version bump (bug #351409) with ebuild/patch from Michael (kensington)

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

5 files changed, 107 insertions, 6 deletions

diff --git a/games-sports/vdrift/ChangeLog b/games-sports/vdrift/ChangeLog
index 138fc206b0d8..f97a0f7143fa 100644
--- a/games-sports/vdrift/ChangeLog
+++ b/games-sports/vdrift/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-sports/vdrift
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/vdrift/ChangeLog,v 1.15 2010/10/14 01:59:17 mr_bones_ Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-sports/vdrift/ChangeLog,v 1.16 2011/12/16 16:48:36 mr_bones_ Exp $
+
+*vdrift-20111022 (16 Dec 2011)
+
+  16 Dec 2011; Michael Sterrett <mr_bones_@gentoo.org>
+  files/vdrift-20090615-ldflags.patch, +vdrift-20111022.ebuild,
+  +files/vdrift-20111022-build.patch:
+  version bump (bug #351409) with ebuild/patch from Michael (kensington)
 
   14 Oct 2010; Michael Sterrett <mr_bones_@gentoo.org>
   vdrift-20090615.ebuild:
diff --git a/games-sports/vdrift/Manifest b/games-sports/vdrift/Manifest
index 075467b5b05e..ceb6748931c1 100644
--- a/games-sports/vdrift/Manifest
+++ b/games-sports/vdrift/Manifest
@@ -1,5 +1,8 @@
-AUX vdrift-20090615-ldflags.patch 454 RMD160 b396d32c5d6884e5cec3e2d898f75ce52e5ae920 SHA1 085827c32fb55c323bdf37c5e8d64f1f58ebd005 SHA256 63c3a8aad80c16f41f8421e6f6c86c638ad8bb6e5f193a4988925b14bec12cc5
+AUX vdrift-20090615-ldflags.patch 382 RMD160 9f398db54673ded27726e6c631e660ae2ff1478b SHA1 96fdd565739e9e172a8df695d8a4ede41252755a SHA256 b787e5d098ab39bafb7ff7d82d222052617cc847145018d4b9f2177bd7e8d77b
+AUX vdrift-20111022-build.patch 1274 RMD160 68b8319677b395b44cc7d7177d214781371bf73d SHA1 37ee22e033169dff934b850374b7d578ae0b01cc SHA256 fd443f5207c025ff5d89ff35596ecf7da8ae54eceb5a2fded2bb4f30eb68994e
 DIST vdrift-2009-06-15-src.tar.bz2 502507126 RMD160 5ef735cc9a0c51612c59d51170bf50b7b8841b8d SHA1 b6fc35f1df7ca519e876d58d248924922c7e0eb5 SHA256 14c87f25e9dea2dc51f991a6c14e5f7122ec5b56df416327ba3ca383e20c11b9
+DIST vdrift-2011-10-22.tar.bz2 591243241 RMD160 7d35fc7409d6dc26b335d33f16d65a9173b527a9 SHA1 a98f5b133bb022b4a3ce8321be89989fd7bddb7c SHA256 1a0dff7aa003276c0984d34f329e619bb2e7b4b07d9a21a6b17449904ad8e16d
 EBUILD vdrift-20090615.ebuild 1654 RMD160 089e86ccfedd700544d8a698a745a5dfbfc8a981 SHA1 24ac429eda122a99167ac6badf4cd76efd6852a1 SHA256 59546c1ecc55ed122f2403e06c0c46086183c1c9d0510be7efcc6514a2a29fc6
-MISC ChangeLog 2101 RMD160 f0ad3fe0c74d14bedbb1d51768bb2021908ba42d SHA1 c8312f08312956df642ad934064202b5d64bd262 SHA256 f7d82cd92e4c2969aa302f13624f171c581a50abd2caf89005de2062447af5ab
+EBUILD vdrift-20111022.ebuild 1445 RMD160 0a462193e233395f9f822cc19b44640a454c67de SHA1 70ace6e18ee1dec451ee24340e9c30fa112cd67e SHA256 9994c9dbc659c39d8a7784f6bb4d436706c7e388a7ffcab6728eeba3c7856b9b
+MISC ChangeLog 2364 RMD160 7d13b2631ff7d44093093ea12cf880e8d93d6168 SHA1 6895e6720ae5e74652a52e6c4a6c4f8229da2259 SHA256 cc05ba8deffe05807aae5ea2e6a06062131f49b33a5348ac1532b4b08be65695
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-sports/vdrift/files/vdrift-20090615-ldflags.patch b/games-sports/vdrift/files/vdrift-20090615-ldflags.patch
index 1949ef8036c0..ce05dab6960e 100644
--- a/games-sports/vdrift/files/vdrift-20090615-ldflags.patch
+++ b/games-sports/vdrift/files/vdrift-20090615-ldflags.patch
@@ -1,5 +1,5 @@
---- SConstruct.old	2010-10-06 15:54:11.000000000 +0200
-+++ SConstruct	2010-10-06 15:59:55.000000000 +0200
+--- SConstruct.old
++++ SConstruct
 @@ -141,6 +141,7 @@
          LINKFLAGS = ['-pthread'],
          CC = 'gcc', CXX = 'g++',
diff --git a/games-sports/vdrift/files/vdrift-20111022-build.patch b/games-sports/vdrift/files/vdrift-20111022-build.patch
new file mode 100644
index 000000000000..6384910faadd
--- /dev/null
+++ b/games-sports/vdrift/files/vdrift-20111022-build.patch
@@ -0,0 +1,27 @@
+--- SConstruct
++++ SConstruct
+@@ -138,6 +139,7 @@
+         LINKFLAGS = ['-pthread'],
+         CC = 'gcc', CXX = 'g++',
+         options = opts)
++    env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
+     check_headers = ['asio.hpp', 'boost/bind.hpp', 'GL/gl.h', 'GL/glu.h', 'SDL/SDL.h', 'SDL/SDL_image.h', 'SDL/SDL_rotozoom.h', 'vorbis/vorbisfile.h', 'GL/glew.h', 'curl/curl.h', 'bullet/btBulletCollisionCommon.h', 'archive.h']
+     check_libs = [ ['GLEW', 'GL/glew.h', 'glDeleteSamplers(0, NULL);', 'Your GLEW library is out of date.'] ]
+ 
+@@ -390,7 +392,7 @@
+ if env['release']:
+     # release build, debugging off, optimizations on
+     if (sys.platform != 'freebsd6') and (sys.platform != 'freebsd7') and (sys.platform != 'freebsd8') and (sys.platform != 'freebsd9') and (sys.platform != 'win32') and (sys.platform != 'cygwin'):
+-        env.Append(CCFLAGS = ['-O1', '-pipe'])
++        env.Append(CCFLAGS = ['-pipe'])
+ else:
+     # debug build, lots of debugging, no optimizations
+     env.Append(CCFLAGS = ['-g3'])
+@@ -409,7 +411,6 @@
+     env.Append(CCFLAGS = ['-pg'])
+     env.Append(LINKFLAGS = ['-pg'])
+     env.Append(CCFLAGS = ['-g3'])
+-    env.Append(CCFLAGS = ['-O1'])
+ 
+ #------------------------------------#
+ # compile-time efficiency assessment #
diff --git a/games-sports/vdrift/vdrift-20111022.ebuild b/games-sports/vdrift/vdrift-20111022.ebuild
new file mode 100644
index 000000000000..f230e15e7a30
--- /dev/null
+++ b/games-sports/vdrift/vdrift-20111022.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-sports/vdrift/vdrift-20111022.ebuild,v 1.1 2011/12/16 16:48:36 mr_bones_ Exp $
+
+EAPI=2
+inherit eutils scons-utils games
+
+MY_P=${PN}-${PV:0:4}-${PV:4:2}-${PV:6:2}
+DESCRIPTION="A driving simulation made with drift racing in mind"
+HOMEPAGE="http://vdrift.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-arch/libarchive
+	media-libs/glew
+	media-libs/libsdl[opengl,video]
+	media-libs/sdl-gfx
+	media-libs/sdl-image[png]
+	media-libs/libvorbis
+	net-misc/curl
+	sci-physics/bullet
+	virtual/opengl
+	virtual/glu"
+DEPEND="${RDEPEND}
+	dev-cpp/asio
+	dev-libs/boost
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+}
+
+src_compile() {
+	escons \
+		force_feedback=1 \
+		destdir="${D}" \
+		bindir="${GAMES_BINDIR}" \
+		datadir="${GAMES_DATADIR}"/${PN} \
+		prefix= \
+		use_binreloc=0 \
+		release=1 \
+		os_cc=1 \
+		os_cxx=1 \
+		os_cxxflags=1 \
+		|| die
+}
+
+src_install() {
+	dogamesbin build/vdrift || die
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r data/* || die
+	newicon data/textures/icons/vdrift-64x64.png ${PN}.png
+	make_desktop_entry ${PN} VDrift
+	find "${D}" -name "SCon*" -exec rm \{\} +
+	cd "${D}"
+	keepdir $(find "${GAMES_DATADIR/\//}/${PN}" -type d -empty)
+	prepgamesdirs
+}