Remove set-qtdir statements and change qt deps to use qt_min_version per bug #100235

(Portage version: 2.0.51.22-r2)

8 files changed, 22 insertions, 18 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index f90919c23da4..fd2ea4f6440c 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.264 2005/07/22 21:53:33 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.265 2005/07/25 15:19:25 caleb Exp $
+
+  25 Jul 2005; Caleb Tennis <caleb@gentoo.org> kdelibs-3.2.3-r7.ebuild,
+  kdelibs-3.2.3-r9.ebuild, kdelibs-3.3.2-r9.ebuild,
+  kdelibs-3.3.2-r10.ebuild, kdelibs-3.4.0-r2.ebuild,
+  kdelibs-3.4.1-r1.ebuild, kdelibs-3.4.1-r2.ebuild:
+  Remove set-qtdir statements and change qt deps to use qt_min_version per bug
+  #100235
 
   22 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
   kdelibs-3.3.2-r10.ebuild:
diff --git a/kde-base/kdelibs/kdelibs-3.2.3-r7.ebuild b/kde-base/kdelibs/kdelibs-3.2.3-r7.ebuild
index 4eab5f90a224..75288e8f66a3 100644
--- a/kde-base/kdelibs/kdelibs-3.2.3-r7.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.2.3-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.2.3-r7.ebuild,v 1.8 2005/07/08 23:20:48 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.2.3-r7.ebuild,v 1.9 2005/07/25 15:19:25 caleb Exp $
 
 inherit kde eutils
 
@@ -40,7 +40,7 @@ DEPEND=">=sys-devel/autoconf-2.58
 	media-libs/libart_lgpl
 	sys-devel/gettext
 	~kde-base/arts-1.2.3
-	>=x11-libs/qt-3.2.3"
+	$(qt_min_version 3.2.3)"
 RDEPEND="${DEPEND}
 	app-text/sgml-common
 	cups? ( net-print/cups )
diff --git a/kde-base/kdelibs/kdelibs-3.2.3-r9.ebuild b/kde-base/kdelibs/kdelibs-3.2.3-r9.ebuild
index fd7abc4ffe03..2078c2087554 100644
--- a/kde-base/kdelibs/kdelibs-3.2.3-r9.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.2.3-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.2.3-r9.ebuild,v 1.7 2005/07/08 23:20:48 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.2.3-r9.ebuild,v 1.8 2005/07/25 15:19:25 caleb Exp $
 
 inherit kde eutils
 
@@ -41,7 +41,7 @@ DEPEND=">=sys-devel/autoconf-2.58
 	media-libs/libart_lgpl
 	sys-devel/gettext
 	~kde-base/arts-1.2.3
-	>=x11-libs/qt-3.2.3"
+	$(qt_min_version 3.2.3)"
 RDEPEND="${DEPEND}
 	app-text/sgml-common
 	cups? ( net-print/cups )
diff --git a/kde-base/kdelibs/kdelibs-3.3.2-r10.ebuild b/kde-base/kdelibs/kdelibs-3.3.2-r10.ebuild
index 1b58d0deec73..bdbc839438c0 100644
--- a/kde-base/kdelibs/kdelibs-3.3.2-r10.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.3.2-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.3.2-r10.ebuild,v 1.10 2005/07/22 21:53:33 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.3.2-r10.ebuild,v 1.11 2005/07/25 15:19:25 caleb Exp $
 
 inherit kde eutils flag-o-matic
 set-kdedir 3.3
@@ -23,7 +23,7 @@ IUSE="alsa arts cups doc ipv6 kerberos ldap spell ssl tiff"
 # kde.eclass has kdelibs in DEPEND, and we can't have that in here.
 # so we recreate the entire DEPEND from scratch.
 RDEPEND="arts? ( ~kde-base/arts-1.3.2 )
-	>=x11-libs/qt-3.3.3
+	$(qt_min_version 3.3.3)
 	app-arch/bzip2
 	>=dev-libs/libxslt-1.1.4
 	>=dev-libs/libxml2-2.6.6
diff --git a/kde-base/kdelibs/kdelibs-3.3.2-r9.ebuild b/kde-base/kdelibs/kdelibs-3.3.2-r9.ebuild
index 8c4d7ea68062..555ecb68e501 100644
--- a/kde-base/kdelibs/kdelibs-3.3.2-r9.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.3.2-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.3.2-r9.ebuild,v 1.11 2005/07/08 23:20:48 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.3.2-r9.ebuild,v 1.12 2005/07/25 15:19:25 caleb Exp $
 
 inherit kde eutils flag-o-matic
 set-kdedir 3.3
