Make sure user build env settings are respected and make sure rpath gets set properly in the binary (thus no need for a wrapper script) #190065 by Torsten Kaiser.

Package-Manager: portage-2.1.3.6

5 files changed, 142 insertions, 9 deletions

diff --git a/games-action/btanks/ChangeLog b/games-action/btanks/ChangeLog
index e308b7a9740c..5ce088e67f1d 100644
--- a/games-action/btanks/ChangeLog
+++ b/games-action/btanks/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-action/btanks
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/btanks/ChangeLog,v 1.1 2007/08/20 23:41:14 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/btanks/ChangeLog,v 1.2 2007/08/24 21:31:01 vapier Exp $
+
+*btanks-0.5.4740-r1 (24 Aug 2007)
+
+  24 Aug 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/btanks-0.5.4740-scons-blows.patch, +btanks-0.5.4740-r1.ebuild:
+  Make sure user build env settings are respected and make sure rpath gets set
+  properly in the binary (thus no need for a wrapper script) #190065 by
+  Torsten Kaiser.
 
 *btanks-0.5.4740 (20 Aug 2007)
 
diff --git a/games-action/btanks/Manifest b/games-action/btanks/Manifest
index 80940475adc0..c53696c2ca58 100644
--- a/games-action/btanks/Manifest
+++ b/games-action/btanks/Manifest
@@ -1,15 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX btanks-0.5.4740-scons-blows.patch 2128 RMD160 804864003109dcec4808666b8b325133e986d2df SHA1 f729a13f9af91ff81b60bfd312518473e4712f8c SHA256 969ec058de1631dec59bb2b4c4e33560bfd971fb483875f14a6203c4faa3a2bf
+MD5 ad92057571aee4b976c0cf9fde604c5c files/btanks-0.5.4740-scons-blows.patch 2128
+RMD160 804864003109dcec4808666b8b325133e986d2df files/btanks-0.5.4740-scons-blows.patch 2128
+SHA256 969ec058de1631dec59bb2b4c4e33560bfd971fb483875f14a6203c4faa3a2bf files/btanks-0.5.4740-scons-blows.patch 2128
 DIST btanks-0.5.4740.tar.bz2 47302958 RMD160 adcced45f120a26de0a36a88849232231535bd7f SHA1 ff62c7adb3a3008c349623514ef8acd18568ab2e SHA256 2eb3d691f84c3933bde270212ad71565e168a5b67fe7332b3bc8fac1de232403
+EBUILD btanks-0.5.4740-r1.ebuild 1382 RMD160 7b3750a82d59afb99ce0039c07862c3f187615f7 SHA1 f14271b0a8d9731f98d24e6c44887ec5d9a4b3a1 SHA256 cafe8f935c3576bc18ea0530ff3734039c79bf427557e48f54c66379f9b8fe4d
+MD5 2f7dcbdcf86a48a8b83d18542343a386 btanks-0.5.4740-r1.ebuild 1382
+RMD160 7b3750a82d59afb99ce0039c07862c3f187615f7 btanks-0.5.4740-r1.ebuild 1382
+SHA256 cafe8f935c3576bc18ea0530ff3734039c79bf427557e48f54c66379f9b8fe4d btanks-0.5.4740-r1.ebuild 1382
 EBUILD btanks-0.5.4740.ebuild 1356 RMD160 bd3c26358ca494206355b830e31a07124cf91ccd SHA1 a07c004ee30e9b72a16ce33206764a1fb1b87685 SHA256 ce8f9aaab966c35b331f38ed725487cc7de1304746cfad5d749d309d91d96b98
 MD5 80208a3a6f4fb4a9edda99fb76e52d4f btanks-0.5.4740.ebuild 1356
 RMD160 bd3c26358ca494206355b830e31a07124cf91ccd btanks-0.5.4740.ebuild 1356
 SHA256 ce8f9aaab966c35b331f38ed725487cc7de1304746cfad5d749d309d91d96b98 btanks-0.5.4740.ebuild 1356
