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

[Andreas Sturmlechner]

commit: e33053f4098c027323c7d0b3bf61ed8acfd95804
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jun 11 15:13:16 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jun 11 16:30:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e33053f4

games-strategy/freeciv: Fix build w/ USE=qt6

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../freeciv/files/freeciv-3.1.0-qt6.patch  | 24 ++
 games-strategy/freeciv/freeciv-3.1.0.ebuild|  1 +
 2 files changed, 25 insertions(+)

diff --git a/games-strategy/freeciv/files/freeciv-3.1.0-qt6.patch 
b/games-strategy/freeciv/files/freeciv-3.1.0-qt6.patch
new file mode 100644
index ..9aa363a11e02
--- /dev/null
+++ b/games-strategy/freeciv/files/freeciv-3.1.0-qt6.patch
@@ -0,0 +1,24 @@
+From 8da1d4c91dff53db6d903730855ed6a02252e53d Mon Sep 17 00:00:00 2001
+From: Marko Lindqvist 
+Date: Wed, 17 Apr 2024 07:02:20 +0300
+Subject: [PATCH] Qt: Add Q_OBJECT for fc_shortcut_popup
+
+See RM #462
+
+Signed-off-by: Marko Lindqvist 
+---
+ client/gui-qt/shortcuts.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/client/gui-qt/shortcuts.h b/client/gui-qt/shortcuts.h
+index 7574ce4f8e..9d02d1c3f6 100644
+--- a/client/gui-qt/shortcuts.h
 b/client/gui-qt/shortcuts.h
+@@ -155,6 +155,7 @@ class line_edit : public QLineEdit
+ **/
+ class fc_shortcut_popup : public QDialog
+ {
++  Q_OBJECT
+ public:
+   fc_shortcut_popup(QWidget *parent);
+   void run(fc_shortcut *s);

diff --git a/games-strategy/freeciv/freeciv-3.1.0.ebuild 
b/games-strategy/freeciv/freeciv-3.1.0.ebuild
index 0b5e2c809016..17f914cff915 100644
--- a/games-strategy/freeciv/freeciv-3.1.0.ebuild
+++ b/games-strategy/freeciv/freeciv-3.1.0.ebuild
@@ -92,6 +92,7 @@ pkg_setup() {
 
 PATCHES=(
"${FILESDIR}"/${PN}-3.1.0_beta4-fix-manpage-install-location.patch
+   "${FILESDIR}"/${P}-qt6.patch # from git master
 )
 
 src_prepare() {

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

[Matt Jolly]

commit: 674b1e486187c2464c8693f85b1748716ebd6c0c
Author: Matt Jolly  gentoo  org>
AuthorDate: Mon Apr  1 04:14:59 2024 +
Commit: Matt Jolly  gentoo  org>
CommitDate: Mon Apr  1 04:14:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=674b1e48

games-strategy/freeciv: drop unused local USE aimodules, auth

Signed-off-by: Matt Jolly  gentoo.org>

 games-strategy/freeciv/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/games-strategy/freeciv/metadata.xml 
b/games-strategy/freeciv/metadata.xml
index 2131b4947957..9a51d4a95eeb 100644
--- a/games-strategy/freeciv/metadata.xml
+++ b/games-strategy/freeciv/metadata.xml
@@ -6,10 +6,6 @@
Gentoo Games Project


-   Support for dynamically loadable AI
-   modules (server-side)
-   Add authentication capability via
-   mysql, postgres, or sqlite3
Build the gtk3 client
Build the gtk4 client
Add support for JSON via

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

[Matt Jolly]

commit: 1ea25f6e39022a110e064d71228f0b6ebd68da48
Author: Matt Jolly  gentoo  org>
AuthorDate: Sun Mar 31 12:13:34 2024 +
Commit: Matt Jolly  gentoo  org>
CommitDate: Mon Apr  1 03:48:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ea25f6e

games-strategy/freeciv: drop 3.1.0_beta4

Signed-off-by: Matt Jolly  gentoo.org>

 games-strategy/freeciv/Manifest   |   1 -
 games-strategy/freeciv/freeciv-3.1.0_beta4.ebuild | 215 --
 2 files changed, 216 deletions(-)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 5ab062b74145..9a0035fd6a40 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,2 +1 @@
 DIST freeciv-3.1.0.tar.gz 127748997 BLAKE2B 
75b3d1341d8ab09af244f07f3df5b1817571c4958a4296f37f35a105fe5a8e3d2e8d2e0dc7eb1d1aaf3d4a4c6574ba75355595134dc5a255535bc14c604bb99f
 SHA512 
514d796a54466790a5ce0f2abb6fd8cb9c124a2f19ab33d48ce7a7f0d8d92096b54352a5d3655da852cdbd807baf4969467e04b82f687347bdff92e09f7aad86
-DIST freeciv-3.1.0_beta4.tar.gz 127725084 BLAKE2B 
f92c0aa75a47c165f808c761dc8e0a7cc76cafa722ef8d968ad69f379f2945774c811407f234df7ef22327c93dc2ec7b7765d0666bda249c573f57be3d03891a
 SHA512 
b6864730583fe6dc17818813080132d6fa44c2adf8033a827b9a209f309c69e58bda41b8263a86006042a2e5f8bf99037e9d1d813a15ff1b9d48ec69b395f139

diff --git a/games-strategy/freeciv/freeciv-3.1.0_beta4.ebuild 
b/games-strategy/freeciv/freeciv-3.1.0_beta4.ebuild
deleted file mode 100644
index 0b5e2c809016..
--- a/games-strategy/freeciv/freeciv-3.1.0_beta4.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-4 )
-
-inherit desktop lua-single meson xdg
-
-DESCRIPTION="Multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="https://www.freeciv.org/ https://github.com/freeciv/freeciv/;
-
-if [[ ${PV} ==  ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/freeciv/freeciv/;
-else
-   MY_PV="R${PV//./_}"
-   
SRC_URI="https://github.com/freeciv/freeciv/archive/refs/tags/${MY_PV}.tar.gz 
-> ${P}.tar.gz"
-   if [[ ${PV} != *_beta* ]]; then
-   KEYWORDS="~amd64 ~ppc64 ~x86"
-   fi
-   MY_P="${PN}-${MY_PV}"
-   S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="dedicated gtk3 gtk4 json mapimg modpack mysql nls +qt5 qt6 readline 
rule-editor sdl +server +sound +system-lua web-server"
-
-# I'm pretty sure that you can't build both qt flavours at the same time
-REQUIRED_USE="
-   system-lua? ( ${LUA_REQUIRED_USE} )
-   !dedicated? ( || ( gtk3 gtk4 qt5 qt6 sdl ) )
-   dedicated? ( !gtk3 !gtk4 !mapimg !nls !qt5 !qt6 !sdl !sound )
-   qt5?  ( !qt6 )
-   qt6?  ( !qt5 )
-"
-
-RDEPEND="
-   app-arch/bzip2
-   app-arch/xz-utils
-   app-arch/zstd:=
-   dev-build/libtool
-   dev-db/sqlite:3
-   dev-libs/icu:=
-   net-misc/curl
-   sys-libs/zlib
-   !dedicated? (
-   media-libs/libpng
-   gtk3? ( x11-libs/gtk+:3 )
-   gtk4? ( gui-libs/gtk:4 )
-   mapimg? ( media-gfx/imagemagick:= )
-   nls? ( virtual/libintl )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-   qt6? (
-   dev-qt/qtbase:6[gui,widgets]
-   )
-   sdl? (
-   media-libs/libsdl2[video]
-   media-libs/sdl2-gfx
-   media-libs/sdl2-image[png]
-   media-libs/sdl2-ttf
-   )
-   sound? (
-   media-libs/libsdl2[sound]
-   media-libs/sdl2-mixer[vorbis]
-   )
-   )
-   json? ( dev-libs/jansson:= )
-   readline? ( sys-libs/readline:= )
-   system-lua? (
-   ${LUA_DEPS}
-   )
-"
-DEPEND="${RDEPEND}
-   !dedicated? ( x11-base/xorg-proto )
-"
-# Calls gzip during build
-BDEPEND="
-   app-arch/gzip
-   virtual/pkgconfig
-   nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-   use system-lua && lua-single_pkg_setup
-}
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.1.0_beta4-fix-manpage-install-location.patch
-)
-
-src_prepare() {
-   # Upstream's meson.build is not very friendly to our needs
-   sed -i -e "s:doc/freeciv:doc/${PF}:" meson.build || die
-   sed -i -e "/custom_target('gzip_ChangeLog/,+6d" meson.build || die
-   default
-}
-
-src_configure() {
-   # Docs here: 
https://github.com/freeciv/freeciv/blob/main/doc/INSTALL.meson
-   local myclient=() emesonargs=() myfcmp=()
-
-   # Upstream considers meson "experimental" until 3.2.0 according to 
their roadmap
-   emesonargs+=( -Dack_experimental=true )
-
-   if use dedicated || use 

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

[Matt Jolly]

commit: 9f32c1177d4dc3bd65b91b93533903451979d9d1
Author: Matt Jolly  gentoo  org>
AuthorDate: Sun Mar 31 06:26:24 2024 +
Commit: Matt Jolly  gentoo  org>
CommitDate: Mon Apr  1 03:48:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f32c117

games-strategy/freeciv: add 3.1.0

Signed-off-by: Matt Jolly  gentoo.org>

 games-strategy/freeciv/Manifest |   1 +
 games-strategy/freeciv/freeciv-3.1.0.ebuild | 215 
 2 files changed, 216 insertions(+)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index ca8deabd1aa1..432548adceb3 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,2 +1,3 @@
 DIST freeciv-3.0.10.tar.xz 43433812 BLAKE2B 
c529b2039e38070fef4758f4d316cfe952dcce4d4a773e70da22f2a3948f0506be493b4af20529d80749b47954bdd87a7aca8efb72c5502fefb2c103977f4e12
 SHA512 
4082e94deeda8d9b90f04137d6e7dfd39ff7232225a910f47519a464db553891e42289c1d7738f9ee0d9a16db143669bf8c4c5ce9492a4455ccd99906c956192
+DIST freeciv-3.1.0.tar.gz 127748997 BLAKE2B 
75b3d1341d8ab09af244f07f3df5b1817571c4958a4296f37f35a105fe5a8e3d2e8d2e0dc7eb1d1aaf3d4a4c6574ba75355595134dc5a255535bc14c604bb99f
 SHA512 
514d796a54466790a5ce0f2abb6fd8cb9c124a2f19ab33d48ce7a7f0d8d92096b54352a5d3655da852cdbd807baf4969467e04b82f687347bdff92e09f7aad86
 DIST freeciv-3.1.0_beta4.tar.gz 127725084 BLAKE2B 
f92c0aa75a47c165f808c761dc8e0a7cc76cafa722ef8d968ad69f379f2945774c811407f234df7ef22327c93dc2ec7b7765d0666bda249c573f57be3d03891a
 SHA512 
b6864730583fe6dc17818813080132d6fa44c2adf8033a827b9a209f309c69e58bda41b8263a86006042a2e5f8bf99037e9d1d813a15ff1b9d48ec69b395f139

diff --git a/games-strategy/freeciv/freeciv-3.1.0.ebuild 
b/games-strategy/freeciv/freeciv-3.1.0.ebuild
new file mode 100644
index ..0b5e2c809016
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-3.1.0.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+
+inherit desktop lua-single meson xdg
+
+DESCRIPTION="Multiplayer strategy game (Civilization Clone)"
+HOMEPAGE="https://www.freeciv.org/ https://github.com/freeciv/freeciv/;
+
+if [[ ${PV} ==  ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/freeciv/freeciv/;
+else
+   MY_PV="R${PV//./_}"
+   
SRC_URI="https://github.com/freeciv/freeciv/archive/refs/tags/${MY_PV}.tar.gz 
-> ${P}.tar.gz"
+   if [[ ${PV} != *_beta* ]]; then
+   KEYWORDS="~amd64 ~ppc64 ~x86"
+   fi
+   MY_P="${PN}-${MY_PV}"
+   S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="dedicated gtk3 gtk4 json mapimg modpack mysql nls +qt5 qt6 readline 
rule-editor sdl +server +sound +system-lua web-server"
+
+# I'm pretty sure that you can't build both qt flavours at the same time
+REQUIRED_USE="
+   system-lua? ( ${LUA_REQUIRED_USE} )
+   !dedicated? ( || ( gtk3 gtk4 qt5 qt6 sdl ) )
+   dedicated? ( !gtk3 !gtk4 !mapimg !nls !qt5 !qt6 !sdl !sound )
+   qt5?  ( !qt6 )
+   qt6?  ( !qt5 )
+"
+
+RDEPEND="
+   app-arch/bzip2
+   app-arch/xz-utils
+   app-arch/zstd:=
+   dev-build/libtool
+   dev-db/sqlite:3
+   dev-libs/icu:=
+   net-misc/curl
+   sys-libs/zlib
+   !dedicated? (
+   media-libs/libpng
+   gtk3? ( x11-libs/gtk+:3 )
+   gtk4? ( gui-libs/gtk:4 )
+   mapimg? ( media-gfx/imagemagick:= )
+   nls? ( virtual/libintl )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   qt6? (
+   dev-qt/qtbase:6[gui,widgets]
+   )
+   sdl? (
+   media-libs/libsdl2[video]
+   media-libs/sdl2-gfx
+   media-libs/sdl2-image[png]
+   media-libs/sdl2-ttf
+   )
+   sound? (
+   media-libs/libsdl2[sound]
+   media-libs/sdl2-mixer[vorbis]
+   )
+   )
+   json? ( dev-libs/jansson:= )
+   readline? ( sys-libs/readline:= )
+   system-lua? (
+   ${LUA_DEPS}
+   )
+"
+DEPEND="${RDEPEND}
+   !dedicated? ( x11-base/xorg-proto )
+"
+# Calls gzip during build
+BDEPEND="
+   app-arch/gzip
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )
+"
+
+pkg_setup() {
+   use system-lua && lua-single_pkg_setup
+}
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.1.0_beta4-fix-manpage-install-location.patch
+)
+
+src_prepare() {
+   # Upstream's meson.build is not very friendly to our needs
+   sed -i -e "s:doc/freeciv:doc/${PF}:" meson.build || die
+   sed -i -e "/custom_target('gzip_ChangeLog/,+6d" meson.build || die
+   default
+}
+
+src_configure() {
+   # Docs here: 

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

[Matt Jolly]

commit: 2243dedc3478753e74f5c19b6208fa3d5dbd23cb
Author: Matt Jolly  gentoo  org>
AuthorDate: Sun Mar 31 06:26:59 2024 +
Commit: Matt Jolly  gentoo  org>
CommitDate: Mon Apr  1 03:48:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2243dedc

games-strategy/freeciv: drop 3.0.10

Signed-off-by: Matt Jolly  gentoo.org>

 games-strategy/freeciv/Manifest  |   1 -
 games-strategy/freeciv/freeciv-3.0.10.ebuild | 193 ---
 2 files changed, 194 deletions(-)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 432548adceb3..5ab062b74145 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,3 +1,2 @@
-DIST freeciv-3.0.10.tar.xz 43433812 BLAKE2B 
c529b2039e38070fef4758f4d316cfe952dcce4d4a773e70da22f2a3948f0506be493b4af20529d80749b47954bdd87a7aca8efb72c5502fefb2c103977f4e12
 SHA512 
4082e94deeda8d9b90f04137d6e7dfd39ff7232225a910f47519a464db553891e42289c1d7738f9ee0d9a16db143669bf8c4c5ce9492a4455ccd99906c956192
 DIST freeciv-3.1.0.tar.gz 127748997 BLAKE2B 
75b3d1341d8ab09af244f07f3df5b1817571c4958a4296f37f35a105fe5a8e3d2e8d2e0dc7eb1d1aaf3d4a4c6574ba75355595134dc5a255535bc14c604bb99f
 SHA512 
514d796a54466790a5ce0f2abb6fd8cb9c124a2f19ab33d48ce7a7f0d8d92096b54352a5d3655da852cdbd807baf4969467e04b82f687347bdff92e09f7aad86
 DIST freeciv-3.1.0_beta4.tar.gz 127725084 BLAKE2B 
f92c0aa75a47c165f808c761dc8e0a7cc76cafa722ef8d968ad69f379f2945774c811407f234df7ef22327c93dc2ec7b7765d0666bda249c573f57be3d03891a
 SHA512 
b6864730583fe6dc17818813080132d6fa44c2adf8033a827b9a209f309c69e58bda41b8263a86006042a2e5f8bf99037e9d1d813a15ff1b9d48ec69b395f139

diff --git a/games-strategy/freeciv/freeciv-3.0.10.ebuild 
b/games-strategy/freeciv/freeciv-3.0.10.ebuild
deleted file mode 100644
index 624a5bb44ac6..
--- a/games-strategy/freeciv/freeciv-3.0.10.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-3 )
-
-inherit desktop lua-single qmake-utils xdg
-
-MY_PV="${PV/_beta/-beta}"
-MY_PV="${MY_PV/_rc/-RC}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="https://www.freeciv.org/;
-
-if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-   SRC_URI="mirror://sourceforge/freeciv/${MY_P}.tar.xz"
-   KEYWORDS="~amd64 ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="aimodules auth dedicated +gtk mapimg modpack mysql nls qt5 readline sdl 
+server +sound sqlite +system-lua"
-
-REQUIRED_USE="
-   system-lua? ( ${LUA_REQUIRED_USE} )
-   dedicated? ( !gtk !mapimg !modpack !nls !qt5 !sdl !sound )
-   !dedicated? ( || ( gtk qt5 sdl ) )
-"
-
-# postgres isn't yet really supported by upstream
-RDEPEND="
-   app-arch/bzip2
-   app-arch/xz-utils
-   dev-libs/icu:=
-   net-misc/curl
-   sys-libs/zlib
-   auth? (
-   app-arch/zstd:=
-   dev-libs/openssl:=
-   !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:= ) ) )
-   mysql? ( dev-db/mysql-connector-c:= )
-   sqlite? ( dev-db/sqlite:3 )
-   )
-   aimodules? ( dev-libs/libltdl )
-   !dedicated? (
-   media-libs/libpng
-   gtk? ( x11-libs/gtk+:3 )
-   mapimg? ( media-gfx/imagemagick:= )
-   modpack? ( x11-libs/gtk+:3 )
-   nls? ( virtual/libintl )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-   !sdl? ( !gtk? ( x11-libs/gtk+:3 ) )
-   sdl? (
-   media-libs/libsdl2[video]
-   media-libs/sdl2-gfx
-   media-libs/sdl2-image[png]
-   media-libs/sdl2-ttf
-   )
-   server? ( aimodules? ( dev-build/libtool ) )
-   sound? (
-   media-libs/libsdl2[sound]
-   media-libs/sdl2-mixer[vorbis]
-   )
-   )
-   readline? ( sys-libs/readline:= )
-   system-lua? ( ${LUA_DEPS} )
-"
-DEPEND="${RDEPEND}
-   !dedicated? ( x11-base/xorg-proto )
-"
-# Calls gzip during build
-BDEPEND="
-   app-arch/gzip
-   virtual/pkgconfig
-   !dedicated? ( nls? ( sys-devel/gettext ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-   if ! use dedicated && ! use server ; then
-   ewarn "Disabling server USE flag will make it impossible to 
start local"
-   ewarn "games, but you will still be able to join multiplayer 
games."
-   fi
-
-   use system-lua && lua-single_pkg_setup
-}
-
-src_configure() {
-   local myclient=() mydatabase=() myeconfargs=()
-
-   if use auth ; then
-   if ! use mysql && ! use sqlite ; then
-   einfo "No database 

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

[David Seifert]

commit: 3bf39315fea027544e97da87d2f4e106f93ccb65
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sat Feb 17 14:35:21 2024 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 17 14:35:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bf39315

games-strategy/freeciv: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: David Seifert  gentoo.org>

 .../files/freeciv-3.1.0_beta2-lua-search.patch  | 21 -
 1 file changed, 21 deletions(-)

diff --git a/games-strategy/freeciv/files/freeciv-3.1.0_beta2-lua-search.patch 
b/games-strategy/freeciv/files/freeciv-3.1.0_beta2-lua-search.patch
deleted file mode 100644
index e7c8123f9985..
--- a/games-strategy/freeciv/files/freeciv-3.1.0_beta2-lua-search.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-This patches meson.build to enable it to find lua in any of its
-many wonderous hiding places. It also bumps the meson version so that
-there's a ton less boilerplate to do so.
 a/meson.build
-+++ b/meson.build
-@@ -1,5 +1,5 @@
- 
--project('freeciv', ['c', 'cpp'], meson_version: '>= 0.57.0')
-+project('freeciv', ['c', 'cpp'], meson_version: '>= 0.60.0')
- 
- if not get_option('ack_experimental')
-   error('Autotools are still the only fully supported way to build 
freeciv.\nSet configure option "ack_experimental" to true if you really want to 
do experimental meson build.\n' +
-@@ -436,7 +436,7 @@ endif
- icu_dep = dependency('icu-uc')
- 
- syslua = get_option('syslua')
--lua_dep_tmp = dependency('lua-5.4', required:false)
-+lua_dep_tmp = dependency('lua-5.4', 'lua-54', 'lua54', 'lua5.4', 
required:false)
- 
- if syslua != 'false' and lua_dep_tmp.found()
-   lua_inc_path = []

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

[Matt Jolly]

commit: bcee564b25eecdc46e385bc51cd2b43a320ea80f
Author: Matt Jolly  footclan  ninja>
AuthorDate: Sat Feb 10 08:32:27 2024 +
Commit: Matt Jolly  gentoo  org>
CommitDate: Sat Feb 10 21:15:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcee564b

games-strategy/freeciv: drop 3.0.1-r1

Signed-off-by: Matt Jolly  footclan.ninja>
Signed-off-by: Matt Jolly  gentoo.org>

 games-strategy/freeciv/Manifest|   1 -
 games-strategy/freeciv/freeciv-3.0.1-r1.ebuild | 195 -
 2 files changed, 196 deletions(-)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index b1ce9b6f02ea..2d30f399f655 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,4 +1,3 @@
-DIST freeciv-3.0.1.tar.xz 33528292 BLAKE2B 
e19cae8a02aa4b9afc2895560aa7a8d6135a63a0e757c348a75e72522448a026874f8f0120448b38ca2fee0ecc42dd04d80345d9877554168ad07ca2a20e5dcc
 SHA512 
0f28aa7eb6adc2c4fe2af31265965ec30b4ea4f12121c4240ca896070f4ea574db58f02240e74822b9d498e112bcdb7036bb69f3d0b33cea5fec724e9e47da34
 DIST freeciv-3.0.10.tar.xz 43433812 BLAKE2B 
c529b2039e38070fef4758f4d316cfe952dcce4d4a773e70da22f2a3948f0506be493b4af20529d80749b47954bdd87a7aca8efb72c5502fefb2c103977f4e12
 SHA512 
4082e94deeda8d9b90f04137d6e7dfd39ff7232225a910f47519a464db553891e42289c1d7738f9ee0d9a16db143669bf8c4c5ce9492a4455ccd99906c956192
 DIST freeciv-3.1.0_beta2.tar.gz 127527752 BLAKE2B 
457e01787e2dccb4862de5519a4ea51bcfe240c0948e2cd97b09ae6d4e2c27d4196329326cd7c0489ce1e37dbc548f4f31fcd7c5f57b15b53b49dd6e54fef032
 SHA512 
2b15134454bf7ca885287985bb6d17a31f6cbfdec87fa8e6fd7fce000a2bfc1fa888dd7a2e244df4460d08011e87876800190a9fa8ea825789eec0e434348920
 DIST freeciv-3.1.0_beta4.tar.gz 127725084 BLAKE2B 
f92c0aa75a47c165f808c761dc8e0a7cc76cafa722ef8d968ad69f379f2945774c811407f234df7ef22327c93dc2ec7b7765d0666bda249c573f57be3d03891a
 SHA512 
b6864730583fe6dc17818813080132d6fa44c2adf8033a827b9a209f309c69e58bda41b8263a86006042a2e5f8bf99037e9d1d813a15ff1b9d48ec69b395f139

diff --git a/games-strategy/freeciv/freeciv-3.0.1-r1.ebuild 
b/games-strategy/freeciv/freeciv-3.0.1-r1.ebuild
deleted file mode 100644
index cd0640190fc3..
--- a/games-strategy/freeciv/freeciv-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-3 )
-
-inherit desktop lua-single qmake-utils xdg
-
-MY_PV="${PV/_beta/-beta}"
-MY_PV="${MY_PV/_rc/-RC}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="https://www.freeciv.org/;
-
-if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-   SRC_URI="mirror://sourceforge/freeciv/${MY_P}.tar.xz"
-   KEYWORDS="~amd64 ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="aimodules auth dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite +system-lua"
-
-REQUIRED_USE="system-lua? ( ${LUA_REQUIRED_USE} )"
-
-# postgres isn't yet really supported by upstream
-RDEPEND="
-   app-arch/bzip2
-   app-arch/xz-utils
-   net-misc/curl
-   dev-libs/icu:=
-   sys-libs/zlib
-   auth? (
-   !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:= ) ) )
-   mysql? ( dev-db/mysql-connector-c:= )
-   sqlite? ( dev-db/sqlite:3 )
-   )
-   dedicated? ( aimodules? ( dev-libs/libltdl ) )
-   !dedicated? (
-   media-libs/libpng
-   gtk? ( x11-libs/gtk+:3 )
-   mapimg? ( media-gfx/imagemagick:= )
-   modpack? ( x11-libs/gtk+:3 )
-   nls? ( virtual/libintl )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-   !sdl? ( !gtk? ( x11-libs/gtk+:3 ) )
-   sdl? (
-   media-libs/libsdl2[video]
-   media-libs/sdl2-gfx
-   media-libs/sdl2-image[png]
-   media-libs/sdl2-ttf
-   )
-   server? ( aimodules? ( dev-build/libtool ) )
-   sound? (
-   media-libs/libsdl2[sound]
-   media-libs/sdl2-mixer[vorbis]
-   )
-   )
-   readline? ( sys-libs/readline:= )
-   system-lua? ( ${LUA_DEPS} )
-"
-DEPEND="${RDEPEND}
-   !dedicated? ( x11-base/xorg-proto )
-"
-# Calls gzip during build
-BDEPEND="
-   app-arch/gzip
-   virtual/pkgconfig
-   !dedicated? ( nls? ( sys-devel/gettext ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-   if ! use dedicated && ! use server ; then
-   ewarn "Disabling server USE flag will make it impossible to 
start local"
-   ewarn "games, but you will still be able to join multiplayer 
games."
-   fi
-
-   use system-lua && lua-single_pkg_setup
-}
-

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

[Matt Jolly]

commit: 105d0e8177ea0f6cc08c745680b1a2bc8a175ee6
Author: Matt Jolly  footclan  ninja>
AuthorDate: Sat Feb 10 08:38:14 2024 +
Commit: Matt Jolly  gentoo  org>
CommitDate: Sat Feb 10 21:15:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=105d0e81

games-strategy/freeciv: drop 3.1.0_beta2

Signed-off-by: Matt Jolly  footclan.ninja>
Closes: https://github.com/gentoo/gentoo/pull/34331
Signed-off-by: Matt Jolly  gentoo.org>

 games-strategy/freeciv/Manifest   |   1 -
 games-strategy/freeciv/freeciv-3.1.0_beta2.ebuild | 198 --
 2 files changed, 199 deletions(-)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 2d30f399f655..ca8deabd1aa1 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,3 +1,2 @@
 DIST freeciv-3.0.10.tar.xz 43433812 BLAKE2B 
c529b2039e38070fef4758f4d316cfe952dcce4d4a773e70da22f2a3948f0506be493b4af20529d80749b47954bdd87a7aca8efb72c5502fefb2c103977f4e12
 SHA512 
4082e94deeda8d9b90f04137d6e7dfd39ff7232225a910f47519a464db553891e42289c1d7738f9ee0d9a16db143669bf8c4c5ce9492a4455ccd99906c956192
-DIST freeciv-3.1.0_beta2.tar.gz 127527752 BLAKE2B 
457e01787e2dccb4862de5519a4ea51bcfe240c0948e2cd97b09ae6d4e2c27d4196329326cd7c0489ce1e37dbc548f4f31fcd7c5f57b15b53b49dd6e54fef032
 SHA512 
2b15134454bf7ca885287985bb6d17a31f6cbfdec87fa8e6fd7fce000a2bfc1fa888dd7a2e244df4460d08011e87876800190a9fa8ea825789eec0e434348920
 DIST freeciv-3.1.0_beta4.tar.gz 127725084 BLAKE2B 
f92c0aa75a47c165f808c761dc8e0a7cc76cafa722ef8d968ad69f379f2945774c811407f234df7ef22327c93dc2ec7b7765d0666bda249c573f57be3d03891a
 SHA512 
b6864730583fe6dc17818813080132d6fa44c2adf8033a827b9a209f309c69e58bda41b8263a86006042a2e5f8bf99037e9d1d813a15ff1b9d48ec69b395f139

diff --git a/games-strategy/freeciv/freeciv-3.1.0_beta2.ebuild 
b/games-strategy/freeciv/freeciv-3.1.0_beta2.ebuild
deleted file mode 100644
index b2c29565edf8..
--- a/games-strategy/freeciv/freeciv-3.1.0_beta2.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-4 )
-
-inherit desktop lua-single meson xdg
-
-DESCRIPTION="Multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="https://www.freeciv.org/;
-
-if [[ ${PV} ==  ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/freeciv/freeciv/;
-else
-   MY_PV="R${PV//./_}"
-   
SRC_URI="https://github.com/freeciv/freeciv/archive/refs/tags/${MY_PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~ppc64 ~x86"
-   MY_P="${PN}-${MY_PV}"
-   S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="dedicated gtk3 gtk4 json mapimg modpack mysql nls +qt5 qt6 readline 
rule-editor sdl +sound +system-lua web-server"
-
-# I'm pretty sure that you can't build both qt flavours at the same time
-REQUIRED_USE="
-   system-lua? ( ${LUA_REQUIRED_USE} )
-   !dedicated? ( || ( gtk3 gtk4 qt5 qt6 sdl ) )
-   qt5?  ( !qt6 )
-   qt6?  ( !qt5 )
-"
-
-RDEPEND="
-   app-arch/bzip2
-   app-arch/xz-utils
-   app-arch/zstd:=
-   dev-db/sqlite:3
-   dev-libs/icu:=
-   net-misc/curl
-   dev-build/libtool
-   sys-libs/zlib
-   !dedicated? (
-   media-libs/libpng
-   gtk3? ( x11-libs/gtk+:3 )
-   gtk4? ( gui-libs/gtk:4 )
-   mapimg? ( media-gfx/imagemagick:= )
-   nls? ( virtual/libintl )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-   qt6? (
-   dev-qt/qtbase:6[gui,widgets]
-   )
-   sdl? (
-   media-libs/libsdl2[video]
-   media-libs/sdl2-gfx
-   media-libs/sdl2-image[png]
-   media-libs/sdl2-ttf
-   )
-   sound? (
-   media-libs/libsdl2[sound]
-   media-libs/sdl2-mixer[vorbis]
-   )
-   )
-   json? ( dev-libs/jansson:= )
-   readline? ( sys-libs/readline:= )
-   system-lua? (
-   ${LUA_DEPS}
-   )
-"
-DEPEND="${RDEPEND}
-   !dedicated? ( x11-base/xorg-proto )
-"
-# Calls gzip during build
-BDEPEND="
-   app-arch/gzip
-   virtual/pkgconfig
-   nls? ( sys-devel/gettext )
-"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-lua-search.patch
-)
-
-pkg_setup() {
-   use system-lua && lua-single_pkg_setup
-}
-
-src_configure() {
-   local myclient=() emesonargs=() myfcmp=()
-
-   # Upstream considers meson "experimental" until 3.2.0 according to 
their roadmap
-   emesonargs+=( -Dack_experimental=true )
-
-   # meson build drops the ability to _not_ build a server in favour
-   # of optionally replacing the server binary the freeciv-web 

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

[Matt Jolly]

commit: 24750791aaf556f3c73166243f0c5417df1c71a8
Author: Matt Jolly  footclan  ninja>
AuthorDate: Sun Dec 17 19:33:43 2023 +
Commit: Matt Jolly  gentoo  org>
CommitDate: Sat Feb 10 21:15:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24750791

games-strategy/freeciv: add 3.0.10

- gtk client -> gtk3.22 client
- drop ipv6 use
- remove superfluous sed

Closes: https://bugs.gentoo.org/872353
Bug: https://bugs.gentoo.org/863848
Signed-off-by: Matt Jolly  footclan.ninja>
Signed-off-by: Matt Jolly  gentoo.org>

 games-strategy/freeciv/Manifest  |   1 +
 games-strategy/freeciv/freeciv-3.0.10.ebuild | 193 +++
 2 files changed, 194 insertions(+)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index eb1adb9d824b..b1ce9b6f02ea 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,3 +1,4 @@
 DIST freeciv-3.0.1.tar.xz 33528292 BLAKE2B 
e19cae8a02aa4b9afc2895560aa7a8d6135a63a0e757c348a75e72522448a026874f8f0120448b38ca2fee0ecc42dd04d80345d9877554168ad07ca2a20e5dcc
 SHA512 
0f28aa7eb6adc2c4fe2af31265965ec30b4ea4f12121c4240ca896070f4ea574db58f02240e74822b9d498e112bcdb7036bb69f3d0b33cea5fec724e9e47da34
+DIST freeciv-3.0.10.tar.xz 43433812 BLAKE2B 
c529b2039e38070fef4758f4d316cfe952dcce4d4a773e70da22f2a3948f0506be493b4af20529d80749b47954bdd87a7aca8efb72c5502fefb2c103977f4e12
 SHA512 
4082e94deeda8d9b90f04137d6e7dfd39ff7232225a910f47519a464db553891e42289c1d7738f9ee0d9a16db143669bf8c4c5ce9492a4455ccd99906c956192
 DIST freeciv-3.1.0_beta2.tar.gz 127527752 BLAKE2B 
457e01787e2dccb4862de5519a4ea51bcfe240c0948e2cd97b09ae6d4e2c27d4196329326cd7c0489ce1e37dbc548f4f31fcd7c5f57b15b53b49dd6e54fef032
 SHA512 
2b15134454bf7ca885287985bb6d17a31f6cbfdec87fa8e6fd7fce000a2bfc1fa888dd7a2e244df4460d08011e87876800190a9fa8ea825789eec0e434348920
 DIST freeciv-3.1.0_beta4.tar.gz 127725084 BLAKE2B 
f92c0aa75a47c165f808c761dc8e0a7cc76cafa722ef8d968ad69f379f2945774c811407f234df7ef22327c93dc2ec7b7765d0666bda249c573f57be3d03891a
 SHA512 
b6864730583fe6dc17818813080132d6fa44c2adf8033a827b9a209f309c69e58bda41b8263a86006042a2e5f8bf99037e9d1d813a15ff1b9d48ec69b395f139

diff --git a/games-strategy/freeciv/freeciv-3.0.10.ebuild 
b/games-strategy/freeciv/freeciv-3.0.10.ebuild
new file mode 100644
index ..624a5bb44ac6
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-3.0.10.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-3 )
+
+inherit desktop lua-single qmake-utils xdg
+
+MY_PV="${PV/_beta/-beta}"
+MY_PV="${MY_PV/_rc/-RC}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Multiplayer strategy game (Civilization Clone)"
+HOMEPAGE="https://www.freeciv.org/;
+
+if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+   SRC_URI="mirror://sourceforge/freeciv/${MY_P}.tar.xz"
+   KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="aimodules auth dedicated +gtk mapimg modpack mysql nls qt5 readline sdl 
+server +sound sqlite +system-lua"
+
+REQUIRED_USE="
+   system-lua? ( ${LUA_REQUIRED_USE} )
+   dedicated? ( !gtk !mapimg !modpack !nls !qt5 !sdl !sound )
+   !dedicated? ( || ( gtk qt5 sdl ) )
+"
+
+# postgres isn't yet really supported by upstream
+RDEPEND="
+   app-arch/bzip2
+   app-arch/xz-utils
+   dev-libs/icu:=
+   net-misc/curl
+   sys-libs/zlib
+   auth? (
+   app-arch/zstd:=
+   dev-libs/openssl:=
+   !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:= ) ) )
+   mysql? ( dev-db/mysql-connector-c:= )
+   sqlite? ( dev-db/sqlite:3 )
+   )
+   aimodules? ( dev-libs/libltdl )
+   !dedicated? (
+   media-libs/libpng
+   gtk? ( x11-libs/gtk+:3 )
+   mapimg? ( media-gfx/imagemagick:= )
+   modpack? ( x11-libs/gtk+:3 )
+   nls? ( virtual/libintl )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   !sdl? ( !gtk? ( x11-libs/gtk+:3 ) )
+   sdl? (
+   media-libs/libsdl2[video]
+   media-libs/sdl2-gfx
+   media-libs/sdl2-image[png]
+   media-libs/sdl2-ttf
+   )
+   server? ( aimodules? ( dev-build/libtool ) )
+   sound? (
+   media-libs/libsdl2[sound]
+   media-libs/sdl2-mixer[vorbis]
+   )
+   )
+   readline? ( sys-libs/readline:= )
+   system-lua? ( ${LUA_DEPS} )
+"
+DEPEND="${RDEPEND}
+   !dedicated? ( x11-base/xorg-proto )
+"
+# Calls gzip during build
+BDEPEND="
+   app-arch/gzip
+   virtual/pkgconfig
+   !dedicated? ( nls? ( sys-devel/gettext ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+

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

[Matt Jolly]

commit: 1f5db9b248ebbb86b90e49a4bf6e15a5175d9fe3
Author: Matt Jolly  footclan  ninja>
AuthorDate: Sun Dec 17 19:21:12 2023 +
Commit: Matt Jolly  gentoo  org>
CommitDate: Sat Feb 10 21:15:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f5db9b2

games-strategy/freeciv: add 3.1.0_beta4

Closes: https://bugs.gentoo.org/913868
Closes: https://bugs.gentoo.org/909397
Signed-off-by: Matt Jolly  footclan.ninja>
Signed-off-by: Matt Jolly  gentoo.org>

 games-strategy/freeciv/Manifest|  1 +
 ...-3.1.0_beta4-fix-manpage-install-location.patch | 34 
 ...eciv-.ebuild => freeciv-3.1.0_beta4.ebuild} | 63 ++
 games-strategy/freeciv/freeciv-.ebuild | 63 ++
 games-strategy/freeciv/metadata.xml|  2 +
 5 files changed, 121 insertions(+), 42 deletions(-)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 07b520312249..eb1adb9d824b 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,2 +1,3 @@
 DIST freeciv-3.0.1.tar.xz 33528292 BLAKE2B 
e19cae8a02aa4b9afc2895560aa7a8d6135a63a0e757c348a75e72522448a026874f8f0120448b38ca2fee0ecc42dd04d80345d9877554168ad07ca2a20e5dcc
 SHA512 
0f28aa7eb6adc2c4fe2af31265965ec30b4ea4f12121c4240ca896070f4ea574db58f02240e74822b9d498e112bcdb7036bb69f3d0b33cea5fec724e9e47da34
 DIST freeciv-3.1.0_beta2.tar.gz 127527752 BLAKE2B 
457e01787e2dccb4862de5519a4ea51bcfe240c0948e2cd97b09ae6d4e2c27d4196329326cd7c0489ce1e37dbc548f4f31fcd7c5f57b15b53b49dd6e54fef032
 SHA512 
2b15134454bf7ca885287985bb6d17a31f6cbfdec87fa8e6fd7fce000a2bfc1fa888dd7a2e244df4460d08011e87876800190a9fa8ea825789eec0e434348920
+DIST freeciv-3.1.0_beta4.tar.gz 127725084 BLAKE2B 
f92c0aa75a47c165f808c761dc8e0a7cc76cafa722ef8d968ad69f379f2945774c811407f234df7ef22327c93dc2ec7b7765d0666bda249c573f57be3d03891a
 SHA512 
b6864730583fe6dc17818813080132d6fa44c2adf8033a827b9a209f309c69e58bda41b8263a86006042a2e5f8bf99037e9d1d813a15ff1b9d48ec69b395f139

diff --git 
a/games-strategy/freeciv/files/freeciv-3.1.0_beta4-fix-manpage-install-location.patch
 
b/games-strategy/freeciv/files/freeciv-3.1.0_beta4-fix-manpage-install-location.patch
new file mode 100644
index ..744d46749741
--- /dev/null
+++ 
b/games-strategy/freeciv/files/freeciv-3.1.0_beta4-fix-manpage-install-location.patch
@@ -0,0 +1,34 @@
+From 4518545bd37c6665db51ccd2da7c15bcceb1c0f8 Mon Sep 17 00:00:00 2001
+From: Matt Jolly 
+Date: Sat, 10 Feb 2024 17:57:38 +1000
+Subject: [PATCH] When using meson we should still install 'man 6' pages to
+ ${mandir}/man6
+
+---
+ meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 099e526..5ec0e79 100644
+--- a/meson.build
 b/meson.build
+@@ -2892,14 +2892,14 @@ endforeach
+ foreach manp : man_pages
+   install_data(
+ join_paths(b_root, manp + '.6'),
+-install_dir : get_option('mandir')
++install_dir : join_paths(get_option('mandir'), 'man6')
+ )
+ endforeach
+ 
+ foreach manp : man_links
+   install_data(
+ join_paths('doc/man/', manp + '.6'),
+-install_dir : get_option('mandir')
++install_dir : join_paths(get_option('mandir'), 'man6')
+ )
+ endforeach
+ 
+-- 
+2.43.0
+

diff --git a/games-strategy/freeciv/freeciv-.ebuild 
b/games-strategy/freeciv/freeciv-3.1.0_beta4.ebuild
similarity index 76%
copy from games-strategy/freeciv/freeciv-.ebuild
copy to games-strategy/freeciv/freeciv-3.1.0_beta4.ebuild
index fd6bf4d53f31..0b5e2c809016 100644
--- a/games-strategy/freeciv/freeciv-.ebuild
+++ b/games-strategy/freeciv/freeciv-3.1.0_beta4.ebuild
@@ -8,7 +8,7 @@ LUA_COMPAT=( lua5-4 )
 inherit desktop lua-single meson xdg
 
 DESCRIPTION="Multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="https://www.freeciv.org/;
+HOMEPAGE="https://www.freeciv.org/ https://github.com/freeciv/freeciv/;
 
 if [[ ${PV} ==  ]] ; then
inherit git-r3
@@ -16,19 +16,22 @@ if [[ ${PV} ==  ]] ; then
 else
MY_PV="R${PV//./_}"

SRC_URI="https://github.com/freeciv/freeciv/archive/refs/tags/${MY_PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~ppc64 ~x86"
+   if [[ ${PV} != *_beta* ]]; then
+   KEYWORDS="~amd64 ~ppc64 ~x86"
+   fi
MY_P="${PN}-${MY_PV}"
S="${WORKDIR}/${MY_P}"
 fi
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="dedicated gtk3 gtk4 json mapimg modpack mysql nls +qt5 qt6 readline 
rule-editor sdl +sound +system-lua web-server"
+IUSE="dedicated gtk3 gtk4 json mapimg modpack mysql nls +qt5 qt6 readline 
rule-editor sdl +server +sound +system-lua web-server"
 
 # I'm pretty sure that you can't build both qt flavours at the same time
 REQUIRED_USE="
system-lua? ( ${LUA_REQUIRED_USE} )
!dedicated? ( || ( gtk3 gtk4 qt5 qt6 sdl ) )
+   dedicated? ( !gtk3 !gtk4 !mapimg !nls !qt5 !qt6 !sdl !sound )
qt5?  ( !qt6 )
qt6?  ( !qt5 )
 "
@@ -37,10 +40,10 

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

[Conrad Kostecki]

commit: 6ce5c96c6689e1addf680abd19bc14c9f229b97b
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Wed Jul  5 08:21:12 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Jul  5 20:41:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ce5c96c

games-strategy/freeciv: use HTTPS

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31760
Signed-off-by: Conrad Kostecki  gentoo.org>

 games-strategy/freeciv/freeciv-3.0.1-r1.ebuild| 2 +-
 games-strategy/freeciv/freeciv-3.1.0_beta2.ebuild | 4 ++--
 games-strategy/freeciv/freeciv-.ebuild| 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/games-strategy/freeciv/freeciv-3.0.1-r1.ebuild 
b/games-strategy/freeciv/freeciv-3.0.1-r1.ebuild
index b9f2024bc3a7..b14f7c92e768 100644
--- a/games-strategy/freeciv/freeciv-3.0.1-r1.ebuild
+++ b/games-strategy/freeciv/freeciv-3.0.1-r1.ebuild
@@ -12,7 +12,7 @@ MY_PV="${MY_PV/_rc/-RC}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="Multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="http://www.freeciv.org/;
+HOMEPAGE="https://www.freeciv.org/;
 
 if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
SRC_URI="mirror://sourceforge/freeciv/${MY_P}.tar.xz"

diff --git a/games-strategy/freeciv/freeciv-3.1.0_beta2.ebuild 
b/games-strategy/freeciv/freeciv-3.1.0_beta2.ebuild
index bf93bfe2a9ee..1832f6f9a715 100644
--- a/games-strategy/freeciv/freeciv-3.1.0_beta2.ebuild
+++ b/games-strategy/freeciv/freeciv-3.1.0_beta2.ebuild
@@ -8,7 +8,7 @@ LUA_COMPAT=( lua5-4 )
 inherit desktop lua-single meson xdg
 
 DESCRIPTION="Multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="http://www.freeciv.org/;
+HOMEPAGE="https://www.freeciv.org/;
 
 if [[ ${PV} ==  ]] ; then
inherit git-r3
@@ -23,7 +23,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="dedicated gtk3 gtk4 json mapimg modpack mysql nls +qt5 qt6 readline 
rule-editor sdl +sound +system-lua web-server "
+IUSE="dedicated gtk3 gtk4 json mapimg modpack mysql nls +qt5 qt6 readline 
rule-editor sdl +sound +system-lua web-server"
 
 # I'm pretty sure that you can't build both qt flavours at the same time
 REQUIRED_USE="

diff --git a/games-strategy/freeciv/freeciv-.ebuild 
b/games-strategy/freeciv/freeciv-.ebuild
index 0b65cd815449..8a9d4b523f87 100644
--- a/games-strategy/freeciv/freeciv-.ebuild
+++ b/games-strategy/freeciv/freeciv-.ebuild
@@ -8,7 +8,7 @@ LUA_COMPAT=( lua5-4 )
 inherit desktop lua-single meson xdg
 
 DESCRIPTION="Multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="http://www.freeciv.org/;
+HOMEPAGE="https://www.freeciv.org/;
 
 if [[ ${PV} ==  ]] ; then
inherit git-r3
@@ -23,7 +23,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="dedicated gtk3 gtk4 json mapimg modpack mysql nls +qt5 qt6 readline 
rule-editor sdl +sound +system-lua web-server "
+IUSE="dedicated gtk3 gtk4 json mapimg modpack mysql nls +qt5 qt6 readline 
rule-editor sdl +sound +system-lua web-server"
 
 # I'm pretty sure that you can't build both qt flavours at the same time
 REQUIRED_USE="

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

[Sam James]

commit: 08e5f37bdc8170cba7357f6c5d14ab7b300e572a
Author: Matt Jolly  footclan  ninja>
AuthorDate: Sun Jun 11 07:07:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 30 07:17:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08e5f37b

games-strategy/freeciv: add 3.1.0_beta2, 

Switch to meson build; it'll be the default next version anyway
and it's better than autotools (controversial opinion, I know).

Signed-off-by: Matt Jolly  footclan.ninja>
Closes: https://github.com/gentoo/gentoo/pull/31381
Signed-off-by: Sam James  gentoo.org>

 games-strategy/freeciv/Manifest|   1 +
 .../files/freeciv-3.1.0_beta2-lua-search.patch |  21 +++
 games-strategy/freeciv/freeciv-3.1.0_beta2.ebuild  | 198 +
 games-strategy/freeciv/freeciv-.ebuild | 194 
 games-strategy/freeciv/metadata.xml|  11 +-
 5 files changed, 423 insertions(+), 2 deletions(-)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 68270362a7df..07b520312249 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1 +1,2 @@
 DIST freeciv-3.0.1.tar.xz 33528292 BLAKE2B 
e19cae8a02aa4b9afc2895560aa7a8d6135a63a0e757c348a75e72522448a026874f8f0120448b38ca2fee0ecc42dd04d80345d9877554168ad07ca2a20e5dcc
 SHA512 
0f28aa7eb6adc2c4fe2af31265965ec30b4ea4f12121c4240ca896070f4ea574db58f02240e74822b9d498e112bcdb7036bb69f3d0b33cea5fec724e9e47da34
+DIST freeciv-3.1.0_beta2.tar.gz 127527752 BLAKE2B 
457e01787e2dccb4862de5519a4ea51bcfe240c0948e2cd97b09ae6d4e2c27d4196329326cd7c0489ce1e37dbc548f4f31fcd7c5f57b15b53b49dd6e54fef032
 SHA512 
2b15134454bf7ca885287985bb6d17a31f6cbfdec87fa8e6fd7fce000a2bfc1fa888dd7a2e244df4460d08011e87876800190a9fa8ea825789eec0e434348920

diff --git a/games-strategy/freeciv/files/freeciv-3.1.0_beta2-lua-search.patch 
b/games-strategy/freeciv/files/freeciv-3.1.0_beta2-lua-search.patch
new file mode 100644
index ..e7c8123f9985
--- /dev/null
+++ b/games-strategy/freeciv/files/freeciv-3.1.0_beta2-lua-search.patch
@@ -0,0 +1,21 @@
+This patches meson.build to enable it to find lua in any of its
+many wonderous hiding places. It also bumps the meson version so that
+there's a ton less boilerplate to do so.
+--- a/meson.build
 b/meson.build
+@@ -1,5 +1,5 @@
+ 
+-project('freeciv', ['c', 'cpp'], meson_version: '>= 0.57.0')
++project('freeciv', ['c', 'cpp'], meson_version: '>= 0.60.0')
+ 
+ if not get_option('ack_experimental')
+   error('Autotools are still the only fully supported way to build 
freeciv.\nSet configure option "ack_experimental" to true if you really want to 
do experimental meson build.\n' +
+@@ -436,7 +436,7 @@ endif
+ icu_dep = dependency('icu-uc')
+ 
+ syslua = get_option('syslua')
+-lua_dep_tmp = dependency('lua-5.4', required:false)
++lua_dep_tmp = dependency('lua-5.4', 'lua-54', 'lua54', 'lua5.4', 
required:false)
+ 
+ if syslua != 'false' and lua_dep_tmp.found()
+   lua_inc_path = []

diff --git a/games-strategy/freeciv/freeciv-3.1.0_beta2.ebuild 
b/games-strategy/freeciv/freeciv-3.1.0_beta2.ebuild
new file mode 100644
index ..bf93bfe2a9ee
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-3.1.0_beta2.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+
+inherit desktop lua-single meson xdg
+
+DESCRIPTION="Multiplayer strategy game (Civilization Clone)"
+HOMEPAGE="http://www.freeciv.org/;
+
+if [[ ${PV} ==  ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/freeciv/freeciv/;
+else
+   MY_PV="R${PV//./_}"
+   
SRC_URI="https://github.com/freeciv/freeciv/archive/refs/tags/${MY_PV}.tar.gz 
-> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~ppc64 ~x86"
+   MY_P="${PN}-${MY_PV}"
+   S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="dedicated gtk3 gtk4 json mapimg modpack mysql nls +qt5 qt6 readline 
rule-editor sdl +sound +system-lua web-server "
+
+# I'm pretty sure that you can't build both qt flavours at the same time
+REQUIRED_USE="
+   system-lua? ( ${LUA_REQUIRED_USE} )
+   !dedicated? ( || ( gtk3 gtk4 qt5 qt6 sdl ) )
+   qt5?  ( !qt6 )
+   qt6?  ( !qt5 )
+"
+
+RDEPEND="
+   app-arch/bzip2
+   app-arch/xz-utils
+   app-arch/zstd:=
+   dev-db/sqlite:3
+   dev-libs/icu:=
+   net-misc/curl
+   sys-devel/libtool
+   sys-libs/zlib
+   !dedicated? (
+   media-libs/libpng
+   gtk3? ( x11-libs/gtk+:3 )
+   gtk4? ( gui-libs/gtk:4 )
+   mapimg? ( media-gfx/imagemagick:= )
+   nls? ( virtual/libintl )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   qt6? (
+   

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

[Sam James]

commit: 1e41c6903c4b6b61c030539e21287bf14562430e
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 15 06:32:25 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 15 06:32:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e41c690

games-strategy/freeciv: add missing ICU dep

Closes: https://bugs.gentoo.org/838409
Signed-off-by: Sam James  gentoo.org>

 .../{freeciv-3.0.1.ebuild => freeciv-3.0.1-r1.ebuild} | 15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/games-strategy/freeciv/freeciv-3.0.1.ebuild 
b/games-strategy/freeciv/freeciv-3.0.1-r1.ebuild
similarity index 93%
rename from games-strategy/freeciv/freeciv-3.0.1.ebuild
rename to games-strategy/freeciv/freeciv-3.0.1-r1.ebuild
index ed4228f81246..01f0ad879e67 100644
--- a/games-strategy/freeciv/freeciv-3.0.1.ebuild
+++ b/games-strategy/freeciv/freeciv-3.0.1-r1.ebuild
@@ -30,15 +30,16 @@ RDEPEND="
app-arch/bzip2
app-arch/xz-utils
net-misc/curl
+   dev-libs/icu:=
sys-libs/zlib
auth? (
-   !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) )
-   mysql? ( dev-db/mysql-connector-c:0= )
+   !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:= ) ) )
+   mysql? ( dev-db/mysql-connector-c:= )
sqlite? ( dev-db/sqlite:3 )
)
-   dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
+   dedicated? ( aimodules? ( dev-libs/libltdl ) )
!dedicated? (
-   media-libs/libpng:0
+   media-libs/libpng
gtk? ( x11-libs/gtk+:3 )
mapimg? ( media-gfx/imagemagick:= )
modpack? ( x11-libs/gtk+:3 )
@@ -55,19 +56,21 @@ RDEPEND="
media-libs/sdl2-image[png]
media-libs/sdl2-ttf
)
-   server? ( aimodules? ( sys-devel/libtool:2 ) )
+   server? ( aimodules? ( sys-devel/libtool ) )
sound? (
media-libs/libsdl2[sound]
media-libs/sdl2-mixer[vorbis]
)
)
-   readline? ( sys-libs/readline:0= )
+   readline? ( sys-libs/readline:= )
system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}
!dedicated? ( x11-base/xorg-proto )
 "