@@ -23,7 +23,7 @@ IUSE="alsa arts cups doc ipv6 kerberos ldap spell ssl tiff"
 # kde.eclass has kdelibs in DEPEND, and we can't have that in here.
 # so we recreate the entire DEPEND from scratch.
 RDEPEND="arts? ( ~kde-base/arts-1.3.2 )
-	>=x11-libs/qt-3.3.3
+	$(qt_min_version 3.3.3)
 	app-arch/bzip2
 	>=dev-libs/libxslt-1.1.4
 	>=dev-libs/libxml2-2.6.6
diff --git a/kde-base/kdelibs/kdelibs-3.4.0-r2.ebuild b/kde-base/kdelibs/kdelibs-3.4.0-r2.ebuild
index a69ed65629cd..aece2efb08bb 100644
--- a/kde-base/kdelibs/kdelibs-3.4.0-r2.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.4.0-r2.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.4.0-r2.ebuild,v 1.5 2005/07/08 23:20:48 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.4.0-r2.ebuild,v 1.6 2005/07/25 15:19:25 caleb Exp $
 
 inherit kde eutils flag-o-matic
-set-qtdir 3
 set-kdedir 3.4
 
 DESCRIPTION="KDE libraries needed by all kde programs"
@@ -19,7 +18,7 @@ IUSE="alsa arts cups doc jpeg2k kerberos openexr spell ssl tiff zeroconf"
 # kde.eclass has kdelibs in DEPEND, and we can't have that in here.
 # so we recreate the entire DEPEND from scratch.
 RDEPEND="arts? ( ~kde-base/arts-${PV} )
-	>=x11-libs/qt-3.3.3
+	$(qt_min_version 3.3.3)
 	app-arch/bzip2
 	>=dev-libs/libxslt-1.1.4
 	>=dev-libs/libxml2-2.6.6
diff --git a/kde-base/kdelibs/kdelibs-3.4.1-r1.ebuild b/kde-base/kdelibs/kdelibs-3.4.1-r1.ebuild
index ed8c0ddaed6b..8b84d886994e 100644
--- a/kde-base/kdelibs/kdelibs-3.4.1-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.4.1-r1.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.4.1-r1.ebuild,v 1.10 2005/07/14 07:40:02 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.4.1-r1.ebuild,v 1.11 2005/07/25 15:19:25 caleb Exp $
 
 inherit kde flag-o-matic eutils multilib
-set-qtdir 3
 set-kdedir 3.4
 
 DESCRIPTION="KDE libraries needed by all kde programs"
@@ -18,7 +17,7 @@ IUSE="alsa arts cups doc jpeg2k kerberos openexr spell ssl tiff zeroconf"
 # kde.eclass has kdelibs in DEPEND, and we can't have that in here.
 # so we recreate the entire DEPEND from scratch.
 RDEPEND="arts? ( ~kde-base/arts-${PV} )
-	>=x11-libs/qt-3.3.3
+	$(qt_min_version 3.3.3)
 	app-arch/bzip2
 	>=dev-libs/libxslt-1.1.4
 	>=dev-libs/libxml2-2.6.6
diff --git a/kde-base/kdelibs/kdelibs-3.4.1-r2.ebuild b/kde-base/kdelibs/kdelibs-3.4.1-r2.ebuild
index af1bdfc47fee..9996f9e4afd5 100644
--- a/kde-base/kdelibs/kdelibs-3.4.1-r2.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.4.1-r2.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.4.1-r2.ebuild,v 1.1 2005/07/10 20:16:35 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.4.1-r2.ebuild,v 1.2 2005/07/25 15:19:25 caleb Exp $
 
 inherit kde flag-o-matic eutils multilib
-set-qtdir 3
 set-kdedir 3.4
 
 DESCRIPTION="KDE libraries needed by all kde programs"
@@ -18,7 +17,7 @@ IUSE="alsa arts cups doc jpeg2k kerberos openexr spell ssl tiff zeroconf"
 # kde.eclass has kdelibs in DEPEND, and we can't have that in here.
 # so we recreate the entire DEPEND from scratch.
 RDEPEND="arts? ( ~kde-base/arts-${PV} )
-	>=x11-libs/qt-3.3.3
+	$(qt_min_version 3.3.3)
 	app-arch/bzip2
 	>=dev-libs/libxslt-1.1.4
 	>=dev-libs/libxml2-2.6.6