summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Heaven <tristan@gentoo.org>2009-06-13 18:13:11 +0000
committerTristan Heaven <tristan@gentoo.org>2009-06-13 18:13:11 +0000
commitc34c62bb6c73a9d09395f2826769b95749be54ba (patch)
tree364a7091cef503658bbaae42e5d24f9526bcbe23 /games-puzzle
parentFix building with glibc-2.10, bug #273494 (diff)
downloadhistorical-c34c62bb6c73a9d09395f2826769b95749be54ba.tar.gz
historical-c34c62bb6c73a9d09395f2826769b95749be54ba.tar.bz2
historical-c34c62bb6c73a9d09395f2826769b95749be54ba.zip
Fix building with glibc-2.10, bug #273501
Package-Manager: portage-2.2_rc33/cvs/Linux i686
Diffstat (limited to 'games-puzzle')
-rw-r--r--games-puzzle/amoebax/ChangeLog8
-rw-r--r--games-puzzle/amoebax/Manifest15
-rw-r--r--games-puzzle/amoebax/amoebax-0.2.0.ebuild13
-rw-r--r--games-puzzle/amoebax/files/amoebax-0.2.0-glibc2.10.patch11
4 files changed, 37 insertions, 10 deletions
diff --git a/games-puzzle/amoebax/ChangeLog b/games-puzzle/amoebax/ChangeLog
index a281cbe6d834..d2781d24a58d 100644
--- a/games-puzzle/amoebax/ChangeLog
+++ b/games-puzzle/amoebax/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-puzzle/amoebax
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/amoebax/ChangeLog,v 1.5 2008/06/26 10:05:37 coldwind Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/amoebax/ChangeLog,v 1.6 2009/06/13 18:13:11 nyhm Exp $
+
+ 13 Jun 2009; Tristan Heaven <nyhm@gentoo.org> amoebax-0.2.0.ebuild,
+ +files/amoebax-0.2.0-glibc2.10.patch:
+ Fix building with glibc-2.10, bug #273501
26 Jun 2008; Santiago M. Mola <coldwind@gentoo.org> amoebax-0.2.0.ebuild:
amd64 stable wrt bug #229497
diff --git a/games-puzzle/amoebax/Manifest b/games-puzzle/amoebax/Manifest
index 20e80f4278ce..f561229cf496 100644
--- a/games-puzzle/amoebax/Manifest
+++ b/games-puzzle/amoebax/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX amoebax-0.2.0-gcc43.patch 1765 RMD160 a5521f0e29e2e7781704ca4e3ba4abf20f44f5ba SHA1 178091ea8dc0a6ca4a1150054b10ebb151d8ab04 SHA256 86d0644119cbdad92a28667d945e7da0b7789566077a1a8947e343c8e0c256d5
+AUX amoebax-0.2.0-glibc2.10.patch 250 RMD160 8bf95b3ad79b91473d7c82f0ec6a57a7cee309ab SHA1 e366d2b0802b0c5571b3279342ec03eb488e1828 SHA256 dfd3d92bcf95749cfb4f0e0725bffe7750245efccdc7dc3f1238d8bd49d879b4
DIST amoebax-0.2.0.tar.bz2 10565913 RMD160 f602d4ddef217b9759c4ed16604b19edb04106d1 SHA1 84f45f0363782c4ea7040315cbd0a43f143a5b8a SHA256 77c9da7b424432c55d76a74b62bf01ccba3120200bb89fd5815993c001c7eaae
-EBUILD amoebax-0.2.0.ebuild 1050 RMD160 50b5dd34f221099bf8c7d36125e2fd684e4f09dd SHA1 bf50ac278181c759a2cb95a4ac7b39830ca511d6 SHA256 b70395e7eee33cbaeee008db584f5a543ce12c7dc950da6834a338593f2417d0
-MISC ChangeLog 794 RMD160 eca076c959f2784e72fab73a2691113b7793a873 SHA1 bfa9eb88e636e6e2902932802e9bdb9313528936 SHA256 ad2abf3943e8547563215125cc11550e3eff782fd2819a3d983c004752fa5e1c
+EBUILD amoebax-0.2.0.ebuild 1073 RMD160 623254940a4c251d02c6dc24931401945d449e15 SHA1 0a8ec2c05715b695b3469d68b261d3d6ec4466f1 SHA256 ba7aa28e837b3e2b787cd5d5af2014a405fb90fd732baf045d4a2ae935635d02
+MISC ChangeLog 945 RMD160 cc011abc229f3ce0b19702ab69ebf80388f784d0 SHA1 797dfcab88f95c1d2627f4257dfb87946cc6b1de SHA256 63a060c07c13ad54dc764e35cfa5023c5e017d6f7658fbe2c1f01a7913fa236a
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoz7D4ACgkQdz7hIScOURHJsgCfUUUWo9iFH41Q/28V8uK6UTSQ
+6GUAoLtbRVFPUVD+nAiQFT85LL5vc/AD
+=w86e
+-----END PGP SIGNATURE-----
diff --git a/games-puzzle/amoebax/amoebax-0.2.0.ebuild b/games-puzzle/amoebax/amoebax-0.2.0.ebuild
index 0e8006680bcf..da22ddbd53d6 100644
--- a/games-puzzle/amoebax/amoebax-0.2.0.ebuild
+++ b/games-puzzle/amoebax/amoebax-0.2.0.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/amoebax/amoebax-0.2.0.ebuild,v 1.5 2008/06/26 10:05:37 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/amoebax/amoebax-0.2.0.ebuild,v 1.6 2009/06/13 18:13:11 nyhm Exp $
+EAPI=2
inherit autotools eutils games
DESCRIPTION="a cute and addictive action-puzzle game, similar to tetris"
@@ -17,10 +18,10 @@ DEPEND="media-libs/libsdl
media-libs/sdl-image
media-libs/sdl-mixer"
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-gcc43.patch
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${P}-gcc43.patch \
+ "${FILESDIR}"/${P}-glibc2.10.patch
sed -i \
-e "/^SUBDIRS/s:doc ::" \
Makefile.am \
diff --git a/games-puzzle/amoebax/files/amoebax-0.2.0-glibc2.10.patch b/games-puzzle/amoebax/files/amoebax-0.2.0-glibc2.10.patch
new file mode 100644
index 000000000000..4dae207f418c
--- /dev/null
+++ b/games-puzzle/amoebax/files/amoebax-0.2.0-glibc2.10.patch
@@ -0,0 +1,11 @@
+--- src/binreloc.cxx
++++ src/binreloc.cxx
+@@ -744,7 +744,7 @@
+ if (path == (const char *) NULL)
+ return (char *) NULL;
+
+- end = strrchr (path, '/');
++ end = strrchr ((char *)path, '/');
+ if (end == (const char *) NULL)
+ return strdup (".");
+