old

(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)

5 files changed, 6 insertions, 203 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/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
-}