add patch for --as-needed support from Harald van Dijk (bug #211679)

Package-Manager: portage-2.1.4.4

4 files changed, 89 insertions, 8 deletions

diff --git a/games-fps/duke3d/ChangeLog b/games-fps/duke3d/ChangeLog
index 9ee4475213bf..ca22518a97e7 100644
--- a/games-fps/duke3d/ChangeLog
+++ b/games-fps/duke3d/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/duke3d
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/ChangeLog,v 1.28 2008/01/04 20:59:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/ChangeLog,v 1.29 2008/02/28 03:24:23 mr_bones_ Exp $
+
+  28 Feb 2008; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/duke3d-20040817-as-needed.patch, duke3d-20040817-r2.ebuild:
+  add patch for --as-needed support from Harald van Dijk (bug #211679)
 
   04 Jan 2008; Michael Sterrett <mr_bones_@gentoo.org>
   duke3d-20040817-r2.ebuild:
diff --git a/games-fps/duke3d/Manifest b/games-fps/duke3d/Manifest
index 31363dd23036..43d852496536 100644
--- a/games-fps/duke3d/Manifest
+++ b/games-fps/duke3d/Manifest
@@ -3,12 +3,13 @@ AUX 20040817-duke3d-makefile-opts.patch 863 RMD160 49c36fb8f5907f9ac01fd2d9e4a5c
 AUX 20040817-endian.patch 772 RMD160 b5657806a89846a9280b7ece2aa95b7816249e8b SHA1 c88d5e0e4efb7bdaf507f8f80f116fab1d74c91f SHA256 e0bd07c16123593627e888c102a84af033e906ace3aa3a1559828d83626ec16e
 AUX 20040817-gcc34.patch 1886 RMD160 971968bf75c8151269ee3ca6a326ca780e2470ad SHA1 9cf88162fb707103465e804325fa98bf14676d67 SHA256 f6f8271c95d898317b17eb22986a90294db4297482b011b01bf659c22686a3d8
 AUX 20040817-gcc4.patch 2169 RMD160 641c45992c2c26447543b9c2175673e9588b71ef SHA1 b892403cb36694e8d6de939194f629a33a8ff79a SHA256 aef2b2b12a04a69ed075df55aae1f8a40d9c4fb9c5abd62f66119da3357c540a
+AUX duke3d-20040817-as-needed.patch 2774 RMD160 a08c589c2eb7c8cca8a2660c0587ae079d39080a SHA1 b0da82411173aa3b0378570e0d54c519d33a5753 SHA256 d69ef12868cad9fccf4de6114ff3d127d95219f3417e6f3b8f0f9ce05c1f2e3a
 AUX duke3d-20040817-gcc4.patch 10474 RMD160 a83132ef666d8a78da848ccbb40f16e1250750f6 SHA1 79f26bf9ff0718cca1f9428b93a8808027e214b3 SHA256 010ceb7ff130da74d0f6349a9d12ddc206940d8545499cccb319220ba7d9d585
 AUX duke3d.cfg 4314 RMD160 8ba6360d6bc24ae353a8c3ad0b973c47d379ea21 SHA1 a6ac127c82aa845ce2afa3657088bd0084335ed8 SHA256 0ad9477e6185f0d812d726943beacdc7f7581f66c86640f44ee8e5621fe40556
 AUX network.cfg 398 RMD160 4452e8b8a99f0e08b192f2418ff8324c4bce8a7e SHA1 e9e81a204fd5b470dbd48130cde8e7270ec64eed SHA256 fe5806712207d39812906034b76191effc96d7c6efa9c8bd9081e18fab76d7b5
 DIST 3dduke13.zip 5924374 RMD160 b2788f0ef7e8e88bcd1c4e56d22cd741109ea59a SHA1 72b832734d72c829cecaffd8d8ae0eb38995aeb3 SHA256 c67efd179022bc6d9bde54f404c707cbcbdc15423c20be72e277bc2bdddf3d0e
 DIST duke3d-20040817.tar.bz2 1509273 RMD160 d6d4896c6357e21543d68e322f18e8c0c00224d4 SHA1 795b4616c6840023d2f790de3aff2342ef40fa25 SHA256 c0dd72030f9c5b84aea3e4989831311c94ef21641d6a1fdb0f557d04076f641f
 EBUILD duke3d-20040817-r1.ebuild 3462 RMD160 08ba1b796b9497271b4effcfda6a91fcd23b233f SHA1 8e403819b56ca384b7f929e2984d12f56c50332f SHA256 f5c421be36ea0244fc99366a3af9c5cb50bf83f7eb14ecb8aacda7e3c7e61205
-EBUILD duke3d-20040817-r2.ebuild 3546 RMD160 1717c99805a26b45483590da86976e6cb4a1f8ab SHA1 9ca984c816f09a9b6affac4558ffdc5f8d59bbf6 SHA256 46f599d6bb7039f071e9a33047a326df3d8ec9da9479d2b82deb560bd2c8852b
-MISC ChangeLog 4381 RMD160 1b0dd859b87c161196cc18643a1f9fae083afefb SHA1 3b5f81e85e380e61bd4bf1015b49b9ef70cd219d SHA256 5c086bc294204f92ca8968ba6291e4883c9c8d783754f920217dcc853389e07e
+EBUILD duke3d-20040817-r2.ebuild 3549 RMD160 3cee5826ce56f27dee3a6e1d74f03d281d07985c SHA1 06c68f0c6ecba92ccc4c38ffdaaab9e8adfe3d2d SHA256 4a34b91994b0e35f5eca1639eea6f8a2599cab7c2a904ae19b8b647880a376f0
+MISC ChangeLog 4577 RMD160 c4ef6b0650ac37fa50a0b87256781ad28d28ccca SHA1 acee39ea88351b8853895ce0a2a05e2877f774d4 SHA256 2ea1edec74350cd78b22ff5326844465556a3388dd7c31a08472caf46fcc8cc4
 MISC metadata.xml 2594 RMD160 03b8a770a9e33a078974b028df60891c1d9f27ae SHA1 ab4714b9dcb1fa837c19e8432d6257c34784678c SHA256 1f9ff9ce704c510d6893b20e9db8bdeff02beae7076d8eb2d48e5a6344ac116a
diff --git a/games-fps/duke3d/duke3d-20040817-r2.ebuild b/games-fps/duke3d/duke3d-20040817-r2.ebuild
index 7e3d3bfcddce..2ee3679c7a68 100644
--- a/games-fps/duke3d/duke3d-20040817-r2.ebuild
+++ b/games-fps/duke3d/duke3d-20040817-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/duke3d-20040817-r2.ebuild,v 1.4 2008/01/04 20:59:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/duke3d-20040817-r2.ebuild,v 1.5 2008/02/28 03:24:23 mr_bones_ Exp $
 
 fromcvs=0
 ECVS_MODULE="duke3d"
@@ -77,11 +77,13 @@ src_unpack() {
 
 	# configure duke3d
 	cd "${S}/source"
-	epatch "${FILESDIR}/${PV}-credits.patch"
 	# need to sync features with build engine
-	epatch "${FILESDIR}/${PV}-duke3d-makefile-opts.patch"
-	epatch "${FILESDIR}/${PV}-gcc34.patch" # compile fixes for GCC 3.4
-	epatch "${FILESDIR}"/${P}-gcc4.patch
+	epatch \
+		"${FILESDIR}/${PV}-credits.patch" \
+		"${FILESDIR}/${PV}-duke3d-makefile-opts.patch" \
+		"${FILESDIR}/${PV}-gcc34.patch" \
+		"${FILESDIR}"/${P}-gcc4.patch \
+		"${FILESDIR}"/${P}-as-needed.patch
 	sed -i \
 		-e "/^use_opengl := / s:=.*:= $(use_tf opengl):" \
 		-e "/^use_physfs := / s:=.*:= false:" \
diff --git a/games-fps/duke3d/files/duke3d-20040817-as-needed.patch b/games-fps/duke3d/files/duke3d-20040817-as-needed.patch
new file mode 100644
index 000000000000..0a049c029c49
--- /dev/null
+++ b/games-fps/duke3d/files/duke3d-20040817-as-needed.patch
@@ -0,0 +1,74 @@
+diff -ur duke3d/source/buildengine/Makefile duke3d-patched/source/buildengine/Makefile
+--- duke3d/source/buildengine/Makefile	2004-05-15 05:15:05.000000000 +0200
++++ duke3d-patched/source/buildengine/Makefile	2008-02-27 23:10:46.000000000 +0100
+@@ -99,11 +99,11 @@
+   ifeq ($(strip $(SDL_LIB_DIR)),please_set_me_cygwin_users)
+     $(error Cygwin users need to set the SDL_LIB_DIR envr var.)
+   else
+-    SDL_LDFLAGS := -L$(SDL_LIB_DIR) -lSDL
++    SDL_LIBS := -L$(SDL_LIB_DIR) -lSDL
+   endif
+ else
+   SDL_CFLAGS := $(shell sdl-config --cflags)
+-  SDL_LDFLAGS := $(shell sdl-config --libs)
++  SDL_LIBS := $(shell sdl-config --libs)
+ endif
+ 
+ CC = gcc
+@@ -202,7 +202,7 @@
+ ASMFLAGS = -f $(ASMOBJFMT) $(ASMDEFS)
+ LINKER = gcc
+ CFLAGS += $(USE_ASM) -funsigned-char  -DPLATFORM_UNIX -Wall $(SDL_CFLAGS) -fno-omit-frame-pointer
+-LDFLAGS += $(SDL_LDFLAGS)
++LDLIBS += $(SDL_LIBS)
+ 
+ # Rules for turning source files into .o files
+ %.o: %.c
+@@ -236,17 +236,17 @@
+ 
+ ifeq ($(strip $(usedlls)),true)
+ $(ENGINEDLL) : $(ENGINEOBJS)
+-	$(LINKER) -shared -o $(ENGINEDLL) $(LDFLAGS) $(ENGINEOBJS)
++	$(LINKER) -shared -o $(ENGINEDLL) $(LDFLAGS) $(ENGINEOBJS) $(LDLIBS)
+ 
+ $(NETDLL) : $(NETOBJS)
+-	$(LINKER) -shared -o $(NETDLL) $(LDFLAGS) $(NETOBJS)
++	$(LINKER) -shared -o $(NETDLL) $(LDFLAGS) $(NETOBJS) $(LDLIBS)
+ endif
+ 
+ $(GAMEEXE) : $(ENGINEDLL) $(NETDLL) $(GAMEOBJS) $(PERLOBJS)
+-	$(LINKER) -o $(GAMEEXE) $(LDFLAGS) $(LDPERL) $(PERLOBJS) $(GAMEOBJS) $(ENGINEDLL) $(NETDLL)
++	$(LINKER) -o $(GAMEEXE) $(LDFLAGS) $(LDPERL) $(PERLOBJS) $(GAMEOBJS) $(LDLIBS) $(ENGINEDLL) $(NETDLL)
+ 
+ $(BUILDEXE) : $(ENGINEDLL) $(BUILDOBJS)
+-	$(LINKER) -o $(BUILDEXE) $(LDFLAGS) $(BUILDOBJS) $(ENGINEDLL)
++	$(LINKER) -o $(BUILDEXE) $(LDFLAGS) $(BUILDOBJS) $(LDLIBS) $(ENGINEDLL)
+ 
+ listclean:
+ 	@echo "A 'make clean' would remove" $(CLEANUP)
+diff -ur duke3d/source/Makefile duke3d-patched/source/Makefile
+--- duke3d/source/Makefile	2004-05-15 05:14:16.000000000 +0200
++++ duke3d-patched/source/Makefile	2008-02-27 23:09:57.000000000 +0100
+@@ -45,11 +45,11 @@
+   ifeq ($(strip $(SDL_LIB_DIR)),please_set_me_cygwin_users)
+     $(error Cygwin users need to set the SDL_LIB_DIR envr var.)
+   else
+-    SDL_LDFLAGS := -L$(SDL_LIB_DIR) -lSDL
++    SDL_LIBS := -L$(SDL_LIB_DIR) -lSDL
+   endif
+ else
+   SDL_CFLAGS := $(shell sdl-config --cflags)
+-  SDL_LDFLAGS := $(shell sdl-config --libs) -L.
++  SDL_LIBS := $(shell sdl-config --libs) -L.
+ endif
+ 
+ ifeq ($(strip $(macosx)),true)
+@@ -104,7 +104,7 @@
+ #CC = icc
+ #CFLAGS = -g $(SDL_CFLAGS) -DUSE_SDL=1 -DPLATFORM_UNIX=1 -DUSE_I386_ASM=1 $(EXTRACFLAGS) -O2
+ 
+-LDLIBS = $(SDL_LDFLAGS) -lSDL -lSDL_mixer $(EXTRALDFLAGS)
++LDLIBS = $(SDL_LIBS) -lSDL -lSDL_mixer $(EXTRALDFLAGS)
+ 
+ # !!! FIXME: Do we even need this? It doesn't fly on MacOS X.  --ryan.
+ #LDLIBS += -Wl,-E