Move dev-util/automoc to DEPEND only, thanks to Nikoli in bug 412275. Remove old.

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

4 files changed, 11 insertions, 143 deletions

diff --git a/net-im/qutim/ChangeLog b/net-im/qutim/ChangeLog
index c4aac84750f6..8f67c75fdd61 100644
--- a/net-im/qutim/ChangeLog
+++ b/net-im/qutim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/qutim
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.17 2012/04/15 22:41:30 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.18 2012/04/17 12:48:20 pesa Exp $
+
+  17 Apr 2012; Davide Pesavento <pesa@gentoo.org>
+  -files/qutim-0.3.0-fix-linking-with-system-jreen.patch, -qutim-0.3.0.ebuild,
+  qutim-0.3.1.ebuild:
+  Move dev-util/automoc to DEPEND only, thanks to Nikoli in bug 412275. Remove
+  old.
 
 *qutim-0.3.1 (15 Apr 2012)
 
diff --git a/net-im/qutim/files/qutim-0.3.0-fix-linking-with-system-jreen.patch b/net-im/qutim/files/qutim-0.3.0-fix-linking-with-system-jreen.patch
deleted file mode 100644
index 89b082ecdfa0..000000000000
--- a/net-im/qutim/files/qutim-0.3.0-fix-linking-with-system-jreen.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- protocols/jabber/CMakeLists.txt
-+++ protocols/jabber/CMakeLists.txt
-@@ -6,6 +6,7 @@
- 	if( SYSTEM_JREEN )
- 		find_package( PkgConfig )
- 		pkg_check_modules( JREEN REQUIRED libjreen )
-+		link_directories( ${JREEN_LIBRARY_DIRS} )
- 	else()
- 		ADD_SUBDIRECTORY(jreen)
- 		LIST(APPEND INCLUDE_DIRS "${JREEN_INCLUDE_DIRS}")
\ No newline at end of file
diff --git a/net-im/qutim/qutim-0.3.0.ebuild b/net-im/qutim/qutim-0.3.0.ebuild
deleted file mode 100644
index 6f987ba75ee1..000000000000
--- a/net-im/qutim/qutim-0.3.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.3.0.ebuild,v 1.3 2012/04/12 16:35:12 pesa Exp $
-
-EAPI=4
-
-LANGS="ar bg cs de en_GB ru uk zh_CN"
-
-inherit qt4-r2 cmake-utils
-
-DESCRIPTION="Qt4-based multi-protocol instant messenger"
-HOMEPAGE="http://www.qutim.org"
-SRC_URI="http://www.qutim.org/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="aspell awn ayatana crypt dbus debug doc histman hunspell irc jabber kde kinetic mrim
-	multimedia oscar phonon purple qml sdl +ssl telepathy vkontakte webkit +xscreensaver"
-
-REQUIRED_USE="
-	oscar? ( ssl )
-"
-
-QT_PV="4.7.0:4"
-
-CDEPEND="
-	x11-libs/libqxt
-	>=x11-libs/qt-core-${QT_PV}[ssl?]
-	>=x11-libs/qt-gui-${QT_PV}
-	>=x11-libs/qt-script-${QT_PV}
-	aspell? ( app-text/aspell )
-	awn? ( >=x11-libs/qt-dbus-${QT_PV} )
-	ayatana? ( >=dev-libs/libindicate-qt-0.2.2 )
-	crypt? ( app-crypt/qca:2 )
-	dbus? ( >=x11-libs/qt-dbus-${QT_PV} )
-	debug? ( >=x11-libs/qt-declarative-${QT_PV} )
-	histman? ( >=x11-libs/qt-sql-${QT_PV} )
-	hunspell? ( app-text/hunspell )
-	jabber? ( net-libs/jreen )
-	kde? (
-		dev-util/automoc
-		kde-base/kdelibs:4
-	)
-	kinetic? ( >=x11-libs/qt-declarative-${QT_PV} )
-	multimedia? ( >=x11-libs/qt-multimedia-${QT_PV} )
-	oscar? ( app-crypt/qca:2 )
-	phonon? (
-		kde? ( media-libs/phonon )
-		!kde? ( || ( >=x11-libs/qt-phonon-${QT_PV} media-libs/phonon ) )
-	)
-	purple? ( net-im/pidgin )
-	qml? (
-		>=x11-libs/qt-declarative-${QT_PV}
-		>=x11-libs/qt-opengl-${QT_PV}
-	)
-	sdl? ( media-libs/sdl-mixer )
-	telepathy? ( =net-libs/telepathy-qt-0.8* )
-	vkontakte? ( >=x11-libs/qt-webkit-${QT_PV} )
-	webkit? ( >=x11-libs/qt-webkit-${QT_PV} )
-	xscreensaver? ( x11-libs/libXScrnSaver )
-"
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="${CDEPEND}
-	oscar? ( app-crypt/qca-ossl:2 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-linking-with-system-jreen.patch"
-)
-
-src_prepare() {
-	base_src_prepare
-
-	# fix automagic dep on libXScrnSaver
-	if ! use xscreensaver; then
-		sed -i -e '/XSS xscrnsaver/d' \
-			core/src/corelayers/idledetector/CMakeLists.txt || die
-	fi
-
-	# remove unwanted translations
-	local lang
-	for lang in ${LANGS}; do
-		use linguas_${lang} || rm -f translations/modules/*/${lang}.{po,ts}
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSTEM_JREEN=ON
-		$(cmake-utils_use_with doc DOXYGEN)
-		$(cmake-utils_use doc QUTIM_GENERATE_DOCS)
-		# plugins
-		$(cmake-utils_use aspell ASPELLER)
-		$(cmake-utils_use awn)
-		$(cmake-utils_use ayatana INDICATOR)
-		$(cmake-utils_use crypt AESCRYPTO)
-		$(cmake-utils_use dbus DBUSAPI)
-		$(cmake-utils_use dbus DBUSNOTIFICATIONS)
-		$(cmake-utils_use dbus NOWPLAYING)
-		$(cmake-utils_use debug LOGGER)
-		$(cmake-utils_use histman)
-		$(cmake-utils_use hunspell HUNSPELLER)
-		$(cmake-utils_use kde KDEINTEGRATION)
-		$(cmake-utils_use kinetic KINETICPOPUPS)
-		$(cmake-utils_use multimedia MULTIMEDIABACKEND)
-		$(cmake-utils_use phonon PHONONSOUND)
-		$(cmake-utils_use qml QMLCHAT)
-		$(cmake-utils_use sdl SDLSOUND)
-		$(cmake-utils_use webkit ADIUMWEBVIEW)
-		-DHAIKUNOTIFICATIONS=OFF
-		-DUNITYLAUNCHER=OFF
-		-DUPDATER=OFF
-		# protocols
-		$(cmake-utils_use irc)
-		$(cmake-utils_use jabber)
-		$(cmake-utils_use mrim)
-		$(cmake-utils_use oscar)
-		$(cmake-utils_use purple QUETZAL)
-		$(cmake-utils_use telepathy ASTRAL)
-		$(cmake-utils_use vkontakte)
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-im/qutim/qutim-0.3.1.ebuild b/net-im/qutim/qutim-0.3.1.ebuild
index 4807ade05624..2934fb670006 100644
--- a/net-im/qutim/qutim-0.3.1.ebuild
+++ b/net-im/qutim/qutim-0.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.3.1.ebuild,v 1.1 2012/04/15 22:41:30 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.3.1.ebuild,v 1.2 2012/04/17 12:48:20 pesa Exp $
 
 EAPI=4
 
@@ -22,6 +22,7 @@ REQUIRED_USE="
 	oscar? ( ssl )
 "
 
+# Minimum Qt version required
 QT_PV="4.7.0:4"
 
 CDEPEND="
@@ -41,10 +42,7 @@ CDEPEND="
 		app-crypt/qca:2
 		net-libs/jreen
 	)
-	kde? (
-		dev-util/automoc
-		kde-base/kdelibs:4
-	)
+	kde? ( kde-base/kdelibs:4 )
 	kinetic? ( >=x11-libs/qt-declarative-${QT_PV} )
 	multimedia? ( >=x11-libs/qt-multimedia-${QT_PV} )
 	oscar? ( app-crypt/qca:2 )
@@ -67,6 +65,7 @@ CDEPEND="
 DEPEND="${CDEPEND}
 	dev-util/pkgconfig
 	doc? ( app-doc/doxygen )
+	kde? ( dev-util/automoc )
 "
 RDEPEND="${CDEPEND}
 	jabber? ( app-crypt/qca-gnupg:2 )