Fix KDE dependencies wrt bug 206617.

Package-Manager: portage-2.1.4

4 files changed, 26 insertions, 32 deletions

diff --git a/net-irc/kvirc/ChangeLog b/net-irc/kvirc/ChangeLog
index bed7137194de..708a909b3ebf 100644
--- a/net-irc/kvirc/ChangeLog
+++ b/net-irc/kvirc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/kvirc
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.58 2007/11/16 08:23:01 jokey Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.59 2008/01/19 13:59:12 ingmar Exp $
+
+  19 Jan 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  kvirc-3.2.6_pre20070714.ebuild, kvirc-9999.ebuild:
+  Fix KDE dependencies wrt bug 206617.
 
   16 Nov 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog
   kvirc-9999.ebuild:
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index e1f9e0f87ba5..db7e0f567865 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX kvirc-gendoc.patch 330 RMD160 942c672170630dcb565c046318621f05e6f43dda SHA1 4a60660db3b30226be8880f44a50e317b7b743dd SHA256 b61281260069c33f13927bd8af006c27de15b303be44e723f2eec5c5953bb9f7
 MD5 06a9983fa26f8ffaa7db0d89d1ced219 files/kvirc-gendoc.patch 330
 RMD160 942c672170630dcb565c046318621f05e6f43dda files/kvirc-gendoc.patch 330
@@ -14,18 +11,18 @@ MD5 2368dd38403344a571ac93fb875bb06a files/kvirc-svn-kdedir-fix.patch 2398
 RMD160 2749e0170ec205bec7a17ece6376e55d3758c0f0 files/kvirc-svn-kdedir-fix.patch 2398
 SHA256 e6d4278a0a95ead3a75804557a97509eda1355797d49b947c90b49f5f4994655 files/kvirc-svn-kdedir-fix.patch 2398
 DIST kvirc-3.2.6_pre20070714.tar.bz2 5371722 RMD160 bfe27103b6a88774491f6c947ea503cffe75d817 SHA1 be918db69929cd859ccac53202ae762542b932cd SHA256 dc4362f9f2efd49d22a91de62bb3c61ce0f168e318e1ea44da6ba9d36fc8c56a
-EBUILD kvirc-3.2.6_pre20070714.ebuild 1834 RMD160 081d55c96fcae9b4bc91a29fa44198a1092cd9b8 SHA1 42e0601c9115f0b18f0b717d404b237a454b1cf8 SHA256 aa3c6ddf648b659489abaa732b90ecc097d43f3aa8075db724bd117a9e9209f8
-MD5 9eae2f09050eaa789a6e36fa6d8995b0 kvirc-3.2.6_pre20070714.ebuild 1834
-RMD160 081d55c96fcae9b4bc91a29fa44198a1092cd9b8 kvirc-3.2.6_pre20070714.ebuild 1834
-SHA256 aa3c6ddf648b659489abaa732b90ecc097d43f3aa8075db724bd117a9e9209f8 kvirc-3.2.6_pre20070714.ebuild 1834
-EBUILD kvirc-9999.ebuild 1794 RMD160 4edb38ce2bc0840e82d4dc884ef96ebc20e7f2d4 SHA1 2623af5c5480e44ef30c7ecf3446a692736f9c3b SHA256 41f67004c1242ecbf9d01cd8a044307b54c9afcb43bf8f7b97d9e6a52523247d
-MD5 a52afe9a44d48276192750d1ff888f99 kvirc-9999.ebuild 1794
-RMD160 4edb38ce2bc0840e82d4dc884ef96ebc20e7f2d4 kvirc-9999.ebuild 1794
-SHA256 41f67004c1242ecbf9d01cd8a044307b54c9afcb43bf8f7b97d9e6a52523247d kvirc-9999.ebuild 1794
-MISC ChangeLog 9761 RMD160 3f805cc4cb7744d50b4388bdb05498b922084cbb SHA1 87fd6d2460c4ee2d91765ab6749c3d41d81c7661 SHA256 f0bfa009ebccfba5de126abfd035d880c069b2667a8c66417bc63377e6acfe75
-MD5 00546d3b6dc93b38c400e3be5abd7edb ChangeLog 9761
-RMD160 3f805cc4cb7744d50b4388bdb05498b922084cbb ChangeLog 9761
-SHA256 f0bfa009ebccfba5de126abfd035d880c069b2667a8c66417bc63377e6acfe75 ChangeLog 9761
+EBUILD kvirc-3.2.6_pre20070714.ebuild 1839 RMD160 70988f402618cc17c0ee685734eb880f15cbf9f4 SHA1 c53d3dc503888247792ed0cc5a8245485bb5cb08 SHA256 60295e9cb4dd7353279bbe7ac307bcb2dbe9dcfb97544b191f52cf58b5f8d03d
+MD5 0a9d54c40d181e25afd47c499fa800ac kvirc-3.2.6_pre20070714.ebuild 1839
+RMD160 70988f402618cc17c0ee685734eb880f15cbf9f4 kvirc-3.2.6_pre20070714.ebuild 1839
+SHA256 60295e9cb4dd7353279bbe7ac307bcb2dbe9dcfb97544b191f52cf58b5f8d03d kvirc-3.2.6_pre20070714.ebuild 1839
+EBUILD kvirc-9999.ebuild 1800 RMD160 1919f77dbcd3b26f8a6316846b82487f4df04f88 SHA1 ae5d621986a596dafaea437344d0e4569dec9e1c SHA256 ed39cd5df83d16cd2f9d20bba805487de1abbf75d8b655381a0aaca32390dc7a
+MD5 52eca9b21b1a79942933ae1a75a6dfe2 kvirc-9999.ebuild 1800
+RMD160 1919f77dbcd3b26f8a6316846b82487f4df04f88 kvirc-9999.ebuild 1800
+SHA256 ed39cd5df83d16cd2f9d20bba805487de1abbf75d8b655381a0aaca32390dc7a kvirc-9999.ebuild 1800
+MISC ChangeLog 9907 RMD160 9544c8544d47aee35d8cfa4525f5a888dc82e009 SHA1 69f43129d25263b07f56e9277545b75f7438fad7 SHA256 5789918b11580edd4df9dc2bd10cdb7c5ed80168ca942c221583e647e6856cf2
+MD5 1edeef5ece5a93213f63d9a1a257da87 ChangeLog 9907
+RMD160 9544c8544d47aee35d8cfa4525f5a888dc82e009 ChangeLog 9907
+SHA256 5789918b11580edd4df9dc2bd10cdb7c5ed80168ca942c221583e647e6856cf2 ChangeLog 9907
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
@@ -36,10 +33,3 @@ SHA256 95c8c8f6e985f99facb90544ba46135262d6c4d1055dedb90d9e3dae317ce650 files/di
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kvirc-9999 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-kvirc-9999 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-kvirc-9999 0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHPVNuz974XjDVpbkRAnUAAJ9rlzW7O21zEnp/VVd5EneNrssr9gCfVmUO
-mwPVbOuxXJzMboTXTI7XTjU=
-=efJi
------END PGP SIGNATURE-----
diff --git a/net-irc/kvirc/kvirc-3.2.6_pre20070714.ebuild b/net-irc/kvirc/kvirc-3.2.6_pre20070714.ebuild
index 15fa0d305f23..03383e38f928 100644
--- a/net-irc/kvirc/kvirc-3.2.6_pre20070714.ebuild
+++ b/net-irc/kvirc/kvirc-3.2.6_pre20070714.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-3.2.6_pre20070714.ebuild,v 1.6 2007/09/06 12:13:35 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-3.2.6_pre20070714.ebuild,v 1.7 2008/01/19 13:59:12 ingmar Exp $
 
 inherit autotools eutils kde-functions
 
