Version bump to 1.1, auto* tools based.

7 files changed, 29 insertions, 43 deletions

diff --git a/media-plugins/bmp-musepack/ChangeLog b/media-plugins/bmp-musepack/ChangeLog
index 8afc9f993f41..7d4de3ef2f26 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/bmp-musepack/ChangeLog,v 1.1 2004/11/14 14:07:16 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/bmp-musepack/ChangeLog,v 1.2 2004/11/29 22:03:11 chainsaw Exp $
+
+*bmp-musepack-1.1 (29 Nov 2004)
+
+  29 Nov 2004; Tony Vroon <chainsaw@gentoo.org> +files/1.1-includes.patch,
+  -files/1.1_alpha10-makefile.patch, +bmp-musepack-1.1.ebuild,
+  -bmp-musepack-1.1_alpha10.ebuild:
+  Version bump to 1.1 release.
 
 *bmp-musepack-1.1_alpha10 (14 Nov 2004)
 
diff --git a/media-plugins/bmp-musepack/Manifest b/media-plugins/bmp-musepack/Manifest
index a5fd2b0c519e..1e11fb11be72 100644
--- a/media-plugins/bmp-musepack/Manifest
+++ b/media-plugins/bmp-musepack/Manifest
@@ -1,5 +1,5 @@
-MD5 0c6d76406fd3a3fb03dc41776566952e ChangeLog 462
+MD5 bbd89906d2e463d1e4f4021dc64fdfc3 bmp-musepack-1.1.ebuild 748
+MD5 1bb87ea2e70f4669a4a3e0f613fb5b5a ChangeLog 701
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 526a9eb389dd9d2c2fb3787fb310cfda bmp-musepack-1.1_alpha10.ebuild 888
-MD5 280179d514956a7eaecc7b65d7c61414 files/digest-bmp-musepack-1.1_alpha10 76
-MD5 9db9d04e4d163c4b054eaa52e2d1992d files/1.1_alpha10-makefile.patch 903
+MD5 ee544dc7fb42e61589396bd9eff9c6f3 files/1.1-includes.patch 506
+MD5 aa99fc0bbb88e04b858ec1107d3d27e6 files/digest-bmp-musepack-1.1 69
diff --git a/media-plugins/bmp-musepack/bmp-musepack-1.1_alpha10.ebuild b/media-plugins/bmp-musepack/bmp-musepack-1.1.ebuild
index aa3aad8a17fe..6212e3c0856d 100644
--- a/media-plugins/bmp-musepack/bmp-musepack-1.1_alpha10.ebuild
+++ b/media-plugins/bmp-musepack/bmp-musepack-1.1.ebuild
@@ -1,37 +1,28 @@
 # Copyright 1999-2004 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_alpha10.ebuild,v 1.1 2004/11/14 14:07:16 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/bmp-musepack/bmp-musepack-1.1.ebuild,v 1.1 2004/11/29 22:03:11 chainsaw Exp $
 
 inherit eutils
 IUSE=""
 
-MY_P="${P/_alpha/-alpha}"
-S="${WORKDIR}/${MY_P}"
-
 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.musepack.net/downloads/linux/plugins/${MY_P}.tar.bz2"
+SRC_URI="http://www.saunalahti.fi/grimmel/musepack.net/linux/plugins/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~x86"
 
 DEPEND="media-sound/beep-media-player
-	>=media-libs/libmusepack-1.0.2"
+	>=media-libs/libmusepack-1.0.3"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	epatch ${FILESDIR}/${PV}-makefile.patch
-}
-
-src_compile() {
-	emake || die "make failed"
+	epatch ${FILESDIR}/${PV}-includes.patch
 }
 
 src_install() {
-	exeinto `beep-config --input-plugin-dir`
-	doexe libmpc.so
-	dodoc README
+	make DESTDIR="${D}" install
 }
