Remove kdelibs:3.5 depend and USE kde with it wrt #292791 and workaround multilib-strict bug.

Package-Manager: portage-2.2_rc60/cvs/Linux x86_64

4 files changed, 14 insertions, 132 deletions

diff --git a/net-im/licq/ChangeLog b/net-im/licq/ChangeLog
index e31372ca07d9..0bf58133dded 100644
--- a/net-im/licq/ChangeLog
+++ b/net-im/licq/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/licq
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.111 2009/12/14 14:22:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.112 2009/12/25 20:20:05 ssuominen Exp $
+
+  25 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> licq-1.3.6.ebuild:
+  Remove kdelibs:3.5 depend and USE kde with it wrt #292791 and workaround
+  multilib-strict bug.
 
 *licq-1.3.8 (14 Dec 2009)
 
diff --git a/net-im/licq/Manifest b/net-im/licq/Manifest
index a3cce2c7c922..0033d0bcd5c9 100644
--- a/net-im/licq/Manifest
+++ b/net-im/licq/Manifest
@@ -1,9 +1,7 @@
 AUX licq-1.3.6-glibc-2.10.patch 6864 RMD160 807108dcaaec5dfa3cbee446c3a4967bd1189194 SHA1 48014f3e1ede20b7b3e90c0f8e8e610f8ea5517a SHA256 70131d3a3cc6c4b3d3a87c05465ab0b946458d5de03ea5bcd46728dbbf78e211
 DIST licq-1.3.6.tar.bz2 4777777 RMD160 0d626640e02c9991309d6f7c32725cd1d5bdfa37 SHA1 1451da41c82b9a13424c96d8641e642895b723ac SHA256 ad6ea66301923e5d106111a6b4654aaa72131d8b5c499d16dc9fbbc8cd29845e
-DIST licq-1.3.7.tar.bz2 4713892 RMD160 c76bd2e6291157a5969b7f1877c44fd9c041d5ca SHA1 7e7d4e81defb2a175914fda3292b4dbb1f1e70c7 SHA256 a111fdbe05b7aa5e3afece253d24c3e2a8d61ca421c32b6c2ef44752f056ee45
 DIST licq-1.3.8.tar.bz2 4500623 RMD160 07900d5d7bbd7154c5569468a709ed9a63ac83c8 SHA1 3cd6ccf8b584dff7803a639da82c3bed7fafdbac SHA256 fb65cd5447f2771def5cffda113d68b25ee6ed6fe0ebce84638da79e2869ebc6
-EBUILD licq-1.3.6.ebuild 3175 RMD160 adfcca3470a535675cb598dba079370d4ab5cb12 SHA1 3adc62fc35b1b68b25e130717959fa049720afb6 SHA256 cab4d059b9543b3a9a6b7d25ce80f330a76c2ad3d70d377f489425305a1f4c2e
-EBUILD licq-1.3.7.ebuild 3179 RMD160 44a71156c1fb15886a5bd11fb34e78c67387de1a SHA1 b79dfa35a0d537c30180950a0d685b1edb3bcd2a SHA256 6ace542c1d65057f490b00bdcda776a167ad89f7ad5fba265fb423a7905b0364
+EBUILD licq-1.3.6.ebuild 3062 RMD160 efd76f3af698deaf98b1b4b16750c2dc32635b38 SHA1 62afcd0b25e2f069510aa4b53b9d50d608e34cbd SHA256 66c450ddc7fc63ee75575c87ed5475d98bdba3276bcbf187bc48c5b7248c5f11
 EBUILD licq-1.3.8.ebuild 2057 RMD160 c2b67ef1616927567147226a592e43ec68baae2a SHA1 62d765a92bf36e2f481b8bc1d577bfc1cbc4c82b SHA256 f5a0fa0fba687cb5c1590d3982c4d28e67004e024c06accd1a78e79075341681
