old

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64

6 files changed, 7 insertions, 209 deletions

diff --git a/games-sports/torcs/ChangeLog b/games-sports/torcs/ChangeLog
index 85962e3041aa..e58dbf07d30b 100644
--- a/games-sports/torcs/ChangeLog
+++ b/games-sports/torcs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-sports/torcs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/torcs/ChangeLog,v 1.38 2013/01/30 18:06:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/torcs/ChangeLog,v 1.39 2013/01/30 18:32:18 mr_bones_ Exp $
+
+  30 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/torcs-1.3.1-as-needed.patch, -files/torcs-1.3.1-libpng15.patch,
+  -files/torcs-1.3.1-no-automake.patch, -torcs-1.3.1.ebuild:
+  old
 
   30 Jan 2013; Agostino Sarubbo <ago@gentoo.org> torcs-1.3.4.ebuild:
   Stable for x86, wrt bug #453384
diff --git a/games-sports/torcs/Manifest b/games-sports/torcs/Manifest
index 69c06bf40ab1..f77b3ed6fd95 100644
--- a/games-sports/torcs/Manifest
+++ b/games-sports/torcs/Manifest
@@ -1,12 +1,7 @@
-AUX torcs-1.3.1-as-needed.patch 3479 SHA256 e8a0cae374209cd350d978ba5cbfb1756928db4e659b673b106c859acbcfbb55 SHA512 9a23c5c689e6350e224d03ff1594e3f5498883eefe2dee089fd415f937f91871d8c62d7d07eea94df7002c8f2345829658ffe2c460f102b4a494da97c008b550 WHIRLPOOL b5aec2e8cf06a71f0d3186a960a70de2e329bbe688bcaa6c3db77c15c6983b1388aca6753a8be9d2ab63ea0df4b5163cb048b2dc6990d53cb3d76ea9bb09eb97
-AUX torcs-1.3.1-libpng15.patch 528 SHA256 3b8a4ff0c927ca9996477d0a18e44de9ea1c73e07ebbab85023cb2b1cd3b5eb8 SHA512 318b6d0cd08beda4b355cba590c558a50fadaef0856a6571bca4fcba660f7cca3723ceb2c6ac14bd168ba0b9acbc2fcf6b370b706a15e8759d8820385217302f WHIRLPOOL 2f29169802a8883b8e7b314f1bf20fd61e8ab5a47f74ffdcdc6df2d6ef1ce3aeacac7889ec5b90b02d0809eee4b84b85f9631dd0f36290293ef3f6ab635a0c78
-AUX torcs-1.3.1-no-automake.patch 572 SHA256 09ce29d3846a3333be436f1edb39044a443bd5818c930eda51d40d67e1d03c0c SHA512 5878fe3e7c4013fbbdaeec5bb6f745f03572c51063fb67f044a5cd50abcbfd28ad20f03949d89b06b3adf48f62d6fb0884bbba9149c7bc88d6354d7da88a6723 WHIRLPOOL 00daec801f9497c6411db05ffd24fa13a36b225081f7723c049eb75c35747edf784bd42a191f794ba508b3cf0e2c3b569ea83a350c8385df48b9cc326793b940
 AUX torcs-1.3.4-as-needed.patch 4503 SHA256 47874c2562e3ae2a7f11fed9d19acf08a2da18a1af1a5489cb4d81a0bbc043a8 SHA512 4a165120028160a2fc2032a155266c41c3386bb1132b9158badfe13d9f26ee5d3ead91a14922950610ec5c57041dd52fb42c2a4e58dd384b555f439c7da8e6dc WHIRLPOOL 999999c7d37ee14476ace14911f17ca16c8f5ff90c89751270cdd1ebca7a86f4f9b55cfea867558e191f8808c1676124c2605ff8d20e8e0b47de88da98577ae4
 AUX torcs-1.3.4-flags.patch 412 SHA256 4509cda9a445b116c976cd731fce19226f9e90c0e9d8b208d823c0e66a8324b8 SHA512 9eb4f15f32fc76bcbfb019c56ddc4132b835a258f1167476426c1141f6f00717aba296f05ae6434661f9ead7aed28edebe6fe5b84d410c8dc48966c92ef10db8 WHIRLPOOL b4d6919c454a2b8b5f18b8212fb01184db1741d131a4dcc1e4023818ed53a004be80a423c6bbd454dc384fba633191b8a2436567788a0a0a36a9ea0419959c16
 AUX torcs-1.3.4-no-automake.patch 592 SHA256 91be55dab0355e14a9ce2a64280a2711d0d87d8c46fd9df7bdf04fc6dd8230e9 SHA512 be70370176675c0cc15a13caf2eb3344611b354085537b9fbbd27be587a598e1512521036302c116a319f7d34e9eae0ca6ef0c992a327ee59d9edfe6952518ec WHIRLPOOL 3e2bbe840f0bf0dddbb99ec9485d5d23878e3e4a19b76cb80c72c2ca002c394ee3b13ad96f1ed5dbfab70ea898569578f3e927a6e10c62d2a6151bb3c794ec81
