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

(Portage version: 2.1_pre10-r4)

2 files changed, 30 insertions, 21 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/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