Version bump from the GNUstep overlay

Package-Manager: portage-2.1.3.9

10 files changed, 427 insertions, 135 deletions

diff --git a/gnustep-apps/cynthiune/ChangeLog b/gnustep-apps/cynthiune/ChangeLog
index e04d5c83dd66..f902097f6896 100644
--- a/gnustep-apps/cynthiune/ChangeLog
+++ b/gnustep-apps/cynthiune/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnustep-apps/cynthiune
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cynthiune/ChangeLog,v 1.8 2006/12/11 18:45:44 grobian Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cynthiune/ChangeLog,v 1.9 2007/09/10 18:22:48 voyageur Exp $
+
+*cynthiune-0.9.5-r1 (10 Sep 2007)
+
+  10 Sep 2007; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/cynthiune-0.9.5-NSCellExtensions.patch,
+  +files/cynthiune-0.9.5-gnustep-make-2.patch,
+  +files/cynthiune-0.9.5-set-macro.patch, -cynthiune-0.9.4.ebuild,
+  -cynthiune-0.9.5.ebuild, +cynthiune-0.9.5-r1.ebuild:
+  Version bump from the GNUstep overlay
 
 *cynthiune-0.9.5 (11 Dec 2006)
 
diff --git a/gnustep-apps/cynthiune/Manifest b/gnustep-apps/cynthiune/Manifest
index d22efffe4f77..ac7b3b0e2823 100644
--- a/gnustep-apps/cynthiune/Manifest
+++ b/gnustep-apps/cynthiune/Manifest
@@ -1,28 +1,32 @@
+AUX cynthiune-0.9.5-NSCellExtensions.patch 489 RMD160 b1ce1939f4c63c3dc01979762f03ed1294f59411 SHA1 1ab1511acb797497bc911f0fba4f331ca9af1ebe SHA256 a306d2dfef899d223741b0e39f57c1ca6be9ed8517c8fb08f14186ce13c586f8
+MD5 3c7ba8b9dafa20b5a7858df0f1fc0341 files/cynthiune-0.9.5-NSCellExtensions.patch 489
+RMD160 b1ce1939f4c63c3dc01979762f03ed1294f59411 files/cynthiune-0.9.5-NSCellExtensions.patch 489
+SHA256 a306d2dfef899d223741b0e39f57c1ca6be9ed8517c8fb08f14186ce13c586f8 files/cynthiune-0.9.5-NSCellExtensions.patch 489
 AUX cynthiune-0.9.5-flac-1.1.3.patch 8504 RMD160 4320c4a28fcd5bc9d37fab4113168ba9e4c0b42b SHA1 d2552a9e68dd5bee85a2545a0d49074f99f69029 SHA256 bbf5da3ba5acce325ce0d21c164f435912fa68149c7955179399bfee6ce4805f
 MD5 8aeecb52b8592abc674a1cf17aa250a3 files/cynthiune-0.9.5-flac-1.1.3.patch 8504
 RMD160 4320c4a28fcd5bc9d37fab4113168ba9e4c0b42b files/cynthiune-0.9.5-flac-1.1.3.patch 8504
 SHA256 bbf5da3ba5acce325ce0d21c164f435912fa68149c7955179399bfee6ce4805f files/cynthiune-0.9.5-flac-1.1.3.patch 8504
-DIST Cynthiune-0.9.4.tar.gz 308113 RMD160 80a0b0a67c6cc55a674e406ed0a7b23a6ed031f4 SHA1 f1f8949b6efaa3ba6a5f2e1f726eaf1cadc2b723 SHA256 a10c04bfe9284a2f200d8193b9cef23a1663056331366c10a77531ddef2b2e45
+AUX cynthiune-0.9.5-gnustep-make-2.patch 12567 RMD160 2ea2afc4facff487187c7a600c1a711911d1b9db SHA1 f77ed1765d746a118c9a72fdf59bb8fc409bfde1 SHA256 61adc8a6ee7257c778dca98189a87942b29c1f08364419ff601f6865ae125246
+MD5 ba65f4a5cb792c8a972ba419d07e787c files/cynthiune-0.9.5-gnustep-make-2.patch 12567
+RMD160 2ea2afc4facff487187c7a600c1a711911d1b9db files/cynthiune-0.9.5-gnustep-make-2.patch 12567
+SHA256 61adc8a6ee7257c778dca98189a87942b29c1f08364419ff601f6865ae125246 files/cynthiune-0.9.5-gnustep-make-2.patch 12567
+AUX cynthiune-0.9.5-set-macro.patch 1108 RMD160 db86c99b51c925e7f0716f660904a1e4182ef902 SHA1 a15c667e9e5d60ee333d16eaf5db779ec95060b6 SHA256 47241760782bf54ff172ef0a010e5b27073c717e62c85e2c428425752b018f4d
+MD5 a604ec8c438b281b7ee4a2f3a6b388cd files/cynthiune-0.9.5-set-macro.patch 1108
+RMD160 db86c99b51c925e7f0716f660904a1e4182ef902 files/cynthiune-0.9.5-set-macro.patch 1108
+SHA256 47241760782bf54ff172ef0a010e5b27073c717e62c85e2c428425752b018f4d files/cynthiune-0.9.5-set-macro.patch 1108
 DIST Cynthiune-0.9.5.tar.gz 490426 RMD160 b9dff46275b6b79ebc62655e7de92b9c9aa41274 SHA1 6622288efde5e576defa64f0d4034adeb56291d4 SHA256 e3e036385388556759e3712ea5e595976ec7a4867698dea7c46b46d226122e70
