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, 38 insertions, 105 deletions

diff --git a/media-video/gnome-mplayer/ChangeLog b/media-video/gnome-mplayer/ChangeLog
index d203661de50b..3156daa4a920 100644
--- a/media-video/gnome-mplayer/ChangeLog
+++ b/media-video/gnome-mplayer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/gnome-mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/ChangeLog,v 1.54 2011/04/22 11:13:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/ChangeLog,v 1.55 2011/04/23 08:58:21 ssuominen Exp $
+
+*gnome-mplayer-1.0.3-r1 (23 Apr 2011)
+
+  23 Apr 2011; Samuli Suominen <ssuominen@gentoo.org>
+  +gnome-mplayer-1.0.3-r1.ebuild:
+  Stop using gnome2.eclass and remove support for gnome-base/gconf wrt #364513.
 
 *gnome-mplayer-1.0.3 (22 Apr 2011)
 
diff --git a/media-video/gnome-mplayer/Manifest b/media-video/gnome-mplayer/Manifest
index 2aac21d4a247..714338410528 100644
--- a/media-video/gnome-mplayer/Manifest
+++ b/media-video/gnome-mplayer/Manifest
@@ -4,17 +4,15 @@ Hash: SHA256
 AUX gnome-mplayer-1.0.0-libnotify-0.7.patch 1091 RMD160 701b3bc3e5e103ba2e32f3185a4ce4a4b5e8ef0d SHA1 b42a416fa332ab144081fafeb12c003a43805745 SHA256 e18662cb267fdb12c30af59be49e83ef7b0b1bbdbc6b9a990a2369dfa363ee86
 AUX gnome-mplayer-1.0.2-implicit_declaration.patch 250 RMD160 14a3a3023b633bedd50e90cabf1d5ee58e0092dd SHA1 77b6e871274d1dd77744dc3e900277ce8ac3033e SHA256 a89a56c9b6820cc8beecd3ca5df35d5492f6295b82a6aaa06e531eae279e8c0c
 DIST gnome-mplayer-1.0.0.tar.gz 903789 RMD160 1d64094c2e72369d06cc97686fbc433dfee87638 SHA1 ef94c3170cc4d425403c8de67efb8f64dc7f762f SHA256 4694a4f8409039cef7206eb072952721262dbec372669373b732e617dd5ee530
-DIST gnome-mplayer-1.0.2.tar.gz 948288 RMD160 ac12058012b2f9d53bc3f6397829bebc2cd7d46f SHA1 b2b0edf10f5d8796f6c291725539cc997151b92b SHA256 06082073ffa1351566e9992a67d9309cd04b367fb3b62c6fa5024761c897b40d
 DIST gnome-mplayer-1.0.3.tar.gz 1016907 RMD160 f8bd3a0c35f7362dcf1052612b49726e506af28a SHA1 99e78a10a9801b7da5f4dc59b0266f18953a9d22 SHA256 7e24cdd515264520c30949577db6149c448c2d8feb9207c7f81c9619538fc172
 EBUILD gnome-mplayer-1.0.0.ebuild 1771 RMD160 8c6d2c8900008492ddb1f760eb2bb3526ca88b7f SHA1 a93345c185fde28e1c876b198797df2f0553f57c SHA256 b542174a84d7f6518518ca4ee0a65babc04d55bfc24fd0ff52b8a79d97894ec8
-EBUILD gnome-mplayer-1.0.2.ebuild 1748 RMD160 7750e7c163fc8a6e0c68b018a93940ccd6e55bb9 SHA1 482a57bcef8c67d6ea9ad2231eafa63822026704 SHA256 4763d2470c75f57746567e5c82c1f64127b0f717d8829321bd876860fbe82694
-EBUILD gnome-mplayer-1.0.3.ebuild 1755 RMD160 a181159934117096961bc1a90faea8a9570e99fe SHA1 426f92e144ad1adfcfc382469909ef38ba629069 SHA256 5eee064f347c3bf67df0d28de84bd4f99a1e4bb12f5ae2a37ec21afd333ea877
-MISC ChangeLog 7901 RMD160 4907222e5bd1b3806cf3567dd5d7a69e92824962 SHA1 2531b0a5d79ff2605fb4da2a0250ed616cb58cd1 SHA256 83f17708e405999268c7683866a93656352ca40bb085e5ccad9952d34e555bd9
+EBUILD gnome-mplayer-1.0.3-r1.ebuild 1670 RMD160 c81b237c279c85e7b0adc5d58500fab00bb9a208 SHA1 ea742fe37b63e53e8bbe9553dbd7334df83471dc SHA256 bfd1889980f25e3de62fb17db5faee75c21feb2ed484e0c1a1332c89b7e23767
+MISC ChangeLog 8109 RMD160 da89b4c783aa5fc5b16da024dc4494a30a461da0 SHA1 4cd051461caa9a29d217c132b8c10c30380f0b45 SHA256 1d1d0d68c4afbf6836a4713421933a57eb71cab17f9fddfeded795ec42f48895
 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2xY6UACgkQXkR9YqOcLPEEGwD+OaVIn1Jd+8PHyzs+UPFrgtdK
-ntrpzyXD2miMMarWjHwA/ApBobZB/jLndH7dQt6xtPEoRdrYRit/QhGf81ZQ9fc3
-=DGlT
+iF4EAREIAAYFAk2ylPMACgkQXkR9YqOcLPHNkwEAk7ylWwfflUis5G2nW5gk7rD7
+yKQRHWn4JR0Y1Jgg/UABAKWMk2MS8zwa4t9BAtLd3/E7Pu5jU82aNrZ7J7DmfGMP
+=e4pN
 -----END PGP SIGNATURE-----
