Can't use qt = 3.2.0 version with this kde version - doesn't configure right.

3 files changed, 29 insertions, 23 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 2adf479300f3..69a0412f6b94 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,8 +1,10 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.83 2003/07/20 22:11:47 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.84 2003/07/31 02:11:12 caleb Exp $
 
-#kdelibs-3.0.5b-r1 (20 Jul 2003)
+
+
+*kdelibs-3.0.5b-r1 (20 Jul 2003)
 *kdelibs-3.1.2-r1 (20 Jul 2003)
 
   20 Jul 2003; Caleb Tennis <caleb@gentoo.org: kdelibs-3.1.2-r1.ebuild, kdelibs-3.0.5b-r1.ebuild:
@@ -10,6 +12,10 @@
 
 *kdelibs-3.1.3 (20 Jul 2003)
 
+  30 Jul 2003; Caleb Tennis <caleb@gentoo.org>: kdelibs-3.1.3.ebuild:
+  Add a dep that Qt version != 3.2.0, or kde bombs out.
+  Also remove an old portage version dep.
+
   20 Jul 2003; Caleb Tennis <caleb@gentoo.org>: kdelibs-3.1.3.ebuild:
   New version
 
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 3645edd5798d..0e9435ea5056 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,28 +1,28 @@
+MD5 91af2953e64ba4168ad04792c0e85407 kdelibs-3.1.2.ebuild 2440
 MD5 a96d21c40dbd04b8ace9ef89537542d6 kdelibs-3.1.2-r1.ebuild 2537
-MD5 e907b234e307a34e574f3225b3f7d17b kdelibs-3.0.5b-r1.ebuild 1994
 MD5 8a21daa4525f5d8edef9d9be0d4a3354 kdelibs-3.0.4-r1.ebuild 2303
+MD5 cc47efcd70a7e332a245ebb59833142d kdelibs-3.1.1a.ebuild 2645
+MD5 e907b234e307a34e574f3225b3f7d17b kdelibs-3.0.5b-r1.ebuild 1994
 MD5 b738a6c4ff97493257f186b1dfb853ee kdelibs-3.0.5b.ebuild 1921
-MD5 91af2953e64ba4168ad04792c0e85407 kdelibs-3.1.2.ebuild 2440
-MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 9c042ee71a2255b959b551785cae531a ChangeLog 14389
+MD5 f11dd778b220c5b1425a00d49532b383 kdelibs-3.1.3.ebuild 2426
 MD5 ecb842ef67a00a4a3348c92a784cc3b7 kdelibs-2.2.2a-r2.ebuild 2570
-MD5 aa5a51f469ace2f163b3be24ba45c2f1 kdelibs-3.1.3.ebuild 2444
-MD5 cc47efcd70a7e332a245ebb59833142d kdelibs-3.1.1a.ebuild 2645
-MD5 09f2cae6a320fd2baef3d56102cb6f62 files/digest-kdelibs-3.0.5b-r1 68
-MD5 488126241373edef5f0cd3db16aecc63 files/kdelibs-3.1.2-http.patch 1450
-MD5 c087405ca3581f6493850d59c98dcefa files/kdelibs-3.1.2-khtml.patch 1486
+MD5 99dcecd948327d155f65d8cc14b9db11 ChangeLog 14560
+MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.3-kjs-alphaev6-gcc3-workaround.patch 477
-MD5 0599a56d65abe28cd41280572b621d2f files/kdelibs-3.0.5b-http.patch 1639
-MD5 ed6c2a4ca2dca736f3cbfe717b762fe6 files/kdelibs-2.2.2a-gentoo.diff 75788
-MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.1a-kjs-alphaev6-gcc3-workaround.patch 477
-MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.2-kjs-alphaev6-gcc3-workaround.patch 477
+MD5 4232704fe9aeecbb09dbed9cb45b8529 files/kdelibs-3.0.5b-khtml.patch 848
 MD5 24190dc0508cd29ea5adecc4cefc0db2 files/kdelibs-2.2.2a-crosside.diff 1267
