diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-06-23 04:25:39 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-06-23 04:25:39 +0000 |
| commit | 95e311a82be1dcce10abbd5eacd4942a0f7f5e73 (patch) | |
| tree | 21371cd780aeca12477d52672824019b454493ca /games-fps/alephone | |
| parent | Convert pkg_postinst() message about polkitd home directory to new user.eclas... (diff) | |
| download | historical-95e311a82be1dcce10abbd5eacd4942a0f7f5e73.tar.gz historical-95e311a82be1dcce10abbd5eacd4942a0f7f5e73.tar.bz2 historical-95e311a82be1dcce10abbd5eacd4942a0f7f5e73.zip | |
Fix building with sys-devel/automake >= 1.12 wrt #422557
Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64
Diffstat (limited to 'games-fps/alephone')
| -rw-r--r-- | games-fps/alephone/ChangeLog | 7 | ||||
| -rw-r--r-- | games-fps/alephone/Manifest | 16 | ||||
| -rw-r--r-- | games-fps/alephone/alephone-20100424.ebuild | 18 |
3 files changed, 26 insertions, 15 deletions
diff --git a/games-fps/alephone/ChangeLog b/games-fps/alephone/ChangeLog index c383d887cd7f..dea7df5d9ef1 100644 --- a/games-fps/alephone/ChangeLog +++ b/games-fps/alephone/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-fps/alephone -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/alephone/ChangeLog,v 1.39 2011/09/13 08:45:26 tupone Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-fps/alephone/ChangeLog,v 1.40 2012/06/23 04:25:39 ssuominen Exp $ + + 23 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> alephone-20100424.ebuild: + Fix building with sys-devel/automake >= 1.12 wrt #422557 13 Sep 2011; Tupone Alfredo <tupone@gentoo.org> alephone-20100424.ebuild, +files/alephone-20100424-png15.patch: diff --git a/games-fps/alephone/Manifest b/games-fps/alephone/Manifest index 1b455878b60e..f1ea7b447f9f 100644 --- a/games-fps/alephone/Manifest +++ b/games-fps/alephone/Manifest @@ -5,13 +5,17 @@ AUX alephone-20100424-boost_145.patch 319 RMD160 48979916e285214b922d7e7d83da700 AUX alephone-20100424-png15.patch 697 RMD160 e21f50d8c8d1e3c769180a8fc1def9bf88eac664 SHA1 140a6b08c5b5cc5d964bbdc348867809cac6a0ee SHA256 681efd1f3e44c9fadc8345bfb1083fcbb1918cd05a71b64f56898f44dd79d034 AUX alephone.sh 442 RMD160 f5bf19e2752d356e51fa886dbad9fedfe12f9d34 SHA1 317ab6a122227e30cd1d508e3957e27b8cafa9bd SHA256 03d4eaec18bed5fd909604ff7efbcf4ba737a2cc76ca80161bdcb4bdf527d8b9 DIST AlephOne-20100424.tar.bz2 3180896 RMD160 cc6e0491b0aa7febd854c560c5df56c0a660c757 SHA1 3d3989703ccb1b5e8a6b6ab0028956f433e4f846 SHA256 d97089890ce99952027eaf6185baa6cb01b26c2882dfca9e68816dfe7076a5e6 -EBUILD alephone-20100424.ebuild 2436 RMD160 80240483c6a96905277ef2f75bd2e89a7df3da44 SHA1 69abbfefb1bac22c8c2d392afb3b487b93e6b167 SHA256 60c7dbbfa8e9a08307b9dae3deaccb46def7149ef7c8fa833bc10a962846031c -MISC ChangeLog 5710 RMD160 bf4addc41520653dd040eb02d0da02f8a5f40210 SHA1 03bddb541264954616d3a6c74d0a8ddb0122dbf7 SHA256 5f6ea59bbd7f214521b9c97a3bb74ea7317a3a4fbf23528d047c94dc7a0bcc56 +EBUILD alephone-20100424.ebuild 2519 RMD160 fb308e53c71e756dd974a438a9145c86dae9fcef SHA1 714fcf956da8df3854a5551c6f7a041f9c32d6d9 SHA256 0cd90df84967c1e49d5fe21c26b8c6bd699e50ff28c35bf2a4f98c3a5a397d4d +MISC ChangeLog 5853 RMD160 ea5d9f3d4116ed86af33ce8f28b24413d5032783 SHA1 d717a5fb2420d18de8c935cf7a0efed88f524a73 SHA256 36a8c7d2cbd366d0d2ae49f58ae7abcab9176375173b81bfd4eac1b895b3b3a6 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.19 (GNU/Linux) -iEYEARECAAYFAk5vF9gACgkQIY77eQFFFC3OuwCg7arBvB/3nUoCM/k7k7A4DfJO -KWQAn3j3IPYupdeu05URjC0RgcyO87gZ -=7xWd +iQEcBAEBAgAGBQJP5UQhAAoJEEdUh39IaPFNC2YH/3l+UsAnXvt8GLeqlK9zQg6B +sm9StNo+z6OQ7s+ZED9KaZjb9QWIWrwEQjoDKHVsVVuno01yFs3DeOWBF5jcN4I7 +zuYPST5Ffq9AnveAxD/sxar5JyG9pYlhQpOgHCFCmlas0oCEZdq7AIa9BInVtPc2 +BtNdkhfOut/1i8ddVpjdhLMxHCT43xQEgQ+GaaKo1qyI1OtFBk9HGfPawwbfzWKO +A0cEguN5iaH6YyzWCO3/TNy1JFPmRDGKHZw2kHzDSIElmQ0eBH3Qz4fq92PWo4MQ +P33GswT/SeeGslHFzvY2m0fPpfvgh7MMy+nYGYL/COW5RR8QByM+0bgc315Z91I= +=a/rw -----END PGP SIGNATURE----- diff --git a/games-fps/alephone/alephone-20100424.ebuild b/games-fps/alephone/alephone-20100424.ebuild index c6b42715273b..d1c033509c72 100644 --- a/games-fps/alephone/alephone-20100424.ebuild +++ b/games-fps/alephone/alephone-20100424.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/alephone/alephone-20100424.ebuild,v 1.5 2011/09/13 08:45:26 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/alephone/alephone-20100424.ebuild,v 1.6 2012/06/23 04:25:39 ssuominen Exp $ EAPI=2 inherit autotools eutils games @@ -20,7 +20,7 @@ RDEPEND="media-libs/sdl-net media-libs/libsdl[video] dev-libs/expat dev-libs/zziplib - media-libs/libpng + media-libs/libpng:0 alsa? ( media-libs/alsa-lib ) mad? ( media-libs/libmad ) mpeg? ( media-libs/smpeg ) @@ -38,21 +38,25 @@ S=${WORKDIR}/${MY_P} src_prepare() { sed "s:GAMES_DATADIR:${GAMES_DATADIR}:g" \ "${FILESDIR}"/${PN}.sh > "${T}"/${PN}.sh \ - || die "sed failed" + || die # try using the system expat - bug #251108 sed -i \ -e '/SUBDIRS/ s/Expat//' \ -e 's/Expat\/libexpat.a/-lexpat/' \ Source_Files/Makefile.am \ - || die "sed failed" + || die sed -i \ -e '/Expat/d' \ configure.ac \ - || die "sed failed" + || die rm -rf Source_Files/Expat - epatch "${FILESDIR}"/${P}-boost_145.patch \ + # for automake 1.12 compability - bug #422557 + sed -i -e 's:AC_PROG_CC:&\nAC_PROG_OBJCXX:' configure.ac || die + + epatch \ + "${FILESDIR}"/${P}-boost_145.patch \ "${FILESDIR}"/${P}-png15.patch eautoreconf |