support building with --as-needed with patch from Dannee McGuire via bug #232592

Package-Manager: portage-2.1.4.4

4 files changed, 117 insertions, 7 deletions

diff --git a/games-sports/torcs/ChangeLog b/games-sports/torcs/ChangeLog
index 9b6df2003359..bcbb3fb30457 100644
--- a/games-sports/torcs/ChangeLog
+++ b/games-sports/torcs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-sports/torcs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/torcs/ChangeLog,v 1.24 2008/04/08 04:10:26 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/torcs/ChangeLog,v 1.25 2008/09/05 23:13:30 mr_bones_ Exp $
+
+  05 Sep 2008; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/torcs-1.3.0-as-needed.patch, torcs-1.3.0.ebuild:
+  support building with --as-needed with patch from Dannee McGuire via bug
+  #232592
 
   08 Apr 2008; Michael Sterrett <mr_bones_@gentoo.org>
   +files/torcs-1.3.0-gcc43.patch, torcs-1.3.0.ebuild:
diff --git a/games-sports/torcs/Manifest b/games-sports/torcs/Manifest
index 6247b58ce1e3..273a53f053df 100644
--- a/games-sports/torcs/Manifest
+++ b/games-sports/torcs/Manifest
@@ -1,5 +1,6 @@
+AUX torcs-1.3.0-as-needed.patch 3479 RMD160 7ead736dc188f4945314ef9acf7712f7c05c1989 SHA1 dd384fc8f8500a7fea1c86e1093052574c6d2dec SHA256 e8a0cae374209cd350d978ba5cbfb1756928db4e659b673b106c859acbcfbb55
 AUX torcs-1.3.0-gcc43.patch 2787 RMD160 f29ff539fcd9ef827c7ab18ac7095ff1d0754b81 SHA1 7d63acd9f59102ea58dfcd4c74a5b84a1e386b08 SHA256 3ea5090abcc99b9f9a48d25d18ed95b4035ee890d1ab8ee3e50f890052faec5e
 DIST torcs-1.3.0.tar.bz2 153890028 RMD160 1c039d4061a739c8bca2a8924bbf4eaf1490c058 SHA1 02aa1f7e17ca92eb41a60879a765a8793f1676ee SHA256 354b1e34475b6579f493f8a1344788659973add3e7c2e7d087870909067625d7