-MISC ChangeLog 17053 RMD160 e4e1b3a05fe8b2ebeed54cae725ae8217db53580 SHA1 7db2041031d9949cc6f620b280da284863e29408 SHA256 f7ccca4e4cd0f09d446217cda0b986db3b268441af25da641e9a67832fcd0426
+MISC ChangeLog 17225 RMD160 d33e23a12a9e175090860b2e1a03bbca18b789bc SHA1 5ca3b902bb9c25c03460da79a8f491f769f3a94c SHA256 70530a3afef3ca3afd80e147154f8b4ad10b02f3648efe291abe1f6b4a2931db
 MISC metadata.xml 249 RMD160 09f64f681d0dd11fd8a5784ae17b7eaaa87cc12f SHA1 936e8c76314d77517317065331498434f2c59674 SHA256 bfa15ab9faf7742a9f33d2ba72410a089690beb639884f357b135951cd663230
diff --git a/net-im/licq/licq-1.3.6.ebuild b/net-im/licq/licq-1.3.6.ebuild
index 458fe67d18f1..6eeed04c27d5 100644
--- a/net-im/licq/licq-1.3.6.ebuild
+++ b/net-im/licq/licq-1.3.6.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.6.ebuild,v 1.11 2009/12/11 15:11:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.6.ebuild,v 1.12 2009/12/25 20:20:05 ssuominen Exp $
 
 EAPI="1"
 
 CMAKE_USE_DIR="${S}/plugins/qt4-gui"
-inherit eutils kde-functions multilib cmake-utils
+inherit eutils qt3 multilib cmake-utils
 
 DESCRIPTION="ICQ Client with v8 support"
 HOMEPAGE="http://www.licq.org/"
@@ -14,13 +14,9 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-IUSE="crypt debug kde msn ncurses nls qt3 qt4 socks5 ssl xosd"
+IUSE="crypt debug msn ncurses nls qt3 qt4 socks5 ssl xosd"
 
-# we use kde as KDE4
-RDEPEND="kde? (
-		qt3? ( kde-base/kdelibs:3.5 )
-	)
-	ssl? ( dev-libs/openssl )
+RDEPEND="ssl? ( dev-libs/openssl )
 	qt3? ( x11-libs/qt:3 )
 	qt4? ( x11-libs/qt-gui:4 )
 	nls? ( sys-devel/gettext )
