summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2012-03-14 23:27:44 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2012-03-14 23:27:44 +0000
commit20df2445023350e7ef6b086b6f8a741f5d9c00e7 (patch)
tree4905c50800db9ccb42276c2dd4ee1e8a2d4451c5 /gnustep-apps
parentLast rites for gnustep-libs/objcunit, bug #380433 (diff)
downloadgentoo-2-20df2445023350e7ef6b086b6f8a741f5d9c00e7.tar.gz
gentoo-2-20df2445023350e7ef6b086b6f8a741f5d9c00e7.tar.bz2
gentoo-2-20df2445023350e7ef6b086b6f8a741f5d9c00e7.zip
Last rites for gnustep-apps/cynthiune, gnustep-apps/gridlock, gnustep-apps/talksoup, bug #380433
Diffstat (limited to 'gnustep-apps')
-rw-r--r--gnustep-apps/cynthiune/ChangeLog135
-rw-r--r--gnustep-apps/cynthiune/Manifest12
-rw-r--r--gnustep-apps/cynthiune/cynthiune-0.9.5-r5.ebuild68
-rw-r--r--gnustep-apps/cynthiune/files/cynthiune-0.9.5-NSCellExtensions.patch11
-rw-r--r--gnustep-apps/cynthiune/files/cynthiune-0.9.5-NSMutableDictionary.patch10
-rw-r--r--gnustep-apps/cynthiune/files/cynthiune-0.9.5-NSWindow.patch12
-rw-r--r--gnustep-apps/cynthiune/files/cynthiune-0.9.5-as-needed.patch22
-rw-r--r--gnustep-apps/cynthiune/files/cynthiune-0.9.5-flac-1.1.3.patch300
-rw-r--r--gnustep-apps/cynthiune/files/cynthiune-0.9.5-gnustep-make-2.patch276
-rw-r--r--gnustep-apps/cynthiune/files/cynthiune-0.9.5-libmpcdec.patch310
-rw-r--r--gnustep-apps/cynthiune/files/cynthiune-0.9.5-set-macro.patch39
-rw-r--r--gnustep-apps/cynthiune/metadata.xml42
-rw-r--r--gnustep-apps/gridlock/ChangeLog85
-rw-r--r--gnustep-apps/gridlock/Manifest15
-rw-r--r--gnustep-apps/gridlock/files/gridlock-1.10-objcruntime.patch47
-rw-r--r--gnustep-apps/gridlock/gridlock-1.10.ebuild19
-rw-r--r--gnustep-apps/gridlock/metadata.xml8
-rw-r--r--gnustep-apps/talksoup/ChangeLog35
-rw-r--r--gnustep-apps/talksoup/Manifest5
-rw-r--r--gnustep-apps/talksoup/files/talksoup-1.0_alpha1-make2_support.patch270
-rw-r--r--gnustep-apps/talksoup/metadata.xml11
-rw-r--r--gnustep-apps/talksoup/talksoup-1.0_alpha1-r1.ebuild25
22 files changed, 0 insertions, 1757 deletions
diff --git a/gnustep-apps/cynthiune/ChangeLog b/gnustep-apps/cynthiune/ChangeLog
deleted file mode 100644
index 67b841161cb4..000000000000
--- a/gnustep-apps/cynthiune/ChangeLog
+++ /dev/null
@@ -1,135 +0,0 @@
-# ChangeLog for gnustep-apps/cynthiune
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cynthiune/ChangeLog,v 1.30 2010/07/14 17:12:56 voyageur Exp $
-
- 14 Jul 2010; Bernard Cafarelli <voyageur@gentoo.org>
- cynthiune-0.9.5-r5.ebuild, +files/cynthiune-0.9.5-NSWindow.patch:
- Fix compilation with new gnustep-base, bug #328191
-
- 10 Feb 2010; Bernard Cafarelli <voyageur@gentoo.org>
- -cynthiune-0.9.5-r4.ebuild, -files/cynthiune-0.9.5-libmpcdecsv7.patch:
- Drop old version
-
- 08 Feb 2010; nixnut <nixnut@gentoo.org> cynthiune-0.9.5-r5.ebuild:
- ppc stable #301304
-
- 03 Feb 2010; Markus Meier <maekke@gentoo.org> cynthiune-0.9.5-r5.ebuild:
- amd64/x86 stable, bug #301304
-
-*cynthiune-0.9.5-r5 (23 Dec 2009)
-
- 23 Dec 2009; Bernard Cafarelli <voyageur@gentoo.org>
- +cynthiune-0.9.5-r5.ebuild, +files/cynthiune-0.9.5-libmpcdec.patch:
- Convert musepack support to SV8 api, thanks to ssuominen in bug #297910
-
- 10 Nov 2009; Mounir Lamouri <volkmar@gentoo.org>
- cynthiune-0.9.5-r4.ebuild:
- Stable for ppc, bug 281600
-
- 17 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
- cynthiune-0.9.5-r1.ebuild:
- Remove libmpcdec (SV7) support.
-
- 25 Sep 2009; Markus Meier <maekke@gentoo.org> cynthiune-0.9.5-r4.ebuild:
- amd64 stable, bug #281600
-
- 16 Aug 2009; Christian Faulhammer <fauli@gentoo.org>
- cynthiune-0.9.5-r4.ebuild:
- stable x86, bug 281600
-
-*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)
-
- 19 Jun 2009; Bernard Cafarelli <voyageur@gentoo.org>
- -cynthiune-0.9.5-r2.ebuild, +cynthiune-0.9.5-r3.ebuild:
- Drop arts and esd USE flags, bug #274650
-
-*cynthiune-0.9.5-r2 (09 Dec 2008)
-
- 09 Dec 2008; Bernard Cafarelli <voyageur@gentoo.org>
- +files/cynthiune-0.9.5-as-needed.patch, +cynthiune-0.9.5-r2.ebuild:
- Fix compilation with --as-needed, bug #250170
-
- 21 Jul 2008; Bernard Cafarelli <voyageur@gentoo.org>
- cynthiune-0.9.5-r1.ebuild:
- Fix compilation with USE=-flac, bug #232442. Also fix with USE=-vorbis
-
- 17 May 2008; Fabian Groffen <grobian@gentoo.org>
- cynthiune-0.9.5-r1.ebuild:
- put dev-util/pkgconfig only in DEPEND, bug #217278
-
- 07 Apr 2008; Bernard Cafarelli <voyageur@gentoo.org>
- cynthiune-0.9.5-r1.ebuild:
- Only compile id3tag bundle with USE=mad, bug #216564
-
- 23 Mar 2008; nixnut <nixnut@gentoo.org> cynthiune-0.9.5-r1.ebuild:
- Stable on ppc wrt bug 207381
-
- 22 Mar 2008; Santiago M. Mola <coldwind@gentoo.org>
- cynthiune-0.9.5-r1.ebuild:
- amd64 stable wrt bug #207381, second round.
-
- 21 Mar 2008; Christian Faulhammer <opfer@gentoo.org>
- cynthiune-0.9.5-r1.ebuild:
- stable x86, bug 207381
-
- 17 Jan 2008; Bernard Cafarelli <voyageur@gentoo.org>
- cynthiune-0.9.5-r1.ebuild:
- Add pkgconfig DEPEND for libmad, bug #206476
-
- 04 Jan 2008; Bernard Cafarelli <voyageur@gentoo.org>
- +files/cynthiune-0.9.5-NSMutableDictionary.patch,
- cynthiune-0.9.5-r1.ebuild:
- Add compilation fix for stricter gnustep
-
- 01 Jan 2008; Alexis Ballier <aballier@gentoo.org>
- cynthiune-0.9.5-r1.ebuild:
- stick musicbrainz deps to -2*, bug #203784
-
-*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)
-
- 11 Dec 2006; Fabian Groffen <grobian@gentoo.org>
- +files/cynthiune-0.9.5-flac-1.1.3.patch, cynthiune-0.9.4.ebuild,
- +cynthiune-0.9.5.ebuild:
- Version bump, with flac 1.1.3 support patch. Thanks to Alex Ballier to tell
- me how to "configure" the package.
-
- 20 Oct 2006; Fabian Groffen <grobian@gentoo.org> cynthiune-0.9.4.ebuild:
- Fixing flac dependency on 1.1.2 for bug #152007
-
- 27 Apr 2006; Marien Zwart <marienz@gentoo.org> Manifest:
- Fixing SHA256 digest, pass four
-
- 26 Mar 2006; Fabian Groffen <grobian@gentoo.org> cynthiune-0.9.4.ebuild:
- Incorporate changes by Jouni Rinne (bug #120054)
-
- 08 Jan 2006; Michael Hanselmann <hansmi@gentoo.org> metadata.xml:
- Remove retiring dev from metadata.
-
- 26 Dec 2005; Luca Barbato <lu_zero@gentoo.org> cynthiune-0.9.4.ebuild:
- oggvorbis Cleanup
-
- 05 Nov 2005; Mark Loeser <halcy0n@gentoo.org> cynthiune-0.9.4.ebuild:
- Added ~x86 to KEYWORDS; bug #111374
-
-*cynthiune-0.9.4 (18 Mar 2005)
-
- 18 Mar 2005; Armando Di Cianno <fafhrd@gentoo.org>
- +cynthiune-0.9.4.ebuild:
- Orignal package import -- a gnustep built media player, yay
-
diff --git a/gnustep-apps/cynthiune/Manifest b/gnustep-apps/cynthiune/Manifest
deleted file mode 100644
index 53d869c7ebb2..000000000000
--- a/gnustep-apps/cynthiune/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX cynthiune-0.9.5-NSCellExtensions.patch 489 RMD160 b1ce1939f4c63c3dc01979762f03ed1294f59411 SHA1 1ab1511acb797497bc911f0fba4f331ca9af1ebe SHA256 a306d2dfef899d223741b0e39f57c1ca6be9ed8517c8fb08f14186ce13c586f8
-AUX cynthiune-0.9.5-NSMutableDictionary.patch 312 RMD160 aebeb9f2b5cd54621103c61cc1b1af6e0eb69dfd SHA1 4888c09008acdd8c27e89f93b58fdefc0f479d3d SHA256 9555d22fe34ccf415f2433b9a4628666b4a2c4ed8f0eb3262419075ef0934322
-AUX cynthiune-0.9.5-NSWindow.patch 403 RMD160 ea444fecbc6406d0f18b176755d2195e6cbeaf0b SHA1 d05a0d2721532cbe7218c9b7f4bc7ca50a0dffa8 SHA256 4ce40d44770de335844375e33de867a651e9ff06661658adc892421455ae939a
-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-libmpcdec.patch 8735 RMD160 29c22b17128624e54e2ad629daf31bbbbaabdeef SHA1 fa8e24aeb3b662cfef0d279ab77a52ca1df5e9c9 SHA256 8c5337294146216d30fecf5bfb87688c42d8ec4dad6cf0e3e07213236cc45c8d
-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-r5.ebuild 2094 RMD160 f2a749ff7041e7b0addf5416c2dba8a41e8932b3 SHA1 96847b64b8374ea6dc192b789aad904445fac833 SHA256 d159d16a1ab619e28d647bdeb48b3d2d396bf7fd7581aeaef1ebc06dcf0d91e7
-MISC ChangeLog 4777 RMD160 2f8cc3db0309f25bc1523e4dfce54188709a975f SHA1 ffdd79f2b9d02b1ab44ea2798e17c9724ae5acd5 SHA256 3bb231113481484927cfaf5076c4ce535287f261d853e146821838b05295eb21
-MISC metadata.xml 2216 RMD160 06c2aea6ad54e88d28371ef8a6302120e88e8505 SHA1 65b4217c9947df1b0052b2a121bfce3c849de949 SHA256 6559882bfeb74a0c812e092fc392728e16a7df57d1ec45d43f44babd79ee3424
diff --git a/gnustep-apps/cynthiune/cynthiune-0.9.5-r5.ebuild b/gnustep-apps/cynthiune/cynthiune-0.9.5-r5.ebuild
deleted file mode 100644
index 6da63b5b4e90..000000000000
--- a/gnustep-apps/cynthiune/cynthiune-0.9.5-r5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2010 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-r5.ebuild,v 1.4 2010/07/14 17:12:56 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="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-sound/musepack-tools-444 )
- 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}-NSWindow.patch
- epatch "${FILESDIR}"/${P}-gnustep-make-2.patch
- epatch "${FILESDIR}"/${P}-as-needed.patch
- epatch "${FILESDIR}"/${P}-libmpcdec.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-NSCellExtensions.patch b/gnustep-apps/cynthiune/files/cynthiune-0.9.5-NSCellExtensions.patch
deleted file mode 100644
index 9ca91887f270..000000000000
--- a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-NSCellExtensions.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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-NSMutableDictionary.patch b/gnustep-apps/cynthiune/files/cynthiune-0.9.5-NSMutableDictionary.patch
deleted file mode 100644
index 866c3644455c..000000000000
--- a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-NSMutableDictionary.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Cynthiune-0.9.5.orig/Bundles/OSS/OSSPreference.h 2008-01-04 13:52:41.000000000 +0100
-+++ Cynthiune-0.9.5/Bundles/OSS/OSSPreference.h 2008-01-04 13:51:46.000000000 +0100
-@@ -26,6 +26,7 @@
- #import <Cynthiune/Preference.h>
-
- @class NSBox;
-+@class NSMutableDictionary;
- @class NSWindow;
- @class NSTextField;
-
diff --git a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-NSWindow.patch b/gnustep-apps/cynthiune/files/cynthiune-0.9.5-NSWindow.patch
deleted file mode 100644
index 0de5fdf6e035..000000000000
--- a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-NSWindow.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- CynthiuneController.m.orig 2010-07-14 19:09:33.000000000 +0200
-+++ CynthiuneController.m 2010-07-14 19:09:14.000000000 +0200
-@@ -28,9 +28,6 @@
- #import <AppKit/NSPasteboard.h>
- #import <AppKit/NSToolbar.h>
- #import <AppKit/NSWindow.h>
--#ifdef GNUSTEP
--#import <AppKit/NSWindow+Toolbar.h>
--#endif
- #import <Foundation/NSArray.h>
- #import <Foundation/NSBundle.h>
- #import <Foundation/NSFileManager.h>
diff --git a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-as-needed.patch b/gnustep-apps/cynthiune/files/cynthiune-0.9.5-as-needed.patch
deleted file mode 100644
index e707a44a2a4b..000000000000
--- a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-as-needed.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- frameworks.make.orig 2008-12-09 18:05:15.000000000 +0100
-+++ frameworks.make 2008-12-09 18:05:22.000000000 +0100
-@@ -2,13 +2,16 @@
-
- ADDITIONAL_INCLUDE_DIRS += $(foreach fdir,$(foreach fdir,$(FRAMEWORKS_DIRS),$(foreach framework,$(FRAMEWORKS),$(wildcard $(fdir)/$(framework).framework))),-I$(fdir)/Headers)
- ifeq (yes, $(local-build))
-- _ldflags = $(foreach framework,$(FRAMEWORKS),$(foreach efdir,$(foreach fdir,$(FRAMEWORKS_DIRS),$(wildcard $(fdir)/$(framework).framework)), -Wl,-rpath,$(if $(wildcard $(shell pwd)/$(efdir)),$(shell pwd)/$(efdir),$(efdir))/Versions/Current -L$(efdir)/Versions/Current) -l$(framework))
-+ _ldflags = $(foreach framework,$(FRAMEWORKS),$(foreach efdir,$(foreach fdir,$(FRAMEWORKS_DIRS),$(wildcard $(fdir)/$(framework).framework)), -Wl,-rpath,$(if $(wildcard $(shell pwd)/$(efdir)),$(shell pwd)/$(efdir),$(efdir))/Versions/Current -L$(efdir)/Versions/Current))
-+ _libs = $(foreach framework,$(FRAMEWORKS), -l$(framework))
- else
-- _ldflags = $(foreach framework,$(FRAMEWORKS),$(foreach efdir,$(foreach fdir,$(FRAMEWORKS_DIRS),$(wildcard $(fdir)/$(framework).framework)), -L$(efdir)/Versions/Current) -l$(framework))
-+ _ldflags = $(foreach framework,$(FRAMEWORKS),$(foreach efdir,$(foreach fdir,$(FRAMEWORKS_DIRS),$(wildcard $(fdir)/$(framework).framework)), -L$(efdir)/Versions/Current))
-+ _libs = $(foreach framework,$(FRAMEWORKS), -l$(framework))
- endif
-
- ifeq (mingw32, $(GNUSTEP_TARGET_OS))
--ADDITIONAL_GUI_LIBS += -L$(FRAMEWORKS_DIRS)/../../Cynthiune.app $(_ldflags)
-+ADDITIONAL_GUI_LIBS += -L$(FRAMEWORKS_DIRS)/../../Cynthiune.app $(_ldflags) $(_libs)
- else
- ADDITIONAL_LDFLAGS += $(_ldflags)
-+ADDITIONAL_GUI_LIBS += $(_libs)
- endif
diff --git a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-flac-1.1.3.patch b/gnustep-apps/cynthiune/files/cynthiune-0.9.5-flac-1.1.3.patch
deleted file mode 100644
index a6554bda50c3..000000000000
--- a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-flac-1.1.3.patch
+++ /dev/null
@@ -1,300 +0,0 @@
-* Josh Coalson <j_coalson@yahoo.com>: cynthiune patch for upcoming FLAC 1.1.3
-
---- Cynthiune-0.9.5/Bundles/FLAC/FLAC.h
-+++ Cynthiune-0.9.5/Bundles/FLAC/FLAC.h
-@@ -31,7 +31,11 @@
-
- @interface FLAC : NSObject <CynthiuneBundle, Format>
- {
-+#ifdef LEGACY_FLAC
- FLAC__FileDecoder *fileDecoder;
-+#else
-+ FLAC__StreamDecoder *fileDecoder;
-+#endif
-
- unsigned int bitsPerSample;
- unsigned int duration;
---- Cynthiune-0.9.5/Bundles/FLAC/FLAC.m
-+++ Cynthiune-0.9.5/Bundles/FLAC/FLAC.m
-@@ -34,13 +34,25 @@
- #import <Cynthiune/Format.h>
- #import <Cynthiune/utils.h>
-
-+/* FLAC 1.1.3 has FLAC_API_VERSION_CURRENT == 8 */
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
-+#define LEGACY_FLAC
-+#else
-+#undef LEGACY_FLAC
-+#endif
-+
- #import "FLAC.h"
-
- #define LOCALIZED(X) _b ([FLAC class], X)
-
- static FLAC__StreamDecoderWriteStatus
-+#ifdef LEGACY_FLAC
- writeCallback (const FLAC__FileDecoder *fileDecoder, const FLAC__Frame *frame,
- const FLAC__int32 * const buffer[], void *clientData)
-+#else
-+writeCallback (const FLAC__StreamDecoder *fileDecoder, const FLAC__Frame *frame,
-+ const FLAC__int32 * const buffer[], void *clientData)
-+#endif
- {
- CFLAC *cStream;
- unsigned int sample, channel;
-@@ -70,9 +82,15 @@
- }
-
- static void
-+#ifdef LEGACY_FLAC
- metadataCallback (const FLAC__FileDecoder *fileDecoder,
- const FLAC__StreamMetadata *metadata,
- void *clientData)
-+#else
-+metadataCallback (const FLAC__StreamDecoder *fileDecoder,
-+ const FLAC__StreamMetadata *metadata,
-+ void *clientData)
-+#endif
- {
- CFLAC *cStream;
-
-@@ -88,9 +106,15 @@
- }
-
- static void
-+#ifdef LEGACY_FLAC
- errorCallback (const FLAC__FileDecoder *fileDecoder,
- FLAC__StreamDecoderErrorStatus status,
- void *clientData)
-+#else
-+errorCallback (const FLAC__StreamDecoder *fileDecoder,
-+ FLAC__StreamDecoderErrorStatus status,
-+ void *clientData)
-+#endif
- {
- NSLog (@"FLAC: received error with status %d", status);
- }
-@@ -161,6 +185,7 @@
-
- - (BOOL) _initializeFileDecoderWithFilename: (NSString *) fileName
- {
-+#ifdef LEGACY_FLAC
- FLAC__file_decoder_set_metadata_ignore_all (fileDecoder);
- FLAC__file_decoder_set_metadata_respond (fileDecoder,
- FLAC__METADATA_TYPE_STREAMINFO);
-@@ -173,13 +198,25 @@
- return (FLAC__file_decoder_set_filename (fileDecoder, [fileName cString])
- && (FLAC__file_decoder_init (fileDecoder) == FLAC__FILE_DECODER_OK)
- && FLAC__file_decoder_process_until_end_of_metadata (fileDecoder));
-+#else
-+ FLAC__stream_decoder_set_metadata_ignore_all (fileDecoder);
-+ FLAC__stream_decoder_set_metadata_respond (fileDecoder,
-+ FLAC__METADATA_TYPE_STREAMINFO);
-+ return ((FLAC__stream_decoder_init_file (fileDecoder, [fileName cString],
-+ writeCallback, metadataCallback, errorCallback, self) == FLAC__STREAM_DECODER_INIT_STATUS_OK)
-+ && FLAC__stream_decoder_process_until_end_of_metadata (fileDecoder));
-+#endif
- }
-
- - (BOOL) streamOpen: (NSString *) fileName
- {
- BOOL result;
-
-+#ifdef LEGACY_FLAC
- fileDecoder = FLAC__file_decoder_new();
-+#else
-+ fileDecoder = FLAC__stream_decoder_new();
-+#endif
-
- if (fileDecoder)
- {
-@@ -187,7 +224,11 @@
- result = YES;
- else
- {
-+#ifdef LEGACY_FLAC
- FLAC__file_decoder_delete (fileDecoder);
-+#else
-+ FLAC__stream_decoder_delete (fileDecoder);
-+#endif
- fileDecoder = NULL;
- result = NO;
- }
-@@ -200,7 +241,11 @@
-
- - (void) streamClose
- {
-+#ifdef LEGACY_FLAC
- FLAC__file_decoder_delete (fileDecoder);
-+#else
-+ FLAC__stream_decoder_delete (fileDecoder);
-+#endif
- fileDecoder = NULL;
- }
-
-@@ -215,7 +260,11 @@
- if (position >= readBufferSize)
- {
- position = 0;
-+#ifdef LEGACY_FLAC
- success = FLAC__file_decoder_process_single (fileDecoder);
-+#else
-+ success = FLAC__stream_decoder_process_single (fileDecoder);
-+#endif
- }
-
- if (success)
-@@ -251,13 +300,27 @@
- withSize: (unsigned int) bufferSize
- {
- int readBytes;
-+#ifdef LEGACY_FLAC
- FLAC__FileDecoderState state;
-
- state = FLAC__file_decoder_get_state (fileDecoder);
-+#else
-+ FLAC__StreamDecoderState state;
-+
-+ state = FLAC__stream_decoder_get_state (fileDecoder);
-+#endif
-
-+#ifdef LEGACY_FLAC
- if (state == FLAC__FILE_DECODER_OK)
-+#else
-+ if (state < FLAC__STREAM_DECODER_END_OF_STREAM)
-+#endif
- readBytes = [self _processNextChunk: buffer withSize: bufferSize];
-+#ifdef LEGACY_FLAC
- else if (state == FLAC__FILE_DECODER_END_OF_FILE)
-+#else
-+ else if (state == FLAC__STREAM_DECODER_END_OF_STREAM)
-+#endif
- readBytes = 0;
- else
- readBytes = -1;
-@@ -272,7 +335,11 @@
-
- - (void) seek: (unsigned int) aPos
- {
-+#ifdef LEGACY_FLAC
- FLAC__file_decoder_seek_absolute (fileDecoder, aPos * rate);
-+#else
-+ FLAC__stream_decoder_seek_absolute (fileDecoder, aPos * rate);
-+#endif
- }
-
- - (unsigned int) readChannels
-@@ -295,7 +362,11 @@
- if (readBuffer)
- free (readBuffer);
- if (fileDecoder)
-+#ifdef LEGACY_FLAC
- FLAC__file_decoder_delete (fileDecoder);
-+#else
-+ FLAC__stream_decoder_delete (fileDecoder);
-+#endif
- [super dealloc];
- }
-
---- Cynthiune-0.9.5/Bundles/FLACTags/FLACTags.m
-+++ Cynthiune-0.9.5/Bundles/FLACTags/FLACTags.m
-@@ -33,6 +33,13 @@
-
- #import "FLACTags.h"
-
-+/* FLAC 1.1.3 has FLAC_API_VERSION_CURRENT == 8 */
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
-+#define LEGACY_FLAC
-+#else
-+#undef LEGACY_FLAC
-+#endif
-+
- #define LOCALIZED(X) _b ([FLACTags class], X)
-
- static inline int
-@@ -78,16 +85,27 @@
- }
-
- static FLAC__StreamDecoderWriteStatus
-+#ifdef LEGACY_FLAC
- writeCallback (const FLAC__FileDecoder *fileDecoder, const FLAC__Frame *frame,
- const FLAC__int32 * const buffer[], void *clientData)
-+#else
-+writeCallback (const FLAC__StreamDecoder *fileDecoder, const FLAC__Frame *frame,
-+ const FLAC__int32 * const buffer[], void *clientData)
-+#endif
- {
- return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
- }
-
- static void
-+#ifdef LEGACY_FLAC
- metadataCallback (const FLAC__FileDecoder *fileDecoder,
- const FLAC__StreamMetadata *metadata,
- void *clientData)
-+#else
-+metadataCallback (const FLAC__StreamDecoder *fileDecoder,
-+ const FLAC__StreamMetadata *metadata,
-+ void *clientData)
-+#endif
- {
- unsigned int count;
-
-@@ -104,9 +122,15 @@
- }
-
- static void
-+#ifdef LEGACY_FLAC
- errorCallback (const FLAC__FileDecoder *fileDecoder,
- FLAC__StreamDecoderErrorStatus status,
- void *clientData)
-+#else
-+errorCallback (const FLAC__StreamDecoder *fileDecoder,
-+ FLAC__StreamDecoderErrorStatus status,
-+ void *clientData)
-+#endif
- {
- NSLog (@"FLACTags: received error with status %d", status);
- }
-@@ -132,14 +156,23 @@
- year: (NSString **) year
- ofFilename: (NSString *) filename
- {
-+#ifdef LEGACY_FLAC
- FLAC__FileDecoder *fileDecoder;
-+#else
-+ FLAC__StreamDecoder *fileDecoder;
-+#endif
- BOOL result;
- NSString **arrayOfValues[] = { title, artist, album, trackNumber,
- genre, year };
-
-+#ifdef LEGACY_FLAC
- fileDecoder = FLAC__file_decoder_new();
-+#else
-+ fileDecoder = FLAC__stream_decoder_new();
-+#endif
- if (fileDecoder)
- {
-+#ifdef LEGACY_FLAC
- FLAC__file_decoder_set_metadata_ignore_all (fileDecoder);
- FLAC__file_decoder_set_metadata_respond (fileDecoder,
- FLAC__METADATA_TYPE_VORBIS_COMMENT);
-@@ -156,6 +189,17 @@
- && FLAC__file_decoder_process_until_end_of_metadata
- (fileDecoder));
- FLAC__file_decoder_delete (fileDecoder);
-+#else
-+ FLAC__stream_decoder_set_metadata_ignore_all (fileDecoder);
-+ FLAC__stream_decoder_set_metadata_respond (fileDecoder,
-+ FLAC__METADATA_TYPE_VORBIS_COMMENT);
-+ result = ((FLAC__stream_decoder_init_file (fileDecoder, [filename cString],
-+ writeCallback, metadataCallback, errorCallback, arrayOfValues)
-+ == FLAC__STREAM_DECODER_INIT_STATUS_OK)
-+ && FLAC__stream_decoder_process_until_end_of_metadata
-+ (fileDecoder));
-+ FLAC__stream_decoder_delete (fileDecoder);
-+#endif
- }
- else
- result = NO;
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
deleted file mode 100644
index 3972c72f133d..000000000000
--- a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-gnustep-make-2.patch
+++ /dev/null
@@ -1,276 +0,0 @@
-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-libmpcdec.patch b/gnustep-apps/cynthiune/files/cynthiune-0.9.5-libmpcdec.patch
deleted file mode 100644
index 1c89f4b4f86b..000000000000
--- a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-libmpcdec.patch
+++ /dev/null
@@ -1,310 +0,0 @@
-2009-05-19 Yavor Doganov <yavor@gnu.org>
-
- * Bundsles/Musepack/CNSFileHandle.h: Import <mpc/reader.h>.
- (CNSFileHandleRetain, CNSFileHandleRelease): Remove prototypes.
- (CNSFileHandleRead, CNSFileHandleTell, CNSFileHandleCanSeek)
- (CNSFileHandleSeek, CNSFileHandleGetSize): Accept mpc_reader
- type as first argument.
- * Bundles/Musepack/CNSFileHandle.m (CNSFileHandleRetain)
- (CNSFileHandleRelease): Delete; unused.
- (CNSFileHandleRead, CNSFileHandleTell, CNSFileHandleCanSeek)
- (CNSFileHandleSeek, CNSFileHandleGetSize): Adjust for the new
- mpc_reader type.
- * Bundles/Musepack/Musepack.h <mpcDecoder>: Declare of
- mpc_demux type.
- * Bundles/Musepack/Musepack.m: Import <mpc/mpcdec.h>.
- (MPCReaderDelete): Use `mpc_reader_exit_stdio' instead of
- `free'.
- (MPCStreamInfoNew): Don't call `mpc_streaminfo_init'.
- (MPCDecoderNew): Remove function.
- ([Musepack -streamOpen]): Initialize the decoder with the new
- API function `mpc_demux_init'.
- ([Musepack +streamTestOpen]): Likewise.
- ([Musepack -readNextChunk:withSize:]): Adjust to use
- `mpc_demux_decode'.
- <frame, err>: New local variables.
- <vbrAcc, vbrBits>: Remove.
- ([Musepack -readDuration]): Use `mpc_streaminfo_get_length' to
- obtain the duration and return its result casted to unsigned int.
- ([Musepack -streamClose]): Use `mpc_demux_exit' as appropriate.
- ([Musepack +acceptedFileExtensions]): Recognize `.mpp'.
- ([Musepack -seek]): Use `mpc_demux_seek_second'.
-
---- cynthiune.app-0.9.5.orig/Bundles/Musepack/CNSFileHandle.h
-+++ cynthiune.app-0.9.5/Bundles/Musepack/CNSFileHandle.h
-@@ -23,20 +23,17 @@
- #ifndef CNSFILEHANDLE_H
- #define CNSFILEHANDLE_H
-
--#include <mpcdec/config_types.h>
-+#import <mpc/reader.h>
-
- #ifdef __cplusplus
- extern "C" {
- #endif /* __cplusplus */
-
--void CNSFileHandleRetain (void *fileHandle);
--void CNSFileHandleRelease (void *fileHandle);
--
--int CNSFileHandleRead (void *fileHandle, void *ptr, int size);
--int CNSFileHandleTell (void *fileHandle);
--mpc_bool_t CNSFileHandleCanSeek (void *fileHandle);
--mpc_bool_t CNSFileHandleSeek (void *fileHandle, int offset);
--int CNSFileHandleGetSize (void *fileHandle);
-+int CNSFileHandleRead (mpc_reader *fileHandle, void *ptr, int size);
-+int CNSFileHandleTell (mpc_reader *fileHandle);
-+mpc_bool_t CNSFileHandleCanSeek (mpc_reader *fileHandle);
-+mpc_bool_t CNSFileHandleSeek (mpc_reader *fileHandle, int offset);
-+int CNSFileHandleGetSize (mpc_reader *fileHandle);
-
- #ifdef __cplusplus
- }
---- cynthiune.app-0.9.5.orig/Bundles/Musepack/CNSFileHandle.m
-+++ cynthiune.app-0.9.5/Bundles/Musepack/CNSFileHandle.m
-@@ -26,57 +26,45 @@
-
- #import "CNSFileHandle.h"
-
--void
--CNSFileHandleRetain (void *fileHandle)
--{
-- [(NSFileHandle *) fileHandle retain];
--}
--
--void
--CNSFileHandleRelease (void *fileHandle)
--{
-- [(NSFileHandle *) fileHandle release];
--}
--
- int
--CNSFileHandleRead (void *fileHandle, void *ptr, int size)
-+CNSFileHandleRead (mpc_reader *fileHandle, void *ptr, int size)
- {
- NSData *data;
-
-- data = [(NSFileHandle *) fileHandle readDataOfLength: size];
-+ data = [(NSFileHandle *) fileHandle->data readDataOfLength: size];
- [data getBytes: ptr];
-
- return [data length];
- }
-
- int
--CNSFileHandleTell (void *fileHandle)
-+CNSFileHandleTell (mpc_reader *fileHandle)
- {
-- return [(NSFileHandle *) fileHandle offsetInFile];
-+ return [(NSFileHandle *) fileHandle->data offsetInFile];
- }
-
- mpc_bool_t
--CNSFileHandleCanSeek (void *fileHandle)
-+CNSFileHandleCanSeek (mpc_reader *fileHandle)
- {
- return YES;
- }
-
- mpc_bool_t
--CNSFileHandleSeek (void *fileHandle, int offset)
-+CNSFileHandleSeek (mpc_reader *fileHandle, int offset)
- {
-- [(NSFileHandle *) fileHandle seekToFileOffset: (long long) offset];
-+ [(NSFileHandle *) fileHandle->data seekToFileOffset: (long long) offset];
-
- return YES;
- }
-
- int
--CNSFileHandleGetSize (void *fileHandle)
-+CNSFileHandleGetSize (mpc_reader *fileHandle)
- {
- int size, where;
-
-- where = [(NSFileHandle *) fileHandle offsetInFile];
-- size = [(NSFileHandle *) fileHandle seekToEndOfFile];
-- [(NSFileHandle *) fileHandle seekToFileOffset: (long long) where];
-+ where = [(NSFileHandle *) fileHandle->data offsetInFile];
-+ size = [(NSFileHandle *) fileHandle->data seekToEndOfFile];
-+ [(NSFileHandle *) fileHandle->data seekToFileOffset: (long long) where];
-
- return size;
- }
---- cynthiune.app-0.9.5.orig/Bundles/Musepack/Musepack.h
-+++ cynthiune.app-0.9.5/Bundles/Musepack/Musepack.h
-@@ -31,7 +31,7 @@
-
- mpc_reader *mpcReader;
- mpc_streaminfo *mpcStreamInfo;
-- mpc_decoder *mpcDecoder;
-+ mpc_demux *mpcDecoder;
-
- MPC_SAMPLE_FORMAT sampleBuffer[maxSamples];
- unsigned char frameBuffer[maxSamples * 4];
---- cynthiune.app-0.9.5.orig/Bundles/Musepack/Musepack.m
-+++ cynthiune.app-0.9.5/Bundles/Musepack/Musepack.m
-@@ -30,7 +30,7 @@
- #import <Cynthiune/Format.h>
- #import <Cynthiune/utils.h>
-
--#import <mpcdec/mpcdec.h>
-+#import <mpc/mpcdec.h>
-
- #import "Musepack.h"
- #import "CNSFileHandle.h"
-@@ -75,7 +75,7 @@
- MPCReaderDelete (mpc_reader *reader)
- {
- [(NSFileHandle *) reader->data release];
-- free (reader);
-+ mpc_reader_exit_stdio (reader);
- }
-
- static mpc_streaminfo *
-@@ -84,23 +84,10 @@
- mpc_streaminfo *streamInfo;
-
- streamInfo = malloc (sizeof (mpc_streaminfo));
-- mpc_streaminfo_init (streamInfo);
-
- return streamInfo;
- }
-
--static mpc_decoder *
--MPCDecoderNew (mpc_reader *reader, mpc_streaminfo *streamInfo)
--{
-- mpc_decoder *decoder;
--
-- decoder = malloc (sizeof (mpc_decoder));
-- mpc_decoder_setup (decoder, reader);
-- mpc_decoder_initialize (decoder, streamInfo);
--
-- return decoder;
--}
--
- static inline void
- CopyBuffer (const MPC_SAMPLE_FORMAT *buffer, unsigned char *destBuffer,
- unsigned int length)
-@@ -173,10 +160,13 @@
- {
- [fileHandle retain];
- mpcReader = MPCReaderNew (fileHandle);
-+ if (!mpcReader)
-+ return MPC_FALSE;
- mpcStreamInfo = MPCStreamInfoNew ();
-- mpc_streaminfo_read (mpcStreamInfo, mpcReader);
--
-- mpcDecoder = MPCDecoderNew (mpcReader, mpcStreamInfo);
-+ mpcDecoder = mpc_demux_init (mpcReader);
-+ if (!mpcDecoder)
-+ return MPC_FALSE;
-+ mpc_demux_get_info (mpcDecoder, mpcStreamInfo);
-
- result = YES;
- }
-@@ -196,6 +186,7 @@
- NSFileHandle *testFileHandle;
- mpc_reader *testReader;
- mpc_streaminfo *testStreamInfo;
-+ mpc_demux *testDecoder;
- BOOL result;
-
- testFileHandle = [NSFileHandle fileHandleForReadingAtPath: fileName];
-@@ -203,9 +194,14 @@
- {
- testReader = MPCReaderNew (testFileHandle);
- testStreamInfo = MPCStreamInfoNew ();
-- result = !mpc_streaminfo_read (testStreamInfo, testReader);
-- free (testStreamInfo);
-- MPCReaderDelete (testReader);
-+ testDecoder = mpc_demux_init (testReader);
-+ if (testDecoder)
-+ {
-+ result = YES;
-+ mpc_demux_exit (testDecoder);
-+ }
-+ if (testReader)
-+ MPCReaderDelete (testReader);
- }
- else
- result = NO;
-@@ -222,21 +218,29 @@
- withSize: (unsigned int) bufferSize
- {
- int bytes, status;
-- unsigned int vbrAcc, vbrBits;
-+ mpc_frame_info frame;
-+ mpc_status err;
- unsigned long frames, samples;
-
- status = 1;
-+ frame.buffer = sampleBuffer;
-
-- if (!remaining)
-+ while (!remaining)
- {
-- samples = mpc_decoder_decode (mpcDecoder, sampleBuffer,
-- &vbrAcc, &vbrBits);
-- if (!samples)
-- status = 0;
-- else if (samples == (unsigned long) -1)
-- status = -1;
-+ err = mpc_demux_decode (mpcDecoder, &frame);
-+ if (err != MPC_STATUS_OK)
-+ {
-+ status = -1;
-+ break;
-+ }
-+ else if (frame.bits == -1)
-+ {
-+ status = 0;
-+ break;
-+ }
- else
- {
-+ samples = frame.samples;
- frames = samples * mpcStreamInfo->channels;
- CopyBuffer (sampleBuffer, frameBuffer, frames);
- remaining = frames * 2;
-@@ -277,7 +281,7 @@
-
- - (unsigned int) readDuration
- {
-- return mpcStreamInfo->pcm_samples / mpcStreamInfo->sample_freq;
-+ return (unsigned int) mpc_streaminfo_get_length (mpcStreamInfo);
- }
-
- - (void) streamClose
-@@ -287,12 +291,10 @@
- [fileHandle closeFile];
- [fileHandle release];
- }
-+ if (mpcDecoder)
-+ mpc_demux_exit (mpcDecoder);
- if (mpcReader)
- MPCReaderDelete (mpcReader);
-- if (mpcStreamInfo)
-- free (mpcStreamInfo);
-- if (mpcDecoder)
-- free (mpcDecoder);
-
- [self _resetIVars];
- }
-@@ -300,7 +302,7 @@
- // Player Protocol
- + (NSArray *) acceptedFileExtensions
- {
-- return [NSArray arrayWithObjects: @"mpc", @"mp+", nil];
-+ return [NSArray arrayWithObjects: @"mpc", @"mp+", @"mpp", nil];
- }
-
- - (BOOL) isSeekable
-@@ -310,7 +312,7 @@
-
- - (void) seek: (unsigned int) aPos
- {
-- mpc_decoder_seek_seconds (mpcDecoder, (double) aPos);
-+ mpc_demux_seek_second (mpcDecoder, (double) aPos);
- }
-
- @end
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
deleted file mode 100644
index 342d65a6ab42..000000000000
--- a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-set-macro.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- 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/metadata.xml b/gnustep-apps/cynthiune/metadata.xml
deleted file mode 100644
index 7c7458d44268..000000000000
--- a/gnustep-apps/cynthiune/metadata.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>gnustep</herd>
-<longdescription>
-Cynthiune (january 2004)
-=========
-
-What is Cynthiune?
-------------------
-Cynthiune is a free software and romantic music player for GNUstep and MacOSX.
-I wrote it originally as a christmas gift to a girl that I liked because she
-could not listen to music on her Mac with a free program. Since then, I decided
-to make it public and add even more features to make it a complete and useable
-media player.
-
-For the moment, it looks pretty much like XMMS, Winamp and similar software.
-Even though it has far less features than those, the essential components of a
-usable and user-friendly program are there in my opinion.
-
-From a programmatic point-of-view, I have decided to write a program that is
-released only when considered bug-free. The free software community lacks,
-IMnsHO, a sense of quality that makes its programs nearly useless to
-lambda users. Not only is it useless, but I think it also gives free software
-a bad reputation. The principle of freedom in "free software" is fundamental
-to me, but it has to be reachable not only by some sort of geeky elite. There
-is no point in telling users that since they have the freedom to enhance those
-programs, they must fix them if they want to use them. Releasing a program
-with too many bugs is of no use and is likely not to interest other fellow
-programmers in the community either.
-
-On the other hand, Apple has published an interesting program called "iTunes".
-Of course, it is not free software but it does implement interesting ideas
-that I would like to include in Cynthiune. For example: CD burning, complete
-playlist management, etc... Personally I find its user interface to be not as
-user-friendly as it could be. My plan is thus to take advantage of my own
-programming skills and sense of aesthetics (and ergonomy) to try to write
-something a little bit different, inspired both by XMMS/Winamp and iTunes.
-Cynthiune is thus currently very basic but its core design is starting to be
-extensible enough that it will not be too much trouble to enhance it.
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/gridlock/ChangeLog b/gnustep-apps/gridlock/ChangeLog
deleted file mode 100644
index 0de09a92fb64..000000000000
--- a/gnustep-apps/gridlock/ChangeLog
+++ /dev/null
@@ -1,85 +0,0 @@
-# ChangeLog for gnustep-apps/gridlock
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gridlock/ChangeLog,v 1.15 2011/08/19 09:43:40 voyageur Exp $
-
- 19 Aug 2011; Bernard Cafarelli <voyageur@gentoo.org> gridlock-1.10.ebuild,
- +files/gridlock-1.10-objcruntime.patch:
- Fix runtime headers inclusion, from debian bug 629202. Fixes bug #374951
-
- 08 Mar 2008; Santiago M. Mola <coldwind@gentoo.org> gridlock-1.10.ebuild:
- amd64 stable wrt bug #207381
-
- 30 Jan 2008; Brent Baude <ranger@gentoo.org> gridlock-1.10.ebuild:
- Marking gridlock-1.10 ppc for bug 207381
-
- 25 Jan 2008; Christian Faulhammer <opfer@gentoo.org> gridlock-1.10.ebuild:
- stable x86, bug 207381
-
-*gridlock-1.10 (13 Sep 2007)
-
- 13 Sep 2007; Bernard Cafarelli <voyageur@gentoo.org>
- -gridlock-1.9-r2.ebuild, +gridlock-1.10.ebuild:
- Version bump, fixed homepage
-
-*gridlock-1.9-r2 (11 Sep 2007)
-
- 11 Sep 2007; Bernard Cafarelli <voyageur@gentoo.org>
- -gridlock-1.9-r1.ebuild, +gridlock-1.9-r2.ebuild:
- Port to new GNUstep eclasses, fix bug #170467
- Changed SRC_URI to gentoo mirrors
-
- 18 Aug 2007; Christoph Mende <angelos@gentoo.org> gridlock-1.9-r1.ebuild:
- Added ~amd64 wrt bug #170433
-
- 11 Jun 2007; Bernard Cafarelli <voyageur@gentoo.org> -gridlock-1.9.ebuild:
- Remove old ebuild
-
- 22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
- Transition to Manifest2.
-
-*gridlock-1.9-r1 (11 Nov 2004)
-
- 11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org> -gridlock-1.6.1.ebuild,
- +gridlock-1.9-r1.ebuild, gridlock-1.9.ebuild:
- Mass Update: gnustep.eclass revamped to allow configurable root install;
- gnustep-base/libs/apps updated to utilize new gnustep.eclass (only versions
- bumped where files would change); some KEYWORDS were accidentally dropped
- between version bumps of packages -- this has been resolved; windowmaker
- correctly supports gnustep now
-
- 17 Oct 2004; David Holm <dholm@gentoo.org> gridlock-1.9.ebuild:
- Added to ~ppc.
-
-*gridlock-1.9 (25 Sep 2004)
-
- 25 Sep 2004; Armando Di Cianno <fafhrd@gentoo.org> metadata.xml,
- +gridlock-1.9.ebuild:
- Version bump; key'd for ~x86.
-
- 23 Jul 2004; Armando Di Cianno <fafhrd@gentoo.org>
- gridlock-1.6.1.ebuild:
- Changed referenced categories in ebuilds to reflect recent epkgmove changes.
-
-*gridlock-1.6.1 (22 Jul 2004)
-
- 22 Jul 2004; Armando Di Cianno <fafhrd@gentoo.org> +metadata.xml,
- +gridlock-1.6.1.ebuild:
- Moved from app-gnustep/gridlock to gnustep-apps/gridlock.
-
- 22 Jul 2004; Armando Di Cianno <fafhrd@gentoo.org>
- gridlock-1.6.1.ebuild:
- Changing the eclass to gnustep-old
-
- 17 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> gridlock-1.6.1.ebuild:
- Added IUSE=
-
- 18 Feb 2004; David Holm <dholm@gentoo.org> gridlock-1.6.1.ebuild:
- Added to ~ppc.
-
- 18 Oct 2003; Nick Hadaway <raker@gentoo.org> gridlock-1.6.1.ebuild:
- Fixed the policy violation of setting ${A}
-
-*gridlock-1.6.1 (17 Jul 2003)
-
- 17 Jul 2003; Michele Balistreri <brain@gentoo.org> gridlock-1.6.1.ebuild:
- New ebuild.
diff --git a/gnustep-apps/gridlock/Manifest b/gnustep-apps/gridlock/Manifest
deleted file mode 100644
index 02a69c428bce..000000000000
--- a/gnustep-apps/gridlock/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX gridlock-1.10-objcruntime.patch 1763 RMD160 f329a7110ceb8c2534f8a57f7f75d253880ccf7c SHA1 d46bf94ed8608e4a37dd4567becd6a2950e2be8e SHA256 4a260055cc82310561aabccbf203655258d16335c3a960dc467d227edce8eca2
-DIST Gridlock-gnustep-1.10.tar.gz 230641 RMD160 78544673bcf5818c9100a2d1c18790a8e56691c5 SHA1 298efc068c9dc3484ba2eb2d2a08d953a461bd94 SHA256 e5d1e57f6f1bcd19dede22dbd9ba922c73e2172780a92dfff1b333e222e9aae7
-EBUILD gridlock-1.10.ebuild 598 RMD160 2f46cd28ee96cbbaac1f95abcbca6e9019e5dfd7 SHA1 03f28a0de38230cf832e455bf710e0ca25f6f0cd SHA256 a64bb0a6ee1f8f5fd20b29bc7575a2eaed0b4628ead7bb83595bba4ff7e39709
-MISC ChangeLog 3027 RMD160 b505e8963acba04bde2b77dcdaf3d7775649ca91 SHA1 f02d7ca11c22227d789aa9c340d5392cd6b8d996 SHA256 bdb40501b197a2137ec971fae4a115e934dc76848ef5d0eb6c4935e422f6677f
-MISC metadata.xml 418 RMD160 a02cd2cece5cc8c54fa73d1cc42e481a135f6ee7 SHA1 f946038887aa4e47ac281b752f0eb00209096b8d SHA256 e782270fe1019df55b0391865d940e44e43bba2439b9c1d84b162f3705f5a35d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iF4EAREIAAYFAk5OMFsACgkQFYEBGcdFJfJ+gQD9EKBe05Y90EWipHo3FjblI3JO
-ArrPdxKtuYyl/ArEZBUA/jrPriEGyydPYFnr6R/NbOk5+VpA4P+uSBwPhXaENnEx
-=XRjr
------END PGP SIGNATURE-----
diff --git a/gnustep-apps/gridlock/files/gridlock-1.10-objcruntime.patch b/gnustep-apps/gridlock/files/gridlock-1.10-objcruntime.patch
deleted file mode 100644
index 5981f57fbb5b..000000000000
--- a/gnustep-apps/gridlock/files/gridlock-1.10-objcruntime.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- gridlock.app-1.10.orig/EDObjcRuntime.h
-+++ gridlock.app-1.10/EDObjcRuntime.h
-@@ -44,16 +44,15 @@
- #else /* GNU_RUNTIME */
-
-
--#import <objc/objc.h>
--#import <objc/objc-api.h>
-+#import <objc/runtime.h>
-
- #define EDObjcMsgSend(obj, sel) objc_msg_lookup((obj), (sel))((obj), (sel))
- #define EDObjcMsgSend1(obj, sel, obj1) objc_msg_lookup((obj), (sel))((obj), (sel), (obj1))
- #define EDObjcMsgSend2(obj, sel, obj1, obj2) objc_msg_lookup((obj), (sel))((obj), (sel), (obj1), (obj2))
- #define EDObjcMsgSend3(obj, sel, obj1, obj2, obj3) objc_msg_lookup((obj), (sel))((obj), (sel), (obj1), (obj2), (obj3))
--#define EDObjcMethodInfo Method_t
--#define EDObjcClassGetInstanceMethod class_get_instance_method
--#define EDObjcClassGetClassMethod class_get_class_method
-+#define EDObjcMethodInfo Method
-+#define EDObjcClassGetInstanceMethod class_getInstanceMethod
-+#define EDObjcClassGetClassMethod class_getClassMethod
-
- #endif
-
---- gridlock.app-1.10.orig/NSObject+Extensions.m
-+++ gridlock.app-1.10/NSObject+Extensions.m
-@@ -173,13 +173,16 @@ NSArray *EDSubclassesOfClass(Class aClas
- #endif
- #else /* GNU_RUNTIME */
- NSMutableArray *subclasses;
-- Class subClass;
-- void *es = NULL;
-+ Class *classes;
-+ int i, numClasses;
-
- subclasses = [NSMutableArray array];
-- while((subClass = objc_next_class(&es)) != Nil)
-- if(EDClassIsSuperclassOfClass(aClass, subClass) == YES)
-- [subclasses addObject:subClass];
-+ numClasses = objc_getClassList(NULL, 0);
-+ classes = (Class *)NSZoneMalloc(NULL, numClasses * sizeof(Class));
-+ numClasses = objc_getClassList(classes, numClasses);
-+ for (i = 0; i < numClasses; i++)
-+ [subclasses addObject:classes[i]];
-+ NSZoneFree(NULL, classes);
-
- return subclasses;
- #endif
diff --git a/gnustep-apps/gridlock/gridlock-1.10.ebuild b/gnustep-apps/gridlock/gridlock-1.10.ebuild
deleted file mode 100644
index 10eca9b91077..000000000000
--- a/gnustep-apps/gridlock/gridlock-1.10.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gridlock/gridlock-1.10.ebuild,v 1.5 2011/08/19 09:43:40 voyageur Exp $
-
-inherit gnustep-2
-
-S=${WORKDIR}/${PN/g/G}
-
-DESCRIPTION="Gridlock is a collection of grid-based games"
-HOMEPAGE="http://www.dozingcatsoftware.com/Gridlock/readme.html"
-SRC_URI="http://www.dozingcatsoftware.com/Gridlock/${PN/g/G}-gnustep-${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-src_prepare() {
- epatch "${FIESDIR}"/${P}-objcruntime.patch
-}
diff --git a/gnustep-apps/gridlock/metadata.xml b/gnustep-apps/gridlock/metadata.xml
deleted file mode 100644
index 402483cb6e4c..000000000000
--- a/gnustep-apps/gridlock/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>gnustep</herd>
-<longdescription>
-Gridlock is a collection of several grid-based strategy games. The games include Ataxx, Reversi, Checkers, Gomoku, Connect Four, Breakthrough, Glass Bead, and Life; they are individually described in the "Games" section.
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/talksoup/ChangeLog b/gnustep-apps/talksoup/ChangeLog
deleted file mode 100644
index 406db09440ab..000000000000
--- a/gnustep-apps/talksoup/ChangeLog
+++ /dev/null
@@ -1,35 +0,0 @@
-# ChangeLog for gnustep-apps/talksoup
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/talksoup/ChangeLog,v 1.11 2008/03/08 13:51:43 coldwind Exp $
-
- 08 Mar 2008; Santiago M. Mola <coldwind@gentoo.org>
- talksoup-1.0_alpha1-r1.ebuild:
- amd64 stable wrt bug #207381
-
- 30 Jan 2008; Brent Baude <ranger@gentoo.org>
- talksoup-1.0_alpha1-r1.ebuild:
- Marking talksoup-1.0_alpha1-r1 ppc for bug 207381
-
- 25 Jan 2008; Christian Faulhammer <opfer@gentoo.org>
- talksoup-1.0_alpha1-r1.ebuild:
- quote variable
-
- 25 Jan 2008; Christian Faulhammer <opfer@gentoo.org>
- talksoup-1.0_alpha1-r1.ebuild:
- stable x86, bug 207381
-
-*talksoup-1.0_alpha1-r1 (10 Sep 2007)
-
- 10 Sep 2007; Bernard Cafarelli <voyageur@gentoo.org>
- +files/talksoup-1.0_alpha1-make2_support.patch,
- -talksoup-1.0_alpha1.ebuild, +talksoup-1.0_alpha1-r1.ebuild:
- Version bump from the GNUstep overlay
-
- 18 Aug 2007; Christoph Mende <angelos@gentoo.org>
- talksoup-1.0_alpha1.ebuild:
- Added ~amd64 wrt bug #170433
-
- 25 Jun 2006; Fabian Groffen <grobian@gentoo.org> ChangeLog:
- Added new talksoup ebuild, with thanks to <sourav at) sourav [dot. net> (bug
- #135381)
-
diff --git a/gnustep-apps/talksoup/Manifest b/gnustep-apps/talksoup/Manifest
deleted file mode 100644
index 95055b195dd9..000000000000
--- a/gnustep-apps/talksoup/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX talksoup-1.0_alpha1-make2_support.patch 13992 RMD160 0e7c8c6228ebfadbf7520d891eade6c1535c2886 SHA1 ee72e52ab75756b7b9f8b880b88c6fc06c53dbdb SHA256 f6a0a3cfc8922af32c4b4fb291e52a8aa2e141fb6ac8edcd417400a4c6b9c848
-DIST TalkSoup-1.0alpha.tar.bz2 251150 RMD160 3c2d741b7b2af11925d3706232f127a38930337b SHA1 04abef6126bef15c7a6999d8d6381f76608b06aa SHA256 537c81a5707dbf6118b594eaeafac428bb7a016ee7f53391861211cab05c81dc
-EBUILD talksoup-1.0_alpha1-r1.ebuild 633 RMD160 ff650ee23e007049a156cc744b830fd09d69de2a SHA1 2771d558d804c7c1315674718e5abb2a236e3a8f SHA256 15672969f7b8a2bcc0e84dfe950ab15ec83a2b9c753b1ecb2a37cf8d4d6a2ea2
-MISC ChangeLog 1205 RMD160 350222bdfc4952b2c279261ceadc49b979c7c452 SHA1 ed5599cafdb49c08f48f72c9694acbab703c04b6 SHA256 8d99e377c881d5bf410255e0e82aa59273a5d128a83236301bb2f60475c3250a
-MISC metadata.xml 447 RMD160 f5a93dad1c92f77069023f9e40fcaa49711fc520 SHA1 7be5ef2980286ffa716539e0c9e75c828c4ad937 SHA256 060b9db3ed86b9364cde25ea0b685eacd0fb8cfe64d017bd3c07397cad6b4bb3
diff --git a/gnustep-apps/talksoup/files/talksoup-1.0_alpha1-make2_support.patch b/gnustep-apps/talksoup/files/talksoup-1.0_alpha1-make2_support.patch
deleted file mode 100644
index 520ca7a420b7..000000000000
--- a/gnustep-apps/talksoup/files/talksoup-1.0_alpha1-make2_support.patch
+++ /dev/null
@@ -1,270 +0,0 @@
-diff -Naur TalkSoup-1.0alpha.orig/InFilters/DCCSupport/GNUmakefile TalkSoup-1.0alpha/InFilters/DCCSupport/GNUmakefile
---- TalkSoup-1.0alpha.orig/InFilters/DCCSupport/GNUmakefile 2007-05-12 12:37:56.000000000 +0200
-+++ TalkSoup-1.0alpha/InFilters/DCCSupport/GNUmakefile 2007-05-12 16:31:15.000000000 +0200
-@@ -8,9 +8,9 @@
- endif
-
- ifeq ($(OBJC_RUNTIME_LIB), apple)
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
- else
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
- endif
-
- DCCSupport_OBJC_FILES = DCCSupport.m DCCObject.m DCCSender.m DCCGetter.m
-diff -Naur TalkSoup-1.0alpha.orig/InFilters/Debold/GNUmakefile TalkSoup-1.0alpha/InFilters/Debold/GNUmakefile
---- TalkSoup-1.0alpha.orig/InFilters/Debold/GNUmakefile 2007-05-12 12:37:56.000000000 +0200
-+++ TalkSoup-1.0alpha/InFilters/Debold/GNUmakefile 2007-05-12 16:31:53.000000000 +0200
-@@ -4,9 +4,9 @@
- BUNDLE_EXTENSION =
-
- ifeq ($(OBJC_RUNTIME_LIB), apple)
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
- else
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
- endif
-
- Debold_LANGUAGES = English
-diff -Naur TalkSoup-1.0alpha.orig/InFilters/Decolorizer/GNUmakefile TalkSoup-1.0alpha/InFilters/Decolorizer/GNUmakefile
---- TalkSoup-1.0alpha.orig/InFilters/Decolorizer/GNUmakefile 2007-05-12 12:37:56.000000000 +0200
-+++ TalkSoup-1.0alpha/InFilters/Decolorizer/GNUmakefile 2007-05-12 16:31:53.000000000 +0200
-@@ -4,9 +4,9 @@
- BUNDLE_EXTENSION =
-
- ifeq ($(OBJC_RUNTIME_LIB), apple)
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
- else
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
- endif
-
- Decolorizer_LANGUAGES = English
-diff -Naur TalkSoup-1.0alpha.orig/InFilters/Dereverse/GNUmakefile TalkSoup-1.0alpha/InFilters/Dereverse/GNUmakefile
---- TalkSoup-1.0alpha.orig/InFilters/Dereverse/GNUmakefile 2007-05-12 12:37:56.000000000 +0200
-+++ TalkSoup-1.0alpha/InFilters/Dereverse/GNUmakefile 2007-05-12 16:31:53.000000000 +0200
-@@ -4,9 +4,9 @@
- BUNDLE_EXTENSION =
-
- ifeq ($(OBJC_RUNTIME_LIB), apple)
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
- else
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
- endif
-
- Dereverse_LANGUAGES = English
-diff -Naur TalkSoup-1.0alpha.orig/InFilters/Deunderline/GNUmakefile TalkSoup-1.0alpha/InFilters/Deunderline/GNUmakefile
---- TalkSoup-1.0alpha.orig/InFilters/Deunderline/GNUmakefile 2007-05-12 12:37:56.000000000 +0200
-+++ TalkSoup-1.0alpha/InFilters/Deunderline/GNUmakefile 2007-05-12 16:31:53.000000000 +0200
-@@ -4,9 +4,9 @@
- BUNDLE_EXTENSION =
-
- ifeq ($(OBJC_RUNTIME_LIB), apple)
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
- else
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
- endif
-
- Deunderline_LANGUAGES = English
-diff -Naur TalkSoup-1.0alpha.orig/InFilters/Emoticon/GNUmakefile TalkSoup-1.0alpha/InFilters/Emoticon/GNUmakefile
---- TalkSoup-1.0alpha.orig/InFilters/Emoticon/GNUmakefile 2007-05-12 12:37:56.000000000 +0200
-+++ TalkSoup-1.0alpha/InFilters/Emoticon/GNUmakefile 2007-05-12 16:31:53.000000000 +0200
-@@ -4,9 +4,9 @@
- BUNDLE_EXTENSION =
-
- ifeq ($(OBJC_RUNTIME_LIB), apple)
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
- else
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
- endif
-
- Emoticon_LANGUAGES = English
-diff -Naur TalkSoup-1.0alpha.orig/InFilters/Highlighting/GNUmakefile TalkSoup-1.0alpha/InFilters/Highlighting/GNUmakefile
---- TalkSoup-1.0alpha.orig/InFilters/Highlighting/GNUmakefile 2007-05-12 12:37:56.000000000 +0200
-+++ TalkSoup-1.0alpha/InFilters/Highlighting/GNUmakefile 2007-05-12 16:31:53.000000000 +0200
-@@ -8,9 +8,9 @@
- endif
-
- ifeq ($(OBJC_RUNTIME_LIB), apple)
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
- else
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
- endif
-
- Highlighting_OBJC_FILES = Highlighting.m
-diff -Naur TalkSoup-1.0alpha.orig/InFilters/KeepAlive/GNUmakefile TalkSoup-1.0alpha/InFilters/KeepAlive/GNUmakefile
---- TalkSoup-1.0alpha.orig/InFilters/KeepAlive/GNUmakefile 2007-05-12 12:37:56.000000000 +0200
-+++ TalkSoup-1.0alpha/InFilters/KeepAlive/GNUmakefile 2007-05-12 16:31:53.000000000 +0200
-@@ -4,9 +4,9 @@
- BUNDLE_EXTENSION =
-
- ifeq ($(OBJC_RUNTIME_LIB), apple)
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
- else
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
- endif
-
- KeepAlive_LANGUAGES = English
-diff -Naur TalkSoup-1.0alpha.orig/InFilters/Logging/GNUmakefile TalkSoup-1.0alpha/InFilters/Logging/GNUmakefile
---- TalkSoup-1.0alpha.orig/InFilters/Logging/GNUmakefile 2007-05-12 12:37:56.000000000 +0200
-+++ TalkSoup-1.0alpha/InFilters/Logging/GNUmakefile 2007-05-12 16:31:53.000000000 +0200
-@@ -4,9 +4,9 @@
- BUNDLE_EXTENSION =
-
- ifeq ($(OBJC_RUNTIME_LIB), apple)
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
- else
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
- endif
-
- Logging_LANGUAGES = English
-diff -Naur TalkSoup-1.0alpha.orig/InFilters/MessageInTab/GNUmakefile TalkSoup-1.0alpha/InFilters/MessageInTab/GNUmakefile
---- TalkSoup-1.0alpha.orig/InFilters/MessageInTab/GNUmakefile 2007-05-12 12:37:56.000000000 +0200
-+++ TalkSoup-1.0alpha/InFilters/MessageInTab/GNUmakefile 2007-05-12 16:31:53.000000000 +0200
-@@ -4,9 +4,9 @@
- BUNDLE_EXTENSION =
-
- ifeq ($(OBJC_RUNTIME_LIB), apple)
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
- else
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
- endif
-
- MessageInTab_LANGUAGES = English
-diff -Naur TalkSoup-1.0alpha.orig/InFilters/MessageOutTab/GNUmakefile TalkSoup-1.0alpha/InFilters/MessageOutTab/GNUmakefile
---- TalkSoup-1.0alpha.orig/InFilters/MessageOutTab/GNUmakefile 2007-05-12 12:37:56.000000000 +0200
-+++ TalkSoup-1.0alpha/InFilters/MessageOutTab/GNUmakefile 2007-05-12 16:31:53.000000000 +0200
-@@ -4,9 +4,9 @@
- BUNDLE_EXTENSION =
-
- ifeq ($(OBJC_RUNTIME_LIB), apple)
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
- else
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
- endif
-
- MessageOutTab_LANGUAGES = English
-diff -Naur TalkSoup-1.0alpha.orig/InFilters/PrivateBeep/GNUmakefile TalkSoup-1.0alpha/InFilters/PrivateBeep/GNUmakefile
---- TalkSoup-1.0alpha.orig/InFilters/PrivateBeep/GNUmakefile 2007-05-12 12:37:56.000000000 +0200
-+++ TalkSoup-1.0alpha/InFilters/PrivateBeep/GNUmakefile 2007-05-12 16:31:53.000000000 +0200
-@@ -4,9 +4,9 @@
- BUNDLE_EXTENSION =
-
- ifeq ($(OBJC_RUNTIME_LIB), apple)
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
- else
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
- endif
-
- PrivateBeep_LANGUAGES = English
-diff -Naur TalkSoup-1.0alpha.orig/InFilters/Skeleton/GNUmakefile TalkSoup-1.0alpha/InFilters/Skeleton/GNUmakefile
---- TalkSoup-1.0alpha.orig/InFilters/Skeleton/GNUmakefile 2007-05-12 12:37:56.000000000 +0200
-+++ TalkSoup-1.0alpha/InFilters/Skeleton/GNUmakefile 2007-05-12 16:31:53.000000000 +0200
-@@ -4,9 +4,9 @@
- BUNDLE_EXTENSION =
-
- ifeq ($(OBJC_RUNTIME_LIB), apple)
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/InFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/InFilters
- else
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/InFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/InFilters
- endif
-
- Skeleton_LANGUAGES = English
-diff -Naur TalkSoup-1.0alpha.orig/Input/NetclassesInput/GNUmakefile TalkSoup-1.0alpha/Input/NetclassesInput/GNUmakefile
---- TalkSoup-1.0alpha.orig/Input/NetclassesInput/GNUmakefile 2007-05-12 12:37:56.000000000 +0200
-+++ TalkSoup-1.0alpha/Input/NetclassesInput/GNUmakefile 2007-05-12 16:31:53.000000000 +0200
-@@ -4,9 +4,9 @@
- BUNDLE_EXTENSION =
-
- ifeq ($(OBJC_RUNTIME_LIB), apple)
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/Input
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/Input
- else
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/Input
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/Input
- endif
-
- ifeq ($(OBJC_RUNTIME_LIB), apple)
-diff -Naur TalkSoup-1.0alpha.orig/OutFilters/Colorizer/GNUmakefile TalkSoup-1.0alpha/OutFilters/Colorizer/GNUmakefile
---- TalkSoup-1.0alpha.orig/OutFilters/Colorizer/GNUmakefile 2007-05-12 12:37:56.000000000 +0200
-+++ TalkSoup-1.0alpha/OutFilters/Colorizer/GNUmakefile 2007-05-12 16:31:53.000000000 +0200
-@@ -4,9 +4,9 @@
- BUNDLE_EXTENSION =
-
- ifeq ($(OBJC_RUNTIME_LIB), apple)
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/OutFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/OutFilters
- else
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/OutFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/OutFilters
- endif
-
- Colorizer_LANGUAGES = English
-diff -Naur TalkSoup-1.0alpha.orig/OutFilters/Piper/GNUmakefile TalkSoup-1.0alpha/OutFilters/Piper/GNUmakefile
---- TalkSoup-1.0alpha.orig/OutFilters/Piper/GNUmakefile 2007-05-12 12:37:56.000000000 +0200
-+++ TalkSoup-1.0alpha/OutFilters/Piper/GNUmakefile 2007-05-12 16:31:53.000000000 +0200
-@@ -4,9 +4,9 @@
- BUNDLE_EXTENSION =
-
- ifeq ($(OBJC_RUNTIME_LIB), apple)
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/OutFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/OutFilters
- else
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/OutFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/OutFilters
- endif
-
- Piper_LANGUAGES = English
-diff -Naur TalkSoup-1.0alpha.orig/OutFilters/Skeleton/GNUmakefile TalkSoup-1.0alpha/OutFilters/Skeleton/GNUmakefile
---- TalkSoup-1.0alpha.orig/OutFilters/Skeleton/GNUmakefile 2007-05-12 12:37:56.000000000 +0200
-+++ TalkSoup-1.0alpha/OutFilters/Skeleton/GNUmakefile 2007-05-12 16:31:53.000000000 +0200
-@@ -4,9 +4,9 @@
- BUNDLE_EXTENSION =
-
- ifeq ($(OBJC_RUNTIME_LIB), apple)
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/OutFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/OutFilters
- else
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/OutFilters
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/OutFilters
- endif
-
- Skeleton_LANGUAGES = English
-diff -Naur TalkSoup-1.0alpha.orig/Output/GNUstepOutput/GNUmakefile TalkSoup-1.0alpha/Output/GNUstepOutput/GNUmakefile
---- TalkSoup-1.0alpha.orig/Output/GNUstepOutput/GNUmakefile 2007-05-12 12:37:56.000000000 +0200
-+++ TalkSoup-1.0alpha/Output/GNUstepOutput/GNUmakefile 2007-05-12 16:31:53.000000000 +0200
-@@ -3,9 +3,9 @@
- BUNDLE_NAME = GNUstepOutput
-
- ifeq ($(OBJC_RUNTIME_LIB), apple)
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Application\ Support/TalkSoup/Output
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Application\ Support/TalkSoup/Output
- else
--BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ApplicationSupport/TalkSoup/Output
-+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ApplicationSupport/TalkSoup/Output
- endif
-
- BUNDLE_EXTENSION =
diff --git a/gnustep-apps/talksoup/metadata.xml b/gnustep-apps/talksoup/metadata.xml
deleted file mode 100644
index 54b4a88eda7c..000000000000
--- a/gnustep-apps/talksoup/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>gnustep</herd>
- <longdescription>
- TalkSoup is an IRC client for OS X and any platform supported by
- GNUstep. It is highly configurable and extensible with a
- fully-featured plugin system already in place. It has all the
- features one would expect from a graphical IRC client.
- </longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/talksoup/talksoup-1.0_alpha1-r1.ebuild b/gnustep-apps/talksoup/talksoup-1.0_alpha1-r1.ebuild
deleted file mode 100644
index 342b07710bc8..000000000000
--- a/gnustep-apps/talksoup/talksoup-1.0_alpha1-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/talksoup/talksoup-1.0_alpha1-r1.ebuild,v 1.5 2008/03/08 13:51:43 coldwind Exp $
-
-inherit gnustep-2
-
-MY_P="TalkSoup-1.0alpha"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="IRC client for GNUstep"
-HOMEPAGE="http://talksoup.aeruder.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-KEYWORDS="amd64 ppc x86"
-SLOT="0"
-LICENSE="GPL-1"
-
-DEPEND=">=gnustep-libs/netclasses-1.05"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}/${P}-make2_support.patch"
-}