Version bump.

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

5 files changed, 47 insertions, 34 deletions

diff --git a/www-plugins/gecko-mediaplayer/ChangeLog b/www-plugins/gecko-mediaplayer/ChangeLog
index 0bd4b94b56ab..4a14ddbed9c7 100644
--- a/www-plugins/gecko-mediaplayer/ChangeLog
+++ b/www-plugins/gecko-mediaplayer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-plugins/gecko-mediaplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/ChangeLog,v 1.29 2010/01/26 21:55:52 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/ChangeLog,v 1.30 2010/02/10 16:37:53 ssuominen Exp $
+
+*gecko-mediaplayer-0.9.9 (10 Feb 2010)
+
+  10 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +gecko-mediaplayer-0.9.9.ebuild,
+  +files/gecko-mediaplayer-0.9.9-without-gconf.patch:
+  Version bump.
 
   26 Jan 2010; Ben de Groot <yngwin@gentoo.org>
   gecko-mediaplayer-0.9.8_p347.ebuild,
diff --git a/www-plugins/gecko-mediaplayer/Manifest b/www-plugins/gecko-mediaplayer/Manifest
index 7e980662609b..e4d2f8f9a7fb 100644
--- a/www-plugins/gecko-mediaplayer/Manifest
+++ b/www-plugins/gecko-mediaplayer/Manifest
@@ -1,12 +1,12 @@
-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
 AUX gecko-mediaplayer-0.9.8_p347-gconf-2.m4.patch 2805 RMD160 a9830135f6468857d24808d90c417f565e4dfd52 SHA1 a23a8fbe15d8d760464183e8239e48a34d8d7c5a SHA256 9aed347405ace41d2b383fef0518011c846d464e63f31e4b15ab935ef8b312fb
 AUX gecko-mediaplayer-0.9.8_p347-xulrunner-detection.patch 1791 RMD160 94c6790279b6e9f48000d52dbeb7c1b5fb746aca SHA1 2137864b2f93515eed6be5b109d75c2a421a7576 SHA256 e7ad7d53969cd6c49ce71326a8c759096134feb6248cf318eedf89efd45fd881
-DIST gecko-mediaplayer-0.9.6.tar.gz 389598 RMD160 d50463aeec54ac25404b915f7e659e41b2070e5c SHA1 8de13d93a92729ad9ea2e9e0ccaa1f019c7a44ac SHA256 27fba7e5c1ff53d7b88742a40e85d045a25b9da05b6e3d77fd9de4b4c39687a0
+AUX gecko-mediaplayer-0.9.9-without-gconf.patch 1019 RMD160 a429a25708c426f987e5649ea4d0b29779222ad5 SHA1 d919dac4870fdabc78209bf3ed33011b725beeff SHA256 ef9aac3020640748845ab55cb04471339fd55ad34acbb89180fc69d9da15d5d6
 DIST gecko-mediaplayer-0.9.8.tar.gz 257788 RMD160 46ae679d112f7853b58268de7d6e5a4444a4797d SHA1 a1f90176c0447374ac6518f1eb23984bc2a88ae3 SHA256 a51ebf00021b1d5d43837edebd0fb28d8f6d2626111c4c391e8b0f6515004aa1
+DIST gecko-mediaplayer-0.9.9.tar.gz 260724 RMD160 1ec8762503c155f1ee62d663534943071fd91196 SHA1 68481e9df9c57812763f5e5cfcd01627dbe0a894 SHA256 a6a646509c1f1de3307168b9fced22b84fc5dc5905d85723488b0f38ca02a6d9
 DIST gecko-mediaplayer-r347.tar.bz2 207434 RMD160 75b1ca46b2170aca7ec1a9b5177f37ed0a538ec0 SHA1 c556ffb11dcd893e63e7fa7ccd963b51e14e6c46 SHA256 46155b01f8c1af03db93dd85464f01562d5231d21fd4082b6b8f2451cd78de41
-EBUILD gecko-mediaplayer-0.9.6.ebuild 1341 RMD160 440b0015de715bf32ecad0b0408834f0bde06109 SHA1 77df1397664c6ce9fbd71abc700f2813ef87ced1 SHA256 2043db79bbeb558b3b716743493c0a7674f9dac853db609a41a63db5de24042f
 EBUILD gecko-mediaplayer-0.9.8.ebuild 1573 RMD160 0b6f2bc227f7ce8668b8b2e8bf6aded2a92c83a8 SHA1 a6d51fb17f5f845e35be4f60002565a71a9f697a SHA256 036a0537f500f86afb7489eb9551810c961364ec1322ba1e8e4c00a7b1f59857
 EBUILD gecko-mediaplayer-0.9.8_p347.ebuild 1600 RMD160 09eefc9f4d22b5ebc937fe9c77473b0997e45b1c SHA1 45d0fd21f3c910c7b19686226eeb482425dd471f SHA256 d6f4045dae165e12f09df62b76f737fd35959ba7a18fdb15a423212594db7880
-MISC ChangeLog 6399 RMD160 99898be4bdec1a1388ec34f7f2845e4169d6402e SHA1 f12b71dfe3319e53107c07a5ff519f9faede1858 SHA256 47a732141f149f038331af9fdebcabb0da926de7c3fa631aab1c96075fd723d4
+EBUILD gecko-mediaplayer-0.9.9.ebuild 1517 RMD160 d0320764d3e22d47e1d6028df50d20980cb7f19f SHA1 905b77f2d06ab026f0dc0829a9ce4471fbc631f8 SHA256 2aa7b268a20a103e5a06920ebbf692dea6dc610feee7ac1459e91177b9e31002
+MISC ChangeLog 6602 RMD160 100b92a69e7f78cd3a3f5c3f5873481f85cc55cd SHA1 edb2afd946f8999c92b57be4e166915b2f6c01bd SHA256 f3a8f898dcf2376913aa50d30d0851c37045be1d37e996afe3abfb75c5e0c7db
 MISC metadata.xml 228 RMD160 3071d739d8e15041d594882afdfc434453568466 SHA1 06e3ee83b7a5a910d2d63ea77afb2e5a292606f6 SHA256 060670a1a67923937e4bf55598ae59368d5e716b0b618dedaf12b15f45e8e234
