Build with non-GNU/bfd linker. Bug #369287

Package-Manager: portage-2.1.10.41/cvs/Linux i686

diff --git a/games-action/snipes/ChangeLog b/games-action/snipes/ChangeLog
index 3df09cbbcf40a5e9e4719df3797615277a671040..92fcf2b4fc839490edd70e2081f2d3e13b58d023 100644 (file)
--- a/games-action/snipes/ChangeLog
+++ b/games-action/snipes/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/snipes
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/snipes/ChangeLog,v 1.8 2009/05/23 12:16:29 maekke Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/snipes/ChangeLog,v 1.9 2011/12/18 16:39:43 tupone Exp $
+
+  18 Dec 2011; Tupone Alfredo <tupone@gentoo.org> snipes-1.0.4.ebuild,
+  +files/snipes-1.0.4-nongnulinker.patch:
+  Build with non-GNU/bfd linker. Bug #369287 by Diego Elio Pettenò
 
   23 May 2009; Markus Meier <maekke@gentoo.org> snipes-1.0.4.ebuild:
   amd64/x86 stable, bug #265234

diff --git a/games-action/snipes/Manifest b/games-action/snipes/Manifest
index 8f52fae1c48b5c376f4c499c1a7aab963bbb2741..f4405e77f3be6305784e606f60a45e2168d521b1 100644 (file)
--- a/games-action/snipes/Manifest
+++ b/games-action/snipes/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX snipes-1.0.4-nongnulinker.patch 711 RMD160 b0707d8d038423d04da9e792f31c8ceb1c003ab2 SHA1 e752313bf538f6cd9e8626efefcff558c7078495 SHA256 a36b3a95897ab3ed01040a4ba755cc2115b647c24a1560325f156c46f2367c17
 DIST snipes-1.0.4.tar.gz 39150 RMD160 2f76f5ab1d02b0bdcfb678879ac1add02e25ca42 SHA1 f0f781c4a7ab7ffd2df598a7894387a773ffc639 SHA256 61096e82e2467e3b8ada0560e08d0745022cfe674cdf333e2ee7e140e841a913
-EBUILD snipes-1.0.4.ebuild 666 RMD160 f77429a529007f3642840ee3530566454187083b SHA1 83d58d2f074f10a996155f699b1027c6e51260f7 SHA256 b7d23acf96c9df71854616addd40e9c939ca376c66d1d0b07dde8b87edf5daf2
-MISC ChangeLog 1162 RMD160 4a66cedfbfbc27b8f9c9c47f8eb6108784b91361 SHA1 de62a4a15c820dd757ca0e73f15efaa12d91f2e1 SHA256 40f3895fc449eae717caad770198e30075278a7556e3ae48bb413e468f342591
+EBUILD snipes-1.0.4.ebuild 767 RMD160 27b9854bc8c92efdbd70b6052100d93144702696 SHA1 d527de0ab979c8227becdbfb4bfd48fb1c0a225f SHA256 5a90a95207203d2fa8d12701f6ac19bd72f2a9f7a582666461492f31483eaa8a
+MISC ChangeLog 1344 RMD160 1671a17a4c02f6658b585e3301327eb744fe4a25 SHA1 28c8ff737b3591e18d42b0871a75e1c55cf2d13f SHA256 bf7c79d902a6d92bea215129e0fa9f5359dc31924b90394879a2f85d48ecb2d3
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk7uFwIACgkQIY77eQFFFC2F4gCfXGrDeEMlXoufL/J+Ss4jwM83
+nSMAoIk2pZA8dgu21mmLTb61ckjIQkuU
+=ODAG
+-----END PGP SIGNATURE-----

diff --git a/games-action/snipes/files/snipes-1.0.4-nongnulinker.patch b/games-action/snipes/files/snipes-1.0.4-nongnulinker.patch
new file mode 100644 (file)
index 0000000..dbfab28
--- /dev/null
+++ b/games-action/snipes/files/snipes-1.0.4-nongnulinker.patch
@@ -0,0 +1,20 @@
+--- Makefile.old       2011-12-18 17:24:28.795315064 +0100
++++ Makefile   2011-12-18 17:24:59.005311478 +0100
+@@ -33,7 +33,7 @@
+ IMGOBJ = $(OIMGS:%.pbm=$(INTERMEDIATE)/%.o)
+ 
+ CFLAGS += `sdl-config --cflags` -I$(INTERMEDIATE)
+-LDLIBS += `sdl-config --libs`
++LDLIBS += `sdl-config --libs` -lm
+ LDFLAGS += -Wl,-z,noexecstack
+ 
+ 
+@@ -52,7 +52,7 @@
+ 
+ # Why does this result in an executable stack? Can I run my bitmaps? Do bitmaps behave like Conway's game of life, when run?
+ $(INTERMEDIATE)/%.o: $(IMG)/%.pbm
+-      $(LD) -r -b binary -z noexecstack -z really_noexecstack -z pretty_please_noexecstack -o $@ $<
++      $(LD) -r -b binary -z noexecstack -o $@ $<
+ 
+ snipes.6: snipes.6.in
+       sed s/'`VERSION`'/`cat VERSION`/ < $< > $@

diff --git a/games-action/snipes/snipes-1.0.4.ebuild b/games-action/snipes/snipes-1.0.4.ebuild
index 448fad8f86c1e78abb9c7426b52dca34784ddb53..86c6cdc7513c456455ef0569d7ece9195a84e11a 100644 (file)
--- a/games-action/snipes/snipes-1.0.4.ebuild
+++ b/games-action/snipes/snipes-1.0.4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 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/snipes/snipes-1.0.4.ebuild,v 1.3 2009/05/23 12:16:29 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/snipes/snipes-1.0.4.ebuild,v 1.4 2011/12/18 16:39:43 tupone Exp $
+EAPI=2
 
-inherit eutils games
+inherit base eutils games
 
 DESCRIPTION="2D scrolling shooter, resembles the old DOS game of same name"
 HOMEPAGE="http://cyp.github.com/snipes/"
@@ -15,6 +16,13 @@ IUSE=""
 
 DEPEND="media-libs/libsdl"
 
+PATCHES=( "${FILESDIR}"/${P}-nongnulinker.patch )
+
+src_compile() {
+       tc-getLD
+       default
+}
+
 src_install() {
        dogamesbin snipes || die "dogamesbin failed"
        doman snipes.6