USE flag qt->qt3/qt4 change

Package-Manager: portage-2.1.1_pre1-r1

5 files changed, 25 insertions, 21 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index f281a29f1ae4..6387fca4a5d4 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/uim
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.133 2006/06/17 13:34:00 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.134 2006/06/24 00:07:28 cardoe Exp $
+
+  24 Jun 2006; Doug Goldstein <cardoe@gentoo.org> uim-0.5.0.1.ebuild,
+  uim-1.0.0.ebuild, uim-1.0.1.ebuild, uim-1.1.0.ebuild:
+  USE flag qt->qt3/qt4 change
 
 *uim-1.1.0 (17 Jun 2006)
 
diff --git a/app-i18n/uim/uim-0.5.0.1.ebuild b/app-i18n/uim/uim-0.5.0.1.ebuild
index d112ea5b1492..0556e87dc68e 100644
--- a/app-i18n/uim/uim-0.5.0.1.ebuild
+++ b/app-i18n/uim/uim-0.5.0.1.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/app-i18n/uim/uim-0.5.0.1.ebuild,v 1.10 2006/03/29 12:29:23 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.5.0.1.ebuild,v 1.11 2006/06/24 00:07:28 cardoe Exp $
 
 inherit eutils kde-functions flag-o-matic multilib
 
@@ -14,7 +14,7 @@ SRC_URI="http://uim.freedesktop.org/releases/${MY_P}.tar.gz"
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="gtk qt immqt immqt-bc nls X m17n-lib canna"
+IUSE="gtk qt3 immqt immqt-bc nls X m17n-lib canna"
 #IUSE="${IUSE} scim"
 
 RDEPEND="
@@ -34,7 +34,7 @@ RDEPEND="
 	canna? ( app-i18n/canna )
 	immqt? ( $(qt_min_version 3.3.4) )
 	immqt-bc? ( $(qt_min_version 3.3.4) )
-	qt? ( $(qt_min_version 3.3.4) )
+	qt3? ( $(qt_min_version 3.3.4) )
 	!<app-i18n/prime-0.9.4"
 
 DEPEND="${RDEPEND}
@@ -65,7 +65,7 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	use qt && set-qtdir 3
+	use qt3 && set-qtdir 3
 	if use immqt || use immqt-bc ; then
 		myconf="${myconf} --with-qt-immodule"
 		export CPPFLAGS="${CPPFLAGS} -DQT_THREAD_SUPPORT"
