diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2014-05-24 15:16:45 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2014-05-24 15:16:45 +0000 |
| commit | 9cd0605201218f77c2921fbb6e2f85ea6fd63fdc (patch) | |
| tree | bc5340c71d3e0acced21528b5939cbe0d6f2dc06 /games-strategy/freeciv | |
| parent | Stable for x86, wrt bug #510488 (diff) | |
| download | historical-9cd0605201218f77c2921fbb6e2f85ea6fd63fdc.tar.gz historical-9cd0605201218f77c2921fbb6e2f85ea6fd63fdc.tar.bz2 historical-9cd0605201218f77c2921fbb6e2f85ea6fd63fdc.zip | |
fix linking issues wrt #511128, patch by Andrei Slavoiu
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020
Diffstat (limited to 'games-strategy/freeciv')
| -rw-r--r-- | games-strategy/freeciv/ChangeLog | 6 | ||||
| -rw-r--r-- | games-strategy/freeciv/Manifest | 33 | ||||
| -rw-r--r-- | games-strategy/freeciv/files/freeciv-2.4.2-as-needed.patch | 11 | ||||
| -rw-r--r-- | games-strategy/freeciv/freeciv-2.4.2.ebuild | 7 |
4 files changed, 38 insertions, 19 deletions
diff --git a/games-strategy/freeciv/ChangeLog b/games-strategy/freeciv/ChangeLog index b642e2a3a395..fb7bd9de2bb4 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.150 2014/05/23 17:59:37 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.151 2014/05/24 15:16:41 hasufell Exp $ + + 24 May 2014; Julian Ospald <hasufell@gentoo.org> freeciv-2.4.2.ebuild, + +files/freeciv-2.4.2-as-needed.patch: + fix linking issues wrt #511128, patch by Andrei Slavoiu 23 May 2014; Julian Ospald <hasufell@gentoo.org> freeciv-2.4.2.ebuild: set readline slot diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest index 69aeff8c6aeb..ec6478324256 100644 --- a/games-strategy/freeciv/Manifest +++ b/games-strategy/freeciv/Manifest @@ -1,28 +1,29 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX freeciv-2.4.2-as-needed.patch 322 SHA256 dc834e6b959239f328571b6d2dd62a1b38695ebef0b88fab751854869871a083 SHA512 f5e31c37f981d062e8b82ebed84658ae295e655f3a3388385c9db4031a0a73ed943c4eb31fcecf81c5c9563ec54c562a52c39aa711a497380333592ff5f85ae0 WHIRLPOOL 099f2c82d1f86ac9997ad6a9a3563718ba0d57758108864f6a1eab0d5b4e56c00ba26e083b83214a678bae7fe4ef1918cbdd1649cb49a36187624c31b06cced8 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 4897 SHA256 1db47b421905a271d640f78f579d4b6d31077457e56eb8c9363c4fcc56240450 SHA512 2cba85d0a174e081bbb26b390e511f58d45abe61bbf0fd1b071d16209f386e10458b12225856af5f275cdb02b3dcaf9813aaaa7dfb9b822a79b619ed3ccfe547 WHIRLPOOL 1fcc1d939b3f51ea00d484a2071dc68e558d5f7de77de3aae73dccf64d4b30b52177da139f4188bc051b7c8a32bbcd19aad49d34928de489e0e9e65d3863a6e4 -MISC ChangeLog 21492 SHA256 9abd6ec36af169da38dfc025a39aeaec1dc4ccae0dcd519ac34d9164e87cd5ea SHA512 1d4934708d1b64e691a07125c071fe9d8e438c91547908a6dc3ff5df956e2dc3c9423141549fa724607eca17acec65ada3a63391accda9f98a640982acfef7b8 WHIRLPOOL c0a3198587402c14ffaf528094afe9505b037d3243da212a3772e69c3942b92dc3621acf14af8032b2a6068f671d2a80c1bf16a5bc7458e206ae7961d9ba08c3 +EBUILD freeciv-2.4.2.ebuild 4964 SHA256 fa3973779cd0a93a51d4c1b4ec043ba55c1b04f713d1151caa33f3d6be2a593c SHA512 2a6fb910922fcbf78f34fb3b36f34b7874a990132377749d2fa03b9c8b6e9d4f44595017c4e840bc7bc34a76597d007e79a74832413923d47796050e21beada2 WHIRLPOOL c2db7732a27d085edeba3c379cfc451594883096754018678d0c490217277cfe86afaf1ea52e3d0c1beaa76270dfab53c5704dc74e40b62c410e0c3a3d6e03e6 +MISC ChangeLog 21664 SHA256 9d79e348d9f3a811378e3210bbb59a3ac8357019b103438ed321e7d9e446906b SHA512 47733b50d6a7b54e235641645696f994c599af164da6b9bfa01f10353ea07bfb53bd18462b9996709ca5c619363d594883d07663edcf000ad8e90a45a94f6bc6 WHIRLPOOL 630d94d9211441f77ba42f8ddcd29821563e4f81a87028abf3cee8c59237e06a7fc5e997664ab2ab295760b669f6b13368f72f23a89a20cef2661c9575e7a3e3 MISC metadata.xml 824 SHA256 6cc757311f3ca78853f0cfca67a322d1f332d93b9fdf44cab82957babcf2cdec SHA512 be03ae743496462b779cc6e4f8f2a2b1f2db534fc8bf14060c313843d2c5180bb7d38b6262b9cd4a93aa2ed2116fa5c8f5ad19bd565d7a55f5d7cb4c3d5e480d WHIRLPOOL d3ec0e0b75475c7b9455062be02ad0f575cb1d052118dd83ca6c6bb16171306dd2c0986f13639ae9f3cfce974afac7270bcadce5ace7aca0986a9b88da2e15c4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQJ8BAEBCABmBQJTf4yOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJTgLfdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy -MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAg+uYQAPG4RpzwUbxSeuv0FWpAdfjk -sGBk5H06wp6Bu0SPPeQgaCruc/AjxE0ta56FuEzqFGFfcPCmg4/iVuxGyYhOPeAc -fsNHvT/XBDew/uSw9z4reubXtsXnzCQaTSH0tq7i0+OohayVkIuEAYWhIDo+bIMx -NFfNteyDLq4/0a+W7wXkDxp0Aa+If8PnHgTG/v67LhN7PEvoIB3NDbxb9/exEYnL -1GJM90A2oTrfA+GGniyxehKdW2/LZGmNY30/8LpK+DjuDX8JluZN5OhT97EC0vc5 -/4w7ILAWzjHJn0RMCFXDNZUg/NxXypA5hnOg4Cn65ofqdwpx2UN95W7FgaFz1KCG -JbC4qtpJba13UUcS+RB12g/GF7RmiQaFn2u+eHaI0EAe20dUb07bmzLcXSDZfX5h -wfqbYRHbIqQzKWxXcs5A71L8T9g+37U1FxooG1JWYd5e7BHfQXU4e5iZZz95Qsr2 -8KtwK72vcHGvr8WPhLCpOtCkDDMYN0B4I2GWXZmGq04yzMeXEsSjb0feH01aIhNZ -1vn30Iu2NSevMAwb2dU5uzRkEcF213+bkDDTJ0hht8Y+B//ZXZfy/sq0lLOpkzjo -FQ/ft4mMK3Wx+XqFv4AkoKRdEoKw56sp4CtdB6SVC/8wk9PrtgdskZTUXW3sBUIW -2Q/2pisnv7gv512tIenh -=uqj+ +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 -----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 new file mode 100644 index 000000000000..99212fd38e05 --- /dev/null +++ b/games-strategy/freeciv/files/freeciv-2.4.2-as-needed.patch @@ -0,0 +1,11 @@ +--- 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 @@ + $(top_builddir)/server/scripting/libscripting_server.la + + libfreeciv_srv_la_LIBADD = \ +- $(srvlibs) ++ $(srvlibs) $(SERVER_LIBS) + + freeciv_server_LDFLAGS = $(GGZDMOD_LDFLAGS) + diff --git a/games-strategy/freeciv/freeciv-2.4.2.ebuild b/games-strategy/freeciv/freeciv-2.4.2.ebuild index f8b50f405959..67fa83782723 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.2 2014/05/23 17:59:37 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.4.2.ebuild,v 1.3 2014/05/24 15:16:41 hasufell Exp $ # FIXME: gtk3 support breaks ggz support EAPI=5 -inherit eutils gnome2-utils games-ggz games +inherit autotools eutils gnome2-utils games-ggz games DESCRIPTION="multiplayer strategy game (Civilization Clone)" HOMEPAGE="http://www.freeciv.org/" @@ -69,6 +69,9 @@ 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 sed -i \ |