When USE="opengl" make sure wxGTK was built with opengl support.

Package-Manager: portage-2.1.2.3

diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index 5fe640f3dd9ef94916fe2dfbbdecc6432b4fb4d5..449954b77afa04bee7d19d80acef77845ff274a6 100644 (file)
--- a/dev-python/wxpython/ChangeLog
+++ b/dev-python/wxpython/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/wxpython
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.52 2007/02/10 15:52:37 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.53 2007/04/07 02:43:07 dirtyepic Exp $
+
+  07 Apr 2007; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.6.3.3.ebuild:
+  When USE="opengl" make sure wxGTK was built with opengl support.
 
   10 Feb 2007; Simon Stelling <blubb@gentoo.org> wxpython-2.6.3.3.ebuild:
   stable on amd64; bug 136924

diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 6433d538c24a2db61b3cfa17fd83ed7427da5ff2..759f50715b65a43fba49d79a37bf7bfedc900904 100644 (file)
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX scripts-multiver-2.6.0.0.diff 3373 RMD160 377cfeba11d5c91106d8ab57c50ed7534d3004b6 SHA1 1191dc7b4dd560dfc0843c44d823c0971dabd70c SHA256 504cb13fe5e13d75274fc965be2d78618fae99693ff6b8c1cf0ff50852cf8084
 MD5 d69bb360ce49f76f26ef1ae017f4bc31 files/scripts-multiver-2.6.0.0.diff 3373
 RMD160 377cfeba11d5c91106d8ab57c50ed7534d3004b6 files/scripts-multiver-2.6.0.0.diff 3373
@@ -36,14 +33,14 @@ EBUILD wxpython-2.6.1.0.ebuild 3665 RMD160 81804b4cd19509c2106389f06fb298506fdf3
 MD5 97d74923d83b505ea00adb6e0fe27e36 wxpython-2.6.1.0.ebuild 3665
 RMD160 81804b4cd19509c2106389f06fb298506fdf3e49 wxpython-2.6.1.0.ebuild 3665
 SHA256 a3cdf970912d42187441825705edaaf7678ae0eafff069efdc3024508f2e45dd wxpython-2.6.1.0.ebuild 3665
-EBUILD wxpython-2.6.3.3.ebuild 2926 RMD160 89265680e6f0963ba6fb38f7a2668fb1cff9867e SHA1 9a643ffe304624c29964531642c766b9ba656c97 SHA256 f8b0b47662f0a048348d8a2091d5c17dd73f00733c17de146048aa5c84e51eb8
-MD5 56235821c8d15fb1fe657164cdcb7c32 wxpython-2.6.3.3.ebuild 2926
-RMD160 89265680e6f0963ba6fb38f7a2668fb1cff9867e wxpython-2.6.3.3.ebuild 2926
-SHA256 f8b0b47662f0a048348d8a2091d5c17dd73f00733c17de146048aa5c84e51eb8 wxpython-2.6.3.3.ebuild 2926
-MISC ChangeLog 13280 RMD160 9fc5b1773e0c205c4c6b2ee5745f31cd19cab26e SHA1 df69585acbd5e99a93bed66e54922e1e1d3507af SHA256 4a7af41fa5bf9406805f620b8250997e835c100664ac11ba8e25ce7dde9e2b6a
-MD5 d9b8464527538353b64a6da0883f984c ChangeLog 13280
-RMD160 9fc5b1773e0c205c4c6b2ee5745f31cd19cab26e ChangeLog 13280
-SHA256 4a7af41fa5bf9406805f620b8250997e835c100664ac11ba8e25ce7dde9e2b6a ChangeLog 13280
+EBUILD wxpython-2.6.3.3.ebuild 3177 RMD160 c77875d6b7b8d0093e2fca8b4e6881ccbe84573b SHA1 c0c7bbff8c53df3879e6636a35e69283ffbfea6b SHA256 8257fa6185b21e496f79bda3c4f62fde0a29180e94209262ea4a675fd10a4b65
+MD5 b06947cedf36e5a3df85acbea76204ce wxpython-2.6.3.3.ebuild 3177
+RMD160 c77875d6b7b8d0093e2fca8b4e6881ccbe84573b wxpython-2.6.3.3.ebuild 3177
+SHA256 8257fa6185b21e496f79bda3c4f62fde0a29180e94209262ea4a675fd10a4b65 wxpython-2.6.3.3.ebuild 3177
+MISC ChangeLog 13425 RMD160 6438982fcfc43928d6d0a52ceaa7e476d168bd08 SHA1 a8c7fe1ddde3a7b5301235ee5a7938932658aae8 SHA256 af5f4f7a051c700014838e72860247dd1b8bee7216cf514db4f571d4d4f88566
+MD5 de0c6fca511c5abfa776483036e83190 ChangeLog 13425
+RMD160 6438982fcfc43928d6d0a52ceaa7e476d168bd08 ChangeLog 13425
+SHA256 af5f4f7a051c700014838e72860247dd1b8bee7216cf514db4f571d4d4f88566 ChangeLog 13425
 MISC metadata.xml 182 RMD160 ea41002477d2dd03185feb91318022c593ab267f SHA1 104f632f29e5a0bafbe01ab77d3565326054ab3b SHA256 1d83e81ebf161f14a972d059a5af2cac192b64c4e3ca059347204d14b5f270e5
 MD5 f3c5a27935083d6431dbc3401b897b92 metadata.xml 182
 RMD160 ea41002477d2dd03185feb91318022c593ab267f metadata.xml 182
@@ -60,10 +57,3 @@ SHA256 9c471738678619dddb0569143f1f46d3d0ab92c4b1b8f5d76b69f3c5e9697b12 files/di
 MD5 4865b7c2ac0ec50eb4588b9c8782f5f9 files/digest-wxpython-2.6.3.3 271
 RMD160 bc71a86558bf3216ddd97ea35e83fd50fd934587 files/digest-wxpython-2.6.3.3 271
 SHA256 fd33053a2b85e0e330fff5bb181c0cd89d25c524f5ea2a6987e791480a83b814 files/digest-wxpython-2.6.3.3 271
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGEz8V8bi6rjpTunYRAtIPAKCXj2ayjm/LJrAxlfFTj0uH1gXhzQCaA6F1
-CWb+SlK23/whK9kRcx3ymFk=
-=9jFa
------END PGP SIGNATURE-----

diff --git a/dev-python/wxpython/wxpython-2.6.3.3.ebuild b/dev-python/wxpython/wxpython-2.6.3.3.ebuild
index 28a20d1cef1f149d47416e6637fce77dd43c9120..bb3ca646c15e7edc5358bfe225bfef39b1466d80 100644 (file)
--- a/dev-python/wxpython/wxpython-2.6.3.3.ebuild
+++ b/dev-python/wxpython/wxpython-2.6.3.3.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/dev-python/wxpython/wxpython-2.6.3.3.ebuild,v 1.10 2007/04/04 06:00:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.3.3.ebuild,v 1.11 2007/04/07 02:43:07 dirtyepic Exp $
 
 inherit python wxwidgets eutils multilib
 
@@ -31,6 +31,17 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}/wxPython/
 
+pkg_setup() {
+       if use opengl; then
+               if ! built_with_use wxGTK opengl; then
+                       echo
+                       eerror "To build wxpython with opengl support, wxGTK must also be"
+                       eerror "built with USE=\"opengl\"."
+                       die "Rebuild wxGTK with USE=\"opengl\""
+               fi
+       fi
+}
+
 src_unpack() {
        unpack ${A}
        cd "${S}"