@@ -77,7 +77,7 @@ src_compile() {
 		$(use_with gtk gtk2)
 		$(use_with m17n-lib m17nlib)
 		$(use_with canna)
-		$(use_with qt)"
+		$(use_with qt3 qt)"
 
 	autoreconf
 	libtoolize --copy --force
diff --git a/app-i18n/uim/uim-1.0.0.ebuild b/app-i18n/uim/uim-1.0.0.ebuild
index cc4861fb6edf..b7d5a0cfe722 100644
--- a/app-i18n/uim/uim-1.0.0.ebuild
+++ b/app-i18n/uim/uim-1.0.0.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/app-i18n/uim/uim-1.0.0.ebuild,v 1.3 2006/03/29 12:29:23 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.0.0.ebuild,v 1.4 2006/06/24 00:07:28 cardoe Exp $
 
 inherit eutils kde-functions flag-o-matic multilib elisp-common
 
@@ -14,7 +14,7 @@ SRC_URI="http://uim.freedesktop.org/releases/${MY_P}.tar.gz"
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gtk qt immqt immqt-bc nls X m17n-lib canna emacs"
+IUSE="gtk qt3 immqt immqt-bc nls X m17n-lib canna emacs"
 
 RDEPEND="
 	X? ( || ( (
@@ -33,7 +33,7 @@ RDEPEND="
 	canna? ( app-i18n/canna )
 	immqt? ( $(qt_min_version 3.3.4) )
 	immqt-bc? ( $(qt_min_version 3.3.4) )
-	qt? ( $(qt_min_version 3.3.4) )
+	qt3? ( $(qt_min_version 3.3.4) )
 	emacs? ( virtual/emacs )
 	!<app-i18n/prime-0.9.4"
 
@@ -67,7 +67,7 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	use qt && set-qtdir 3
+	use qt3 && set-qtdir 3
 	if use immqt || use immqt-bc ; then
 		myconf="${myconf} --with-qt-immodule"
 		export CPPFLAGS="${CPPFLAGS} -DQT_THREAD_SUPPORT"
@@ -79,7 +79,7 @@ src_compile() {
 		$(use_with gtk gtk2)
 		$(use_with m17n-lib m17nlib)
 		$(use_with canna)
-		$(use_with qt)
+		$(use_with qt3 qt)
 		$(use_enable emacs)"
 
 	autoreconf
diff --git a/app-i18n/uim/uim-1.0.1.ebuild b/app-i18n/uim/uim-1.0.1.ebuild
index 53ca3d506a85..d465bf1e0a87 100644
--- a/app-i18n/uim/uim-1.0.1.ebuild
+++ b/app-i18n/uim/uim-1.0.1.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/app-i18n/uim/uim-1.0.1.ebuild,v 1.2 2006/03/29 12:29:23 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.0.1.ebuild,v 1.3 2006/06/24 00:07:28 cardoe Exp $
 
 inherit eutils kde-functions flag-o-matic multilib elisp-common
 
@@ -14,7 +14,7 @@ SRC_URI="http://uim.freedesktop.org/releases/${MY_P}.tar.gz"
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gtk qt immqt immqt-bc nls X m17n-lib canna emacs"
+IUSE="gtk qt3 immqt immqt-bc nls X m17n-lib canna emacs"
 
 RDEPEND="
 	X? ( || ( (
@@ -33,7 +33,7 @@ RDEPEND="
 	canna? ( app-i18n/canna )
 	immqt? ( $(qt_min_version 3.3.4) )
 	immqt-bc? ( $(qt_min_version 3.3.4) )
-	qt? ( $(qt_min_version 3.3.4) )
+	qt3? ( $(qt_min_version 3.3.4) )
 	emacs? ( virtual/emacs )
 	!<app-i18n/prime-0.9.4"
 
@@ -67,7 +67,7 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	use qt && set-qtdir 3
+	use qt3 && set-qtdir 3
 	if use immqt || use immqt-bc ; then
 		myconf="${myconf} --with-qt-immodule"
 		export CPPFLAGS="${CPPFLAGS} -DQT_THREAD_SUPPORT"
@@ -79,7 +79,7 @@ src_compile() {
 		$(use_with gtk gtk2)
 		$(use_with m17n-lib m17nlib)
 		$(use_with canna)
-		$(use_with qt)
+		$(use_with qt3 qt)
 		$(use_enable emacs)"
 
 	autoreconf
diff --git a/app-i18n/uim/uim-1.1.0.ebuild b/app-i18n/uim/uim-1.1.0.ebuild
index 89ae05c8227c..2d870708106e 100644
--- a/app-i18n/uim/uim-1.1.0.ebuild
+++ b/app-i18n/uim/uim-1.1.0.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/app-i18n/uim/uim-1.1.0.ebuild,v 1.1 2006/06/17 13:34:00 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.1.0.ebuild,v 1.2 2006/06/24 00:07:28 cardoe Exp $
 
 inherit eutils kde-functions flag-o-matic multilib elisp-common
 
@@ -14,7 +14,7 @@ SRC_URI="http://uim.freedesktop.org/releases/${MY_P}.tar.gz"
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gtk qt immqt immqt-bc nls X m17n-lib canna emacs"
+IUSE="gtk qt3 immqt immqt-bc nls X m17n-lib canna emacs"
 
 RDEPEND="
 	X? ( || ( (
@@ -33,7 +33,7 @@ RDEPEND="
 	canna? ( app-i18n/canna )
 	immqt? ( $(qt_min_version 3.3.4) )
 	immqt-bc? ( $(qt_min_version 3.3.4) )
-	qt? ( $(qt_min_version 3.3.4) )
+	qt3? ( $(qt_min_version 3.3.4) )
 	emacs? ( virtual/emacs )
 	!<app-i18n/prime-0.9.4"
 
@@ -67,7 +67,7 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	use qt && set-qtdir 3
+	use qt3 && set-qtdir 3
 	if use immqt || use immqt-bc ; then
 		myconf="${myconf} --with-qt-immodule"
 		export CPPFLAGS="${CPPFLAGS} -DQT_THREAD_SUPPORT"
@@ -79,7 +79,7 @@ src_compile() {
 		$(use_with gtk gtk2)
 		$(use_with m17n-lib m17nlib)
 		$(use_with canna)
-		$(use_with qt)
+		$(use_with qt3 qt)
 		$(use_enable emacs)"
 
 	autoreconf