Fix ROOT abuse, bug #167277

(Portage version: 2.1.2-r9)

3 files changed, 39 insertions, 18 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/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)