-EBUILD cynthiune-0.9.4.ebuild 1031 RMD160 dbc473735aa37b25787b730a56ff82685930844b SHA1 b2a79717c7e2fbde0bc8545c96c9877a1e28189d SHA256 ddeb773778fd73d7904b95c47b145975ad36962d47ef23ece76dc5874b39f248
-MD5 3ca571bdd0d017e70254cf2e748f18de cynthiune-0.9.4.ebuild 1031
-RMD160 dbc473735aa37b25787b730a56ff82685930844b cynthiune-0.9.4.ebuild 1031
-SHA256 ddeb773778fd73d7904b95c47b145975ad36962d47ef23ece76dc5874b39f248 cynthiune-0.9.4.ebuild 1031
-EBUILD cynthiune-0.9.5.ebuild 1655 RMD160 2efcae54b13c01fd49f40597e800ec3e788a1582 SHA1 684ddb2491c2c0af3519147c3e6b2a0e6580d49c SHA256 822199593084cc80fd4b2075bbff744b0f2d7162148fbf8876600ad77d0d8aa6
-MD5 caa1ea6135c00e23df54dfea99a41605 cynthiune-0.9.5.ebuild 1655
-RMD160 2efcae54b13c01fd49f40597e800ec3e788a1582 cynthiune-0.9.5.ebuild 1655
-SHA256 822199593084cc80fd4b2075bbff744b0f2d7162148fbf8876600ad77d0d8aa6 cynthiune-0.9.5.ebuild 1655
-MISC ChangeLog 1344 RMD160 e688ac38822ce2a57e543134c13e749c9e2ca2dd SHA1 e1581310eea0408e081252b4b6a5ebd8606c77db SHA256 2686ff0590697c6f21f2bfb1d1adaae842014490abe2495b0eecd62f02c9aab8
-MD5 9385d54f63a15316bf2a1018a867cc9f ChangeLog 1344
-RMD160 e688ac38822ce2a57e543134c13e749c9e2ca2dd ChangeLog 1344
-SHA256 2686ff0590697c6f21f2bfb1d1adaae842014490abe2495b0eecd62f02c9aab8 ChangeLog 1344
+EBUILD cynthiune-0.9.5-r1.ebuild 1931 RMD160 8178d8496163a352e9985fa45a24e4178e9a60c9 SHA1 fa3be75fd6abeaff69b770512529f89bc1ce9b30 SHA256 5f9d1f7a06affe1173861c5ae21e56292e4e721657fa949a01864cc0acc200ee
+MD5 7143c104e0de5634a6beb4864a795f15 cynthiune-0.9.5-r1.ebuild 1931
+RMD160 8178d8496163a352e9985fa45a24e4178e9a60c9 cynthiune-0.9.5-r1.ebuild 1931
+SHA256 5f9d1f7a06affe1173861c5ae21e56292e4e721657fa949a01864cc0acc200ee cynthiune-0.9.5-r1.ebuild 1931
+MISC ChangeLog 1694 RMD160 1d08f22435b1d85881a441ea4ec3288a93c219dc SHA1 dfa879a6f6af623575e391acd947048a82884744 SHA256 4ca0e0ea63ee3452b85a62614c0171b6ace7728354ee255b75884672ae5bc8a7
+MD5 a7c3a764ed51068998b454e9f84ad7cc ChangeLog 1694
+RMD160 1d08f22435b1d85881a441ea4ec3288a93c219dc ChangeLog 1694
+SHA256 4ca0e0ea63ee3452b85a62614c0171b6ace7728354ee255b75884672ae5bc8a7 ChangeLog 1694
 MISC metadata.xml 2216 RMD160 06c2aea6ad54e88d28371ef8a6302120e88e8505 SHA1 65b4217c9947df1b0052b2a121bfce3c849de949 SHA256 6559882bfeb74a0c812e092fc392728e16a7df57d1ec45d43f44babd79ee3424
 MD5 6605705ac6cf5ccfbb1e0fb5ffd5e5b0 metadata.xml 2216
 RMD160 06c2aea6ad54e88d28371ef8a6302120e88e8505 metadata.xml 2216
 SHA256 6559882bfeb74a0c812e092fc392728e16a7df57d1ec45d43f44babd79ee3424 metadata.xml 2216
