New ebuild including firefox plugin support, bug 122659, remove old

Package-Manager: portage-2.1_pre7-r2

7 files changed, 53 insertions, 88 deletions

diff --git a/net-www/gnash/ChangeLog b/net-www/gnash/ChangeLog
index 21c4f25ff426..05572a8f4236 100644
--- a/net-www/gnash/ChangeLog
+++ b/net-www/gnash/ChangeLog
@@ -1,6 +1,13 @@
 # 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.3 2006/01/29 20:28:49 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/ChangeLog,v 1.4 2006/04/02 15:52:24 genstef Exp $
+
+*gnash-0.7_alpha20060331 (02 Apr 2006)
+
+  02 Apr 2006; Stefan Schweizer <genstef@gentoo.org>
+  -gnash-0.7_alpha20060110.ebuild, -gnash-0.7_alpha20060129.ebuild,
+  +gnash-0.7_alpha20060331.ebuild:
+  New ebuild including firefox plugin support, bug 122659, remove old
 
 *gnash-0.7_alpha20060129 (29 Jan 2006)
 
diff --git a/net-www/gnash/Manifest b/net-www/gnash/Manifest
index 4e14d858d68d..29cfb7bbedef 100644
--- a/net-www/gnash/Manifest
+++ b/net-www/gnash/Manifest
@@ -1,6 +1,12 @@
-MD5 b12a1693604f36036103695e23db8636 ChangeLog 699
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnash-0.7_alpha20060110 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnash-0.7_alpha20060129 0
-MD5 71e2d018003c2b4f2af7f665a9cf562b gnash-0.7_alpha20060110.ebuild 1756
-MD5 e62fd3c4eabf2f7d5399b5a6ab0ae1e6 gnash-0.7_alpha20060129.ebuild 1746
+MD5 d09745f2ec158e0e027b74b36a69b309 ChangeLog 966
+RMD160 658f8f601e108caa117e32197f6182b28fab765f ChangeLog 966
+SHA256 4f62d5bfbbee30b138c8f1fcf693014d6fad1b01bc517730f0c8c3533008540b ChangeLog 966
+MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-gnash-0.7_alpha20060331 1
+RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-gnash-0.7_alpha20060331 1
+SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-gnash-0.7_alpha20060331 1
+MD5 0929910b73f91f66fa3d61b8b70b4c83 gnash-0.7_alpha20060331.ebuild 2008
+RMD160 37cd996bcde542b2dc9806dd13b3b464c02c8148 gnash-0.7_alpha20060331.ebuild 2008
+SHA256 0ed78453c6ac9a8f9391adaf4d2e0d29748ce8b92216597c20dd728ce8f3d73f gnash-0.7_alpha20060331.ebuild 2008
 MD5 d5ce5bbf8880322ebca9672595e248ab metadata.xml 242
+RMD160 0c1495108d642a4ab0e1bffef66b6ff60a3e619c metadata.xml 242
+SHA256 771b4e1c8b0943aae8c90480ad18a37ee37bd086f0eeb329099eee9d238c81f2 metadata.xml 242
diff --git a/net-www/gnash/files/digest-gnash-0.7_alpha20060110 b/net-www/gnash/files/digest-gnash-0.7_alpha20060110
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/net-www/gnash/files/digest-gnash-0.7_alpha20060110
+++ /dev/null
diff --git a/net-www/gnash/files/digest-gnash-0.7_alpha20060129 b/net-www/gnash/files/digest-gnash-0.7_alpha20060129
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/net-www/gnash/files/digest-gnash-0.7_alpha20060129
+++ /dev/null
diff --git a/net-www/gnash/files/digest-gnash-0.7_alpha20060331 b/net-www/gnash/files/digest-gnash-0.7_alpha20060331
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/net-www/gnash/files/digest-gnash-0.7_alpha20060331
@@ -0,0 +1 @@
+
diff --git a/net-www/gnash/gnash-0.7_alpha20060110.ebuild b/net-www/gnash/gnash-0.7_alpha20060110.ebuild
deleted file mode 100644
index 1facd81105e1..000000000000
--- a/net-www/gnash/gnash-0.7_alpha20060110.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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_alpha20060110.ebuild,v 1.2 2006/01/11 20:03:25 dholm Exp $
-
-inherit cvs
-
-DESCRIPTION="Gnash is a GNU Flash movie player that supports many SWF v7 features"
-HOMEPAGE="http://www.gnu.org/software/gnash"
-SRC_URI=""
-ECVS_SERVER="cvs.sv.gnu.org:/sources/${PN}"
-ECVS_MODULE="${PN}"
-ECVS_TOP_DIR="${DISTDIR}/cvs-src/${PN}"
-ECVS_CO_OPTS="-D ${PV/0.7_alpha}"
-ECVS_UP_OPTS="-dP ${ECVS_CO_OPTS}"
-S=${WORKDIR}/${ECVS_MODULE}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE=""
-
-DEPEND="virtual/opengl
-	media-libs/jpeg
-	media-libs/libpng
-	sys-libs/zlib
-	|| ( ( x11-libs/libX11
-	x11-libs/libXt
-	x11-proto/xproto )
-	virtual/x11 )
-	dev-libs/libxml2
-	media-libs/libsdl
-	media-libs/libmad
-	sys-libs/gpm
-	sys-libs/ncurses
-	sys-libs/slang
-	media-libs/sdl-mixer"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	libtoolize --copy --force || die "libtoolize --copy --force failed"
-	./autogen.sh || die "autogen.sh failed"
-	econf \
-		--with-libxml-includes=/usr/include/libxml2 \
-		--with-x \
-		--enable-mp3 \
-		--disable-plugin \
-		|| die "econf failed"
-# plugin disabled, because gnash does not work perfectly yet ..
-#  --with-firefox=PFX   Prefix where firefox is installed (optional)
-#  --with-firefox-libraries=DIR   Directory where firefox library is installed (optional)
-#  --with-firefox-includes=DIR   Directory where firefox header files are installed (optional)
-	emake || die "emake failed"
-
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-}
-
-pkg_postinst() {
-	ewarn "ALPHA"
-	ewarn "gnash is still in heavy development"
-	ewarn "please report gnash bugs upstream to the gnash devs"
-}
diff --git a/net-www/gnash/gnash-0.7_alpha20060129.ebuild b/net-www/gnash/gnash-0.7_alpha20060331.ebuild
index 414b0035758c..922e56bb7988 100644
--- a/net-www/gnash/gnash-0.7_alpha20060129.ebuild
+++ b/net-www/gnash/gnash-0.7_alpha20060331.ebuild
@@ -1,8 +1,8 @@
 # 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_alpha20060129.ebuild,v 1.2 2006/01/31 02:47:20 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.7_alpha20060331.ebuild,v 1.1 2006/04/02 15:52:24 genstef Exp $
 
