Ensure Qt is built with OpenGL support, see bug #152329.

Package-Manager: portage-2.1.2.4

diff --git a/kde-base/qtjava/ChangeLog b/kde-base/qtjava/ChangeLog
index 31cc5b5f15733f79bbb2ee4d492ed79e6808f29e..ef7e81a42610049473579d48816501cf3c5e95d6 100644 (file)
--- a/kde-base/qtjava/ChangeLog
+++ b/kde-base/qtjava/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/qtjava
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/ChangeLog,v 1.47 2007/04/07 22:36:17 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/ChangeLog,v 1.48 2007/04/25 15:45:13 carlo Exp $
+
+  25 Apr 2007; Carsten Lohrke <carlo@gentoo.org> qtjava-3.5.6-r1.ebuild:
+  Ensure Qt is built with OpenGL support, see bug #152329.
 
   07 Apr 2007; Joseph Jezak <josejx@gentoo.org> qtjava-3.5.2-r1.ebuild:
   Marked ppc stable for bug #155341.

diff --git a/kde-base/qtjava/Manifest b/kde-base/qtjava/Manifest
index dbcee5cb9268aea982e2228ecc6369f01910a528..45e32c0bb5627433285491b2921e70a82e01660c 100644 (file)
--- a/kde-base/qtjava/Manifest
+++ b/kde-base/qtjava/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX no-gtk-glib-check.diff 949 RMD160 6df47b78e158fb7e38a49c30627421186d83e3da SHA1 234a650d3b629e41b2249ae99e6f7b0ee44fcf63 SHA256 f2721c8a1567ab9e259e216372a6552f8910fd33bc82390d8556aff00b0ba8df
 MD5 ffe26fb6d5d193883dfebd69250df2e5 files/no-gtk-glib-check.diff 949
 RMD160 6df47b78e158fb7e38a49c30627421186d83e3da files/no-gtk-glib-check.diff 949
@@ -19,14 +16,14 @@ EBUILD qtjava-3.5.2.ebuild 961 RMD160 22abdba12d388b9dd4bf74166c0cd39c49c5ee51 S
 MD5 add12d3bddd3f1c63b1951df63ee3af9 qtjava-3.5.2.ebuild 961
 RMD160 22abdba12d388b9dd4bf74166c0cd39c49c5ee51 qtjava-3.5.2.ebuild 961
 SHA256 a9100b8fc8ae9be3dc221fd6057bbec5ab845052e41c5b799605fae12acf870e qtjava-3.5.2.ebuild 961
