Drop qt3 support

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

5 files changed, 37 insertions, 46 deletions

diff --git a/app-crypt/pinentry/ChangeLog b/app-crypt/pinentry/ChangeLog
index d5f62d2b668d..2bef1f0e02de 100644
--- a/app-crypt/pinentry/ChangeLog
+++ b/app-crypt/pinentry/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/pinentry
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.96 2009/07/15 21:04:10 arfrever Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.97 2010/01/02 21:46:50 yngwin Exp $
+
+  02 Jan 2010; Ben de Groot <yngwin@gentoo.org> pinentry-0.7.5.ebuild,
+  pinentry-0.7.5-r1.ebuild, pinentry-0.7.6.ebuild:
+  Drop qt3 support
 
   15 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   pinentry-0.7.6.ebuild:
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 16ba15a5b73a..5ea333b1dadf 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -2,8 +2,8 @@ AUX pinentry-0.7.5-grab.patch 536 RMD160 66f86ff0c8c208ec62de1dea2b2c3edeca41d0f
 AUX pinentry-gmem.patch 880 RMD160 82c41513e47be43a801ec0d2e6cf89857b5e373f SHA1 34abb7caa0aecbd4d8f592695c30e40311425688 SHA256 484dafa00a7fe6e04380d32f3a468082d68923c11f8e3fb007e09018b4b617f5
 DIST pinentry-0.7.5.tar.gz 422801 RMD160 4ed9d06981b647f9fd39b9d30651a36307869c2d SHA1 6699a1ff94c649e8905199d480c6412cc43bad3d SHA256 cb269ac058793b2df343a12a65e3402abc4b68503e105b12e4ca903d8d8e3172
 DIST pinentry-0.7.6.tar.gz 475101 RMD160 6e69eee88b5cbb919ced79971cd4794f5e659023 SHA1 0c525ce81e5589bc9a4f2eb72705bed2b3e9a8b9 SHA256 14670c18f4a042ffcbd7a937aa3f15de392816c56b472588383d8378f65b42ab
-EBUILD pinentry-0.7.5-r1.ebuild 2585 RMD160 8b2ffa6e650a29a6d764bade182973f8d063954f SHA1 584e27493300e9633f9dcf77d2f68af82d23f908 SHA256 d6a4cb6d6963900a7fa6147a9670814f071d08ac49be922ae038b3d99a2744a0
-EBUILD pinentry-0.7.5.ebuild 2135 RMD160 5d7f62ddfb798c37d78679dd5188b4280e39c905 SHA1 02807101b19e9bd66f53751cd8ab5dfebe818d87 SHA256 f17d67266771bd12fa532fe4a58949b61545ff0627c62e2ce293266e4bf227bf
-EBUILD pinentry-0.7.6.ebuild 2801 RMD160 d1916d0d93cddc6cefb34436b5cad07133e1f92d SHA1 e4e34a679200f405daea23887fd8eac9c2531337 SHA256 4e16f393554701e6bb2b534bbef92bfb69e1e554ad13acab068ea9c10d2ca7a4
-MISC ChangeLog 12884 RMD160 bc9bbaf9714fb39eadd0c072cdf3a40917e82734 SHA1 c3f1088636e98f617b1abcb4b5c262bf97413fac SHA256 e369123b50d1f4c4b750e5bc4b7cd25326e0975c1cd6803804d47963970734a1
+EBUILD pinentry-0.7.5-r1.ebuild 2390 RMD160 730747a0c9ab73215be997a763280d3105e684d6 SHA1 23b6815ed2d97958534e142ec8b81ea884273ecd SHA256 1dd5feb0db92c0492e5375a9cd87373b0d17bf9b33a84e4b6a34d9ad8451f8b9
+EBUILD pinentry-0.7.5.ebuild 1965 RMD160 c4a3b0d9f7d1d1f4838f36108d6ba812519a5239 SHA1 3886110c38eede87e81440d8231913a766401c51 SHA256 cc7dcc4ab69d7cb53c8d62d640bb9f9fc4d590ddfa5c23fdc9ea20455358c17e
+EBUILD pinentry-0.7.6.ebuild 2721 RMD160 be07cf15faa193752e17f82bbcac5482c4dd7722 SHA1 8e0e1c995392c7055075845378074be5103cc132 SHA256 c2e0a011e15c54d240eff575054d05414e3f35c850ae7f85e013b844116bd826
+MISC ChangeLog 13024 RMD160 93a52b8302666fd883784a6abababe54a2c9a02b SHA1 020a7ef65d3bb37d4a410c1ba35133fad728c90f SHA256 926c9dcb4a5f104a9d4cbedf329893cd5e5aed3603a28c843771e388fc868730
 MISC metadata.xml 275 RMD160 7aca4724ede81b0eaad9b4536f00a6a805727cef SHA1 b1a92ff0d6bfacd26122ac4dbd4725ef2b023f81 SHA256 1e9c7343efc06a4d4143421f4bf3740c30f71ed6ce5011231505e7e911f31548
