www-plugins/gnash: more USE flag checks

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

diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog
index fde2b1294abcd0dc95dfb111f50a495f72cbdaaf..179e7f7e6036c7dc5961ce5f1de9845f9ba852c5 100644 (file)
--- a/www-plugins/gnash/ChangeLog
+++ b/www-plugins/gnash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-plugins/gnash
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.24 2010/03/23 23:48:37 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.25 2010/03/24 08:24:07 chithanh Exp $
+
+  24 Mar 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  gnash-0.8.7.ebuild:
+  update USE flag checks more
 
   23 Mar 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   gnash-0.8.7.ebuild:

diff --git a/www-plugins/gnash/Manifest b/www-plugins/gnash/Manifest
index 99a17241c4b08b01b61ce70b5693b3cda830953e..c6faecdf400a1029f7b2cc342a98fcb61270e791 100644 (file)
--- a/www-plugins/gnash/Manifest
+++ b/www-plugins/gnash/Manifest
@@ -14,6 +14,6 @@ DIST gnash-0.8.6.tar.bz2 3571055 RMD160 987342b6cc46e94d5684d917bebbe6f6da6033bf
 DIST gnash-0.8.7.tar.bz2 3617298 RMD160 809e5dcf6f11567f7463d1e772053aa54f7170ed SHA1 bba6245ce251730fd58a59b37609ca4b8898ae01 SHA256 73b8a7c788511e453add26fd68cebd5818b39f9da21cc7c78e9cef8bc837e896
 EBUILD gnash-0.8.5.ebuild 6821 RMD160 1c98adc66e062632ce9ebd7786e5d5521619ba40 SHA1 205146eac55069bfda754e3b35c97a2cc85b3c22 SHA256 b416952e5ea784f649978f337e0b156fe4e05b356725be03640889ed6c231d44
 EBUILD gnash-0.8.6.ebuild 7706 RMD160 d6f012bca625b0ddf07a7825d46148fa918bf6e5 SHA1 d7925fa6186ef2c5e5cb6664fcfa9f727f17d1b2 SHA256 77951ff4e95c61b91a703cbed907751528dfa0ac1186b73677833eb01c828266
-EBUILD gnash-0.8.7.ebuild 7936 RMD160 99bfd6df510992a04f46111ff8062338a61b1375 SHA1 74708d15dc44d2b6a3c6e8bf30347a4ca401b202 SHA256 9ff0020ec2af2e1cf56736c52b9df25e1d93930054e7c5da88178aceb5f31a83
-MISC ChangeLog 16889 RMD160 f0637437f634c3bbe8ab2430b259feb4fd16cd9d SHA1 3e476838530ff5e7d41a5392a836073101bdccc5 SHA256 b732e12c13a7fa0004c5df5e18a514225ccea4f627dae988010cb2b66c11e963
+EBUILD gnash-0.8.7.ebuild 7960 RMD160 f40e4be9c041f4c7b71f1341ef798534d264a54e SHA1 252d7a8b03c5c87f3e3a969a39e4d4ed184e3d4d SHA256 76414b4d332306c3f16bd2464f87130b2e5d36ade729573304c9057594e594f9
+MISC ChangeLog 17011 RMD160 daad7f99d9a64e2e29d829e51f28aa15acc2f95a SHA1 00fdddb90ba4b84daeca5b17cbc22f4c7be23aa8 SHA256 704d203a7b5e467cdb8f420ad9664a01f5ed2592004c1b1e3c9aa526a4225b61
 MISC metadata.xml 629 RMD160 c09d2f9e4f61ffff0d0a86807f5ae79fc3986474 SHA1 3a7a29e2e3c9d91a0cd1fd61a35eb6e069f3a0e7 SHA256 145ff961a7e0d2e841559d29dd8ab3fc8e448acce4eacb4e8b960209d2a1f41f

diff --git a/www-plugins/gnash/gnash-0.8.7.ebuild b/www-plugins/gnash/gnash-0.8.7.ebuild
index 54446b2b39cd82f81a895982a40ad97f443a0f11..c0130aa52069d60419188971ca140cd107d4c950 100644 (file)
--- a/www-plugins/gnash/gnash-0.8.7.ebuild
+++ b/www-plugins/gnash/gnash-0.8.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.7.ebuild,v 1.3 2010/03/23 23:48:37 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.7.ebuild,v 1.4 2010/03/24 08:24:07 chithanh Exp $
 
 EAPI="2"
 CMAKE_REQUIRED="false"
@@ -78,13 +78,8 @@ pkg_setup() {
                die "Please enable a renderer"
        elif use agg && use cairo && use opengl; then
                ewarn "You enabled 3 renderers, agg was chosen as default."
-       elif use !agg && use cairo; then
-               if use !gtk; then
-                       eerror "Cairo backend needs gtk."
-                       die "Please enable the gtk USE flag."
-               elif use opengl; then
-                       ewarn "You enabled cairo and opengl, cairo was chosen as default."
-               fi
+       elif use !agg && use cairo && use opengl; then
+               ewarn "You enabled cairo and opengl, cairo was chosen as default."
        fi
 
        if ! ( use kde || use gtk || use sdl ); then
@@ -93,17 +88,22 @@ pkg_setup() {
                        || die "Please enable at least one of these USE flags."
        fi
 
+       if use python && use !gtk; then
+               eerror "Building gnash with python support requires gtk."
+               die "python requires the gtk USE flag."
+       fi
+
        if use nsplugin && use !gtk; then
                eerror "Building gnash with nsplugin requires the gtk gui."
                die "Nsplugin requires the gtk gui."
        fi
 
        if use sdl; then
-               ewarn "Enable SDL as gui frontend and sound handler"
+               elog "Enable SDL as gui frontend and sound handler"
        fi
 
        if use lirc; then
-               ewarn "Enable LIRC daemon support and lirc extension"
+               elog "Enable LIRC daemon support and lirc extension"
        fi
 
        kde4-base_pkg_setup