fix building with --as-needed with patch from Kacper Kowalik via bug #295827

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 36 insertions, 12 deletions

diff --git a/games-strategy/freecnc/ChangeLog b/games-strategy/freecnc/ChangeLog
index ae3b1b475618..c2da4ebc9df8 100644
--- a/games-strategy/freecnc/ChangeLog
+++ b/games-strategy/freecnc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/freecnc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecnc/ChangeLog,v 1.13 2009/06/13 18:01:40 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecnc/ChangeLog,v 1.14 2009/12/07 18:57:00 mr_bones_ Exp $
+
+  07 Dec 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  freecnc-0.2.1.31072003.ebuild,
+  +files/freecnc-0.2.1.31072003-as-needed.patch:
+  fix building with --as-needed with patch from Kacper Kowalik via bug
+  #295827
 
   13 Jun 2009; Tristan Heaven <nyhm@gentoo.org>
   freecnc-0.2.1.31072003.ebuild,
diff --git a/games-strategy/freecnc/Manifest b/games-strategy/freecnc/Manifest
index fea792232827..e0c501930d83 100644
--- a/games-strategy/freecnc/Manifest
+++ b/games-strategy/freecnc/Manifest
@@ -1,12 +1,13 @@
 AUX 0.2.1.31072003-gentoo-paths.patch 1583 RMD160 86f64dfb501eeced4602f2c6893bd77c24785a05 SHA1 b9b98145a30107af647bca2f0ff233f6145a4a35 SHA256 bb0d6527d3a87583eefa30b5e3fef99c5fd23dd6e9e040be5208ace045bdb664
 AUX 0.2.1.31072003-makefile-cflags.patch 478 RMD160 5f6fb661fae69a542d9875e24485405fd29faeb1 SHA1 3d79fbfd8b47ab5186c24422e878424d18276bdb SHA256 21ab855aded23a19c353ad5e13f42ec76150bf020ba4311c717a43bf99682e97
 AUX 0.2.1.31072003-remove-root.patch 555 RMD160 7bd7afe0241e83308b8531ae09af974c04db2822 SHA1 458d98509dc767ceef7cce13bfc53e24955faf9e SHA256 b9450649620c70a2c4c11fcc4a16c2782d611f11c3e6eab802e4e057383ce207
+AUX freecnc-0.2.1.31072003-as-needed.patch 515 RMD160 2738c2dc01648dbd7d93dacf253e7ab271ea9ea7 SHA1 b5a0451c52887f75594dc6bfbad90aafdff1b414 SHA256 cfb27b7e1a7c51f17ad60223fba7bf05c2c3b6346898bb72466cde185f568cdd
 AUX freecnc-0.2.1.31072003-gcc4.patch 403 RMD160 2aa4b9ecfe762cbb6599ad8a502d384bb75c8816 SHA1 3f884ae37f843ea8320f0e5e1f12695db661731c SHA256 bfe4b998ae938a1b3f87d394ddc13e745ec85736b4594dd7ab66ee48e5b34ae1
 AUX freecnc-0.2.1.31072003-gcc42.patch 725 RMD160 d738974841ec331a3865600c7484742d6c9228a8 SHA1 cf41e50df3053522147f74f37195c1f224e8062e SHA256 c4434062d2848a7d170d5dda9289b4b81a451c4b35f453f722c9b0bc11a1d06b
 AUX freecnc-0.2.1.31072003-glibc2.10.patch 296 RMD160 5b49549c07fddae640f0ea3d7c838f100bea481c SHA1 7a0e739aab49d0cc79201b2f1b0c950124faf2a1 SHA256 25f677d4953b5161d0f31e7aa9c28d71366e07888388b79e32e1412ef1be9f93
 DIST cc1demo1.zip 9367945 RMD160 a51eaee5f738e058f9c0f10689d8a81dc3c8e316 SHA1 fce488d0f9090cd96e6b064f0821ecf299b71962 SHA256 29d33849cb450a87262426cc59b25baa5e033b94c2e3495ec94f813f3bc09f87
 DIST cc1demo2.zip 17797920 RMD160 f59fb2ab7a0bbcae89c361ad97372f2b2e017985 SHA1 a154a12f2479b76601081f2bdb49286b5bb040dc SHA256 a42804b84e4015c26eaf7a9439398fdc609bfd6a7ba7b272567f187aad7b3c48
 DIST freecnc++-0.2.1.31072003-src.tar.bz2 271980 RMD160 e249a600a54a5a0aa791219360011724b8e273f2 SHA1 40d742f4acc9d175bb3b7ef1deddd1cdb18ba285 SHA256 512f55708791742093703b5ebe7ebe7b3e0c3ca46562aa9fb8f526bafc514cc5