-MISC ChangeLog 391 RMD160 667c95cf7591e45fb97ae726091fa63306a3aba9 SHA1 15f26c4a795f1d7b0a52ac76b07a7f37c47f5e96 SHA256 5592d10f608c9fca956037ccc76f6444ecadf00b458135a56810f8e6bd824b2c
-MD5 ed965b5c0cde8dcf2ca3ab74d8fedea8 ChangeLog 391
-RMD160 667c95cf7591e45fb97ae726091fa63306a3aba9 ChangeLog 391
-SHA256 5592d10f608c9fca956037ccc76f6444ecadf00b458135a56810f8e6bd824b2c ChangeLog 391
+MISC ChangeLog 718 RMD160 fdbdc8b25c4907aa222888203d9fdcd29a73a62c SHA1 7caceafcc1fd5179a1dfc0edea37780c0cc0cb60 SHA256 237e0c6d915375cca51266032e25e1643f21601847d40264fe2324d1554a5bbf
+MD5 6eb7e9774aeeb1a6fce60504812a8ef4 ChangeLog 718
+RMD160 fdbdc8b25c4907aa222888203d9fdcd29a73a62c ChangeLog 718
+SHA256 237e0c6d915375cca51266032e25e1643f21601847d40264fe2324d1554a5bbf ChangeLog 718
 MISC metadata.xml 602 RMD160 7bcf0da779e8e1cc2a225f25cba147e7d743d671 SHA1 2a04ca616e925cb64cd5df0f4dd96e1512b4aeb0 SHA256 f2fba9fde47806ea5f4d7a16dfe1a5edd4869619118f28a30a91ec8a629cfb2c
 MD5 9c9f7d14dde57ff55c042998e68c2ec5 metadata.xml 602
 RMD160 7bcf0da779e8e1cc2a225f25cba147e7d743d671 metadata.xml 602
@@ -17,10 +25,13 @@ SHA256 f2fba9fde47806ea5f4d7a16dfe1a5edd4869619118f28a30a91ec8a629cfb2c metadata
 MD5 05f99c3218c1b22fe2f337775e760d7f files/digest-btanks-0.5.4740 256
 RMD160 d6c696a3dda2290fb02c5c19b93301f7b279de1e files/digest-btanks-0.5.4740 256
 SHA256 43ebdcfe7d03155a5765384aca5d82c6e48b481bbdc2b33b78f67046c806c25d files/digest-btanks-0.5.4740 256
+MD5 05f99c3218c1b22fe2f337775e760d7f files/digest-btanks-0.5.4740-r1 256
+RMD160 d6c696a3dda2290fb02c5c19b93301f7b279de1e files/digest-btanks-0.5.4740-r1 256
+SHA256 43ebdcfe7d03155a5765384aca5d82c6e48b481bbdc2b33b78f67046c806c25d files/digest-btanks-0.5.4740-r1 256
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGyianRmMZkarFlIwRAhh0AKDjwOJesqEpEV26InBMIBathOeqwACgjv1K
-xRTKKIkQQUHIGOPTsPsztm4=
-=e79k
+iD8DBQFGz05fp/wUKkr7RBoRAuS1AKCOEwY4dbYHAWWogpgTxM9Zkr32vQCgvLCD
+a8KUY0bjLQiBsgcD6/reZNc=
+=dsx3
 -----END PGP SIGNATURE-----