@@ -16,7 +16,7 @@ IUSE="debug esd ipv6 kde oss ssl"
 RDEPEND="esd? ( media-sound/esound )
 	ssl? ( dev-libs/openssl )
 	oss? ( media-libs/audiofile )
-	kde? ( >=kde-base/kdelibs-3 )
+	kde? ( =kde-base/kdelibs-3.5* )
 	=x11-libs/qt-3*"
 
 DEPEND="${RDEPEND}
@@ -50,7 +50,7 @@ src_compile() {
 	use esd || myconf="${myconf} --without-esd-support"
 	use ssl || myconf="${myconf} --without-ssl-support"
 
-	[ "${ARCH}" == "x86" ] && myconf="${myconf} --with-ix86-asm"
+	[[ "${ARCH}" == "x86" ]] && myconf="${myconf} --with-ix86-asm"
 
 	econf ${myconf} || die "econf failed"
 	emake -j1 || die "econf failed"
diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild
index 732f85ee1349..b9f37356fe3d 100644
--- a/net-irc/kvirc/kvirc-9999.ebuild
+++ b/net-irc/kvirc/kvirc-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-9999.ebuild,v 1.9 2007/11/16 08:23:01 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-9999.ebuild,v 1.10 2008/01/19 13:59:12 ingmar Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -17,7 +17,7 @@ IUSE="debug esd ipv6 kde oss ssl"
 RDEPEND="esd? ( media-sound/esound )
 	ssl? ( dev-libs/openssl )
 	oss? ( media-libs/audiofile )
-	kde? ( >=kde-base/kdelibs-3 )
+	kde? ( =kde-base/kdelibs-3.5* )
 	=x11-libs/qt-3*"
 
 DEPEND="${RDEPEND}
@@ -49,7 +49,7 @@ src_compile() {
 	use esd || myconf="${myconf} --without-esd-support"
 	use ssl || myconf="${myconf} --without-ssl-support"
 
-	[ "${ARCH}" == "x86" ] && myconf="${myconf} --with-ix86-asm"
+	[[ "${ARCH}" == "x86" ]] && myconf="${myconf} --with-ix86-asm"
 
 	econf ${myconf} || die "econf failed"
 	emake -j1 || die "emake failed"