Use transition package media-libs/libmpcdecsv7 instead of media-libs/libmpcdec for Musepack support.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 126 insertions, 2 deletions

diff --git a/gnustep-apps/cynthiune/ChangeLog b/gnustep-apps/cynthiune/ChangeLog
index 9105c5abcf03..3f421de45a2b 100644
--- a/gnustep-apps/cynthiune/ChangeLog
+++ b/gnustep-apps/cynthiune/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnustep-apps/cynthiune
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cynthiune/ChangeLog,v 1.20 2009/06/19 16:44:33 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cynthiune/ChangeLog,v 1.21 2009/07/26 15:33:11 ssuominen Exp $
+
+*cynthiune-0.9.5-r4 (26 Jul 2009)
+
+  26 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +cynthiune-0.9.5-r4.ebuild, +files/cynthiune-0.9.5-libmpcdecsv7.patch:
+  Use transition package media-libs/libmpcdecsv7 instead of
+  media-libs/libmpcdec for Musepack support.
 
 *cynthiune-0.9.5-r3 (19 Jun 2009)
 
diff --git a/gnustep-apps/cynthiune/Manifest b/gnustep-apps/cynthiune/Manifest
index d2e5ea6318e0..db67ce0e8a94 100644
--- a/gnustep-apps/cynthiune/Manifest
+++ b/gnustep-apps/cynthiune/Manifest
@@ -3,9 +3,11 @@ AUX cynthiune-0.9.5-NSMutableDictionary.patch 312 RMD160 aebeb9f2b5cd54621103c61
 AUX cynthiune-0.9.5-as-needed.patch 1681 RMD160 07179474202c7f64689731d079b9b94cc3a201c4 SHA1 6d041502b3e348529f6298812595dbd04e58ed34 SHA256 4241e0709d8889661090b8b94574bcf6e9eb219aab7ff044ec17a2941445e83d
 AUX cynthiune-0.9.5-flac-1.1.3.patch 8504 RMD160 4320c4a28fcd5bc9d37fab4113168ba9e4c0b42b SHA1 d2552a9e68dd5bee85a2545a0d49074f99f69029 SHA256 bbf5da3ba5acce325ce0d21c164f435912fa68149c7955179399bfee6ce4805f
 AUX cynthiune-0.9.5-gnustep-make-2.patch 12567 RMD160 2ea2afc4facff487187c7a600c1a711911d1b9db SHA1 f77ed1765d746a118c9a72fdf59bb8fc409bfde1 SHA256 61adc8a6ee7257c778dca98189a87942b29c1f08364419ff601f6865ae125246
+AUX cynthiune-0.9.5-libmpcdecsv7.patch 2071 RMD160 780e80e06e6cf2d06ba491c2ad586a28349a71b1 SHA1 5c787a3e13f1a76b0321a222278f013cc08acdd5 SHA256 540b577ae4f1f86377f0e156a577d782dec7964c4f9ec96c20faf417167e7cce
 AUX cynthiune-0.9.5-set-macro.patch 1108 RMD160 db86c99b51c925e7f0716f660904a1e4182ef902 SHA1 a15c667e9e5d60ee333d16eaf5db779ec95060b6 SHA256 47241760782bf54ff172ef0a010e5b27073c717e62c85e2c428425752b018f4d
 DIST Cynthiune-0.9.5.tar.gz 490426 RMD160 b9dff46275b6b79ebc62655e7de92b9c9aa41274 SHA1 6622288efde5e576defa64f0d4034adeb56291d4 SHA256 e3e036385388556759e3712ea5e595976ec7a4867698dea7c46b46d226122e70
 EBUILD cynthiune-0.9.5-r1.ebuild 2081 RMD160 9945ac1631632f97d3e8aa1c1177bb857c6c3a10 SHA1 ece5ddd81940cc7a96b555b046bf8f5728bea364 SHA256 b0e88680d0230d06f16660cb43eefff9dfe4a9dd4620e23f5fd566aa464d4c00
 EBUILD cynthiune-0.9.5-r3.ebuild 2000 RMD160 5eed378712763065dae5a272c378ffe36dfcefea SHA1 fc38d86a341b75e6a6b0e60f432fe00b82d28888 SHA256 a77ab7bebd1a121fd190d521d267169fede16e10d7b93f5e8003bc348372394d
