From 859354f2055fd685099c30336ce7e08dbe647a5d Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Mon, 16 Aug 2010 19:42:30 +0000 Subject: Fix building with recent glibc wrt #331511 by Diego E. Pettenò. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- games-action/atanks/ChangeLog | 6 +++++- games-action/atanks/Manifest | 15 +++------------ games-action/atanks/atanks-4.6.ebuild | 7 ++++--- games-action/atanks/files/atanks-4.6-glibc212.patch | 13 +++++++++++++ 4 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 games-action/atanks/files/atanks-4.6-glibc212.patch (limited to 'games-action/atanks') diff --git a/games-action/atanks/ChangeLog b/games-action/atanks/ChangeLog index e72f5c354bd4..0023b3a618d2 100644 --- a/games-action/atanks/ChangeLog +++ b/games-action/atanks/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-action/atanks # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/atanks/ChangeLog,v 1.54 2010/08/13 14:01:11 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/atanks/ChangeLog,v 1.55 2010/08/16 19:42:30 ssuominen Exp $ + + 16 Aug 2010; Samuli Suominen atanks-4.6.ebuild, + +files/atanks-4.6-glibc212.patch: + Fix building with recent glibc wrt #331511 by Diego E. Pettenò. 13 Aug 2010; Joseph Jezak atanks-4.6.ebuild: Marked ppc stable for bug #327343. diff --git a/games-action/atanks/Manifest b/games-action/atanks/Manifest index 29b02fcfb0ab..5869c131fa0a 100644 --- a/games-action/atanks/Manifest +++ b/games-action/atanks/Manifest @@ -1,18 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX atanks-4.5-build.patch 5361 RMD160 a38d9840f197278f3adf57772410f27e3c26587d SHA1 4dc83166f7087f0f452a56558f5b0a7e5b360ea4 SHA256 b2cf4e15ae389ead074cce9d9d1979acee0665c5c0f89bc679b87dbd3e7eb146 AUX atanks-4.6-build.patch 5477 RMD160 2ccb1e58976e3c3d67ee2f37d8886596f51bd581 SHA1 90df1333e39bb6ac913faf02906273817ed0f0a2 SHA256 7f2962bd876c3b12578bab416e1c204fc10e2948a1b762758ee59badee121ca2 +AUX atanks-4.6-glibc212.patch 214 RMD160 8b6bfee0dc5647bb0b86a6e10b08a02203821b95 SHA1 bb8fc42df9578bf2f4e592035bd176df228c894e SHA256 8f51b92cf1a6a20b50ac14ba31957719d145513c96e9a9398286ffcc88a8708f DIST atanks-4.5.tar.gz 3099988 RMD160 fcd4d4831e2b98c740338792a6bfd367d935f764 SHA1 fb79d8392a8fa7f4a04074519e4ecbef35a1e6dd SHA256 29fcf9d8c2493dd94d9bc0776e75b54e18a7cb3dd1fd40a07954112f8ebe6bdc DIST atanks-4.6.tar.gz 3118071 RMD160 8e7b48d6e27f060d22a3a980ca633c810b1d9501 SHA1 3c02683fd9aef76c5976f7c8f919a59ff7604aae SHA256 230fd102ffca083e30187c9fc86c098446f532a8cca5c035f852f7da5eb81a77 EBUILD atanks-4.5.ebuild 1033 RMD160 1db6eb410005a6511fd7eab873ea07ce88d8c4d4 SHA1 8fc726f5bef903fa5bf9ffbe965f9f97394d64ff SHA256 9f1c68e5b6944e9e1afdd0aa08131178bb4ef07e5432d7ddfc9c8470baffe9d3 -EBUILD atanks-4.6.ebuild 1029 RMD160 c19c35fc3431c6dfd78fa4554293f77607a69450 SHA1 b48016e1685951a33ec6faf096b34bac752b809c SHA256 b512b34eafb567e1226325a5698f18e0bc6e2abf45ac75254140bf2a217aada3 -MISC ChangeLog 7675 RMD160 c2b24ac27717dfa4c863c639b21778e5b976cde8 SHA1 b0dd5df58a569fdc5705d64a9158c48f4fc89f2e SHA256 1310163ac904789bbd07a02cf301e08a9e251a3699ba7c0bdd21fe09f338515c +EBUILD atanks-4.6.ebuild 1072 RMD160 b9967fd7aed80b3a8d57a48092174dee55b7ea64 SHA1 1ea8b28f2aa08219aa0cd5511b2ff79770e67ec5 SHA256 443b8639b61e6af8c6014b439af478c1f5cbabf215ff92eb931f4297fc558cc2 +MISC ChangeLog 7855 RMD160 f20fc8c636f04672b634f0d54126d00893240246 SHA1 c707192620dcf3530e7cea7d4d42cf2c67c020ae SHA256 1ef85602d1214ec2865caa05982127ff287ae29d6d3c26803011445efc12b8a3 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iEYEARECAAYFAkxlT9UACgkQcsIHjyDViGT1LgCdHUllzWq82W3al5FI5uHOJtuf -xYUAn2HUjU8LH1mFlP1yNvqs6m95u7ky -=rNzi ------END PGP SIGNATURE----- diff --git a/games-action/atanks/atanks-4.6.ebuild b/games-action/atanks/atanks-4.6.ebuild index 5df488f61a06..5011f2c781be 100644 --- a/games-action/atanks/atanks-4.6.ebuild +++ b/games-action/atanks/atanks-4.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/atanks/atanks-4.6.ebuild,v 1.4 2010/08/13 14:01:11 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/atanks/atanks-4.6.ebuild,v 1.5 2010/08/16 19:42:30 ssuominen Exp $ EAPI=2 inherit eutils games @@ -18,12 +18,13 @@ DEPEND="media-libs/allegro[X]" src_prepare() { find . -type f -name ".directory" -exec rm -vf '{}' + - epatch "${FILESDIR}"/${P}-build.patch + epatch "${FILESDIR}"/${P}-build.patch \ + "${FILESDIR}"/${P}-glibc212.patch } src_compile() { emake \ - BINDIR="${GAMES_BINDIR}" + BINDIR="${GAMES_BINDIR}" \ INSTALLDIR="${GAMES_DATADIR}/${PN}" \ || die "emake failed" } diff --git a/games-action/atanks/files/atanks-4.6-glibc212.patch b/games-action/atanks/files/atanks-4.6-glibc212.patch new file mode 100644 index 000000000000..8403397355e0 --- /dev/null +++ b/games-action/atanks/files/atanks-4.6-glibc212.patch @@ -0,0 +1,13 @@ +http://bugs.gentoo.org/331511 + +--- src/files.cpp ++++ src/files.cpp +@@ -3,7 +3,7 @@ + #include + #include + +-#ifdef MACOSX ++#if defined(MACOSX) || defined(LINUX) + #include + #endif + -- cgit v1.2.3-65-gdbad