Remove old and pin deps to proper slots.

Package-Manager: portage-2.1.9.44/cvs/Linux x86_64

4 files changed, 32 insertions, 109 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/Manifest b/media-sound/muine/Manifest
index 3eed3893ad58..afd287c45d90 100644
--- a/media-sound/muine/Manifest
+++ b/media-sound/muine/Manifest
@@ -1,7 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX muine-0.8.11-drop-deprecated.patch 1100 RMD160 482f77a78e58882f841d57c48aec88532851bbb0 SHA1 25464a0c9ed6f8c30a9ec871e1f7c62ab2755124 SHA256 3e750aa396460323d7c1a741f2b601c943246cebf4ef3ee77ec93accd75b8db8
 AUX muine-0.8.11-multimedia-keys.patch 1006 RMD160 088ab34810ac1e26b167eb662f704d547e2429d0 SHA1 331d62253df1e0ed9c97c5232da71042168affd0 SHA256 1da103b7eab6a9676e510657a5f5397c4eccc2e8979d4f25f8488d91f6f47005
 DIST muine-0.8.11.tar.bz2 647177 RMD160 2a2a3667120fd5f5d86a634871e586904b570855 SHA1 c1da39ba39d5af58aff0ec661c0bec54738e4b71 SHA256 fac70bd9ab8a3c7c48c1f48d10f06080f6b5a42ce32cce21a6ab472cb178ecd4
-EBUILD muine-0.8.11-r1.ebuild 2434 RMD160 be878d3d7bb1473577aa2550fc3ad4e54624c087 SHA1 3a15bc6f9068fc3a88058db570b8d0911dd92730 SHA256 3aa64e88c1e0ff1340c3be327cb10a6c52474e45556b84d688c8f07fb96a13d0
-EBUILD muine-0.8.11-r2.ebuild 2763 RMD160 53e237bb85dda7c6ac334a70716879447dae44fc SHA1 cda68f55dd50abc0176ca6e7f8a561669b83e5ea SHA256 c571bd38c84898769f01ed9fad14d87f09121c070bb26e09e58b65fdd071e69a
-MISC ChangeLog 10597 RMD160 0b1ca2e1ba643de0f09bf980fdfe1fc30663c767 SHA1 3cad7b643c304bc615cfc8cd1fc2e558e9358bf4 SHA256 6ab57547569eeeebfdfd156f34decc8ea97d405b7feb35cb4eaf964467f8bebc
+EBUILD muine-0.8.11-r2.ebuild 2754 RMD160 f5fcefa1d54d6cd0b957b158e00c435aa2a750c9 SHA1 38d717f4fdb6239825b43c82b67cae488139061a SHA256 611b03b9d8b96048ca7dd5641748246960ec6e93477713f65d683d094256d41b
+MISC ChangeLog 10737 RMD160 1df2846923c9c48fa22609685294be2ccebb5cfe SHA1 dd7e430f308b5f77a7506cdc601a6035dd4bd669 SHA256 e821620af1871a93528fb55794c0dd46dcf05d6c5e7f51982c113674fe1432c9
 MISC metadata.xml 184 RMD160 e6bfd6e86eb38a78381d278fbeade487579aaf84 SHA1 ec780d1693126026f6d2da5584e4e5e9ac217e5e SHA256 cc9f71b3a498c3d1d147de62c6557f1523b1fe59a6b489ca716a13dd71305291
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2PJUcACgkQCaWpQKGI+9TgEwCfXTxw1OHeocicTvPlpzhADcrZ
+vMUAoIBYoWyBKJTHtf/Gry/u7JdnitPL
+=xuNa
+-----END PGP SIGNATURE-----
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}