don't rely on broken autoreconf wrt #511904

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

4 files changed, 28 insertions, 25 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/Manifest b/games-strategy/freeciv/Manifest
index ec6478324256..0b843be8b352 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,29 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX freeciv-2.4.2-as-needed.patch 322 SHA256 dc834e6b959239f328571b6d2dd62a1b38695ebef0b88fab751854869871a083 SHA512 f5e31c37f981d062e8b82ebed84658ae295e655f3a3388385c9db4031a0a73ed943c4eb31fcecf81c5c9563ec54c562a52c39aa711a497380333592ff5f85ae0 WHIRLPOOL 099f2c82d1f86ac9997ad6a9a3563718ba0d57758108864f6a1eab0d5b4e56c00ba26e083b83214a678bae7fe4ef1918cbdd1649cb49a36187624c31b06cced8
+AUX freeciv-2.4.2-as-needed.patch 270 SHA256 2f702ea01a106dd7763b685909ab9bc47648397fafe4f05898749670a8ba792d SHA512 1a62c3cc98c07aae998b36c2b1b864de1c9d657fc849f6382821f41178e24018f74711dc826f6ab429ed71dcbffb60df9fdc10bf9f8779d378ddaaa170fae7c4 WHIRLPOOL d38cd664aa316c13c256a928183f62d3c25ce6b2a4e63f32911278d39c7fcd34a867092aff978d7ab531831cbd1475a8882dc06bb311e37470a129c78c568d82
 DIST freeciv-2.3.4.tar.bz2 31395893 SHA256 084c10c50c06166177c9864b5610eaf36dca3808e3d3a7da8ef7ae927d56c41c SHA512 51d89321cf7b5b08d2338f8d76051ebde745c85e4ebad21b9ff2109696edfdc79ad43d7f8d2bf989400ce5e71f28127835dc4b4e60635fb71ebb3a2fb149269a WHIRLPOOL afcb5543049059d87503451c7d82abe6be765406fe3aba13fa01dec430062c4ed51c39b42827fb863a37c0b9737962f9557c6069f9d7be1efbd851c18268b6ce
 DIST freeciv-2.4.2.tar.bz2 38545497 SHA256 025d3cf51237a0c12422a5f100460a22ce1236b650a1e73cbd1c13c0b0676ce0 SHA512 de2b409b113c0da4cb3279d31f6525e94c9123806e71b183639ac8f7ed5af58520109cf3ce7561637146a11c4d2aa44c74818a7445824c399297009722d98a7c WHIRLPOOL eab5eb1120d325ebfd09be3250f79deea9c9b1208b5dc0b30df5675882594546305b47bd35178a7bc518868be999a2315cd21c3017aa6df26846deea9ab8d2e6
 EBUILD freeciv-2.3.4.ebuild 3216 SHA256 c1d1c253fbf8c4864dc6611f647288d091244113ea137f524b7341cb41c1b8e7 SHA512 ad68f749101cfc93ed18757a80fdecc181a0081f30647f666a896e53c0ecd338811e1d8089f8852b6953b0026627eecb26d148180d5971ae5ed7f3c5ed2afea1 WHIRLPOOL 1cd41f64b65e78fd3108f19daca21a32692cb4664dfdb87468ee9a0bbd4ef5a45b4ffa64c06ae7928e8ea71911feb21e4e67fc56df29211604d442c176607b1e
-EBUILD freeciv-2.4.2.ebuild 4964 SHA256 fa3973779cd0a93a51d4c1b4ec043ba55c1b04f713d1151caa33f3d6be2a593c SHA512 2a6fb910922fcbf78f34fb3b36f34b7874a990132377749d2fa03b9c8b6e9d4f44595017c4e840bc7bc34a76597d007e79a74832413923d47796050e21beada2 WHIRLPOOL c2db7732a27d085edeba3c379cfc451594883096754018678d0c490217277cfe86afaf1ea52e3d0c1beaa76270dfab53c5704dc74e40b62c410e0c3a3d6e03e6
-MISC ChangeLog 21664 SHA256 9d79e348d9f3a811378e3210bbb59a3ac8357019b103438ed321e7d9e446906b SHA512 47733b50d6a7b54e235641645696f994c599af164da6b9bfa01f10353ea07bfb53bd18462b9996709ca5c619363d594883d07663edcf000ad8e90a45a94f6bc6 WHIRLPOOL 630d94d9211441f77ba42f8ddcd29821563e4f81a87028abf3cee8c59237e06a7fc5e997664ab2ab295760b669f6b13368f72f23a89a20cef2661c9575e7a3e3
+EBUILD freeciv-2.4.2.ebuild 4941 SHA256 20515466c1680e7d52ca814ad34102d45a9705156fc6c8720c4f22bfe7440dcd SHA512 9ed32fbdf35a1c93515f0f1e7723541aadd69b88c105d5268711384cf28770a7cd3faec345b4b74b7fecd21591c4a190d9e520f4ab512f4df80cdeb8362c43eb WHIRLPOOL 24651353ca1eb7cf0bd70d11a805aad0a21c8b51cbe111d84bd0a8437a844d1f79f0cdcbdc1556939a8667ad67175b28a4846d5c35e50e90a7bfb4feca015da9
+MISC ChangeLog 21823 SHA256 2e31e5b5b1a338701695954602c301a597f8941162290f6c04de286d0577a8bb SHA512 09ebd9a63a8fcd65ea32dec244d3372d899e97d32142243bb3a08aa01d17c710d214ef87d13452963f190496e5fafd707399504c52769e0a5047d996c5f0e24a WHIRLPOOL f091faa1d07c7b2c2be1c56eee980162d759198b341c830a38e29d4b8a408c952edc6e7e9d8d592ddc5ef2c8670642ec602ff0a185e57953bb640b14896e402f
 MISC metadata.xml 824 SHA256 6cc757311f3ca78853f0cfca67a322d1f332d93b9fdf44cab82957babcf2cdec SHA512 be03ae743496462b779cc6e4f8f2a2b1f2db534fc8bf14060c313843d2c5180bb7d38b6262b9cd4a93aa2ed2116fa5c8f5ad19bd565d7a55f5d7cb4c3d5e480d WHIRLPOOL d3ec0e0b75475c7b9455062be02ad0f575cb1d052118dd83ca6c6bb16171306dd2c0986f13639ae9f3cfce974afac7270bcadce5ace7aca0986a9b88da2e15c4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTgLfdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTicVLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAg59QQAPag0w6XT2ZiIaK1yGQtc3+Z
