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 | fa72c9fdcc12595ad886b45b92e7a287f4d7b96b (patch) | |
| tree | 0366e7015e281476ad8db7fa2d668b7dad4fc5f6 /games-fps/alephone | |
| parent | Convert pkg_postinst() message about polkitd home directory to new user.eclas... (diff) | |
| download | gentoo-2-fa72c9fdcc12595ad886b45b92e7a287f4d7b96b.tar.gz gentoo-2-fa72c9fdcc12595ad886b45b92e7a287f4d7b96b.tar.bz2 gentoo-2-fa72c9fdcc12595ad886b45b92e7a287f4d7b96b.zip | |
Fix building with sys-devel/automake >= 1.12 wrt #422557
(Portage version: 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/alephone-20100424.ebuild | 18 |
2 files changed, 16 insertions, 9 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/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 |