-DIST torcs-1.3.1.tar.bz2 211422481 SHA256 901b7baddbdc6c0aa343be1b35fe3ef2eb30100279ba9189d8ec8ed4b33d51fd SHA512 a4192698ac16e0cabb53c11ead9b5098dcfb4e40febb5313946019d2f1ccc7b9647e450691d26fe32f8eced6d307f393b4d73a06dab2398871b079f7f6c0972b WHIRLPOOL be46223cf2a0c2cb2b7eb8aafe5ddc245d3190ba29b16abc1e31b58e87e425b339b4ad60a8793a170ed09f94d775ebf2ea3b7e46f9535821919a35eb2c9629f4
 DIST torcs-1.3.4.tar.bz2 414704098 SHA256 be50a42e4a32b322411a786ce4ab2fed44a1a2431511aef9925017858168e485 SHA512 8998ebaa92cb9d6c45cef5743b0cf6da04d88bb3eea18c863c4b3542eaff4b4c09cf47755dd47f5103fe4c0701125c8492cf6220bec97f1825e8cc549aa8270e WHIRLPOOL a73f3b8c4334d0d6795e1053d6131de84d2179cfc2451abf27bff05f57fdc5281deffae4a1f4c48333846e4aaaee7a5a1f6965cc353ba3b718327e494dae757a
-EBUILD torcs-1.3.1.ebuild 1458 SHA256 8b3f1a07da6a5c5a774c18b137f50f0e64107c8ff4c1311e39ba6ae1dc67dc3d SHA512 5c4dc389fc7a5aab6ae3f95f2a36c95450f236b381fdaf5134d1dce29e37298d823250ec87fd83e51205b1ea297877668161e01427b91f15c24c0fe36c2929cf WHIRLPOOL 71aec3b58261ac2021ce749e5f0dbebfb0b5b3be1be7ee9fa3ec134a4b9d7875a46cde540f4771546308a7dac9adb16ca69ebcb314f69d77f2c508a972429d84
 EBUILD torcs-1.3.4.ebuild 1421 SHA256 d7eee56be3796313a38365f43e7df3dd13bf9c71bbf2c7d0e49a6fb1afb77692 SHA512 640724a67aab7810566681e71429679137744fde55edf1f987df3cac05d9ac0caa4af1f73415406c8a2b0df09bdd239eabcc3773f1cddb613c8a6a4a2f65170e WHIRLPOOL c8f75cfe4b6db4d11bd191ae498d4b34cc86d28c0a79a54af663b28eb102e5f13bb7903f0debd5a08ad458a3d2049ded948419773ebb4b5196a2bb39d7b0e3f6
