Workaround install problem thanks to Roie Kerstein <sf_kersteinroie@bezeqint.net> in bug 132964, mp3->mad to support alt-arches with mad use.mask, enable sound, cleanup depends

Package-Manager: portage-2.1_pre10-r4

3 files changed, 41 insertions, 32 deletions

diff --git a/net-www/gnash/ChangeLog b/net-www/gnash/ChangeLog
index 538ee00e03f4..d93c59c8b874 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.6 2006/05/09 23:54:55 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/ChangeLog,v 1.7 2006/05/11 17:09:54 genstef Exp $
+
+  11 May 2006; Stefan Schweizer <genstef@gentoo.org> gnash-0.7.1.ebuild:
+  Workaround install problem thanks to Roie Kerstein
+  <sf_kersteinroie@bezeqint.net> in bug 132964, mp3->mad to support alt-arches
+  with mad use.mask, enable sound, cleanup depends
 
 *gnash-0.7.1 (09 May 2006)
 
diff --git a/net-www/gnash/Manifest b/net-www/gnash/Manifest
index 536fd38fb8f3..ad6b1304c999 100644
--- a/net-www/gnash/Manifest
+++ b/net-www/gnash/Manifest
@@ -6,14 +6,14 @@ MD5 5758f8309a9738a69b55dc2f8de7c7eb files/gnash-as-needed.diff 1359
 RMD160 e3caac39b725724bb3d31cde6f0a9bae7788363e files/gnash-as-needed.diff 1359
 SHA256 beae9755cc8c45b4675b562dd57da720e5b24b56dfebe5a7e7220e4dadc019c7 files/gnash-as-needed.diff 1359
 DIST gnash-0.7.1.tar.bz2 1089794 RMD160 db7817a80d41a9e1a7168bc8554c64c66f23eb98 SHA256 48fcb533e3989757c23af2b9130c8b490a4d40375be4813ce425efea82ae0f62 size 1089794
-EBUILD gnash-0.7.1.ebuild 1997 RMD160 6c9890e04677bee3e7477afee312afc86201ae6e SHA1 50ccd673bbb9b3a2c43b865a48daa1bd528df0ea SHA256 0da1bc2aecdf41b03dd75d9ed38c6ca11a52e8ae2d985da08b3ee1ede92c5594 size 1997
-MD5 e28534b829dbf296e28fb9b55714e058 gnash-0.7.1.ebuild 1997
-RMD160 6c9890e04677bee3e7477afee312afc86201ae6e gnash-0.7.1.ebuild 1997
-SHA256 0da1bc2aecdf41b03dd75d9ed38c6ca11a52e8ae2d985da08b3ee1ede92c5594 gnash-0.7.1.ebuild 1997
-MISC ChangeLog 1400 RMD160 5d613ba0dbff49548a7cffb9a7e2431f2586d6a8 SHA1 4af81eee4de691da73dc1e71549b7e25f4ceed91 SHA256 ab4731e4f8810408ded0ed79467b4610fefc2f1a681dae92640f42c6add64683 size 1400
-MD5 255cfe08ccdbfe4436e17002f1c008f6 ChangeLog 1400
-RMD160 5d613ba0dbff49548a7cffb9a7e2431f2586d6a8 ChangeLog 1400
-SHA256 ab4731e4f8810408ded0ed79467b4610fefc2f1a681dae92640f42c6add64683 ChangeLog 1400
+EBUILD gnash-0.7.1.ebuild 2229 RMD160 c274ea987a00dd579ad9c516900c88784821472f SHA1 743ff94ba99b29a2a984c0f1d553c15fa7901d5b SHA256 73e1b49a9568a7d2fed40c9161a4aaacbda27a2505ceb1217b54dd3f1fa54eab size 2229
+MD5 21ff21874073e37af2ac0e9b25e8784a gnash-0.7.1.ebuild 2229
+RMD160 c274ea987a00dd579ad9c516900c88784821472f gnash-0.7.1.ebuild 2229
+SHA256 73e1b49a9568a7d2fed40c9161a4aaacbda27a2505ceb1217b54dd3f1fa54eab gnash-0.7.1.ebuild 2229
+MISC ChangeLog 1657 RMD160 95ead9631ef3d1f600682d47ea9acc35b6c1cca9 SHA1 fcf17db629ddcb8d9cfc77a4b0ca96f8ec7c4cc0 SHA256 98abe581e95eba459d7e6e9d9f0c4c75d77cd28fac43365d9350735475feb437 size 1657
+MD5 767da94a9938324b40dee50d137cc4f5 ChangeLog 1657
+RMD160 95ead9631ef3d1f600682d47ea9acc35b6c1cca9 ChangeLog 1657
+SHA256 98abe581e95eba459d7e6e9d9f0c4c75d77cd28fac43365d9350735475feb437 ChangeLog 1657
 MISC metadata.xml 242 RMD160 0c1495108d642a4ab0e1bffef66b6ff60a3e619c SHA1 383cfdd7a210a459dd71b1a8bad03be54f047d5b SHA256 771b4e1c8b0943aae8c90480ad18a37ee37bd086f0eeb329099eee9d238c81f2 size 242
 MD5 d5ce5bbf8880322ebca9672595e248ab metadata.xml 242
 RMD160 0c1495108d642a4ab0e1bffef66b6ff60a3e619c metadata.xml 242
