Bump, and remove some older versions.

(Portage version: 2.0.53)

7 files changed, 40 insertions, 195 deletions

diff --git a/media-sound/muine/ChangeLog b/media-sound/muine/ChangeLog
index 0821964d4516..4c329d90b1bb 100644
--- a/media-sound/muine/ChangeLog
+++ b/media-sound/muine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/muine
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/ChangeLog,v 1.31 2006/04/27 23:32:10 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/ChangeLog,v 1.32 2006/07/01 03:25:42 latexer Exp $
+
+*muine-0.8.5 (01 Jul 2006)
+
+  01 Jul 2006; Peter Johanson <latexer@gentoo.org> -muine-0.8.3.ebuild,
+  -muine-0.8.3-r1.ebuild, +muine-0.8.5.ebuild:
+  Bump, and remove some older versions.
 
   27 Apr 2006; Marien Zwart <marienz@gentoo.org> files/digest-muine-0.8.3,
   files/digest-muine-0.8.3-r1, Manifest:
diff --git a/media-sound/muine/Manifest b/media-sound/muine/Manifest
index 47877ab5fbb9..9cefb082e5d7 100644
--- a/media-sound/muine/Manifest
+++ b/media-sound/muine/Manifest
@@ -1,57 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX muine-0.8.2-autoconf.diff 1187 RMD160 abd72d659913ffa12d04b86f9d28f96749abedc5 SHA1 f54622b76f77d33b198714153006a6d3bcaf2349 SHA256 cf4976bca38f99154a34e4c783b0e8bb981acab9e95679ba51f3355542ad2ecd size 1187
+MD5 a8003b3ab5b0604f9ccbe8b85ea58619 ChangeLog 4765
+MD5 e1d8b573edc2450b4d98c5eb0ebb5067 files/digest-muine-0.8.4 235
+MD5 e87fbedde299811184eef7fa20e1043d files/digest-muine-0.8.5 63
 MD5 d5dc53fe5feabb06a5204e6e51934bc7 files/muine-0.8.2-autoconf.diff 1187
-RMD160 abd72d659913ffa12d04b86f9d28f96749abedc5 files/muine-0.8.2-autoconf.diff 1187
-SHA256 cf4976bca38f99154a34e4c783b0e8bb981acab9e95679ba51f3355542ad2ecd files/muine-0.8.2-autoconf.diff 1187
-AUX muine-0.8.3-64-bit-int.diff 439 RMD160 998d2101f1b838d76b81b28e59d6b1f3e29df380 SHA1 be9ad88828358ea900139c0fd6b1f91d140fbad7 SHA256 6dbcbf4f7867dd5b4296b66468ca5dba533acfe6f993c840689b83bf929a9d5e size 439
 MD5 c8375c619daa713f08a6a564fb7b67a5 files/muine-0.8.3-64-bit-int.diff 439
-RMD160 998d2101f1b838d76b81b28e59d6b1f3e29df380 files/muine-0.8.3-64-bit-int.diff 439
-SHA256 6dbcbf4f7867dd5b4296b66468ca5dba533acfe6f993c840689b83bf929a9d5e files/muine-0.8.3-64-bit-int.diff 439
-AUX muine-0.8.3-gtk-sharp-2.x.90-compat.diff 490 RMD160 a3bbf607022b5bca1b887a8da6d72d6087e46ef4 SHA1 51742cc72cdfeeefb4c9ee84cdbc763b39824420 SHA256 96f137ca2438b47051c88c0048b8b12d1c209e1415fb536e2b06c899cb4ffba1 size 490
 MD5 31aa500432a0c61481b3c6b02dd0c37d files/muine-0.8.3-gtk-sharp-2.x.90-compat.diff 490
-RMD160 a3bbf607022b5bca1b887a8da6d72d6087e46ef4 files/muine-0.8.3-gtk-sharp-2.x.90-compat.diff 490
-SHA256 96f137ca2438b47051c88c0048b8b12d1c209e1415fb536e2b06c899cb4ffba1 files/muine-0.8.3-gtk-sharp-2.x.90-compat.diff 490
-AUX muine-0.8.3-monodoc-update.diff 2898 RMD160 a79eb3d6ba66aeb211916374939796701f19a9cd SHA1 fb9b4fee928fadf942fbb86c19f2a2a73dcde391 SHA256 54334bc08f2645c23e8b4182b794c20ced8f964ea9f85099f865d2589f6e8985 size 2898
 MD5 b04462b969c03f2679e7e45ebf828e08 files/muine-0.8.3-monodoc-update.diff 2898
