diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2011-06-14 06:26:39 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2011-06-14 06:26:39 +0000 |
| commit | 92471d178a9c8db9625a7a6e3370c150f351bf9b (patch) | |
| tree | 616db3da3effe9a2a9d2ec9815f53825557aab81 /games-action | |
| parent | use.mask pdfannotextractor (diff) | |
| download | gentoo-2-92471d178a9c8db9625a7a6e3370c150f351bf9b.tar.gz gentoo-2-92471d178a9c8db9625a7a6e3370c150f351bf9b.tar.bz2 gentoo-2-92471d178a9c8db9625a7a6e3370c150f351bf9b.zip | |
Tidy and fix underlink. Bug #368885
(Portage version: 2.1.10.2/cvs/Linux x86_64)
Diffstat (limited to 'games-action')
| -rw-r--r-- | games-action/noiz2sa/ChangeLog | 8 | ||||
| -rw-r--r-- | games-action/noiz2sa/files/noiz2sa-0.51a-underlink.patch | 31 | ||||
| -rw-r--r-- | games-action/noiz2sa/noiz2sa-0.51a.ebuild | 30 |
3 files changed, 49 insertions, 20 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/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 |