diff --git a/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.6-xul.patch b/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.6-xul.patch
deleted file mode 100644
index 073c611df8a9..000000000000
--- a/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.6-xul.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Upstreamized patch wrt http://bugs.gentoo.org/attachment.cgi?id=273059
-Fixes race condition where two different xulrunners are installed, and
-old headers get picked up by mistake.
-
---- src/plugin_setup.cpp-old	2009-06-09 19:48:33.518153163 -0500
-+++ src/plugin_setup.cpp	2009-06-09 19:48:12.522163011 -0500
-@@ -362,7 +362,7 @@
- 
-     }
- 
--    nperror = NPN_GetValue (instance->mInstance, NPNVSupportsWindowless, &supportsWindowless);
-+    nperror = NPN_GetValue (instance->mInstance, (NPNVariable) 17 /* NPNVSupportsWindowless */, &supportsWindowless);
- 	supportsWindowless = (nperror == NPERR_NO_ERROR) && supportsWindowless;
- 	if (instance->windowless) {
- 		if (supportsWindowless) {
-
diff --git a/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.9-without-gconf.patch b/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.9-without-gconf.patch
new file mode 100644
index 000000000000..f1315ac07d4d
--- /dev/null
+++ b/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.9-without-gconf.patch
@@ -0,0 +1,17 @@
+diff -ur gecko-mediaplayer-0.9.9.orig/configure.in gecko-mediaplayer-0.9.9/configure.in
+--- gecko-mediaplayer-0.9.9.orig/configure.in	2010-02-01 18:00:42.000000000 +0200
++++ gecko-mediaplayer-0.9.9/configure.in	2010-02-10 18:27:16.000000000 +0200
+@@ -96,11 +96,11 @@
+ AC_ARG_WITH([gconf],
+     [AS_HELP_STRING([--with-gconf],
+         [Use Gconf to store preferences])],
+-        [],
++        [AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL],[1])],
+         [with_gconf=check])
+ AS_IF([test "x$with_gconf" != xno],        
+     [PKG_CHECK_MODULES(GCONF, [gconf-2.0],[AM_GCONF_SOURCE_2
+- GCONF_DEFINES="-DHAVE_GCONF" AC_DEFINE([HAVE_GCONF],[1],[Define to 1 to use GConf to store preferences])],AC_MSG_NOTICE([Using keystore for preferences]))
++ GCONF_DEFINES="-DHAVE_GCONF" AC_DEFINE([HAVE_GCONF],[1],[Define to 1 to use GConf to store preferences])],[AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL],[1]) AC_MSG_NOTICE([Using keystore for preferences])])
+     AC_SUBST(GCONF_DEFINES)
+     AC_SUBST(GCONF_CFLAGS)
+     AC_SUBST(GCONF_LIBS)
diff --git a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.6.ebuild b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.9.ebuild
index 1052387e53a4..6ffbc198e532 100644
--- a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.6.ebuild
+++ b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.9.ebuild
@@ -1,39 +1,44 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.6.ebuild,v 1.7 2009/07/02 11:56:49 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.9.ebuild,v 1.1 2010/02/10 16:37:53 ssuominen Exp $
 
 EAPI=2
 GCONF_DEBUG=no
-inherit eutils gnome2 multilib
+inherit autotools gnome2 multilib
 
-DESCRIPTION="A browser multimedia plugin using gnome-mplayer"
-HOMEPAGE="http://code.google.com/p/gecko-mediaplayer"
+DESCRIPTION="A browser plugin that uses 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"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="gnome"
 
-RDEPEND="dev-libs/glib:2
+RDEPEND=">=dev-libs/glib-2.14:2
 	net-libs/xulrunner:1.9
 	dev-libs/nspr
-	dev-libs/dbus-glib
-	>=media-video/gnome-mplayer-${PV}
+	>=dev-libs/dbus-glib-0.70
+	>=media-video/gnome-mplayer-0.9.9
 	gnome? ( gnome-base/gconf:2 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	sys-devel/gettext"
 
 pkg_setup() {
-	G2CONF+=" $(use_with gnome gconf)
-		$(use_enable gnome schemas-install)"
 	DOCS="ChangeLog DOCS/tech/javascript.txt"
+	G2CONF="--disable-dependency-tracking
+		$(use_enable gnome schemas-install)
+		$(use_with gnome gconf)
+		--with-gio"
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-without-gconf.patch \
+		"${FILESDIR}"/${PN}-0.9.8_p347-gconf-2.m4.patch \
+		"${FILESDIR}"/${PN}-0.9.8_p347-xulrunner-detection.patch
+	eautoreconf
 	gnome2_src_prepare
-	epatch "${FILESDIR}"/${P}-xul.patch
 }
 
 src_install() {
@@ -43,7 +48,7 @@ src_install() {
 	# 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"
+		"${D}"/usr/$(get_libdir)/nsbrowser/plugins || die
 	rm -rf "${D}"/usr/$(get_libdir)/nspr
 	rm -rf "${D}"/var
 }