Fix qt checks, see bug #237928 and #244862.

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.27-gentoo-r1 x86_64

4 files changed, 15 insertions, 23 deletions

diff --git a/app-admin/keepassx/ChangeLog b/app-admin/keepassx/ChangeLog
index 2e72ce2ed8d5..7c31fb8dbf27 100644
--- a/app-admin/keepassx/ChangeLog
+++ b/app-admin/keepassx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/keepassx
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/ChangeLog,v 1.30 2008/10/07 06:14:50 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/ChangeLog,v 1.31 2008/11/07 18:55:42 tgurr Exp $
+
+  07 Nov 2008; Timo Gurr <tgurr@gentoo.org> keepassx-0.2.2-r1.ebuild,
+  keepassx-0.3.3.ebuild:
+  Fix qt checks, see bug #237928 and #244862.
 
   07 Oct 2008; Zac Medico <zmedico@gentoo.org> keepassx-0.3.3.ebuild:
   Bug #239671 - Fix the distcc workaround so it also works when ccache is
diff --git a/app-admin/keepassx/Manifest b/app-admin/keepassx/Manifest
index 5a4323ed7601..208b105206bb 100644
--- a/app-admin/keepassx/Manifest
+++ b/app-admin/keepassx/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX keepassx.desktop 281 RMD160 46d613482dc2aeb07e82f7d62b11e368457f1dec SHA1 7c37944fc0ea013579e266e70d3e78532a5a1a88 SHA256 1e550108aef3cdb614a391518f2b4e9de50f4611587ed103fe67ba5baf86b247
 DIST KeePassX-0.2.2.tar.gz 302656 RMD160 ba386cca105227120c0c50a500eee3b2b2bf24ec SHA1 bae4b984d32f2bb6220d17a135e3322c4df73fcb SHA256 ee588bd744195e394e7b618b8e0aeb25cbf37ca5b619b1c7e2176fd412b29cbd
 DIST KeePassX-0.3.3.tar.gz 536021 RMD160 6d3da31b6dd9882be264b5091f633be1955e97d0 SHA1 6c6405a1ea8e75c568688094bb576fae5c501b7e SHA256 954bce220c9581a32f68be2693c6cfb6b81f1b534c7d5f54f118bdc46674c37e
-EBUILD keepassx-0.2.2-r1.ebuild 1050 RMD160 2b7dd9f3a3a788cc99cb69a618174e4eb969ef11 SHA1 cedaff20fe256336f44cd6e92d83b43ca6669d01 SHA256 c463403d4d5d47ac0a84d31695a9ff60086f7e1bc84384f57791e9bc776f5e83
-EBUILD keepassx-0.3.3.ebuild 1122 RMD160 343b659f86efaf786a954ba44d5f274988326bf7 SHA1 f53d624a57e3798ea76508f1946360d1ca1a69f6 SHA256 f43b84ad6a2828ca5957ae4d170500389fd714378a8ac2b593e3b17c3e9aa481
-MISC ChangeLog 5670 RMD160 0deccff47de5a401e246c15a5c5267da26f61ae0 SHA1 14c9b498fc25284078372641d69ffe475ed9b9ed SHA256 72b15a91a4625d73ac25d8b980b0688f1b1a1fb32b370dcc07f5a0beaee952af
+EBUILD keepassx-0.2.2-r1.ebuild 1064 RMD160 80fd56121ade856a5aa1aeeebc94923bcd5e6b2b SHA1 8e3aa9a081b2ff6420971aa5d4a063368555d5fe SHA256 42433aadbc141f4ddcaba440d6df40e80fb20dd5d6b6e32113a01c0428ec1104
+EBUILD keepassx-0.3.3.ebuild 1123 RMD160 b7617aa11d4f2a51b2c48d65d7b82b499aaa3278 SHA1 fce46b0915ff82268f45935b7d3a7083d4396e1e SHA256 6d48ff86fa9673ee80537541ea5659e8365e848a724ebc319752fc8f5e049136
+MISC ChangeLog 5810 RMD160 9fafabc5d688d70eb00a6dc7d570417a39c799b4 SHA1 89033850425a073ea822c71ba6ef3e91d4e02fd2 SHA256 26bb567f5830117de1e615594b6134729063f7777447f5a0b3e6e2b28f0c96a3
 MISC metadata.xml 495 RMD160 90266b304a5c8425582869e66f36475590a9aeea SHA1 4711ce96501403b2061f630bda3c86d42a09794e SHA256 3280fffee9ad925df39ffbf8a0a90f9eb469669d45934d2921bcbc0b1ed9b8ef
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjq/mAACgkQ/ejvha5XGaMMEwCgobMpqB6Ox3UFGRUNt/RNYncq
-DfsAoOhf4TZ/BfLBM0KThV4U35dZaJuq
-=kq4z
------END PGP SIGNATURE-----
diff --git a/app-admin/keepassx/keepassx-0.2.2-r1.ebuild b/app-admin/keepassx/keepassx-0.2.2-r1.ebuild
index 7e374a3c0bbd..07b200781816 100644
--- a/app-admin/keepassx/keepassx-0.2.2-r1.ebuild
+++ b/app-admin/keepassx/keepassx-0.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/keepassx-0.2.2-r1.ebuild,v 1.6 2008/01/14 19:03:33 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/keepassx-0.2.2-r1.ebuild,v 1.7 2008/11/07 18:55:42 tgurr Exp $
 
 inherit eutils
 
@@ -18,9 +18,9 @@ RDEPEND="${DEPEND}"
 pkg_setup() {
 	if ! built_with_use --missing true x11-libs/qt qt3support png; then
 		eerror
-		eerror "You need to rebuild x11-libs/qt with USE=qt3support enabled"
+		eerror "You need to rebuild x11-libs/qt with USE=\"qt3support png\" enabled"
 		eerror
-		die "please rebuild x11-libs/qt with USE=qt3support"
+		die "please rebuild x11-libs/qt with USE=\"qt3support png\""
 	fi
 }
 
diff --git a/app-admin/keepassx/keepassx-0.3.3.ebuild b/app-admin/keepassx/keepassx-0.3.3.ebuild
index b593eb9df215..e3648d166983 100644
--- a/app-admin/keepassx/keepassx-0.3.3.ebuild
+++ b/app-admin/keepassx/keepassx-0.3.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/keepassx-0.3.3.ebuild,v 1.3 2008/10/07 06:14:50 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/keepassx-0.3.3.ebuild,v 1.4 2008/11/07 18:55:42 tgurr Exp $
 
-EAPI="1"
+EAPI="2"
 
 inherit eutils qt4
 
@@ -17,11 +17,9 @@ IUSE="debug"
 DEPEND="|| ( ( x11-libs/qt-core:4
 			x11-libs/qt-gui:4
 			x11-libs/qt-xmlpatterns:4 )
-		>=x11-libs/qt-4.3:4 )"
+		( =x11-libs/qt-4.3*:4[png,zlib] ) )"
 RDEPEND="${DEPEND}"
 
-QT4_BUILT_WITH_USE_CHECK="zlib"
-
 src_compile() {
 	cd "${S}/src"
 	lrelease src.pro || die "lrelease failed"
@@ -35,5 +33,5 @@ src_compile() {
 
 src_install(){
 	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc changelog todo
+	dodoc changelog todo || die "dodoc failed"
 }