@@ -24,7 +24,7 @@ SHA256 0e0aba61d3e68f0b415d528c2d5483f4d9cb8c967ad611d29b043caa45a7e0d8 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEYvJqNJowsmZ/PzARAuHyAJ9TCws1k3AsVJf3DUpIVISIvb3tLACfd/a+
-Unz2nkeWh3hJdllYmjHcFFs=
-=oCxE
+iD8DBQFEY2/yNJowsmZ/PzARAgMJAJ9ATjNOuLiCPeOyFEnnySNc7bh1swCgny+m
+28XeRG8jpTY7o6PxHlhxJUk=
+=IZUv
 -----END PGP SIGNATURE-----
diff --git a/net-www/gnash/gnash-0.7.1.ebuild b/net-www/gnash/gnash-0.7.1.ebuild
index 7f8dc864a535..f32756ce266d 100644
--- a/net-www/gnash/gnash-0.7.1.ebuild
+++ b/net-www/gnash/gnash-0.7.1.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.1.ebuild,v 1.3 2006/05/11 08:14:18 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.7.1.ebuild,v 1.4 2006/05/11 17:09:54 genstef Exp $
 
 inherit nsplugins kde-functions autotools
 
@@ -11,47 +11,50 @@ SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${PV}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
-IUSE="dmalloc mp3 nsplugin nptl xml kde gtk video_cards_i810"
+IUSE="dmalloc mad nsplugin nptl xml kde gtk video_cards_i810"
 
-DEPEND="sys-libs/zlib
+RDEPEND="dmalloc? ( dev-libs/dmalloc )
+	xml? ( dev-libs/libxml2 )
+	kde? (
+		kde-base/kdelibs
+		x11-libs/qt
+	)
+	sys-libs/zlib
 	media-libs/jpeg
+	mad? ( media-libs/libmad )
+	media-libs/libogg
 	media-libs/libpng
+	media-libs/libsdl
+	media-libs/sdl-mixer
+	virtual/opengl
 	|| (
 		( x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXmu
 		x11-libs/libXt
 		x11-proto/xproto )
 		virtual/x11
 	)
-	xml? ( dev-libs/libxml2 )
-	dmalloc? ( dev-libs/dmalloc )
-	mp3? ( media-libs/libmad )
-	media-libs/libcaca
-	media-libs/libogg
-	media-libs/sdl-mixer
-	sys-libs/gpm
-	sys-libs/ncurses
-	sys-libs/slang
-	kde? ( kde-base/kdelibs )
 	gtk? (
-		dev-libs/glib
 		dev-libs/atk
-		x11-libs/pango
+		dev-libs/glib
 		x11-libs/cairo
 		>x11-libs/gtk+-2
 		x11-libs/gtkglext
-	)
-	virtual/opengl
-	media-libs/libsdl"
-RDEPEND="${DEPEND}"
+		x11-libs/pango
+	)"
 set-kdedir
 
 src_compile() {
 	epatch ${FILESDIR}/gnash-as-needed.diff
+	# we want sound
+	sed -i -e "s:bool do_sound = .*:bool do_sound = true;:" backend/gnash.cpp
+
 	AT_M4DIR="macros" eautoreconf
 	econf \
 		$(use_enable dmalloc) \
 		$(use_enable kde klash) \
-		$(use_enable mp3) \
+		$(use_enable mad mp3) \
 		$(use_enable nptl pthreads) \
 		$(use_enable xml) \
 		$(use_enable gtk glext) \
@@ -65,6 +68,7 @@ src_compile() {
 }
 
 src_install() {
+	sed -i -e "s:-lXmu @inst_prefix_dir:-lXmu -L../backend/.libs -L../server/.libs -L../libgeometry/.libs -L../libbase/.libs -L. @inst_prefix_dir:" server/libgnashserver.la
 	make DESTDIR=${D} install || die "make install failed"
 	use nsplugin && inst_plugin /opt/netscape/plugins/libgnashplugin.so \
 		|| rm ${D}/opt/netscape/plugins/libgnashplugin.so