Fix ROOT abuse, bug #167277

Package-Manager: portage-2.1.2-r9

4 files changed, 54 insertions, 29 deletions

diff --git a/games-action/clanbomber/ChangeLog b/games-action/clanbomber/ChangeLog
index 2c50820a592d..2408355c41a3 100644
--- a/games-action/clanbomber/ChangeLog
+++ b/games-action/clanbomber/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/clanbomber
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/clanbomber/ChangeLog,v 1.7 2007/02/08 20:50:05 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/clanbomber/ChangeLog,v 1.8 2007/02/17 08:47:09 nyhm Exp $
+
+  17 Feb 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/clanbomber-1.05-build.patch, clanbomber-1.05.ebuild:
+  Fix ROOT abuse, bug #167277
 
   08 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/games-action/clanbomber/Manifest b/games-action/clanbomber/Manifest
index 02c370634e83..22ed5db5707d 100644
--- a/games-action/clanbomber/Manifest
+++ b/games-action/clanbomber/Manifest
@@ -9,15 +9,19 @@ AUX 1.05-no-display.patch 1217 RMD160 8c79b724fbf7397a9c0b061e7e24086e151058a4 S
 MD5 18333125f34d58cb129c22c86ad7ef50 files/1.05-no-display.patch 1217
 RMD160 8c79b724fbf7397a9c0b061e7e24086e151058a4 files/1.05-no-display.patch 1217
 SHA256 c91577ac15cb7c0175bcaee8bd667af28e8675cbc44ca9d774ad51049a569b6c files/1.05-no-display.patch 1217
+AUX clanbomber-1.05-build.patch 806 RMD160 d6a1938929bf3be64e062a7c77f949737f5d9371 SHA1 8e505957987ff40276b9da89d71f14d17ae83334 SHA256 df14273aac2d525acac1be9b2c8b4fabaece0ca9489c2a096fc9425bb23a1aa1
+MD5 4ede0bd657600a99f529f07205e5cdea files/clanbomber-1.05-build.patch 806
+RMD160 d6a1938929bf3be64e062a7c77f949737f5d9371 files/clanbomber-1.05-build.patch 806
+SHA256 df14273aac2d525acac1be9b2c8b4fabaece0ca9489c2a096fc9425bb23a1aa1 files/clanbomber-1.05-build.patch 806
 DIST clanbomber-1.05.tar.gz 2066198 RMD160 ccee2f7db6f0d01bd44591151d46832494c604a6 SHA1 46822052cf454f7e70171830a075ec723cacbc16 SHA256 f84f31f00a58fb9a1215a4699c12ed2262b697054752cf6eebf5c79896773216
-EBUILD clanbomber-1.05.ebuild 1080 RMD160 35552c24b848677713e12e7882825872b032d410 SHA1 f6e05b4eaa57fad5ce0aed409ef0da00aecd61ae SHA256 dc9415d54dc51a852960dc9cd48b699e3c6ab0e58abdadd9793129b57959f2f4
-MD5 8c75666520c87077b481b9c5a643310e clanbomber-1.05.ebuild 1080
-RMD160 35552c24b848677713e12e7882825872b032d410 clanbomber-1.05.ebuild 1080
-SHA256 dc9415d54dc51a852960dc9cd48b699e3c6ab0e58abdadd9793129b57959f2f4 clanbomber-1.05.ebuild 1080
-MISC ChangeLog 1023 RMD160 d0292529a69ceee36b8fdb1367eca68f205bca3f SHA1 c1fe936416fe4610f83cb1415a5dbf8c2a8d925b SHA256 955096e4255331927581d34cd76d55c2b94149228466abe1442f138db1f4161d
-MD5 d71b52a31fc3c35f553ef2903db69269 ChangeLog 1023
-RMD160 d0292529a69ceee36b8fdb1367eca68f205bca3f ChangeLog 1023
-SHA256 955096e4255331927581d34cd76d55c2b94149228466abe1442f138db1f4161d ChangeLog 1023
+EBUILD clanbomber-1.05.ebuild 939 RMD160 482cd9b00e11307b6eb23ffdd3949dbe4a985707 SHA1 fb876a860380a790604664b7972e92632dd8d299 SHA256 b709b04d18024351271ce42c96a62397fe43e2da08be72c152981d85ad449fa2
+MD5 efc9c8fd2de299a8745c8ce9f3a51603 clanbomber-1.05.ebuild 939
+RMD160 482cd9b00e11307b6eb23ffdd3949dbe4a985707 clanbomber-1.05.ebuild 939
+SHA256 b709b04d18024351271ce42c96a62397fe43e2da08be72c152981d85ad449fa2 clanbomber-1.05.ebuild 939
+MISC ChangeLog 1160 RMD160 0e298405f970802ee9d461f5421e11723befdb92 SHA1 2ff700e00c73775996b03018b34b76656f68454b SHA256 22d08152b24f1a877e22d03868ba9590386ba69df78eaef3e9f5d5784f7c5690
+MD5 357e20c546c55a76eebe10eb39a398f3 ChangeLog 1160
+RMD160 0e298405f970802ee9d461f5421e11723befdb92 ChangeLog 1160
+SHA256 22d08152b24f1a877e22d03868ba9590386ba69df78eaef3e9f5d5784f7c5690 ChangeLog 1160
 MISC metadata.xml 664 RMD160 538f91810f0b46cf428acdc6c9e3e4e75fef19a1 SHA1 63018ae7caeb316569c655e4e8b139082df5d6a1 SHA256 4191923c5c67851dc9a2bbea0ec54b6b6ae9dfd93e35700b1b9c0a8f659d59bf
 MD5 042c680a45dc47c6b52b7f6643ef0ae2 metadata.xml 664
 RMD160 538f91810f0b46cf428acdc6c9e3e4e75fef19a1 metadata.xml 664
