USE flag change qt->qt3/qt4 bug #137785

(Portage version: 2.1.1_pre1-r1)

4 files changed, 15 insertions, 11 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 05769b0c4232..618d0cdb69ea 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.116 2006/06/20 14:54:42 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.117 2006/06/24 02:02:21 cardoe Exp $
+
+  23 Jun 2006; <dougg@gentoo.org> -dbus-0.50-r1.ebuild,
+  -dbus-0.60-r3.ebuild, dbus-0.60-r4.ebuild, dbus-0.61-r1.ebuild:
+  removing old revs. Changed qt USE flag to qt3/qt4 in all instances
 
   20 Jun 2006; <dougg@gentoo.org> dbus-0.62.ebuild:
   Unfortunately genstef was wrong and didn't speak to anyone before making the
diff --git a/sys-apps/dbus/dbus-0.60-r4.ebuild b/sys-apps/dbus/dbus-0.60-r4.ebuild
index 3e26fc93407e..8fadee54e024 100644
--- a/sys-apps/dbus/dbus-0.60-r4.ebuild
+++ b/sys-apps/dbus/dbus-0.60-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.60-r4.ebuild,v 1.14 2006/04/09 16:56:28 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.60-r4.ebuild,v 1.15 2006/06/24 02:02:21 cardoe Exp $
 
 inherit eutils mono python multilib debug qt3 autotools toolchain-funcs
 
@@ -11,14 +11,14 @@ SRC_URI="http://dbus.freedesktop.org/releases/${P}.tar.gz"
 LICENSE="|| ( GPL-2 AFL-2.1 )"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="doc gcj gtk mono python qt selinux X xml"
+IUSE="doc gcj gtk mono python qt3 selinux X xml"
 
 RDEPEND=">=dev-libs/glib-2.6
 	X? ( || ( ( x11-libs/libXt x11-libs/libX11 ) virtual/x11 ) )
 	gtk? ( >=x11-libs/gtk+-2.6 )
 	mono? ( >=dev-lang/mono-0.95 )
 	python? ( >=dev-lang/python-2.4 >=dev-python/pyrex-0.9.3-r2 )
-	qt? ( $(qt_min_version 3.3) )
+	qt3? ( $(qt_min_version 3.3) )
 	selinux? ( sys-libs/libselinux )
 	xml? ( >=dev-libs/libxml2-2.6.21 )
 	!xml? ( dev-libs/expat )"
@@ -73,7 +73,7 @@ src_compile() {
 	# Only enable mono-docs if both mono and doc is defined
 	use mono && myconf="${myconf} $(use_enable doc mono-docs)"
 
-	if use qt; then
+	if use qt3; then
 		myconf="${myconf} --enable-qt3=${QTDIR} QT_MOC=/usr/bin/moc QT3_MOC=${QTDIR}/bin/moc"
 	else
 		myconf="${myconf} --disable-qt --disable-qt3"
diff --git a/sys-apps/dbus/dbus-0.61-r1.ebuild b/sys-apps/dbus/dbus-0.61-r1.ebuild
index 2c3f539ca008..8271a9317362 100644
--- a/sys-apps/dbus/dbus-0.61-r1.ebuild
+++ b/sys-apps/dbus/dbus-0.61-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.61-r1.ebuild,v 1.1 2006/03/27 03:40:54 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.61-r1.ebuild,v 1.2 2006/06/24 02:02:21 cardoe Exp $
 
 inherit eutils mono python multilib debug qt3 autotools
 
@@ -11,14 +11,14 @@ SRC_URI="http://dbus.freedesktop.org/releases/${P}.tar.gz"
 SLOT="0"
 LICENSE="|| ( GPL-2 AFL-2.1 )"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="doc gtk mono python qt selinux X"
+IUSE="doc gtk mono python qt3 selinux X"
 
 RDEPEND=">=dev-libs/glib-2.6
 	X? ( || ( ( x11-libs/libXt x11-libs/libX11 ) virtual/x11 ) )
 	gtk? ( >=x11-libs/gtk+-2.6 )
 	mono? ( >=dev-lang/mono-0.95 )
 	python? ( >=dev-lang/python-2.4 >=dev-python/pyrex-0.9.3-r2 )
-	qt? ( $(qt_min_version 3.3) )
+	qt3? ( $(qt_min_version 3.3) )
 	selinux? ( sys-libs/libselinux )
 	>=dev-libs/libxml2-2.6.21"
 	# expat code now sucks.. libxml2 is the default
@@ -67,7 +67,7 @@ src_compile() {
 	# Only enable mono-docs if both mono and doc is defined
 	use mono && myconf="${myconf} $(use_enable doc mono-docs)"
 
-	if use qt; then
+	if use qt3; then
 		myconf="${myconf} --enable-qt3=${QTDIR} --with-qt-moc=/usr/bin/moc --with-qt3-moc=${QTDIR}/bin/moc --disable-qt"
 	else
 		myconf="${myconf} --disable-qt --disable-qt3 --without-qt-moc --without-qt3-moc"
diff --git a/sys-apps/dbus/dbus-0.62.ebuild b/sys-apps/dbus/dbus-0.62.ebuild
index c4a44027face..664112447d28 100644
--- a/sys-apps/dbus/dbus-0.62.ebuild
+++ b/sys-apps/dbus/dbus-0.62.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.62.ebuild,v 1.4 2006/06/20 14:54:42 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.62.ebuild,v 1.5 2006/06/24 02:02:21 cardoe Exp $
 
 inherit eutils mono python multilib debug qt3 autotools
 
@@ -10,7 +10,7 @@ SRC_URI="http://dbus.freedesktop.org/releases/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="|| ( GPL-2 AFL-2.1 )"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64  ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64  ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="doc gtk mono python qt3 qt4 selinux X"
 
 RDEPEND=">=dev-libs/glib-2.6