www-plugins/gnash: update 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 c983d5042896a89cbd4b1a8b45805c4fb0d9c5ad..fde2b1294abcd0dc95dfb111f50a495f72cbdaaf 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.23 2010/03/17 23:35:21 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.24 2010/03/23 23:48:37 chithanh Exp $
+
+  23 Mar 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  gnash-0.8.7.ebuild:
+  update USE flag checks
 
   17 Mar 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   gnash-0.8.7.ebuild, +files/gnash-0.8.7-amf-include.patch:

diff --git a/www-plugins/gnash/Manifest b/www-plugins/gnash/Manifest
index 97e1ce2f5708f7dbed054a0eaeb8a51f324c9be4..99a17241c4b08b01b61ce70b5693b3cda830953e 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 7786 RMD160 dbb212f4af21f11173b528180e1ea4eaf800fe4a SHA1 205bac58613fd1c5663cd6c163da5d569da31abd SHA256 c63a1e1b49d158df10ebd43a05afafaa3ed21c39b24ac38da45be68cefa63ef7
-MISC ChangeLog 16772 RMD160 fd70316c9d0288641d81228299553d9b6d7f05df SHA1 c54222ea8fafc28cff3e7ec53f88996c38d67ecd SHA256 0078d49aed9ae6aa82ace51785ec3413e110e2dbcfd7e8c1e02da3fd7c71dd48
+EBUILD gnash-0.8.7.ebuild 7936 RMD160 99bfd6df510992a04f46111ff8062338a61b1375 SHA1 74708d15dc44d2b6a3c6e8bf30347a4ca401b202 SHA256 9ff0020ec2af2e1cf56736c52b9df25e1d93930054e7c5da88178aceb5f31a83
+MISC ChangeLog 16889 RMD160 f0637437f634c3bbe8ab2430b259feb4fd16cd9d SHA1 3e476838530ff5e7d41a5392a836073101bdccc5 SHA256 b732e12c13a7fa0004c5df5e18a514225ccea4f627dae988010cb2b66c11e963
 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 18c4bb6447a282379fae0061c6c42285b7f8aa61..54446b2b39cd82f81a895982a40ad97f443a0f11 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.2 2010/03/17 23:35:21 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.7.ebuild,v 1.3 2010/03/23 23:48:37 chithanh Exp $
 
 EAPI="2"
 CMAKE_REQUIRED="false"
@@ -74,11 +74,17 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
        if ! ( use agg || use cairo || use opengl ); then
-               ewarn "You are trying to build Gnash without choosing a renderer [agg|cairo|opengl]."
-               has_version x11-libs/cairo && ewarn "cairo enabled as default" \
-                       || die "Please enable a renderer"
+               eerror "You are trying to build Gnash without choosing a renderer [agg|cairo|opengl]."
+               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
        fi
 
        if ! ( use kde || use gtk || use sdl ); then
@@ -251,12 +257,12 @@ src_install() {
        dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
 }
 pkg_postinst() {
-       if use !ffmpeg && use !gstreamer || use gstreamer && ( ! use gnome ); then
+       if use !gnome || use !gstreamer && use !ffmpeg ; then
                ewarn ""
                ewarn "Gnash was built without a media handler and or http handler !"
                ewarn ""
                ewarn "If you want Gnash to support video then you will need to"
-               ewarn "rebuild Gnash with either the ffmpeg or gstreamer use flags set."
+               ewarn "rebuild Gnash with either the ffmpeg or gstreamer and gnome use flags set."
                ewarn ""
        fi
        ewarn "${PN} is still in heavy development"