@@ -65,9 +61,6 @@ src_compile() {
 		cd "${S}"/plugins/"${plugin}"
 		einfo "Compiling Licq: \"${plugin}\"."
 		if use qt3; then
-			set-qtdir 3
-			set-kdedir 3
-			use kde && myconf2="${myconf} --with-kde"
 			myconf2="${myconf2} --with-qt-libraries=${QTDIR}/$(get_libdir)"
 		fi
 		econf ${myconf} ${myconf2} || die "econf failed"
@@ -82,8 +75,6 @@ src_compile() {
 		# need to fix this later
 		# kde not yet workie
 		# use kde && myconf2="${myconf2} -DWITH_KDE=1"
-		use kde && ewarn "Sorry but kde4 support is duped and not working so not
-		enabling for now"
 		cmake-utils_src_compile
 	fi
 }
@@ -104,6 +95,9 @@ src_install() {
 		einfo "Installing Licq: \"qt4-gui\"."
 		cmake-utils_src_install
 		docinto plugins/qt4-gui
+		# Hack only for 1.3.6. Fixed in 1.3.8.
+		mv -f "${D}"/usr/lib/licq/licq_qt4-gui.so \
+			"${D}"/usr/$(get_libdir)/licq/licq_qt4-gui.so
 	fi
 
 	exeinto /usr/share/${PN}/upgrade
diff --git a/net-im/licq/licq-1.3.7.ebuild b/net-im/licq/licq-1.3.7.ebuild
deleted file mode 100644
index 25070602d9b0..000000000000
--- a/net-im/licq/licq-1.3.7.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.7.ebuild,v 1.1 2009/10/26 11:49:44 patrick Exp $
-
-EAPI="1"
-
-CMAKE_USE_DIR="${S}/plugins/qt4-gui"
-inherit eutils kde-functions multilib cmake-utils
-
-DESCRIPTION="ICQ Client with v8 support"
-HOMEPAGE="http://www.licq.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="crypt debug kde msn ncurses nls qt3 qt4 socks5 ssl xosd"
-
-# we use kde as KDE4
-RDEPEND="kde? (
-		qt3? ( kde-base/kdelibs:3.5 )
-	)
-	ssl? ( dev-libs/openssl )
-	qt3? ( x11-libs/qt:3 )
-	qt4? ( x11-libs/qt-gui:4 )
-	nls? ( sys-devel/gettext )
-	ncurses? ( sys-libs/ncurses dev-libs/cdk )
-	crypt? ( app-crypt/gpgme:1 )
-	xosd? ( x11-libs/xosd )"
-DEPEND="${RDEPEND}
-	dev-libs/boost"
-
-#PATCHES=( "${FILESDIR}/${P}-glibc-2.10.patch" )
-
-_generate_plugins_directories() {
-	PLUGINS="auto-reply email rms"
-	use msn && PLUGINS="${PLUGINS} msn"
-	use ncurses && PLUGINS="${PLUGINS} console"
-	use xosd &&  PLUGINS="${PLUGINS} osd"
-	# QT4 is something extra. Uses cmake.
-	use qt4 && PLUGINS_CMAKE="${PLUGINS_CMAKE} qt4-gui"
-	use qt3 && PLUGINS="${PLUGINS} qt-gui"
-	elog "I will generate these plugins/frontends for licq:"
-	elog "${PLUGINS} ${PLUGINS_CMAKE}"
-}
-
-pkg_setup() {
-	_generate_plugins_directories
-}
-
-src_compile() {
-	local myconf myconf2 plugin
-	# global config setup for automake
-	myconf="$(use_enable crypt gpgme)
-		$(use_enable ssl openssl)
-		$(use_enable socks5)
-		$(use_enable debug)
-		$(use_enable nls)"
-
-	einfo "Compiling Licq core."
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
-
-	for plugin in ${PLUGINS}; do
-		cd "${S}"/plugins/"${plugin}"
-		einfo "Compiling Licq: \"${plugin}\"."
-		if use qt3; then
-			set-qtdir 3
-			set-kdedir 3
-			use kde && myconf2="${myconf} --with-kde"
-			myconf2="${myconf2} --with-qt-libraries=${QTDIR}/$(get_libdir)"
-		fi
-		econf ${myconf} ${myconf2} || die "econf failed"
-		emake || die "emake failed"
-	done
-	# we like qt4 it uses cmake
-	if use qt4; then
-		einfo "Compiling Licq: \"qt4-gui\"."
-		# Possible error because of one tiny issue we introduce in kde
-		# it is called kdeprefix and in that case you can't be sure where it
-		# find kde stuff. This is working only for -kdeprefix so someone will
-		# need to fix this later
-		# kde not yet workie
-		# use kde && myconf2="${myconf2} -DWITH_KDE=1"
-		use kde && ewarn "Sorry but kde4 support is duped and not working so not
-		enabling for now"
-		cmake-utils_src_compile
-	fi
-}
-
-src_install() {
-	# install core
-	einfo "Installing Licq core."
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README* doc/*
-	# Install the plug-ins
-	for plugin in ${PLUGINS}; do
-		cd "${S}"/plugins/"${plugin}"
-		einfo "Installing Licq: \"${plugin}\"."
-		emake DESTDIR="${D}" install || die "emake install failed"
-		dodoc README* *.conf
-	done
-	if use qt4; then
-		einfo "Installing Licq: \"qt4-gui\"."
-		cmake-utils_src_install
-		docinto plugins/qt4-gui
-	fi
-
-	exeinto /usr/share/${PN}/upgrade
-	doexe "${S}"/upgrade/*
-
-	# fixes bug #22136 and #149464
-	rm -fR "${D}"/var
-}