-MISC ChangeLog 5914 SHA256 4d73c4cceaecd91e40dc3a4cad9d1421ae462785cae27b827d36562059891351 SHA512 69a0b821877fb301ac44844764eb8561942b3bebc961814c230b5f7a23829a9dae84d9e0b5156799544035c8446b881db00519cc20890a8aa9ef0dc2eae13d5c WHIRLPOOL fb22b3858f4075df69ed70db38b70dd8053c3d30311ea4e58fc12ad8487507229ee80756fc2c4910f154a1e606d98f3fd04ecc3f19da854ee43840f8967b4df7
+MISC ChangeLog 6116 SHA256 0f7beaf93763f66c246baa3b7599892f586fb1edfc0e6d4869bb1e699193171f SHA512 2baa9aa77951a45cec7e8325bba473e38722c7bb683731f31e9321759d670adc72583c3c167abb1ff87a5300f85c0f8e32342ea6242c22ea97290499c3d4080c WHIRLPOOL 31c74714f05f3dd44d1a15f61949a2a8fb01ef9b4e8ffd90c145cc63b1beddbba8a85d039ad47bd718f32b99e6458403af3aa4b0dc69d1b464437e1fabcf950d
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-sports/torcs/files/torcs-1.3.1-as-needed.patch b/games-sports/torcs/files/torcs-1.3.1-as-needed.patch
deleted file mode 100644
index e0616cd93512..000000000000
--- a/games-sports/torcs/files/torcs-1.3.1-as-needed.patch
+++ /dev/null
@@ -1,101 +0,0 @@
---- 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/files/torcs-1.3.1-libpng15.patch b/games-sports/torcs/files/torcs-1.3.1-libpng15.patch
deleted file mode 100644
index 94f6d6c471e9..000000000000
--- a/games-sports/torcs/files/torcs-1.3.1-libpng15.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/libs/tgfclient/img.cpp
-+++ b/src/libs/tgfclient/img.cpp
-@@ -98,7 +98,7 @@
- 		return (unsigned char *)NULL;
- 	}
- 	
--	if (setjmp(png_ptr->jmpbuf))
-+	if (setjmp(png_jmpbuf(png_ptr)))
- 	{
- 		/* Free all of the memory associated with the png_ptr and info_ptr */
- 		png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
-@@ -229,7 +229,7 @@
- 		return -1;
- 	}
- 	
--	if (setjmp(png_ptr->jmpbuf)) {    
-+	if (setjmp(png_jmpbuf(png_ptr))) {
- 		png_destroy_write_struct(&png_ptr, &info_ptr);
- 		fclose(fp);
- 		return -1;
diff --git a/games-sports/torcs/files/torcs-1.3.1-no-automake.patch b/games-sports/torcs/files/torcs-1.3.1-no-automake.patch
deleted file mode 100644
index a7a26f6a1f5c..000000000000
--- a/games-sports/torcs/files/torcs-1.3.1-no-automake.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-torcs doesn't use automake, so it shouldn't be calling the macro
-
-http://bugs.gentoo.org/408473
-
---- a/configure.in
-+++ b/configure.in
-@@ -14,9 +14,12 @@
- #
- ##############################################################################
- 
--AC_INIT(Make-config.in)
-+AC_INIT(torcs, 1.3.1)
- AC_CONFIG_HEADERS(config.h)
--AM_INIT_AUTOMAKE(torcs, 1.3.1)
-+dnl Workaround code using old VERSION instead of new PACKAGE_VERSION
-+VERSION=$PACKAGE_VERSION
-+AC_DEFINE_UNQUOTED([VERSION], "$VERSION", [old VERSION workaround])
-+AC_SUBST(VERSION)
- 
- dnl Checks for programs.
- AC_PROG_CC
diff --git a/games-sports/torcs/torcs-1.3.1.ebuild b/games-sports/torcs/torcs-1.3.1.ebuild
deleted file mode 100644
index b25a25665fb5..000000000000
--- a/games-sports/torcs/torcs-1.3.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/torcs/torcs-1.3.1.ebuild,v 1.10 2012/03/22 15:05:44 vapier Exp $
-
-EAPI=2
-inherit autotools eutils multilib games
-
-DESCRIPTION="The Open Racing Car Simulator"
-HOMEPAGE="http://torcs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/torcs/${P}.tar.bz2"
-
-LICENSE="GPL-2 FreeArt"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=media-libs/plib-1.8.4
-	virtual/opengl
-	virtual/glu
-	media-libs/freeglut
-	media-libs/openal
-	media-libs/freealut
-	media-libs/libpng
-	x11-libs/libXrandr
-	x11-libs/libXt"
-DEPEND="${RDEPEND}
-	x11-proto/xf86vidmodeproto"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-as-needed.patch \
-		"${FILESDIR}"/${P}-libpng15.patch \
-		"${FILESDIR}"/${P}-no-automake.patch
-	eautoreconf
-	ecvs_clean
-}
-
-src_configure() {
-	addpredict $(echo /dev/snd/controlC? | sed 's/ /:/g')
-	[[ -e /dev/dsp ]] && addpredict /dev/dsp
-	egamesconf \
-		--disable-dependency-tracking \
-		--datadir="${GAMES_DATADIR_BASE}" \
-		--x-libraries=/usr/$(get_libdir) \
-		--enable-xrandr
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install datainstall || die "emake install failed"
-	newicon Ticon.png ${PN}.png
-	make_desktop_entry ${PN} TORCS
-	dodoc README doc/history/history.txt
-	doman doc/man/*.6
-	dohtml -r doc/faq/faq.html doc/tutorials doc/userman
-	prepgamesdirs
-}