Tidy and fix underlink. Bug #368885

Package-Manager: portage-2.1.10.2/cvs/Linux x86_64

4 files changed, 62 insertions, 22 deletions

diff --git a/games-action/noiz2sa/ChangeLog b/games-action/noiz2sa/ChangeLog
index bcb93c1fd077..f427a3d264e3 100644
--- a/games-action/noiz2sa/ChangeLog
+++ b/games-action/noiz2sa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/noiz2sa
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/noiz2sa/ChangeLog,v 1.9 2010/09/15 18:48:44 mr_bones_ Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/noiz2sa/ChangeLog,v 1.10 2011/06/14 06:26:38 tupone Exp $
+
+  14 Jun 2011; Tupone Alfredo <tupone@gentoo.org> noiz2sa-0.51a.ebuild,
+  +files/noiz2sa-0.51a-underlink.patch:
+  Tidy and fix underlink. Bug #368885 by Diego Elio Pettenò
 
   15 Sep 2010; Michael Sterrett <mr_bones_@gentoo.org> noiz2sa-0.51a.ebuild:
   respect LDFLAGS (bug #337476)
diff --git a/games-action/noiz2sa/Manifest b/games-action/noiz2sa/Manifest
index 37d8f1924a9d..524cfd83c327 100644
--- a/games-action/noiz2sa/Manifest
+++ b/games-action/noiz2sa/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX noiz2sa-0.51a-gcc41.patch 621 RMD160 f9cbbb3369cb569d909f452522f3b3d893730ade SHA1 f4b2e5e08414d6440ff1b9e400ea8e0ff731d051 SHA256 a570c14514f583187584018108eee8e50593e2237dd8415dc1825b0a275c3b7c
+AUX noiz2sa-0.51a-underlink.patch 981 RMD160 9d7d257ab86fb8688f14f36cbea5b59b03aecb4d SHA1 a00a9820b070ceff691b67615b28095eb017d803 SHA256 d551bcde1408af4f4ec0b6e58fd6201d576a62c1e235222af9c9635d84a0d620
 DIST noiz2sa-0.51a.tar.gz 8861907 RMD160 6f1853cd9abd6e62d89a8e95e676e5a7b65f24a1 SHA1 191d0cadc71a8849f36def93e85c5b14f112faec SHA256 a7e2b689a320b49cd87a5666b38b934528c65d5a212efca81a21fdd45c9f88e6
-EBUILD noiz2sa-0.51a.ebuild 1631 RMD160 24a4f3bf74de31bfca8d411ed9677a57c34cac58 SHA1 4d80da456618b51e1aa16ea9bdbe3384ae9eb047 SHA256 6efc2f13074e2bd9cb14ebeefbb63f84063bd14a6d3084273bbdd8228e92ec97
-MISC ChangeLog 1261 RMD160 37ef13080347343ad7f1216bec9e1ba284dc6d31 SHA1 be99ed14f414afa6ebf61ac031e3b163b9a30f7a SHA256 4343d30b14b28da2b7a884053d54164e6bde4932b86b07183ce53abcd4530f33
+EBUILD noiz2sa-0.51a.ebuild 1536 RMD160 0cef77e41d7e53b7abae870496862e2bda8f5741 SHA1 fccb8a3060665fc0089208a379aa9e77a82de6a6 SHA256 1b2c84f94781ee7f9baa048fe7283f04b9201f5f8b347da2f976eab67e9c3014
+MISC ChangeLog 1433 RMD160 75959dae2c374d433a7f89e62e5581368ad81efb SHA1 f4e70fe16096386fe8a8074f06e33d0a849878b0 SHA256 5aa9f358789ddc5640d94f6d08252742f1a423aac354ae4015924f5adf28bbc9
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk32/ygACgkQIY77eQFFFC24dQCaA3ecR0vk9SAoHVPML8K+le7U
+Am8AnRJOeGlGthhnOCrLz0e2b5Kw/GCR
+=qSYZ
+-----END PGP SIGNATURE-----
diff --git a/games-action/noiz2sa/files/noiz2sa-0.51a-underlink.patch b/games-action/noiz2sa/files/noiz2sa-0.51a-underlink.patch
new file mode 100644
index 000000000000..ced37410175b
--- /dev/null
+++ b/games-action/noiz2sa/files/noiz2sa-0.51a-underlink.patch
@@ -0,0 +1,31 @@
+--- makefile.lin.old	2011-06-14 08:03:28.928366818 +0200
++++ makefile.lin	2011-06-14 08:07:43.199113541 +0200
+@@ -4,18 +4,13 @@
+ NAME   = noiz2sa

+ O      = o

+ RM     = rm -f

+-CC     = gcc

+-CXX    = g++

+ 

+ PROG        = $(NAME)

+ 

+ DEFAULT_CFLAGS = `sdl-config --cflags`

+-LDFLAGS        = `sdl-config --libs` -L. -lglut -lbulletml -lSDL_mixer -mwindows -lstdc++

++LDLIBS         = `sdl-config --libs` -lGL -lbulletml -lSDL_mixer -mwindows -lstdc++ -lm

+ 

+-MORE_CFLAGS = -O3

+-

+-CFLAGS  = $(DEFAULT_CFLAGS) $(MORE_CFLAGS)

+-CPPFLAGS  = $(DEFAULT_CFLAGS) $(MORE_CFLAGS) -I./bulletml/

++CPPFLAGS  = $(DEFAULT_CFLAGS) -I./bulletml/

+ 

+ OBJS =	$(NAME).$(O) ship.$(O) shot.$(O) frag.$(O) bonus.$(O) \

+ 	foe.$(O) foecommand.$(O) barragemanager.$(O) attractmanager.$(O) \

+@@ -23,7 +19,6 @@
+ 	screen.$(O) clrtbl.$(O) vector.$(O) degutil.$(O) rand.$(O) soundmanager.$(O)

+ 

+ $(PROG): $(OBJS)

+-	$(CC) $(CFLAGS) -o $(PROG) $(OBJS) $(LDFLAGS)

+ 

+ clean:

+ 	$(RM) $(PROG) *.$(O)

diff --git a/games-action/noiz2sa/noiz2sa-0.51a.ebuild b/games-action/noiz2sa/noiz2sa-0.51a.ebuild
index 8e7dd50bcf2f..97fe8ce41b35 100644
--- a/games-action/noiz2sa/noiz2sa-0.51a.ebuild
+++ b/games-action/noiz2sa/noiz2sa-0.51a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/noiz2sa/noiz2sa-0.51a.ebuild,v 1.10 2010/09/15 18:48:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/noiz2sa/noiz2sa-0.51a.ebuild,v 1.11 2011/06/14 06:26:38 tupone Exp $
 
 EAPI=2
 inherit eutils games
@@ -18,37 +18,31 @@ DEPEND="media-libs/sdl-mixer[vorbis]
 	>=dev-libs/libbulletml-0.0.3
 	virtual/opengl"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}"/${PN}/src
+
+PATCHES=( "${FILESDIR}/${P}"-gcc41.patch
+	"${FILESDIR}/${P}"-underlink.patch
+)
 
 src_prepare(){
-	cd "${S}/src"
-	epatch "${FILESDIR}/${P}"-gcc41.patch
-	sed \
-		-e '/^CC/d' \
-		-e '/^CXX/d' \
-		-e '/^LDFLAGS/s/=/+=/' \
-		-e "s/-lglut/-lGL/" \
-		makefile.lin > Makefile \
-		|| die "sed failed"
+	base_src_prepare
 
 	sed -i \
 		-e "s:/.noiz2sa.prf:/noiz2sa.prf:" \
 		-e "s:getenv(\"HOME\"):\"${GAMES_STATEDIR}\":" \
 		attractmanager.c \
 		|| die "sed failed"
-}
 
-src_compile(){
-	emake -C src MORE_CFLAGS="${CFLAGS}" || die
+	cp makefile.lin Makefile || die "Failed copying Makefile"
 }
 
 src_install(){
 	local datadir="${GAMES_DATADIR}/${PN}"
 
-	dogamesbin src/${PN} || die "dogamesbin failed"
+	dogamesbin ${PN} || die "dogamesbin failed"
 	dodir "${datadir}" "${GAMES_STATEDIR}"
-	cp -r noiz2sa_share/* "${D}/${datadir}" || die "cp failed"
-	dodoc readme*
+	cp -r ../noiz2sa_share/* "${D}/${datadir}" || die "cp failed"
+	dodoc ../readme*
 	touch "${D}${GAMES_STATEDIR}/${PN}.prf"
 	fperms 660 "${GAMES_STATEDIR}/${PN}.prf"
 	prepgamesdirs