gentoo resync : 21.07.2018

3 files changed, 27 insertions, 10 deletions

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 386f97068f47..1775d1784838 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,6 +1,6 @@
-AUX freeciv-2.5.11-freetype_pkgconfig.patch 7770 BLAKE2B 89ee785b4db49eebd2a17d24622728933f9a90c813ea7c5c448efc150d6c9fd1f51ade375e549a45190db08efedeca93ec3c287cff54cf3f7b842a9cd84a14ba SHA512 6aac048569b8b42768832292162dbafceb69b93f6f6419c24e6dedd3a60aee9e059624dbfbf843cea19b1a97370c7e8178ff5a10f199f94665dbabe75e3e81b1
+AUX freeciv-2.5.11-freetype_pkgconfig.patch 8120 BLAKE2B cbcb39010d40abd530b8b30955c0461b7207698bb2e0701469e696d3ad3be6b3b0887d58623c7589784edd6961485517e18877dfbe9c011292e29b94dbcffb94 SHA512 525d3829fa17401cde3a0324d1342d4513decf6996864fa5d02462e2449d0895e8048fa71bd255b028b2ed084f8ca4734536cb86f85dd00d65e14d0f68b41184
 DIST freeciv-2.5.11.tar.bz2 40940090 BLAKE2B dfc1e714e1a3122335f555c2e57352726bda60dc0d1700b0d8ae937c85cba6beb0b2a6ffa6266b77437934ed85f1740f319c379a10c217161ee147f2339a50d3 SHA512 f5eac2fc2b7e09b9fd3b8b45145a5359f8216aef49050c692893d30584000c7db2f2a6e66ac19e67186e2653efaa0aa7656abefe2d2de25d123e9a52ce604456
-DIST freeciv-2.6.0-beta3.tar.bz2 51761039 BLAKE2B a01e1df80eaa7ab76416190d8c32941e443481b6f7460155f3180548919270bec5bf6efde698931c44d427e17c6347299c0674ed2fc59b5b3c6a8ee5b97c9cf0 SHA512 c8a49ab77d799a65d181632a565d92cd0f9c2cd9fbaa5ce963eddc9abca29ccb9567bc3f731ad80b3f3593dd807c3d702abbe378824e3adef655edb8100711f5
+DIST freeciv-2.6.0-RC2.tar.bz2 51828653 BLAKE2B 87e83e23cb1cec91e408415a5c0b7f4f2fc438f239ca48ba4e713b89c8624fdd58c1888ff53119196085b1f7f2c663af91df4af9c789c3238465f887758bf09f SHA512 254e492bb2ece390bcdb6c7ec9151b812811e7a1bff72eea4a9179a97c865d754436c5a02de2acb1ccf86850e1dd7db1218a84b836d18400217813d0c0ae173c
 EBUILD freeciv-2.5.11.ebuild 4569 BLAKE2B 06624aac60d9b6a6ce354f73d22513b429879b15f58d83990abacdb43cece5feff525cd8feaa853867bb0c8038d42b6e00c807c22d998eadd45d455344a63cec SHA512 50ea3f5c7851449554e42485e9b3e45c1483328d9b90c44ee23679a36ba10f7cd2fa84cfc041c2c4aaf9b03f66e53e53dd83d0e89719a3afbd91e221dd369ce3
-EBUILD freeciv-2.6.0_beta3.ebuild 4645 BLAKE2B c9bd80c89361bf855487e92303476fe1d450314baeb860571408a71d87e23c6fde27f6e856da8baccce2f1655007e890a69150e9bf8a227af554004660726648 SHA512 205479dc6f9cc89254e1c1bd80578549a2817d4a3b89b1139469fd5412c81468d8750ce2bd11d43d2bfdbda132d722c2dd49b4b2f2793ff2d17756c31ef2ff53
+EBUILD freeciv-2.6.0_rc2.ebuild 4730 BLAKE2B c511af4f5cfe5f89e8e764aa4e101ead2ca8847aa930f8ed3fb363cd91c0fa8e19d2d36d98ec0e908787e9725f1f812900cb4e9d80ecb2335f796e9d9840ab25 SHA512 3ab46c6adcae4fc43fe27d6202842bc404e42aa6c1716f102a559d39c9aaee0341231508b8ec99a84d054dbc4482c54e3a8948c213a2f965d160049dbb109e48
 MISC metadata.xml 1031 BLAKE2B 1421e4d2e504fbddc337b16cf2dc51af61957e954dc7c1752f537fd90ff1e3869b82c44635887dcd237eac274a5ca8b0d8c2b1cf92dd348a3301c804dd64142d SHA512 cbf6f0e418650f16f4b517895e6e03a9ffb3bdcd66563fab4ec067e6d4df79a1fb13d0cb9b7b314ad274839b430176405a3760e06a7d1f603f3464d1ff2bb201
