new 1.2.6 upstream release and closing 3 bug reports (see ChangeLog)

9 files changed, 25 insertions, 164 deletions

diff --git a/net-im/licq/ChangeLog b/net-im/licq/ChangeLog
index 059a67b087db..36f6c3013319 100644
--- a/net-im/licq/ChangeLog
+++ b/net-im/licq/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/licq
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.21 2003/02/12 08:02:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.22 2003/04/22 22:36:11 drobbins Exp $
+
+*licq-1.2.6 (22 Apr 2003)
+
+  22 Apr 2003; Daniel Robbins <drobbins@gentoo.org> licq-1.2.6.ebuild: A
+  tricky hack to fix the illegal "need kde && inherit kde-base". newdepend()
+  tweaks the DEPEND line, and we can't tweak dependencies in a conditional
+  as this messes up our dependency caching. This closes bugs #12436, #17925,
+  #18205.
 
 *licq-1.2.4-r2 (07 Feb 2003)
 
diff --git a/net-im/licq/Manifest b/net-im/licq/Manifest
index 21bbbfb49096..73217f8d1f26 100644
--- a/net-im/licq/Manifest
+++ b/net-im/licq/Manifest
@@ -1,11 +1,5 @@
-MD5 eca1447e2992d69d784803614a5873fd licq-1.2.4-r1.ebuild 1695
-MD5 819673c4d3476aa7e50072ddd8d2e09f licq-1.2.0a-r3.ebuild 1759
-MD5 57f9c9037e9db62bf2df7f7db9f7d921 licq-1.2.4-r2.ebuild 3741
-MD5 57f9c9037e9db62bf2df7f7db9f7d921 licq-1.2.6.ebuild 3741
-MD5 98018372dc2f08a0212a2c6eeb51c271 ChangeLog 3359
-MD5 75137b18c40ae9b662f3475b4c0becb9 files/digest-licq-1.2.0a-r3 65
-MD5 a8826dd5f10c7c144c806bdaced90479 files/digest-licq-1.2.4-r1 64
-MD5 a8826dd5f10c7c144c806bdaced90479 files/digest-licq-1.2.4-r2 64
+MD5 5440d11ab8414cb6385411e93de97e89 licq-1.2.6.ebuild 4034
+MD5 fc8502290a7d11d4250a6b77563c409a ChangeLog 3701
 MD5 361d20e528b72b61170b815694ebe1c7 files/digest-licq-1.2.6 64
 MD5 ea0b7f8aa5cf8b175753ede6025f06ce files/1.2.0a-qt31.patch 1306
 MD5 3b10872fafb342e13b1b81dacae7d68e files/1.2.0a-gcc3-gentoo.patch 1996