diff --git a/games-action/btanks/btanks-0.5.4740-r1.ebuild b/games-action/btanks/btanks-0.5.4740-r1.ebuild
new file mode 100644
index 000000000000..eecd46ca0645
--- /dev/null
+++ b/games-action/btanks/btanks-0.5.4740-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/btanks/btanks-0.5.4740-r1.ebuild,v 1.1 2007/08/24 21:31:01 vapier Exp $
+
+inherit eutils games
+
+DESCRIPTION="Fast 2D tank arcade game with multiplayer and split-screen modes"
+HOMEPAGE="http://btanks.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=dev-libs/libsigc++-2.0
+	media-libs/openal
+	media-libs/libsdl
+	media-libs/libvorbis
+	virtual/opengl
+	dev-libs/expat
+	media-libs/sdl-image"
+DEPEND="${RDEPEND}
+	dev-util/scons"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-scons-blows.patch
+}
+
+src_compile() {
+	scons \
+		mode="release" \
+		prefix=/usr \
+		lib_dir="$(games_get_libdir)/${PN}" \
+		resources_dir="${GAMES_DATADIR}/${PN}" \
+		|| die "scons"
+}
+
+src_install() {
+	dogamesbin bt || die "newgamesbin"
+
+	insinto "$(games_get_libdir)"/${PN}
+	doins lib{mrt,bt,sdlx}.so || die "doins for lib.so failed"
+
+	exeinto "${GAMES_DATADIR}/${PN}"
+	doexe libbt_objects.so || die "doins for libbt_objects.so failed"
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r data || die "doins for data failed"
+	dodoc ChangeLog *.txt
+
+	newicon src/bt.xpm ${PN}.xpm || die "newicon"
+	make_desktop_entry ${PN} "Battle Tanks" ${PN}.xpm
+
+	prepgamesdirs
+}
diff --git a/games-action/btanks/files/btanks-0.5.4740-scons-blows.patch b/games-action/btanks/files/btanks-0.5.4740-scons-blows.patch
new file mode 100644
index 000000000000..1290bb5b98e0
--- /dev/null
+++ b/games-action/btanks/files/btanks-0.5.4740-scons-blows.patch
@@ -0,0 +1,54 @@
+Respect env build settings, dont force crappy flags, and make sure -rpath is added properly.
+
+--- SConstruct
++++ SConstruct
+@@ -41,6 +41,18 @@
+ debug = buildmode == "debug"
+ Export('debug')
+ 
++import SCons.Util
++if os.environ.has_key('CC'):
++	env['CC'] = os.environ['CC']
++if os.environ.has_key('CFLAGS'):
++	env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
++if os.environ.has_key('CXX'):
++	env['CXX'] = os.environ['CXX']
++if os.environ.has_key('CXXFLAGS'):
++	env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
++if os.environ.has_key('LDFLAGS'):
++	env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
++
+ if (env['gcc_visibility']): 
+ 	env.Append(CCFLAGS=' -fvisibility-inlines-hidden -fvisibility=hidden -DGCC_HASCLASSVISIBILITY ')
+ 	env.Append(CXXFLAGS=' -fvisibility-inlines-hidden -fvisibility=hidden -DGCC_HASCLASSVISIBILITY ')
+@@ -81,16 +81,10 @@
+ 	if env['gcc_visibility']: 
+ 		env.Append(CCFLAGS=' -fvisibility-inlines-hidden -fvisibility=hidden ');
+ 		env.Append(CPPFLAGS=' -fvisibility-inlines-hidden -fvisibility=hidden ');
+-	if debug:
+-		env.Append(CCFLAGS='-ggdb ')
+-		env.Append(CPPFLAGS='-ggdb ')
+-	else: 
+-		env.Append(CCFLAGS='-O3 ')
+-		env.Append(CPPFLAGS='-O3 ')
+ 		
+ 	al_lib = 'openal'
+-	env.Append(CPPFLAGS=' -Wall -pedantic -Wno-long-long -pipe -pthread ')
+-	env.Append(CCFLAGS=' -Wall -pedantic -Wno-long-long -pipe -pthread ')
++	env.Append(CPPFLAGS=' -Wall -pedantic -Wno-long-long -pthread ')
++	env.Append(CCFLAGS=' -Wall -pedantic -Wno-long-long -pthread ')
+ 
+ 
+ conf_env = env.Copy()
+--- SConscript
++++ SConscript
+@@ -94,7 +94,7 @@
+ 
+ Import('lib_dir')
+ if sys.platform != 'win32':
+-	bt_env.Append(LINKFLAGS=' -Wl,-rpath '+ lib_dir + ' -Wl,-rpath-link build/' + env['mode'] + '/mrt')
+-	bt_env.Append(LINKFLAGS=' -Wl,-rpath '+ lib_dir + ' -Wl,-rpath-link build/' + env['mode'] + '/sdlx')
++	bt_env.Append(LINKFLAGS=' -Wl,-rpath,'+ lib_dir + ' -Wl,-rpath-link,build/' + env['mode'] + '/mrt')
++	bt_env.Append(LINKFLAGS=' -Wl,-rpath,'+ lib_dir + ' -Wl,-rpath-link,build/' + env['mode'] + '/sdlx')
+ 
+ bt_main = bt_env.Program('bt', bt_main_sources, LIBS=bt_main_libs, RPATH=[lib_dir])
diff --git a/games-action/btanks/files/digest-btanks-0.5.4740-r1 b/games-action/btanks/files/digest-btanks-0.5.4740-r1
new file mode 100644
index 000000000000..689fd211413a
--- /dev/null
+++ b/games-action/btanks/files/digest-btanks-0.5.4740-r1
@@ -0,0 +1,3 @@
+MD5 ab532befed2166a1f722ec1a59df926b btanks-0.5.4740.tar.bz2 47302958
+RMD160 adcced45f120a26de0a36a88849232231535bd7f btanks-0.5.4740.tar.bz2 47302958
+SHA256 2eb3d691f84c3933bde270212ad71565e168a5b67fe7332b3bc8fac1de232403 btanks-0.5.4740.tar.bz2 47302958