diff --git a/games-strategy/freeciv/files/freeciv-2.5.11-freetype_pkgconfig.patch b/games-strategy/freeciv/files/freeciv-2.5.11-freetype_pkgconfig.patch
index b41411c8a164..d2b321dde274 100644
--- a/games-strategy/freeciv/files/freeciv-2.5.11-freetype_pkgconfig.patch
+++ b/games-strategy/freeciv/files/freeciv-2.5.11-freetype_pkgconfig.patch
@@ -1,4 +1,4 @@
-From fe3eaf658c256a1ee1aac645c004625e9f345421 Mon Sep 17 00:00:00 2001
+From f2eafd087a20b4236c1f2f1324e8644cb5055bf9 Mon Sep 17 00:00:00 2001
 From: Lars Wendler <polynomial-c@gentoo.org>
 Date: Wed, 16 May 2018 20:41:22 +0200
 Subject: [PATCH] Use pkg-config to find freetype
@@ -6,11 +6,24 @@ Subject: [PATCH] Use pkg-config to find freetype
 As of freetype-2.9.1 the freetype-config script no longer gets installed
 by default.
 ---
+ Makefile.am      |   1 -
  m4/freetype2.m4  | 194 -----------------------------------------------
  m4/sdl-client.m4 |   2 +-
- 2 files changed, 1 insertion(+), 195 deletions(-)
+ 3 files changed, 1 insertion(+), 196 deletions(-)
  delete mode 100644 m4/freetype2.m4
 
+diff --git a/Makefile.am b/Makefile.am
+index 5d5a187d47..51791433ab 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -64,7 +64,6 @@ EXTRA_DIST =	autogen.sh 			\
+ 		m4/fcdb-postgres.m4		\
+ 		m4/fcdb-sqlite3.m4		\
+ 		m4/features.m4			\
+-		m4/freetype2.m4			\
+ 		m4/gettimeofday.m4		\
+ 		m4/ggz.m4			\
+ 		m4/freeciv-gettext.m4		\
 diff --git a/m4/freetype2.m4 b/m4/freetype2.m4
 deleted file mode 100644
 index 3d0ecb3554..0000000000
@@ -225,5 +238,5 @@ index 095cd0b287..015d948d95 100644
  	  gui_sdl_cflags="$gui_sdl_cflags $FT2_CFLAGS"
  	  gui_sdl_libs="$gui_sdl_libs $FT2_LIBS"
 -- 
-2.17.0
+2.18.0
 
diff --git a/games-strategy/freeciv/freeciv-2.6.0_beta3.ebuild b/games-strategy/freeciv/freeciv-2.6.0_rc2.ebuild
index ceb9ae038ec1..54306880240b 100644
--- a/games-strategy/freeciv/freeciv-2.6.0_beta3.ebuild
+++ b/games-strategy/freeciv/freeciv-2.6.0_rc2.ebuild
@@ -2,11 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit flag-o-matic gnome2-utils ltprune xdg-utils
+inherit flag-o-matic gnome2-utils xdg-utils
+
+MY_PV="${PV/_beta/-beta}"
+MY_PV="${MY_PV/_rc/-RC}"
+MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="multiplayer strategy game (Civilization Clone)"
 HOMEPAGE="http://www.freeciv.org/"
-SRC_URI="mirror://sourceforge/freeciv/${P/_/-}.tar.bz2"
+SRC_URI="mirror://sourceforge/freeciv/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -58,7 +62,7 @@ DEPEND="${RDEPEND}
 		nls? ( sys-devel/gettext )
 	)"
 
-S="${WORKDIR}/${P/_/-}"
+S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
 	if use !dedicated && use !server ; then
@@ -170,7 +174,7 @@ src_install() {
 	find "${ED}" -name "freeciv-manual*" -delete
 
 	rm -f "${ED%/}/usr/$(get_libdir)"/*.a
-	prune_libtool_files
+	find "${ED}" -name "*.la" -delete || die
 }
 
 pkg_preinst() {