-RMD160 a79eb3d6ba66aeb211916374939796701f19a9cd files/muine-0.8.3-monodoc-update.diff 2898
-SHA256 54334bc08f2645c23e8b4182b794c20ced8f964ea9f85099f865d2589f6e8985 files/muine-0.8.3-monodoc-update.diff 2898
-DIST muine-0.8.3.tar.gz 769686 RMD160 5fa87079cb4441094ca2669f8ccfbf83b7c8af88 SHA256 9bc7cdce0366c9bc306e51a21eac0dde9d8cfc1d2a874ed2cd3660c53263901c size 769686
-DIST muine-0.8.4.tar.gz 703273 RMD160 97162ea16a85043aa0dcf78932f36c4a2c7186ca SHA256 2a2b97f1c61ff6a2b030074c2a104b067c8a13ff1cb4952bf06caa08c86bdde4 size 703273
-EBUILD muine-0.8.3-r1.ebuild 3007 RMD160 ea647c13fa159f250c061222016437b9489a56c7 SHA1 3e5a4fd976e3af1696bf78d46d246c69d1ce8294 SHA256 a489b96028fe3089893b1efe2ea7efc7f8184b8e3b58530a668b6987b563a223 size 3007
-MD5 458ed65dd2953361bce6c9d66cf595ac muine-0.8.3-r1.ebuild 3007
-RMD160 ea647c13fa159f250c061222016437b9489a56c7 muine-0.8.3-r1.ebuild 3007
-SHA256 a489b96028fe3089893b1efe2ea7efc7f8184b8e3b58530a668b6987b563a223 muine-0.8.3-r1.ebuild 3007
-EBUILD muine-0.8.3.ebuild 2802 RMD160 dc0133ddec61e9fc112f427d7f450b5f99b44707 SHA1 dc8c591dbad3b889d9ab526734e181940683ff07 SHA256 2a15ff130dd824a230bed91d867ff679aa1b85f102f406bfc2f6f6b3dd51ca49 size 2802
-MD5 d990aa2f2adc4cf42db6f4c2ccb28df5 muine-0.8.3.ebuild 2802
-RMD160 dc0133ddec61e9fc112f427d7f450b5f99b44707 muine-0.8.3.ebuild 2802
-SHA256 2a15ff130dd824a230bed91d867ff679aa1b85f102f406bfc2f6f6b3dd51ca49 muine-0.8.3.ebuild 2802
-EBUILD muine-0.8.4.ebuild 2810 RMD160 9dc4e41129b8eb8d8a15749265275842a1dfbb52 SHA1 6ad33d9281250125df4e303737cc438e93e9afe4 SHA256 19cf70427818b3f8f7e90c0041183d3ea6f9d459884f61fd9ab881e0ec526169 size 2810
-MD5 14b7e20eebb507aef103f4e610b4604f muine-0.8.4.ebuild 2810
-RMD160 9dc4e41129b8eb8d8a15749265275842a1dfbb52 muine-0.8.4.ebuild 2810
-SHA256 19cf70427818b3f8f7e90c0041183d3ea6f9d459884f61fd9ab881e0ec526169 muine-0.8.4.ebuild 2810
-MISC ChangeLog 4765 RMD160 08f39a4817f778f743a5a057843fcd641c9b2970 SHA1 6cd20f48247b01f9ca3e2fc40403d6b47244d199 SHA256 05eb0abce8beb848543f1ca202fdbbe1bdee9af95cc2d543b8569c6ec2768500 size 4765
-MD5 a8003b3ab5b0604f9ccbe8b85ea58619 ChangeLog 4765
-RMD160 08f39a4817f778f743a5a057843fcd641c9b2970 ChangeLog 4765
-SHA256 05eb0abce8beb848543f1ca202fdbbe1bdee9af95cc2d543b8569c6ec2768500 ChangeLog 4765
-MISC metadata.xml 245 RMD160 1616aa879e13e5d3f8ee6b140d342f83017a1b2b SHA1 784f47492a87ac299b76a07110f7a41a6cd2a0b7 SHA256 1b1fd4c1c14c9c902fcb27fc5a13587386c662b5b2da3b130b15fbac4afce1ce size 245
 MD5 42dcaa983276bbd8e849c07f13677337 metadata.xml 245