-MISC ChangeLog 3308 RMD160 c3fa9df8e6005d31e90f48a9201f2738e63441e6 SHA1 3d3c2a24a2987c0e1988cc190efb8dd605f74509 SHA256 9488719693d4481f902e553940e0f9ff9bbd9a0c11c4503b1fc86f89a4edeaaf
+EBUILD cynthiune-0.9.5-r4.ebuild 2050 RMD160 e309e3bda0e8bd688e9bb76767eef3241f10f6dd SHA1 6ed241b6b837bec46e3c06fb41127a7abdd9a03d SHA256 eab7172deb2ddde2a2086897bfd69e6ad2188165f94b7c2f7a304c7cf53e7627
+MISC ChangeLog 3577 RMD160 f26d38d04c690fd441aa5c49238bedd40c30bb18 SHA1 0ae04e9463b308a352ffcbd056da1cc4dabb1098 SHA256 e70a06a772a8b958c92087c120a967de2d4ea7dce5c3568b492ba11f51adfaca
 MISC metadata.xml 2216 RMD160 06c2aea6ad54e88d28371ef8a6302120e88e8505 SHA1 65b4217c9947df1b0052b2a121bfce3c849de949 SHA256 6559882bfeb74a0c812e092fc392728e16a7df57d1ec45d43f44babd79ee3424
