check x11-libs/qt-4.2.2 and beyond for USE=qt3support, see bug 158149, reported by...

Package-Manager: portage-2.1.1-r2

diff --git a/app-admin/keepassx/ChangeLog b/app-admin/keepassx/ChangeLog
index 184f400cf381d513f3bbf8b69dccb19dbcb603d2..425ba807545e461b78ccf4f07115054bfc24015c 100644 (file)
--- a/app-admin/keepassx/ChangeLog
+++ b/app-admin/keepassx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/keepassx
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/ChangeLog,v 1.4 2006/12/10 19:58:28 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/ChangeLog,v 1.5 2006/12/16 10:55:43 opfer Exp $
+
+  16 Dec 2006; Christian Faulhammer <opfer@gentoo.org>
+  keepassx-0.2.2.ebuild:
+  check x11-libs/qt-4.2.2 and beyond for USE=qt3support, see bug 158149,
+  reported by Greg Wilson <drakos7@gmail.com>
 
   10 Dec 2006; Peter Weller <welp@gentoo.org> keepassx-0.2.2.ebuild:
   Added ~amd64 keyword wrt bug #153523

diff --git a/app-admin/keepassx/Manifest b/app-admin/keepassx/Manifest
index ed6abb2eede41695cea641a93a0cc004657f3d82..191a938239f71a751b7627dee6bfb35fbc975011 100644 (file)
--- a/app-admin/keepassx/Manifest
+++ b/app-admin/keepassx/Manifest
@@ -1,16 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX keepassx.desktop 192 RMD160 fa3f17247009dd9c52ae01cca48fe46a40a69eb8 SHA1 431da8747daf599956d832aed6da4ec347eaaa34 SHA256 b9c99bcc56b45247e38ec8fbbabf8b944ca157f4eb7cd0abd96509e658a7b72b
 MD5 0056d74f87219bc351b6e1a98b11d386 files/keepassx.desktop 192
 RMD160 fa3f17247009dd9c52ae01cca48fe46a40a69eb8 files/keepassx.desktop 192
 SHA256 b9c99bcc56b45247e38ec8fbbabf8b944ca157f4eb7cd0abd96509e658a7b72b files/keepassx.desktop 192
 DIST KeePassX-0.2.2.tar.gz 302656 RMD160 ba386cca105227120c0c50a500eee3b2b2bf24ec SHA1 bae4b984d32f2bb6220d17a135e3322c4df73fcb SHA256 ee588bd744195e394e7b618b8e0aeb25cbf37ca5b619b1c7e2176fd412b29cbd