@@ -28,7 +32,7 @@ SHA256 091e33d768aeea7e031f2ed1f82ee68c38da38e2cfff7bcce5566e36c280732c files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFy40DkT4lNIS36YERAkQ2AJ9TkVBiodQgFJqJCYVvK+7RPl/6UgCZAZQa
-w95PUYCiSilfdduXkjxz+3I=
-=rC5h
+iD8DBQFF1sETdz7hIScOURERAv0SAKCjtnYalcF8WbtefSrr3zSVUS8pWACgjtho
+pS/p/SF9aS0eI4UagX2kKmE=
+=VmbZ
 -----END PGP SIGNATURE-----
diff --git a/games-action/clanbomber/clanbomber-1.05.ebuild b/games-action/clanbomber/clanbomber-1.05.ebuild
index ce1a818eb360..2465312db93a 100644
--- a/games-action/clanbomber/clanbomber-1.05.ebuild
+++ b/games-action/clanbomber/clanbomber-1.05.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/clanbomber/clanbomber-1.05.ebuild,v 1.6 2005/09/26 17:27:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/clanbomber/clanbomber-1.05.ebuild,v 1.7 2007/02/17 08:47:09 nyhm Exp $
 
-inherit eutils flag-o-matic games
+inherit autotools eutils games
 
 DESCRIPTION="Bomberman-like multiplayer game"
 HOMEPAGE="http://clanbomber.sourceforge.net/"
-SRC_URI="mirror://sourceforge/clanbomber/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="sys-libs/zlib
-	media-libs/hermes
+DEPEND="media-libs/hermes
 	=dev-games/clanlib-0.6.5*"
 
 src_unpack() {
@@ -22,21 +21,17 @@ src_unpack() {
 	cd "${S}"
 	sed -i \
 		-e 's:\(@datadir@/clanbomber/\):$(DESTDIR)\1:' \
-		clanbomber/{,*/}Makefile.in \
+		clanbomber/{,*/}Makefile.am \
 		|| die "sed failed"
-	epatch "${FILESDIR}/${PV}-no-display.patch" \
-		"${FILESDIR}/${PV}-gcc34.patch"
-}
-
-src_compile() {
-	append-flags -I${ROOT}/usr/include/clanlib-0.6.5
-	append-ldflags -L${ROOT}/usr/lib/clanlib-0.6.5
-	egamesconf || die
-	emake -j1 || die "emake failed"
+	epatch \
+		"${FILESDIR}"/${PV}-no-display.patch \
+		"${FILESDIR}"/${PV}-gcc34.patch \
+		"${FILESDIR}"/${P}-build.patch
+	eautoreconf
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog IDEAS QUOTES README
 	prepgamesdirs
 }
diff --git a/games-action/clanbomber/files/clanbomber-1.05-build.patch b/games-action/clanbomber/files/clanbomber-1.05-build.patch
new file mode 100644
index 000000000000..fceced2e8604
--- /dev/null
+++ b/games-action/clanbomber/files/clanbomber-1.05-build.patch
@@ -0,0 +1,22 @@
+--- clanbomber/Makefile.am
++++ clanbomber/Makefile.am
+@@ -19,7 +19,7 @@
+ 	-rm -f @datadir@/clanbomber/clanbomber.dat
+ 	-rm -f @datadir@/clanbomber/clanbomber.scr
+ 
+-clanbomber.dat: clanbomber.scr pics/*.pcx pics/*.tga wavs/*.wav maps/*.map music/bud.mod
++clanbomber.dat: clanbomber clanbomber.scr pics/*.pcx pics/*.tga wavs/*.wav maps/*.map music/bud.mod
+ 	@./clanbomber -datafile
+ 
+ all-local: clanbomber.dat
+--- configure.in
++++ configure.in
+@@ -11,6 +11,8 @@
+ AC_PROG_CXX
+ dnl Checks for libraries.
+ 
++CPPFLAGS=`clanlib0.6-config --cflags`
++LIBS=`clanlib0.6-config --libs`
+ AC_CHECK_LIB(z,main,,echo "ClanBomber requires zlib to run."; exit 1)
+ AC_CHECK_LIB(Hermes,main,,echo "ClanBomber requires Hermes to run."; exit 1)
+ AC_CHECK_LIB(clanCore,main,,echo "ClanBomber requires ClanLib to run."; exit 1)