Stop using gnome2.eclass and remove support for gnome-base/gconf wrt #364513.

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

4 files changed, 52 insertions, 50 deletions

diff --git a/www-plugins/gecko-mediaplayer/ChangeLog b/www-plugins/gecko-mediaplayer/ChangeLog
index 30f601ac792c..bdcaebae0b73 100644
--- a/www-plugins/gecko-mediaplayer/ChangeLog
+++ b/www-plugins/gecko-mediaplayer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-plugins/gecko-mediaplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/ChangeLog,v 1.46 2011/04/22 11:26:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/ChangeLog,v 1.47 2011/04/23 09:21:25 ssuominen Exp $
+
+*gecko-mediaplayer-1.0.3-r1 (23 Apr 2011)
+
+  23 Apr 2011; Samuli Suominen <ssuominen@gentoo.org>
+  +gecko-mediaplayer-1.0.3-r1.ebuild:
+  Stop using gnome2.eclass and remove support for gnome-base/gconf wrt #364513.
 
 *gecko-mediaplayer-1.0.3 (22 Apr 2011)
 
diff --git a/www-plugins/gecko-mediaplayer/Manifest b/www-plugins/gecko-mediaplayer/Manifest
index c160304a2e89..e2f4d5441d49 100644
--- a/www-plugins/gecko-mediaplayer/Manifest
+++ b/www-plugins/gecko-mediaplayer/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
 DIST gecko-mediaplayer-1.0.0.tar.gz 263320 RMD160 218134c088669ae15ab12b7f008d988af3eba308 SHA1 702fbb47b45b92fcffbcd324983e96a8027bc075 SHA256 d0e5d6516c943de2257661d4718c91aa878e243d3fa891a121e99c887929499e
 DIST gecko-mediaplayer-1.0.3.tar.gz 271546 RMD160 4c13ee90d38382454b2d126f5d263e72a5adb0ca SHA1 48198a321504b11f53c563bceeac1bc3dc4b4058 SHA256 0c91f1e5f4f245558201b5088913a58203d423a95795323f7cfcc530920cdda2
 EBUILD gecko-mediaplayer-1.0.0.ebuild 1358 RMD160 25b5fc09d59073094e3f90c8251b3e77d90dbf2e SHA1 426f6135efdf131d26e9e253f21e820d600b7ecf SHA256 50698348136604e20ab6d47c27a98ad8dd37ea6d4483ceabf8fc2e93a2c75aea
-EBUILD gecko-mediaplayer-1.0.3.ebuild 1169 RMD160 19abb2e45da775412c3a08ec8ffdb2d9a1519c8e SHA1 36d7435eae57c32072d6739eaeb747bbbb66d8b9 SHA256 a31958d08b6d4aad25b2166e98929f959c6bbb3365a924eb82732791d6c3c94e
-MISC ChangeLog 8727 RMD160 e3e69e64614a53430f9730a8ff2f90416aa91e56 SHA1 fafb6dc6fb0e9729d92f3f4b333a7c88778bea12 SHA256 b756fe12206c15dc4026fb9590aedbd1eb54e7f5a48cb93214ce146b576fc6fd
+EBUILD gecko-mediaplayer-1.0.3-r1.ebuild 1018 RMD160 f81fd1f69f345e3c406294b843faa2a6eab57df4 SHA1 94686a651ce3df38959f11326b7bbeeb342b71b8 SHA256 fbd1bfacddcf43b3b126c116e60d4470ad97cfa9a509ebce4d00ee0ed0972d48
+MISC ChangeLog 8943 RMD160 5ddb527b167cf9c1a6fcac4ca67ea1010e3f4653 SHA1 053cbfc1e003cd903f3aa90c5836047585332c64 SHA256 9f62d9c5e804110da07281e37e8cc58dfbb8be94811be2230adcbc7833a74af0
 MISC metadata.xml 228 RMD160 3071d739d8e15041d594882afdfc434453568466 SHA1 06e3ee83b7a5a910d2d63ea77afb2e5a292606f6 SHA256 060670a1a67923937e4bf55598ae59368d5e716b0b618dedaf12b15f45e8e234
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2xZhUACgkQXkR9YqOcLPErEAD/fqulzWaUrWnyWiOBwzGe5rXM
-Ud9ixJmMH6nAc8LKVCAA/RSLcFtVFknYriIJp+mVAzkeD/K4T1GVuIEH1xzZz+Q8
-=asmB
+iF4EAREIAAYFAk2ymlsACgkQXkR9YqOcLPFJOwD+J/6qtdquE7eEkELaQpVDYux2
+j5l7JZ7fUbNk0ytg1QAA/3hh5Mg7iztEnAvUovBUJFq0QPzrjM0k2OvDGasqpWnm
+=+/aV
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.3-r1.ebuild b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..ec15929207ab
--- /dev/null
+++ b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.3-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.3-r1.ebuild,v 1.1 2011/04/23 09:21:25 ssuominen Exp $
+
+EAPI=4
+inherit multilib nsplugins
+
+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 ~ppc ~ppc64 ~x86"
+IUSE="curl"
+
+RDEPEND=">=dev-libs/dbus-glib-0.92
+	>=dev-libs/glib-2.26:2
+	dev-libs/nspr
+	>=media-video/gnome-mplayer-${PV}[dbus]
+	>=net-libs/xulrunner-1.9.2:1.9
+	curl? ( net-misc/curl )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+DOCS="ChangeLog DOCS/tech/javascript.txt"
+
+src_configure() {
+	econf \
+		--without-gconf \
+		--with-gio \
+		--with-plugin-dir=/usr/$(get_libdir)/${PLUGINS_DIR} \
+		$(use_with curl libcurl)
+}
+
+src_install() {
+	default
+	rm -rf "${ED}"/usr/share/doc/${PN}
+}
diff --git a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.3.ebuild b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.3.ebuild
deleted file mode 100644
index bc985da711f9..000000000000
--- a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.3.ebuild,v 1.1 2011/04/22 11:26:12 ssuominen Exp $
-
-EAPI=2
-GCONF_DEBUG=no
-inherit gnome2 multilib nsplugins
-
-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 ~ppc ~ppc64 ~x86"
-IUSE="curl gnome"
-
-RDEPEND=">=dev-libs/glib-2.14:2
-	net-libs/xulrunner:1.9
-	dev-libs/nspr
-	>=dev-libs/dbus-glib-0.92
-	>=media-video/gnome-mplayer-${PV}[dbus]
-	curl? ( net-misc/curl )
-	gnome? ( gnome-base/gconf:2 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-pkg_setup() {
-	G2CONF="--disable-dependency-tracking
-		$(use_enable gnome schemas-install)
-		$(use_with gnome gconf)
-		--with-gio
-		$(use_with curl libcurl)
-		--with-plugin-dir=/usr/$(get_libdir)/${PLUGINS_DIR}"
-
-	DOCS="ChangeLog DOCS/tech/javascript.txt"
-}
-
-src_install() {
-	gnome2_src_install
-	rm -rf "${D}"/usr/share/doc/${PN}
-	rmdir -p "${D}"/var/lib
-}