USE flag qt->qt3/qt4 change

Package-Manager: portage-2.1.1_pre1-r1

4 files changed, 38 insertions, 24 deletions

diff --git a/app-crypt/pinentry/ChangeLog b/app-crypt/pinentry/ChangeLog
index 3cc540ec49c2..e63c3375132b 100644
--- a/app-crypt/pinentry/ChangeLog
+++ b/app-crypt/pinentry/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/pinentry
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.46 2006/06/05 10:38:30 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.47 2006/06/23 23:54:49 cardoe Exp $
+
+  23 Jun 2006; Doug Goldstein <cardoe@gentoo.org> pinentry-0.7.2-r2.ebuild,
+  pinentry-0.7.2-r3.ebuild:
+  USE flag qt->qt3/qt4 change
 
   05 Jun 2006; Guy Martin <gmsoft@gentoo.org> pinentry-0.7.2-r3.ebuild:
   Stable on hppa.
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 53a87146b775..4cd61371169c 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -1,20 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.7.2-libcap.patch 910 RMD160 21292ff64730826431d78d1f96a1909cb2c8997c SHA1 bc523a03e593f3bfa84437bdc603d683a21097f5 SHA256 4d142f836bcbcbfcf21412d891335e6d4351ebced3c5a699e493e5f6a4599701
 MD5 136f0f72a38f70865f50397f0a5a3412 files/0.7.2-libcap.patch 910
 RMD160 21292ff64730826431d78d1f96a1909cb2c8997c files/0.7.2-libcap.patch 910
 SHA256 4d142f836bcbcbfcf21412d891335e6d4351ebced3c5a699e493e5f6a4599701 files/0.7.2-libcap.patch 910
 DIST pinentry-0.7.2.tar.gz 398775 RMD160 db667256801545ef065d9d47cafe5e67137fa6ce SHA256 fbdb15ef6b05c5435745d1dde90cf4c82dd512c983d7a178cd25bdbe882dd668