-RMD160 1616aa879e13e5d3f8ee6b140d342f83017a1b2b metadata.xml 245
-SHA256 1b1fd4c1c14c9c902fcb27fc5a13587386c662b5b2da3b130b15fbac4afce1ce metadata.xml 245
-MD5 be6697e6b100ca03024ca5217804826e files/digest-muine-0.8.3 235
-RMD160 6cf0a899d22c09baba73f649a73829b80f9b5468 files/digest-muine-0.8.3 235
-SHA256 55bfd6ea68dd49c2b138f670f1bea26309539ca830b35ba93befab2275ce5ca3 files/digest-muine-0.8.3 235
-MD5 be6697e6b100ca03024ca5217804826e files/digest-muine-0.8.3-r1 235
-RMD160 6cf0a899d22c09baba73f649a73829b80f9b5468 files/digest-muine-0.8.3-r1 235
-SHA256 55bfd6ea68dd49c2b138f670f1bea26309539ca830b35ba93befab2275ce5ca3 files/digest-muine-0.8.3-r1 235
-MD5 e1d8b573edc2450b4d98c5eb0ebb5067 files/digest-muine-0.8.4 235
-RMD160 4ec93a7635d0c9eb4a1b35cb36772370dbec969c files/digest-muine-0.8.4 235
-SHA256 0fcd891f37a1577926a04ed02404e82e9188913ae2d845577a4d7bbb7e79755e files/digest-muine-0.8.4 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEUVSAW78445TWHXcRAnF+AJ0e3+OSaeJPy1zEII8hSQHPUw3wLgCePj8p
-pQQ/dOasHfh5UCs1+dTMbNY=
-=8B1h
------END PGP SIGNATURE-----
+MD5 14b7e20eebb507aef103f4e610b4604f muine-0.8.4.ebuild 2810
+MD5 dc8f5ccdba4a58dfa02bfdacef9ea585 muine-0.8.5.ebuild 2737
diff --git a/media-sound/muine/files/digest-muine-0.8.3 b/media-sound/muine/files/digest-muine-0.8.3
deleted file mode 100644
index d8627b187a9a..000000000000
--- a/media-sound/muine/files/digest-muine-0.8.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4e21eeb8e809bebf1e13540e44a6259d muine-0.8.3.tar.gz 769686
-RMD160 5fa87079cb4441094ca2669f8ccfbf83b7c8af88 muine-0.8.3.tar.gz 769686
-SHA256 9bc7cdce0366c9bc306e51a21eac0dde9d8cfc1d2a874ed2cd3660c53263901c muine-0.8.3.tar.gz 769686
diff --git a/media-sound/muine/files/digest-muine-0.8.3-r1 b/media-sound/muine/files/digest-muine-0.8.3-r1
deleted file mode 100644
index d8627b187a9a..000000000000
--- a/media-sound/muine/files/digest-muine-0.8.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4e21eeb8e809bebf1e13540e44a6259d muine-0.8.3.tar.gz 769686
-RMD160 5fa87079cb4441094ca2669f8ccfbf83b7c8af88 muine-0.8.3.tar.gz 769686
-SHA256 9bc7cdce0366c9bc306e51a21eac0dde9d8cfc1d2a874ed2cd3660c53263901c muine-0.8.3.tar.gz 769686
diff --git a/media-sound/muine/files/digest-muine-0.8.5 b/media-sound/muine/files/digest-muine-0.8.5
new file mode 100644
index 000000000000..554350c7bcb5
--- /dev/null
+++ b/media-sound/muine/files/digest-muine-0.8.5
@@ -0,0 +1 @@
+MD5 fef9efdbcb50f7192380499fa7dea150 muine-0.8.5.tar.gz 701882
diff --git a/media-sound/muine/muine-0.8.3-r1.ebuild b/media-sound/muine/muine-0.8.3-r1.ebuild
deleted file mode 100644
index d67be82b43e5..000000000000
--- a/media-sound/muine/muine-0.8.3-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/muine-0.8.3-r1.ebuild,v 1.2 2006/01/23 17:58:30 latexer Exp $
-
-inherit gnome2 mono eutils multilib
-
-DESCRIPTION="A music player for GNOME"
-HOMEPAGE="http://muine.gooeylinux.org/"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-IUSE="xine mad vorbis flac aac"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-
-RDEPEND=">=dev-lang/mono-1.0
-	>=dev-dotnet/gtk-sharp-2.3.90
-	>=dev-dotnet/gnome-sharp-2.3.90
-	>=dev-dotnet/gnomevfs-sharp-2.3.90
-	>=dev-dotnet/glade-sharp-2.3.90
-	>=dev-dotnet/gconf-sharp-2.3.90
-	xine? ( >=media-libs/xine-lib-1_rc4 )
-	!xine? (
-		=media-libs/gstreamer-0.8*
-		=media-libs/gst-plugins-0.8*
-		=media-plugins/gst-plugins-gnomevfs-0.8*
-		mad? ( =media-plugins/gst-plugins-mad-0.8* )
-		vorbis? ( =media-plugins/gst-plugins-ogg-0.8*
-			=media-plugins/gst-plugins-vorbis-0.8* )
-		flac? ( =media-plugins/gst-plugins-flac-0.8* )
-		aac? (
-			=media-plugins/gst-plugins-faad-0.8*
-			>=media-libs/faad2-2.0-r4
-		)
-	)
-	>=media-libs/libid3tag-0.15.0b
-	>=media-libs/libvorbis-1.0
-	sys-libs/gdbm
-	>=gnome-base/gconf-2.0.0
-	>=gnome-base/gnome-vfs-2.0.0
-	>=x11-libs/gtk+-2.6.0
-	>=dev-util/intltool-0.29
-	>=sys-apps/dbus-0.23.2-r1
-	media-libs/flac"
-
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	>=dev-util/monodoc-1.1.8
-	dev-util/pkgconfig
-	app-text/scrollkeeper"
-
-use xine && \
-	G2CONF="${G2CONF} --enable-gstreamer=no" || \
-	G2CONF="${G2CONF} --enable-gstreamer=yes"
-
-
-G2CONF="${G2CONF} $(use_enable aac faad2)"
-
-USE_DESTDIR=1
-DOCS="AUTHORS COPYING ChangeLog INSTALL \
-	  MAINTAINERS NEWS README TODO"
-
-pkg_setup() {
-	if ! built_with_use sys-apps/dbus mono ; then
-		echo
-		eerror "In order to compile muine, you need to have sys-apps/dbus emerged"
-		eerror "with 'mono' in your USE flags. Please add that flag, re-emerge"
-		eerror "dbus, and then emerge muine."
-		die "sys-apps/dbus is missing the .NET binding."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# Fix the install location of the dbus service file
-	sed -i "s:libdir)/dbus-1.0:datadir)/dbus-1:" \
-		${S}/data/Makefile.am || die "sed failed"
-
-	epatch ${FILESDIR}/${P}-gtk-sharp-2.x.90-compat.diff || die
-	epatch ${FILESDIR}/${P}-64-bit-int.diff || die
-	epatch ${FILESDIR}/${P}-monodoc-update.diff || die
-
-	libtoolize --force --copy || die "libtoolize failed"
-	aclocal -I "${S}/m4" || die "aclocal failed"
-	autoconf || die "autoconf failed"
-	automake || die "automake failed"
-}
-
-src_compile() {
-	gnome2_src_configure "$@"
-	emake -j1 || die "compile failure"
-}
-
-src_install() {
-	gnome2_src_install "$@"
-
-	insinto /usr/$(get_libdir)/muine/plugins/
-	doins ${S}/plugins/TrayIcon.dll
-	doins ${S}/plugins/DashboardPlugin.dll
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Upstream no longer packages the tray icon plugin by default."
-	einfo "The Gentoo ebuilds will continue to install the plugin, if you don't"
-	einfo "want to use the plugin, remove TrayIcon.dll from"
-	einfo "/usr/$(get_libdir)/muine/plugins/"
-}
diff --git a/media-sound/muine/muine-0.8.3.ebuild b/media-sound/muine/muine-0.8.5.ebuild
index ae9df730aa25..3a7eacbe47a5 100644
--- a/media-sound/muine/muine-0.8.3.ebuild
+++ b/media-sound/muine/muine-0.8.5.ebuild
@@ -1,35 +1,36 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/muine-0.8.3.ebuild,v 1.8 2005/12/05 23:32:19 zaheerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/muine-0.8.5.ebuild,v 1.1 2006/07/01 03:25:42 latexer Exp $
 
