Fix bug 286795.

Package-Manager: portage-2.2_rc42/cvs/Linux x86_64

4 files changed, 19 insertions, 67 deletions

diff --git a/www-plugins/gecko-mediaplayer/ChangeLog b/www-plugins/gecko-mediaplayer/ChangeLog
index cb85bc1857ee..e9d7aafb3d7a 100644
--- a/www-plugins/gecko-mediaplayer/ChangeLog
+++ b/www-plugins/gecko-mediaplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-plugins/gecko-mediaplayer
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/ChangeLog,v 1.15 2009/09/27 20:41:07 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/ChangeLog,v 1.16 2009/09/29 16:39:26 idl0r Exp $
+
+  29 Sep 2009; Christian Ruppert <idl0r@gentoo.org>
+  gecko-mediaplayer-0.9.7-r1.ebuild,
+  -files/gecko-mediaplayer-as-needed.patch:
+  Fix bug 286795.
 
 *gecko-mediaplayer-0.9.7-r1 (27 Sep 2009)
 
diff --git a/www-plugins/gecko-mediaplayer/Manifest b/www-plugins/gecko-mediaplayer/Manifest
index 577b1156fb36..8870d22e25a3 100644
--- a/www-plugins/gecko-mediaplayer/Manifest
+++ b/www-plugins/gecko-mediaplayer/Manifest
@@ -2,17 +2,16 @@
 Hash: SHA1
 
 AUX gecko-mediaplayer-0.9.6-xul.patch 687 RMD160 f31e072487afa241cd35d9649b5284c7ead24167 SHA1 25ce0ce8b1b1f33c4dc5ba5be8118b120c53553f SHA256 a618947606fd92efa779d6939146c2e5b6b49541c1f6520f1d34a4a2ca40f856
-AUX gecko-mediaplayer-as-needed.patch 2025 RMD160 8bad537b6dd8655fdad4065e353408833b2b3413 SHA1 5699921d4f62057381f3ba01b9341c1f0a267cf5 SHA256 50bb184291c882386f4ab8d85cbcece90db5897c221315a252d658ea6b6f3878
 DIST gecko-mediaplayer-0.9.6.tar.gz 389598 RMD160 d50463aeec54ac25404b915f7e659e41b2070e5c SHA1 8de13d93a92729ad9ea2e9e0ccaa1f019c7a44ac SHA256 27fba7e5c1ff53d7b88742a40e85d045a25b9da05b6e3d77fd9de4b4c39687a0
 DIST gecko-mediaplayer-0.9.7.tar.gz 255773 RMD160 7b05c8942a1158db0a1a31bfb72f3ba349b0a3cb SHA1 2b43163e93a04be85bd2b1059c9c7c427519ec4d SHA256 f37aa469ee709fe397bfb2cdafe36f75f6600ed271eeba7a993b135ff069f404
 EBUILD gecko-mediaplayer-0.9.6.ebuild 1341 RMD160 440b0015de715bf32ecad0b0408834f0bde06109 SHA1 77df1397664c6ce9fbd71abc700f2813ef87ced1 SHA256 2043db79bbeb558b3b716743493c0a7674f9dac853db609a41a63db5de24042f
