Die on kde and agg thanks to Marco Clocchiatti <ziapannocchia@gmail.com> and sanchan...

Package-Manager: portage-2.1.2_rc2-r1

diff --git a/net-www/gnash/ChangeLog b/net-www/gnash/ChangeLog
index 347ce77ebee3575be5753666c885cf8a395832a1..2935db8c103a02ceaecf95d2903bc1567733aa0d 100644 (file)
--- 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/Manifest b/net-www/gnash/Manifest
index 6a99224c3edac3693b78ddce2d86d686dac934d4..6e8ff6815632f3910b4e7a926d0758fc0bf65244 100644 (file)
--- a/net-www/gnash/Manifest
+++ b/net-www/gnash/Manifest
@@ -1,16 +1,16 @@
 DIST gnash-0.7.2.tar.bz2 1599810 RMD160 0f5904b6c13ffb3b2b4a5f723d9fdacb0a8a6198 SHA1 e2bbd71d61665c435ed22339078070af196ea31a SHA256 12dccb4bc69488f516e0283e988412ba7db5dfad32744425f97d641392a2e98b
-EBUILD gnash-0.7.2.ebuild 2748 RMD160 00f5a9f39812eb6528ab8c67598abf9cacbd307a SHA1 6cb7be8d771f5c3844684ab7311b037a4f041796 SHA256 0dc2b76e7ef78e4627eabe6769bbe42e68c8005ec0030ba412fa2f1dbbc841b6
-MD5 7d39de1337d5d991434654da6c8e7ed7 gnash-0.7.2.ebuild 2748
-RMD160 00f5a9f39812eb6528ab8c67598abf9cacbd307a gnash-0.7.2.ebuild 2748
-SHA256 0dc2b76e7ef78e4627eabe6769bbe42e68c8005ec0030ba412fa2f1dbbc841b6 gnash-0.7.2.ebuild 2748
-EBUILD gnash-0.7.2_p20099999.ebuild 3079 RMD160 e1d56ef51931efcc618a1673ccf60b87aa20600e SHA1 90ef3706884ed2e8c9dccff54c51b40576f65981 SHA256 995c012201b08fd94522247b57f8bd10318d2fa066f7c45306072c490c69529f
-MD5 08eaa708d53264fa9e582e3119576042 gnash-0.7.2_p20099999.ebuild 3079
-RMD160 e1d56ef51931efcc618a1673ccf60b87aa20600e gnash-0.7.2_p20099999.ebuild 3079
-SHA256 995c012201b08fd94522247b57f8bd10318d2fa066f7c45306072c490c69529f gnash-0.7.2_p20099999.ebuild 3079
-MISC ChangeLog 6463 RMD160 46455b49033be1db97786a74b3b0ea2f7ebb833a SHA1 3172aa17ae2390ae8e2abd8ea21867f535cdbfcb SHA256 bdaa7a592de7f074d29a7f6cb2fc00834f17f77eb4a1c7837674f95ef0ec6698
-MD5 1ff232c2d13d33d799766073cc964b1c ChangeLog 6463
-RMD160 46455b49033be1db97786a74b3b0ea2f7ebb833a ChangeLog 6463
-SHA256 bdaa7a592de7f074d29a7f6cb2fc00834f17f77eb4a1c7837674f95ef0ec6698 ChangeLog 6463
+EBUILD gnash-0.7.2.ebuild 2955 RMD160 e7b438302125895a1c9bac38cad26130f64b5fb0 SHA1 a308ae5733fcdf0caf25c7035d3600a8da82ae63 SHA256 220fed4c294915a6a31dd1368c36efe9f3491c66f115d36e6fe9fcbb06dadfdf
+MD5 aecd8445a77835ca9d37512287d147d6 gnash-0.7.2.ebuild 2955
+RMD160 e7b438302125895a1c9bac38cad26130f64b5fb0 gnash-0.7.2.ebuild 2955
+SHA256 220fed4c294915a6a31dd1368c36efe9f3491c66f115d36e6fe9fcbb06dadfdf gnash-0.7.2.ebuild 2955
+EBUILD gnash-0.7.2_p20099999.ebuild 3286 RMD160 a52e9a4b8eada9aa3c5fff4c62f82d3ae29cb91b SHA1 b75a797e02d5a28f527f69dcf29575b141d86762 SHA256 18aa13c5d6f6a9d5aaf3e50174875ba4a0f8d3585fc008b1edbb7c76d76542ec
+MD5 3868768194111bd4014dd4dbea6ec33f gnash-0.7.2_p20099999.ebuild 3286
+RMD160 a52e9a4b8eada9aa3c5fff4c62f82d3ae29cb91b gnash-0.7.2_p20099999.ebuild 3286
+SHA256 18aa13c5d6f6a9d5aaf3e50174875ba4a0f8d3585fc008b1edbb7c76d76542ec gnash-0.7.2_p20099999.ebuild 3286
+MISC ChangeLog 6672 RMD160 d065bad3d340ab5140644b2a5cefeb2066964e1a SHA1 e74438979f56708b81b1eff41e268ce494fe8d34 SHA256 1ca8ff02021d58ada8442481b5fe8ba8cea76b68eaffc2b71df49b757c683aff
+MD5 9c85d980f927d0d3e2eb2c4a05dfcc67 ChangeLog 6672
+RMD160 d065bad3d340ab5140644b2a5cefeb2066964e1a ChangeLog 6672
+SHA256 1ca8ff02021d58ada8442481b5fe8ba8cea76b68eaffc2b71df49b757c683aff ChangeLog 6672
 MISC metadata.xml 242 RMD160 0c1495108d642a4ab0e1bffef66b6ff60a3e619c SHA1 383cfdd7a210a459dd71b1a8bad03be54f047d5b SHA256 771b4e1c8b0943aae8c90480ad18a37ee37bd086f0eeb329099eee9d238c81f2
 MD5 d5ce5bbf8880322ebca9672595e248ab metadata.xml 242
 RMD160 0c1495108d642a4ab0e1bffef66b6ff60a3e619c metadata.xml 242

diff --git a/net-www/gnash/gnash-0.7.2.ebuild b/net-www/gnash/gnash-0.7.2.ebuild
index b3dafc212c503a406fe73701bb34e5029df6a7c7..914de601cd6ce91194e2e56b44f86f155f99532f 100644 (file)
--- 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 242d02fff449ef307ac13dac48aa36d451fe8e79..4e3b8c8db92963c29a89cfedb7ae179ae9c1eb86 100644 (file)
--- 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}