-EBUILD pinentry-0.7.2-r2.ebuild 1869 RMD160 d50d7287679a99a5a050066a055e94766daa78ec SHA1 32864dacdf71b3bf482c9282de2438945c2c37df SHA256 48081544bd89860fe48df7c25937f0228cdb0a0196271cf6b012f7d5d4492985
-MD5 bd4879c422d925ecce8ef6dc7d3d9c11 pinentry-0.7.2-r2.ebuild 1869
-RMD160 d50d7287679a99a5a050066a055e94766daa78ec pinentry-0.7.2-r2.ebuild 1869
-SHA256 48081544bd89860fe48df7c25937f0228cdb0a0196271cf6b012f7d5d4492985 pinentry-0.7.2-r2.ebuild 1869
-EBUILD pinentry-0.7.2-r3.ebuild 2150 RMD160 39a8bc15b3a30f59ab4dc18bcfc19e3ca58a9a44 SHA1 00425cda3b70d1d4575b6b55d11b4e5a5836602b SHA256 37b97a24fc92bc3dfd1df4bc0c855bcd67a0b1a868562f12c17136ae18a44325
-MD5 1e81a6b93310b1eb273c505531f8302a pinentry-0.7.2-r3.ebuild 2150
-RMD160 39a8bc15b3a30f59ab4dc18bcfc19e3ca58a9a44 pinentry-0.7.2-r3.ebuild 2150
-SHA256 37b97a24fc92bc3dfd1df4bc0c855bcd67a0b1a868562f12c17136ae18a44325 pinentry-0.7.2-r3.ebuild 2150
-MISC ChangeLog 6498 RMD160 7205855dc92fc53b52baa17bce0523447abfd4aa SHA1 7be9bc4237ab9fe45dc6fcf33305ac3e0e674924 SHA256 8edfdeabf11b7016803b40d0ba272174d74c26c9a0a2135768901dc4d0afec35
-MD5 29ee9ef0c9b767abaeafb801ac42c6f1 ChangeLog 6498
-RMD160 7205855dc92fc53b52baa17bce0523447abfd4aa ChangeLog 6498
-SHA256 8edfdeabf11b7016803b40d0ba272174d74c26c9a0a2135768901dc4d0afec35 ChangeLog 6498
+EBUILD pinentry-0.7.2-r2.ebuild 1876 RMD160 6478405c90c40310bb7ac67814f7ee39c1e7433e SHA1 6a5cf2acc6774229dbf86682c3fbff8602fbf562 SHA256 9cff60c0ab8f9ae99294f5d968aa6be94abe57ae4fbc8086a2f6070979949325
+MD5 45b8b79fac1cb10e6d5e442549ae2bd5 pinentry-0.7.2-r2.ebuild 1876
+RMD160 6478405c90c40310bb7ac67814f7ee39c1e7433e pinentry-0.7.2-r2.ebuild 1876
+SHA256 9cff60c0ab8f9ae99294f5d968aa6be94abe57ae4fbc8086a2f6070979949325 pinentry-0.7.2-r2.ebuild 1876
+EBUILD pinentry-0.7.2-r3.ebuild 2154 RMD160 623868072709b0f181e727ec65621502ea342b88 SHA1 f347bf2a922a779e776b72554071d3c4a39f1d30 SHA256 4af253182f73c066d0371bccaca9e2fa047f2a2cd852b07c9135f4906b5de3ac
+MD5 d135c99ff043e31bc43acb382646e73c pinentry-0.7.2-r3.ebuild 2154
+RMD160 623868072709b0f181e727ec65621502ea342b88 pinentry-0.7.2-r3.ebuild 2154
+SHA256 4af253182f73c066d0371bccaca9e2fa047f2a2cd852b07c9135f4906b5de3ac pinentry-0.7.2-r3.ebuild 2154
+MISC ChangeLog 6633 RMD160 dd9b57272c41655b41f2cd2841c776f5030532ed SHA1 9c3ce7059d206a578b2f988bb7093d09bb6b40ae SHA256 69c564e9a944c779b35d4a11a783fca2abba6c0e74f44c11496995ab6d6731f9
+MD5 f4f7e573f23983b111b75e93bb1aaba9 ChangeLog 6633
+RMD160 dd9b57272c41655b41f2cd2841c776f5030532ed ChangeLog 6633
+SHA256 69c564e9a944c779b35d4a11a783fca2abba6c0e74f44c11496995ab6d6731f9 ChangeLog 6633
 MISC metadata.xml 275 RMD160 7aca4724ede81b0eaad9b4536f00a6a805727cef SHA1 b1a92ff0d6bfacd26122ac4dbd4725ef2b023f81 SHA256 1e9c7343efc06a4d4143421f4bf3740c30f71ed6ce5011231505e7e911f31548
 MD5 f5775272cd7e22ae38566107c416c1e4 metadata.xml 275
 RMD160 7aca4724ede81b0eaad9b4536f00a6a805727cef metadata.xml 275
@@ -25,3 +28,10 @@ SHA256 1c9c61d95b78cea1c7b5911f093d02947f015e0420a87eb24f0ea9e0a4b18c32 files/di
 MD5 354793966a5b246e80341cc5a226df68 files/digest-pinentry-0.7.2-r3 244
 RMD160 8f5e8a1f54f1213dbb5274acc96f8d3860ffa7a5 files/digest-pinentry-0.7.2-r3 244
 SHA256 1c9c61d95b78cea1c7b5911f093d02947f015e0420a87eb24f0ea9e0a4b18c32 files/digest-pinentry-0.7.2-r3 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEnH9ooeSe8B0zEfwRArhEAJ93iA+KRBIiIId5Ru2nnBg4Xs1C9gCfRPxR