-EBUILD gecko-mediaplayer-0.9.7-r1.ebuild 1385 RMD160 0adee7e53eec71b86901a9826a7ef4c4976bbccc SHA1 4b7bf9fe4b61b5328607525dabf311278bdc47a9 SHA256 673bddab4e92a9e1c854b320bca3b2197ec78dca4ddc6dd03e1f5ef1aaff6877
-MISC ChangeLog 4060 RMD160 8bc9dd7480d4d9dddaf9fb5501785ddd66666fbb SHA1 57948d6d270dc216d321ad5c1e35b0d2e7b81585 SHA256 b4af3c3acab166bc27d823c5a9e40280fd83082b08c92ce2f97bfa385ff4d627
+EBUILD gecko-mediaplayer-0.9.7-r1.ebuild 1613 RMD160 fec1a3d9946bb09dad973cd6a684a72ff361fe3f SHA1 c5a5b524704559da2203ed0f3d6dfea247412836 SHA256 678de63746270393e3c59cf8861818aac7f5c07b53ac31415112def053e4ce92
+MISC ChangeLog 4212 RMD160 4f896424f359ab2ad54f699c65ea4de6a5502e7d SHA1 c1a106425e32a0d19b47cd7f1a251f3d6ce1449e SHA256 bdfbcdff173397baa4bd28dd98c49da1927a34f031529e60640e6f90bc844c96
 MISC metadata.xml 228 RMD160 3071d739d8e15041d594882afdfc434453568466 SHA1 06e3ee83b7a5a910d2d63ea77afb2e5a292606f6 SHA256 060670a1a67923937e4bf55598ae59368d5e716b0b618dedaf12b15f45e8e234
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkq/zgAACgkQixe2jn+ufTjJ+gCfR9q2D5q5aV8a/7vDdGgs4o/A
-3EsAni8IXvWkyOKxVqmA3PWWLAsQ32Ln
-=cFSc
+iEYEARECAAYFAkrCOEsACgkQixe2jn+ufTi9rgCeK/pdW5cOdaljy910+BQOfm0G
+yNsAn0cWaYuokJu0knX3fL0rAZ1B0yi6
+=kVh+
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-as-needed.patch b/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-as-needed.patch
deleted file mode 100644
index b9b0a9eaf7c6..000000000000
--- a/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-as-needed.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- src/Makefile.am.old	2009-09-27 21:32:26.566057010 +0200
-+++ src/Makefile.am	2009-09-27 21:33:33.564053846 +0200
-@@ -39,6 +39,8 @@ COMMONCODE = \
- 	npp_gate.cpp \
- 	npupp.h
- 
-+LIBS = $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS)
-+
- install_libexecdir = $(libdir)/mozilla/plugins
- install_libexec_PROGRAMS = \
- 	gecko-mediaplayer.so \
-@@ -52,7 +54,7 @@ gecko_mediaplayer_so_SOURCES = \
- 	$(COMMONCODE)
- 		
- gecko_mediaplayer_so_CFLAGS = -fPIC 
--gecko_mediaplayer_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC
-+gecko_mediaplayer_so_LDFLAGS = -shared -fPIC
- gecko_mediaplayer_so_LDADD = libgmlib/libgmlib.a
- 
- gecko_mediaplayer_qt_so_SOURCES = \
-@@ -60,7 +62,7 @@ gecko_mediaplayer_qt_so_SOURCES = \
- 	$(COMMONCODE)
- 	
- gecko_mediaplayer_qt_so_CFLAGS = -fPIC 
--gecko_mediaplayer_qt_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC 
-+gecko_mediaplayer_qt_so_LDFLAGS = -shared -fPIC 
- gecko_mediaplayer_qt_so_LDADD = libgmlib/libgmlib.a
- 
- gecko_mediaplayer_wmp_so_SOURCES = \
-@@ -68,7 +70,7 @@ gecko_mediaplayer_wmp_so_SOURCES = \
- 	$(COMMONCODE)
- 	
- gecko_mediaplayer_wmp_so_CFLAGS = -fPIC 
--gecko_mediaplayer_wmp_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC 
-+gecko_mediaplayer_wmp_so_LDFLAGS = -shared -fPIC 
- gecko_mediaplayer_wmp_so_LDADD = libgmlib/libgmlib.a
- 
- gecko_mediaplayer_dvx_so_SOURCES = \
-@@ -76,7 +78,7 @@ gecko_mediaplayer_dvx_so_SOURCES = \
- 	$(COMMONCODE)
- 	
- gecko_mediaplayer_dvx_so_CFLAGS = -fPIC 
--gecko_mediaplayer_dvx_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC
-+gecko_mediaplayer_dvx_so_LDFLAGS = -shared -fPIC
- gecko_mediaplayer_dvx_so_LDADD = libgmlib/libgmlib.a
- 
- gecko_mediaplayer_rm_so_SOURCES = \
-@@ -84,7 +86,7 @@ gecko_mediaplayer_rm_so_SOURCES = \
- 	$(COMMONCODE)
- 	
- gecko_mediaplayer_rm_so_CFLAGS = -fPIC 
--gecko_mediaplayer_rm_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC
-+gecko_mediaplayer_rm_so_LDFLAGS = -shared -fPIC
- gecko_mediaplayer_rm_so_LDADD = libgmlib/libgmlib.a
- 
- indent:
diff --git a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.7-r1.ebuild b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.7-r1.ebuild
index a6af7f9aae53..fabf0040fcb9 100644
--- a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.7-r1.ebuild
+++ b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.7-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.7-r1.ebuild,v 1.1 2009/09/27 20:41:07 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.7-r1.ebuild,v 1.2 2009/09/29 16:39:26 idl0r Exp $
 
 EAPI=2
 GCONF_DEBUG=no
-inherit gnome2 multilib autotools eutils
+inherit gnome2 multilib
 
 DESCRIPTION="A browser multimedia plugin using gnome-mplayer"
 HOMEPAGE="http://code.google.com/p/gecko-mediaplayer"
@@ -33,8 +33,12 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-as-needed.patch"
-	eautoreconf
+	# Fix as-needed, bug 279419 and bug 286795.
+	# bug 279419 has been fixed by upstream in 0.9.8.
+	sed -i -r \
+		-e 's:(gecko_mediaplayer(_.+)?_so_LDFLAGS) = .*:\1 = -shared -fPIC:' \
+		-e 's:(gecko_mediaplayer(_.+)?_so_LDADD = .*):\1 $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS):' \
+		src/Makefile.in || die
 }
 
 src_install() {