-inherit cvs
+inherit cvs nsplugins
 
 DESCRIPTION="Gnash is a GNU Flash movie player that supports many SWF v7 features"
 HOMEPAGE="http://www.gnu.org/software/gnash"
@@ -16,47 +16,62 @@ S=${WORKDIR}/${ECVS_MODULE}
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
-IUSE=""
+IUSE="dmalloc mp3 nsplugin nptl xml kde"
 
-DEPEND="virtual/opengl
+DEPEND="sys-libs/zlib
 	media-libs/jpeg
 	media-libs/libpng
-	sys-libs/zlib
 	|| (
 		( x11-libs/libX11
 		x11-libs/libXt
 		x11-proto/xproto )
 		virtual/x11
 	)
-	dev-libs/libxml2
-	media-libs/libsdl
-	media-libs/libmad
+	xml? ( dev-libs/libxml2 )
+	dmalloc? ( dev-libs/dmalloc )
+	mp3? ( media-libs/libmad )
 	media-libs/libcaca
+	media-libs/sdl-mixer
 	sys-libs/gpm
 	sys-libs/ncurses
 	sys-libs/slang
-	media-libs/sdl-mixer"
+		virtual/opengl
+		media-libs/libsdl
+	kde? ( kde-base/kdelibs )"
+#	plugin? ( 
+#		!sdl? (
+#			dev-libs/glib
+#			dev-libs/atk
+#			x11-libs/pango
+#			x11-libs/cairo
+#			>x11-libs/gtk+-2
+#			x11-libs/gtkglext
+#		)
+#		sdl? (
 RDEPEND="${DEPEND}"
 
 src_compile() {
 	libtoolize --copy --force || die "libtoolize --copy --force failed"
 	./autogen.sh || die "autogen.sh failed"
 	econf \
-		--with-libxml-includes=/usr/include/libxml2 \
-		--with-x \
-		--enable-mp3 \
-		--disable-plugin \
+		$(use_enable nptl pthreads) \
+		$(use_enable mp3) \
+		$(use_enable xml) \
+		$(use_enable kde klash) \
+		$(use_enable dmalloc) \
+		$(use_enable nsplugin plugin) \
+		--with-plugindir=/opt/netscape/plugins \
 		|| die "econf failed"
-# plugin disabled, because gnash does not work perfectly yet ..
-#  --with-firefox=PFX   Prefix where firefox is installed (optional)
-#  --with-firefox-libraries=DIR   Directory where firefox library is installed (optional)
-#  --with-firefox-includes=DIR   Directory where firefox header files are installed (optional)
-	emake || die "emake failed"
+		#$(use_enable !sdl glext) \
+	# ugly workaround
+	sed -i 's:exit $EXIT_FAILURE:#exit $EXIT_FAILURE:' libtool || die "failed"
 
+	emake -j1 || die "emake failed"
 }
 
 src_install() {
 	make DESTDIR=${D} install || die "make install failed"
+	use nsplugin && inst_plugin /opt/netscape/plugins/libgnashplugin.so
 }
 
 pkg_postinst() {