Fix compilation with --as-needed, bug #250170

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.26-gentoo x86_64

4 files changed, 102 insertions, 2 deletions

diff --git a/gnustep-apps/cynthiune/ChangeLog b/gnustep-apps/cynthiune/ChangeLog
index 0c3a495e6c97..143cdea5d788 100644
--- a/gnustep-apps/cynthiune/ChangeLog
+++ b/gnustep-apps/cynthiune/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnustep-apps/cynthiune
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cynthiune/ChangeLog,v 1.18 2008/07/21 08:25:11 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cynthiune/ChangeLog,v 1.19 2008/12/09 17:12:34 voyageur Exp $
+
+*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:
diff --git a/gnustep-apps/cynthiune/Manifest b/gnustep-apps/cynthiune/Manifest
index cbf662688f8c..f6f951fb5e4b 100644
--- a/gnustep-apps/cynthiune/Manifest
+++ b/gnustep-apps/cynthiune/Manifest
@@ -1,9 +1,11 @@
 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-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-set-macro.patch 1108 RMD160 db86c99b51c925e7f0716f660904a1e4182ef902 SHA1 a15c667e9e5d60ee333d16eaf5db779ec95060b6 SHA256 47241760782bf54ff172ef0a010e5b27073c717e62c85e2c428425752b018f4d
 DIST Cynthiune-0.9.5.tar.gz 490426 RMD160 b9dff46275b6b79ebc62655e7de92b9c9aa41274 SHA1 6622288efde5e576defa64f0d4034adeb56291d4 SHA256 e3e036385388556759e3712ea5e595976ec7a4867698dea7c46b46d226122e70
 EBUILD cynthiune-0.9.5-r1.ebuild 2081 RMD160 9945ac1631632f97d3e8aa1c1177bb857c6c3a10 SHA1 ece5ddd81940cc7a96b555b046bf8f5728bea364 SHA256 b0e88680d0230d06f16660cb43eefff9dfe4a9dd4620e23f5fd566aa464d4c00
-MISC ChangeLog 2907 RMD160 d8a4876c876d54a853b64e70aa0b891986c6a9e2 SHA1 7faeb64c2a3bb1f4a8bc19654046f8d9450c94ba SHA256 fc6cb44db4d2575947b68ca44adb5b91cd2ffad944cc73709aa9854d0dd21b2b
+EBUILD cynthiune-0.9.5-r2.ebuild 2126 RMD160 2fc3d70399d0bbf1cc1b27975bbd2417b50bf286 SHA1 80d22147e70029c0fb6b78140f4d1405940ef74d SHA256 1778ac3759ffe63824410479c770b874d128e04cd395a32ae5e033bfe0631c09
+MISC ChangeLog 3116 RMD160 4499a41d53d4b17f6d1ebf79c0ce2c0ba1ead873 SHA1 51ba3ad679dfc645b7d705545a1937b134da0fc0 SHA256 275108895801e0e3d9a94bb655fe3ab099b8147df5c45f68fc34dd4b9d58f613
 MISC metadata.xml 2216 RMD160 06c2aea6ad54e88d28371ef8a6302120e88e8505 SHA1 65b4217c9947df1b0052b2a121bfce3c849de949 SHA256 6559882bfeb74a0c812e092fc392728e16a7df57d1ec45d43f44babd79ee3424
diff --git a/gnustep-apps/cynthiune/cynthiune-0.9.5-r2.ebuild b/gnustep-apps/cynthiune/cynthiune-0.9.5-r2.ebuild
new file mode 100644
index 000000000000..c3ed0e5a9115
--- /dev/null
+++ b/gnustep-apps/cynthiune/cynthiune-0.9.5-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2008 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-r2.ebuild,v 1.1 2008/12/09 17:12:34 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"
+
+RDEPEND="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-2*"
+DEPEND="${RDEPEND}
+	mad? ( dev-util/pkgconfig )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-flac-1.1.3.patch
+	epatch "${FILESDIR}"/${P}-set-macro.patch
+	epatch "${FILESDIR}"/${P}-NSCellExtensions.patch
+	epatch "${FILESDIR}"/${P}-NSMutableDictionary.patch
+	epatch "${FILESDIR}"/${P}-gnustep-make-2.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+}
+
+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 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-as-needed.patch b/gnustep-apps/cynthiune/files/cynthiune-0.9.5-as-needed.patch
new file mode 100644
index 000000000000..e707a44a2a4b
--- /dev/null
+++ b/gnustep-apps/cynthiune/files/cynthiune-0.9.5-as-needed.patch
@@ -0,0 +1,22 @@
+--- 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