-EBUILD keepassx-0.2.2.ebuild 731 RMD160 d7a36a30fced970c05b3155821d2ac6226d676df SHA1 c90220ea32d8919e30a860e817beeb1960a1c710 SHA256 ad0ef5c1cd8bd522c135911d2d533913f2402c52675d0f1f6eb0643dccb24ab7
-MD5 2898fb9c77b7053797b610764adb9655 keepassx-0.2.2.ebuild 731
-RMD160 d7a36a30fced970c05b3155821d2ac6226d676df keepassx-0.2.2.ebuild 731
-SHA256 ad0ef5c1cd8bd522c135911d2d533913f2402c52675d0f1f6eb0643dccb24ab7 keepassx-0.2.2.ebuild 731
-MISC ChangeLog 1116 RMD160 023630785d3c5e7829bef46050a06fb04db90f02 SHA1 cdbd79dc1851ccaf727c9afbff46e6ae17ef20e2 SHA256 8242a7777a3be5a8f02113dd0bd9798150a3c9d4f78cb36f950357b169d7da81
-MD5 a1c6ae1426f959eece6cac76762ae859 ChangeLog 1116
-RMD160 023630785d3c5e7829bef46050a06fb04db90f02 ChangeLog 1116
-SHA256 8242a7777a3be5a8f02113dd0bd9798150a3c9d4f78cb36f950357b169d7da81 ChangeLog 1116
+EBUILD keepassx-0.2.2.ebuild 955 RMD160 431640f6b4fb10d6be21a362e7f0f5a864f35273 SHA1 79dbed5e5a49f8d1f2bf977f908a9b2c2a8b5ad6 SHA256 3900346fec8e4b2b4915add93272c7942fe0963d9302b8524b1d159306544779
+MD5 c475c3087fc972902355c08d02bfdf8b keepassx-0.2.2.ebuild 955
+RMD160 431640f6b4fb10d6be21a362e7f0f5a864f35273 keepassx-0.2.2.ebuild 955
+SHA256 3900346fec8e4b2b4915add93272c7942fe0963d9302b8524b1d159306544779 keepassx-0.2.2.ebuild 955
+MISC ChangeLog 1317 RMD160 34f496b14cd06e3e0ac7f4f8849c7da5be19c470 SHA1 cfe01fc921ca461fe7a3ae8b8d0b106ec7cd8c83 SHA256 dfef3067f4a24e0133596c729169960a7b7cc64553e2092139aabdd5b609610b
+MD5 8032e070869e9248e36017c0030d0544 ChangeLog 1317
+RMD160 34f496b14cd06e3e0ac7f4f8849c7da5be19c470 ChangeLog 1317
+SHA256 dfef3067f4a24e0133596c729169960a7b7cc64553e2092139aabdd5b609610b ChangeLog 1317
 MISC metadata.xml 505 RMD160 aa11034c8925303264818a4be9ae226c5cb47cfd SHA1 bb91e173269a532d2f85a2c7772cf221a6306dc3 SHA256 f7fb98797c71f4a4b3186f8d6526a1db0c6c57107bebafdcb933d1cd4d104fed
 MD5 5e132b8e1a0ed8e43e12174365b32363 metadata.xml 505
 RMD160 aa11034c8925303264818a4be9ae226c5cb47cfd metadata.xml 505
@@ -18,3 +21,10 @@ SHA256 f7fb98797c71f4a4b3186f8d6526a1db0c6c57107bebafdcb933d1cd4d104fed metadata
 MD5 c533243c30cc5d5dc663d928b1fc6800 files/digest-keepassx-0.2.2 244
 RMD160 de8c91ac690bd72f6e2878b0255abce458fb9ab9 files/digest-keepassx-0.2.2 244
 SHA256 d44e82387d8509e8bdc3771b946df5414b2bfeea46c87182fb6b0685fa16d518 files/digest-keepassx-0.2.2 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFg9CvNQqtfCuFneMRAovqAKCI5Lum66rhtHC+cR56Sm6gTa+kuwCfSX/n
+gNjRISoBkFAL+FP/ghSrVmw=
+=t50y
+-----END PGP SIGNATURE-----

diff --git a/app-admin/keepassx/keepassx-0.2.2.ebuild b/app-admin/keepassx/keepassx-0.2.2.ebuild
index 4f022474df7e924cfd829e5e96e6fe869d631887..5dfe4371a67099b4616407bee0e64927e19bd0ed 100644 (file)
--- a/app-admin/keepassx/keepassx-0.2.2.ebuild
+++ b/app-admin/keepassx/keepassx-0.2.2.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-admin/keepassx/keepassx-0.2.2.ebuild,v 1.3 2006/12/10 19:58:27 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/keepassx-0.2.2.ebuild,v 1.4 2006/12/16 10:55:43 opfer Exp $
 
 inherit eutils
 
@@ -16,6 +16,13 @@ DEPEND=">=x11-libs/qt-4.1"
 RDEPEND="${DEPEND}"
 
 src_compile() {
+       if has_version >=x11-libs/qt-4.2.2 && built_with_use qt qt3support; then
+               eerror
+               eerror "You need to rebuild x11-libs/qt with USE=qt3support enabled"
+               eerror
+               die "please rebuild x11-libs/qt with USE=qt3support"
+       fi
+
        /usr/bin/qmake || die "qmake failed"
        emake || die "emake failed"
 }