diff --git a/media-plugins/bmp-musepack/files/1.1-includes.patch b/media-plugins/bmp-musepack/files/1.1-includes.patch
new file mode 100644
index 000000000000..eb4fcbc6e4ee
--- /dev/null
+++ b/media-plugins/bmp-musepack/files/1.1-includes.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	2004-11-29 21:51:25.907314248 +0000
++++ src/Makefile.in	2004-11-29 21:51:45.210379736 +0000
+@@ -185,7 +185,7 @@
+ target_alias = @target_alias@
+ AUTOMAKE_OPTIONS = foreign
+ lib_LTLIBRARIES = libmpc.la
+-INCLUDES = @GLIB_2_0_CFLAGS@ @GTK_CFLAGS@ -DVERSION=\"@VERSION@\"
++INCLUDES = @BEEP_CFLAGS@ -DVERSION=\"@VERSION@\"
+ libmpc_la_LIBADD = @PTHREAD_LIBS@ @GLIB_2_0_LIBS@ @GTK_LIBS@
+ libmpc_la_SOURCES = equalizer.cpp tags.cpp libmpc.cpp
+ libmpc_la_LDFLAGS = -lmusepack -avoid-version
diff --git a/media-plugins/bmp-musepack/files/1.1_alpha10-makefile.patch b/media-plugins/bmp-musepack/files/1.1_alpha10-makefile.patch
deleted file mode 100644
index 5cfb8c048213..000000000000
--- a/media-plugins/bmp-musepack/files/1.1_alpha10-makefile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- Makefile.orig	2004-09-24 18:54:09.000000000 +0100
-+++ Makefile	2004-11-14 13:45:06.804421168 +0000
-@@ -2,9 +2,9 @@
- VERSION = 1.1-alpha10
- 
- CC = g++
--CPPFLAGS  = -Wall -fPIC -DPIC -O2 -march=i686 -pipe -DPOSIX -D_REENTRANT -DVERSION=\"$(VERSION)\"
--INCLUDE =  -I/usr/include/musepack `pkg-config --cflags gtk+-2.0` -pthread
--LIBS = `pkg-config --cflags --libs gtk+-2.0` -lpthread -lm -lmusepack
-+CPPFLAGS  = -Wall -fPIC -DPIC ${CXXFLAGS} -DPOSIX -D_REENTRANT -DVERSION=\"$(VERSION)\"
-+INCLUDE = $(shell pkg-config --cflags bmp) -pthread -I/usr/include/musepack
-+LIBS = $(shell pkg-config --libs bmp) -lpthread -lmusepack
- 
- SOURCES :=$(wildcard *.cpp)
- HEADERS :=$(wildcard *.h)
-@@ -21,6 +21,6 @@
- 	rm -f  libmpc.so
- 
- install: libmpc.so
--	install ${installopts} libmpc.so /usr/lib/bmp/Input/.
-+	install ${installopts} libmpc.so $(shell pkg-config --variable=input_plugin_dir bmp)
- 	
- #END OF FILE
diff --git a/media-plugins/bmp-musepack/files/digest-bmp-musepack-1.1 b/media-plugins/bmp-musepack/files/digest-bmp-musepack-1.1
new file mode 100644
index 000000000000..545448e9f40d
--- /dev/null
+++ b/media-plugins/bmp-musepack/files/digest-bmp-musepack-1.1
@@ -0,0 +1 @@
+MD5 86dc611f56f07d8e0e2868f93db21339 bmp-musepack-1.1.tar.bz2 205382
diff --git a/media-plugins/bmp-musepack/files/digest-bmp-musepack-1.1_alpha10 b/media-plugins/bmp-musepack/files/digest-bmp-musepack-1.1_alpha10
deleted file mode 100644
index 1042ee8b4350..000000000000
--- a/media-plugins/bmp-musepack/files/digest-bmp-musepack-1.1_alpha10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6c44c475c9a87a34a5e5343f2fcc6aff bmp-musepack-1.1-alpha10.tar.bz2 14991