-EBUILD freecnc-0.2.1.31072003.ebuild 2562 RMD160 25d46db71299641a207a6d91a3ad78bf706098c6 SHA1 a9bccbee2f13eee35c2d7eae009934b96461a5f7 SHA256 e189bf5086e20f94584ad862d7062085718e37d30bae67938f2a93999f54c993
-MISC ChangeLog 1972 RMD160 88d36989f8f5c8884b47412fcf6f742626d687de SHA1 6e4e01a2d5abbcbefda047bdf23014dbb3275a4c SHA256 b6ab9827d1c044bf8bd17ffee1986b1589ce24011fa891665b2e1f32de057703
+EBUILD freecnc-0.2.1.31072003.ebuild 2655 RMD160 217316ad3ece8dc380c4303e92a5c0a76c3ad74f SHA1 7078cdc7f3f4ce34631ad9ce6a19c533ebdcf626 SHA256 1d81a197a6ec18e76e5d1b59d11b1312790dd1df573ef523d1c137ebe5fa3745
+MISC ChangeLog 2196 RMD160 329c945b2b0dff19289b886a41d1106873916237 SHA1 714eb0adffb8183d737ad21ab785d6bac4bfaa98 SHA256 443a2c081b34904616ef2e231d26369985164e5cfac17cbc980f7a1120bae988
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-strategy/freecnc/files/freecnc-0.2.1.31072003-as-needed.patch b/games-strategy/freecnc/files/freecnc-0.2.1.31072003-as-needed.patch
new file mode 100644
index 000000000000..a8654cb3e5c9
--- /dev/null
+++ b/games-strategy/freecnc/files/freecnc-0.2.1.31072003-as-needed.patch
@@ -0,0 +1,11 @@
+--- freecnc++.org/tools/tmpinied/Makefile	2009-12-07 18:18:23.985443151 +0000
++++ freecnc++/tools/tmpinied/Makefile	2009-12-07 18:19:45.869476911 +0000
+@@ -13,7 +13,7 @@
+ CFLAGS = -g -Wall -Werror -I../../src/include `sdl-config --cflags`
+ 
+ ../../tmpinied: $(LOCALOBJS) $(OBJECTS)
+-	$(CXX) -o ../../tmpinied -g `sdl-config --libs` $(LOCALOBJS) $(OBJECTS) $(LIBS) $(LDFLAGS)
++	$(CXX) -g $(LDFLAGS) -o ../../tmpinied $(LOCALOBJS) $(OBJECTS) $(LIBS) `sdl-config --libs`
+ clean:
+ 	\rm -f $(LOCALOBJS) ../../tmpinied
+ 
diff --git a/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild b/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild
index b63d6809de0b..17e20c211d43 100644
--- a/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild
+++ b/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild
@@ -1,22 +1,23 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild,v 1.15 2009/06/13 18:01:40 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild,v 1.16 2009/12/07 18:57:00 mr_bones_ Exp $
 
+EAPI=2
 inherit flag-o-matic eutils games
 
 DESCRIPTION="SDL-rewrite of the classical real time strategy hit Command & Conquer"
 HOMEPAGE="http://www.freecnc.org/"
 #mirror://sourceforge/freecnc/freecnc++-${PV}-src.tar.bz2
 SRC_URI="mirror://gentoo/freecnc++-${PV}-src.tar.bz2
-	nocd? ( ftp://ftp.westwood.com/pub/cc1/previews/demo/cc1demo1.zip )
-	nocd? ( ftp://ftp.westwood.com/pub/cc1/previews/demo/cc1demo2.zip )"
+	nocd? ( ftp://ftp.westwood.com/pub/cc1/previews/demo/cc1demo1.zip
+			ftp://ftp.westwood.com/pub/cc1/previews/demo/cc1demo2.zip )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc x86"
 IUSE="nocd"
 
-RDEPEND="media-libs/libsdl
+RDEPEND="media-libs/libsdl[audio,video]
 	media-libs/sdl-net"
 DEPEND="${RDEPEND}
 	app-arch/unzip"
@@ -32,14 +33,17 @@ src_unpack() {
 			mv ${f} $(echo ${f} | awk '{print tolower($1)}') || die "moving $f"
 		done
 	fi
-	cd "${S}"
+}
+
+src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PV}-makefile-cflags.patch \
 		"${FILESDIR}"/${PV}-remove-root.patch \
 		"${FILESDIR}"/${PV}-gentoo-paths.patch \
 		"${FILESDIR}"/${P}-gcc4.patch \
 		"${FILESDIR}"/${P}-gcc42.patch \
-		"${FILESDIR}"/${P}-glibc2.10.patch
+		"${FILESDIR}"/${P}-glibc2.10.patch \
+		"${FILESDIR}"/${P}-as-needed.patch
 	sed -i \
 		-e "s:GENTOO_LOGDIR:${GAMES_LOGDIR}:" \
 		-e "s:GENTOO_CONFDIR:${GAMES_SYSCONFDIR}/${PN}/:" \
@@ -82,7 +86,9 @@ src_install() {
 
 pkg_postinst() {
 	games_pkg_postinst
-	elog "If you have the C&C games, then just copy the .mix"
-	elog "to ${GAMES_DATADIR}/${PN}"
-	elog "Otherwise, re-emerge freecnc with 'nocd' in your USE."
+	if ! use nocd ; then
+		elog "If you have the C&C games, then just copy the .mix"
+		elog "to ${GAMES_DATADIR}/${PN}"
+		elog "Otherwise, re-emerge freecnc with 'nocd' in your USE."
+	fi
 }