-EBUILD qtjava-3.5.6-r1.ebuild 1275 RMD160 d1914a8d8732e1186ab75b56b2dfc58775a9e7ce SHA1 5d0bbdbae0081ae6f140751e83215dbe17a2c8ac SHA256 cd0547e960f76132d7882725b0779b800fbac11771c14667cce417112dc00c32
-MD5 dd15d11769d118010a8723fbb1867626 qtjava-3.5.6-r1.ebuild 1275
-RMD160 d1914a8d8732e1186ab75b56b2dfc58775a9e7ce qtjava-3.5.6-r1.ebuild 1275
-SHA256 cd0547e960f76132d7882725b0779b800fbac11771c14667cce417112dc00c32 qtjava-3.5.6-r1.ebuild 1275
-MISC ChangeLog 6413 RMD160 3b3f82e6d7acae7d8800f9c7f42ba31ea278f8aa SHA1 0db6540b7340167500bbaa93808daa9fa535adb5 SHA256 1e7c2f89e9d4949769d2a65e0d734fed16a7b2bc1d0887ecbcf2db5257259e8c
-MD5 02298956dfa773358c6b0874c07fe960 ChangeLog 6413
-RMD160 3b3f82e6d7acae7d8800f9c7f42ba31ea278f8aa ChangeLog 6413
-SHA256 1e7c2f89e9d4949769d2a65e0d734fed16a7b2bc1d0887ecbcf2db5257259e8c ChangeLog 6413
+EBUILD qtjava-3.5.6-r1.ebuild 1426 RMD160 76df50203791bf74e60a88f45b2a881f07b7326c SHA1 64d395d46a8aa8f523f24f9e71c536b22ad0f261 SHA256 9962def3383a48894123ea9f83c1153da327b652c551956a533ba159362e4153
+MD5 8d660f843185fa4a2067dbaa2791aab2 qtjava-3.5.6-r1.ebuild 1426
+RMD160 76df50203791bf74e60a88f45b2a881f07b7326c qtjava-3.5.6-r1.ebuild 1426
+SHA256 9962def3383a48894123ea9f83c1153da327b652c551956a533ba159362e4153 qtjava-3.5.6-r1.ebuild 1426
+MISC ChangeLog 6545 RMD160 2f284bb1c94501b09687eb7baf984cd63c2fd994 SHA1 c6c15ff738459b31c162fa2c0d8945eb65916a68 SHA256 f982d1eac73ce539605e12dc2835e19cf4b98abb92d10cc5449f171d77867d3b
+MD5 0ac786f1d8d228dd72d1c8b88323c07a ChangeLog 6545
+RMD160 2f284bb1c94501b09687eb7baf984cd63c2fd994 ChangeLog 6545
+SHA256 f982d1eac73ce539605e12dc2835e19cf4b98abb92d10cc5449f171d77867d3b ChangeLog 6545
 MISC metadata.xml 174 RMD160 c2e418dc10e1431eec90cebd2bcd049ea84c164e SHA1 b29657b99bedc684ac7e40dfa561ef7da5fc4ad7 SHA256 9b93e47904abc783e4ed3714c950f453b6769b553b06fb1a0964b50beabf36e8
 MD5 76e6979e60db4af541cd6af21de010f7 metadata.xml 174
 RMD160 c2e418dc10e1431eec90cebd2bcd049ea84c164e metadata.xml 174
@@ -40,10 +37,3 @@ SHA256 0ed7df165eb81c40fc0d314443c341edac8d4c000ddddad7229f8386696555ac files/di
 MD5 6931b79e7b3debd1a959ff1f9b4ba80f files/digest-qtjava-3.5.6-r1 259
 RMD160 f30948060c4e7da061540353e486d5c0a7e94fa4 files/digest-qtjava-3.5.6-r1 259
 SHA256 76651708f126d5371e659b269806fda4892d6f6c45a3e8580d099605cf5fd9ef files/digest-qtjava-3.5.6-r1 259
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGGBzWcsIHjyDViGQRAliDAJ9ckAIlLFmgQD5oGp2sUAKIVGwYZQCfQkF4
-m/TpS6XjVhPyaXvbute0zUs=
-=dzqX
------END PGP SIGNATURE-----

diff --git a/kde-base/qtjava/qtjava-3.5.6-r1.ebuild b/kde-base/qtjava/qtjava-3.5.6-r1.ebuild
index cea2d646adc344046813d2a4cdce37dc6e568889..5e8a770e7dc9d6ee75c69c578809df5910f49619 100644 (file)
--- a/kde-base/qtjava/qtjava-3.5.6-r1.ebuild
+++ b/kde-base/qtjava/qtjava-3.5.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/qtjava-3.5.6-r1.ebuild,v 1.2 2007/02/01 13:31:53 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/qtjava-3.5.6-r1.ebuild,v 1.3 2007/04/25 15:45:13 carlo Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
@@ -18,8 +18,13 @@ RDEPEND=">=virtual/jre-1.4"
 PATCHES="${FILESDIR}/no-gtk-glib-check.diff
        ${FILESDIR}/${PN}-${SLOT}-javacflags.patch"
 
-# both eclasses define pkg_setup
+
 pkg_setup() {
+       if ! built_with_use =x11-libs/qt-3* opengl ; then
+               eerror "${CATEGORY}/${PN} needs Qt 3 built with OpenGL support."
+               die "Please reemerge =x11-libs/qt-3* with USE=\"opengl\"."
+       fi
+
        kde_pkg_setup
        java-pkg-2_pkg_setup
 }