diff --git a/app-crypt/pinentry/pinentry-0.7.5-r1.ebuild b/app-crypt/pinentry/pinentry-0.7.5-r1.ebuild
index 239b21866303..7fa83d9051af 100644
--- a/app-crypt/pinentry/pinentry-0.7.5-r1.ebuild
+++ b/app-crypt/pinentry/pinentry-0.7.5-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.7.5-r1.ebuild,v 1.2 2009/05/02 20:33:05 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.7.5-r1.ebuild,v 1.3 2010/01/02 21:46:50 yngwin Exp $
 
 EAPI="1"
 
-inherit qt3 multilib eutils flag-o-matic
+inherit multilib eutils flag-o-matic
 
 DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
 HOMEPAGE="http://www.gnupg.org/aegypten/"
@@ -13,14 +13,13 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="gtk ncurses qt3 caps static"
+IUSE="gtk ncurses caps static"
 
 DEPEND="static? ( sys-libs/ncurses )
 	!static? (
 		gtk? ( x11-libs/gtk+:2 )
 		ncurses? ( sys-libs/ncurses )
-		qt3? ( x11-libs/qt:3 )
-		!gtk? ( !qt3? ( !ncurses? ( sys-libs/ncurses ) ) )
+		!gtk? ( !ncurses? ( sys-libs/ncurses ) )
 	)
 	caps? ( sys-libs/libcap )"
 RDEPEND="${DEPEND}"
@@ -28,10 +27,9 @@ RDEPEND="${DEPEND}"
 pkg_setup() {
 	use static && append-ldflags -static
 
-	if use static && ( use gtk || use qt3 )
-	then
+	if use static && use gtk; then
 		ewarn
-		ewarn "The static USE flag is only supported with the ncurses USE flags, disabling the gtk and qt3 USE flags."
+		ewarn "The static USE flag is only supported with the ncurses USE flags, disabling the gtk USE flag."
 		ewarn
 	fi
 }