-inherit gnome2 mono eutils multilib
+inherit gnome2 mono eutils multilib autotools
 
 DESCRIPTION="A music player for GNOME"
-HOMEPAGE="http://muine.gooeylinux.org/"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+HOMEPAGE="http://muine-player.org/"
+SRC_URI="${HOMEPAGE}/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 IUSE="xine mad vorbis flac aac"
 SLOT="0"
-KEYWORDS="~ppc ~x86"
-
-RDEPEND=">=dev-lang/mono-0.96
-	>=dev-dotnet/gtk-sharp-2.3.90
-	>=dev-dotnet/gnome-sharp-2.3.90
-	>=dev-dotnet/gnomevfs-sharp-2.3.90
-	>=dev-dotnet/glade-sharp-2.3.90
-	>=dev-dotnet/gconf-sharp-2.3.90
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND=">=dev-lang/mono-1.1
+	>=dev-dotnet/gtk-sharp-2.4.0
+	>=dev-dotnet/gnome-sharp-2.4.0
+	>=dev-dotnet/gnomevfs-sharp-2.4.0
+	>=dev-dotnet/glade-sharp-2.4.0
+	>=dev-dotnet/gconf-sharp-2.4.0
 	xine? ( >=media-libs/xine-lib-1_rc4 )
 	!xine? (
-		=media-libs/gstreamer-0.8*
-		=media-libs/gst-plugins-0.8*
-		=media-plugins/gst-plugins-gnomevfs-0.8*
-		mad? ( =media-plugins/gst-plugins-mad-0.8* )
-		vorbis? ( =media-plugins/gst-plugins-ogg-0.8*
-			=media-plugins/gst-plugins-vorbis-0.8* )
-		flac? ( =media-plugins/gst-plugins-flac-0.8* )
+		=media-libs/gstreamer-0.10*
+		=media-libs/gst-plugins-base-0.10*
+		=media-plugins/gst-plugins-gnomevfs-0.10*
+		=media-plugins/gst-plugins-gconf-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* )
+		flac? ( =media-plugins/gst-plugins-flac-0.10* )
 		aac? (
-			=media-plugins/gst-plugins-faad-0.8*
+			=media-plugins/gst-plugins-faad-0.10*
 			>=media-libs/faad2-2.0-r4
 		)
 	)