-MD5 2764efdc178cb44a451920637b48429f files/digest-cynthiune-0.9.4 247
-RMD160 dcc59f8b39e95109cf4698636cf277c0f0e8b375 files/digest-cynthiune-0.9.4 247
-SHA256 7facc1b9c596396239d58e2e10d588cb0b474f670f521a6667cdec38c326e228 files/digest-cynthiune-0.9.4 247
-MD5 1e0c6e6962ade2c34edc3bc89b4792c5 files/digest-cynthiune-0.9.5 247
-RMD160 5501bcd24a9a99740b4070043194327324b7c9d1 files/digest-cynthiune-0.9.5 247
-SHA256 14c1736f505f9ab8453f860c12844f3a190ac1caecca17b077b9055ff10fdb2c files/digest-cynthiune-0.9.5 247
+MD5 7bf826c9244ea32da5684d281dfc8842 files/digest-cynthiune-0.9.5-r1 180
+RMD160 52eede46d8c633547fa8bda354adf880c00af3d5 files/digest-cynthiune-0.9.5-r1 180
+SHA256 1e62c5b9180d32e3ec792966295a5217ee14eee1c9407f0e49076909532ce00d files/digest-cynthiune-0.9.5-r1 180
diff --git a/gnustep-apps/cynthiune/cynthiune-0.9.4.ebuild b/gnustep-apps/cynthiune/cynthiune-0.9.4.ebuild
deleted file mode 100644
index 0d3f4e42cd1c..000000000000
--- a/gnustep-apps/cynthiune/cynthiune-0.9.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cynthiune/cynthiune-0.9.4.ebuild,v 1.9 2006/12/11 18:45:44 grobian Exp $
-
-inherit gnustep
-
-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/old/${P/c/C}.tar.gz"
-
-IUSE=""
-
-KEYWORDS="~ppc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="${GS_DEPEND}
-	>=media-libs/libid3tag-0.15.0b
-	>=media-libs/libmad-0.15.1b
-	media-libs/audiofile
-	>=media-libs/libogg-1.1.2
-	>=media-libs/libvorbis-1.0.1-r2
-	~media-libs/libmodplug-0.7
-	~media-libs/flac-1.1.2
-	media-sound/esound"
-RDEPEND="${GS_RDEPEND}
-	>=media-libs/libid3tag-0.15.0b
-	>=media-libs/libmad-0.15.1b
-	media-libs/audiofile
-	>=media-libs/libogg-1.1.2
-	>=media-libs/libvorbis-1.0.1-r2
-	~media-libs/libmodplug-0.7
-	~media-libs/flac-1.1.2
-	media-sound/esound"
-
-egnustep_install_domain "Local"
diff --git a/gnustep-apps/cynthiune/cynthiune-0.9.5-r1.ebuild b/gnustep-apps/cynthiune/cynthiune-0.9.5-r1.ebuild
new file mode 100644
index 000000000000..b8b496a2020a
--- /dev/null
+++ b/gnustep-apps/cynthiune/cynthiune-0.9.5-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2007 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-r1.ebuild,v 1.1 2007/09/10 18:22:48 voyageur 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="arts esd flac mad modplug musepack timidity vorbis"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="media-libs/audiofile
+	media-libs/taglib
+	arts? ( kde-base/arts )
+	esd? ( media-sound/esound )
+	flac? ( media-libs/flac )
+	mad? ( media-libs/libid3tag
+		media-libs/libmad )
+	musepack? ( media-libs/libmpcdec )
+	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"
+RDEPEND="${DEPEND}"
+
+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}-gnustep-make-2.patch
+}
+
+cynthiune_get_config() {
+	# Gentoo doesn't have libavi (any more)
+	local myconf="disable-windowsmedia=yes"
+	use arts || myconf="${myconf} disable-arts=yes"
+	use esd || myconf="${myconf} disable-esound=yes"
+	use flac || myconf="${myconf} disable-flac=yes"
+	use mad || myconf="${myconf} disable-mp3=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"
+
+	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/cynthiune-0.9.5.ebuild b/gnustep-apps/cynthiune/cynthiune-0.9.5.ebuild
deleted file mode 100644
index fd05a1111d58..000000000000
--- a/gnustep-apps/cynthiune/cynthiune-0.9.5.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2006 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.ebuild,v 1.1 2006/12/11 18:45:44 grobian Exp $
-
-inherit eutils gnustep
-
-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="arts"
-
-KEYWORDS="~ppc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="${GS_DEPEND}
-	>=media-libs/libid3tag-0.15.0b
-	>=media-libs/libmad-0.15.1b
-	media-libs/audiofile
-	>=media-libs/libogg-1.1.2
-	>=media-libs/libvorbis-1.0.1-r2
-	~media-libs/libmodplug-0.7
-	media-libs/flac
-	media-libs/libmpcdec
-	media-sound/esound
-	arts? ( kde-base/arts )"
-RDEPEND="${GS_RDEPEND}
-	>=media-libs/libid3tag-0.15.0b
-	>=media-libs/libmad-0.15.1b
-	media-libs/audiofile
-	>=media-libs/libogg-1.1.2
-	>=media-libs/libvorbis-1.0.1-r2
-	~media-libs/libmodplug-0.7
-	media-libs/flac
-	media-libs/libmpcdec
-	media-sound/esound
-	arts? ( kde-base/arts )"
-
-egnustep_install_domain "Local"
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}"/${P}-flac-1.1.3.patch
-}
-
-cynthiune_get_config() {
-	local myconf=""
-	# Gentoo doesn't have libavi (any more)
-	myconf="${myconf} disable-windowsmedia=yes"
-	use arts || myconf="${myconf} disable-arts=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
-	if use doc ; then
-		egnustep_env
-		egnustep_doc || die
-	fi
-	egnustep_package_config
-}
diff --git a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-NSCellExtensions.patch b/gnustep-apps/cynthiune/files/cynthiune-0.9.5-NSCellExtensions.patch
new file mode 100644
index 000000000000..9ca91887f270
--- /dev/null
+++ b/gnustep-apps/cynthiune/files/cynthiune-0.9.5-NSCellExtensions.patch
@@ -0,0 +1,11 @@
+diff -Naur Cynthiune-0.9.5.orig/Frameworks/Cynthiune/NSCellExtensions.m Cynthiune-0.9.5/Frameworks/Cynthiune/NSCellExtensions.m
+--- Cynthiune-0.9.5.orig/Frameworks/Cynthiune/NSCellExtensions.m	2007-06-30 10:06:22.000000000 +0200
++++ Cynthiune-0.9.5/Frameworks/Cynthiune/NSCellExtensions.m	2007-06-30 10:06:47.000000000 +0200
+@@ -20,6 +20,7 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
++#import <AppKit/NSAttributedString.h>
+ #import <AppKit/NSStringDrawing.h>
+ 
+ #import "NSCellExtensions.h"
diff --git a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-gnustep-make-2.patch b/gnustep-apps/cynthiune/files/cynthiune-0.9.5-gnustep-make-2.patch
new file mode 100644
index 000000000000..3972c72f133d
--- /dev/null
+++ b/gnustep-apps/cynthiune/files/cynthiune-0.9.5-gnustep-make-2.patch
@@ -0,0 +1,276 @@
+diff -Naur Cynthiune-0.9.5.orig/Bundles/aRts/GNUmakefile Cynthiune-0.9.5/Bundles/aRts/GNUmakefile
+--- Cynthiune-0.9.5.orig/Bundles/aRts/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
++++ Cynthiune-0.9.5/Bundles/aRts/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
+@@ -35,7 +35,7 @@
+ PACKAGE_NAME=aRts
+ BUNDLE_NAME=aRts
+ BUNDLE_EXTENSION=.output
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
+ aRts_PRINCIPAL_CLASS=aRts
+ aRts_LANGUAGES=
+ aRts_LOCALIZED_RESOURCE_FILES=
+diff -Naur Cynthiune-0.9.5.orig/Bundles/ASFTags/GNUmakefile Cynthiune-0.9.5/Bundles/ASFTags/GNUmakefile
+--- Cynthiune-0.9.5.orig/Bundles/ASFTags/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
++++ Cynthiune-0.9.5/Bundles/ASFTags/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
+@@ -35,7 +35,7 @@
+ PACKAGE_NAME=ASFTags
+ BUNDLE_NAME=ASFTags
+ BUNDLE_EXTENSION=.tags
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
+ ASFTags_PRINCIPAL_CLASS=ASFTags
+ 
+ #
+diff -Naur Cynthiune-0.9.5.orig/Bundles/AudioFile/GNUmakefile Cynthiune-0.9.5/Bundles/AudioFile/GNUmakefile
+--- Cynthiune-0.9.5.orig/Bundles/AudioFile/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
++++ Cynthiune-0.9.5/Bundles/AudioFile/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
+@@ -24,7 +24,7 @@
+ PACKAGE_NAME=AudioFile
+ BUNDLE_NAME=AudioFile
+ BUNDLE_EXTENSION=.format
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
+ AudioFile_PRINCIPAL_CLASS=AudioFile
+ 
+ AudioFile_LIBRARIES_DEPEND_UPON += 
+diff -Naur Cynthiune-0.9.5.orig/Bundles/Esound/GNUmakefile Cynthiune-0.9.5/Bundles/Esound/GNUmakefile
+--- Cynthiune-0.9.5.orig/Bundles/Esound/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
++++ Cynthiune-0.9.5/Bundles/Esound/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
+@@ -35,7 +35,7 @@
+ PACKAGE_NAME=Esound
+ BUNDLE_NAME=Esound
+ BUNDLE_EXTENSION=.output
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
+ Esound_PRINCIPAL_CLASS=Esound
+ Esound_LANGUAGES=English French
+ Esound_LOCALIZED_RESOURCE_FILES=Localizable.strings
+diff -Naur Cynthiune-0.9.5.orig/Bundles/FLAC/GNUmakefile Cynthiune-0.9.5/Bundles/FLAC/GNUmakefile
+--- Cynthiune-0.9.5.orig/Bundles/FLAC/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
++++ Cynthiune-0.9.5/Bundles/FLAC/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
+@@ -35,7 +35,7 @@
+ PACKAGE_NAME=FLAC
+ BUNDLE_NAME=FLAC
+ BUNDLE_EXTENSION=.format
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
+ FLAC_PRINCIPAL_CLASS=FLAC
+ 
+ 
+diff -Naur Cynthiune-0.9.5.orig/Bundles/FLACTags/GNUmakefile Cynthiune-0.9.5/Bundles/FLACTags/GNUmakefile
+--- Cynthiune-0.9.5.orig/Bundles/FLACTags/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
++++ Cynthiune-0.9.5/Bundles/FLACTags/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
+@@ -35,7 +35,7 @@
+ PACKAGE_NAME=FLACTags
+ BUNDLE_NAME=FLACTags
+ BUNDLE_EXTENSION=.tags
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
+ FLACTags_PRINCIPAL_CLASS=FLACTags
+ 
+ 
+diff -Naur Cynthiune-0.9.5.orig/Bundles/FormatSkeleton/GNUmakefile Cynthiune-0.9.5/Bundles/FormatSkeleton/GNUmakefile
+--- Cynthiune-0.9.5.orig/Bundles/FormatSkeleton/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
++++ Cynthiune-0.9.5/Bundles/FormatSkeleton/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
+@@ -35,7 +35,7 @@
+ PACKAGE_NAME=$FORMAT$
+ BUNDLE_NAME=$FORMAT$
+ BUNDLE_EXTENSION=.format
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
+ $FORMAT$_PRINCIPAL_CLASS=$FORMAT$
+ 
+ 
+diff -Naur Cynthiune-0.9.5.orig/Bundles/GraphWriter/GNUmakefile Cynthiune-0.9.5/Bundles/GraphWriter/GNUmakefile
+--- Cynthiune-0.9.5.orig/Bundles/GraphWriter/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
++++ Cynthiune-0.9.5/Bundles/GraphWriter/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
+@@ -35,7 +35,7 @@
+ PACKAGE_NAME=GraphWriter
+ BUNDLE_NAME=GraphWriter
+ BUNDLE_EXTENSION=.output
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
+ GraphWriter_PRINCIPAL_CLASS=GraphWriter
+ GraphWriter_LANGUAGES=
+ GraphWriter_LOCALIZED_RESOURCE_FILES=
+diff -Naur Cynthiune-0.9.5.orig/Bundles/ID3Tag/GNUmakefile Cynthiune-0.9.5/Bundles/ID3Tag/GNUmakefile
+--- Cynthiune-0.9.5.orig/Bundles/ID3Tag/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
++++ Cynthiune-0.9.5/Bundles/ID3Tag/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
+@@ -35,7 +35,7 @@
+ PACKAGE_NAME=ID3Tag
+ BUNDLE_NAME=ID3Tag
+ BUNDLE_EXTENSION=.tags
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
+ ID3Tag_PRINCIPAL_CLASS=ID3Tag
+ 
+ #
+diff -Naur Cynthiune-0.9.5.orig/Bundles/Mod/GNUmakefile Cynthiune-0.9.5/Bundles/Mod/GNUmakefile
+--- Cynthiune-0.9.5.orig/Bundles/Mod/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
++++ Cynthiune-0.9.5/Bundles/Mod/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
+@@ -35,7 +35,7 @@
+ PACKAGE_NAME=Mod
+ BUNDLE_NAME=Mod
+ BUNDLE_EXTENSION=.format
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
+ Mod_PRINCIPAL_CLASS=Mod
+ 
+ 
+diff -Naur Cynthiune-0.9.5.orig/Bundles/MP3/GNUmakefile Cynthiune-0.9.5/Bundles/MP3/GNUmakefile
+--- Cynthiune-0.9.5.orig/Bundles/MP3/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
++++ Cynthiune-0.9.5/Bundles/MP3/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
+@@ -35,7 +35,7 @@
+ PACKAGE_NAME=MP3
+ BUNDLE_NAME=MP3
+ BUNDLE_EXTENSION=.format
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
+ MP3_PRINCIPAL_CLASS=MP3
+ 
+ #
+diff -Naur Cynthiune-0.9.5.orig/Bundles/Musepack/GNUmakefile Cynthiune-0.9.5/Bundles/Musepack/GNUmakefile
+--- Cynthiune-0.9.5.orig/Bundles/Musepack/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
++++ Cynthiune-0.9.5/Bundles/Musepack/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
+@@ -28,7 +28,7 @@
+ PACKAGE_NAME=Musepack
+ BUNDLE_NAME=Musepack
+ BUNDLE_EXTENSION=.format
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
+ Musepack_PRINCIPAL_CLASS=Musepack
+ 
+ #
+diff -Naur Cynthiune-0.9.5.orig/Bundles/Ogg/GNUmakefile Cynthiune-0.9.5/Bundles/Ogg/GNUmakefile
+--- Cynthiune-0.9.5.orig/Bundles/Ogg/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
++++ Cynthiune-0.9.5/Bundles/Ogg/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
+@@ -35,7 +35,7 @@
+ PACKAGE_NAME=Ogg
+ BUNDLE_NAME=Ogg
+ BUNDLE_EXTENSION=.format
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
+ Ogg_PRINCIPAL_CLASS=Ogg
+ 
+ 
+diff -Naur Cynthiune-0.9.5.orig/Bundles/OSS/GNUmakefile Cynthiune-0.9.5/Bundles/OSS/GNUmakefile
+--- Cynthiune-0.9.5.orig/Bundles/OSS/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
++++ Cynthiune-0.9.5/Bundles/OSS/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
+@@ -35,7 +35,7 @@
+ PACKAGE_NAME=OSS
+ BUNDLE_NAME=OSS
+ BUNDLE_EXTENSION=.output
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
+ OSS_PRINCIPAL_CLASS=OSS
+ OSS_LANGUAGES=English French
+ OSS_LOCALIZED_RESOURCE_FILES=Localizable.strings
+diff -Naur Cynthiune-0.9.5.orig/Bundles/OutputSkeleton/GNUmakefile Cynthiune-0.9.5/Bundles/OutputSkeleton/GNUmakefile
+--- Cynthiune-0.9.5.orig/Bundles/OutputSkeleton/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
++++ Cynthiune-0.9.5/Bundles/OutputSkeleton/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
+@@ -35,7 +35,7 @@
+ PACKAGE_NAME=$OUTPUT$
+ BUNDLE_NAME=$OUTPUT$
+ BUNDLE_EXTENSION=.output
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
+ $OUTPUT$_PRINCIPAL_CLASS=$OUTPUT$
+ $OUTPUT$_LANGUAGES=
+ $OUTPUT$_LOCALIZED_RESOURCE_FILES=
+diff -Naur Cynthiune-0.9.5.orig/Bundles/Taglib/GNUmakefile Cynthiune-0.9.5/Bundles/Taglib/GNUmakefile
+--- Cynthiune-0.9.5.orig/Bundles/Taglib/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
++++ Cynthiune-0.9.5/Bundles/Taglib/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
+@@ -35,7 +35,7 @@
+ PACKAGE_NAME=Taglib
+ BUNDLE_NAME=Taglib
+ BUNDLE_EXTENSION=.tags
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
+ Taglib_PRINCIPAL_CLASS=Taglib
+ 
+ 
+diff -Naur Cynthiune-0.9.5.orig/Bundles/TagsSkeleton/GNUmakefile Cynthiune-0.9.5/Bundles/TagsSkeleton/GNUmakefile
+--- Cynthiune-0.9.5.orig/Bundles/TagsSkeleton/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
++++ Cynthiune-0.9.5/Bundles/TagsSkeleton/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
+@@ -35,7 +35,7 @@
+ PACKAGE_NAME=$TAGS$
+ BUNDLE_NAME=$TAGS$
+ BUNDLE_EXTENSION=.tags
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
+ $TAGS$_PRINCIPAL_CLASS=$TAGS$
+ 
+ 
+diff -Naur Cynthiune-0.9.5.orig/Bundles/Timidity/GNUmakefile Cynthiune-0.9.5/Bundles/Timidity/GNUmakefile
+--- Cynthiune-0.9.5.orig/Bundles/Timidity/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
++++ Cynthiune-0.9.5/Bundles/Timidity/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
+@@ -35,7 +35,7 @@
+ PACKAGE_NAME=Timidity
+ BUNDLE_NAME=Timidity
+ BUNDLE_EXTENSION=.format
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
+ Timidity_PRINCIPAL_CLASS=Timidity
+ 
+ 
+diff -Naur Cynthiune-0.9.5.orig/Bundles/VorbisTags/GNUmakefile Cynthiune-0.9.5/Bundles/VorbisTags/GNUmakefile
+--- Cynthiune-0.9.5.orig/Bundles/VorbisTags/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
++++ Cynthiune-0.9.5/Bundles/VorbisTags/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
+@@ -35,7 +35,7 @@
+ PACKAGE_NAME=VorbisTags
+ BUNDLE_NAME=VorbisTags
+ BUNDLE_EXTENSION=.tags
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
+ VorbisTags_PRINCIPAL_CLASS=VorbisTags
+ 
+ 
+diff -Naur Cynthiune-0.9.5.orig/Bundles/WaveOut/GNUmakefile Cynthiune-0.9.5/Bundles/WaveOut/GNUmakefile
+--- Cynthiune-0.9.5.orig/Bundles/WaveOut/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
++++ Cynthiune-0.9.5/Bundles/WaveOut/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
+@@ -35,7 +35,7 @@
+ PACKAGE_NAME=WaveOut
+ BUNDLE_NAME=WaveOut
+ BUNDLE_EXTENSION=.output
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
+ WaveOut_PRINCIPAL_CLASS=WaveOut
+ WaveOut_LANGUAGES=
+ WaveOut_LOCALIZED_RESOURCE_FILES=
+diff -Naur Cynthiune-0.9.5.orig/Bundles/WindowsMedia/GNUmakefile Cynthiune-0.9.5/Bundles/WindowsMedia/GNUmakefile
+--- Cynthiune-0.9.5.orig/Bundles/WindowsMedia/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
++++ Cynthiune-0.9.5/Bundles/WindowsMedia/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
+@@ -35,7 +35,7 @@
+ PACKAGE_NAME=WindowsMedia
+ BUNDLE_NAME=WindowsMedia
+ BUNDLE_EXTENSION=.format
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
+ WindowsMedia_PRINCIPAL_CLASS=WindowsMedia
+ 
+ 
+diff -Naur Cynthiune-0.9.5.orig/Bundles/XMMSInput/GNUmakefile Cynthiune-0.9.5/Bundles/XMMSInput/GNUmakefile
+--- Cynthiune-0.9.5.orig/Bundles/XMMSInput/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
++++ Cynthiune-0.9.5/Bundles/XMMSInput/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
+@@ -35,7 +35,7 @@
+ PACKAGE_NAME=XMMSInput
+ BUNDLE_NAME=XMMSInput
+ BUNDLE_EXTENSION=.format
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
+ XMMSInput_PRINCIPAL_CLASS=XMMSInput
+ 
+ 
+diff -Naur Cynthiune-0.9.5.orig/GNUmakefile Cynthiune-0.9.5/GNUmakefile
+--- Cynthiune-0.9.5.orig/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
++++ Cynthiune-0.9.5/GNUmakefile	2007-07-01 23:34:07.000000000 +0200
+@@ -22,8 +22,6 @@
+ 
+ include $(GNUSTEP_MAKEFILES)/common.make
+ 
+-GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_LOCAL_ROOT)/
+-
+ FRAMEWORKS_DIRS = Frameworks/Cynthiune
+ FRAMEWORKS = Cynthiune
+ 
diff --git a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-set-macro.patch b/gnustep-apps/cynthiune/files/cynthiune-0.9.5-set-macro.patch
new file mode 100644
index 000000000000..342d65a6ab42
--- /dev/null
+++ b/gnustep-apps/cynthiune/files/cynthiune-0.9.5-set-macro.patch
@@ -0,0 +1,39 @@
+--- Cynthiune-0.9.5/Bundles/FLACTags/FLACTags.m
++++ Cynthiune-0.9.5/Bundles/FLACTags/FLACTags.m
+@@ -72,7 +72,9 @@
+       value = equalsign + 1;
+       position = keyPositionInArray (key);
+       if (position > -1)
+-        SET (*arrayOfValues[position], [NSString stringWithUTF8String: value]);
++        {
++          SET (*arrayOfValues[position], [NSString stringWithUTF8String: value]);
++        }
+     }
+   free (key);
+ }
+--- Cynthiune-0.9.5/Bundles/VorbisTags/VorbisTags.m
++++ Cynthiune-0.9.5/Bundles/VorbisTags/VorbisTags.m
+@@ -150,7 +150,9 @@
+         }
+       
+       if (cComment)
+-        SET (*string, [NSString stringWithUTF8String: cComment]);
++        {
++          SET (*string, [NSString stringWithUTF8String: cComment]);
++        }
+     }
+ }
+ 
+--- Cynthiune-0.9.5/Bundles/XMMSInput/XMMSInput.m
++++ Cynthiune-0.9.5/Bundles/XMMSInput/XMMSInput.m
+@@ -329,7 +329,9 @@
+ //   inputPlugin->output->open_audio (FMT_S16_LE,44100, 2);
+   result = (inputPlugin->is_our_file (name) == 1);
+   if (result)
+-    SET (filename, fileName);
++    {
++      SET (filename, fileName);
++    }
+ 
+   return result;
+ }
diff --git a/gnustep-apps/cynthiune/files/digest-cynthiune-0.9.4 b/gnustep-apps/cynthiune/files/digest-cynthiune-0.9.4
deleted file mode 100644
index 2b7ef9ed25b3..000000000000
--- a/gnustep-apps/cynthiune/files/digest-cynthiune-0.9.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d57efebd3edbc7b7e2ffefcdc0eb61d5 Cynthiune-0.9.4.tar.gz 308113
-RMD160 80a0b0a67c6cc55a674e406ed0a7b23a6ed031f4 Cynthiune-0.9.4.tar.gz 308113
-SHA256 a10c04bfe9284a2f200d8193b9cef23a1663056331366c10a77531ddef2b2e45 Cynthiune-0.9.4.tar.gz 308113
diff --git a/gnustep-apps/cynthiune/files/digest-cynthiune-0.9.5 b/gnustep-apps/cynthiune/files/digest-cynthiune-0.9.5-r1
index b3ba39c6c118..de4cd1834c8c 100644
--- a/gnustep-apps/cynthiune/files/digest-cynthiune-0.9.5
+++ b/gnustep-apps/cynthiune/files/digest-cynthiune-0.9.5-r1
@@ -1,3 +1,2 @@
-MD5 99a0366c52bab71e846941dbce987089 Cynthiune-0.9.5.tar.gz 490426
 RMD160 b9dff46275b6b79ebc62655e7de92b9c9aa41274 Cynthiune-0.9.5.tar.gz 490426
 SHA256 e3e036385388556759e3712ea5e595976ec7a4867698dea7c46b46d226122e70 Cynthiune-0.9.5.tar.gz 490426