Remove old and pin deps to proper slots.

(Portage version: 2.1.9.44/cvs/Linux x86_64)

3 files changed, 20 insertions, 106 deletions

diff --git a/media-sound/muine/ChangeLog b/media-sound/muine/ChangeLog
index a754ca27ebba..fd5c5f373f41 100644
--- a/media-sound/muine/ChangeLog
+++ b/media-sound/muine/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/muine
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/ChangeLog,v 1.68 2011/03/21 20:27:07 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/ChangeLog,v 1.69 2011/03/27 11:53:36 pacho Exp $
+
+  27 Mar 2011; Pacho Ramos <pacho@gentoo.org> -muine-0.8.11-r1.ebuild,
+  muine-0.8.11-r2.ebuild:
+  Remove old and pin deps to proper slots.
 
   21 Mar 2011; Brent Baude <ranger@gentoo.org> muine-0.8.11-r2.ebuild:
   Marking muine-0.8.11-r2 ppc stable for bug 359651
diff --git a/media-sound/muine/muine-0.8.11-r1.ebuild b/media-sound/muine/muine-0.8.11-r1.ebuild
deleted file mode 100644
index f74cf7e8248a..000000000000
--- a/media-sound/muine/muine-0.8.11-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/muine-0.8.11-r1.ebuild,v 1.5 2011/03/12 12:01:35 angelos Exp $
-
-EAPI=2
-
-inherit base gnome2 mono eutils multilib flag-o-matic
-
-DESCRIPTION="A music player for GNOME"
-HOMEPAGE="http://muine-player.org"
-SRC_URI="http://download.gnome.org/sources/muine/0.8/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="flac mad vorbis"
-
-RDEPEND="
-	x11-themes/gnome-icon-theme
-	>=dev-lang/mono-2
-	>=x11-libs/gtk+-2.6
-	>=dev-dotnet/gtk-sharp-2.12.9
-	>=dev-dotnet/glade-sharp-2.12.6
-	>=dev-dotnet/gnome-sharp-2.6
-	>=dev-dotnet/gconf-sharp-2.6
-	>=dev-dotnet/gnomevfs-sharp-2.6
-	>=dev-dotnet/ndesk-dbus-0.4
-	>=dev-dotnet/ndesk-dbus-glib-0.3
-	>=dev-dotnet/taglib-sharp-2.0.3
-	sys-libs/gdbm
-	=media-libs/gstreamer-0.10*
-	=media-libs/gst-plugins-base-0.10*
-	=media-libs/gst-plugins-good-0.10*
-	=media-plugins/gst-plugins-gconf-0.10*
-	=media-plugins/gst-plugins-gnomevfs-0.10*
-	flac? ( =media-plugins/gst-plugins-flac-0.10* )
-	mad? ( =media-plugins/gst-plugins-mad-0.10* )
-	vorbis? (
-		=media-plugins/gst-plugins-ogg-0.10*
-		=media-plugins/gst-plugins-vorbis-0.10*
-	)
-	"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	app-text/scrollkeeper
-	gnome-base/gnome-common
-	>=dev-util/intltool-0.29
-	virtual/monodoc"
-
-DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS PLUGINS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--enable-compile-warnings=yes
-		--docdir=/usr/share/doc/"${PF}"
-	"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix multimedia key support for >=Gnome-2.22
-	epatch "${FILESDIR}/${P}-multimedia-keys.patch"
-
-	# Replace some deprecated gtk functions
-	epatch "${FILESDIR}/${P}-drop-deprecated.patch"
-
-	# Update icons, upstream bug #623480
-	sed "s:stock_timer:list-add:g" -i src/AddWindow.cs src/StockIcons.cs || die
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed failed"
-}
-
-src_install() {
-	gnome2_src_install
-	insinto /usr/$(get_libdir)/${PN}/plugins
-	doins "${S}"/plugins/TrayIcon.dll
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	elog
-	elog "Upstream no longer packages the tray icon plugin by default."
-	elog "The Gentoo ebuilds will continue to install the plugin, if you don't"
-	elog "want to use the plugin, remove TrayIcon.dll from"
-	elog "/usr/$(get_libdir)/muine/plugins/"
-	elog
-}
diff --git a/media-sound/muine/muine-0.8.11-r2.ebuild b/media-sound/muine/muine-0.8.11-r2.ebuild
index 1640dab3f201..d9f60ffeb5bf 100644
--- a/media-sound/muine/muine-0.8.11-r2.ebuild
+++ b/media-sound/muine/muine-0.8.11-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/muine-0.8.11-r2.ebuild,v 1.6 2011/03/21 20:27:07 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/muine-0.8.11-r2.ebuild,v 1.7 2011/03/27 11:53:36 pacho Exp $
 
 EAPI=2
 
@@ -19,25 +19,25 @@ RDEPEND="
 	x11-themes/gnome-icon-theme
 	>=dev-lang/mono-2
 	>=x11-libs/gtk+-2.6:2
-	>=dev-dotnet/gtk-sharp-2.12.9
-	>=dev-dotnet/glade-sharp-2.12.6
-	>=dev-dotnet/gnome-sharp-2.6
-	>=dev-dotnet/gconf-sharp-2.6
-	>=dev-dotnet/gnomevfs-sharp-2.6
+	>=dev-dotnet/gtk-sharp-2.12.9:2
+	>=dev-dotnet/glade-sharp-2.12.6:2
+	>=dev-dotnet/gnome-sharp-2.6:2
+	>=dev-dotnet/gconf-sharp-2.6:2
+	>=dev-dotnet/gnomevfs-sharp-2.6:2
 	>=dev-dotnet/ndesk-dbus-0.4
 	>=dev-dotnet/ndesk-dbus-glib-0.3
 	>=dev-dotnet/taglib-sharp-2.0.3
 	sys-libs/gdbm
-	=media-libs/gstreamer-0.10*
-	=media-libs/gst-plugins-base-0.10*
-	=media-libs/gst-plugins-good-0.10*
-	=media-plugins/gst-plugins-gconf-0.10*
-	=media-plugins/gst-plugins-gnomevfs-0.10*
-	flac? ( =media-plugins/gst-plugins-flac-0.10* )
-	mad? ( =media-plugins/gst-plugins-mad-0.10* )
+	media-libs/gstreamer:0.10
+	media-libs/gst-plugins-base:0.10
+	media-libs/gst-plugins-good:0.10
+	media-plugins/gst-plugins-gconf:0.10
+	media-plugins/gst-plugins-gnomevfs:0.10
+	flac? ( media-plugins/gst-plugins-flac:0.10 )
+	mad? ( media-plugins/gst-plugins-mad:0.10 )
 	vorbis? (
-		=media-plugins/gst-plugins-ogg-0.10*
-		=media-plugins/gst-plugins-vorbis-0.10*
+		media-plugins/gst-plugins-ogg:0.10
+		media-plugins/gst-plugins-vorbis:0.10
 	)
 	"
 DEPEND="${RDEPEND}