+# Calls gzip during build
 BDEPEND="
+   app-arch/gzip
virtual/pkgconfig
!dedicated? ( nls? ( sys-devel/gettext ) )
 "

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

[Sam James]

commit: f590c1e24e05af4783357249681183b9f7f5f4a4
Author: Matt Jolly  footclan  ninja>
AuthorDate: Fri Apr 15 05:49:45 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 15 05:51:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f590c1e2

games-strategy/freeciv: add 3.0.1, drop 3.0.0

Signed-off-by: Matt Jolly  footclan.ninja>
Closes: https://github.com/gentoo/gentoo/pull/25031
Signed-off-by: Sam James  gentoo.org>

 games-strategy/freeciv/Manifest   | 2 +-
 games-strategy/freeciv/{freeciv-3.0.0.ebuild => freeciv-3.0.1.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index fb23736138a2..68270362a7df 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1 +1 @@
-DIST freeciv-3.0.0.tar.xz 33421584 BLAKE2B 
aafd69767c947b26b410e520c674604aa06b51080de35b14bab584b2baf5259fe0b11efb97601341f594d054a664cf0cbf4bb29763919a482f097823d2f024ab
 SHA512 
5c3774cc1510f1aedac0be043cb0684230e23067031ad1b88c6320a1aab1308452719950d49e25b29f8c2ee9e4e96cc40cdf89ac23609c5422c8beeccd37
+DIST freeciv-3.0.1.tar.xz 33528292 BLAKE2B 
e19cae8a02aa4b9afc2895560aa7a8d6135a63a0e757c348a75e72522448a026874f8f0120448b38ca2fee0ecc42dd04d80345d9877554168ad07ca2a20e5dcc
 SHA512 
0f28aa7eb6adc2c4fe2af31265965ec30b4ea4f12121c4240ca896070f4ea574db58f02240e74822b9d498e112bcdb7036bb69f3d0b33cea5fec724e9e47da34

diff --git a/games-strategy/freeciv/freeciv-3.0.0.ebuild 
b/games-strategy/freeciv/freeciv-3.0.1.ebuild
similarity index 100%
rename from games-strategy/freeciv/freeciv-3.0.0.ebuild
rename to games-strategy/freeciv/freeciv-3.0.1.ebuild

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

[Sam James]

commit: 7bd703f953fccbf2efc43964b73ae0cad21ea13f
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 15 05:52:52 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 15 05:52:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bd703f9

games-strategy/freeciv: move comment location

Signed-off-by: Sam James  gentoo.org>

 games-strategy/freeciv/freeciv-3.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/freeciv/freeciv-3.0.1.ebuild 
b/games-strategy/freeciv/freeciv-3.0.1.ebuild
index 7ff9b9132dcd..ed4228f81246 100644
--- a/games-strategy/freeciv/freeciv-3.0.1.ebuild
+++ b/games-strategy/freeciv/freeciv-3.0.1.ebuild
@@ -25,6 +25,7 @@ IUSE="aimodules auth dedicated +gtk ipv6 mapimg modpack mysql 
nls qt5 readline s
 
 REQUIRED_USE="system-lua? ( ${LUA_REQUIRED_USE} )"
 
+# postgres isn't yet really supported by upstream
 RDEPEND="
app-arch/bzip2
app-arch/xz-utils
@@ -66,7 +67,6 @@ RDEPEND="
 DEPEND="${RDEPEND}
!dedicated? ( x11-base/xorg-proto )
 "
-# postgres isn't yet really supported by upstream
 BDEPEND="
virtual/pkgconfig
!dedicated? ( nls? ( sys-devel/gettext ) )

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

[James Le Cuirot]

commit: a7f9ae9ac54ecfedaec26c90e0360ed6b98e47cd
Author: Matt Jolly  footclan  ninja>
AuthorDate: Tue Mar 29 10:47:42 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Apr 14 21:34:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7f9ae9a

games-strategy/freeciv: add 3.0.0

Signed-off-by: Matt Jolly  footclan.ninja>
Signed-off-by: James Le Cuirot  gentoo.org>

 games-strategy/freeciv/Manifest |   1 +
 games-strategy/freeciv/freeciv-3.0.0.ebuild | 192 
 2 files changed, 193 insertions(+)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 399242876ba6..5c49edfb6e62 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1 +1,2 @@
 DIST freeciv-2.6.6.tar.bz2 52244748 BLAKE2B 
88f85b8345b0a2baaa6626a6ab0c8a68e1e7a9a189f661b4fb800572090bf999c62e64641eae36a48b5d90a988bf43b839a411a60af285fbc234e2ca20fadd0c
 SHA512 
97723d260c4e40328aaf26606a4f37871958b58a475cd3fc635edf2e94d28d486c6e28a75b42126e9e69580a60d24fc490da086877d0c912a544d643ff69b103
+DIST freeciv-3.0.0.tar.xz 33421584 BLAKE2B 
aafd69767c947b26b410e520c674604aa06b51080de35b14bab584b2baf5259fe0b11efb97601341f594d054a664cf0cbf4bb29763919a482f097823d2f024ab
 SHA512 
5c3774cc1510f1aedac0be043cb0684230e23067031ad1b88c6320a1aab1308452719950d49e25b29f8c2ee9e4e96cc40cdf89ac23609c5422c8beeccd37

diff --git a/games-strategy/freeciv/freeciv-3.0.0.ebuild 
b/games-strategy/freeciv/freeciv-3.0.0.ebuild
new file mode 100644
index ..7ff9b9132dcd
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-3.0.0.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-3 )
+
+inherit desktop lua-single qmake-utils xdg
+
+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/;
+
+if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+   SRC_URI="mirror://sourceforge/freeciv/${MY_P}.tar.xz"
+   KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="aimodules auth dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
+
+REQUIRED_USE="system-lua? ( ${LUA_REQUIRED_USE} )"
+
+RDEPEND="
+   app-arch/bzip2
+   app-arch/xz-utils
+   net-misc/curl
+   sys-libs/zlib
+   auth? (
+   !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) )
+   mysql? ( dev-db/mysql-connector-c:0= )
+   sqlite? ( dev-db/sqlite:3 )
+   )
+   dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
+   !dedicated? (
+   media-libs/libpng:0
+   gtk? ( x11-libs/gtk+:3 )
+   mapimg? ( media-gfx/imagemagick:= )
+   modpack? ( x11-libs/gtk+:3 )
+   nls? ( virtual/libintl )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   !sdl? ( !gtk? ( x11-libs/gtk+:3 ) )
+   sdl? (
+   media-libs/libsdl2[video]
+   media-libs/sdl2-gfx
+   media-libs/sdl2-image[png]
+   media-libs/sdl2-ttf
+   )
+   server? ( aimodules? ( sys-devel/libtool:2 ) )
+   sound? (
+   media-libs/libsdl2[sound]
+   media-libs/sdl2-mixer[vorbis]
+   )
+   )
+   readline? ( sys-libs/readline:0= )
+   system-lua? ( ${LUA_DEPS} )
+"
+DEPEND="${RDEPEND}
+   !dedicated? ( x11-base/xorg-proto )
+"
+# postgres isn't yet really supported by upstream
+BDEPEND="
+   virtual/pkgconfig
+   !dedicated? ( nls? ( sys-devel/gettext ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+   if ! use dedicated && ! use server ; then
+   ewarn "Disabling server USE flag will make it impossible to 
start local"
+   ewarn "games, but you will still be able to join multiplayer 
games."
+   fi
+
+   use system-lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+   default
+
+   # install the .desktop in /usr/share/applications
+   # install the icons in /usr/share/pixmaps
+   sed -i \
+   -e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
+   -e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
+   -e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
+   client/Makefile.in \
+   server/Makefile.in \
+   tools/Makefile.in \
+   data/icons/Makefile.in || die
+}
+
+src_configure() {
+   local myclient=() mydatabase=() myeconfargs=()
+
+   if use auth ; then
+   if ! use mysql && ! use sqlite ; then
+ 

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

[James Le Cuirot]

commit: f2b421199a701bcf10040b3bfae21d024ac22df6
Author: Matt Jolly  footclan  ninja>
AuthorDate: Tue Mar 29 10:49:26 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Apr 14 21:34:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2b42119

games-strategy/freeciv: drop 2.6.6

Signed-off-by: Matt Jolly  footclan.ninja>
Signed-off-by: James Le Cuirot  gentoo.org>

 games-strategy/freeciv/Manifest |   1 -
 games-strategy/freeciv/freeciv-2.6.6.ebuild | 188 
 2 files changed, 189 deletions(-)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 5c49edfb6e62..fb23736138a2 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,2 +1 @@
-DIST freeciv-2.6.6.tar.bz2 52244748 BLAKE2B 
88f85b8345b0a2baaa6626a6ab0c8a68e1e7a9a189f661b4fb800572090bf999c62e64641eae36a48b5d90a988bf43b839a411a60af285fbc234e2ca20fadd0c
 SHA512 
97723d260c4e40328aaf26606a4f37871958b58a475cd3fc635edf2e94d28d486c6e28a75b42126e9e69580a60d24fc490da086877d0c912a544d643ff69b103
 DIST freeciv-3.0.0.tar.xz 33421584 BLAKE2B 
aafd69767c947b26b410e520c674604aa06b51080de35b14bab584b2baf5259fe0b11efb97601341f594d054a664cf0cbf4bb29763919a482f097823d2f024ab
 SHA512 
5c3774cc1510f1aedac0be043cb0684230e23067031ad1b88c6320a1aab1308452719950d49e25b29f8c2ee9e4e96cc40cdf89ac23609c5422c8beeccd37

diff --git a/games-strategy/freeciv/freeciv-2.6.6.ebuild 
b/games-strategy/freeciv/freeciv-2.6.6.ebuild
deleted file mode 100644
index 3f7037e7e0e1..
--- a/games-strategy/freeciv/freeciv-2.6.6.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-3 )
-
-inherit desktop lua-single qmake-utils xdg
-
-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/;
-
-if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-   SRC_URI="mirror://sourceforge/freeciv/${MY_P}.tar.bz2"
-   KEYWORDS="~amd64 ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="aimodules auth dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
-
-REQUIRED_USE="system-lua? ( ${LUA_REQUIRED_USE} )"
-
-RDEPEND="
-   app-arch/bzip2
-   app-arch/xz-utils
-   net-misc/curl
-   sys-libs/zlib
-   auth? (
-   !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) )
-   mysql? ( dev-db/mysql-connector-c:0= )
-   sqlite? ( dev-db/sqlite:3 )
-   )
-   dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
-   !dedicated? (
-   media-libs/libpng:0
-   gtk? ( x11-libs/gtk+:3 )
-   mapimg? ( media-gfx/imagemagick:= )
-   modpack? ( x11-libs/gtk+:3 )
-   nls? ( virtual/libintl )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-   !sdl? ( !gtk? ( x11-libs/gtk+:3 ) )
-   sdl? (
-   media-libs/libsdl2[video]
-   media-libs/sdl2-gfx
-   media-libs/sdl2-image[png]
-   media-libs/sdl2-ttf
-   )
-   server? ( aimodules? ( sys-devel/libtool:2 ) )
-   sound? (
-   media-libs/libsdl2[sound]
-   media-libs/sdl2-mixer[vorbis]
-   )
-   )
-   readline? ( sys-libs/readline:0= )
-   system-lua? ( ${LUA_DEPS} )
-"
-DEPEND="${RDEPEND}
-   !dedicated? ( x11-base/xorg-proto )
-"
-# postgres isn't yet really supported by upstream
-BDEPEND="
-   virtual/pkgconfig
-   !dedicated? ( nls? ( sys-devel/gettext ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-   if ! use dedicated && ! use server ; then
-   ewarn "Disabling server USE flag will make it impossible to 
start local"
-   ewarn "games, but you will still be able to join multiplayer 
games."
-   fi
-
-   use system-lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-   default
-
-   # install the .desktop in /usr/share/applications
-   # install the icons in /usr/share/pixmaps
-   sed -i \
-   -e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
-   -e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
-   -e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
-   client/Makefile.in \
-   server/Makefile.in \
-   tools/Makefile.in \
-   data/icons/Makefile.in || die
-}
-
-src_configure() {
-   local myclient=() mydatabase=() myeconfargs=()
-
-   if use auth ; then
-   if ! use mysql && ! use sqlite ; then

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

[Stefan Strogin]

commit: 55a34de981e4613a131e3a6213f7d4ffca914071
Author: Stefan Strogin  gentoo  org>
AuthorDate: Thu Feb  3 05:43:28 2022 +
Commit: Stefan Strogin  gentoo  org>
CommitDate: Thu Feb  3 05:43:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55a34de9

games-strategy/freeciv: upgrade 2.6.4 -> 2.6.6

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Stefan Strogin  gentoo.org>

 games-strategy/freeciv/Manifest   | 2 +-
 games-strategy/freeciv/{freeciv-2.6.4.ebuild => freeciv-2.6.6.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index d843e0eb4657..399242876ba6 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1 +1 @@
-DIST freeciv-2.6.4.tar.bz2 52087948 BLAKE2B 
00392974707d9a11e626ac7855fcb27780492b7bead020f6849726ad39833d9ada288bad7245664f8446d0905f027dccc205ee6c943361ba9ba455c55c52cd04
 SHA512 
4dca3a09f4538ce865f5bfef2fa0cdd00b21e30d80bd24343a6d77564bb5239101254155295ccc18593af6f9a32b77ecb8d50c38d0710a37960372e9b1227221
+DIST freeciv-2.6.6.tar.bz2 52244748 BLAKE2B 
88f85b8345b0a2baaa6626a6ab0c8a68e1e7a9a189f661b4fb800572090bf999c62e64641eae36a48b5d90a988bf43b839a411a60af285fbc234e2ca20fadd0c
 SHA512 
97723d260c4e40328aaf26606a4f37871958b58a475cd3fc635edf2e94d28d486c6e28a75b42126e9e69580a60d24fc490da086877d0c912a544d643ff69b103

diff --git a/games-strategy/freeciv/freeciv-2.6.4.ebuild 
b/games-strategy/freeciv/freeciv-2.6.6.ebuild
similarity index 99%
rename from games-strategy/freeciv/freeciv-2.6.4.ebuild
rename to games-strategy/freeciv/freeciv-2.6.6.ebuild
index e95f07c0aced..3f7037e7e0e1 100644
--- a/games-strategy/freeciv/freeciv-2.6.4.ebuild
+++ b/games-strategy/freeciv/freeciv-2.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

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

[Ionen Wolkens]

commit: 335e30dfbd1e00e8825d2fabd4ba4d4de57c65ef
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Sep 12 19:39:10 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Sep 12 20:19:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=335e30df

games-strategy/freeciv: flag-o-matic-- for UnusedInherits

Signed-off-by: Ionen Wolkens  gentoo.org>

 games-strategy/freeciv/freeciv-2.6.4.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/games-strategy/freeciv/freeciv-2.6.4.ebuild 
b/games-strategy/freeciv/freeciv-2.6.4.ebuild
index 9b33682fa13..e95f07c0ace 100644
--- a/games-strategy/freeciv/freeciv-2.6.4.ebuild
+++ b/games-strategy/freeciv/freeciv-2.6.4.ebuild
@@ -5,10 +5,11 @@ EAPI=7
 
 LUA_COMPAT=( lua5-3 )
 
+inherit desktop lua-single qmake-utils xdg
+
 MY_PV="${PV/_beta/-beta}"
 MY_PV="${MY_PV/_rc/-RC}"
 MY_P="${PN}-${MY_PV}"
-inherit desktop flag-o-matic lua-single qmake-utils xdg
 
 DESCRIPTION="Multiplayer strategy game (Civilization Clone)"
 HOMEPAGE="http://www.freeciv.org/;

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

[Sam James]

commit: cd69536ba667f4a7abc1f1dab80bcc85b6c56f19
Author: Sam James  gentoo  org>
AuthorDate: Sun Aug  1 06:46:42 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug  1 18:27:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd69536b

games-strategy/freeciv: drop obsolete qt5 C++11 workaround

Signed-off-by: Sam James  gentoo.org>

 games-strategy/freeciv/freeciv-2.6.4.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/games-strategy/freeciv/freeciv-2.6.4.ebuild 
b/games-strategy/freeciv/freeciv-2.6.4.ebuild
index 93e090d0ab5..9b33682fa13 100644
--- a/games-strategy/freeciv/freeciv-2.6.4.ebuild
+++ b/games-strategy/freeciv/freeciv-2.6.4.ebuild
@@ -74,7 +74,7 @@ BDEPEND="
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
-   if use !dedicated && use !server ; then
+   if ! use dedicated && ! use server ; then
ewarn "Disabling server USE flag will make it impossible to 
start local"
ewarn "games, but you will still be able to join multiplayer 
games."
fi
@@ -129,7 +129,6 @@ src_configure() {
if use qt5 ; then
local -x MOCCMD=$(qt5_get_bindir)/moc
myclient+=( qt )
-   append-cxxflags -std=c++11
fi
fi
myeconfargs+=(

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

[Marek Szuba]

commit: 520793f9e323a38d14456e058d69c539735e2f9d
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Jun  5 17:45:29 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Jun  5 17:48:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=520793f9

games-strategy/freeciv: migrate to lua-single.eclass

Builds and installs fine against lua5-3. Against lua5-4, src_configure
dies with
"configure: error: Use of included lua disabled, and no lua found from system"

Note: USE=system-lua is still masked for this package, leaving it up to
its maintainers to unmask it.

Closes: https://bugs.gentoo.org/752711
Signed-off-by: Marek Szuba  gentoo.org>

 games-strategy/freeciv/freeciv-2.6.4.ebuild | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/games-strategy/freeciv/freeciv-2.6.4.ebuild 
b/games-strategy/freeciv/freeciv-2.6.4.ebuild
index 93312c18dcb..93e090d0ab5 100644
--- a/games-strategy/freeciv/freeciv-2.6.4.ebuild
+++ b/games-strategy/freeciv/freeciv-2.6.4.ebuild
@@ -3,10 +3,12 @@
 
 EAPI=7
 
+LUA_COMPAT=( lua5-3 )
+
 MY_PV="${PV/_beta/-beta}"
 MY_PV="${MY_PV/_rc/-RC}"
 MY_P="${PN}-${MY_PV}"
-inherit desktop flag-o-matic qmake-utils xdg
+inherit desktop flag-o-matic lua-single qmake-utils xdg
 
 DESCRIPTION="Multiplayer strategy game (Civilization Clone)"
 HOMEPAGE="http://www.freeciv.org/;
@@ -20,6 +22,8 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="aimodules auth dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
 
+REQUIRED_USE="system-lua? ( ${LUA_REQUIRED_USE} )"
+
 RDEPEND="
app-arch/bzip2
app-arch/xz-utils
@@ -56,7 +60,7 @@ RDEPEND="
)
)
readline? ( sys-libs/readline:0= )
-   system-lua? ( >=dev-lang/lua-5.3:= )
+   system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}
!dedicated? ( x11-base/xorg-proto )
@@ -74,6 +78,8 @@ pkg_setup() {
ewarn "Disabling server USE flag will make it impossible to 
start local"
ewarn "games, but you will still be able to join multiplayer 
games."
fi
+
+   use system-lua && lua-single_pkg_setup
 }
 
 src_prepare() {

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

[Andreas Sturmlechner]

commit: da8940e3d8eef6796436dcb7d4fc624665f19a9b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat May 15 16:27:26 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May 16 19:10:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da8940e3

games-strategy/freeciv: Drop 2.6.2

Closes: https://bugs.gentoo.org/769164
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 games-strategy/freeciv/Manifest|   1 -
 .../freeciv/files/freeciv-2.6.2-qt515.patch|  39 -
 games-strategy/freeciv/freeciv-2.6.2.ebuild| 190 -
 3 files changed, 230 deletions(-)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index a42d00191c8..d843e0eb465 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,2 +1 @@
-DIST freeciv-2.6.2.tar.bz2 52139007 BLAKE2B 
5d30274f24786dcd0b29d4d85a45be47e791aedba7fbeeb28001e2c19d2acc1fa16b4ab88b779d0dbd318806e571a26c94f8a61b33c6d8df8e68d4fd90713302
 SHA512 
b11752f38027fcc8b092f323d4e76cf3c4c426bfcc811eb3a76daca075dc391d8179cd140abf1534abc56409344c53238b9fee2ee10d08a688e15671f3a70ef3
 DIST freeciv-2.6.4.tar.bz2 52087948 BLAKE2B 
00392974707d9a11e626ac7855fcb27780492b7bead020f6849726ad39833d9ada288bad7245664f8446d0905f027dccc205ee6c943361ba9ba455c55c52cd04
 SHA512 
4dca3a09f4538ce865f5bfef2fa0cdd00b21e30d80bd24343a6d77564bb5239101254155295ccc18593af6f9a32b77ecb8d50c38d0710a37960372e9b1227221

diff --git a/games-strategy/freeciv/files/freeciv-2.6.2-qt515.patch 
b/games-strategy/freeciv/files/freeciv-2.6.2-qt515.patch
deleted file mode 100644
index db5e657a585..000
--- a/games-strategy/freeciv/files/freeciv-2.6.2-qt515.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 87f4abf81d530b825d0af772d95fd1ea78503e64 Mon Sep 17 00:00:00 2001
-From: Marko Lindqvist 
-Date: Tue, 7 Apr 2020 13:22:14 +0300
-Subject: [PATCH] Include  where needed
-
-This fixes Qt-client build on OpenEmbedded
-
-See hrm Bug #868060
-
-Signed-off-by: Marko Lindqvist 

- client/gui-qt/canvas.cpp  | 1 +
- client/gui-qt/dialogs.cpp | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/client/gui-qt/canvas.cpp b/client/gui-qt/canvas.cpp
-index 24291bc183..00fa1b8f52 100644
 a/client/gui-qt/canvas.cpp
-+++ b/client/gui-qt/canvas.cpp
-@@ -18,6 +18,7 @@
- // Qt
- #include 
- #include 
-+#include 
- 
- // qt-client
- #include "canvas.h"
-diff --git a/client/gui-qt/dialogs.cpp b/client/gui-qt/dialogs.cpp
-index e0f9de31d4..4b3254c496 100644
 a/client/gui-qt/dialogs.cpp
-+++ b/client/gui-qt/dialogs.cpp
-@@ -24,6 +24,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include 

diff --git a/games-strategy/freeciv/freeciv-2.6.2.ebuild 
b/games-strategy/freeciv/freeciv-2.6.2.ebuild
deleted file mode 100644
index e361752c4a5..000
--- a/games-strategy/freeciv/freeciv-2.6.2.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV="${PV/_beta/-beta}"
-MY_PV="${MY_PV/_rc/-RC}"
-MY_P="${PN}-${MY_PV}"
-inherit desktop flag-o-matic qmake-utils xdg
-
-DESCRIPTION="multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="http://www.freeciv.org/;
-
-if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-   SRC_URI="mirror://sourceforge/freeciv/${MY_P}.tar.bz2"
-   KEYWORDS="~amd64 ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="aimodules auth dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
-
-# postgres isn't yet really supported by upstream
-BDEPEND="
-   virtual/pkgconfig
-   !dedicated? (
-   x11-base/xorg-proto
-   nls? ( sys-devel/gettext )
-   )
-"
-DEPEND="
-   app-arch/bzip2
-   app-arch/xz-utils
-   net-misc/curl
-   sys-libs/zlib
-   auth? (
-   !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) )
-   mysql? ( dev-db/mysql-connector-c:0= )
-   sqlite? ( dev-db/sqlite:3 )
-   )
-   dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
-   !dedicated? (
-   media-libs/libpng:0
-   gtk? ( x11-libs/gtk+:2 )
-   mapimg? ( media-gfx/imagemagick:= )
-   modpack? ( x11-libs/gtk+:2 )
-   nls? ( virtual/libintl )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-   !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
-   sdl? (
-   media-libs/libsdl2[video]
-   media-libs/sdl2-gfx
-   media-libs/sdl2-image[png]
-   media-libs/sdl2-ttf
-   )
-   server? ( aimodules? ( sys-devel/libtool:2 ) )
-   sound? (
- 

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

[Andreas Sturmlechner]

commit: 26984cfb5749d6fcd3858e46eeb7257d060fd372
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat May 15 12:58:14 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat May 15 16:25:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26984cfb

games-strategy/freeciv: 2.6.4 version bump

Switch to gtk+-3
Fix BDEPEND/DEPEND

Closes: https://bugs.gentoo.org/769164
Thanks-to: Patrice Levesque  ptaff.ca>
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Closes: https://github.com/gentoo/gentoo/pull/20046
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 games-strategy/freeciv/Manifest |   1 +
 games-strategy/freeciv/freeciv-2.6.4.ebuild | 182 
 2 files changed, 183 insertions(+)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index f3cf2806868..a42d00191c8 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1 +1,2 @@
 DIST freeciv-2.6.2.tar.bz2 52139007 BLAKE2B 
5d30274f24786dcd0b29d4d85a45be47e791aedba7fbeeb28001e2c19d2acc1fa16b4ab88b779d0dbd318806e571a26c94f8a61b33c6d8df8e68d4fd90713302
 SHA512 
b11752f38027fcc8b092f323d4e76cf3c4c426bfcc811eb3a76daca075dc391d8179cd140abf1534abc56409344c53238b9fee2ee10d08a688e15671f3a70ef3
+DIST freeciv-2.6.4.tar.bz2 52087948 BLAKE2B 
00392974707d9a11e626ac7855fcb27780492b7bead020f6849726ad39833d9ada288bad7245664f8446d0905f027dccc205ee6c943361ba9ba455c55c52cd04
 SHA512 
4dca3a09f4538ce865f5bfef2fa0cdd00b21e30d80bd24343a6d77564bb5239101254155295ccc18593af6f9a32b77ecb8d50c38d0710a37960372e9b1227221

diff --git a/games-strategy/freeciv/freeciv-2.6.4.ebuild 
b/games-strategy/freeciv/freeciv-2.6.4.ebuild
new file mode 100644
index 000..93312c18dcb
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.6.4.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="${PV/_beta/-beta}"
+MY_PV="${MY_PV/_rc/-RC}"
+MY_P="${PN}-${MY_PV}"
+inherit desktop flag-o-matic qmake-utils xdg
+
+DESCRIPTION="Multiplayer strategy game (Civilization Clone)"
+HOMEPAGE="http://www.freeciv.org/;
+
+if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+   SRC_URI="mirror://sourceforge/freeciv/${MY_P}.tar.bz2"
+   KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="aimodules auth dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
+
+RDEPEND="
+   app-arch/bzip2
+   app-arch/xz-utils
+   net-misc/curl
+   sys-libs/zlib
+   auth? (
+   !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) )
+   mysql? ( dev-db/mysql-connector-c:0= )
+   sqlite? ( dev-db/sqlite:3 )
+   )
+   dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
+   !dedicated? (
+   media-libs/libpng:0
+   gtk? ( x11-libs/gtk+:3 )
+   mapimg? ( media-gfx/imagemagick:= )
+   modpack? ( x11-libs/gtk+:3 )
+   nls? ( virtual/libintl )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   !sdl? ( !gtk? ( x11-libs/gtk+:3 ) )
+   sdl? (
+   media-libs/libsdl2[video]
+   media-libs/sdl2-gfx
+   media-libs/sdl2-image[png]
+   media-libs/sdl2-ttf
+   )
+   server? ( aimodules? ( sys-devel/libtool:2 ) )
+   sound? (
+   media-libs/libsdl2[sound]
+   media-libs/sdl2-mixer[vorbis]
+   )
+   )
+   readline? ( sys-libs/readline:0= )
+   system-lua? ( >=dev-lang/lua-5.3:= )
+"
+DEPEND="${RDEPEND}
+   !dedicated? ( x11-base/xorg-proto )
+"
+# postgres isn't yet really supported by upstream
+BDEPEND="
+   virtual/pkgconfig
+   !dedicated? ( nls? ( sys-devel/gettext ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+   if use !dedicated && use !server ; then
+   ewarn "Disabling server USE flag will make it impossible to 
start local"
+   ewarn "games, but you will still be able to join multiplayer 
games."
+   fi
+}
+
+src_prepare() {
+   default
+
+   # install the .desktop in /usr/share/applications
+   # install the icons in /usr/share/pixmaps
+   sed -i \
+   -e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
+   -e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
+   -e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
+   client/Makefile.in \
+   server/Makefile.in \
+   tools/Makefile.in \
+   data/icons/Makefile.in || die
+}
+
+src_configure() {
+   local myclient=() mydatabase=() myeconfargs=()
+
+   if 

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

[Andreas Sturmlechner]

commit: 8fc8c6b083f0d9ab8189b526c8b4bc434ae7f14e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 18 22:33:17 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Apr 19 07:57:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fc8c6b0

games-strategy/freeciv: Drop 2.5.12

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 games-strategy/freeciv/Manifest  |   1 -
 games-strategy/freeciv/freeciv-2.5.12.ebuild | 179 ---
 2 files changed, 180 deletions(-)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 7c6f87f354d..f3cf2806868 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,2 +1 @@
-DIST freeciv-2.5.12.tar.bz2 40983794 BLAKE2B 
53c5f9833684bef20a80c891bb001b2e03c819ba57c0989463b854fda7fe2cffe16d292e8f13f8bf8253aee0691c8ad1cb6f19522c5aae69b48165d26a0c3665
 SHA512 
bc0de8f2e63779ab0ac57b9a1dfd6ab30b4ad973c9ed1704ae7c1575ec63a695e65016f45abf5ad44b9d3818211aa351b74492783a4155cf19357b7f1dd2554d
 DIST freeciv-2.6.2.tar.bz2 52139007 BLAKE2B 
5d30274f24786dcd0b29d4d85a45be47e791aedba7fbeeb28001e2c19d2acc1fa16b4ab88b779d0dbd318806e571a26c94f8a61b33c6d8df8e68d4fd90713302
 SHA512 
b11752f38027fcc8b092f323d4e76cf3c4c426bfcc811eb3a76daca075dc391d8179cd140abf1534abc56409344c53238b9fee2ee10d08a688e15671f3a70ef3

diff --git a/games-strategy/freeciv/freeciv-2.5.12.ebuild 
b/games-strategy/freeciv/freeciv-2.5.12.ebuild
deleted file mode 100644
index 068b8162f15..000
--- a/games-strategy/freeciv/freeciv-2.5.12.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop flag-o-matic gnome2-utils ltprune
-
-DESCRIPTION="multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="http://www.freeciv.org/;
-SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
-
-# postgres isn't yet really supported by upstream
-RDEPEND="app-arch/bzip2
-   app-arch/xz-utils
-   net-misc/curl
-   sys-libs/zlib
-   auth? (
-   mysql? ( dev-db/mysql-connector-c:0= )
-   sqlite? ( dev-db/sqlite:3 )
-   !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) )
-   )
-   readline? ( sys-libs/readline:0= )
-   dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
-   !dedicated? (
-   media-libs/libpng:0
-   gtk? ( x11-libs/gtk+:2 )
-   mapimg? ( media-gfx/imagemagick:= )
-   modpack? ( x11-libs/gtk+:2 )
-   nls? ( virtual/libintl )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-   sdl? (
-   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/libsdl[sound]
-   media-libs/sdl-mixer[vorbis]
-   )
-   !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
-   )
-   system-lua? ( >=dev-lang/lua-5.2 )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   !dedicated? (
-   x11-base/xorg-proto
-   nls? ( sys-devel/gettext )
-   )"
-
-pkg_setup() {
-   if ! use dedicated && ! use server ; then
-   ewarn "Disabling server USE flag will make it impossible"
-   ewarn "to start local games, but you will still be able to"
-   ewarn "join multiplayer games."
-   fi
-}
-
-src_prepare() {
-   default
-
-   eautoreconf
-
-   # install the .desktop in /usr/share/applications
-   # install the icons in /usr/share/pixmaps
-   sed -i \
-   -e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
-   -e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
-   -e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
-   client/Makefile.in \
-   server/Makefile.in \
-   tools/Makefile.in \
-   data/icons/Makefile.in || die
-   sed -i -e 's/=SDL/=X-SDL/' bootstrap/freeciv-sdl.desktop.in || die
-}
-
-src_configure() {
-   local myclient mydatabase myeconfargs
-
-   if use auth ; then
-   if ! use mysql && ! use sqlite ; then
-   einfo "No database backend chosen, defaulting"
-   einfo "to mysql!"
-   mydatabase=mysql
-   else

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

[David Seifert]

commit: 4c84e7768bd1cc84c02f38dacb55b900e45eda43
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 16 10:12:54 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Apr 16 10:12:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c84e776

games-strategy/freeciv: eutils->desktop

Signed-off-by: Sam James  gentoo.org>
Signed-off-by: David Seifert  gentoo.org>

 games-strategy/freeciv/freeciv-2.5.12.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/games-strategy/freeciv/freeciv-2.5.12.ebuild 
b/games-strategy/freeciv/freeciv-2.5.12.ebuild
index 4e4d76e3938..068b8162f15 100644
--- a/games-strategy/freeciv/freeciv-2.5.12.ebuild
+++ b/games-strategy/freeciv/freeciv-2.5.12.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils flag-o-matic gnome2-utils ltprune
+inherit autotools desktop flag-o-matic gnome2-utils ltprune
 
 DESCRIPTION="multiplayer strategy game (Civilization Clone)"
 HOMEPAGE="http://www.freeciv.org/;
@@ -58,7 +58,7 @@ DEPEND="${RDEPEND}
)"
 
 pkg_setup() {
-   if use !dedicated && use !server ; then
+   if ! use dedicated && ! use server ; then
ewarn "Disabling server USE flag will make it impossible"
ewarn "to start local games, but you will still be able to"
ewarn "join multiplayer games."

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

[Andreas Sturmlechner]

commit: b2dcda6e1c4d2db4ada1e73f014860353977874f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov 24 00:59:17 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov 24 00:59:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2dcda6e

games-strategy/freeciv: Fix path to Qt5 moc with qmake-utils.eclass

Closes: https://bugs.gentoo.org/756262
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 games-strategy/freeciv/freeciv-2.6.2.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/games-strategy/freeciv/freeciv-2.6.2.ebuild 
b/games-strategy/freeciv/freeciv-2.6.2.ebuild
index 1b61b770630..e361752c4a5 100644
--- a/games-strategy/freeciv/freeciv-2.6.2.ebuild
+++ b/games-strategy/freeciv/freeciv-2.6.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PV="${PV/_beta/-beta}"
 MY_PV="${MY_PV/_rc/-RC}"
 MY_P="${PN}-${MY_PV}"
-inherit desktop flag-o-matic xdg
+inherit desktop flag-o-matic qmake-utils xdg
 
 DESCRIPTION="multiplayer strategy game (Civilization Clone)"
 HOMEPAGE="http://www.freeciv.org/;
@@ -129,6 +129,7 @@ src_configure() {
use sdl && myclient+=( sdl2 )
use gtk && myclient+=( gtk2 )
if use qt5 ; then
+   local -x MOCCMD=$(qt5_get_bindir)/moc
myclient+=( qt )
append-cxxflags -std=c++11
fi

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

[Sergei Trofimovich]

commit: c97552cb6715eb40ebe5b787924d49d2d265e7db
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Nov 21 21:59:33 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Nov 21 21:59:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c97552cb

games-strategy/freeciv: keyworded 2.6.2 for ppc64

keyworded wrt bug #748573 (KEYWORDREQ)
Tested-by: ernsteiswuerfel
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-strategy/freeciv/freeciv-2.6.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/freeciv/freeciv-2.6.2.ebuild 
b/games-strategy/freeciv/freeciv-2.6.2.ebuild
index 2b5d791692c..1b61b770630 100644
--- a/games-strategy/freeciv/freeciv-2.6.2.ebuild
+++ b/games-strategy/freeciv/freeciv-2.6.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.freeciv.org/;
 
 if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
SRC_URI="mirror://sourceforge/freeciv/${MY_P}.tar.bz2"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-2+"

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

[Lars Wendler]

commit: 16538e4c1056d7b60eeaa695a0c2139db8a65858
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Jun 14 17:00:34 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Jun 14 17:00:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16538e4c

games-strategy/freeciv: Fixed build against qt-5.15

Closes: https://bugs.gentoo.org/728254
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Lars Wendler  gentoo.org>

 .../freeciv/files/freeciv-2.6.2-qt515.patch| 39 ++
 games-strategy/freeciv/freeciv-2.6.2.ebuild|  4 +++
 2 files changed, 43 insertions(+)

diff --git a/games-strategy/freeciv/files/freeciv-2.6.2-qt515.patch 
b/games-strategy/freeciv/files/freeciv-2.6.2-qt515.patch
new file mode 100644
index 000..db5e657a585
--- /dev/null
+++ b/games-strategy/freeciv/files/freeciv-2.6.2-qt515.patch
@@ -0,0 +1,39 @@
+From 87f4abf81d530b825d0af772d95fd1ea78503e64 Mon Sep 17 00:00:00 2001
+From: Marko Lindqvist 
+Date: Tue, 7 Apr 2020 13:22:14 +0300
+Subject: [PATCH] Include  where needed
+
+This fixes Qt-client build on OpenEmbedded
+
+See hrm Bug #868060
+
+Signed-off-by: Marko Lindqvist 
+---
+ client/gui-qt/canvas.cpp  | 1 +
+ client/gui-qt/dialogs.cpp | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/client/gui-qt/canvas.cpp b/client/gui-qt/canvas.cpp
+index 24291bc183..00fa1b8f52 100644
+--- a/client/gui-qt/canvas.cpp
 b/client/gui-qt/canvas.cpp
+@@ -18,6 +18,7 @@
+ // Qt
+ #include 
+ #include 
++#include 
+ 
+ // qt-client
+ #include "canvas.h"
+diff --git a/client/gui-qt/dialogs.cpp b/client/gui-qt/dialogs.cpp
+index e0f9de31d4..4b3254c496 100644
+--- a/client/gui-qt/dialogs.cpp
 b/client/gui-qt/dialogs.cpp
+@@ -24,6 +24,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 

diff --git a/games-strategy/freeciv/freeciv-2.6.2.ebuild 
b/games-strategy/freeciv/freeciv-2.6.2.ebuild
index e8166766834..2b5d791692c 100644
--- a/games-strategy/freeciv/freeciv-2.6.2.ebuild
+++ b/games-strategy/freeciv/freeciv-2.6.2.ebuild
@@ -70,6 +70,10 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+   "${FILESDIR}/${P}-qt515.patch" #728254
+)
+
 pkg_setup() {
if use !dedicated && use !server ; then
ewarn "Disabling server USE flag will make it impossible"

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

[James Le Cuirot]

commit: 8f93769b9dcd9903f11b9e13774d9a7d81c6b920
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Mar  8 21:43:35 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Mar  8 21:43:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f93769b

games-strategy/freeciv: Drop old 2.6.1

Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: James Le Cuirot  gentoo.org>

 games-strategy/freeciv/Manifest |   1 -
 games-strategy/freeciv/freeciv-2.6.1.ebuild | 184 
 2 files changed, 185 deletions(-)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 1e0f51f78f2..7c6f87f354d 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,3 +1,2 @@
 DIST freeciv-2.5.12.tar.bz2 40983794 BLAKE2B 
53c5f9833684bef20a80c891bb001b2e03c819ba57c0989463b854fda7fe2cffe16d292e8f13f8bf8253aee0691c8ad1cb6f19522c5aae69b48165d26a0c3665
 SHA512 
bc0de8f2e63779ab0ac57b9a1dfd6ab30b4ad973c9ed1704ae7c1575ec63a695e65016f45abf5ad44b9d3818211aa351b74492783a4155cf19357b7f1dd2554d
-DIST freeciv-2.6.1.tar.bz2 51915573 BLAKE2B 
160df7f59a5d2ab8090132df5c690ee96ce6811ad0644341ba07b1bc2e4c30ef4e60ead57d17a7d0f722e42c204d839264830c7b423ccc393b7e7b30c30b
 SHA512 
44145eaea96d5ab4f18e843102209d0f88a626af37365cf91b5e592bcac45f2692a7e21e9b3454a3ee4b9099212f5826a4687931bb37dabbb7dedad059df1cb4
 DIST freeciv-2.6.2.tar.bz2 52139007 BLAKE2B 
5d30274f24786dcd0b29d4d85a45be47e791aedba7fbeeb28001e2c19d2acc1fa16b4ab88b779d0dbd318806e571a26c94f8a61b33c6d8df8e68d4fd90713302
 SHA512 
b11752f38027fcc8b092f323d4e76cf3c4c426bfcc811eb3a76daca075dc391d8179cd140abf1534abc56409344c53238b9fee2ee10d08a688e15671f3a70ef3

diff --git a/games-strategy/freeciv/freeciv-2.6.1.ebuild 
b/games-strategy/freeciv/freeciv-2.6.1.ebuild
deleted file mode 100644
index 764443f246c..000
--- a/games-strategy/freeciv/freeciv-2.6.1.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV="${PV/_beta/-beta}"
-MY_PV="${MY_PV/_rc/-RC}"
-MY_P="${PN}-${MY_PV}"
-inherit desktop flag-o-matic xdg
-
-DESCRIPTION="multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="http://www.freeciv.org/;
-
-if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-   SRC_URI="mirror://sourceforge/freeciv/${MY_P}.tar.bz2"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="aimodules auth dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
-
-# postgres isn't yet really supported by upstream
-BDEPEND="
-   virtual/pkgconfig
-   !dedicated? (
-   x11-base/xorg-proto
-   nls? ( sys-devel/gettext )
-   )
-"
-DEPEND="
-   app-arch/bzip2
-   app-arch/xz-utils
-   net-misc/curl
-   sys-libs/zlib
-   auth? (
-   !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) )
-   mysql? ( dev-db/mysql-connector-c:0= )
-   sqlite? ( dev-db/sqlite:3 )
-   )
-   dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
-   !dedicated? (
-   media-libs/libpng:0
-   gtk? ( x11-libs/gtk+:2 )
-   mapimg? ( media-gfx/imagemagick:= )
-   modpack? ( x11-libs/gtk+:2 )
-   nls? ( virtual/libintl )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-   !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
-   sdl? (
-   media-libs/libsdl2[video]
-   media-libs/sdl2-gfx
-   media-libs/sdl2-image[png]
-   media-libs/sdl2-ttf
-   )
-   server? ( aimodules? ( sys-devel/libtool:2 ) )
-   sound? (
-   media-libs/libsdl2[sound]
-   media-libs/sdl2-mixer[vorbis]
-   )
-   )
-   readline? ( sys-libs/readline:0= )
-   system-lua? ( >=dev-lang/lua-5.3:= )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-   if use !dedicated && use !server ; then
-   ewarn "Disabling server USE flag will make it impossible"
-   ewarn "to start local games, but you will still be able to"
-   ewarn "join multiplayer games."
-   fi
-}
-
-src_prepare() {
-   default
-
-   # install the .desktop in /usr/share/applications
-   # install the icons in /usr/share/pixmaps
-   sed -i \
-   -e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
-   -e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
-   -e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
-   client/Makefile.in \
-   server/Makefile.in \
-   

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

[James Le Cuirot]

commit: e5adf0ab1c81659ccf7c28261cf7f16fdd038299
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Fri Mar  6 07:48:50 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Mar  8 21:42:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5adf0ab

games-strategy/freeciv: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14843
Signed-off-by: James Le Cuirot  gentoo.org>

 .../files/freeciv-2.5.11-freetype_pkgconfig.patch  | 242 -
 1 file changed, 242 deletions(-)

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
deleted file mode 100644
index d2b321dde27..000
--- a/games-strategy/freeciv/files/freeciv-2.5.11-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,242 +0,0 @@
-From f2eafd087a20b4236c1f2f1324e8644cb5055bf9 Mon Sep 17 00:00:00 2001
-From: Lars Wendler 
-Date: Wed, 16 May 2018 20:41:22 +0200
-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 +-
- 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..00
 a/m4/freetype2.m4
-+++ /dev/null
-@@ -1,194 +0,0 @@
--# Configure paths for FreeType2
--# Marcelo Magallon 2001-10-26, based on gtk.m4 by Owen Taylor
--#
--# Copyright 2001, 2003, 2007, 2009 by
--# David Turner, Robert Wilhelm, and Werner Lemberg.
--#
--# This file is part of the FreeType project, and may only be used, modified,
--# and distributed under the terms of the FreeType project license,
--# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
--# indicate that you have read the license and understand and accept it
--# fully.
--#
--# As a special exception to the FreeType project license, this file may be
--# distributed as part of a program that contains a configuration script
--# generated by Autoconf, under the same distribution terms as the rest of
--# that program.
--#
--# serial 3
--
--# AC_CHECK_FT2([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
--# Test for FreeType 2, and define FT2_CFLAGS and FT2_LIBS.
--# MINIMUM-VERSION is what libtool reports; the default is `7.0.1' (this is
--# FreeType 2.0.4).
--#
--AC_DEFUN([AC_CHECK_FT2],
--  [# Get the cflags and libraries from the freetype-config script
--   #
--   AC_ARG_WITH([ft-prefix],
-- dnl don't quote AS_HELP_STRING!
-- AS_HELP_STRING([--with-ft-prefix=PREFIX],
--[Prefix where FreeType is installed (optional)]),
-- [ft_config_prefix="$withval"],
-- [ft_config_prefix=""])
--
--   AC_ARG_WITH([ft-exec-prefix],
-- dnl don't quote AS_HELP_STRING!
-- AS_HELP_STRING([--with-ft-exec-prefix=PREFIX],
--[Exec prefix where FreeType is installed (optional)]),
-- [ft_config_exec_prefix="$withval"],
-- [ft_config_exec_prefix=""])
--
--   AC_ARG_ENABLE([freetypetest],
-- dnl don't quote AS_HELP_STRING!
-- AS_HELP_STRING([--disable-freetypetest],
--[Do not try to compile and run a test FreeType program]),
-- [],
-- [enable_fttest=yes])
--
--   if test x$ft_config_exec_prefix != x ; then
-- ft_config_args="$ft_config_args --exec-prefix=$ft_config_exec_prefix"
-- if test x${FT2_CONFIG+set} != xset ; then
--   FT2_CONFIG=$ft_config_exec_prefix/bin/freetype-config
-- fi
--   fi
--
--   if test x$ft_config_prefix != x ; then
-- ft_config_args="$ft_config_args --prefix=$ft_config_prefix"
-- if test x${FT2_CONFIG+set} != xset ; then
--   FT2_CONFIG=$ft_config_prefix/bin/freetype-config
-- fi
--   fi
--
--   if test "x$FT2_CONFIG" = x ; then
-- AC_PATH_PROG([FT2_CONFIG], [freetype-config], [no])
--   fi
--
--   min_ft_version=m4_if([$1], [], [7.0.1], [$1])
--   AC_MSG_CHECKING([for FreeType -- version >= $min_ft_version])
--   no_ft=""
--   if test "$FT2_CONFIG" = "no" ; then
-- no_ft=yes
--   else
-- FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags`
-- FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs`
-- ft_config_major_version=`$FT2_CONFIG 

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

[Lars Wendler]

commit: 1c541fcb6dbcbf9300809ab0339392d3f94d32ee
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Feb 19 13:24:29 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Feb 19 13:24:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c541fcb

games-strategy/freeciv: "|| die" where QA wants it

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Lars Wendler  gentoo.org>

 games-strategy/freeciv/freeciv-2.6.2.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/games-strategy/freeciv/freeciv-2.6.2.ebuild 
b/games-strategy/freeciv/freeciv-2.6.2.ebuild
index dfdabbce68c..e8166766834 100644
--- a/games-strategy/freeciv/freeciv-2.6.2.ebuild
+++ b/games-strategy/freeciv/freeciv-2.6.2.ebuild
@@ -158,8 +158,8 @@ src_install() {
default
 
if use dedicated ; then
-   rm -rf "${ED}"/usr/share/pixmaps
-   rm -f 
"${ED}"/usr/share/man/man6/freeciv-{client,gtk2,gtk3,modpack,qt,sdl,xaw}*
+   rm -rf "${ED}"/usr/share/pixmaps || die
+   rm -f 
"${ED}"/usr/share/man/man6/freeciv-{client,gtk2,gtk3,modpack,qt,sdl,xaw}* || die
else
if use server ; then
# Create and install the html manual. It can't be done 
for dedicated
@@ -178,8 +178,8 @@ src_install() {
fi
rm -f "${ED}"/usr/share/man/man6/freeciv-xaw*
fi
-   find "${ED}" -name "freeciv-manual*" -delete
+   find "${ED}" -name "freeciv-manual*" -delete || die
 
-   rm -f "${ED}/usr/$(get_libdir)"/*.a
+   rm -f "${ED}/usr/$(get_libdir)"/*.a || die
find "${ED}" -type f -name "*.la" -delete || die
 }

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

[Lars Wendler]

commit: 510bc3d8e3dc1c88f39e1c57a0edaf3c5678ad19
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Feb 19 12:49:15 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Feb 19 12:49:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=510bc3d8

games-strategy/freeciv: Removed old

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Lars Wendler  gentoo.org>

 games-strategy/freeciv/Manifest |   2 -
 games-strategy/freeciv/freeciv-2.5.11-r1.ebuild | 183 ---
 games-strategy/freeciv/freeciv-2.6.0-r1.ebuild  | 184 
 3 files changed, 369 deletions(-)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 75bf4a2b689..1e0f51f78f2 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,5 +1,3 @@
-DIST freeciv-2.5.11.tar.bz2 40940090 BLAKE2B 
dfc1e714e1a3122335f555c2e57352726bda60dc0d1700b0d8ae937c85cba6beb0b2a6ffa6266b77437934ed85f1740f319c379a10c217161ee147f2339a50d3
 SHA512 
f5eac2fc2b7e09b9fd3b8b45145a5359f8216aef49050c692893d30584000c7db2f2a6e66ac19e67186e2653efaa0aa7656abefe2d2de25d123e9a52ce604456
 DIST freeciv-2.5.12.tar.bz2 40983794 BLAKE2B 
53c5f9833684bef20a80c891bb001b2e03c819ba57c0989463b854fda7fe2cffe16d292e8f13f8bf8253aee0691c8ad1cb6f19522c5aae69b48165d26a0c3665
 SHA512 
bc0de8f2e63779ab0ac57b9a1dfd6ab30b4ad973c9ed1704ae7c1575ec63a695e65016f45abf5ad44b9d3818211aa351b74492783a4155cf19357b7f1dd2554d
-DIST freeciv-2.6.0.tar.bz2 51912466 BLAKE2B 
180fa8900af6763ecae9190ce24799a77b8504d98081e48600c16c19e814b2ff1ef01ce6a41cb1a1739f848895e1551ba158f0357602f758e76b9ee6e0104a36
 SHA512 
658f05ed32a2045eeeadd1e12f88df927378f8032292e709af78f24c2dbc6019ba45ce67e4fe24001a9e70756c68126a313607a81e7009270ad255d7c9fe75d8
 DIST freeciv-2.6.1.tar.bz2 51915573 BLAKE2B 
160df7f59a5d2ab8090132df5c690ee96ce6811ad0644341ba07b1bc2e4c30ef4e60ead57d17a7d0f722e42c204d839264830c7b423ccc393b7e7b30c30b
 SHA512 
44145eaea96d5ab4f18e843102209d0f88a626af37365cf91b5e592bcac45f2692a7e21e9b3454a3ee4b9099212f5826a4687931bb37dabbb7dedad059df1cb4
 DIST freeciv-2.6.2.tar.bz2 52139007 BLAKE2B 
5d30274f24786dcd0b29d4d85a45be47e791aedba7fbeeb28001e2c19d2acc1fa16b4ab88b779d0dbd318806e571a26c94f8a61b33c6d8df8e68d4fd90713302
 SHA512 
b11752f38027fcc8b092f323d4e76cf3c4c426bfcc811eb3a76daca075dc391d8179cd140abf1534abc56409344c53238b9fee2ee10d08a688e15671f3a70ef3

diff --git a/games-strategy/freeciv/freeciv-2.5.11-r1.ebuild 
b/games-strategy/freeciv/freeciv-2.5.11-r1.ebuild
deleted file mode 100644
index 6428dc82064..000
--- a/games-strategy/freeciv/freeciv-2.5.11-r1.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic gnome2-utils ltprune
-
-DESCRIPTION="multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="http://www.freeciv.org/;
-SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
-
-# postgres isn't yet really supported by upstream
-RDEPEND="app-arch/bzip2
-   app-arch/xz-utils
-   net-misc/curl
-   sys-libs/zlib
-   auth? (
-   mysql? ( dev-db/mysql-connector-c:0= )
-   sqlite? ( dev-db/sqlite:3 )
-   !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) )
-   )
-   readline? ( sys-libs/readline:0= )
-   dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
-   !dedicated? (
-   media-libs/libpng:0
-   gtk? ( x11-libs/gtk+:2 )
-   mapimg? ( media-gfx/imagemagick:= )
-   modpack? ( x11-libs/gtk+:2 )
-   nls? ( virtual/libintl )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-   sdl? (
-   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/libsdl[sound]
-   media-libs/sdl-mixer[vorbis]
-   )
-   !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
-   )
-   system-lua? ( >=dev-lang/lua-5.2 )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   !dedicated? (
-   x11-base/xorg-proto
-   nls? ( sys-devel/gettext )
-   )"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.5.11-freetype_pkgconfig.patch"
-)
-
-pkg_setup() {
-   if use !dedicated && use !server ; then
-   ewarn "Disabling server USE flag will make it impossible"
-   ewarn "to 

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

[Lars Wendler]

commit: 3c8f8c10c7edd330df859ed7f00509cf0beb9c59
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Feb 19 12:48:29 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Feb 19 12:49:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c8f8c10

games-strategy/freeciv: Bump to version 2.6.2

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Lars Wendler  gentoo.org>

 games-strategy/freeciv/Manifest |   1 +
 games-strategy/freeciv/freeciv-2.6.2.ebuild | 185 
 2 files changed, 186 insertions(+)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 430823d3ab4..75bf4a2b689 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -2,3 +2,4 @@ DIST freeciv-2.5.11.tar.bz2 40940090 BLAKE2B 
dfc1e714e1a3122335f555c2e57352726bd
 DIST freeciv-2.5.12.tar.bz2 40983794 BLAKE2B 
53c5f9833684bef20a80c891bb001b2e03c819ba57c0989463b854fda7fe2cffe16d292e8f13f8bf8253aee0691c8ad1cb6f19522c5aae69b48165d26a0c3665
 SHA512 
bc0de8f2e63779ab0ac57b9a1dfd6ab30b4ad973c9ed1704ae7c1575ec63a695e65016f45abf5ad44b9d3818211aa351b74492783a4155cf19357b7f1dd2554d
 DIST freeciv-2.6.0.tar.bz2 51912466 BLAKE2B 
180fa8900af6763ecae9190ce24799a77b8504d98081e48600c16c19e814b2ff1ef01ce6a41cb1a1739f848895e1551ba158f0357602f758e76b9ee6e0104a36
 SHA512 
658f05ed32a2045eeeadd1e12f88df927378f8032292e709af78f24c2dbc6019ba45ce67e4fe24001a9e70756c68126a313607a81e7009270ad255d7c9fe75d8
 DIST freeciv-2.6.1.tar.bz2 51915573 BLAKE2B 
160df7f59a5d2ab8090132df5c690ee96ce6811ad0644341ba07b1bc2e4c30ef4e60ead57d17a7d0f722e42c204d839264830c7b423ccc393b7e7b30c30b
 SHA512 
44145eaea96d5ab4f18e843102209d0f88a626af37365cf91b5e592bcac45f2692a7e21e9b3454a3ee4b9099212f5826a4687931bb37dabbb7dedad059df1cb4
+DIST freeciv-2.6.2.tar.bz2 52139007 BLAKE2B 
5d30274f24786dcd0b29d4d85a45be47e791aedba7fbeeb28001e2c19d2acc1fa16b4ab88b779d0dbd318806e571a26c94f8a61b33c6d8df8e68d4fd90713302
 SHA512 
b11752f38027fcc8b092f323d4e76cf3c4c426bfcc811eb3a76daca075dc391d8179cd140abf1534abc56409344c53238b9fee2ee10d08a688e15671f3a70ef3

diff --git a/games-strategy/freeciv/freeciv-2.6.2.ebuild 
b/games-strategy/freeciv/freeciv-2.6.2.ebuild
new file mode 100644
index 000..dfdabbce68c
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.6.2.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="${PV/_beta/-beta}"
+MY_PV="${MY_PV/_rc/-RC}"
+MY_P="${PN}-${MY_PV}"
+inherit desktop flag-o-matic xdg
+
+DESCRIPTION="multiplayer strategy game (Civilization Clone)"
+HOMEPAGE="http://www.freeciv.org/;
+
+if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+   SRC_URI="mirror://sourceforge/freeciv/${MY_P}.tar.bz2"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="aimodules auth dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
+
+# postgres isn't yet really supported by upstream
+BDEPEND="
+   virtual/pkgconfig
+   !dedicated? (
+   x11-base/xorg-proto
+   nls? ( sys-devel/gettext )
+   )
+"
+DEPEND="
+   app-arch/bzip2
+   app-arch/xz-utils
+   net-misc/curl
+   sys-libs/zlib
+   auth? (
+   !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) )
+   mysql? ( dev-db/mysql-connector-c:0= )
+   sqlite? ( dev-db/sqlite:3 )
+   )
+   dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
+   !dedicated? (
+   media-libs/libpng:0
+   gtk? ( x11-libs/gtk+:2 )
+   mapimg? ( media-gfx/imagemagick:= )
+   modpack? ( x11-libs/gtk+:2 )
+   nls? ( virtual/libintl )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
+   sdl? (
+   media-libs/libsdl2[video]
+   media-libs/sdl2-gfx
+   media-libs/sdl2-image[png]
+   media-libs/sdl2-ttf
+   )
+   server? ( aimodules? ( sys-devel/libtool:2 ) )
+   sound? (
+   media-libs/libsdl2[sound]
+   media-libs/sdl2-mixer[vorbis]
+   )
+   )
+   readline? ( sys-libs/readline:0= )
+   system-lua? ( >=dev-lang/lua-5.3:= )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+   if use !dedicated && use !server ; then
+   ewarn "Disabling server USE flag will make it impossible"
+   ewarn "to start local games, but you will still be able to"
+   ewarn "join multiplayer games."
+   fi
+}
+
+src_prepare() {
+   default
+
+   # install the .desktop in /usr/share/applications
+   

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

[Lars Wendler]

commit: 38d2bc9d62e4703107619731e409093d3f0aebf4
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Dec 28 11:53:02 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Dec 28 11:53:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38d2bc9d

games-strategy/freeciv: Bump to version 2.5.12 and 2.6.1

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Lars Wendler  gentoo.org>

 games-strategy/freeciv/Manifest  |   2 +
 games-strategy/freeciv/freeciv-2.5.12.ebuild | 179 ++
 games-strategy/freeciv/freeciv-2.6.1.ebuild  | 184 +++
 3 files changed, 365 insertions(+)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index b5c5d316432..430823d3ab4 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,2 +1,4 @@
 DIST freeciv-2.5.11.tar.bz2 40940090 BLAKE2B 
dfc1e714e1a3122335f555c2e57352726bda60dc0d1700b0d8ae937c85cba6beb0b2a6ffa6266b77437934ed85f1740f319c379a10c217161ee147f2339a50d3
 SHA512 
f5eac2fc2b7e09b9fd3b8b45145a5359f8216aef49050c692893d30584000c7db2f2a6e66ac19e67186e2653efaa0aa7656abefe2d2de25d123e9a52ce604456
+DIST freeciv-2.5.12.tar.bz2 40983794 BLAKE2B 
53c5f9833684bef20a80c891bb001b2e03c819ba57c0989463b854fda7fe2cffe16d292e8f13f8bf8253aee0691c8ad1cb6f19522c5aae69b48165d26a0c3665
 SHA512 
bc0de8f2e63779ab0ac57b9a1dfd6ab30b4ad973c9ed1704ae7c1575ec63a695e65016f45abf5ad44b9d3818211aa351b74492783a4155cf19357b7f1dd2554d
 DIST freeciv-2.6.0.tar.bz2 51912466 BLAKE2B 
180fa8900af6763ecae9190ce24799a77b8504d98081e48600c16c19e814b2ff1ef01ce6a41cb1a1739f848895e1551ba158f0357602f758e76b9ee6e0104a36
 SHA512 
658f05ed32a2045eeeadd1e12f88df927378f8032292e709af78f24c2dbc6019ba45ce67e4fe24001a9e70756c68126a313607a81e7009270ad255d7c9fe75d8
+DIST freeciv-2.6.1.tar.bz2 51915573 BLAKE2B 
160df7f59a5d2ab8090132df5c690ee96ce6811ad0644341ba07b1bc2e4c30ef4e60ead57d17a7d0f722e42c204d839264830c7b423ccc393b7e7b30c30b
 SHA512 
44145eaea96d5ab4f18e843102209d0f88a626af37365cf91b5e592bcac45f2692a7e21e9b3454a3ee4b9099212f5826a4687931bb37dabbb7dedad059df1cb4

diff --git a/games-strategy/freeciv/freeciv-2.5.12.ebuild 
b/games-strategy/freeciv/freeciv-2.5.12.ebuild
new file mode 100644
index 000..bbb7332dc8e
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.5.12.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools 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"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
+
+# postgres isn't yet really supported by upstream
+RDEPEND="app-arch/bzip2
+   app-arch/xz-utils
+   net-misc/curl
+   sys-libs/zlib
+   auth? (
+   mysql? ( dev-db/mysql-connector-c:0= )
+   sqlite? ( dev-db/sqlite:3 )
+   !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) )
+   )
+   readline? ( sys-libs/readline:0= )
+   dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
+   !dedicated? (
+   media-libs/libpng:0
+   gtk? ( x11-libs/gtk+:2 )
+   mapimg? ( media-gfx/imagemagick:= )
+   modpack? ( x11-libs/gtk+:2 )
+   nls? ( virtual/libintl )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   sdl? (
+   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/libsdl[sound]
+   media-libs/sdl-mixer[vorbis]
+   )
+   !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
+   )
+   system-lua? ( >=dev-lang/lua-5.2 )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   !dedicated? (
+   x11-base/xorg-proto
+   nls? ( sys-devel/gettext )
+   )"
+
+pkg_setup() {
+   if use !dedicated && use !server ; then
+   ewarn "Disabling server USE flag will make it impossible"
+   ewarn "to start local games, but you will still be able to"
+   ewarn "join multiplayer games."
+   fi
+}
+
+src_prepare() {
+   default
+
+   eautoreconf
+
+   # install the .desktop in /usr/share/applications
+   # install the icons in /usr/share/pixmaps
+   sed -i \
+   -e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
+   -e 

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

[Brian Evans]

commit: 92128074a8022460f0f8137a51ddf771318a042e
Author: Brian Evans  gentoo  org>
AuthorDate: Sun Feb 24 20:42:26 2019 +
Commit: Brian Evans  gentoo  org>
CommitDate: Sun Feb 24 20:42:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92128074

games-strategy/freeciv: Revbump for dependency change

Non-maintainer commit

Closes: https://bugs.gentoo.org/665898
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Brian Evans  gentoo.org>

 .../freeciv/{freeciv-2.5.11.ebuild => freeciv-2.5.11-r1.ebuild} | 6 +++---
 .../freeciv/{freeciv-2.6.0.ebuild => freeciv-2.6.0-r1.ebuild}   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/games-strategy/freeciv/freeciv-2.5.11.ebuild 
b/games-strategy/freeciv/freeciv-2.5.11-r1.ebuild
similarity index 97%
rename from games-strategy/freeciv/freeciv-2.5.11.ebuild
rename to games-strategy/freeciv/freeciv-2.5.11-r1.ebuild
index 149823db319..4d18546bd9f 100644
--- a/games-strategy/freeciv/freeciv-2.5.11.ebuild
+++ b/games-strategy/freeciv/freeciv-2.5.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,9 +19,9 @@ RDEPEND="app-arch/bzip2
net-misc/curl
sys-libs/zlib
auth? (
-   mysql? ( virtual/mysql )
+   mysql? ( dev-db/mysql-connector-c:0= )
sqlite? ( dev-db/sqlite:3 )
-   !mysql? ( ( !sqlite? ( virtual/mysql ) ) )
+   !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) )
)
readline? ( sys-libs/readline:0= )
dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )

diff --git a/games-strategy/freeciv/freeciv-2.6.0.ebuild 
b/games-strategy/freeciv/freeciv-2.6.0-r1.ebuild
similarity index 97%
rename from games-strategy/freeciv/freeciv-2.6.0.ebuild
rename to games-strategy/freeciv/freeciv-2.6.0-r1.ebuild
index 1debea6e424..764443f246c 100644
--- a/games-strategy/freeciv/freeciv-2.6.0.ebuild
+++ b/games-strategy/freeciv/freeciv-2.6.0-r1.ebuild
@@ -34,8 +34,8 @@ DEPEND="
net-misc/curl
sys-libs/zlib
auth? (
-   !mysql? ( ( !sqlite? ( virtual/mysql ) ) )
-   mysql? ( virtual/mysql )
+   !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) )
+   mysql? ( dev-db/mysql-connector-c:0= )
sqlite? ( dev-db/sqlite:3 )
)
dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )

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

[Andreas Sturmlechner]

commit: ac6606a5c80419ccc42becc2d5f0e7983a5d543e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Feb 14 21:11:24 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb 14 23:06:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac6606a5

games-strategy/freeciv: Switch from gnome2-utils to xdg, EAPI-7 bump

Add missing desktop.eclass.

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 games-strategy/freeciv/freeciv-2.6.0.ebuild | 63 +
 1 file changed, 28 insertions(+), 35 deletions(-)

diff --git a/games-strategy/freeciv/freeciv-2.6.0.ebuild 
b/games-strategy/freeciv/freeciv-2.6.0.ebuild
index 1bf520d364f..1debea6e424 100644
--- a/games-strategy/freeciv/freeciv-2.6.0.ebuild
+++ b/games-strategy/freeciv/freeciv-2.6.0.ebuild
@@ -1,35 +1,43 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit flag-o-matic gnome2-utils xdg-utils
+EAPI=7
 
 MY_PV="${PV/_beta/-beta}"
 MY_PV="${MY_PV/_rc/-RC}"
 MY_P="${PN}-${MY_PV}"
+inherit desktop flag-o-matic xdg
 
 DESCRIPTION="multiplayer strategy game (Civilization Clone)"
 HOMEPAGE="http://www.freeciv.org/;
-SRC_URI="mirror://sourceforge/freeciv/${MY_P}.tar.bz2"
 
-LICENSE="GPL-2+"
-SLOT="0"
 if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+   SRC_URI="mirror://sourceforge/freeciv/${MY_P}.tar.bz2"
KEYWORDS="~amd64 ~x86"
 fi
-IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="aimodules auth dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
 
 # postgres isn't yet really supported by upstream
-RDEPEND="app-arch/bzip2
+BDEPEND="
+   virtual/pkgconfig
+   !dedicated? (
+   x11-base/xorg-proto
+   nls? ( sys-devel/gettext )
+   )
+"
+DEPEND="
+   app-arch/bzip2
app-arch/xz-utils
net-misc/curl
sys-libs/zlib
auth? (
+   !mysql? ( ( !sqlite? ( virtual/mysql ) ) )
mysql? ( virtual/mysql )
sqlite? ( dev-db/sqlite:3 )
-   !mysql? ( ( !sqlite? ( virtual/mysql ) ) )
)
-   readline? ( sys-libs/readline:0= )
dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
!dedicated? (
media-libs/libpng:0
@@ -42,6 +50,7 @@ RDEPEND="app-arch/bzip2
dev-qt/qtgui:5
dev-qt/qtwidgets:5
)
+   !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
sdl? (
media-libs/libsdl2[video]
media-libs/sdl2-gfx
@@ -53,15 +62,11 @@ RDEPEND="app-arch/bzip2
media-libs/libsdl2[sound]
media-libs/sdl2-mixer[vorbis]
)
-   !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
)
-   system-lua? ( >=dev-lang/lua-5.3 )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   !dedicated? (
-   x11-base/xorg-proto
-   nls? ( sys-devel/gettext )
-   )"
+   readline? ( sys-libs/readline:0= )
+   system-lua? ( >=dev-lang/lua-5.3:= )
+"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -152,8 +157,8 @@ src_install() {
default
 
if use dedicated ; then
-   rm -rf "${ED%/}/usr/share/pixmaps"
-   rm -f 
"${ED%/}"/usr/share/man/man6/freeciv-{client,gtk2,gtk3,modpack,qt,sdl,xaw}*
+   rm -rf "${ED}"/usr/share/pixmaps
+   rm -f 
"${ED}"/usr/share/man/man6/freeciv-{client,gtk2,gtk3,modpack,qt,sdl,xaw}*
else
if use server ; then
# Create and install the html manual. It can't be done 
for dedicated
@@ -168,24 +173,12 @@ src_install() {
if use sdl ; then
make_desktop_entry freeciv-sdl "Freeciv (SDL)" 
freeciv-client
else
-   rm -f "${ED%/}"/usr/share/man/man6/freeciv-sdl*
+   rm -f "${ED}"/usr/share/man/man6/freeciv-sdl*
fi
-   rm -f "${ED%/}"/usr/share/man/man6/freeciv-xaw*
+   rm -f "${ED}"/usr/share/man/man6/freeciv-xaw*
fi
find "${ED}" -name "freeciv-manual*" -delete
 
-   rm -f "${ED%/}/usr/$(get_libdir)"/*.a
+   rm -f "${ED}/usr/$(get_libdir)"/*.a
find "${ED}" -name "*.la" -delete || die
 }
-
-pkg_preinst() {
-   gnome2_icon_savelist
-}
-
-pkg_postinst() {
-   gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-   gnome2_icon_cache_update
-}

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

[Lars Wendler]

commit: ba82e1bc7a92e001c54c675b673de7194902a47d
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Sep 15 08:45:27 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Sep 15 08:45:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba82e1bc

games-strategy/freeciv: Restored amd64 and x86 KEYWORDS.

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 games-strategy/freeciv/freeciv-2.6.0.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/games-strategy/freeciv/freeciv-2.6.0.ebuild 
b/games-strategy/freeciv/freeciv-2.6.0.ebuild
index 5df947c98b8..1bf520d364f 100644
--- a/games-strategy/freeciv/freeciv-2.6.0.ebuild
+++ b/games-strategy/freeciv/freeciv-2.6.0.ebuild
@@ -14,8 +14,9 @@ SRC_URI="mirror://sourceforge/freeciv/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-[[ ${PV} != *_beta* ]] || [[ ${PV} != *_rc* ]] || \
-KEYWORDS="~amd64 ~ppc64 ~x86"
+if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+   KEYWORDS="~amd64 ~x86"
+fi
 IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
 
 # postgres isn't yet really supported by upstream

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

[Lars Wendler]

commit: 0f842e1cb96d0c7677f0fa9cffdda4b49d8bc817
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Sep 14 07:05:37 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Sep 14 07:06:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f842e1c

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

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 games-strategy/freeciv/Manifest|  2 +-
 ...eeciv-2.6.0_rc2.ebuild => freeciv-2.6.0.ebuild} | 24 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 2fd784292d5..b5c5d316432 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-RC2.tar.bz2 51828653 BLAKE2B 
87e83e23cb1cec91e408415a5c0b7f4f2fc438f239ca48ba4e713b89c8624fdd58c1888ff53119196085b1f7f2c663af91df4af9c789c3238465f887758bf09f
 SHA512 
254e492bb2ece390bcdb6c7ec9151b812811e7a1bff72eea4a9179a97c865d754436c5a02de2acb1ccf86850e1dd7db1218a84b836d18400217813d0c0ae173c
+DIST freeciv-2.6.0.tar.bz2 51912466 BLAKE2B 
180fa8900af6763ecae9190ce24799a77b8504d98081e48600c16c19e814b2ff1ef01ce6a41cb1a1739f848895e1551ba158f0357602f758e76b9ee6e0104a36
 SHA512 
658f05ed32a2045eeeadd1e12f88df927378f8032292e709af78f24c2dbc6019ba45ce67e4fe24001a9e70756c68126a313607a81e7009270ad255d7c9fe75d8

diff --git a/games-strategy/freeciv/freeciv-2.6.0_rc2.ebuild 
b/games-strategy/freeciv/freeciv-2.6.0.ebuild
similarity index 92%
rename from games-strategy/freeciv/freeciv-2.6.0_rc2.ebuild
rename to games-strategy/freeciv/freeciv-2.6.0.ebuild
index 54306880240..5df947c98b8 100644
--- a/games-strategy/freeciv/freeciv-2.6.0_rc2.ebuild
+++ b/games-strategy/freeciv/freeciv-2.6.0.ebuild
@@ -89,23 +89,23 @@ src_prepare() {
 }
 
 src_configure() {
-   local myclient mydatabase myeconfargs
+   local myclient=() mydatabase=() myeconfargs=()
 
if use auth ; then
if ! use mysql && ! use sqlite ; then
einfo "No database backend chosen, defaulting"
einfo "to mysql!"
-   mydatabase=mysql
+   mydatabase=( mysql )
else
-   use mysql && mydatabase+=" mysql"
-   use sqlite && mydatabase+=" sqlite3"
+   use mysql && mydatabase+=( mysql )
+   use sqlite && mydatabase+=( sqlite3 )
fi
else
-   mydatabase=no
+   mydatabase=( no )
fi
 
if use dedicated ; then
-   myclient="no"
+   myclient=( no )
myeconfargs+=(
--enable-server
--enable-freeciv-manual=html
@@ -114,12 +114,12 @@ src_configure() {
if use !sdl && use !gtk && ! use qt5 ; then
einfo "No client backend given, defaulting to"
einfo "gtk2 client!"
-   myclient="gtk2"
+   myclient=( gtk2 )
else
-   use sdl && myclient+=" sdl2"
-   use gtk && myclient+=" gtk2"
+   use sdl && myclient+=( sdl2 )
+   use gtk && myclient+=( gtk2 )
if use qt5 ; then
-   myclient+=" qt"
+   myclient+=( qt )
append-cxxflags -std=c++11
fi
fi
@@ -131,8 +131,8 @@ src_configure() {
 
myeconfargs+=(
--enable-aimodules="$(usex aimodules "yes" "no")"
-   --enable-client="${myclient}"
-   --enable-fcdb="${mydatabase}"
+   --enable-client="${myclient[*]}"
+   --enable-fcdb="${mydatabase[*]}"
--enable-fcmp="$(usex modpack "gtk2" "no")"
# disabling shared libs will break aimodules USE flag
--enable-shared

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

[Lars Wendler]

commit: f9a3d8380ebfcb13f91c29d24233879ac141bc41
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Jul 21 04:43:12 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Jul 21 04:43:37 2018 +
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() {

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

[Lars Wendler]

commit: 16eb17fdaf41e561b228d0aaf50981f28c7496f4
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Jul 16 06:43:13 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Jul 16 06:43:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16eb17fd

games-strategy/freeciv: Minor patch improvement.

Package-Manager: Portage-2.3.42, Repoman-2.3.9

 .../files/freeciv-2.5.11-freetype_pkgconfig.patch | 19 ---
 1 file changed, 16 insertions(+), 3 deletions(-)

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 b41411c8a16..d2b321dde27 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 
 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..00
@@ -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
 

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

[Lars Wendler]

commit: 75a69dc7a39a5fbb3aca2a0ad71d4ca2640d5a8a
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed May 16 19:20:38 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed May 16 19:20:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75a69dc7

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

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 games-strategy/freeciv/Manifest | 2 +-
 .../freeciv/{freeciv-2.6.0_beta2.ebuild => freeciv-2.6.0_beta3.ebuild}  | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 68e908dea79..ffd9e563bfb 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-beta2.tar.bz2 51503051 BLAKE2B 
45bf863a530d726261670cbdcd16daefeecaa72e3f090d98d274baa0cd52f3cd0dd1807d660863c822a2dafd170ad51a6b45d756c43aaf6e95e70c74460ce90b
 SHA512 
e92411f43192dc28bcd492f7e78f455cbc18264c7720dd8d35eb86fcc6da5e3927d79751bd1cd6f88d2904283c0844910415df5d7e36d0b9b76ab5fe3c872976
+DIST freeciv-2.6.0-beta3.tar.bz2 51761039 BLAKE2B 
a01e1df80eaa7ab76416190d8c32941e443481b6f7460155f3180548919270bec5bf6efde698931c44d427e17c6347299c0674ed2fc59b5b3c6a8ee5b97c9cf0
 SHA512 
c8a49ab77d799a65d181632a565d92cd0f9c2cd9fbaa5ce963eddc9abca29ccb9567bc3f731ad80b3f3593dd807c3d702abbe378824e3adef655edb8100711f5

diff --git a/games-strategy/freeciv/freeciv-2.6.0_beta2.ebuild 
b/games-strategy/freeciv/freeciv-2.6.0_beta3.ebuild
similarity index 100%
rename from games-strategy/freeciv/freeciv-2.6.0_beta2.ebuild
rename to games-strategy/freeciv/freeciv-2.6.0_beta3.ebuild

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

[Lars Wendler]

commit: f0f2368ce5bc5d28cf6e0a0019bcdd226853187f
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed May 16 18:42:53 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed May 16 19:12:08 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0f2368c

games-strategy/freeciv: Removed old.

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 games-strategy/freeciv/Manifest  |   1 -
 games-strategy/freeciv/freeciv-2.5.10.ebuild | 177 ---
 2 files changed, 178 deletions(-)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 85f6bc2183f..68e908dea79 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,3 +1,2 @@
-DIST freeciv-2.5.10.tar.bz2 40920632 BLAKE2B 
1fb6d3d8130088c818ffe95c68a4061732278da8b7e477347cc67e7cc770526a65006844db0d3ecdb462a903fb5589d18666ffe6c9262956bf30fbc0c79742e5
 SHA512 
198ea42af083ebbfc4d79cbcbc9fc2dd548c92581301d77fd9cff0e2addc7b7255090471dc52aceb966320958b3a4c542615d5ec91a114dfc805fe993864a6f5
 DIST freeciv-2.5.11.tar.bz2 40940090 BLAKE2B 
dfc1e714e1a3122335f555c2e57352726bda60dc0d1700b0d8ae937c85cba6beb0b2a6ffa6266b77437934ed85f1740f319c379a10c217161ee147f2339a50d3
 SHA512 
f5eac2fc2b7e09b9fd3b8b45145a5359f8216aef49050c692893d30584000c7db2f2a6e66ac19e67186e2653efaa0aa7656abefe2d2de25d123e9a52ce604456
 DIST freeciv-2.6.0-beta2.tar.bz2 51503051 BLAKE2B 
45bf863a530d726261670cbdcd16daefeecaa72e3f090d98d274baa0cd52f3cd0dd1807d660863c822a2dafd170ad51a6b45d756c43aaf6e95e70c74460ce90b
 SHA512 
e92411f43192dc28bcd492f7e78f455cbc18264c7720dd8d35eb86fcc6da5e3927d79751bd1cd6f88d2904283c0844910415df5d7e36d0b9b76ab5fe3c872976

diff --git a/games-strategy/freeciv/freeciv-2.5.10.ebuild 
b/games-strategy/freeciv/freeciv-2.5.10.ebuild
deleted file mode 100644
index b235bb640ff..000
--- a/games-strategy/freeciv/freeciv-2.5.10.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
-
-# postgres isn't yet really supported by upstream
-RDEPEND="app-arch/bzip2
-   app-arch/xz-utils
-   net-misc/curl
-   sys-libs/zlib
-   auth? (
-   mysql? ( virtual/mysql )
-   sqlite? ( dev-db/sqlite:3 )
-   !mysql? ( ( !sqlite? ( virtual/mysql ) ) )
-   )
-   readline? ( sys-libs/readline:0= )
-   dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
-   !dedicated? (
-   media-libs/libpng:0
-   gtk? ( x11-libs/gtk+:2 )
-   mapimg? ( media-gfx/imagemagick:= )
-   modpack? ( x11-libs/gtk+:2 )
-   nls? ( virtual/libintl )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-   sdl? (
-   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/libsdl[sound]
-   media-libs/sdl-mixer[vorbis]
-   )
-   !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
-   )
-   system-lua? ( >=dev-lang/lua-5.2 )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   !dedicated? (
-   x11-proto/xextproto
-   nls? ( sys-devel/gettext )
-   )"
-
-pkg_setup() {
-   if use !dedicated && use !server ; then
-   ewarn "Disabling server USE flag will make it impossible"
-   ewarn "to start local games, but you will still be able to"
-   ewarn "join multiplayer games."
-   fi
-}
-
-src_prepare() {
-   default
-
-   # install the .desktop in /usr/share/applications
-   # install the icons in /usr/share/pixmaps
-   sed -i \
-   -e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
-   -e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
-   -e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
-   client/Makefile.in \
-   server/Makefile.in \
-   tools/Makefile.in \
-   data/icons/Makefile.in || die
-   sed -i -e 's/=SDL/=X-SDL/' bootstrap/freeciv-sdl.desktop.in || die
-}
-
-src_configure() {
-   local myclient mydatabase myeconfargs
-
-   if use auth ; then
-   if ! use mysql && ! use 

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

[Lars Wendler]

commit: 855784a25ceb0d58033f2fb7cd07682677286e28
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed May 16 19:11:48 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed May 16 19:12:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=855784a2

games-strategy/freeciv: Use pkg-config to find freetype

Bug: https://bugs.gentoo.org/655884
Package-Manager: Portage-2.3.36, Repoman-2.3.9

 .../files/freeciv-2.5.11-freetype_pkgconfig.patch  | 229 +
 games-strategy/freeciv/freeciv-2.5.11.ebuild   |   8 +-
 2 files changed, 236 insertions(+), 1 deletion(-)

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
new file mode 100644
index 000..b41411c8a16
--- /dev/null
+++ b/games-strategy/freeciv/files/freeciv-2.5.11-freetype_pkgconfig.patch
@@ -0,0 +1,229 @@
+From fe3eaf658c256a1ee1aac645c004625e9f345421 Mon Sep 17 00:00:00 2001
+From: Lars Wendler 
+Date: Wed, 16 May 2018 20:41:22 +0200
+Subject: [PATCH] Use pkg-config to find freetype
+
+As of freetype-2.9.1 the freetype-config script no longer gets installed
+by default.
+---
+ m4/freetype2.m4  | 194 ---
+ m4/sdl-client.m4 |   2 +-
+ 2 files changed, 1 insertion(+), 195 deletions(-)
+ delete mode 100644 m4/freetype2.m4
+
+diff --git a/m4/freetype2.m4 b/m4/freetype2.m4
+deleted file mode 100644
+index 3d0ecb3554..00
+--- a/m4/freetype2.m4
 /dev/null
+@@ -1,194 +0,0 @@
+-# Configure paths for FreeType2
+-# Marcelo Magallon 2001-10-26, based on gtk.m4 by Owen Taylor
+-#
+-# Copyright 2001, 2003, 2007, 2009 by
+-# David Turner, Robert Wilhelm, and Werner Lemberg.
+-#
+-# This file is part of the FreeType project, and may only be used, modified,
+-# and distributed under the terms of the FreeType project license,
+-# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+-# indicate that you have read the license and understand and accept it
+-# fully.
+-#
+-# As a special exception to the FreeType project license, this file may be
+-# distributed as part of a program that contains a configuration script
+-# generated by Autoconf, under the same distribution terms as the rest of
+-# that program.
+-#
+-# serial 3
+-
+-# AC_CHECK_FT2([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+-# Test for FreeType 2, and define FT2_CFLAGS and FT2_LIBS.
+-# MINIMUM-VERSION is what libtool reports; the default is `7.0.1' (this is
+-# FreeType 2.0.4).
+-#
+-AC_DEFUN([AC_CHECK_FT2],
+-  [# Get the cflags and libraries from the freetype-config script
+-   #
+-   AC_ARG_WITH([ft-prefix],
+- dnl don't quote AS_HELP_STRING!
+- AS_HELP_STRING([--with-ft-prefix=PREFIX],
+-[Prefix where FreeType is installed (optional)]),
+- [ft_config_prefix="$withval"],
+- [ft_config_prefix=""])
+-
+-   AC_ARG_WITH([ft-exec-prefix],
+- dnl don't quote AS_HELP_STRING!
+- AS_HELP_STRING([--with-ft-exec-prefix=PREFIX],
+-[Exec prefix where FreeType is installed (optional)]),
+- [ft_config_exec_prefix="$withval"],
+- [ft_config_exec_prefix=""])
+-
+-   AC_ARG_ENABLE([freetypetest],
+- dnl don't quote AS_HELP_STRING!
+- AS_HELP_STRING([--disable-freetypetest],
+-[Do not try to compile and run a test FreeType program]),
+- [],
+- [enable_fttest=yes])
+-
+-   if test x$ft_config_exec_prefix != x ; then
+- ft_config_args="$ft_config_args --exec-prefix=$ft_config_exec_prefix"
+- if test x${FT2_CONFIG+set} != xset ; then
+-   FT2_CONFIG=$ft_config_exec_prefix/bin/freetype-config
+- fi
+-   fi
+-
+-   if test x$ft_config_prefix != x ; then
+- ft_config_args="$ft_config_args --prefix=$ft_config_prefix"
+- if test x${FT2_CONFIG+set} != xset ; then
+-   FT2_CONFIG=$ft_config_prefix/bin/freetype-config
+- fi
+-   fi
+-
+-   if test "x$FT2_CONFIG" = x ; then
+- AC_PATH_PROG([FT2_CONFIG], [freetype-config], [no])
+-   fi
+-
+-   min_ft_version=m4_if([$1], [], [7.0.1], [$1])
+-   AC_MSG_CHECKING([for FreeType -- version >= $min_ft_version])
+-   no_ft=""
+-   if test "$FT2_CONFIG" = "no" ; then
+- no_ft=yes
+-   else
+- FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags`
+- FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs`
+- ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \
+-   sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+- ft_config_minor_version=`$FT2_CONFIG $ft_config_args --version | \
+-   sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+- ft_config_micro_version=`$FT2_CONFIG $ft_config_args --version | \
+-   sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+- ft_min_major_version=`echo $min_ft_version | \
+-   sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+- ft_min_minor_version=`echo $min_ft_version | \

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

[Lars Wendler]

commit: 6dfcb5f136b411c139fd8a39f99d2e6a9430b0ce
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Apr  3 14:18:49 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Apr  3 14:18:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dfcb5f1

games-strategy/freeciv: Bump to version 2.5.11

Closes: https://bugs.gentoo.org/652332
Package-Manager: Portage-2.3.28, Repoman-2.3.9

 games-strategy/freeciv/Manifest  |   1 +
 games-strategy/freeciv/freeciv-2.5.11.ebuild | 177 +++
 2 files changed, 178 insertions(+)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 1abf5589715..98389d908fc 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,3 +1,4 @@
 DIST freeciv-2.5.10.tar.bz2 40920632 BLAKE2B 
1fb6d3d8130088c818ffe95c68a4061732278da8b7e477347cc67e7cc770526a65006844db0d3ecdb462a903fb5589d18666ffe6c9262956bf30fbc0c79742e5
 SHA512 
198ea42af083ebbfc4d79cbcbc9fc2dd548c92581301d77fd9cff0e2addc7b7255090471dc52aceb966320958b3a4c542615d5ec91a114dfc805fe993864a6f5
+DIST freeciv-2.5.11.tar.bz2 40940090 BLAKE2B 
dfc1e714e1a3122335f555c2e57352726bda60dc0d1700b0d8ae937c85cba6beb0b2a6ffa6266b77437934ed85f1740f319c379a10c217161ee147f2339a50d3
 SHA512 
f5eac2fc2b7e09b9fd3b8b45145a5359f8216aef49050c692893d30584000c7db2f2a6e66ac19e67186e2653efaa0aa7656abefe2d2de25d123e9a52ce604456
 DIST freeciv-2.5.9.tar.bz2 41176249 BLAKE2B 
d590318e8f03c726fd36714751ed666574951bf988a37b1ee6527a07dcdf4e637cfa525c2ecdf83d537fefdc4c3fd4a3db2c0e037424825af6d1c38f009293c9
 SHA512 
e8002dc2d0c313ec34d6245f69bf8cc9ed4f98a826d9f564e21cbca379529f6060b8efb3453ec38cb2c7efd222a4aea04033c3ff84b191271ba0af5b770c7677
 DIST freeciv-2.6.0-beta2.tar.bz2 51503051 BLAKE2B 
45bf863a530d726261670cbdcd16daefeecaa72e3f090d98d274baa0cd52f3cd0dd1807d660863c822a2dafd170ad51a6b45d756c43aaf6e95e70c74460ce90b
 SHA512 
e92411f43192dc28bcd492f7e78f455cbc18264c7720dd8d35eb86fcc6da5e3927d79751bd1cd6f88d2904283c0844910415df5d7e36d0b9b76ab5fe3c872976

diff --git a/games-strategy/freeciv/freeciv-2.5.11.ebuild 
b/games-strategy/freeciv/freeciv-2.5.11.ebuild
new file mode 100644
index 000..b235bb640ff
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.5.11.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+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"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
+
+# postgres isn't yet really supported by upstream
+RDEPEND="app-arch/bzip2
+   app-arch/xz-utils
+   net-misc/curl
+   sys-libs/zlib
+   auth? (
+   mysql? ( virtual/mysql )
+   sqlite? ( dev-db/sqlite:3 )
+   !mysql? ( ( !sqlite? ( virtual/mysql ) ) )
+   )
+   readline? ( sys-libs/readline:0= )
+   dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
+   !dedicated? (
+   media-libs/libpng:0
+   gtk? ( x11-libs/gtk+:2 )
+   mapimg? ( media-gfx/imagemagick:= )
+   modpack? ( x11-libs/gtk+:2 )
+   nls? ( virtual/libintl )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   sdl? (
+   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/libsdl[sound]
+   media-libs/sdl-mixer[vorbis]
+   )
+   !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
+   )
+   system-lua? ( >=dev-lang/lua-5.2 )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   !dedicated? (
+   x11-proto/xextproto
+   nls? ( sys-devel/gettext )
+   )"
+
+pkg_setup() {
+   if use !dedicated && use !server ; then
+   ewarn "Disabling server USE flag will make it impossible"
+   ewarn "to start local games, but you will still be able to"
+   ewarn "join multiplayer games."
+   fi
+}
+
+src_prepare() {
+   default
+
+   # install the .desktop in /usr/share/applications
+   # install the icons in /usr/share/pixmaps
+   sed -i \
+   -e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
+   -e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
+   -e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
+  

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

[Lars Wendler]

commit: 3edff1c871f7d019f5b43d03315e483774bf1c22
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Apr  3 14:19:22 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Apr  3 14:19:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3edff1c8

games-strategy/freeciv: Removed old.

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 games-strategy/freeciv/Manifest |   1 -
 games-strategy/freeciv/freeciv-2.5.9.ebuild | 177 
 2 files changed, 178 deletions(-)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 98389d908fc..85f6bc2183f 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,4 +1,3 @@
 DIST freeciv-2.5.10.tar.bz2 40920632 BLAKE2B 
1fb6d3d8130088c818ffe95c68a4061732278da8b7e477347cc67e7cc770526a65006844db0d3ecdb462a903fb5589d18666ffe6c9262956bf30fbc0c79742e5
 SHA512 
198ea42af083ebbfc4d79cbcbc9fc2dd548c92581301d77fd9cff0e2addc7b7255090471dc52aceb966320958b3a4c542615d5ec91a114dfc805fe993864a6f5
 DIST freeciv-2.5.11.tar.bz2 40940090 BLAKE2B 
dfc1e714e1a3122335f555c2e57352726bda60dc0d1700b0d8ae937c85cba6beb0b2a6ffa6266b77437934ed85f1740f319c379a10c217161ee147f2339a50d3
 SHA512 
f5eac2fc2b7e09b9fd3b8b45145a5359f8216aef49050c692893d30584000c7db2f2a6e66ac19e67186e2653efaa0aa7656abefe2d2de25d123e9a52ce604456
-DIST freeciv-2.5.9.tar.bz2 41176249 BLAKE2B 
d590318e8f03c726fd36714751ed666574951bf988a37b1ee6527a07dcdf4e637cfa525c2ecdf83d537fefdc4c3fd4a3db2c0e037424825af6d1c38f009293c9
 SHA512 
e8002dc2d0c313ec34d6245f69bf8cc9ed4f98a826d9f564e21cbca379529f6060b8efb3453ec38cb2c7efd222a4aea04033c3ff84b191271ba0af5b770c7677
 DIST freeciv-2.6.0-beta2.tar.bz2 51503051 BLAKE2B 
45bf863a530d726261670cbdcd16daefeecaa72e3f090d98d274baa0cd52f3cd0dd1807d660863c822a2dafd170ad51a6b45d756c43aaf6e95e70c74460ce90b
 SHA512 
e92411f43192dc28bcd492f7e78f455cbc18264c7720dd8d35eb86fcc6da5e3927d79751bd1cd6f88d2904283c0844910415df5d7e36d0b9b76ab5fe3c872976

diff --git a/games-strategy/freeciv/freeciv-2.5.9.ebuild 
b/games-strategy/freeciv/freeciv-2.5.9.ebuild
deleted file mode 100644
index 50f294a240b..000
--- a/games-strategy/freeciv/freeciv-2.5.9.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
-
-# postgres isn't yet really supported by upstream
-RDEPEND="app-arch/bzip2
-   app-arch/xz-utils
-   net-misc/curl
-   sys-libs/zlib
-   auth? (
-   mysql? ( virtual/mysql )
-   sqlite? ( dev-db/sqlite:3 )
-   !mysql? ( ( !sqlite? ( virtual/mysql ) ) )
-   )
-   readline? ( sys-libs/readline:0= )
-   dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
-   !dedicated? (
-   media-libs/libpng:0
-   gtk? ( x11-libs/gtk+:2 )
-   mapimg? ( media-gfx/imagemagick:= )
-   modpack? ( x11-libs/gtk+:2 )
-   nls? ( virtual/libintl )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-   sdl? (
-   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/libsdl[sound]
-   media-libs/sdl-mixer[vorbis]
-   )
-   !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
-   )
-   system-lua? ( >=dev-lang/lua-5.2 )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   !dedicated? (
-   x11-proto/xextproto
-   nls? ( sys-devel/gettext )
-   )"
-
-pkg_setup() {
-   if use !dedicated && use !server ; then
-   ewarn "Disabling server USE flag will make it impossible"
-   ewarn "to start local games, but you will still be able to"
-   ewarn "join multiplayer games."
-   fi
-}
-
-src_prepare() {
-   default
-
-   # install the .desktop in /usr/share/applications
-   # install the icons in /usr/share/pixmaps
-   sed -i \
-   -e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
-   -e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
-   -e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
-   client/Makefile.in \
-   

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

[Lars Wendler]

commit: 646c2153d2ca776aea214b6962b89046078156a7
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Feb  4 06:03:18 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Feb  4 06:03:18 2018 +
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 

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

[Lars Wendler]

commit: e606c99837e93abade773ed42d8821b711fdb265
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Dec  3 13:32:24 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Dec  3 13:32:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e606c998

games-strategy/freeciv: Removed old.

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 games-strategy/freeciv/Manifest |   2 -
 games-strategy/freeciv/freeciv-2.5.6.ebuild | 176 
 games-strategy/freeciv/freeciv-2.5.7.ebuild | 176 
 3 files changed, 354 deletions(-)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 222c08189cb..d3fa818d3db 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,4 +1,2 @@
-DIST freeciv-2.5.6.tar.bz2 41185678 SHA256 
cfadc23eec11a5a8ae74a7d3719eb126026137f0700da065367fd55cbab6999b SHA512 
85f87d73e7f9a74ff4fe71962481374b2e37a98574615fb94831af0b3d8c1e5c8bbee9a9bbb0223ff455ca46ead85f050f941fb9c015d1d760d8468cb3db
 WHIRLPOOL 
a93bcf972226b65df1cbd33816949593f27bc12aea92abd00e94eaf6659682b59bc3019897e8917eacbf3e9ed88067fd261afc4374f72c392feb07e08ac02cc1
-DIST freeciv-2.5.7.tar.bz2 41200685 SHA256 
ffe36736db6a64893681e9eea8b90f7abe05eaebe6b777e82149a98cad6dbed2 SHA512 
09e286f3b9a1bbfe9f9e306c0c559f9d93a1e90a671f772061e600fa2b34ec31da0fe98977f7e6e213ea53af0a40f345734d16727850f10a427c515b5d10c0c1
 WHIRLPOOL 
d084116f7425c31fdaca768dfb556bc5634e65103e5764fe71adf4e37e2eea0ceb80ac4922c90c80283e1931c77a8213ebddd858d7da7db2d9a88f72d8851c8b
 DIST freeciv-2.5.9.tar.bz2 41176249 SHA256 
b83c73585ae80898b27379984f936591b51422c9caccb94880fa16030c975928 SHA512 
e8002dc2d0c313ec34d6245f69bf8cc9ed4f98a826d9f564e21cbca379529f6060b8efb3453ec38cb2c7efd222a4aea04033c3ff84b191271ba0af5b770c7677
 WHIRLPOOL 
78c2bc06897ec49aba9375584cc554dd215ce970b17850da31c58159afc14a44d33b8c85064bc0e583ac68f43f41323beb62c8bc922c27345000524353545024
 DIST freeciv-2.6.0-beta1.tar.bz2 51744941 BLAKE2B 
e9d25aee0b13c189ff3a0c6a94c8925075fb7da22f40308db5db8d3bec580f46179228bd278279f0aa1d2fff606913af94ed1b25ae4d51f677f98738a056fb97
 SHA512 
5e70239e375710ec61f69f6daaa62d1c6881df3f5ddb2905229e2c0cec5cad9ce33688693580b2a24aa5aff79471cda4dbef4f9d51df34bd491b5284b12782e5

diff --git a/games-strategy/freeciv/freeciv-2.5.6.ebuild 
b/games-strategy/freeciv/freeciv-2.5.6.ebuild
deleted file mode 100644
index c408d24ee00..000
--- a/games-strategy/freeciv/freeciv-2.5.6.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
-
-# postgres isn't yet really supported by upstream
-RDEPEND="app-arch/bzip2
-   app-arch/xz-utils
-   net-misc/curl
-   sys-libs/zlib
-   auth? (
-   mysql? ( virtual/mysql )
-   sqlite? ( dev-db/sqlite:3 )
-   !mysql? ( ( !sqlite? ( virtual/mysql ) ) )
-   )
-   readline? ( sys-libs/readline:0= )
-   dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
-   !dedicated? (
-   media-libs/libpng:0
-   gtk? ( x11-libs/gtk+:2 )
-   mapimg? ( media-gfx/imagemagick:= )
-   modpack? ( x11-libs/gtk+:2 )
-   nls? ( virtual/libintl )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-   sdl? (
-   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/libsdl[sound]
-   media-libs/sdl-mixer[vorbis]
-   )
-   !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
-   )
-   system-lua? ( >=dev-lang/lua-5.2 )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   !dedicated? (
-   x11-proto/xextproto
-   nls? ( sys-devel/gettext )
-   )"
-
-pkg_setup() {
-   if use !dedicated && use !server ; then
-   ewarn "Disabling server USE flag will make it impossible"
-   ewarn "to start local games, but you will still be able to"
-   ewarn "join multiplayer games."
-   fi
-}
-
-src_prepare() {
-   default
-
-   # install the .desktop in /usr/share/applications
-   # install the icons in /usr/share/pixmaps
-

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

[Lars Wendler]

commit: b0e434cc12df608954b11c5287d469baff705a0c
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Dec  3 13:31:55 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Dec  3 13:32:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0e434cc

games-strategy/freeciv: Bump to version 2.6.0_beta1

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 games-strategy/freeciv/Manifest   |   1 +
 games-strategy/freeciv/freeciv-2.6.0_beta1.ebuild | 186 ++
 2 files changed, 187 insertions(+)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index bbcee52df83..222c08189cb 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,3 +1,4 @@
 DIST freeciv-2.5.6.tar.bz2 41185678 SHA256 
cfadc23eec11a5a8ae74a7d3719eb126026137f0700da065367fd55cbab6999b SHA512 
85f87d73e7f9a74ff4fe71962481374b2e37a98574615fb94831af0b3d8c1e5c8bbee9a9bbb0223ff455ca46ead85f050f941fb9c015d1d760d8468cb3db
 WHIRLPOOL 
a93bcf972226b65df1cbd33816949593f27bc12aea92abd00e94eaf6659682b59bc3019897e8917eacbf3e9ed88067fd261afc4374f72c392feb07e08ac02cc1
 DIST freeciv-2.5.7.tar.bz2 41200685 SHA256 
ffe36736db6a64893681e9eea8b90f7abe05eaebe6b777e82149a98cad6dbed2 SHA512 
09e286f3b9a1bbfe9f9e306c0c559f9d93a1e90a671f772061e600fa2b34ec31da0fe98977f7e6e213ea53af0a40f345734d16727850f10a427c515b5d10c0c1
 WHIRLPOOL 
d084116f7425c31fdaca768dfb556bc5634e65103e5764fe71adf4e37e2eea0ceb80ac4922c90c80283e1931c77a8213ebddd858d7da7db2d9a88f72d8851c8b
 DIST freeciv-2.5.9.tar.bz2 41176249 SHA256 
b83c73585ae80898b27379984f936591b51422c9caccb94880fa16030c975928 SHA512 
e8002dc2d0c313ec34d6245f69bf8cc9ed4f98a826d9f564e21cbca379529f6060b8efb3453ec38cb2c7efd222a4aea04033c3ff84b191271ba0af5b770c7677
 WHIRLPOOL 
78c2bc06897ec49aba9375584cc554dd215ce970b17850da31c58159afc14a44d33b8c85064bc0e583ac68f43f41323beb62c8bc922c27345000524353545024
+DIST freeciv-2.6.0-beta1.tar.bz2 51744941 BLAKE2B 
e9d25aee0b13c189ff3a0c6a94c8925075fb7da22f40308db5db8d3bec580f46179228bd278279f0aa1d2fff606913af94ed1b25ae4d51f677f98738a056fb97
 SHA512 
5e70239e375710ec61f69f6daaa62d1c6881df3f5ddb2905229e2c0cec5cad9ce33688693580b2a24aa5aff79471cda4dbef4f9d51df34bd491b5284b12782e5

diff --git a/games-strategy/freeciv/freeciv-2.6.0_beta1.ebuild 
b/games-strategy/freeciv/freeciv-2.6.0_beta1.ebuild
new file mode 100644
index 000..4fc0202df50
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.6.0_beta1.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic gnome2-utils ltprune xdg-utils
+
+DESCRIPTION="multiplayer strategy game (Civilization Clone)"
+HOMEPAGE="http://www.freeciv.org/;
+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"
+
+# postgres isn't yet really supported by upstream
+RDEPEND="app-arch/bzip2
+   app-arch/xz-utils
+   net-misc/curl
+   sys-libs/zlib
+   auth? (
+   mysql? ( virtual/mysql )
+   sqlite? ( dev-db/sqlite:3 )
+   !mysql? ( ( !sqlite? ( virtual/mysql ) ) )
+   )
+   readline? ( sys-libs/readline:0= )
+   dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
+   !dedicated? (
+   media-libs/libpng:0
+   gtk? ( x11-libs/gtk+:2 )
+   mapimg? ( media-gfx/imagemagick:= )
+   modpack? ( x11-libs/gtk+:2 )
+   nls? ( virtual/libintl )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   sdl? (
+   media-libs/libsdl2[video]
+   media-libs/sdl2-gfx
+   media-libs/sdl2-image[png]
+   media-libs/sdl2-ttf
+   )
+   server? ( aimodules? ( sys-devel/libtool:2 ) )
+   sound? (
+   media-libs/libsdl2[sound]
+   media-libs/sdl2-mixer[vorbis]
+   )
+   !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
+   )
+   system-lua? ( >=dev-lang/lua-5.3 )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   !dedicated? (
+   x11-proto/xextproto
+   nls? ( sys-devel/gettext )
+   )"
+
+S="${WORKDIR}/${P/_/-}"
+
+pkg_setup() {
+   if use !dedicated && use !server ; then
+   ewarn "Disabling server USE flag will make it impossible"
+   ewarn "to start local games, but you will still be able to"
+   ewarn "join multiplayer games."
+   fi
+}
+
+src_prepare() {
+   default
+
+   # install the .desktop in 

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

[Lars Wendler]

commit: 60d5788200d7e626ec46d3fc5cb7e77e78f178a0
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Aug 22 13:17:58 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Aug 22 13:18:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60d57882

games-strategy/freeciv: Removed old.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 games-strategy/freeciv/Manifest |   1 -
 games-strategy/freeciv/freeciv-2.5.8.ebuild | 177 
 2 files changed, 178 deletions(-)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 276efa53efb..bbcee52df83 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,4 +1,3 @@
 DIST freeciv-2.5.6.tar.bz2 41185678 SHA256 
cfadc23eec11a5a8ae74a7d3719eb126026137f0700da065367fd55cbab6999b SHA512 
85f87d73e7f9a74ff4fe71962481374b2e37a98574615fb94831af0b3d8c1e5c8bbee9a9bbb0223ff455ca46ead85f050f941fb9c015d1d760d8468cb3db
 WHIRLPOOL 
a93bcf972226b65df1cbd33816949593f27bc12aea92abd00e94eaf6659682b59bc3019897e8917eacbf3e9ed88067fd261afc4374f72c392feb07e08ac02cc1
 DIST freeciv-2.5.7.tar.bz2 41200685 SHA256 
ffe36736db6a64893681e9eea8b90f7abe05eaebe6b777e82149a98cad6dbed2 SHA512 
09e286f3b9a1bbfe9f9e306c0c559f9d93a1e90a671f772061e600fa2b34ec31da0fe98977f7e6e213ea53af0a40f345734d16727850f10a427c515b5d10c0c1
 WHIRLPOOL 
d084116f7425c31fdaca768dfb556bc5634e65103e5764fe71adf4e37e2eea0ceb80ac4922c90c80283e1931c77a8213ebddd858d7da7db2d9a88f72d8851c8b
-DIST freeciv-2.5.8.tar.bz2 41176592 SHA256 
6781e655c514d0a86975c87235de24f740cbdf81f33711d68a910b360963bd30 SHA512 
e6bda4b99fa4637eb1b4bebc2628cbd63794037eea8118c8d08a92a19692b504df04e4ccc5b8eff4db018f325522c05241bf221a4bd048c4c3916f4233e8be0a
 WHIRLPOOL 
bc1bb690193d050772f30e2b64bfc93cb258ac9b6048a0bc4cfc415288ba6ace64894b1f98f144fc286cfa61edd7d9e403aff2e55fdd8189df4951796d7bbe79
 DIST freeciv-2.5.9.tar.bz2 41176249 SHA256 
b83c73585ae80898b27379984f936591b51422c9caccb94880fa16030c975928 SHA512 
e8002dc2d0c313ec34d6245f69bf8cc9ed4f98a826d9f564e21cbca379529f6060b8efb3453ec38cb2c7efd222a4aea04033c3ff84b191271ba0af5b770c7677
 WHIRLPOOL 
78c2bc06897ec49aba9375584cc554dd215ce970b17850da31c58159afc14a44d33b8c85064bc0e583ac68f43f41323beb62c8bc922c27345000524353545024

diff --git a/games-strategy/freeciv/freeciv-2.5.8.ebuild 
b/games-strategy/freeciv/freeciv-2.5.8.ebuild
deleted file mode 100644
index 50f294a240b..000
--- a/games-strategy/freeciv/freeciv-2.5.8.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
-
-# postgres isn't yet really supported by upstream
-RDEPEND="app-arch/bzip2
-   app-arch/xz-utils
-   net-misc/curl
-   sys-libs/zlib
-   auth? (
-   mysql? ( virtual/mysql )
-   sqlite? ( dev-db/sqlite:3 )
-   !mysql? ( ( !sqlite? ( virtual/mysql ) ) )
-   )
-   readline? ( sys-libs/readline:0= )
-   dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
-   !dedicated? (
-   media-libs/libpng:0
-   gtk? ( x11-libs/gtk+:2 )
-   mapimg? ( media-gfx/imagemagick:= )
-   modpack? ( x11-libs/gtk+:2 )
-   nls? ( virtual/libintl )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-   sdl? (
-   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/libsdl[sound]
-   media-libs/sdl-mixer[vorbis]
-   )
-   !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
-   )
-   system-lua? ( >=dev-lang/lua-5.2 )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   !dedicated? (
-   x11-proto/xextproto
-   nls? ( sys-devel/gettext )
-   )"
-
-pkg_setup() {
-   if use !dedicated && use !server ; then
-   ewarn "Disabling server USE flag will make it impossible"
-   ewarn "to start local games, but you will still be able to"
-   ewarn "join multiplayer games."
-   fi
-}
-
-src_prepare() {
-   default
-
-   # install the .desktop in /usr/share/applications
-   # install the icons in /usr/share/pixmaps
-   sed -i \

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

[Lars Wendler]

commit: e739112332cf9d47a478921dda94fd9fbefae61e
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Aug 22 13:17:34 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Aug 22 13:18:23 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7391123

games-strategy/freeciv: Bump to version 2.5.9 (bug #628600).

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 games-strategy/freeciv/Manifest |   1 +
 games-strategy/freeciv/freeciv-2.5.9.ebuild | 177 
 2 files changed, 178 insertions(+)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 97298f60613..276efa53efb 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,3 +1,4 @@
 DIST freeciv-2.5.6.tar.bz2 41185678 SHA256 
cfadc23eec11a5a8ae74a7d3719eb126026137f0700da065367fd55cbab6999b SHA512 
85f87d73e7f9a74ff4fe71962481374b2e37a98574615fb94831af0b3d8c1e5c8bbee9a9bbb0223ff455ca46ead85f050f941fb9c015d1d760d8468cb3db
 WHIRLPOOL 
a93bcf972226b65df1cbd33816949593f27bc12aea92abd00e94eaf6659682b59bc3019897e8917eacbf3e9ed88067fd261afc4374f72c392feb07e08ac02cc1
 DIST freeciv-2.5.7.tar.bz2 41200685 SHA256 
ffe36736db6a64893681e9eea8b90f7abe05eaebe6b777e82149a98cad6dbed2 SHA512 
09e286f3b9a1bbfe9f9e306c0c559f9d93a1e90a671f772061e600fa2b34ec31da0fe98977f7e6e213ea53af0a40f345734d16727850f10a427c515b5d10c0c1
 WHIRLPOOL 
d084116f7425c31fdaca768dfb556bc5634e65103e5764fe71adf4e37e2eea0ceb80ac4922c90c80283e1931c77a8213ebddd858d7da7db2d9a88f72d8851c8b
 DIST freeciv-2.5.8.tar.bz2 41176592 SHA256 
6781e655c514d0a86975c87235de24f740cbdf81f33711d68a910b360963bd30 SHA512 
e6bda4b99fa4637eb1b4bebc2628cbd63794037eea8118c8d08a92a19692b504df04e4ccc5b8eff4db018f325522c05241bf221a4bd048c4c3916f4233e8be0a
 WHIRLPOOL 
bc1bb690193d050772f30e2b64bfc93cb258ac9b6048a0bc4cfc415288ba6ace64894b1f98f144fc286cfa61edd7d9e403aff2e55fdd8189df4951796d7bbe79
+DIST freeciv-2.5.9.tar.bz2 41176249 SHA256 
b83c73585ae80898b27379984f936591b51422c9caccb94880fa16030c975928 SHA512 
e8002dc2d0c313ec34d6245f69bf8cc9ed4f98a826d9f564e21cbca379529f6060b8efb3453ec38cb2c7efd222a4aea04033c3ff84b191271ba0af5b770c7677
 WHIRLPOOL 
78c2bc06897ec49aba9375584cc554dd215ce970b17850da31c58159afc14a44d33b8c85064bc0e583ac68f43f41323beb62c8bc922c27345000524353545024

diff --git a/games-strategy/freeciv/freeciv-2.5.9.ebuild 
b/games-strategy/freeciv/freeciv-2.5.9.ebuild
new file mode 100644
index 000..50f294a240b
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.5.9.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+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"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
+
+# postgres isn't yet really supported by upstream
+RDEPEND="app-arch/bzip2
+   app-arch/xz-utils
+   net-misc/curl
+   sys-libs/zlib
+   auth? (
+   mysql? ( virtual/mysql )
+   sqlite? ( dev-db/sqlite:3 )
+   !mysql? ( ( !sqlite? ( virtual/mysql ) ) )
+   )
+   readline? ( sys-libs/readline:0= )
+   dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
+   !dedicated? (
+   media-libs/libpng:0
+   gtk? ( x11-libs/gtk+:2 )
+   mapimg? ( media-gfx/imagemagick:= )
+   modpack? ( x11-libs/gtk+:2 )
+   nls? ( virtual/libintl )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   sdl? (
+   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/libsdl[sound]
+   media-libs/sdl-mixer[vorbis]
+   )
+   !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
+   )
+   system-lua? ( >=dev-lang/lua-5.2 )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   !dedicated? (
+   x11-proto/xextproto
+   nls? ( sys-devel/gettext )
+   )"
+
+pkg_setup() {
+   if use !dedicated && use !server ; then
+   ewarn "Disabling server USE flag will make it impossible"
+   ewarn "to start local games, but you will still be able to"
+   ewarn "join multiplayer games."
+   fi
+}
+
+src_prepare() {
+   default
+
+   # install the .desktop in /usr/share/applications
+   # install the icons in 

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

[Lars Wendler]

commit: 7e44198bdf104ca0a8e7506588efcdcbacbc7ece
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Aug 15 09:57:39 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Aug 15 10:03:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e44198b

games-strategy/freeciv: Bump to version 2.5.8

Package-Manager: Portage-2.3.7, Repoman-2.3.3

 games-strategy/freeciv/Manifest |   1 +
 games-strategy/freeciv/freeciv-2.5.8.ebuild | 177 
 2 files changed, 178 insertions(+)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 83ef9c98896..97298f60613 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,2 +1,3 @@
 DIST freeciv-2.5.6.tar.bz2 41185678 SHA256 
cfadc23eec11a5a8ae74a7d3719eb126026137f0700da065367fd55cbab6999b SHA512 
85f87d73e7f9a74ff4fe71962481374b2e37a98574615fb94831af0b3d8c1e5c8bbee9a9bbb0223ff455ca46ead85f050f941fb9c015d1d760d8468cb3db
 WHIRLPOOL 
a93bcf972226b65df1cbd33816949593f27bc12aea92abd00e94eaf6659682b59bc3019897e8917eacbf3e9ed88067fd261afc4374f72c392feb07e08ac02cc1
 DIST freeciv-2.5.7.tar.bz2 41200685 SHA256 
ffe36736db6a64893681e9eea8b90f7abe05eaebe6b777e82149a98cad6dbed2 SHA512 
09e286f3b9a1bbfe9f9e306c0c559f9d93a1e90a671f772061e600fa2b34ec31da0fe98977f7e6e213ea53af0a40f345734d16727850f10a427c515b5d10c0c1
 WHIRLPOOL 
d084116f7425c31fdaca768dfb556bc5634e65103e5764fe71adf4e37e2eea0ceb80ac4922c90c80283e1931c77a8213ebddd858d7da7db2d9a88f72d8851c8b
+DIST freeciv-2.5.8.tar.bz2 41176592 SHA256 
6781e655c514d0a86975c87235de24f740cbdf81f33711d68a910b360963bd30 SHA512 
e6bda4b99fa4637eb1b4bebc2628cbd63794037eea8118c8d08a92a19692b504df04e4ccc5b8eff4db018f325522c05241bf221a4bd048c4c3916f4233e8be0a
 WHIRLPOOL 
bc1bb690193d050772f30e2b64bfc93cb258ac9b6048a0bc4cfc415288ba6ace64894b1f98f144fc286cfa61edd7d9e403aff2e55fdd8189df4951796d7bbe79

diff --git a/games-strategy/freeciv/freeciv-2.5.8.ebuild 
b/games-strategy/freeciv/freeciv-2.5.8.ebuild
new file mode 100644
index 000..50f294a240b
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.5.8.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+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"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
+
+# postgres isn't yet really supported by upstream
+RDEPEND="app-arch/bzip2
+   app-arch/xz-utils
+   net-misc/curl
+   sys-libs/zlib
+   auth? (
+   mysql? ( virtual/mysql )
+   sqlite? ( dev-db/sqlite:3 )
+   !mysql? ( ( !sqlite? ( virtual/mysql ) ) )
+   )
+   readline? ( sys-libs/readline:0= )
+   dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
+   !dedicated? (
+   media-libs/libpng:0
+   gtk? ( x11-libs/gtk+:2 )
+   mapimg? ( media-gfx/imagemagick:= )
+   modpack? ( x11-libs/gtk+:2 )
+   nls? ( virtual/libintl )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   sdl? (
+   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/libsdl[sound]
+   media-libs/sdl-mixer[vorbis]
+   )
+   !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
+   )
+   system-lua? ( >=dev-lang/lua-5.2 )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   !dedicated? (
+   x11-proto/xextproto
+   nls? ( sys-devel/gettext )
+   )"
+
+pkg_setup() {
+   if use !dedicated && use !server ; then
+   ewarn "Disabling server USE flag will make it impossible"
+   ewarn "to start local games, but you will still be able to"
+   ewarn "join multiplayer games."
+   fi
+}
+
+src_prepare() {
+   default
+
+   # install the .desktop in /usr/share/applications
+   # install the icons in /usr/share/pixmaps
+   sed -i \
+   -e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
+   -e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
+   -e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
+   client/Makefile.in \
+   server/Makefile.in \
+   tools/Makefile.in \
+   data/icons/Makefile.in || 

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

[Lars Wendler]

commit: d6c31c75c6b865482b0d7db837e72b8c6a7206e1
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun May 14 10:02:41 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun May 14 10:05:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6c31c75

games-strategy/freeciv: Bump to version 2.5.7 (bug #618416).

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 games-strategy/freeciv/Manifest |   1 +
 games-strategy/freeciv/freeciv-2.5.7.ebuild | 176 
 2 files changed, 177 insertions(+)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 508b31aeaa2..1ad8fafdf05 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -2,3 +2,4 @@ DIST freeciv-2.5.3.tar.bz2 41010519 SHA256 
480b0381c64bf1a9423f2507a75d76bda9bf4
 DIST freeciv-2.5.4.tar.bz2 40977253 SHA256 
9e64ef047fd0d2f8e9aa1da01586dea7cfe63a36b15875c168ada555c2e6634b SHA512 
08fb0d0e622fdb75a57edfa2de2c662fe68966e510dfc9c0219a00aa52f09ce67c43ad2df6109bdc440a39b020f4762015b04641f01327326768448acff46a92
 WHIRLPOOL 
c07b5fedcb50257df184c4173868b1455ec42298e6fb63517fa94cd70d2216e0d9ca23e861bee9928b83bcbdcb692cf13344a5c6909f2d2ba599193bba851b83
 DIST freeciv-2.5.5.tar.bz2 40828396 SHA256 
5622f2142637057f7e47b1eda764c4e131222fab4d5bb42cd59fbd58ba3db1d4 SHA512 
20cb71ab6d81b0ab272d1a0f8f2d639cbda3f6354a09fef3469cc35b391bf6efd947348c82c76dc632e3366ed1ee203af0e79a2378f7e5ea4206b4fede60f95e
 WHIRLPOOL 
9ca6655f645c84d4488b6c96d06b0e7aa0187a0d29d5e90b8e6c81d544b022727af4ec7004d570e352fc7c60e95f7985f0a9ede7b480247a376e63dbca1ecac4
 DIST freeciv-2.5.6.tar.bz2 41185678 SHA256 
cfadc23eec11a5a8ae74a7d3719eb126026137f0700da065367fd55cbab6999b SHA512 
85f87d73e7f9a74ff4fe71962481374b2e37a98574615fb94831af0b3d8c1e5c8bbee9a9bbb0223ff455ca46ead85f050f941fb9c015d1d760d8468cb3db
 WHIRLPOOL 
a93bcf972226b65df1cbd33816949593f27bc12aea92abd00e94eaf6659682b59bc3019897e8917eacbf3e9ed88067fd261afc4374f72c392feb07e08ac02cc1
+DIST freeciv-2.5.7.tar.bz2 41200685 SHA256 
ffe36736db6a64893681e9eea8b90f7abe05eaebe6b777e82149a98cad6dbed2 SHA512 
09e286f3b9a1bbfe9f9e306c0c559f9d93a1e90a671f772061e600fa2b34ec31da0fe98977f7e6e213ea53af0a40f345734d16727850f10a427c515b5d10c0c1
 WHIRLPOOL 
d084116f7425c31fdaca768dfb556bc5634e65103e5764fe71adf4e37e2eea0ceb80ac4922c90c80283e1931c77a8213ebddd858d7da7db2d9a88f72d8851c8b

diff --git a/games-strategy/freeciv/freeciv-2.5.7.ebuild 
b/games-strategy/freeciv/freeciv-2.5.7.ebuild
new file mode 100644
index 000..83628306240
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.5.7.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+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"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
+
+# postgres isn't yet really supported by upstream
+RDEPEND="app-arch/bzip2
+   app-arch/xz-utils
+   net-misc/curl
+   sys-libs/zlib
+   auth? (
+   mysql? ( virtual/mysql )
+   sqlite? ( dev-db/sqlite:3 )
+   !mysql? ( ( !sqlite? ( virtual/mysql ) ) )
+   )
+   readline? ( sys-libs/readline:0= )
+   dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
+   !dedicated? (
+   media-libs/libpng:0
+   gtk? ( x11-libs/gtk+:2 )
+   mapimg? ( media-gfx/imagemagick:= )
+   modpack? ( x11-libs/gtk+:2 )
+   nls? ( virtual/libintl )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   sdl? (
+   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/libsdl[sound]
+   media-libs/sdl-mixer[vorbis]
+   )
+   !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
+   )
+   system-lua? ( >=dev-lang/lua-5.2 )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   !dedicated? (
+   x11-proto/xextproto
+   nls? ( sys-devel/gettext )
+   )"
+
+pkg_setup() {
+   if use !dedicated && use !server ; then
+   ewarn "Disabling server USE flag will make it impossible"
+   ewarn "to start local games, but you will still be able to"
+   ewarn "join multiplayer games."
+   fi
+}
+
+src_prepare() {
+   default
+
+   # 

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

[Lars Wendler]

commit: d99c804209b38adbc9f2b83e1cb249aee3df4c74
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun May 14 10:04:48 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun May 14 10:05:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d99c8042

games-strategy/freeciv: Removed old.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 games-strategy/freeciv/Manifest |   3 -
 games-strategy/freeciv/freeciv-2.5.3.ebuild | 177 
 games-strategy/freeciv/freeciv-2.5.4.ebuild | 177 
 games-strategy/freeciv/freeciv-2.5.5.ebuild | 173 ---
 4 files changed, 530 deletions(-)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 1ad8fafdf05..83ef9c98896 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,5 +1,2 @@
-DIST freeciv-2.5.3.tar.bz2 41010519 SHA256 
480b0381c64bf1a9423f2507a75d76bda9bf45c3c3badd30b5bad105e75d805c SHA512 
a3e1ee5f585be062ec5fc7783dfe24f4cd313bea016af47b868e01561fc3958a86ed310edd41130fc5ede6ca2547ca38198c8dbb18974db7d14defd103277b4b
 WHIRLPOOL 
c75ef1419e965003aebb396fd7245fa0a859fea2574d74cc1ef8de7bb4b3b0e47f28ee8bcf0b30c3ad1116bd374336f51bb285d66ea244e4b68e44e33ad36ec4
-DIST freeciv-2.5.4.tar.bz2 40977253 SHA256 
9e64ef047fd0d2f8e9aa1da01586dea7cfe63a36b15875c168ada555c2e6634b SHA512 
08fb0d0e622fdb75a57edfa2de2c662fe68966e510dfc9c0219a00aa52f09ce67c43ad2df6109bdc440a39b020f4762015b04641f01327326768448acff46a92
 WHIRLPOOL 
c07b5fedcb50257df184c4173868b1455ec42298e6fb63517fa94cd70d2216e0d9ca23e861bee9928b83bcbdcb692cf13344a5c6909f2d2ba599193bba851b83
-DIST freeciv-2.5.5.tar.bz2 40828396 SHA256 
5622f2142637057f7e47b1eda764c4e131222fab4d5bb42cd59fbd58ba3db1d4 SHA512 
20cb71ab6d81b0ab272d1a0f8f2d639cbda3f6354a09fef3469cc35b391bf6efd947348c82c76dc632e3366ed1ee203af0e79a2378f7e5ea4206b4fede60f95e
 WHIRLPOOL 
9ca6655f645c84d4488b6c96d06b0e7aa0187a0d29d5e90b8e6c81d544b022727af4ec7004d570e352fc7c60e95f7985f0a9ede7b480247a376e63dbca1ecac4
 DIST freeciv-2.5.6.tar.bz2 41185678 SHA256 
cfadc23eec11a5a8ae74a7d3719eb126026137f0700da065367fd55cbab6999b SHA512 
85f87d73e7f9a74ff4fe71962481374b2e37a98574615fb94831af0b3d8c1e5c8bbee9a9bbb0223ff455ca46ead85f050f941fb9c015d1d760d8468cb3db
 WHIRLPOOL 
a93bcf972226b65df1cbd33816949593f27bc12aea92abd00e94eaf6659682b59bc3019897e8917eacbf3e9ed88067fd261afc4374f72c392feb07e08ac02cc1
 DIST freeciv-2.5.7.tar.bz2 41200685 SHA256 
ffe36736db6a64893681e9eea8b90f7abe05eaebe6b777e82149a98cad6dbed2 SHA512 
09e286f3b9a1bbfe9f9e306c0c559f9d93a1e90a671f772061e600fa2b34ec31da0fe98977f7e6e213ea53af0a40f345734d16727850f10a427c515b5d10c0c1
 WHIRLPOOL 
d084116f7425c31fdaca768dfb556bc5634e65103e5764fe71adf4e37e2eea0ceb80ac4922c90c80283e1931c77a8213ebddd858d7da7db2d9a88f72d8851c8b

diff --git a/games-strategy/freeciv/freeciv-2.5.3.ebuild 
b/games-strategy/freeciv/freeciv-2.5.3.ebuild
deleted file mode 100644
index 2a82ae35dcb..000
--- a/games-strategy/freeciv/freeciv-2.5.3.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils gnome2-utils games
-
-DESCRIPTION="multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="http://www.freeciv.org/;
-SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
-
-# postgres isn't yet really supported by upstream
-RDEPEND="app-arch/bzip2
-   app-arch/xz-utils
-   net-misc/curl
-   sys-libs/zlib
-   auth? (
-   mysql? ( virtual/mysql )
-   sqlite? ( dev-db/sqlite:3 )
-   !mysql? ( ( !sqlite? ( virtual/mysql ) ) )
-   )
-   readline? ( sys-libs/readline:0= )
-   dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
-   !dedicated? (
-   media-libs/libpng:0
-   gtk? ( x11-libs/gtk+:2 )
-   mapimg? ( media-gfx/imagemagick )
-   modpack? ( x11-libs/gtk+:2 )
-   nls? ( virtual/libintl )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-   sdl? (
-   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/libsdl[sound]
-   media-libs/sdl-mixer[vorbis]
-   )
-   !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
-   )
-   system-lua? ( >=dev-lang/lua-5.2 )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   

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

[Lars Wendler]

commit: fcba3e32e469e07d184bcbd24a37cbbf2ef5a4c6
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun May 14 10:04:01 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun May 14 10:05:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcba3e32

games-strategy/freeciv: Version 2.5.6 stable for amd64 and x86.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 games-strategy/freeciv/freeciv-2.5.6.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-strategy/freeciv/freeciv-2.5.6.ebuild 
b/games-strategy/freeciv/freeciv-2.5.6.ebuild
index 9dd90fa0910..7c177a64cbe 100644
--- a/games-strategy/freeciv/freeciv-2.5.6.ebuild
+++ b/games-strategy/freeciv/freeciv-2.5.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
 
 # postgres isn't yet really supported by upstream

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

[Lars Wendler]

commit: 1a08ed19f8fcc4dc53ecb2741b4b714627521945
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Nov 27 14:29:34 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Nov 27 14:29:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a08ed19

games-strategy/freeciv: Removed forgotten calls to games eclass functions.

Package-Manager: portage-2.3.2

 games-strategy/freeciv/freeciv-2.5.5.ebuild | 2 --
 games-strategy/freeciv/freeciv-2.5.6.ebuild | 2 --
 2 files changed, 4 deletions(-)

diff --git a/games-strategy/freeciv/freeciv-2.5.5.ebuild 
b/games-strategy/freeciv/freeciv-2.5.5.ebuild
index cdb363b..459a2f1 100644
--- a/games-strategy/freeciv/freeciv-2.5.5.ebuild
+++ b/games-strategy/freeciv/freeciv-2.5.5.ebuild
@@ -162,12 +162,10 @@ src_install() {
 }
 
 pkg_preinst() {
-   games_pkg_preinst
gnome2_icon_savelist
 }
 
 pkg_postinst() {
-   games_pkg_postinst
gnome2_icon_cache_update
 }
 

diff --git a/games-strategy/freeciv/freeciv-2.5.6.ebuild 
b/games-strategy/freeciv/freeciv-2.5.6.ebuild
index 441850c..1b41dc0 100644
--- a/games-strategy/freeciv/freeciv-2.5.6.ebuild
+++ b/games-strategy/freeciv/freeciv-2.5.6.ebuild
@@ -165,12 +165,10 @@ src_install() {
 }
 
 pkg_preinst() {
-   games_pkg_preinst
gnome2_icon_savelist
 }
 
 pkg_postinst() {
-   games_pkg_postinst
gnome2_icon_cache_update
 }
 

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

[Lars Wendler]

commit: 11a77603a46b0ba9fd704a93f20d1ae5068922bd
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Nov 26 21:18:12 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Nov 26 21:18:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11a77603

games-strategy/freeciv: Bump to version 2.5.6

Package-Manager: portage-2.3.2

 games-strategy/freeciv/Manifest |   1 +
 games-strategy/freeciv/freeciv-2.5.6.ebuild | 179 
 2 files changed, 180 insertions(+)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index b4a9241..508b31a 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,3 +1,4 @@
 DIST freeciv-2.5.3.tar.bz2 41010519 SHA256 
480b0381c64bf1a9423f2507a75d76bda9bf45c3c3badd30b5bad105e75d805c SHA512 
a3e1ee5f585be062ec5fc7783dfe24f4cd313bea016af47b868e01561fc3958a86ed310edd41130fc5ede6ca2547ca38198c8dbb18974db7d14defd103277b4b
 WHIRLPOOL 
c75ef1419e965003aebb396fd7245fa0a859fea2574d74cc1ef8de7bb4b3b0e47f28ee8bcf0b30c3ad1116bd374336f51bb285d66ea244e4b68e44e33ad36ec4
 DIST freeciv-2.5.4.tar.bz2 40977253 SHA256 
9e64ef047fd0d2f8e9aa1da01586dea7cfe63a36b15875c168ada555c2e6634b SHA512 
08fb0d0e622fdb75a57edfa2de2c662fe68966e510dfc9c0219a00aa52f09ce67c43ad2df6109bdc440a39b020f4762015b04641f01327326768448acff46a92
 WHIRLPOOL 
c07b5fedcb50257df184c4173868b1455ec42298e6fb63517fa94cd70d2216e0d9ca23e861bee9928b83bcbdcb692cf13344a5c6909f2d2ba599193bba851b83
 DIST freeciv-2.5.5.tar.bz2 40828396 SHA256 
5622f2142637057f7e47b1eda764c4e131222fab4d5bb42cd59fbd58ba3db1d4 SHA512 
20cb71ab6d81b0ab272d1a0f8f2d639cbda3f6354a09fef3469cc35b391bf6efd947348c82c76dc632e3366ed1ee203af0e79a2378f7e5ea4206b4fede60f95e
 WHIRLPOOL 
9ca6655f645c84d4488b6c96d06b0e7aa0187a0d29d5e90b8e6c81d544b022727af4ec7004d570e352fc7c60e95f7985f0a9ede7b480247a376e63dbca1ecac4
+DIST freeciv-2.5.6.tar.bz2 41185678 SHA256 
cfadc23eec11a5a8ae74a7d3719eb126026137f0700da065367fd55cbab6999b SHA512 
85f87d73e7f9a74ff4fe71962481374b2e37a98574615fb94831af0b3d8c1e5c8bbee9a9bbb0223ff455ca46ead85f050f941fb9c015d1d760d8468cb3db
 WHIRLPOOL 
a93bcf972226b65df1cbd33816949593f27bc12aea92abd00e94eaf6659682b59bc3019897e8917eacbf3e9ed88067fd261afc4374f72c392feb07e08ac02cc1

diff --git a/games-strategy/freeciv/freeciv-2.5.6.ebuild 
b/games-strategy/freeciv/freeciv-2.5.6.ebuild
new file mode 100644
index ..441850c
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.5.6.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+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"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
+
+# postgres isn't yet really supported by upstream
+RDEPEND="app-arch/bzip2
+   app-arch/xz-utils
+   net-misc/curl
+   sys-libs/zlib
+   auth? (
+   mysql? ( virtual/mysql )
+   sqlite? ( dev-db/sqlite:3 )
+   !mysql? ( ( !sqlite? ( virtual/mysql ) ) )
+   )
+   readline? ( sys-libs/readline:0= )
+   dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
+   !dedicated? (
+   media-libs/libpng:0
+   gtk? ( x11-libs/gtk+:2 )
+   mapimg? ( media-gfx/imagemagick:= )
+   modpack? ( x11-libs/gtk+:2 )
+   nls? ( virtual/libintl )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   sdl? (
+   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/libsdl[sound]
+   media-libs/sdl-mixer[vorbis]
+   )
+   !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
+   )
+   system-lua? ( >=dev-lang/lua-5.2 )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   !dedicated? (
+   x11-proto/xextproto
+   nls? ( sys-devel/gettext )
+   )"
+
+pkg_setup() {
+   if use !dedicated && use !server ; then
+   ewarn "Disabling server USE flag will make it impossible"
+   ewarn "to start local games, but you will still be able to"
+   ewarn "join multiplayer games."
+   fi
+}
+
+src_prepare() {
+   default
+
+   # install the .desktop in /usr/share/applications
+   # install the icons in /usr/share/pixmaps
+   sed -i \
+  

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

[Lars Wendler]

commit: 6e2cca581d4afcaee3dca0e89d66cc09b6ff5806
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Sep 19 11:35:16 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Sep 19 13:09:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e2cca58

games-strategy/freeciv: Bump to version 2.5.5 (bug #590454).

Using EAPI-6 which deprecates games.eclass.

Package-Manager: portage-2.3.1
Signed-off-by: Lars Wendler  gentoo.org>

 games-strategy/freeciv/Manifest |   1 +
 games-strategy/freeciv/freeciv-2.5.5.ebuild | 176 
 2 files changed, 177 insertions(+)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index b9a042f..b4a9241 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,2 +1,3 @@
 DIST freeciv-2.5.3.tar.bz2 41010519 SHA256 
480b0381c64bf1a9423f2507a75d76bda9bf45c3c3badd30b5bad105e75d805c SHA512 
a3e1ee5f585be062ec5fc7783dfe24f4cd313bea016af47b868e01561fc3958a86ed310edd41130fc5ede6ca2547ca38198c8dbb18974db7d14defd103277b4b
 WHIRLPOOL 
c75ef1419e965003aebb396fd7245fa0a859fea2574d74cc1ef8de7bb4b3b0e47f28ee8bcf0b30c3ad1116bd374336f51bb285d66ea244e4b68e44e33ad36ec4
 DIST freeciv-2.5.4.tar.bz2 40977253 SHA256 
9e64ef047fd0d2f8e9aa1da01586dea7cfe63a36b15875c168ada555c2e6634b SHA512 
08fb0d0e622fdb75a57edfa2de2c662fe68966e510dfc9c0219a00aa52f09ce67c43ad2df6109bdc440a39b020f4762015b04641f01327326768448acff46a92
 WHIRLPOOL 
c07b5fedcb50257df184c4173868b1455ec42298e6fb63517fa94cd70d2216e0d9ca23e861bee9928b83bcbdcb692cf13344a5c6909f2d2ba599193bba851b83
+DIST freeciv-2.5.5.tar.bz2 40828396 SHA256 
5622f2142637057f7e47b1eda764c4e131222fab4d5bb42cd59fbd58ba3db1d4 SHA512 
20cb71ab6d81b0ab272d1a0f8f2d639cbda3f6354a09fef3469cc35b391bf6efd947348c82c76dc632e3366ed1ee203af0e79a2378f7e5ea4206b4fede60f95e
 WHIRLPOOL 
9ca6655f645c84d4488b6c96d06b0e7aa0187a0d29d5e90b8e6c81d544b022727af4ec7004d570e352fc7c60e95f7985f0a9ede7b480247a376e63dbca1ecac4

diff --git a/games-strategy/freeciv/freeciv-2.5.5.ebuild 
b/games-strategy/freeciv/freeciv-2.5.5.ebuild
new file mode 100644
index ..cdb363b
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.5.5.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils gnome2-utils
+
+DESCRIPTION="multiplayer strategy game (Civilization Clone)"
+HOMEPAGE="http://www.freeciv.org/;
+SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
+
+# postgres isn't yet really supported by upstream
+RDEPEND="app-arch/bzip2
+   app-arch/xz-utils
+   net-misc/curl
+   sys-libs/zlib
+   auth? (
+   mysql? ( virtual/mysql )
+   sqlite? ( dev-db/sqlite:3 )
+   !mysql? ( ( !sqlite? ( virtual/mysql ) ) )
+   )
+   readline? ( sys-libs/readline:0= )
+   dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
+   !dedicated? (
+   media-libs/libpng:0
+   gtk? ( x11-libs/gtk+:2 )
+   mapimg? ( media-gfx/imagemagick:= )
+   modpack? ( x11-libs/gtk+:2 )
+   nls? ( virtual/libintl )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   sdl? (
+   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/libsdl[sound]
+   media-libs/sdl-mixer[vorbis]
+   )
+   !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
+   )
+   system-lua? ( >=dev-lang/lua-5.2 )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   !dedicated? (
+   x11-proto/xextproto
+   nls? ( sys-devel/gettext )
+   )"
+
+pkg_setup() {
+   if use !dedicated && use !server ; then
+   ewarn "Disabling server USE flag will make it impossible"
+   ewarn "to start local games, but you will still be able to"
+   ewarn "join multiplayer games."
+   fi
+}
+
+src_prepare() {
+   default
+
+   # install the .desktop in /usr/share/applications
+   # install the icons in /usr/share/pixmaps
+   sed -i \
+   -e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
+   -e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
+   -e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
+   client/Makefile.in \
+   server/Makefile.in \
+  

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

[Lars Wendler]

commit: a4ef4067ce1d554a8dfaeb9a575f18ed17173e1c
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Sep 19 11:36:23 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Sep 19 13:09:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4ef4067

games-strategy/freeciv: Added sub-slot dependency for sys-libs/readline.

Package-Manager: portage-2.3.1
Signed-off-by: Lars Wendler  gentoo.org>

 games-strategy/freeciv/freeciv-2.5.3.ebuild | 4 ++--
 games-strategy/freeciv/freeciv-2.5.4.ebuild | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/games-strategy/freeciv/freeciv-2.5.3.ebuild 
b/games-strategy/freeciv/freeciv-2.5.3.ebuild
index 7d267ed..d445a4f 100644
--- a/games-strategy/freeciv/freeciv-2.5.3.ebuild
+++ b/games-strategy/freeciv/freeciv-2.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -24,7 +24,7 @@ RDEPEND="app-arch/bzip2
sqlite? ( dev-db/sqlite:3 )
!mysql? ( ( !sqlite? ( virtual/mysql ) ) )
)
-   readline? ( sys-libs/readline:0 )
+   readline? ( sys-libs/readline:0= )
dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
!dedicated? (
media-libs/libpng:0

diff --git a/games-strategy/freeciv/freeciv-2.5.4.ebuild 
b/games-strategy/freeciv/freeciv-2.5.4.ebuild
index 37c7ec6..4b8b2b4 100644
--- a/games-strategy/freeciv/freeciv-2.5.4.ebuild
+++ b/games-strategy/freeciv/freeciv-2.5.4.ebuild
@@ -24,7 +24,7 @@ RDEPEND="app-arch/bzip2
sqlite? ( dev-db/sqlite:3 )
!mysql? ( ( !sqlite? ( virtual/mysql ) ) )
)
-   readline? ( sys-libs/readline:0 )
+   readline? ( sys-libs/readline:0= )
dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
!dedicated? (
media-libs/libpng:0

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

[Michael Sterrett]

commit: 79815c0a2fbaae57415fba9e83c063ec36e180dd
Author: Michael Sterrett  gentoo  org>
AuthorDate: Tue May 24 20:43:38 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Tue May 24 20:43:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79815c0a

games-strategy/freeciv: version bump (bug #583964)

Package-Manager: portage-2.2.28

 games-strategy/freeciv/Manifest |   1 +
 games-strategy/freeciv/freeciv-2.5.4.ebuild | 178 
 2 files changed, 179 insertions(+)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index c95a4d4..b9a042f 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1 +1,2 @@
 DIST freeciv-2.5.3.tar.bz2 41010519 SHA256 
480b0381c64bf1a9423f2507a75d76bda9bf45c3c3badd30b5bad105e75d805c SHA512 
a3e1ee5f585be062ec5fc7783dfe24f4cd313bea016af47b868e01561fc3958a86ed310edd41130fc5ede6ca2547ca38198c8dbb18974db7d14defd103277b4b
 WHIRLPOOL 
c75ef1419e965003aebb396fd7245fa0a859fea2574d74cc1ef8de7bb4b3b0e47f28ee8bcf0b30c3ad1116bd374336f51bb285d66ea244e4b68e44e33ad36ec4
+DIST freeciv-2.5.4.tar.bz2 40977253 SHA256 
9e64ef047fd0d2f8e9aa1da01586dea7cfe63a36b15875c168ada555c2e6634b SHA512 
08fb0d0e622fdb75a57edfa2de2c662fe68966e510dfc9c0219a00aa52f09ce67c43ad2df6109bdc440a39b020f4762015b04641f01327326768448acff46a92
 WHIRLPOOL 
c07b5fedcb50257df184c4173868b1455ec42298e6fb63517fa94cd70d2216e0d9ca23e861bee9928b83bcbdcb692cf13344a5c6909f2d2ba599193bba851b83

diff --git a/games-strategy/freeciv/freeciv-2.5.4.ebuild 
b/games-strategy/freeciv/freeciv-2.5.4.ebuild
new file mode 100644
index 000..37c7ec6
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.5.4.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils gnome2-utils games
+
+DESCRIPTION="multiplayer strategy game (Civilization Clone)"
+HOMEPAGE="http://www.freeciv.org/;
+SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
+
+# postgres isn't yet really supported by upstream
+RDEPEND="app-arch/bzip2
+   app-arch/xz-utils
+   net-misc/curl
+   sys-libs/zlib
+   auth? (
+   mysql? ( virtual/mysql )
+   sqlite? ( dev-db/sqlite:3 )
+   !mysql? ( ( !sqlite? ( virtual/mysql ) ) )
+   )
+   readline? ( sys-libs/readline:0 )
+   dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
+   !dedicated? (
+   media-libs/libpng:0
+   gtk? ( x11-libs/gtk+:2 )
+   mapimg? ( media-gfx/imagemagick )
+   modpack? ( x11-libs/gtk+:2 )
+   nls? ( virtual/libintl )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   sdl? (
+   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/libsdl[sound]
+   media-libs/sdl-mixer[vorbis]
+   )
+   !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
+   )
+   system-lua? ( >=dev-lang/lua-5.2 )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   !dedicated? (
+   x11-proto/xextproto
+   nls? ( sys-devel/gettext )
+   )"
+
+pkg_setup() {
+   if use !dedicated && use !server ; then
+   ewarn "Disabling server USE flag will make it impossible"
+   ewarn "to start local games, but you will still be able to"
+   ewarn "join multiplayer games."
+   fi
+   games_pkg_setup
+}
+
+src_prepare() {
+
+   # install the .desktop in /usr/share/applications
+   # install the icons in /usr/share/pixmaps
+   sed -i \
+   -e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
+   -e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
+   -e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
+   client/Makefile.in \
+   server/Makefile.in \
+   tools/Makefile.in \
+   data/icons/Makefile.in || die
+   sed -i -e 's/=SDL/=X-SDL/' bootstrap/freeciv-sdl.desktop.in || die
+}
+
+src_configure() {
+   local myclient myopts mydatabase
+
+   if use auth ; then
+   if use !mysql && use !sqlite ; then
+   einfo "No database backend chosen, defaulting"
+   einfo "to mysql!"
+   mydatabase=mysql
+   

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

[Michael Sterrett]

commit: 95ed38fe29ab426962f2d781e4a7b21383628a3d
Author: Michael Sterrett  gentoo  org>
AuthorDate: Tue Mar 15 16:57:59 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Wed Mar 16 03:57:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95ed38fe

games-strategy/freeciv: clean old

Package-Manager: portage-2.2.26

 games-strategy/freeciv/Manifest |   1 -
 games-strategy/freeciv/freeciv-2.5.1.ebuild | 178 
 2 files changed, 179 deletions(-)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 4bd4ca8..c95a4d4 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,2 +1 @@
-DIST freeciv-2.5.1.tar.bz2 40686265 SHA256 
4e420a9ad91aa7966039ec3b63501725c8261a4ff734d56fe801414fae772696 SHA512 
c0f5df3df7bab9ad8e9e7ce75ea90a539ca7e6aafb0af2b57a3d30b095e30f3b093e66bd8b92524e0e19919e0f5d4b822946219bf270e6071102db56290119b8
 WHIRLPOOL 
1773d56801316afae6ab470b1b1fdf71b42bd42ff0f7ede62b28c5ef7abcd0af36887401937a028b4a9a2e19f994389ef5f63c0395545ebcb367ff2089e2fd55
 DIST freeciv-2.5.3.tar.bz2 41010519 SHA256 
480b0381c64bf1a9423f2507a75d76bda9bf45c3c3badd30b5bad105e75d805c SHA512 
a3e1ee5f585be062ec5fc7783dfe24f4cd313bea016af47b868e01561fc3958a86ed310edd41130fc5ede6ca2547ca38198c8dbb18974db7d14defd103277b4b
 WHIRLPOOL 
c75ef1419e965003aebb396fd7245fa0a859fea2574d74cc1ef8de7bb4b3b0e47f28ee8bcf0b30c3ad1116bd374336f51bb285d66ea244e4b68e44e33ad36ec4

diff --git a/games-strategy/freeciv/freeciv-2.5.1.ebuild 
b/games-strategy/freeciv/freeciv-2.5.1.ebuild
deleted file mode 100644
index b569637..000
--- a/games-strategy/freeciv/freeciv-2.5.1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils gnome2-utils games
-
-DESCRIPTION="multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="http://www.freeciv.org/;
-SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
-
-# postgres isn't yet really supported by upstream
-RDEPEND="app-arch/bzip2
-   app-arch/xz-utils
-   net-misc/curl
-   sys-libs/zlib
-   auth? (
-   mysql? ( virtual/mysql )
-   sqlite? ( dev-db/sqlite:3 )
-   !mysql? ( ( !sqlite? ( virtual/mysql ) ) )
-   )
-   readline? ( sys-libs/readline:0 )
-   dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
-   !dedicated? (
-   media-libs/libpng:0
-   gtk? ( x11-libs/gtk+:2 )
-   mapimg? ( media-gfx/imagemagick )
-   modpack? ( x11-libs/gtk+:2 )
-   nls? ( virtual/libintl )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-   sdl? (
-   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/libsdl[sound]
-   media-libs/sdl-mixer[vorbis]
-   )
-   !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
-   )
-   system-lua? ( >=dev-lang/lua-5.2 )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   !dedicated? (
-   x11-proto/xextproto
-   nls? ( sys-devel/gettext )
-   )"
-
-pkg_setup() {
-   if use !dedicated && use !server ; then
-   ewarn "Disabling server USE flag will make it impossible"
-   ewarn "to start local games, but you will still be able to"
-   ewarn "join multiplayer games."
-   fi
-   games_pkg_setup
-}
-
-src_prepare() {
-
-   # install the .desktop in /usr/share/applications
-   # install the icons in /usr/share/pixmaps
-   sed -i \
-   -e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
-   -e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
-   -e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
-   client/Makefile.in \
-   server/Makefile.in \
-   tools/Makefile.in \
-   data/icons/Makefile.in || die
-   sed -i -e 's/=SDL/=X-SDL/' bootstrap/freeciv-sdl.desktop.in || die
-}
-
-src_configure() {
-   local myclient myopts mydatabase
-
-   if use auth ; then
-   if use !mysql && use !sqlite ; then
-   einfo "No database backend chosen, defaulting"
-   einfo "to mysql!"
-   mydatabase=mysql
-   else
-

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

[Agostino Sarubbo]

commit: 4355319707b1662dd145c306672ee30ca5feb832
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Mar 14 22:12:04 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Mar 14 22:12:04 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43553197

games-strategy/freeciv: amd64 stable wrt bug #577040

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 games-strategy/freeciv/freeciv-2.5.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/freeciv/freeciv-2.5.3.ebuild 
b/games-strategy/freeciv/freeciv-2.5.3.ebuild
index 4886b79..79da738 100644
--- a/games-strategy/freeciv/freeciv-2.5.3.ebuild
+++ b/games-strategy/freeciv/freeciv-2.5.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
 
 # postgres isn't yet really supported by upstream

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

[Michael Sterrett]

commit: 38cc4c08ee2ea747b979407651ec88fe6b015641
Author: Michael Sterrett  gentoo  org>
AuthorDate: Tue Feb 16 00:57:50 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Tue Feb 16 01:37:41 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38cc4c08

games-strategy/freeciv: clean old

Package-Manager: portage-2.2.26

 games-strategy/freeciv/Manifest |   1 -
 games-strategy/freeciv/freeciv-2.5.2.ebuild | 178 
 2 files changed, 179 deletions(-)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index eb676f3..4bd4ca8 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,3 +1,2 @@
 DIST freeciv-2.5.1.tar.bz2 40686265 SHA256 
4e420a9ad91aa7966039ec3b63501725c8261a4ff734d56fe801414fae772696 SHA512 
c0f5df3df7bab9ad8e9e7ce75ea90a539ca7e6aafb0af2b57a3d30b095e30f3b093e66bd8b92524e0e19919e0f5d4b822946219bf270e6071102db56290119b8
 WHIRLPOOL 
1773d56801316afae6ab470b1b1fdf71b42bd42ff0f7ede62b28c5ef7abcd0af36887401937a028b4a9a2e19f994389ef5f63c0395545ebcb367ff2089e2fd55
-DIST freeciv-2.5.2.tar.bz2 40819394 SHA256 
2b5665da849c8f95b9225857fc02935140de2d44cd1a112f9cf3086a84d0b5be SHA512 
c2cd2123a3c3c86406afaa2607cd86b88b7cfeeb54cc1ab2db3bb79d8c56cea66baca53df32ebf7a697d0d31f1c7d08c3fafed759879633d38717c8d31ec5244
 WHIRLPOOL 
d74c28d770c9fd5c499f2d66ab0485302ee53f2d10903095572529f59f464da6cc82b191d666b042093187805c00361399976a15c759cb61412ef77d06ae9b6d
 DIST freeciv-2.5.3.tar.bz2 41010519 SHA256 
480b0381c64bf1a9423f2507a75d76bda9bf45c3c3badd30b5bad105e75d805c SHA512 
a3e1ee5f585be062ec5fc7783dfe24f4cd313bea016af47b868e01561fc3958a86ed310edd41130fc5ede6ca2547ca38198c8dbb18974db7d14defd103277b4b
 WHIRLPOOL 
c75ef1419e965003aebb396fd7245fa0a859fea2574d74cc1ef8de7bb4b3b0e47f28ee8bcf0b30c3ad1116bd374336f51bb285d66ea244e4b68e44e33ad36ec4

diff --git a/games-strategy/freeciv/freeciv-2.5.2.ebuild 
b/games-strategy/freeciv/freeciv-2.5.2.ebuild
deleted file mode 100644
index 4886b79..000
--- a/games-strategy/freeciv/freeciv-2.5.2.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils gnome2-utils games
-
-DESCRIPTION="multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="http://www.freeciv.org/;
-SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
-
-# postgres isn't yet really supported by upstream
-RDEPEND="app-arch/bzip2
-   app-arch/xz-utils
-   net-misc/curl
-   sys-libs/zlib
-   auth? (
-   mysql? ( virtual/mysql )
-   sqlite? ( dev-db/sqlite:3 )
-   !mysql? ( ( !sqlite? ( virtual/mysql ) ) )
-   )
-   readline? ( sys-libs/readline:0 )
-   dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
-   !dedicated? (
-   media-libs/libpng:0
-   gtk? ( x11-libs/gtk+:2 )
-   mapimg? ( media-gfx/imagemagick )
-   modpack? ( x11-libs/gtk+:2 )
-   nls? ( virtual/libintl )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-   sdl? (
-   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/libsdl[sound]
-   media-libs/sdl-mixer[vorbis]
-   )
-   !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
-   )
-   system-lua? ( >=dev-lang/lua-5.2 )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   !dedicated? (
-   x11-proto/xextproto
-   nls? ( sys-devel/gettext )
-   )"
-
-pkg_setup() {
-   if use !dedicated && use !server ; then
-   ewarn "Disabling server USE flag will make it impossible"
-   ewarn "to start local games, but you will still be able to"
-   ewarn "join multiplayer games."
-   fi
-   games_pkg_setup
-}
-
-src_prepare() {
-
-   # install the .desktop in /usr/share/applications
-   # install the icons in /usr/share/pixmaps
-   sed -i \
-   -e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
-   -e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
-   -e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
-   client/Makefile.in \
-   server/Makefile.in \
-   tools/Makefile.in \
-   data/icons/Makefile.in || die
-   sed -i 

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

[Michael Sterrett]

commit: 6ba971f863861a5af82409913ed32bbc442acece
Author: Michael Sterrett  gentoo  org>
AuthorDate: Wed Feb 10 03:22:42 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Wed Feb 10 03:22:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ba971f8

games-strategy/freeciv: version bump (bug #574226)

Package-Manager: portage-2.2.26

 games-strategy/freeciv/Manifest |   1 +
 games-strategy/freeciv/freeciv-2.5.3.ebuild | 178 
 2 files changed, 179 insertions(+)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 65564cd..eb676f3 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,2 +1,3 @@
 DIST freeciv-2.5.1.tar.bz2 40686265 SHA256 
4e420a9ad91aa7966039ec3b63501725c8261a4ff734d56fe801414fae772696 SHA512 
c0f5df3df7bab9ad8e9e7ce75ea90a539ca7e6aafb0af2b57a3d30b095e30f3b093e66bd8b92524e0e19919e0f5d4b822946219bf270e6071102db56290119b8
 WHIRLPOOL 
1773d56801316afae6ab470b1b1fdf71b42bd42ff0f7ede62b28c5ef7abcd0af36887401937a028b4a9a2e19f994389ef5f63c0395545ebcb367ff2089e2fd55
 DIST freeciv-2.5.2.tar.bz2 40819394 SHA256 
2b5665da849c8f95b9225857fc02935140de2d44cd1a112f9cf3086a84d0b5be SHA512 
c2cd2123a3c3c86406afaa2607cd86b88b7cfeeb54cc1ab2db3bb79d8c56cea66baca53df32ebf7a697d0d31f1c7d08c3fafed759879633d38717c8d31ec5244
 WHIRLPOOL 
d74c28d770c9fd5c499f2d66ab0485302ee53f2d10903095572529f59f464da6cc82b191d666b042093187805c00361399976a15c759cb61412ef77d06ae9b6d
+DIST freeciv-2.5.3.tar.bz2 41010519 SHA256 
480b0381c64bf1a9423f2507a75d76bda9bf45c3c3badd30b5bad105e75d805c SHA512 
a3e1ee5f585be062ec5fc7783dfe24f4cd313bea016af47b868e01561fc3958a86ed310edd41130fc5ede6ca2547ca38198c8dbb18974db7d14defd103277b4b
 WHIRLPOOL 
c75ef1419e965003aebb396fd7245fa0a859fea2574d74cc1ef8de7bb4b3b0e47f28ee8bcf0b30c3ad1116bd374336f51bb285d66ea244e4b68e44e33ad36ec4

diff --git a/games-strategy/freeciv/freeciv-2.5.3.ebuild 
b/games-strategy/freeciv/freeciv-2.5.3.ebuild
new file mode 100644
index 000..4886b79
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.5.3.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils gnome2-utils games
+
+DESCRIPTION="multiplayer strategy game (Civilization Clone)"
+HOMEPAGE="http://www.freeciv.org/;
+SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
+
+# postgres isn't yet really supported by upstream
+RDEPEND="app-arch/bzip2
+   app-arch/xz-utils
+   net-misc/curl
+   sys-libs/zlib
+   auth? (
+   mysql? ( virtual/mysql )
+   sqlite? ( dev-db/sqlite:3 )
+   !mysql? ( ( !sqlite? ( virtual/mysql ) ) )
+   )
+   readline? ( sys-libs/readline:0 )
+   dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
+   !dedicated? (
+   media-libs/libpng:0
+   gtk? ( x11-libs/gtk+:2 )
+   mapimg? ( media-gfx/imagemagick )
+   modpack? ( x11-libs/gtk+:2 )
+   nls? ( virtual/libintl )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   sdl? (
+   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/libsdl[sound]
+   media-libs/sdl-mixer[vorbis]
+   )
+   !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
+   )
+   system-lua? ( >=dev-lang/lua-5.2 )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   !dedicated? (
+   x11-proto/xextproto
+   nls? ( sys-devel/gettext )
+   )"
+
+pkg_setup() {
+   if use !dedicated && use !server ; then
+   ewarn "Disabling server USE flag will make it impossible"
+   ewarn "to start local games, but you will still be able to"
+   ewarn "join multiplayer games."
+   fi
+   games_pkg_setup
+}
+
+src_prepare() {
+
+   # install the .desktop in /usr/share/applications
+   # install the icons in /usr/share/pixmaps
+   sed -i \
+   -e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
+   -e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
+   -e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
+   client/Makefile.in \
+   server/Makefile.in \
+   tools/Makefile.in \
+   data/icons/Makefile.in || die
+  

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

[Michael Sterrett]

commit: f44ca653cfef1c75d98d14f9604bcf2870df6b63
Author: Michael Sterrett  gentoo  org>
AuthorDate: Thu Jan 28 15:20:37 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Thu Jan 28 15:20:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f44ca653

games-strategy/freeciv: version bump (bug #573096)

Package-Manager: portage-2.2.26

 games-strategy/freeciv/Manifest |   1 +
 games-strategy/freeciv/freeciv-2.5.2.ebuild | 178 
 2 files changed, 179 insertions(+)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 87dc3fd..65564cd 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1 +1,2 @@
 DIST freeciv-2.5.1.tar.bz2 40686265 SHA256 
4e420a9ad91aa7966039ec3b63501725c8261a4ff734d56fe801414fae772696 SHA512 
c0f5df3df7bab9ad8e9e7ce75ea90a539ca7e6aafb0af2b57a3d30b095e30f3b093e66bd8b92524e0e19919e0f5d4b822946219bf270e6071102db56290119b8
 WHIRLPOOL 
1773d56801316afae6ab470b1b1fdf71b42bd42ff0f7ede62b28c5ef7abcd0af36887401937a028b4a9a2e19f994389ef5f63c0395545ebcb367ff2089e2fd55
+DIST freeciv-2.5.2.tar.bz2 40819394 SHA256 
2b5665da849c8f95b9225857fc02935140de2d44cd1a112f9cf3086a84d0b5be SHA512 
c2cd2123a3c3c86406afaa2607cd86b88b7cfeeb54cc1ab2db3bb79d8c56cea66baca53df32ebf7a697d0d31f1c7d08c3fafed759879633d38717c8d31ec5244
 WHIRLPOOL 
d74c28d770c9fd5c499f2d66ab0485302ee53f2d10903095572529f59f464da6cc82b191d666b042093187805c00361399976a15c759cb61412ef77d06ae9b6d

diff --git a/games-strategy/freeciv/freeciv-2.5.2.ebuild 
b/games-strategy/freeciv/freeciv-2.5.2.ebuild
new file mode 100644
index 000..4886b79
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.5.2.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils gnome2-utils games
+
+DESCRIPTION="multiplayer strategy game (Civilization Clone)"
+HOMEPAGE="http://www.freeciv.org/;
+SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
+
+# postgres isn't yet really supported by upstream
+RDEPEND="app-arch/bzip2
+   app-arch/xz-utils
+   net-misc/curl
+   sys-libs/zlib
+   auth? (
+   mysql? ( virtual/mysql )
+   sqlite? ( dev-db/sqlite:3 )
+   !mysql? ( ( !sqlite? ( virtual/mysql ) ) )
+   )
+   readline? ( sys-libs/readline:0 )
+   dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
+   !dedicated? (
+   media-libs/libpng:0
+   gtk? ( x11-libs/gtk+:2 )
+   mapimg? ( media-gfx/imagemagick )
+   modpack? ( x11-libs/gtk+:2 )
+   nls? ( virtual/libintl )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   sdl? (
+   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/libsdl[sound]
+   media-libs/sdl-mixer[vorbis]
+   )
+   !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
+   )
+   system-lua? ( >=dev-lang/lua-5.2 )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   !dedicated? (
+   x11-proto/xextproto
+   nls? ( sys-devel/gettext )
+   )"
+
+pkg_setup() {
+   if use !dedicated && use !server ; then
+   ewarn "Disabling server USE flag will make it impossible"
+   ewarn "to start local games, but you will still be able to"
+   ewarn "join multiplayer games."
+   fi
+   games_pkg_setup
+}
+
+src_prepare() {
+
+   # install the .desktop in /usr/share/applications
+   # install the icons in /usr/share/pixmaps
+   sed -i \
+   -e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
+   -e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
+   -e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
+   client/Makefile.in \
+   server/Makefile.in \
+   tools/Makefile.in \
+   data/icons/Makefile.in || die
+   sed -i -e 's/=SDL/=X-SDL/' bootstrap/freeciv-sdl.desktop.in || die
+}
+
+src_configure() {
+   local myclient myopts mydatabase
+
+   if use auth ; then
+   if use !mysql && use !sqlite ; then
+   einfo "No database backend chosen, defaulting"
+   einfo "to mysql!"
+   mydatabase=mysql
+   

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

[Michael Sterrett]

commit: 21c9db2834c5eef2273c2ef5763cfd14caaaf199
Author: Michael Sterrett  gentoo  org>
AuthorDate: Thu Oct  8 06:18:54 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Thu Oct  8 06:19:07 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21c9db28

clean old

Package-Manager: portage-2.2.20.1

 games-strategy/freeciv/Manifest |   2 -
 games-strategy/freeciv/freeciv-2.4.4.ebuild | 173 ---
 games-strategy/freeciv/freeciv-2.5.0.ebuild | 178 
 3 files changed, 353 deletions(-)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 0260544..87dc3fd 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,3 +1 @@
-DIST freeciv-2.4.4.tar.bz2 38847925 SHA256 
8307fc9d69571b031ccc465e8029d8a7ea3dbef4e3651f2de07356aba931e2a3 SHA512 
3f2ff619b21c36748a98bda98c923ec9ea71faf18cac77d8b247e4a79c4a8f41c9b399e648a0a51fe54738de3276081c31ded98f769104812125d304716796a7
 WHIRLPOOL 
0eb8374ad2d7174dab8971c39c0ce7f14e72c1c7a64dfa8461a054a53d2b659af71197bad7c65e65e3e5da4fd5552bfb10aa2fa8b9870c9b1fbd7e03c58c9c00
-DIST freeciv-2.5.0.tar.bz2 40323793 SHA256 
bd9f7523ea79b8d2806d0c1844a9f48506ccd18276330580319913c43051210b SHA512 
f03bafdca47da0677ad81ed945afe79bbd01ae871b95e6bdaf6249acb8420e78e3210dd60f520d960ec127e1d443f45c11fcc484b49b6bb59cab5904e51fc651
 WHIRLPOOL 
1a9768837b40c6c19ff6138d07074d96d75d2cecdb671180659d9380beb7c996fcb0be2fb343166fe46e92cc2c2e7495be2683f62440540cea3072f34e928391
 DIST freeciv-2.5.1.tar.bz2 40686265 SHA256 
4e420a9ad91aa7966039ec3b63501725c8261a4ff734d56fe801414fae772696 SHA512 
c0f5df3df7bab9ad8e9e7ce75ea90a539ca7e6aafb0af2b57a3d30b095e30f3b093e66bd8b92524e0e19919e0f5d4b822946219bf270e6071102db56290119b8
 WHIRLPOOL 
1773d56801316afae6ab470b1b1fdf71b42bd42ff0f7ede62b28c5ef7abcd0af36887401937a028b4a9a2e19f994389ef5f63c0395545ebcb367ff2089e2fd55

diff --git a/games-strategy/freeciv/freeciv-2.4.4.ebuild 
b/games-strategy/freeciv/freeciv-2.4.4.ebuild
deleted file mode 100644
index 96d07d3..000
--- a/games-strategy/freeciv/freeciv-2.4.4.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils gnome2-utils games
-
-DESCRIPTION="multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="http://www.freeciv.org/;
-SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls postgres 
readline sdl +server +sound sqlite"
-
-RDEPEND="app-arch/bzip2
-   app-arch/xz-utils
-   dev-lang/lua
-   net-misc/curl
-   sys-libs/zlib
-   auth? (
-   mysql? ( virtual/mysql )
-   postgres? ( dev-db/postgresql )
-   sqlite? ( dev-db/sqlite:3 )
-   !mysql? ( !postgres? ( !sqlite? ( virtual/mysql ) ) )
-   )
-   readline? ( sys-libs/readline:0 )
-   dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
-   !dedicated? (
-   media-libs/libpng:0
-   gtk? ( x11-libs/gtk+:2 )
-   mapimg? ( media-gfx/imagemagick )
-   modpack? ( x11-libs/gtk+:2 )
-   nls? ( virtual/libintl )
-   sdl? (
-   media-libs/libsdl[video]
-   media-libs/sdl-image[png]
-   media-libs/freetype:2
-   )
-   server? ( aimodules? ( sys-devel/libtool:2 ) )
-   sound? (
-   media-libs/libsdl[sound]
-   media-libs/sdl-mixer[vorbis]
-   )
-   !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
-   )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   !dedicated? (
-   x11-proto/xextproto
-   nls? ( sys-devel/gettext )
-   )"
-
-pkg_setup() {
-   if use !dedicated && use !server ; then
-   ewarn "Disabling server USE flag will make it impossible"
-   ewarn "to start local games, but you will still be able to"
-   ewarn "join multiplayer games."
-   fi
-   games_pkg_setup
-}
-
-src_prepare() {
-
-   # install the .desktop in /usr/share/applications
-   # install the icons in /usr/share/pixmaps
-   sed -i \
-   -e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
-   -e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
-   -e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
-   client/Makefile.in \
-   server/Makefile.in \
-   modinst/Makefile.in \
-   data/Makefile.in \
-   data/icons/Makefile.in || die
-   sed -i -e 's/=SDL/=X-SDL/' bootstrap/freeciv-sdl.desktop.in || die
-}
-
-src_configure() {
-   local myclient myopts mydatabase
-
-   

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

[Agostino Sarubbo]

commit: e310c6e0679b6a1a9d3772b9e9bd1eb17c48cedb
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Sep 25 10:42:52 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Sep 25 10:42:52 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e310c6e0

games-strategy/freeciv: amd64 stable wrt bug #561430

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"

 games-strategy/freeciv/freeciv-2.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/freeciv/freeciv-2.5.1.ebuild 
b/games-strategy/freeciv/freeciv-2.5.1.ebuild
index 1b4d6aa..06dce90 100644
--- a/games-strategy/freeciv/freeciv-2.5.1.ebuild
+++ b/games-strategy/freeciv/freeciv-2.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
 
 # postgres isn't yet really supported by upstream

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

[Agostino Sarubbo]

commit: ecc977747b90c7544e7d32c9bee0a2c6877827f0
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Sep 25 14:12:36 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Sep 25 14:12:36 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecc97774

games-strategy/freeciv: x86 stable wrt bug #561430

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"

 games-strategy/freeciv/freeciv-2.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/freeciv/freeciv-2.5.1.ebuild 
b/games-strategy/freeciv/freeciv-2.5.1.ebuild
index 06dce90..b569637 100644
--- a/games-strategy/freeciv/freeciv-2.5.1.ebuild
+++ b/games-strategy/freeciv/freeciv-2.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua"
 
 # postgres isn't yet really supported by upstream

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

[Lars Wendler]

commit: b964bb05fe54c61122e225a623d6349f11c7363b
Author: Lars Wendler polynomial-c AT gentoo DOT org
AuthorDate: Sat Aug 22 08:55:31 2015 +
Commit: Lars Wendler polynomial-c AT gentoo DOT org
CommitDate: Sat Aug 22 08:55:59 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b964bb05

games-strategy/freeciv: Bump to version 2.5.1

with kind permission from mr_bones_

Package-Manager: portage-2.2.20.1
Signed-off-by: Lars Wendler polynomial-c AT gentoo.org

 games-strategy/freeciv/Manifest |   1 +
 games-strategy/freeciv/freeciv-2.5.1.ebuild | 178 
 2 files changed, 179 insertions(+)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index e10ca61..0260544 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,2 +1,3 @@
 DIST freeciv-2.4.4.tar.bz2 38847925 SHA256 
8307fc9d69571b031ccc465e8029d8a7ea3dbef4e3651f2de07356aba931e2a3 SHA512 
3f2ff619b21c36748a98bda98c923ec9ea71faf18cac77d8b247e4a79c4a8f41c9b399e648a0a51fe54738de3276081c31ded98f769104812125d304716796a7
 WHIRLPOOL 
0eb8374ad2d7174dab8971c39c0ce7f14e72c1c7a64dfa8461a054a53d2b659af71197bad7c65e65e3e5da4fd5552bfb10aa2fa8b9870c9b1fbd7e03c58c9c00
 DIST freeciv-2.5.0.tar.bz2 40323793 SHA256 
bd9f7523ea79b8d2806d0c1844a9f48506ccd18276330580319913c43051210b SHA512 
f03bafdca47da0677ad81ed945afe79bbd01ae871b95e6bdaf6249acb8420e78e3210dd60f520d960ec127e1d443f45c11fcc484b49b6bb59cab5904e51fc651
 WHIRLPOOL 
1a9768837b40c6c19ff6138d07074d96d75d2cecdb671180659d9380beb7c996fcb0be2fb343166fe46e92cc2c2e7495be2683f62440540cea3072f34e928391
+DIST freeciv-2.5.1.tar.bz2 40686265 SHA256 
4e420a9ad91aa7966039ec3b63501725c8261a4ff734d56fe801414fae772696 SHA512 
c0f5df3df7bab9ad8e9e7ce75ea90a539ca7e6aafb0af2b57a3d30b095e30f3b093e66bd8b92524e0e19919e0f5d4b822946219bf270e6071102db56290119b8
 WHIRLPOOL 
1773d56801316afae6ab470b1b1fdf71b42bd42ff0f7ede62b28c5ef7abcd0af36887401937a028b4a9a2e19f994389ef5f63c0395545ebcb367ff2089e2fd55

diff --git a/games-strategy/freeciv/freeciv-2.5.1.ebuild 
b/games-strategy/freeciv/freeciv-2.5.1.ebuild
new file mode 100644
index 000..1b4d6aa
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.5.1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils gnome2-utils games
+
+DESCRIPTION=multiplayer strategy game (Civilization Clone)
+HOMEPAGE=http://www.freeciv.org/;
+SRC_URI=mirror://sourceforge/freeciv/${P}.tar.bz2
+
+LICENSE=GPL-2
+SLOT=0
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+IUSE=auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua
+
+# postgres isn't yet really supported by upstream
+RDEPEND=app-arch/bzip2
+   app-arch/xz-utils
+   net-misc/curl
+   sys-libs/zlib
+   auth? (
+   mysql? ( virtual/mysql )
+   sqlite? ( dev-db/sqlite:3 )
+   !mysql? ( ( !sqlite? ( virtual/mysql ) ) )
+   )
+   readline? ( sys-libs/readline:0 )
+   dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
+   !dedicated? (
+   media-libs/libpng:0
+   gtk? ( x11-libs/gtk+:2 )
+   mapimg? ( media-gfx/imagemagick )
+   modpack? ( x11-libs/gtk+:2 )
+   nls? ( virtual/libintl )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   sdl? (
+   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/libsdl[sound]
+   media-libs/sdl-mixer[vorbis]
+   )
+   !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
+   )
+   system-lua? ( =dev-lang/lua-5.2 )
+DEPEND=${RDEPEND}
+   virtual/pkgconfig
+   !dedicated? (
+   x11-proto/xextproto
+   nls? ( sys-devel/gettext )
+   )
+
+pkg_setup() {
+   if use !dedicated  use !server ; then
+   ewarn Disabling server USE flag will make it impossible
+   ewarn to start local games, but you will still be able to
+   ewarn join multiplayer games.
+   fi
+   games_pkg_setup
+}
+
+src_prepare() {
+
+   # install the .desktop in /usr/share/applications
+   # install the icons in /usr/share/pixmaps
+   sed -i \
+   -e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
+   -e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
+   -e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
+   client/Makefile.in \
+