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

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

3 files changed, 33 insertions, 98 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/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}
 }