diff --git a/net-im/licq/files/digest-licq-1.2.0a-r3 b/net-im/licq/files/digest-licq-1.2.0a-r3
deleted file mode 100644
index 7b91e3648cbf..000000000000
--- a/net-im/licq/files/digest-licq-1.2.0a-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3f977d83b36b26d1bc716be3e3336315 licq-1.2.0a.tar.bz2 1741476
diff --git a/net-im/licq/files/digest-licq-1.2.4-r1 b/net-im/licq/files/digest-licq-1.2.4-r1
deleted file mode 100644
index 42f62183e2b1..000000000000
--- a/net-im/licq/files/digest-licq-1.2.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3267518199e440a2c7be5e608b05bfd4 licq-1.2.4.tar.bz2 2952409
diff --git a/net-im/licq/files/digest-licq-1.2.4-r2 b/net-im/licq/files/digest-licq-1.2.4-r2
deleted file mode 100644
index 42f62183e2b1..000000000000
--- a/net-im/licq/files/digest-licq-1.2.4-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3267518199e440a2c7be5e608b05bfd4 licq-1.2.4.tar.bz2 2952409
diff --git a/net-im/licq/files/digest-licq-1.2.6 b/net-im/licq/files/digest-licq-1.2.6
new file mode 100644
index 000000000000..8d03f75b6eb7
--- /dev/null
+++ b/net-im/licq/files/digest-licq-1.2.6
@@ -0,0 +1 @@
+MD5 7e84a1dde8b21eb2bb057d3755353500 licq-1.2.6.tar.bz2 3282918
diff --git a/net-im/licq/licq-1.2.0a-r3.ebuild b/net-im/licq/licq-1.2.0a-r3.ebuild
deleted file mode 100644
index 9a6c17102e45..000000000000
--- a/net-im/licq/licq-1.2.0a-r3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.2.0a-r3.ebuild,v 1.3 2003/02/13 14:11:33 vapier Exp $
-
-IUSE="ssl socks5 qt kde"
-
-DESCRIPTION="ICQ Client with v8 support" 
-HOMEPAGE="http://www.licq.org"
-LICENSE="GPL-2"
-
-DEPEND="${DEPEND}
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	qt?  ( >=x11-libs/qt-3.0.0 )"
-
-SRC_URI="http://download.sourceforge.net/licq/${P}.tar.bz2"
-SLOT="2"
-KEYWORDS="x86"
-S=${WORKDIR}/${P}
-
-use kde && inherit kde-base
-use kde && need-kde 3.0
-
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${A}
-	cd ${S}
-	patch -p0 < ${FILESDIR}/${PV}-config.patch || die
-	patch -p1 < ${FILESDIR}/${PV}-qt31.patch || die
-	patch -p1 < ${FILESDIR}/${PV}-gcc3-gentoo.patch || die
-}
-
-src_compile() {
-
-	local first_conf
-	use ssl		|| first_conf = "${first_conf} --disable-openssl"
-	use socks5	&& first_conf = "${first_conf} --enable-socks5"
-	
-	./configure --host=${CHOST} --prefix=/usr ${first_conf} || die
-	emake || die
-
-	if [ "`use qt`" ] 
-	then
-		# A hack to build against the latest QT:
-		local v
-		for v in /usr/qt/[0-9]
-		do
-			[ -d "${v}" ] && export QTDIR="${v}"
-		done
-		use kde && kde_src_compile myconf
-		use kde && second_conf="${second_conf} ${myconf} --with-kde"
-
-		# note! watch the --prefix=/usr placement;
-		# licq itself installs into /usr, but the
-		# optional kde/qt interface (to which second_conf belogns)
-		# installs its files in $KDE3DIR/{lib,share}/licq
-
-		cd plugins/qt-gui-1.2.0
-		./configure --host=${CHOST} ${second_conf} --prefix=/usr || die
-		emake || die
-	fi
-
-}
-
-src_install() {
-
-	cd ${S}
-	make DESTDIR=${D} install || die
-	if [ "`use qt`" ] 
-	then
-		cd plugins/qt-gui-1.2.0
-		make DESTDIR=${D} install || die	
-	fi
-
-}
diff --git a/net-im/licq/licq-1.2.4-r1.ebuild b/net-im/licq/licq-1.2.4-r1.ebuild
deleted file mode 100644
index baa0ab98b466..000000000000
--- a/net-im/licq/licq-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.2.4-r1.ebuild,v 1.3 2003/02/04 21:04:24 seemant Exp $
-
-IUSE="ssl socks5 qt kde"
-
-use kde && inherit kde-base
-use kde && need-kde 3.0
-
-DESCRIPTION="ICQ Client with v8 support" 
-HOMEPAGE="http://www.licq.org"
-LICENSE="GPL-2"
-
-DEPEND="${DEPEND}
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	qt?  ( >=x11-libs/qt-3.0.0 )"
-
-SRC_URI="http://download.sourceforge.net/licq/${P}.tar.bz2"
-SLOT="2"
-KEYWORDS="~x86"
-
-src_compile() {
-
-	local first_conf
-	use ssl		|| first_conf="${first_conf} --disable-openssl"
-	use socks5	&& first_conf="${first_conf} --enable-socks5"
-	
-	./configure --host=${CHOST} --prefix=/usr ${first_conf} || die
-	emake || die
-
-	if [ "`use qt`" ] 
-	then
-		# A hack to build against the latest QT:
-		local v
-		for v in /usr/qt/[0-9]
-		do
-			[ -d "${v}" ] && export QTDIR="${v}"
-		done
-		use kde && kde_src_compile myconf
-		use kde && second_conf="${second_conf} ${myconf} --with-kde"
-
-		# note! watch the --prefix=/usr placement;
-		# licq itself installs into /usr, but the
-		# optional kde/qt interface (to which second_conf belogns)
-		# installs its files in $KDE3DIR/{lib,share}/licq
-
-		cd plugins/qt-gui
-		./configure --host=${CHOST} ${second_conf} --prefix=/usr || die
-		emake || die
-	fi
-
-}
-
-src_install() {
-
-	cd ${S}
-	make DESTDIR=${D} install || die
-	if [ "`use qt`" ] 
-	then
-		cd plugins/qt-gui
-		make DESTDIR=${D} install || die	
-		
-		# fix bug #12436, see my comment there
-		if [ "`use kde`" ]; then
-			cd $D/usr/lib/licq
-			ln -s licq_kde-gui.la licq_qt-gui.la
-			ln -s licq_kde-gui.so licq_qt-gui.so
-		fi
-		
-	fi
-
-}
diff --git a/net-im/licq/licq-1.2.4-r2.ebuild b/net-im/licq/licq-1.2.6.ebuild
index ca61d2826c83..881af24a5f60 100644
--- a/net-im/licq/licq-1.2.4-r2.ebuild
+++ b/net-im/licq/licq-1.2.6.ebuild
@@ -1,17 +1,25 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.2.4-r2.ebuild,v 1.7 2003/02/11 01:10:29 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.2.6.ebuild,v 1.1 2003/04/22 22:36:12 drobbins Exp $
 
 IUSE="ssl socks5 qt kde gtk ncurses"
 
-use kde && inherit kde-base
-use kde && need-kde 3.0
-
 DESCRIPTION="ICQ Client with v8 support" 
 HOMEPAGE="http://www.licq.org"
 LICENSE="GPL-2"
 
-DEPEND="${DEPEND}
+inherit kde-base
+need-kde 3.0
+
+#we can't have conditional dependencies so "use kde && inherit kde-base" 
+#won't work -- messes up dep caching.
+
+#need-kde and their eclass friends inject things into DEPEND. But we only
+#want them enabled if the kde USE flag is set. We get around this in the
+#following dep lines:
+
+RDEPEND="kde? ( $DEPEND )"
+DEPEND="kde? ( $DEPEND )
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	qt?  ( >=x11-libs/qt-3.0.0 )
 	gtk? ( =x11-libs/gtk+-1.2* )