diff options
| author |   Stefan Schweizer <genstef@gentoo.org> | 2006-11-23 21:31:29 +0000 |
|---|---|---|
| committer | Stefan Schweizer <genstef@gentoo.org> | 2006-11-23 21:31:29 +0000 |
| commit | 9bfde34b199e30049db718bd76fd94b2a5b3fdd4 (patch) | |
| tree | 885013c7c3eeceac89a5bd0f91367aed0f08f69b /net-www/gnash | |
| parent | added ~amd64 (diff) | |
| download | gentoo-2-9bfde34b199e30049db718bd76fd94b2a5b3fdd4.tar.gz gentoo-2-9bfde34b199e30049db718bd76fd94b2a5b3fdd4.tar.bz2 gentoo-2-9bfde34b199e30049db718bd76fd94b2a5b3fdd4.zip | |
Die on kde and agg thanks to Marco Clocchiatti <ziapannocchia@gmail.com> and sanchan in bug 155888
(Portage version: 2.1.2_rc2-r1)
Diffstat (limited to 'net-www/gnash')
| -rw-r--r-- | net-www/gnash/ChangeLog | 7 | ||||
| -rw-r--r-- | net-www/gnash/gnash-0.7.2.ebuild | 10 | ||||
| -rw-r--r-- | net-www/gnash/gnash-0.7.2_p20099999.ebuild | 10 |
3 files changed, 24 insertions, 3 deletions
diff --git a/net-www/gnash/ChangeLog b/net-www/gnash/ChangeLog index 347ce77ebee3..2935db8c103a 100644 --- a/net-www/gnash/ChangeLog +++ b/net-www/gnash/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-www/gnash # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/ChangeLog,v 1.30 2006/11/21 11:56:41 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/ChangeLog,v 1.31 2006/11/23 21:31:29 genstef Exp $ + + 23 Nov 2006; Stefan Schweizer <genstef@gentoo.org> gnash-0.7.2.ebuild, + gnash-0.7.2_p20099999.ebuild: + Die on kde and agg thanks to Marco Clocchiatti <ziapannocchia@gmail.com> and + sanchan in bug 155888 21 Nov 2006; Stefan Schweizer <genstef@gentoo.org> gnash-0.7.2.ebuild, gnash-0.7.2_p20099999.ebuild: diff --git a/net-www/gnash/gnash-0.7.2.ebuild b/net-www/gnash/gnash-0.7.2.ebuild index b3dafc212c50..914de601cd6c 100644 --- a/net-www/gnash/gnash-0.7.2.ebuild +++ b/net-www/gnash/gnash-0.7.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.7.2.ebuild,v 1.3 2006/11/21 11:56:41 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.7.2.ebuild,v 1.4 2006/11/23 21:31:29 genstef Exp $ inherit nsplugins kde-functions set-kdedir @@ -52,6 +52,14 @@ RDEPEND=" agg? ( x11-libs/agg )" #cairo? ( x11-libs/cairo ) +pkg_setup() { + if use agg && use kde; then + eerror "Building klash with the agg based renderer is not supportet" + eerror "Please USE -kde or -agg" + die "kde and agg not supported at the same time" + fi +} + src_compile() { local myconf diff --git a/net-www/gnash/gnash-0.7.2_p20099999.ebuild b/net-www/gnash/gnash-0.7.2_p20099999.ebuild index 242d02fff449..4e3b8c8db929 100644 --- a/net-www/gnash/gnash-0.7.2_p20099999.ebuild +++ b/net-www/gnash/gnash-0.7.2_p20099999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.7.2_p20099999.ebuild,v 1.2 2006/11/21 11:56:41 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.7.2_p20099999.ebuild,v 1.3 2006/11/23 21:31:29 genstef Exp $ WANT_AUTOCONF=latest inherit nsplugins autotools cvs kde-functions @@ -58,6 +58,14 @@ RDEPEND=" agg? ( x11-libs/agg )" #cairo? ( x11-libs/cairo ) +pkg_setup() { + if use agg && use kde; then + eerror "Building klash with the agg based renderer is not supportet" + eerror "Please USE -kde or -agg" + die "kde and agg not supported at the same time" + fi +} + src_unpack() { cvs_src_unpack cd ${S} |