amd64 stable wrt #289703

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

4 files changed, 9 insertions, 61 deletions

diff --git a/www-plugins/gecko-mediaplayer/ChangeLog b/www-plugins/gecko-mediaplayer/ChangeLog
index d9c5a8d545f2..ae3855ba3daf 100644
--- a/www-plugins/gecko-mediaplayer/ChangeLog
+++ b/www-plugins/gecko-mediaplayer/ChangeLog
@@ -1,6 +1,10 @@
 # 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.18 2009/09/29 17:33:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/ChangeLog,v 1.19 2009/10/19 11:34:29 ssuominen Exp $
+
+  19 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
+  gecko-mediaplayer-0.9.8.ebuild:
+  amd64 stable wrt #289703
 
   29 Sep 2009; Samuli Suominen <ssuominen@gentoo.org>
   gecko-mediaplayer-0.9.8.ebuild:
diff --git a/www-plugins/gecko-mediaplayer/Manifest b/www-plugins/gecko-mediaplayer/Manifest
index b8e0e7a8852d..0fc3a8a104b2 100644
--- a/www-plugins/gecko-mediaplayer/Manifest
+++ b/www-plugins/gecko-mediaplayer/Manifest
@@ -1,10 +1,8 @@
 AUX gecko-mediaplayer-0.9.6-xul.patch 687 RMD160 f31e072487afa241cd35d9649b5284c7ead24167 SHA1 25ce0ce8b1b1f33c4dc5ba5be8118b120c53553f SHA256 a618947606fd92efa779d6939146c2e5b6b49541c1f6520f1d34a4a2ca40f856
 AUX gecko-mediaplayer-0.9.8-asneeded.patch 3787 RMD160 afcfb3d75fdfadab10903b622d386921651096a9 SHA1 a8f0dcbe369c2bfbbf0d3ebfcdf01d2f6d18aada SHA256 0ac9d19b1e44195b19a3c0afde58bf3b150b65b07d1f9055655c9d2bb6df4ea1
 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
 DIST gecko-mediaplayer-0.9.8.tar.gz 257788 RMD160 46ae679d112f7853b58268de7d6e5a4444a4797d SHA1 a1f90176c0447374ac6518f1eb23984bc2a88ae3 SHA256 a51ebf00021b1d5d43837edebd0fb28d8f6d2626111c4c391e8b0f6515004aa1
 EBUILD gecko-mediaplayer-0.9.6.ebuild 1341 RMD160 440b0015de715bf32ecad0b0408834f0bde06109 SHA1 77df1397664c6ce9fbd71abc700f2813ef87ced1 SHA256 2043db79bbeb558b3b716743493c0a7674f9dac853db609a41a63db5de24042f
-EBUILD gecko-mediaplayer-0.9.7-r1.ebuild 1613 RMD160 fec1a3d9946bb09dad973cd6a684a72ff361fe3f SHA1 c5a5b524704559da2203ed0f3d6dfea247412836 SHA256 678de63746270393e3c59cf8861818aac7f5c07b53ac31415112def053e4ce92
-EBUILD gecko-mediaplayer-0.9.8.ebuild 1582 RMD160 1b13331918613763d347e8bf1d021850030d8271 SHA1 6cafcb667838d87bbd0abfd84c433dd11da8e9b4 SHA256 1d373fd9ccad4d12c9cfd8141b21fe7b0091881222fcddd4c1ece22bb34b357e
-MISC ChangeLog 4571 RMD160 46753d33cc93bc708c8234c02ed6eac90b0d1dd3 SHA1 faa0a4d614b9484281ea3da2159fae6235513d66 SHA256 3e2ddbc5dde057af09f95ac7302a55deb934d5e69cac11e08f2716ef06ec8789
+EBUILD gecko-mediaplayer-0.9.8.ebuild 1581 RMD160 2c480356e31562b2f8cfca746b71331d8622f072 SHA1 e3be32a0654fe006ddf40c838febd7811c307800 SHA256 1415f5b7a52cb18c010a92de24fb53921eae7700146b831f835ae0efcaae9cb1
+MISC ChangeLog 4687 RMD160 65e65633044aaa7c22a032171ccd94f9e4773a28 SHA1 1994c816052c769bff8107d339c9e79afdb736e8 SHA256 34af7e76a541a20adc2b5cfc312bce0a53378dc151219a3a2fa33349335cf1a6
 MISC metadata.xml 228 RMD160 3071d739d8e15041d594882afdfc434453568466 SHA1 06e3ee83b7a5a910d2d63ea77afb2e5a292606f6 SHA256 060670a1a67923937e4bf55598ae59368d5e716b0b618dedaf12b15f45e8e234
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
deleted file mode 100644
index fabf0040fcb9..000000000000
--- a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.7-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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.2 2009/09/29 16:39:26 idl0r Exp $
-
-EAPI=2
-GCONF_DEBUG=no
-inherit gnome2 multilib
-
-DESCRIPTION="A browser multimedia plugin using gnome-mplayer"
-HOMEPAGE="http://code.google.com/p/gecko-mediaplayer"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="gnome"
-
-RDEPEND=">=dev-libs/glib-2.14:2
-	net-libs/xulrunner:1.9
-	dev-libs/nspr
-	>=dev-libs/dbus-glib-0.70
-	>=media-video/gnome-mplayer-${PV}
-	gnome? ( >=gnome-base/gconf-2:2 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-pkg_setup() {
-	G2CONF="$(use_enable gnome schemas-install)
-		$(use_with gnome gconf)
-		--with-gio"
-	DOCS="ChangeLog DOCS/tech/javascript.txt"
-}
-
-src_prepare() {
-	# 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() {
-	gnome2_src_install
-	rm -rf "${D}"/usr/share/doc/${PN}
-
-	# move plugins to correct location and clean up empty dirs
-	dodir /usr/$(get_libdir)/nsbrowser/plugins
-	mv "${D}"/usr/$(get_libdir)/nspr/mozilla/plugins/${PN}* \
-		"${D}"/usr/$(get_libdir)/nsbrowser/plugins || die "mv plugins failed"
-	rm -rf "${D}"/usr/$(get_libdir)/nspr
-	rm -rf "${D}"/var
-}
diff --git a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.8.ebuild b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.8.ebuild
index 9eef939cbd25..f997c57a6110 100644
--- a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.8.ebuild
+++ b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.8.ebuild
@@ -1,6 +1,6 @@
 # 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.8.ebuild,v 1.2 2009/09/29 17:33:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.8.ebuild,v 1.3 2009/10/19 11:34:29 ssuominen Exp $
 
 EAPI=2
 GCONF_DEBUG=no
@@ -12,7 +12,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="gnome"
 
 RDEPEND=">=dev-libs/glib-2.14:2