commit: 646c2153d2ca776aea214b6962b89046078156a7 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Sun Feb 4 06:03:18 2018 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Sun Feb 4 06:03:18 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=646c2153
games-strategy/freeciv: Bump to versions 2.5.10 and 2.6.0_beta2 Removed old. Closes: https://bugs.gentoo.org/646266 Package-Manager: Portage-2.3.24, Repoman-2.3.6 games-strategy/freeciv/Manifest | 3 +- ...iv-2.6.0_beta1.ebuild => freeciv-2.5.10.ebuild} | 37 ++++++++-------------- ...6.0_beta1.ebuild => freeciv-2.6.0_beta2.ebuild} | 2 +- 3 files changed, 17 insertions(+), 25 deletions(-) diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest index e6798cd6bd2..1abf5589715 100644 --- a/games-strategy/freeciv/Manifest +++ b/games-strategy/freeciv/Manifest @@ -1,2 +1,3 @@ +DIST freeciv-2.5.10.tar.bz2 40920632 BLAKE2B 1fb6d3d8130088c818ffe95c68a4061732278da8b7e477347cc67e7cc770526a65006844db0d3ecdb462a903fb5589d18666ffe6c9262956bf30fbc0c79742e5 SHA512 198ea42af083ebbfc4d79cbcbc9fc2dd548c92581301d77fd9cff0e2addc7b7255090471dc52aceb966320958b3a4c542615d5ec91a114dfc805fe993864a6f5 DIST freeciv-2.5.9.tar.bz2 41176249 BLAKE2B d590318e8f03c726fd36714751ed666574951bf988a37b1ee6527a07dcdf4e637cfa525c2ecdf83d537fefdc4c3fd4a3db2c0e037424825af6d1c38f009293c9 SHA512 e8002dc2d0c313ec34d6245f69bf8cc9ed4f98a826d9f564e21cbca379529f6060b8efb3453ec38cb2c7efd222a4aea04033c3ff84b191271ba0af5b770c7677 -DIST freeciv-2.6.0-beta1.tar.bz2 51744941 BLAKE2B e9d25aee0b13c189ff3a0c6a94c8925075fb7da22f40308db5db8d3bec580f46179228bd278279f0aa1d2fff606913af94ed1b25ae4d51f677f98738a056fb97 SHA512 5e70239e375710ec61f69f6daaa62d1c6881df3f5ddb2905229e2c0cec5cad9ce33688693580b2a24aa5aff79471cda4dbef4f9d51df34bd491b5284b12782e5 +DIST freeciv-2.6.0-beta2.tar.bz2 51503051 BLAKE2B 45bf863a530d726261670cbdcd16daefeecaa72e3f090d98d274baa0cd52f3cd0dd1807d660863c822a2dafd170ad51a6b45d756c43aaf6e95e70c74460ce90b SHA512 e92411f43192dc28bcd492f7e78f455cbc18264c7720dd8d35eb86fcc6da5e3927d79751bd1cd6f88d2904283c0844910415df5d7e36d0b9b76ab5fe3c872976 diff --git a/games-strategy/freeciv/freeciv-2.6.0_beta1.ebuild b/games-strategy/freeciv/freeciv-2.5.10.ebuild similarity index 86% copy from games-strategy/freeciv/freeciv-2.6.0_beta1.ebuild copy to games-strategy/freeciv/freeciv-2.5.10.ebuild index 4fc0202df50..b235bb640ff 100644 --- a/games-strategy/freeciv/freeciv-2.6.0_beta1.ebuild +++ b/games-strategy/freeciv/freeciv-2.5.10.ebuild @@ -1,16 +1,15 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit flag-o-matic gnome2-utils ltprune xdg-utils +inherit eutils flag-o-matic gnome2-utils DESCRIPTION="multiplayer strategy game (Civilization Clone)" HOMEPAGE="http://www.freeciv.org/"; -SRC_URI="mirror://sourceforge/freeciv/${P/_/-}.tar.bz2" +SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -[[ ${PV} != *_beta* ]] || [[ ${PV} != *_rc* ]] || \ KEYWORDS="~amd64 ~ppc64 ~x86" IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua" @@ -38,19 +37,19 @@ RDEPEND="app-arch/bzip2 dev-qt/qtwidgets:5 ) sdl? ( - media-libs/libsdl2[video] - media-libs/sdl2-gfx - media-libs/sdl2-image[png] - media-libs/sdl2-ttf + media-libs/libsdl[video] + media-libs/sdl-gfx + media-libs/sdl-image[png] + media-libs/sdl-ttf ) server? ( aimodules? ( sys-devel/libtool:2 ) ) sound? ( - media-libs/libsdl2[sound] - media-libs/sdl2-mixer[vorbis] + media-libs/libsdl[sound] + media-libs/sdl-mixer[vorbis] ) !sdl? ( !gtk? ( x11-libs/gtk+:2 ) ) ) - system-lua? ( >=dev-lang/lua-5.3 )" + system-lua? ( >=dev-lang/lua-5.2 )" DEPEND="${RDEPEND} virtual/pkgconfig !dedicated? ( @@ -58,8 +57,6 @@ DEPEND="${RDEPEND} nls? ( sys-devel/gettext ) )" -S="${WORKDIR}/${P/_/-}" - pkg_setup() { if use !dedicated && use !server ; then ewarn "Disabling server USE flag will make it impossible" @@ -102,27 +99,21 @@ src_configure() { if use dedicated ; then myclient="no" - myeconfargs+=( - --enable-server - --enable-freeciv-manual=html - ) + myeconfargs+=( --enable-server ) else if use !sdl && use !gtk && ! use qt5 ; then einfo "No client backend given, defaulting to" einfo "gtk2 client!" myclient="gtk2" else - use sdl && myclient+=" sdl2" + use sdl && myclient+=" sdl" use gtk && myclient+=" gtk2" if use qt5 ; then myclient+=" qt" append-cxxflags -std=c++11 fi fi - myeconfargs+=( - $(use_enable server) - $(use_enable server freeciv-manual html ) - ) + myeconfargs+=( $(use_enable server) --without-ggz-client ) fi myeconfargs+=( @@ -158,7 +149,7 @@ src_install() { # something like that, but then it's a PITA to avoid orphan files... ./tools/freeciv-manual || die docinto html - dodoc classic*.html + dodoc manual*.html fi if use sdl ; then make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client diff --git a/games-strategy/freeciv/freeciv-2.6.0_beta1.ebuild b/games-strategy/freeciv/freeciv-2.6.0_beta2.ebuild similarity index 99% rename from games-strategy/freeciv/freeciv-2.6.0_beta1.ebuild rename to games-strategy/freeciv/freeciv-2.6.0_beta2.ebuild index 4fc0202df50..85687658671 100644 --- a/games-strategy/freeciv/freeciv-2.6.0_beta1.ebuild +++ b/games-strategy/freeciv/freeciv-2.6.0_beta2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6
