diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2014-05-31 12:04:25 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2014-05-31 12:04:25 +0000 |
| commit | fef52140d7d13f2cfe01e086cfc63ee65a3a2dcf (patch) | |
| tree | 44651b866930d605bf8d76237bdbe278f8d3937d /games-strategy | |
| parent | fix deps wrt #495270 (diff) | |
| download | gentoo-2-fef52140d7d13f2cfe01e086cfc63ee65a3a2dcf.tar.gz gentoo-2-fef52140d7d13f2cfe01e086cfc63ee65a3a2dcf.tar.bz2 gentoo-2-fef52140d7d13f2cfe01e086cfc63ee65a3a2dcf.zip | |
don't rely on broken autoreconf wrt #511904
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020)
Diffstat (limited to 'games-strategy')
| -rw-r--r-- | games-strategy/freeciv/ChangeLog | 6 | ||||
| -rw-r--r-- | games-strategy/freeciv/files/freeciv-2.4.2-as-needed.patch | 8 | ||||
| -rw-r--r-- | games-strategy/freeciv/freeciv-2.4.2.ebuild | 5 |
3 files changed, 11 insertions, 8 deletions
diff --git a/games-strategy/freeciv/ChangeLog b/games-strategy/freeciv/ChangeLog index fb7bd9de2bb4..8e146b2cb583 100644 --- a/games-strategy/freeciv/ChangeLog +++ b/games-strategy/freeciv/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/freeciv # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.151 2014/05/24 15:16:41 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.152 2014/05/31 12:04:25 hasufell Exp $ + + 31 May 2014; Julian Ospald <hasufell@gentoo.org> freeciv-2.4.2.ebuild, + files/freeciv-2.4.2-as-needed.patch: + don't rely on broken autoreconf wrt #511904 24 May 2014; Julian Ospald <hasufell@gentoo.org> freeciv-2.4.2.ebuild, +files/freeciv-2.4.2-as-needed.patch: diff --git a/games-strategy/freeciv/files/freeciv-2.4.2-as-needed.patch b/games-strategy/freeciv/files/freeciv-2.4.2-as-needed.patch index 99212fd38e05..1d13cad46fe2 100644 --- a/games-strategy/freeciv/files/freeciv-2.4.2-as-needed.patch +++ b/games-strategy/freeciv/files/freeciv-2.4.2-as-needed.patch @@ -1,6 +1,6 @@ ---- server/Makefile.am.old 2014-05-24 02:44:17.956898224 +0300 -+++ server/Makefile.am 2014-05-24 02:44:51.666659234 +0300 -@@ -133,7 +133,7 @@ +--- server/Makefile.in ++++ server/Makefile.in +@@ -610,7 +610,7 @@ $(top_builddir)/server/scripting/libscripting_server.la libfreeciv_srv_la_LIBADD = \ @@ -8,4 +8,4 @@ + $(srvlibs) $(SERVER_LIBS) freeciv_server_LDFLAGS = $(GGZDMOD_LDFLAGS) - + freeciv_server_LDADD = \ diff --git a/games-strategy/freeciv/freeciv-2.4.2.ebuild b/games-strategy/freeciv/freeciv-2.4.2.ebuild index 67fa83782723..26f28c931b9c 100644 --- a/games-strategy/freeciv/freeciv-2.4.2.ebuild +++ b/games-strategy/freeciv/freeciv-2.4.2.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.4.2.ebuild,v 1.3 2014/05/24 15:16:41 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.4.2.ebuild,v 1.4 2014/05/31 12:04:25 hasufell Exp $ # FIXME: gtk3 support breaks ggz support EAPI=5 -inherit autotools eutils gnome2-utils games-ggz games +inherit eutils gnome2-utils games-ggz games DESCRIPTION="multiplayer strategy game (Civilization Clone)" HOMEPAGE="http://www.freeciv.org/" @@ -70,7 +70,6 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/${P}-as-needed.patch - eautoreconf # install the .desktop in /usr/share/applications # install the icons in /usr/share/pixmaps |