-EBUILD torcs-1.3.0.ebuild 1289 RMD160 8c023621b65666d1d653e2a3c34ad4b386283a71 SHA1 01b862a1752572065a33d8b246e51bde5f6e86c5 SHA256 edd1ccb0767434f56a5c7f00c9924502ae11c7d08d413aae4078396353d2b719
-MISC ChangeLog 3919 RMD160 c0736e4b69a44009b78f4ba66b09222ef0853178 SHA1 734ef734d0c1b7d71a7faa40312f05e8d2b8e697 SHA256 0450463fad1acb7e1a8d95ed772fe594ca65cbb4f3e9f98bcb04098afcc4a74f
+EBUILD torcs-1.3.0.ebuild 1312 RMD160 c09cea92e01cf9ad34854fc0ba29a715e394b84f SHA1 412c09df876f1a0e7a436b615be4b14277025813 SHA256 7006678c756b464e7098a451494336fb7433ea1a2b8045013ad216a571bdecf1
+MISC ChangeLog 4118 RMD160 6d43f4664d218ce35fc33ebc8e0ec142adb55e08 SHA1 412fd91bd0dfbb90421d558c665aa99efebc4304 SHA256 b2af2e000ff2b35e87ecef8d7c89cafbc1becc6208ceba4cb6396cb7ba9d74c9
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-sports/torcs/files/torcs-1.3.0-as-needed.patch b/games-sports/torcs/files/torcs-1.3.0-as-needed.patch
new file mode 100644
index 000000000000..e0616cd93512
--- /dev/null
+++ b/games-sports/torcs/files/torcs-1.3.0-as-needed.patch
@@ -0,0 +1,101 @@
+--- configure.in
++++ configure.in
+@@ -118,8 +118,7 @@
+ AC_CHECK_LIB(Xrandr, XRRQueryVersion,,AC_MSG_ERROR([Can't find libXrandr. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
+ AC_CHECK_LIB(openal, alEnable,, AC_MSG_ERROR([Can't find AL/al.h. OpenAL can be found on http://www.openal.org/]))
+ AC_CHECK_LIB(alut, alutLoadWAVFile,
+-	LDFLAGS="$LDFLAGS -lalut",
+-	LDFLAGS="$LDFLAGS")
++	LIBS="$LIBS -lalut", )
+ 
+ AC_CHECK_LIB(dl, dlopen)
+ AC_CHECK_FUNC(dlopen,,AC_MSG_ERROR([Can't find dlopen function. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
+--- Make-default.mk
++++ Make-default.mk
+@@ -402,7 +402,7 @@
+ ifdef PROGRAM
+ 
+ ${PROGRAM}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a})
+-	${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${SOLIBS} ${EXT_LIBS} -o $@
++	${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
+ 
+ installprogram: ${PROGRAM}
+ 	@ createdir="${INSTLIBBASE}" ; \
+@@ -420,14 +420,14 @@
+ ifdef LOCALTOOLS
+ 
+ ${LOCALTOOLS}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a})
+-	${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${EXT_LIBS} ${SOLIBS} -o $@
++	${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
+ 
+ endif
+ 
+ ifdef TOOLS
+ 
+ ${TOOLS}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a})
+-	${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${EXT_LIBS} ${SOLIBS} -o $@
++	${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
+ 
+ installtools: ${TOOLS}
+ 	@createdir="${INSTBINBASE}/${TOOLSDIR}" ; \
+@@ -478,7 +478,7 @@
+ ifdef SOLIBRARY
+ 
+ ${SOLIBRARY}: ${OBJECTS}
+-	${CXX} -shared -o ${SOLIBRARY} ${OBJECTS} ${LDFLAGS} ${LIBSPATH} ${LIBS} ${DEBUG_LIBS}
++	${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -o ${SOLIBRARY} ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
+ 	@D=`pwd` ; \
+ 	createdir="${EXPORTBASE}/lib" ; \
+ 	$(mkinstalldirs) $$createdir ; \
+@@ -509,7 +509,7 @@
+ ifdef MODULE
+ 
+ ${MODULE}: ${OBJECTS}
+-	${CXX} -shared -o ${MODULE} ${OBJECTS} ${LDFLAGS} ${LIBSPATH} ${LIBS} 
++	${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -o ${MODULE} ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
+ 	@D=`pwd` ; \
+ 	createdir="${EXPORTBASE}/${MODULEDIR}" ; \
+ 	$(mkinstalldirs) $$createdir ; \
+--- src/libs/client/Makefile
++++ src/libs/client/Makefile
+@@ -23,6 +23,8 @@
+ SOURCES   = entry.cpp mainmenu.cpp splash.cpp exitmenu.cpp \
+ 	    optionmenu.cpp
+ 
++SOLIBS    = -lconfscreens -lraceengine
++
+ LIBS      =  -lplibssg -lplibsg -lplibul
+ 
+ EXPDIR    = include
+--- src/libs/Makefile
++++ src/libs/Makefile
+@@ -23,7 +23,7 @@
+ 
+ TOOLSUBDIRS	= txml
+ 
+-SUBDIRS		= confscreens racescreens robottools txml tgf tgfclient client raceengineclient learning \
++SUBDIRS		= confscreens racescreens robottools txml tgf tgfclient raceengineclient client learning \
+ 			  portability math
+ 
+ PKGSUBDIRS	= $(SUBDIRS)
+--- src/libs/raceengineclient/Makefile
++++ src/libs/raceengineclient/Makefile
+@@ -23,6 +23,8 @@
+ SOURCES      = singleplayer.cpp raceinit.cpp racemain.cpp racemanmenu.cpp racestate.cpp racegl.cpp \
+ 	       raceengine.cpp raceresults.cpp
+ 
++SOLIBS       = -lconfscreens -lrobottools -lracescreens
++
+ EXPDIR       = include
+ 
+ EXPORTS      = singleplayer.h raceinit.h
+--- src/libs/tgf/Makefile
++++ src/libs/tgf/Makefile
+@@ -29,6 +29,7 @@
+ 		profiler.cpp \
+ 		hash.cpp
+ 
++SOLIBS  = -ltxml
+ 
+ EXPDIR  = include
+ 
diff --git a/games-sports/torcs/torcs-1.3.0.ebuild b/games-sports/torcs/torcs-1.3.0.ebuild
index 36b569dfd8cd..527c2fcc35a5 100644
--- a/games-sports/torcs/torcs-1.3.0.ebuild
+++ b/games-sports/torcs/torcs-1.3.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/torcs/torcs-1.3.0.ebuild,v 1.6 2008/04/08 04:10:26 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/torcs/torcs-1.3.0.ebuild,v 1.7 2008/09/05 23:13:30 mr_bones_ Exp $
 
-inherit eutils multilib games
+inherit autotools eutils multilib games
 
 DESCRIPTION="The Open Racing Car Simulator"
 HOMEPAGE="http://torcs.sourceforge.net/"
@@ -28,7 +28,11 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${P}-gcc43.patch"
+	epatch \
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-as-needed.patch
+	eautoreconf
+	ecvs_clean
 }
 
 src_compile() {
@@ -48,6 +52,5 @@ src_install() {
 	dodoc README.linux doc/history/history.txt
 	doman doc/man/*.6
 	dohtml -r doc/faq/faq.html doc/tutorials doc/userman
-	rm -rf $(find "${D}/usr/share/doc" -type d -name CVS)
 	prepgamesdirs
 }