more complete as-needed, ebuild cleanups

Package-Manager: portage-2.1_pre10-r4

3 files changed, 30 insertions, 17 deletions

diff --git a/net-www/gnash/Manifest b/net-www/gnash/Manifest
index 83144d2073ed..536fd38fb8f3 100644
--- a/net-www/gnash/Manifest
+++ b/net-www/gnash/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX gnash-as-needed.diff 839 RMD160 ea2a64d02951e19d64a09e1a4f998c4781274294 SHA1 11a6964f2774efc3e19027f4ab15af9026c692a0 SHA256 87b8aa74b2401671ad2a0758f8e652bd8031c1dc1a7f2e5c701489965bb8e141 size 839
-MD5 85c62938a72cc754436613833e8a47d6 files/gnash-as-needed.diff 839
-RMD160 ea2a64d02951e19d64a09e1a4f998c4781274294 files/gnash-as-needed.diff 839
-SHA256 87b8aa74b2401671ad2a0758f8e652bd8031c1dc1a7f2e5c701489965bb8e141 files/gnash-as-needed.diff 839
+AUX gnash-as-needed.diff 1359 RMD160 e3caac39b725724bb3d31cde6f0a9bae7788363e SHA1 c8524a715e912d74a21187c89d9d7460040ef384 SHA256 beae9755cc8c45b4675b562dd57da720e5b24b56dfebe5a7e7220e4dadc019c7 size 1359
+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 1946 RMD160 f0f2765cdd0b5e0c66fa7c61ac73ab4d361ab8e4 SHA1 e721fe760a9a2b5ee5c8b73a9af965f700748646 SHA256 724dfebebfaa75ce292b22fb133ad8340aa1606181da73469aee819f6f556f96 size 1946
-MD5 997e45ed3b11557b76d20d064dad9e22 gnash-0.7.1.ebuild 1946
-RMD160 f0f2765cdd0b5e0c66fa7c61ac73ab4d361ab8e4 gnash-0.7.1.ebuild 1946
-SHA256 724dfebebfaa75ce292b22fb133ad8340aa1606181da73469aee819f6f556f96 gnash-0.7.1.ebuild 1946
+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
@@ -24,7 +24,7 @@ SHA256 0e0aba61d3e68f0b415d528c2d5483f4d9cb8c967ad611d29b043caa45a7e0d8 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEYTOBNJowsmZ/PzARAjD3AJ0ZRoaDaXHaJWXWIfsRQr1qGwjDjQCeO/dR
-2CQSwX9enkWAru08Exb4D8s=
-=nXNK
+iD8DBQFEYvJqNJowsmZ/PzARAuHyAJ9TCws1k3AsVJf3DUpIVISIvb3tLACfd/a+
+Unz2nkeWh3hJdllYmjHcFFs=
+=oCxE
 -----END PGP SIGNATURE-----
diff --git a/net-www/gnash/files/gnash-as-needed.diff b/net-www/gnash/files/gnash-as-needed.diff
index 1b64cc802189..627f348f6873 100644
--- a/net-www/gnash/files/gnash-as-needed.diff
+++ b/net-www/gnash/files/gnash-as-needed.diff
@@ -5,7 +5,7 @@ diff -u gnash-0.7.1/libbase/Makefile.am.orig gnash-0.7.1/libbase/Makefile.am
  	utf8.cpp		\
  	utility.cpp		\
  	zlib_adapter.cpp
-+libgnashbase_la_LIBADD = $(JPEG_LIBS)
++libgnashbase_la_LIBADD = $(JPEG_LIBS) $(ZLIB_LIBS)
  
  noinst_HEADERS = \
  	container.h		\
@@ -16,7 +16,20 @@ diff -u gnash-0.7.1/server/Makefile.am.orig gnash-0.7.1/server/Makefile.am
          text.cpp         \
          array.cpp        \
          types.cpp $(MP3_HANDLER)
-+libgnashserver_la_LIBADD = libgnashasobjs.la $(MAD_LIBS) $(LIBXML_LIBS) $(OPENGL_LIBS)
++libgnashserver_la_LIBADD = libgnashasobjs.la $(MP3_LIBS) $(LIBXML_LIBS) $(OPENGL_LIBS) $(ZLIB_LIBS)
  
  noinst_HEADERS = $(as_incls) \
  	action.h	\
+diff -u gnash-0.7.1/plugin/klash/Makefile.am.orig gnash-0.7.1/plugin/klash/Makefile.am
+--- gnash-0.7.1/plugin/klash/Makefile.am.orig	2006-05-11 01:08:17.000000000 +0200
++++ gnash-0.7.1/plugin/klash/Makefile.am	2006-05-11 01:10:37.000000000 +0200
+@@ -116,7 +116,8 @@
+ 	../../server/libgnashserver.la \
+ 	../../server/libgnashasobjs.la \
+ 	../../libgeometry/libgnashgeo.la \
+-	../../libbase/libgnashbase.la
++	../../libbase/libgnashbase.la \
++	$(LIB_QT)
+ 
+ 
+ CLEANFILES = klash_part.moc klash.moc
diff --git a/net-www/gnash/gnash-0.7.1.ebuild b/net-www/gnash/gnash-0.7.1.ebuild
index 6a968780ecbe..7f8dc864a535 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.2 2006/05/10 00:27:36 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.7.1.ebuild,v 1.3 2006/05/11 08:14:18 genstef Exp $
 
 inherit nsplugins kde-functions autotools
 
@@ -11,7 +11,7 @@ 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"
+IUSE="dmalloc mp3 nsplugin nptl xml kde gtk video_cards_i810"
 
 DEPEND="sys-libs/zlib
 	media-libs/jpeg
@@ -55,8 +55,8 @@ src_compile() {
 		$(use_enable nptl pthreads) \
 		$(use_enable xml) \
 		$(use_enable gtk glext) \
+		$(use_enable video_cards_i810 i810-lod-bias) \
 		--with-plugindir=/opt/netscape/plugins \
-		${myconf} \
 		|| die "econf failed"
 	emake || die "emake failed"
 		# fails when disabled
@@ -67,7 +67,7 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} install || die "make install failed"
 	use nsplugin && inst_plugin /opt/netscape/plugins/libgnashplugin.so \
-		|| rm ${D}//opt/netscape/plugins/libgnashplugin.so
+		|| rm ${D}/opt/netscape/plugins/libgnashplugin.so
 	dodoc AUTHORS ChangeLog NEWS README
 }