@@ -44,6 +45,8 @@ RDEPEND=">=dev-lang/mono-0.96
 	media-libs/flac"
 
 DEPEND="${RDEPEND}
+	gnome-base/gnome-common
+	>=dev-util/monodoc-1.1.8
 	dev-util/pkgconfig
 	app-text/scrollkeeper"
 
@@ -58,6 +61,8 @@ USE_DESTDIR=1
 DOCS="AUTHORS COPYING ChangeLog INSTALL \
 	  MAINTAINERS NEWS README TODO"
 
+AT_M4DIR="${S}/m4"
+
 pkg_setup() {
 	if ! built_with_use sys-apps/dbus mono ; then
 		echo
@@ -75,11 +80,7 @@ src_unpack() {
 	sed -i "s:libdir)/dbus-1.0:datadir)/dbus-1:" \
 		${S}/data/Makefile.am || die "sed failed"
 
-	epatch ${FILESDIR}/${P}-gtk-sharp-2.x.90-compat.diff || die
-	epatch ${FILESDIR}/${P}-64-bit-int.diff || die
-
-	autoconf || die "autoconf failed"
-	automake || die "automake failed"
+	eautoreconf
 }
 
 src_compile() {
@@ -92,7 +93,6 @@ src_install() {
 
 	insinto /usr/$(get_libdir)/muine/plugins/
 	doins ${S}/plugins/TrayIcon.dll
-	doins ${S}/plugins/DashboardPlugin.dll
 }
 
 pkg_postinst() {