+82zzywQ0ycXo2h4MajCABCM=
+=pFC/
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/pinentry/pinentry-0.7.2-r2.ebuild b/app-crypt/pinentry/pinentry-0.7.2-r2.ebuild
index 96066eccb1cd..95aa285bb07f 100644
--- a/app-crypt/pinentry/pinentry-0.7.2-r2.ebuild
+++ b/app-crypt/pinentry/pinentry-0.7.2-r2.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-crypt/pinentry/pinentry-0.7.2-r2.ebuild,v 1.9 2006/02/06 10:19:22 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.7.2-r2.ebuild,v 1.10 2006/06/23 23:54:49 cardoe Exp $
 
 inherit flag-o-matic qt3 multilib
 
@@ -11,17 +11,17 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
-IUSE="gtk ncurses qt"
+IUSE="gtk ncurses qt3"
 
 DEPEND="gtk? ( =x11-libs/gtk+-2* )
 	ncurses? ( sys-libs/ncurses )
-	qt? ( $(qt_min_version 3.3) )
-	!gtk? ( !qt? ( !ncurses? ( sys-libs/ncurses ) ) )"
+	qt3? ( $(qt_min_version 3.3) )
+	!gtk? ( !qt3? ( !ncurses? ( sys-libs/ncurses ) ) )"
 
 src_compile() {
 	local myconf=""
 
-	if ! ( use qt || use gtk || use ncurses )
+	if ! ( use qt3 || use gtk || use ncurses )
 	then
 		myconf="--enable-pinentry-curses --enable-fallback-curses"
 	fi
@@ -36,7 +36,7 @@ src_compile() {
 		--enable-maintainer-mode \
 		--disable-pinentry-gtk \
 		$(use_enable gtk pinentry-gtk2) \
-		$(use_enable qt pinentry-qt) \
+		$(use_enable qt3 pinentry-qt) \
 		$(use_enable ncurses pinentry-curses) \
 		$(use_enable ncurses fallback-curses) \
 		${myconf} \
diff --git a/app-crypt/pinentry/pinentry-0.7.2-r3.ebuild b/app-crypt/pinentry/pinentry-0.7.2-r3.ebuild
index f7e11e0ef332..0fe490af990f 100644
--- a/app-crypt/pinentry/pinentry-0.7.2-r3.ebuild
+++ b/app-crypt/pinentry/pinentry-0.7.2-r3.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-crypt/pinentry/pinentry-0.7.2-r3.ebuild,v 1.5 2006/06/05 10:38:30 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.7.2-r3.ebuild,v 1.6 2006/06/23 23:54:49 cardoe Exp $
 
 inherit flag-o-matic qt3 multilib eutils autotools
 
@@ -11,11 +11,11 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86"
-IUSE="gtk ncurses qt caps"
+IUSE="gtk ncurses qt3 caps"
 
 DEPEND="gtk? ( =x11-libs/gtk+-2* )
 	ncurses? ( sys-libs/ncurses )
-	qt? ( $(qt_min_version 3.3) )
+	qt3? ( $(qt_min_version 3.3) )
 	!gtk? ( !qt? ( !ncurses? ( sys-libs/ncurses ) ) )
 	caps? ( sys-libs/libcap )"
 
@@ -30,7 +30,7 @@ src_unpack() {
 src_compile() {
 	local myconf=""
 
-	if ! ( use qt || use gtk || use ncurses )
+	if ! ( use qt3 || use gtk || use ncurses )
 	then
 		myconf="--enable-pinentry-curses --enable-fallback-curses"
 	fi
@@ -45,7 +45,7 @@ src_compile() {
 		--enable-maintainer-mode \
 		--disable-pinentry-gtk \
 		$(use_enable gtk pinentry-gtk2) \
-		$(use_enable qt pinentry-qt) \
+		$(use_enable qt3 pinentry-qt) \
 		$(use_enable ncurses pinentry-curses) \
 		$(use_enable ncurses fallback-curses) \
 		$(use_with caps libcap) \