[gentoo-commits] repo/gentoo:master commit in: games-strategy/freeciv/

[Lars Wendler]

commit:     f9a3d8380ebfcb13f91c29d24233879ac141bc41
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 21 04:43:12 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Jul 21 04:43:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9a3d838

games-strategy/freeciv: Bump to version 2.6.0_rc2. Removed old.

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 games-strategy/freeciv/Manifest                              |  2 +-
 .../{freeciv-2.6.0_beta3.ebuild => freeciv-2.6.0_rc2.ebuild} | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index ffd9e563bfb..2fd784292d5 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,2 +1,2 @@
 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

diff --git a/games-strategy/freeciv/freeciv-2.6.0_beta3.ebuild 
b/games-strategy/freeciv/freeciv-2.6.0_rc2.ebuild
similarity index 94%
rename from games-strategy/freeciv/freeciv-2.6.0_beta3.ebuild
rename to games-strategy/freeciv/freeciv-2.6.0_rc2.ebuild
index ceb9ae038ec..54306880240 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() {