diff --git a/media-video/gnome-mplayer/gnome-mplayer-1.0.2.ebuild b/media-video/gnome-mplayer/gnome-mplayer-1.0.2.ebuild
deleted file mode 100644
index 1dd18aeb63dd..000000000000
--- a/media-video/gnome-mplayer/gnome-mplayer-1.0.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/gnome-mplayer-1.0.2.ebuild,v 1.1 2011/03/03 19:30:25 ssuominen Exp $
-
-EAPI=3
-GCONF_DEBUG=no
-inherit eutils gnome2
-
-DESCRIPTION="A GTK+ interface to MPlayer"
-HOMEPAGE="http://code.google.com/p/gnome-mplayer/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="alsa dbus gnome ipod libnotify musicbrainz pulseaudio"
-
-RDEPEND=">=dev-libs/glib-2.26:2
-	>=media-video/mplayer-1.0_rc4_p20091026[ass]
-	>=x11-libs/gtk+-2.22:2
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( >=dev-libs/dbus-glib-0.88 )
-	gnome? ( gnome-base/gconf:2
-		gnome-base/gvfs
-		gnome-base/nautilus )
-	ipod? ( >=media-libs/libgpod-0.7 )
-	libnotify? ( x11-libs/libnotify )
-	musicbrainz? ( net-misc/curl
-		>=media-libs/musicbrainz-3 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.14 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-pkg_setup() {
-	G2CONF="--disable-dependency-tracking
-		$(use_enable gnome schemas-install)
-		$(use_enable gnome nautilus)
-		--enable-panscan
-		--disable-gseal
-		--with-gio
-		$(use_with dbus)
-		$(use_with gnome gconf)
-		$(use_with alsa)
-		$(use_with pulseaudio)
-		$(use_with libnotify)
-		$(use_with ipod libgpod)
-		$(use_with musicbrainz libmusicbrainz3)
-		--without-gpm-new-method
-		--without-gpm-old-method"
-
-	DOCS="ChangeLog README DOCS/*.txt DOCS/tech/*"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-implicit_declaration.patch
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	rm -rf "${D}"/usr/share/doc/${PN}
-	rmdir -p "${D}"/var/lib
-}
diff --git a/media-video/gnome-mplayer/gnome-mplayer-1.0.3.ebuild b/media-video/gnome-mplayer/gnome-mplayer-1.0.3-r1.ebuild
index aa5370a00a13..9c40e771e231 100644
--- a/media-video/gnome-mplayer/gnome-mplayer-1.0.3.ebuild
+++ b/media-video/gnome-mplayer/gnome-mplayer-1.0.3-r1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/gnome-mplayer-1.0.3.ebuild,v 1.1 2011/04/22 11:13:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/gnome-mplayer-1.0.3-r1.ebuild,v 1.1 2011/04/23 08:58:21 ssuominen Exp $
 
-EAPI=3
-GCONF_DEBUG=no
-inherit eutils gnome2
+EAPI=4
+inherit eutils
 
 DESCRIPTION="A GTK+ interface to MPlayer"
 HOMEPAGE="http://code.google.com/p/gnome-mplayer/"
@@ -16,14 +15,13 @@ KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="alsa dbus gnome ipod libnotify musicbrainz pulseaudio"
 
 RDEPEND=">=dev-libs/glib-2.26:2
-	>=media-video/mplayer-1.0_rc4_p20091026[ass]
+	>=media-video/mplayer-1.0_rc4_p20091026-r1[ass]
 	>=x11-libs/gtk+-2.22:2
 	x11-libs/libX11
 	x11-libs/libXScrnSaver
 	alsa? ( media-libs/alsa-lib )
-	dbus? ( >=dev-libs/dbus-glib-0.88 )
-	gnome? ( gnome-base/gconf:2
-		gnome-base/gvfs
+	dbus? ( >=dev-libs/dbus-glib-0.92 )
+	gnome? ( gnome-base/gvfs
 		gnome-base/nautilus )
 	ipod? ( >=media-libs/libgpod-0.7 )
 	libnotify? ( x11-libs/libnotify )
@@ -34,33 +32,30 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	sys-devel/gettext"
 
-pkg_setup() {
-	G2CONF="--disable-dependency-tracking
-		$(use_enable gnome schemas-install)
-		$(use_enable gnome nautilus)
-		--enable-panscan
-		--disable-gseal
-		--with-gio
-		$(use_with dbus)
-		$(use_with gnome gconf)
-		$(use_with alsa)
-		$(use_with pulseaudio)
-		$(use_with libnotify)
-		$(use_with ipod libgpod)
-		$(use_with musicbrainz libmusicbrainz3)
-		--without-gpm-new-method
-		--without-gpm-old-method"
-
-	DOCS="ChangeLog README DOCS/*.txt DOCS/tech/*"
-}
+DOCS="ChangeLog README DOCS/keyboard_shortcuts.txt DOCS/tech/dbus.txt DOCS/tech/plugin-interaction.txt"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.0.2-implicit_declaration.patch
-	gnome2_src_prepare
+}
+
+src_configure() {
+	econf \
+		$(use_enable gnome nautilus) \
+		--enable-panscan \
+		--disable-gseal \
+		--without-gconf \
+		--with-gio \
+		$(use_with dbus) \
+		$(use_with alsa) \
+		$(use_with pulseaudio) \
+		$(use_with libnotify) \
+		$(use_with ipod libgpod) \
+		$(use_with musicbrainz libmusicbrainz3) \
+		--without-gpm-new-method \
+		--without-gpm-old-method
 }
 
 src_install() {
-	gnome2_src_install
-	rm -rf "${D}"/usr/share/doc/${PN}
-	rmdir -p "${D}"/var/lib
+	default
+	rm -rf "${ED}"/usr/share/doc/${PN}
 }