-MD5 6541fd079b109e7a1d7050ed3d63cf86 files/digest-kdelibs-2.2.2a-r2 139
-MD5 0783bde2d3df61818e8563b3a445742b files/digest-kdelibs-3.1.3 68
+MD5 09f2cae6a320fd2baef3d56102cb6f62 files/digest-kdelibs-3.0.5b 68
 MD5 fe5064a43dd8ed966e50aee8b8f3364a files/digest-kdelibs-3.1.1a 136
 MD5 acd90863c0847e230aa37f3943d58176 files/kdelibs-3.0.5b-libxml2-2.5.2.diff 703
-MD5 067d29e66608e7461f28e94895a0f4a2 files/digest-kdelibs-3.0.4-r1 142
+MD5 09f2cae6a320fd2baef3d56102cb6f62 files/digest-kdelibs-3.0.5b-r1 68
+MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.1a-kjs-alphaev6-gcc3-workaround.patch 477
 MD5 adfd3d17be1f45423f07f22cd0c73427 files/digest-kdelibs-3.1.2 68
-MD5 09f2cae6a320fd2baef3d56102cb6f62 files/digest-kdelibs-3.0.5b 68
+MD5 0783bde2d3df61818e8563b3a445742b files/digest-kdelibs-3.1.3 68
+MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.2-kjs-alphaev6-gcc3-workaround.patch 477
+MD5 488126241373edef5f0cd3db16aecc63 files/kdelibs-3.1.2-http.patch 1450
+MD5 c087405ca3581f6493850d59c98dcefa files/kdelibs-3.1.2-khtml.patch 1486
+MD5 067d29e66608e7461f28e94895a0f4a2 files/digest-kdelibs-3.0.4-r1 142
+MD5 ed6c2a4ca2dca736f3cbfe717b762fe6 files/kdelibs-2.2.2a-gentoo.diff 75788
 MD5 adfd3d17be1f45423f07f22cd0c73427 files/digest-kdelibs-3.1.2-r1 68
-MD5 4232704fe9aeecbb09dbed9cb45b8529 files/kdelibs-3.0.5b-khtml.patch 848
+MD5 0599a56d65abe28cd41280572b621d2f files/kdelibs-3.0.5b-http.patch 1639
+MD5 6541fd079b109e7a1d7050ed3d63cf86 files/digest-kdelibs-2.2.2a-r2 139
diff --git a/kde-base/kdelibs/kdelibs-3.1.3.ebuild b/kde-base/kdelibs/kdelibs-3.1.3.ebuild
index 12db779d51bd..1508272b4442 100644
--- a/kde-base/kdelibs/kdelibs-3.1.3.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.1.3.ebuild,v 1.1 2003/07/20 21:00:58 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.1.3.ebuild,v 1.2 2003/07/31 02:11:12 caleb Exp $
 inherit kde
 #don't inherit  kde-base or kde-dist! it calls need-kde which adds kdelibs to depend!
 
@@ -30,6 +30,7 @@ newdepend "dev-lang/perl
 	app-text/ghostscript
 	media-libs/libart_lgpl
 	sys-devel/gettext
+	!=x11-libs/qt-3.2.0
 	~kde-base/arts-1.1.3"
 
 newdepend "/autotools"
@@ -37,8 +38,7 @@ newdepend "/autotools"
 RDEPEND="$RDEPEND
 	app-text/sgml-common
 	cups? ( net-print/cups )
-	dev-lang/python
-	>=sys-apps/portage-2.0.36" # for #7359
+	dev-lang/python"
 
 myconf="$myconf --with-distribution=Gentoo --enable-libfam --enable-dnotify"
 use ipv6	|| myconf="$myconf --with-ipv6-lookup=no"