From: Michael Sterrett Date: Fri, 19 Mar 2010 20:35:17 +0000 (+0000) Subject: work around odd portage and/or bash bug (bug #310197) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=19c44d2f2e1adcec13adf1095636d868f62b4ec3;p=gentoo.git work around odd portage and/or bash bug (bug #310197) Package-Manager: portage-2.1.7.17/cvs/Linux i686 --- diff --git a/games-action/powermanga/ChangeLog b/games-action/powermanga/ChangeLog index f16fc3e6ff71..dc75890ec885 100644 --- a/games-action/powermanga/ChangeLog +++ b/games-action/powermanga/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-action/powermanga -# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/powermanga/ChangeLog,v 1.17 2009/02/12 16:39:38 mr_bones_ Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-action/powermanga/ChangeLog,v 1.18 2010/03/19 20:35:17 mr_bones_ Exp $ + + 19 Mar 2010; Michael Sterrett + powermanga-0.90.ebuild: + work around odd portage and/or bash bug (bug #310197) 12 Feb 2009; Michael Sterrett powermanga-0.90.ebuild: diff --git a/games-action/powermanga/Manifest b/games-action/powermanga/Manifest index fc501d8d4d6c..c89a6cc3b53c 100644 --- a/games-action/powermanga/Manifest +++ b/games-action/powermanga/Manifest @@ -1,4 +1,4 @@ DIST powermanga-0.90.tgz 11496484 RMD160 8bc937fab37b267b26c18689450028d217cd002a SHA1 d3fbe77f13b8e808cf2cecb8799309625e278179 SHA256 9537b99cdb860711612ce119a2da7b6f1407c1a2511cf056b0846dbf11b6ff0c -EBUILD powermanga-0.90.ebuild 1676 RMD160 34af1850fc6543a2b5ae0cac6e27932fdf359f1f SHA1 cca4900bc7e0a1205f15485b2eed29fa3df4ee2f SHA256 3f8f2d8ecabf4591a5c36076e14a48fe9bb5ca28ba66eafd29add03a6cb5d60e -MISC ChangeLog 2401 RMD160 96d73771f990f3b95bcf4a5c01bc710d83e4e5d4 SHA1 8ea51f1a9b712fb1d1ab3f6ffa0ea40c488a9582 SHA256 23a1a9ce0d3815c5baedaebc47628dd70bbf5af46f24fb038f49c439c85372c1 +EBUILD powermanga-0.90.ebuild 1726 RMD160 1ef8a4feaac6f6f083aa00aef070e4f699eafba9 SHA1 519b6295d02b38aeb84e1847bcabc9b90cded20d SHA256 18c9a3afbedcdb4c68838ef66aab787bd0a1c8cb27f4997afdb342f7f176bc2c +MISC ChangeLog 2539 RMD160 d62a4d70b5f2946a471762eeda18feb56be99064 SHA1 4fce211c239975c6c5de5540a6ce5c7bc5853b1b SHA256 79193d69c26881a360f675fb709dc0782c1fd449ada4aeb816f3aba38c90b0c7 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 diff --git a/games-action/powermanga/powermanga-0.90.ebuild b/games-action/powermanga/powermanga-0.90.ebuild index 7a65a38ee597..84ad2c300523 100644 --- a/games-action/powermanga/powermanga-0.90.ebuild +++ b/games-action/powermanga/powermanga-0.90.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/powermanga/powermanga-0.90.ebuild,v 1.6 2009/02/12 16:39:38 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/powermanga/powermanga-0.90.ebuild,v 1.7 2010/03/19 20:35:17 mr_bones_ Exp $ EAPI=2 inherit eutils games @@ -25,8 +25,9 @@ src_prepare() { sed -i -e "/zozo/d" texts/text_en.txt || die "sed failed" local f for f in src/assembler.S src/assembler_opt.S ; do + einfo "patching $f" cat <<-EOF >> ${f} - #ifdef __ELF__ + #if defined(__linux__) && defined(__ELF__) .section .note.GNU-stack,"",%progbits #endif EOF