@@ -47,7 +45,7 @@ src_unpack() {
 src_compile() {
 	local myconf=""
 
-	if ! ( use qt3 || use gtk || use ncurses )
+	if ! ( use gtk || use ncurses )
 	then
 		myconf="--enable-pinentry-curses --enable-fallback-curses"
 	elif use static
@@ -55,20 +53,16 @@ src_compile() {
 		myconf="--enable-pinentry-curses --enable-fallback-curses --disable-pinentry-gtk2 --disable-pinentry-qt"
 	fi
 
-	# Issues finding qt on multilib systems
-	export QTLIB="${QTDIR}/$(get_libdir)"
-
 	econf \
 		--disable-dependency-tracking \
 		--enable-maintainer-mode \
 		--disable-pinentry-gtk \
 		$(use_enable gtk pinentry-gtk2) \
-		$(use_enable qt3 pinentry-qt) \
+		--disable-pinentry-qt \
 		$(use_enable ncurses pinentry-curses) \
 		$(use_enable ncurses fallback-curses) \
 		$(use_with caps libcap) \
-		${myconf} \
-		|| die "econf failed"
+		${myconf}
 	emake || die "emake failed"
 }
 
diff --git a/app-crypt/pinentry/pinentry-0.7.5.ebuild b/app-crypt/pinentry/pinentry-0.7.5.ebuild
index 6e5f0f6e44b7..d21eef1544b0 100644
--- a/app-crypt/pinentry/pinentry-0.7.5.ebuild
+++ b/app-crypt/pinentry/pinentry-0.7.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.7.5.ebuild,v 1.11 2009/05/02 20:34:01 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.7.5.ebuild,v 1.12 2010/01/02 21:46:50 yngwin Exp $
 
 EAPI=1
 
-inherit qt3 multilib eutils
+inherit multilib eutils
 
 DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
 HOMEPAGE="http://www.gnupg.org/aegypten/"
@@ -13,12 +13,11 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="gtk ncurses qt3 caps"
+IUSE="gtk ncurses caps"
 
 DEPEND="gtk? ( x11-libs/gtk+:2 )
 	ncurses? ( sys-libs/ncurses )
-	qt3? ( x11-libs/qt:3 )
-	!gtk? ( !qt3? ( !ncurses? ( sys-libs/ncurses ) ) )
+	!gtk? ( !ncurses? ( sys-libs/ncurses ) )
 	caps? ( sys-libs/libcap )"
 RDEPEND="${DEPEND}"
 
@@ -33,25 +32,21 @@ src_unpack() {
 src_compile() {
 	local myconf=""
 
-	if ! ( use qt3 || use gtk || use ncurses )
+	if ! ( use gtk || use ncurses )
 	then
 		myconf="--enable-pinentry-curses --enable-fallback-curses"
 	fi
 
-	# Issues finding qt on multilib systems
-	export QTLIB="${QTDIR}/$(get_libdir)"
-
 	econf \
 		--disable-dependency-tracking \
 		--enable-maintainer-mode \
 		--disable-pinentry-gtk \
 		$(use_enable gtk pinentry-gtk2) \
-		$(use_enable qt3 pinentry-qt) \
+		--disable-pinentry-qt \
 		$(use_enable ncurses pinentry-curses) \
 		$(use_enable ncurses fallback-curses) \
 		$(use_with caps libcap) \
-		${myconf} \
-		|| die "econf failed"
+		${myconf}
 	emake || die "emake failed"
 }
 
diff --git a/app-crypt/pinentry/pinentry-0.7.6.ebuild b/app-crypt/pinentry/pinentry-0.7.6.ebuild
index 922cbb570a81..a5cc8de98e47 100644
--- a/app-crypt/pinentry/pinentry-0.7.6.ebuild
+++ b/app-crypt/pinentry/pinentry-0.7.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.7.6.ebuild,v 1.3 2009/07/15 21:04:10 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.7.6.ebuild,v 1.4 2010/01/02 21:46:50 yngwin Exp $
 
 EAPI="1"
 
-inherit qt3 multilib eutils flag-o-matic
+inherit multilib eutils flag-o-matic
 
 DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
 HOMEPAGE="http://www.gnupg.org/aegypten/"
@@ -13,15 +13,14 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="gtk ncurses qt3 qt4 caps static"
+IUSE="gtk ncurses qt4 caps static"
 
 DEPEND="static? ( sys-libs/ncurses )
 	!static? (
 		gtk? ( x11-libs/gtk+:2 )
 		ncurses? ( sys-libs/ncurses )
-		qt3? ( x11-libs/qt:3 )
 		qt4? ( >=x11-libs/qt-gui-4.4.1 )
-		!gtk? ( !qt4? ( !qt3? ( !ncurses? ( sys-libs/ncurses ) ) ) )
+		!gtk? ( !qt4? ( !ncurses? ( sys-libs/ncurses ) ) )
 	)
 	caps? ( sys-libs/libcap )"
 RDEPEND="${DEPEND}"
@@ -29,10 +28,9 @@ RDEPEND="${DEPEND}"
 pkg_setup() {
 	use static && append-ldflags -static
 
-	if use static && { use gtk || use qt3 || use qt4; }
-	then
+	if use static && { use gtk || use qt4; }; then
 		ewarn
-		ewarn "The static USE flag is only supported with the ncurses USE flags, disabling the gtk, qt3 and qt4 USE flags."
+		ewarn "The static USE flag is only supported with the ncurses USE flags, disabling the gtk and qt4 USE flags."
 		ewarn
 	fi
 }
@@ -54,7 +52,7 @@ src_unpack() {
 src_compile() {
 	local myconf=""
 
-	if ! { use qt3 || use qt4 || use gtk || use ncurses; }
+	if ! { use qt4 || use gtk || use ncurses; }
 	then
 		myconf="--enable-pinentry-curses --enable-fallback-curses"
 	elif use static
@@ -70,7 +68,7 @@ src_compile() {
 		--enable-maintainer-mode \
 		--disable-pinentry-gtk \
 		$(use_enable gtk pinentry-gtk2) \
-		$(use_enable qt3 pinentry-qt) \
+		--disable-pinentry-qt \
 		$(use_enable ncurses pinentry-curses) \
 		$(use_enable ncurses fallback-curses) \
 		$(use_enable qt4 pinentry-qt4) \