diff --git a/gnustep-apps/cynthiune/cynthiune-0.9.5-r4.ebuild b/gnustep-apps/cynthiune/cynthiune-0.9.5-r4.ebuild
new file mode 100644
index 000000000000..c06c8f2b5012
--- /dev/null
+++ b/gnustep-apps/cynthiune/cynthiune-0.9.5-r4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cynthiune/cynthiune-0.9.5-r4.ebuild,v 1.1 2009/07/26 15:33:11 ssuominen Exp $
+
+inherit gnustep-2
+
+S=${WORKDIR}/${P/c/C}
+
+DESCRIPTION="Free software and romantic music player for GNUstep."
+HOMEPAGE="http://organact.mine.nu/~wolfgang/cynthiune"
+SRC_URI="http://organact.mine.nu/~wolfgang/cynthiune/${P/c/C}.tar.gz"
+
+IUSE="flac mad modplug musepack timidity vorbis"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="media-libs/audiofile
+	media-libs/taglib
+	flac? ( media-libs/flac )
+	mad? ( media-libs/libid3tag
+		media-libs/libmad )
+	musepack? ( media-libs/libmpcdecsv7 )
+	modplug? ( media-libs/libmodplug )
+	timidity? ( media-sound/timidity++ )
+	vorbis? ( >=media-libs/libogg-1.1.2
+		>=media-libs/libvorbis-1.0.1-r2 )
+	=media-libs/musicbrainz-2*"
+DEPEND="${RDEPEND}
+	mad? ( dev-util/pkgconfig )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-flac-1.1.3.patch
+	epatch "${FILESDIR}"/${P}-set-macro.patch
+	epatch "${FILESDIR}"/${P}-NSCellExtensions.patch
+	epatch "${FILESDIR}"/${P}-NSMutableDictionary.patch
+	epatch "${FILESDIR}"/${P}-gnustep-make-2.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	epatch "${FILESDIR}"/${P}-libmpcdecsv7.patch
+}
+
+cynthiune_get_config() {
+	# Gentoo doesn't have libavi (any more)
+	local myconf="disable-windowsmedia=yes disable-arts=yes disable-esound=yes"
+	use flac || myconf="${myconf} disable-flac=yes disable-flactags=yes"
+	use mad || myconf="${myconf} disable-mp3=yes disable-id3tag=yes"
+	use modplug || myconf="${myconf} disable-mod=yes"
+	use musepack || myconf="${myconf} disable-musepack=yes"
+	use timidity || myconf="${myconf} disable-timidity=yes"
+	use vorbis || myconf="${myconf} disable-ogg=yes disable-vorbistags=yes"
+
+	echo ${myconf}
+}
+
+src_compile() {
+	egnustep_env
+	egnustep_make "$(cynthiune_get_config)" || die "make failed"
+}
+
+src_install() {
+	egnustep_env
+	egnustep_install "$(cynthiune_get_config)" || die
+}
diff --git a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-libmpcdecsv7.patch b/gnustep-apps/cynthiune/files/cynthiune-0.9.5-libmpcdecsv7.patch
new file mode 100644
index 000000000000..f458998e290a
--- /dev/null
+++ b/gnustep-apps/cynthiune/files/cynthiune-0.9.5-libmpcdecsv7.patch
@@ -0,0 +1,48 @@
+diff -ur Cynthiune-0.9.5.orig/Bundles/Musepack/CNSFileHandle.h Cynthiune-0.9.5/Bundles/Musepack/CNSFileHandle.h
+--- Cynthiune-0.9.5.orig/Bundles/Musepack/CNSFileHandle.h	2006-03-22 00:33:28.000000000 +0200
++++ Cynthiune-0.9.5/Bundles/Musepack/CNSFileHandle.h	2009-07-26 18:31:10.000000000 +0300
+@@ -23,7 +23,7 @@
+ #ifndef CNSFILEHANDLE_H
+ #define CNSFILEHANDLE_H
+ 
+-#include <mpcdec/config_types.h>
++#include <mpcdecsv7/config_types.h>
+ 
+ #ifdef __cplusplus
+ extern "C" {
+diff -ur Cynthiune-0.9.5.orig/Bundles/Musepack/GNUmakefile.preamble Cynthiune-0.9.5/Bundles/Musepack/GNUmakefile.preamble
+--- Cynthiune-0.9.5.orig/Bundles/Musepack/GNUmakefile.preamble	2005-12-07 18:42:43.000000000 +0200
++++ Cynthiune-0.9.5/Bundles/Musepack/GNUmakefile.preamble	2009-07-26 18:31:32.000000000 +0300
+@@ -19,7 +19,7 @@
+ # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ # Boston, MA 02111-1307, USA.
+ 
+-MUSEPACK_LIBS = -lmpcdec
++MUSEPACK_LIBS = -lmpcdecsv7
+ 
+ ADDITIONAL_INCLUDE_DIRS += -I../..
+ 
+diff -ur Cynthiune-0.9.5.orig/Bundles/Musepack/Musepack.m Cynthiune-0.9.5/Bundles/Musepack/Musepack.m
+--- Cynthiune-0.9.5.orig/Bundles/Musepack/Musepack.m	2006-03-31 11:17:11.000000000 +0300
++++ Cynthiune-0.9.5/Bundles/Musepack/Musepack.m	2009-07-26 18:30:54.000000000 +0300
+@@ -30,7 +30,7 @@
+ #import <Cynthiune/Format.h>
+ #import <Cynthiune/utils.h>
+ 
+-#import <mpcdec/mpcdec.h>
++#import <mpcdecsv7/mpcdec.h>
+ 
+ #import "Musepack.h"
+ #import "CNSFileHandle.h"
+diff -ur Cynthiune-0.9.5.orig/Cynthiune.pbproj/project.pbxproj Cynthiune-0.9.5/Cynthiune.pbproj/project.pbxproj
+--- Cynthiune-0.9.5.orig/Cynthiune.pbproj/project.pbxproj	2006-03-31 11:35:16.000000000 +0300
++++ Cynthiune-0.9.5/Cynthiune.pbproj/project.pbxproj	2009-07-26 18:31:59.000000000 +0300
+@@ -3405,7 +3405,7 @@
+ 				FRAMEWORK_SEARCH_PATHS = /home/wolfgang/programmes/gnustep/Cynthiune/build;
+ 				OPTIMIZATION_CFLAGS = "-O0";
+ 				OTHER_CFLAGS = "";
+-				OTHER_LDFLAGS = "-lmpcdec";
++				OTHER_LDFLAGS = "-lmpcdecsv7";
+ 				OTHER_REZFLAGS = "";
+ 				PRODUCT_NAME = Musepack;
+ 				SECTORDER_FLAGS = "";