-r+UWJbRYSHRe8gXQEtLx6LKFWj7+cI7Cd+fS8t2xWYNWxQBhO0iwVm8gdXSylugy
-TVOCUXkTnqiOl+oLPvLPx6Bpdf7DH+cHRLx1GHQmZcm7ME9tuh59W+sf6X6Hx6tE
-eRs2otTtNtvSBbdjXYdBJgN6j7C6Eaht5NFvHUJgL2XO/pJUk1JpFgnbamxiqdrp
-oyond5ZQAqK9Og7eqHfHXWxyJ39Wz5WwS4yuH3xRnTujAux2B1M9icxvbUyRNJ18
-gWRCSM18pu3KlaKm3kJ6sL6XRx/xZeK5x939HZs+PERK5EBFdW5cDU1vy4Eno+SO
-YnjzuX5cBGcfzcp40hudQZVBro5ObaD3yivva6HyX/MsrYvrR7tIgvgDB6vXVR11
-61oyHyFHTNCW3a1uI6co4CFLJ5ZwYAdP69FbiBSmKbsh40cpvIHz39wy1G9vIZIx
-TotB/tK3OaewlKpSd1g0V3ZCzLa/x5tdEFcHxdlVO2I7J36b7WijQxFa8T542MTL
-NUynBrPyQ/CJmYUxWqRSgBYVWPrPA+Fh5gxrGIMeQ41GBv2/1Bm2gsGSOTCjtm2O
-Izk6nc/E7Tic03UGZY9TJWFL6YxgHqJQMQsC0EAgkOfGC8JL1uTj8Ed0hNR9Sl/D
-swaVINVox0sl4te2gcYV
-=Xa5M
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgNdMQAIXPfBVHlDrFDjEr4RCcEWVU
+w5IwoXL7MdcFFbr300x1yWgz1ccZr6fNPB7wo29TxAVqBYoVLarDEEenfLizo9cw
+H6m3Dy7iHsvcc91VbNjugzD/GBHlg9cJI3Y8jvq4uQKOC89DZrPksmdz79J3Ap7h
+VC0P+eqiNx96gHc5s+dlvtiWKx9ux3b/yFZ+Pt93I7zD20RL2yMpbZyBC33sRujg
+esZ6SJYlF+DnlXbg0pCPzf+VrWvO98pYoRmTDuHa5kZuqvmSgUwH5MQxTstp+Q06
+lw7/wxXMzLGftuP9W3ydAcEl9xu9lpPMpG0H04HypwKQ2f8x92QtQDzVYUA/SFcU
+gd35OAkxQ5s5uPNn+xamXUc8Q2lw7/EMJ8mQa7RSj0BTTXIv4brgk2O13Qru9EWH
+aRcWRwKqdFyBVPyELvOQh7CG6gABf0OwN3VniIS5sMqOAbfQYYVSbdSEDv/OKV8u
+3ob+a5jL8nuU4KvvVE9oyGVtFvI+LZGLy5SCg6qL9tWPH8/aRN5neY+BA5abtJ6C
+93DHfj+P91p+nvT7mNblPn71JZvx5nYMHKbVnI9lrFskX7cfEhXNZD69V5kzE6Fn
+Tu7LyypFD3ly1M8Boazg3PW5p9qMv/jTzqT+7KYr/K5uKS8pt0BlNGcGpjZq0tDt
+jjKP7UOkn0wnZCbnuz9v
+=m2QB
 -----END PGP SIGNATURE-----
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