summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2010-03-23 23:48:37 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2010-03-23 23:48:37 +0000
commitd778b42bdae8941946117db1ac06ca7811e7923b (patch)
treefd75dc4fc041f1542dbed4fb77f0b82cd549f6e6 /www-plugins
parentMarking subversion-1.6.9 ppc for bug 306343 (diff)
downloadgentoo-2-d778b42bdae8941946117db1ac06ca7811e7923b.tar.gz
gentoo-2-d778b42bdae8941946117db1ac06ca7811e7923b.tar.bz2
gentoo-2-d778b42bdae8941946117db1ac06ca7811e7923b.zip
www-plugins/gnash: update USE flag checks
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'www-plugins')
-rw-r--r--www-plugins/gnash/ChangeLog6
-rw-r--r--www-plugins/gnash/gnash-0.8.7.ebuild18
2 files changed, 17 insertions, 7 deletions
diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog
index c983d5042896..fde2b1294abc 100644
--- 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/gnash-0.8.7.ebuild b/www-plugins/gnash/gnash-0.8.7.ebuild
index 18c4bb6447a2..54446b2b39cd 100644
--- 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"