Version bump, 1.1.2 stable on x86, old ebuild cleaned.

(Portage version: 2.0.51.22-r1)

6 files changed, 32 insertions, 19 deletions

diff --git a/media-plugins/bmp-musepack/ChangeLog b/media-plugins/bmp-musepack/ChangeLog
index 1bc6629cfb3b..c824426714d7 100644
--- a/media-plugins/bmp-musepack/ChangeLog
+++ b/media-plugins/bmp-musepack/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/bmp-musepack
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/bmp-musepack/ChangeLog,v 1.4 2005/02/06 02:01:16 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/bmp-musepack/ChangeLog,v 1.5 2005/06/29 21:39:33 chainsaw Exp $
+
+*bmp-musepack-1.2_rc1 (29 Jun 2005)
+
+  29 Jun 2005; Tony Vroon <chainsaw@gentoo.org> -bmp-musepack-1.1.ebuild,
+  bmp-musepack-1.1.2.ebuild, +bmp-musepack-1.2_rc1.ebuild:
+  Bump to 1.2_rc1 release, depending on libmpc. 1.1.2 stable on x86. Old
+  ebuild cleaned. Ebuild updates by Giacomo Perale in bug #95713.
 
   06 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> bmp-musepack-1.1.2.ebuild:
   added ~amd64 to KEYWORDS. fixes #78084
diff --git a/media-plugins/bmp-musepack/Manifest b/media-plugins/bmp-musepack/Manifest
index d0ab1579ccda..19dd8bbcec66 100644
--- a/media-plugins/bmp-musepack/Manifest
+++ b/media-plugins/bmp-musepack/Manifest
@@ -1,7 +1,9 @@
-MD5 db737be19147ff0cd14945aceaff1d67 bmp-musepack-1.1.ebuild 746
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 12801358ed763e068ad7271438ac893e bmp-musepack-1.1.2.ebuild 861
 MD5 4994319c57952f5afc6d9db7fcbf309f ChangeLog 1199
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 ee544dc7fb42e61589396bd9eff9c6f3 files/1.1-includes.patch 506
-MD5 47d91ece85e52004670eaaaa84baf23e files/digest-bmp-musepack-1.1.2 71
+MD5 db737be19147ff0cd14945aceaff1d67 bmp-musepack-1.1.ebuild 746
+MD5 042f377d694802da5d448f4de4ccec25 bmp-musepack-1.2_rc1.ebuild 739
 MD5 aa99fc0bbb88e04b858ec1107d3d27e6 files/digest-bmp-musepack-1.1 69
+MD5 47d91ece85e52004670eaaaa84baf23e files/digest-bmp-musepack-1.1.2 71
+MD5 0b31479d81a4a536d49ee464dc59baf9 files/digest-bmp-musepack-1.2_rc1 73
+MD5 ee544dc7fb42e61589396bd9eff9c6f3 files/1.1-includes.patch 506
diff --git a/media-plugins/bmp-musepack/bmp-musepack-1.1.2.ebuild b/media-plugins/bmp-musepack/bmp-musepack-1.1.2.ebuild
index 99f170aa4a9a..3ff744b6a2d2 100644
--- a/media-plugins/bmp-musepack/bmp-musepack-1.1.2.ebuild
+++ b/media-plugins/bmp-musepack/bmp-musepack-1.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/bmp-musepack/bmp-musepack-1.1.2.ebuild,v 1.2 2005/02/06 02:01:16 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/bmp-musepack/bmp-musepack-1.1.2.ebuild,v 1.3 2005/06/29 21:39:33 chainsaw Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ SRC_URI="http://files.musepack.net/linux/plugins/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64"
 
 DEPEND="media-sound/beep-media-player
 	>=media-libs/libmusepack-1.1"
diff --git a/media-plugins/bmp-musepack/bmp-musepack-1.1.ebuild b/media-plugins/bmp-musepack/bmp-musepack-1.2_rc1.ebuild
index 5c835a5ed6b1..c07517334834 100644
--- a/media-plugins/bmp-musepack/bmp-musepack-1.1.ebuild
+++ b/media-plugins/bmp-musepack/bmp-musepack-1.2_rc1.ebuild
@@ -1,26 +1,30 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/bmp-musepack/bmp-musepack-1.1.ebuild,v 1.2 2005/01/29 22:05:58 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/bmp-musepack/bmp-musepack-1.2_rc1.ebuild,v 1.1 2005/06/29 21:39:33 chainsaw Exp $
+
+MY_P=${P/_rc/-RC}
+S=${WORKDIR}/${MY_P}
 
-inherit eutils
 IUSE=""
 
 DESCRIPTION="Beep Media Player plugin to play audio files encoded with Andree Buschmann's encoder Musepack (mpc, mp+, mpp)"
 HOMEPAGE="http://www.musepack.net"
-SRC_URI="http://www.saunalahti.fi/grimmel/musepack.net/linux/plugins/${P}.tar.bz2"
+SRC_URI="http://musepack.origean.net/files/linux/plugins/${MY_P}.tar.bz2"
 
-LICENSE="LGPL-2.1"
+LICENSE="BSD"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86 ~amd64"
 
 DEPEND="media-sound/beep-media-player
-	=media-libs/libmusepack-1.0.3"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
+	>=media-libs/libmpcdec-1.2
+	>=media-libs/taglib-1.3.1-r2"
 
-	epatch ${FILESDIR}/${PV}-includes.patch
+src_compile() {
+	ebegin "Rebuilding configure script"
+	WANT_AUTOMAKE=1.7 autoreconf -f -i &> /dev/null
+	eend $?
+	econf || die
+	emake || die
 }
 
 src_install() {
diff --git a/media-plugins/bmp-musepack/files/digest-bmp-musepack-1.1 b/media-plugins/bmp-musepack/files/digest-bmp-musepack-1.1
deleted file mode 100644
index 545448e9f40d..000000000000
--- a/media-plugins/bmp-musepack/files/digest-bmp-musepack-1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 86dc611f56f07d8e0e2868f93db21339 bmp-musepack-1.1.tar.bz2 205382
diff --git a/media-plugins/bmp-musepack/files/digest-bmp-musepack-1.2_rc1 b/media-plugins/bmp-musepack/files/digest-bmp-musepack-1.2_rc1
new file mode 100644
index 000000000000..a5668f553de5
--- /dev/null
+++ b/media-plugins/bmp-musepack/files/digest-bmp-musepack-1.2_rc1
@@ -0,0 +1 @@
+MD5 25273c34267ea258500fddf2e3f9d1af bmp-musepack-1.2-RC1.tar.bz2 205185