subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: games\-strategy\/wesnoth\/"

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

2024-05-27 Thread Sam James

commit: 768f7595d58ed27e21fea815a52c5ca20c21410a
Author: Sam James  gentoo  org>
AuthorDate: Tue May 28 01:41:33 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 28 01:41:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=768f7595

games-strategy/wesnoth: fix build w/ boost-1.85

Closes: https://bugs.gentoo.org/932255
Thanks-to: Marcin Deranek  slonko.net>
Signed-off-by: Sam James  gentoo.org>

 games-strategy/wesnoth/files/wesnoth-1.18.0-boost-1.85.patch | 12 
 games-strategy/wesnoth/wesnoth-1.18.0.ebuild |  4 
 2 files changed, 16 insertions(+)

diff --git a/games-strategy/wesnoth/files/wesnoth-1.18.0-boost-1.85.patch 
b/games-strategy/wesnoth/files/wesnoth-1.18.0-boost-1.85.patch
new file mode 100644
index ..412a4cf8e39d
--- /dev/null
+++ b/games-strategy/wesnoth/files/wesnoth-1.18.0-boost-1.85.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/932255
+--- a/src/filesystem.cpp
 b/src/filesystem.cpp
+@@ -30,6 +30,7 @@
+ #include "serialization/unicode.hpp"
+ #include "utils/general.hpp"
+ 
++#include 
+ #include 
+ #include 
+ #include 
+

diff --git a/games-strategy/wesnoth/wesnoth-1.18.0.ebuild 
b/games-strategy/wesnoth/wesnoth-1.18.0.ebuild
index ba33c9b827a8..1843a5985958 100644
--- a/games-strategy/wesnoth/wesnoth-1.18.0.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.18.0.ebuild
@@ -43,6 +43,10 @@ BDEPEND="
virtual/pkgconfig
 "
 
+PATCHES=(
+   "${FILESDIR}"/wesnoth-1.18.0-boost-1.85.patch
+)
+
 src_prepare() {
cmake_src_prepare

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

2024-05-09 Thread Pacho Ramos

commit: 1cc4ea1522e7013ca4d95ca7d47693e7b4c65563
Author: Pacho Ramos  gentoo  org>
AuthorDate: Thu May  9 09:08:28 2024 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Thu May  9 09:08:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cc4ea15

games-strategy/wesnoth: Fix failing test

Closes: https://bugs.gentoo.org/931551
Signed-off-by: Pacho Ramos  gentoo.org>

 games-strategy/wesnoth/wesnoth-1.18.0.ebuild | 5 +
 1 file changed, 5 insertions(+)

diff --git a/games-strategy/wesnoth/wesnoth-1.18.0.ebuild 
b/games-strategy/wesnoth/wesnoth-1.18.0.ebuild
index eb3ae4211e88..ba33c9b827a8 100644
--- a/games-strategy/wesnoth/wesnoth-1.18.0.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.18.0.ebuild
@@ -92,6 +92,11 @@ src_configure() {
cmake_src_configure
 }
 
+src_test() {
+   # Allow SDL_Mixer test to pass, bug #931551
+   SDL_AUDIODRIVER=dummy cmake_src_test
+}
+
 src_install() {
local DOCS=( README.md changelog.md )
cmake_src_install

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

2024-05-08 Thread Florian Schmaus

commit: b0e38ead7b2b02f524e9c1549689f3191f896312
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Wed May  8 18:08:55 2024 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Wed May  8 20:49:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0e38ead

games-strategy/wesnoth: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Florian Schmaus  gentoo.org>

 .../wesnoth/files/wesnoth-1.16.8-gcc-13.patch  | 32 --
 1 file changed, 32 deletions(-)

diff --git a/games-strategy/wesnoth/files/wesnoth-1.16.8-gcc-13.patch 
b/games-strategy/wesnoth/files/wesnoth-1.16.8-gcc-13.patch
deleted file mode 100644
index f2d79ba6ad06..
--- a/games-strategy/wesnoth/files/wesnoth-1.16.8-gcc-13.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://github.com/wesnoth/wesnoth/commit/5fa07ea15c1736f74d89786d5ae449ed0f91c8a8
-
-From 5fa07ea15c1736f74d89786d5ae449ed0f91c8a8 Mon Sep 17 00:00:00 2001
-From: Martin Liska 
-Date: Mon, 23 May 2022 13:44:39 +0200
-Subject: [PATCH] Fix building with GCC 13.
-
-Fixes the following issue:
-base64.hpp:23:49: error: 'uint8_t' was not declared in this scope
-
-and:
-deprecation.hpp:20:22: error: found ':' in nested-name-specifier, expected '::'
 a/src/deprecation.hpp
-+++ b/src/deprecation.hpp
-@@ -14,6 +14,7 @@
- 
- #pragma once
- 
-+#include 
- #include 
- 
- /** See https://wiki.wesnoth.org/CompatibilityStandards for more info. */
 a/src/serialization/base64.hpp
-+++ b/src/serialization/base64.hpp
-@@ -15,6 +15,7 @@
- 
- #pragma once
- 
-+#include 
- #include 
- #include 
-

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

2024-05-07 Thread Pacho Ramos

commit: e739646df9f27c7dbef2408916d00ad386441526
Author: Pacho Ramos  gentoo  org>
AuthorDate: Tue May  7 19:03:26 2024 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Tue May  7 19:03:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e739646d

games-strategy/wesnoth: add 1.18.0

Closes: https://bugs.gentoo.org/871567
Closes: https://bugs.gentoo.org/894696
Closes: https://bugs.gentoo.org/906996
Closes: https://bugs.gentoo.org/910521
Closes: https://bugs.gentoo.org/920061
Signed-off-by: Pacho Ramos  gentoo.org>

 games-strategy/wesnoth/Manifest  |   1 +
 games-strategy/wesnoth/wesnoth-1.18.0.ebuild | 102 +++
 2 files changed, 103 insertions(+)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 359e84aa77db..97609fd839a7 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -2,3 +2,4 @@ DIST wesnoth-1.16.10.tar.gz 518628374 BLAKE2B 
7aaed481607bc58e9d0f22e4c4a36f24f1
 DIST wesnoth-1.16.9.tar.gz 518511920 BLAKE2B 
bc9bfa9b514e72ce732a4256f765976f5be806d12dd962b2b396ffa8646acaa84c1bb1f4b20368886579782f8236c0d71f296bb5bd2451d4b0d8f6ce46bc3a18
 SHA512 
313aaad95c66757a952c00f1e5a515ce61bcf7564d6555802bc2619714d038a9a5607f3395e3e8afe5f216205e5b9b07b651789a749b4de37b30f8b8a47cb47f
 DIST wesnoth-1.17.19.tar.bz2 424402790 BLAKE2B 
bfb594b2c6421f8c553fda4db7ee9df57f7a5c9ed5589354c5360abe8e7d155720c9b904e8c480ade106308e4e0202ee209bb2550455a45b2dd4dc4a32428c14
 SHA512 
4c43d462a512525640448069c14bb0690ba3bddba793568810c1f3a3af6b26caa922d5e893b6ec5579f23ed244e4cce6604fbc9aa162809050422fe0e44364e4
 DIST wesnoth-1.17.20.tar.bz2 424613262 BLAKE2B 
acf8b6a9213b1fea9370c76cc7e63001fa34777357ab791db8380ca684195e830385939d0e31fbb058e5c84ebce74f084d9884bdf27d1ecb662e28dbcb477dab
 SHA512 
b7eaaf624e84b28eca7d702a791fbe7c6b9e833d3e4f9d61ee79c70737ec396b81b2cefedae0ef272ec5384d71c28a4b083bf837591f6ce2c345d79f43b1e87e
+DIST wesnoth-1.18.0.tar.bz2 460686063 BLAKE2B 
9dd898a6b430999873ae001dad47b2bcadcbbfc4672bf4489533c0268a4bf982a4e4451f79bf62bb1ac66d4ba2f06b62484b2b1b1fccb2e434c4ceef95a2c2bc
 SHA512 
7c7cd1021d9af2e790f3973ae258d7e401b665102cfcdb9e7fb400471d8488b7fa3f35a17a32c53b646d707dcc0508fef379ae6ce2dc79f1d675a7b2ec0e50c2

diff --git a/games-strategy/wesnoth/wesnoth-1.18.0.ebuild 
b/games-strategy/wesnoth/wesnoth-1.18.0.ebuild
new file mode 100644
index ..eb3ae4211e88
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.18.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+   https://github.com/wesnoth/wesnoth;
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2;
+
+LICENSE="GPL-2"
+SLOT="0"
+# uneven minor versions are development versions
+if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
+   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+IUSE="dbus dedicated doc nls server"
+
+RDEPEND="
+   acct-group/wesnoth
+   acct-user/wesnoth
+   dev-libs/boost:=[bzip2,context,icu,nls]
+   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+   !dedicated? (
+   dev-libs/glib:2
+   dev-libs/openssl:0=
+   >=media-libs/fontconfig-2.4.1
+   >=media-libs/sdl2-image-2.0.0[jpeg,png,webp]
+   >=media-libs/sdl2-mixer-2.0.0[vorbis]
+   media-libs/libvorbis
+   >=x11-libs/pango-1.22.0
+   >=x11-libs/cairo-1.10.0
+   sys-libs/readline:0=
+   dbus? ( sys-apps/dbus )
+   )"
+DEPEND="${RDEPEND}
+   x11-libs/libX11
+"
+BDEPEND="
+   sys-devel/gettext
+   virtual/pkgconfig
+"
+
+src_prepare() {
+   cmake_src_prepare
+
+   if ! use doc ; then
+   sed -i \
+   -e '/manual/d' \
+   doc/CMakeLists.txt || die
+   fi
+
+   # respect LINGUAS (bug #483316)
+   if [[ ${LINGUAS+set} ]] ; then
+   local lang langs=()
+   for lang in $(cat po/LINGUAS) ; do
+   has ${lang} ${LINGUAS} && langs+=( ${lang} )
+   done
+   echo "${langs[@]}" > po/LINGUAS || die
+   fi
+}
+
+src_configure() {
+   filter-flags -ftracer -fomit-frame-pointer
+
+   local mycmakeargs=()
+
+   if use dedicated || use server ; then
+   mycmakeargs+=(
+   -DENABLE_CAMPAIGN_SERVER="ON"
+   -DENABLE_SERVER="ON"
+   -DSERVER_UID="${PN}"
+   -DSERVER_GID="${PN}"
+   -DFIFO_DIR="/run/wesnothd"
+   )
+   else
+   mycmakeargs+=(
+   -DENABLE_CAMPAIGN_SERVER="OFF"
+   -DENABLE_SERVER="OFF"
+   )
+

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

2024-05-07 Thread Pacho Ramos

commit: edee84437d304523d11cb9c4395d2dfa4fc13df2
Author: Pacho Ramos  gentoo  org>
AuthorDate: Tue May  7 19:03:45 2024 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Tue May  7 19:03:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edee8443

games-strategy/wesnoth: drop 1.16.9, 1.17.19

Signed-off-by: Pacho Ramos  gentoo.org>

 games-strategy/wesnoth/Manifest   |   2 -
 games-strategy/wesnoth/wesnoth-1.16.9.ebuild  | 106 --
 games-strategy/wesnoth/wesnoth-1.17.19.ebuild | 102 -
 3 files changed, 210 deletions(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 97609fd839a7..c5a9cd75594f 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,5 +1,3 @@
 DIST wesnoth-1.16.10.tar.gz 518628374 BLAKE2B 
7aaed481607bc58e9d0f22e4c4a36f24f19b4fc522ce3c1eb6366e70e3bd901a10f055d2add9dc1c73519368fd4a31cd6b326e42b1be0023eeda370076db0742
 SHA512 
0473ec4e4b7a33a37c2ff52b4e0c3dccec2e58a087517566967409dda03952127bf560b09cfccc7243f506201d98980aafdf289b7f1e5345a7e3b4316a908240
-DIST wesnoth-1.16.9.tar.gz 518511920 BLAKE2B 
bc9bfa9b514e72ce732a4256f765976f5be806d12dd962b2b396ffa8646acaa84c1bb1f4b20368886579782f8236c0d71f296bb5bd2451d4b0d8f6ce46bc3a18
 SHA512 
313aaad95c66757a952c00f1e5a515ce61bcf7564d6555802bc2619714d038a9a5607f3395e3e8afe5f216205e5b9b07b651789a749b4de37b30f8b8a47cb47f
-DIST wesnoth-1.17.19.tar.bz2 424402790 BLAKE2B 
bfb594b2c6421f8c553fda4db7ee9df57f7a5c9ed5589354c5360abe8e7d155720c9b904e8c480ade106308e4e0202ee209bb2550455a45b2dd4dc4a32428c14
 SHA512 
4c43d462a512525640448069c14bb0690ba3bddba793568810c1f3a3af6b26caa922d5e893b6ec5579f23ed244e4cce6604fbc9aa162809050422fe0e44364e4
 DIST wesnoth-1.17.20.tar.bz2 424613262 BLAKE2B 
acf8b6a9213b1fea9370c76cc7e63001fa34777357ab791db8380ca684195e830385939d0e31fbb058e5c84ebce74f084d9884bdf27d1ecb662e28dbcb477dab
 SHA512 
b7eaaf624e84b28eca7d702a791fbe7c6b9e833d3e4f9d61ee79c70737ec396b81b2cefedae0ef272ec5384d71c28a4b083bf837591f6ce2c345d79f43b1e87e
 DIST wesnoth-1.18.0.tar.bz2 460686063 BLAKE2B 
9dd898a6b430999873ae001dad47b2bcadcbbfc4672bf4489533c0268a4bf982a4e4451f79bf62bb1ac66d4ba2f06b62484b2b1b1fccb2e434c4ceef95a2c2bc
 SHA512 
7c7cd1021d9af2e790f3973ae258d7e401b665102cfcdb9e7fb400471d8488b7fa3f35a17a32c53b646d707dcc0508fef379ae6ce2dc79f1d675a7b2ec0e50c2

diff --git a/games-strategy/wesnoth/wesnoth-1.16.9.ebuild 
b/games-strategy/wesnoth/wesnoth-1.16.9.ebuild
deleted file mode 100644
index 7a0223c3d681..
--- a/games-strategy/wesnoth/wesnoth-1.16.9.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org
-   https://github.com/wesnoth/wesnoth;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# uneven minor versions are development versions
-if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
-   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-IUSE="dbus dedicated doc nls server"
-
-RDEPEND="
-   acct-group/wesnoth
-   acct-user/wesnoth
-   dev-libs/boost:=[bzip2,context,icu,nls]
-   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
-   !dedicated? (
-   dev-libs/glib:2
-   dev-libs/openssl:0=
-   >=media-libs/fontconfig-2.4.1
-   >=media-libs/sdl2-image-2.0.0[jpeg,png]
-   >=media-libs/sdl2-mixer-2.0.0[vorbis]
-   media-libs/libvorbis
-   >=x11-libs/pango-1.22.0
-   >=x11-libs/cairo-1.10.0
-   sys-libs/readline:0=
-   dbus? ( sys-apps/dbus )
-   )"
-DEPEND="${RDEPEND}
-   x11-libs/libX11
-"
-BDEPEND="
-   sys-devel/gettext
-   virtual/pkgconfig
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.16.8-gcc-13.patch
-)
-
-src_prepare() {
-   cmake_src_prepare
-
-   if ! use doc ; then
-   sed -i \
-   -e '/manual/d' \
-   doc/CMakeLists.txt || die
-   fi
-
-   # respect LINGUAS (bug #483316)
-   if [[ ${LINGUAS+set} ]] ; then
-   local lang langs=()
-   for lang in $(cat po/LINGUAS) ; do
-   has ${lang} ${LINGUAS} && langs+=( ${lang} )
-   done
-   echo "${langs[@]}" > po/LINGUAS || die
-   fi
-}
-
-src_configure() {
-   filter-flags -ftracer -fomit-frame-pointer
-
-   local mycmakeargs=()
-
-   if use dedicated || use server ; then
-   mycmakeargs+=(
-   -DENABLE_CAMPAIGN_SERVER="ON"
-   -DENABLE_SERVER="ON"
-   -DSERVER_UID="${PN}"
-   -DSERVER_GID="${PN}"
-   -DFIFO_DIR="/run/wesnothd"

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

2023-08-24 Thread Pacho Ramos

commit: 71e03c5df298be999546115390312bb25314bef0
Author: Pacho Ramos  gentoo  org>
AuthorDate: Thu Aug 24 14:32:23 2023 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Thu Aug 24 14:35:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71e03c5d

games-strategy/wesnoth: Apply patch fixing boost-1.83 compat

Thanks-to: solpeth
Closes: https://github.com/gentoo/gentoo/pull/32415
Closes: https://bugs.gentoo.org/912385
Closes: https://bugs.gentoo.org/912968
Signed-off-by: Pacho Ramos  gentoo.org>

 .../wesnoth/files/wesnoth-1.16.10-boost-1.83.patch | 26 ++
 games-strategy/wesnoth/wesnoth-1.16.10.ebuild  |  4 
 2 files changed, 30 insertions(+)

diff --git a/games-strategy/wesnoth/files/wesnoth-1.16.10-boost-1.83.patch 
b/games-strategy/wesnoth/files/wesnoth-1.16.10-boost-1.83.patch
new file mode 100644
index ..2c9e55db0472
--- /dev/null
+++ b/games-strategy/wesnoth/files/wesnoth-1.16.10-boost-1.83.patch
@@ -0,0 +1,26 @@
+From 136e651d69fc91fa7a4154f8a4a7e977cc46eca4 Mon Sep 17 00:00:00 2001
+From: Pentarctagon 
+Date: Thu, 17 Aug 2023 23:19:21 -0500
+Subject: [PATCH] Compile fix for boost 1.83.
+
+Fixes #7849
+---
+ src/gettext.cpp | 4 
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/gettext.cpp b/src/gettext.cpp
+index 9888dede35ad..fa9b17ba85b2 100644
+--- a/src/gettext.cpp
 b/src/gettext.cpp
+@@ -169,7 +169,11 @@ namespace
+   return msg;
+   }
+ 
++#if BOOST_VERSION < 108300
+   const char* get(int domain_id, const char* ctx, const char* 
sid, int n) const override
++#else
++  const char* get(int domain_id, const char* ctx, const char* 
sid, bl::count_type n) const override
++#endif
+   {
+   auto& base = get_base();
+   const char* msg = base.get(domain_id, ctx, sid, n);

diff --git a/games-strategy/wesnoth/wesnoth-1.16.10.ebuild 
b/games-strategy/wesnoth/wesnoth-1.16.10.ebuild
index d3d826ea899c..cb9bc76bf65d 100644
--- a/games-strategy/wesnoth/wesnoth-1.16.10.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.16.10.ebuild
@@ -43,6 +43,10 @@ BDEPEND="
virtual/pkgconfig
 "
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.16.10-boost-1.83.patch #912385
+)
+
 src_prepare() {
cmake_src_prepare

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

2023-08-24 Thread Pacho Ramos

commit: 420dd1b3e2566e5bd88b29dd29812d057ba89f63
Author: Pacho Ramos  gentoo  org>
AuthorDate: Thu Aug 24 13:58:32 2023 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Thu Aug 24 14:00:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=420dd1b3

games-strategy/wesnoth: add 1.17.20

Signed-off-by: Pacho Ramos  gentoo.org>

 games-strategy/wesnoth/Manifest   |   1 +
 games-strategy/wesnoth/wesnoth-1.17.20.ebuild | 102 ++
 2 files changed, 103 insertions(+)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 46bb23272a14..4257802e4705 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -3,3 +3,4 @@ DIST wesnoth-1.16.8.tar.gz 518468407 BLAKE2B 
9c224757e0d1727acc66a5421266fa6e050
 DIST wesnoth-1.16.9.tar.gz 518511920 BLAKE2B 
bc9bfa9b514e72ce732a4256f765976f5be806d12dd962b2b396ffa8646acaa84c1bb1f4b20368886579782f8236c0d71f296bb5bd2451d4b0d8f6ce46bc3a18
 SHA512 
313aaad95c66757a952c00f1e5a515ce61bcf7564d6555802bc2619714d038a9a5607f3395e3e8afe5f216205e5b9b07b651789a749b4de37b30f8b8a47cb47f
 DIST wesnoth-1.17.17.tar.bz2 423574966 BLAKE2B 
08bcc889333a74b45882f0b1a87960f333eb833c135429f19e3e5805206a45d6e890baa5b2b944d54e8aa088295bcf697c592d96703ee1fb49314e080f3949d8
 SHA512 
721edb885f5f215d679f50ae5ec34c11631771d248320617d55808580f4d1ab22d24b5a4e4001113ad8990b2e0f4e13d64a97a57de30d5453bd82e54ee7949aa
 DIST wesnoth-1.17.19.tar.bz2 424402790 BLAKE2B 
bfb594b2c6421f8c553fda4db7ee9df57f7a5c9ed5589354c5360abe8e7d155720c9b904e8c480ade106308e4e0202ee209bb2550455a45b2dd4dc4a32428c14
 SHA512 
4c43d462a512525640448069c14bb0690ba3bddba793568810c1f3a3af6b26caa922d5e893b6ec5579f23ed244e4cce6604fbc9aa162809050422fe0e44364e4
+DIST wesnoth-1.17.20.tar.bz2 424613262 BLAKE2B 
acf8b6a9213b1fea9370c76cc7e63001fa34777357ab791db8380ca684195e830385939d0e31fbb058e5c84ebce74f084d9884bdf27d1ecb662e28dbcb477dab
 SHA512 
b7eaaf624e84b28eca7d702a791fbe7c6b9e833d3e4f9d61ee79c70737ec396b81b2cefedae0ef272ec5384d71c28a4b083bf837591f6ce2c345d79f43b1e87e

diff --git a/games-strategy/wesnoth/wesnoth-1.17.20.ebuild 
b/games-strategy/wesnoth/wesnoth-1.17.20.ebuild
new file mode 100644
index ..b4c9db3eeff1
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.17.20.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+   https://github.com/wesnoth/wesnoth;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+# uneven minor versions are development versions
+if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
+   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+IUSE="dbus dedicated doc nls server"
+
+RDEPEND="
+   acct-group/wesnoth
+   acct-user/wesnoth
+   dev-libs/boost:=[bzip2,context,icu,nls]
+   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+   !dedicated? (
+   dev-libs/glib:2
+   dev-libs/openssl:0=
+   >=media-libs/fontconfig-2.4.1
+   >=media-libs/sdl2-image-2.0.0[jpeg,png,webp]
+   >=media-libs/sdl2-mixer-2.0.0[vorbis]
+   media-libs/libvorbis
+   >=x11-libs/pango-1.22.0
+   >=x11-libs/cairo-1.10.0
+   sys-libs/readline:0=
+   dbus? ( sys-apps/dbus )
+   )"
+DEPEND="${RDEPEND}
+   x11-libs/libX11
+"
+BDEPEND="
+   sys-devel/gettext
+   virtual/pkgconfig
+"
+
+src_prepare() {
+   cmake_src_prepare
+
+   if ! use doc ; then
+   sed -i \
+   -e '/manual/d' \
+   doc/CMakeLists.txt || die
+   fi
+
+   # respect LINGUAS (bug #483316)
+   if [[ ${LINGUAS+set} ]] ; then
+   local lang langs=()
+   for lang in $(cat po/LINGUAS) ; do
+   has ${lang} ${LINGUAS} && langs+=( ${lang} )
+   done
+   echo "${langs[@]}" > po/LINGUAS || die
+   fi
+}
+
+src_configure() {
+   filter-flags -ftracer -fomit-frame-pointer
+
+   local mycmakeargs=()
+
+   if use dedicated || use server ; then
+   mycmakeargs+=(
+   -DENABLE_CAMPAIGN_SERVER="ON"
+   -DENABLE_SERVER="ON"
+   -DSERVER_UID="${PN}"
+   -DSERVER_GID="${PN}"
+   -DFIFO_DIR="/run/wesnothd"
+   )
+   else
+   mycmakeargs+=(
+   -DENABLE_CAMPAIGN_SERVER="OFF"
+   -DENABLE_SERVER="OFF"
+   )
+   fi
+   mycmakeargs+=(
+   -Wno-dev
+   -DENABLE_GAME="$(usex !dedicated)"
+   -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+   -DENABLE_NLS="$(usex

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

2023-08-24 Thread Pacho Ramos

commit: c61267c04cbb3b789046dc47b98d7c57ae46adf5
Author: Pacho Ramos  gentoo  org>
AuthorDate: Thu Aug 24 13:58:46 2023 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Thu Aug 24 14:00:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c61267c0

games-strategy/wesnoth: drop 1.16.8, 1.17.17

Signed-off-by: Pacho Ramos  gentoo.org>

 games-strategy/wesnoth/Manifest   |   2 -
 games-strategy/wesnoth/wesnoth-1.16.8.ebuild  | 106 --
 games-strategy/wesnoth/wesnoth-1.17.17.ebuild | 102 -
 3 files changed, 210 deletions(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 4257802e4705..359e84aa77db 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,6 +1,4 @@
 DIST wesnoth-1.16.10.tar.gz 518628374 BLAKE2B 
7aaed481607bc58e9d0f22e4c4a36f24f19b4fc522ce3c1eb6366e70e3bd901a10f055d2add9dc1c73519368fd4a31cd6b326e42b1be0023eeda370076db0742
 SHA512 
0473ec4e4b7a33a37c2ff52b4e0c3dccec2e58a087517566967409dda03952127bf560b09cfccc7243f506201d98980aafdf289b7f1e5345a7e3b4316a908240
-DIST wesnoth-1.16.8.tar.gz 518468407 BLAKE2B 
9c224757e0d1727acc66a5421266fa6e050bb3727040b457379dd164097c88850f9b2d8b81422ff277548cb8cd51da70f5da63254c2c4ccedc3a45d1789c6037
 SHA512 
9e41e1c574c9744ba9818298d77df1503d7fc70ee24e4bf9d1f59ef17c2bc123f38f0aa21eddccce88cc28b62f2a2d12133ab25dd111655abf5b620f18457bf7
 DIST wesnoth-1.16.9.tar.gz 518511920 BLAKE2B 
bc9bfa9b514e72ce732a4256f765976f5be806d12dd962b2b396ffa8646acaa84c1bb1f4b20368886579782f8236c0d71f296bb5bd2451d4b0d8f6ce46bc3a18
 SHA512 
313aaad95c66757a952c00f1e5a515ce61bcf7564d6555802bc2619714d038a9a5607f3395e3e8afe5f216205e5b9b07b651789a749b4de37b30f8b8a47cb47f
-DIST wesnoth-1.17.17.tar.bz2 423574966 BLAKE2B 
08bcc889333a74b45882f0b1a87960f333eb833c135429f19e3e5805206a45d6e890baa5b2b944d54e8aa088295bcf697c592d96703ee1fb49314e080f3949d8
 SHA512 
721edb885f5f215d679f50ae5ec34c11631771d248320617d55808580f4d1ab22d24b5a4e4001113ad8990b2e0f4e13d64a97a57de30d5453bd82e54ee7949aa
 DIST wesnoth-1.17.19.tar.bz2 424402790 BLAKE2B 
bfb594b2c6421f8c553fda4db7ee9df57f7a5c9ed5589354c5360abe8e7d155720c9b904e8c480ade106308e4e0202ee209bb2550455a45b2dd4dc4a32428c14
 SHA512 
4c43d462a512525640448069c14bb0690ba3bddba793568810c1f3a3af6b26caa922d5e893b6ec5579f23ed244e4cce6604fbc9aa162809050422fe0e44364e4
 DIST wesnoth-1.17.20.tar.bz2 424613262 BLAKE2B 
acf8b6a9213b1fea9370c76cc7e63001fa34777357ab791db8380ca684195e830385939d0e31fbb058e5c84ebce74f084d9884bdf27d1ecb662e28dbcb477dab
 SHA512 
b7eaaf624e84b28eca7d702a791fbe7c6b9e833d3e4f9d61ee79c70737ec396b81b2cefedae0ef272ec5384d71c28a4b083bf837591f6ce2c345d79f43b1e87e

diff --git a/games-strategy/wesnoth/wesnoth-1.16.8.ebuild 
b/games-strategy/wesnoth/wesnoth-1.16.8.ebuild
deleted file mode 100644
index 7a0223c3d681..
--- a/games-strategy/wesnoth/wesnoth-1.16.8.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org
-   https://github.com/wesnoth/wesnoth;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# uneven minor versions are development versions
-if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
-   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-IUSE="dbus dedicated doc nls server"
-
-RDEPEND="
-   acct-group/wesnoth
-   acct-user/wesnoth
-   dev-libs/boost:=[bzip2,context,icu,nls]
-   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
-   !dedicated? (
-   dev-libs/glib:2
-   dev-libs/openssl:0=
-   >=media-libs/fontconfig-2.4.1
-   >=media-libs/sdl2-image-2.0.0[jpeg,png]
-   >=media-libs/sdl2-mixer-2.0.0[vorbis]
-   media-libs/libvorbis
-   >=x11-libs/pango-1.22.0
-   >=x11-libs/cairo-1.10.0
-   sys-libs/readline:0=
-   dbus? ( sys-apps/dbus )
-   )"
-DEPEND="${RDEPEND}
-   x11-libs/libX11
-"
-BDEPEND="
-   sys-devel/gettext
-   virtual/pkgconfig
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.16.8-gcc-13.patch
-)
-
-src_prepare() {
-   cmake_src_prepare
-
-   if ! use doc ; then
-   sed -i \
-   -e '/manual/d' \
-   doc/CMakeLists.txt || die
-   fi
-
-   # respect LINGUAS (bug #483316)
-   if [[ ${LINGUAS+set} ]] ; then
-   local lang langs=()
-   for lang in $(cat po/LINGUAS) ; do
-   has ${lang} ${LINGUAS} && langs+=( ${lang} )
-   done
-   echo "${langs[@]}" > po/LINGUAS || die
-   fi
-}
-
-src_configure() {
-   filter-flags -ftracer -fomit-frame-pointer
-
-   local mycmakeargs=()
-
-

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

2023-08-24 Thread Pacho Ramos

commit: 9740dd339088208c037fccda60a0ad6299f429db
Author: Pacho Ramos  gentoo  org>
AuthorDate: Thu Aug 24 13:58:10 2023 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Thu Aug 24 14:00:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9740dd33

games-strategy/wesnoth: add 1.16.10

Closes: https://bugs.gentoo.org/912385
Signed-off-by: Pacho Ramos  gentoo.org>

 games-strategy/wesnoth/Manifest   |   1 +
 games-strategy/wesnoth/wesnoth-1.16.10.ebuild | 102 ++
 2 files changed, 103 insertions(+)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 69c52b393ad2..46bb23272a14 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,3 +1,4 @@
+DIST wesnoth-1.16.10.tar.gz 518628374 BLAKE2B 
7aaed481607bc58e9d0f22e4c4a36f24f19b4fc522ce3c1eb6366e70e3bd901a10f055d2add9dc1c73519368fd4a31cd6b326e42b1be0023eeda370076db0742
 SHA512 
0473ec4e4b7a33a37c2ff52b4e0c3dccec2e58a087517566967409dda03952127bf560b09cfccc7243f506201d98980aafdf289b7f1e5345a7e3b4316a908240
 DIST wesnoth-1.16.8.tar.gz 518468407 BLAKE2B 
9c224757e0d1727acc66a5421266fa6e050bb3727040b457379dd164097c88850f9b2d8b81422ff277548cb8cd51da70f5da63254c2c4ccedc3a45d1789c6037
 SHA512 
9e41e1c574c9744ba9818298d77df1503d7fc70ee24e4bf9d1f59ef17c2bc123f38f0aa21eddccce88cc28b62f2a2d12133ab25dd111655abf5b620f18457bf7
 DIST wesnoth-1.16.9.tar.gz 518511920 BLAKE2B 
bc9bfa9b514e72ce732a4256f765976f5be806d12dd962b2b396ffa8646acaa84c1bb1f4b20368886579782f8236c0d71f296bb5bd2451d4b0d8f6ce46bc3a18
 SHA512 
313aaad95c66757a952c00f1e5a515ce61bcf7564d6555802bc2619714d038a9a5607f3395e3e8afe5f216205e5b9b07b651789a749b4de37b30f8b8a47cb47f
 DIST wesnoth-1.17.17.tar.bz2 423574966 BLAKE2B 
08bcc889333a74b45882f0b1a87960f333eb833c135429f19e3e5805206a45d6e890baa5b2b944d54e8aa088295bcf697c592d96703ee1fb49314e080f3949d8
 SHA512 
721edb885f5f215d679f50ae5ec34c11631771d248320617d55808580f4d1ab22d24b5a4e4001113ad8990b2e0f4e13d64a97a57de30d5453bd82e54ee7949aa

diff --git a/games-strategy/wesnoth/wesnoth-1.16.10.ebuild 
b/games-strategy/wesnoth/wesnoth-1.16.10.ebuild
new file mode 100644
index ..d3d826ea899c
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.16.10.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+   https://github.com/wesnoth/wesnoth;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# uneven minor versions are development versions
+if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
+   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+IUSE="dbus dedicated doc nls server"
+
+RDEPEND="
+   acct-group/wesnoth
+   acct-user/wesnoth
+   dev-libs/boost:=[bzip2,context,icu,nls]
+   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+   !dedicated? (
+   dev-libs/glib:2
+   dev-libs/openssl:0=
+   >=media-libs/fontconfig-2.4.1
+   >=media-libs/sdl2-image-2.0.0[jpeg,png]
+   >=media-libs/sdl2-mixer-2.0.0[vorbis]
+   media-libs/libvorbis
+   >=x11-libs/pango-1.22.0
+   >=x11-libs/cairo-1.10.0
+   sys-libs/readline:0=
+   dbus? ( sys-apps/dbus )
+   )"
+DEPEND="${RDEPEND}
+   x11-libs/libX11
+"
+BDEPEND="
+   sys-devel/gettext
+   virtual/pkgconfig
+"
+
+src_prepare() {
+   cmake_src_prepare
+
+   if ! use doc ; then
+   sed -i \
+   -e '/manual/d' \
+   doc/CMakeLists.txt || die
+   fi
+
+   # respect LINGUAS (bug #483316)
+   if [[ ${LINGUAS+set} ]] ; then
+   local lang langs=()
+   for lang in $(cat po/LINGUAS) ; do
+   has ${lang} ${LINGUAS} && langs+=( ${lang} )
+   done
+   echo "${langs[@]}" > po/LINGUAS || die
+   fi
+}
+
+src_configure() {
+   filter-flags -ftracer -fomit-frame-pointer
+
+   local mycmakeargs=()
+
+   if use dedicated || use server ; then
+   mycmakeargs+=(
+   -DENABLE_CAMPAIGN_SERVER="ON"
+   -DENABLE_SERVER="ON"
+   -DSERVER_UID="${PN}"
+   -DSERVER_GID="${PN}"
+   -DFIFO_DIR="/run/wesnothd"
+   )
+   else
+   mycmakeargs+=(
+   -DENABLE_CAMPAIGN_SERVER="OFF"
+   -DENABLE_SERVER="OFF"
+   )
+   fi
+   mycmakeargs+=(
+   -Wno-dev
+   -DENABLE_GAME="$(usex !dedicated)"
+   -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+   -DENABLE_NLS="$(usex nls)"
+

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

2023-07-18 Thread Pacho Ramos

commit: fcb1361a738e427ee215673a056701e9daaf0427
Author: Pacho Ramos  gentoo  org>
AuthorDate: Tue Jul 18 07:10:51 2023 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Tue Jul 18 07:10:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcb1361a

games-strategy/wesnoth: drop 1.17.11

Signed-off-by: Pacho Ramos  gentoo.org>

 games-strategy/wesnoth/Manifest   |   1 -
 games-strategy/wesnoth/wesnoth-1.17.11.ebuild | 102 --
 2 files changed, 103 deletions(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 6acaa7ac96e7..69c52b393ad2 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,5 +1,4 @@
 DIST wesnoth-1.16.8.tar.gz 518468407 BLAKE2B 
9c224757e0d1727acc66a5421266fa6e050bb3727040b457379dd164097c88850f9b2d8b81422ff277548cb8cd51da70f5da63254c2c4ccedc3a45d1789c6037
 SHA512 
9e41e1c574c9744ba9818298d77df1503d7fc70ee24e4bf9d1f59ef17c2bc123f38f0aa21eddccce88cc28b62f2a2d12133ab25dd111655abf5b620f18457bf7
 DIST wesnoth-1.16.9.tar.gz 518511920 BLAKE2B 
bc9bfa9b514e72ce732a4256f765976f5be806d12dd962b2b396ffa8646acaa84c1bb1f4b20368886579782f8236c0d71f296bb5bd2451d4b0d8f6ce46bc3a18
 SHA512 
313aaad95c66757a952c00f1e5a515ce61bcf7564d6555802bc2619714d038a9a5607f3395e3e8afe5f216205e5b9b07b651789a749b4de37b30f8b8a47cb47f
-DIST wesnoth-1.17.11.tar.bz2 421068195 BLAKE2B 
43106bb72c6b4a39b4995fb9804733e5420b636db08254e75e7698c58740b84a33c387194bf048247bddf1808f73d0d07b3816f18687390760fb5fab7c2d8449
 SHA512 
8208ae1c02d5e6a9fe50a2cf533d3b0b207151e5b877c98b003117641ae3c46ad31dbbe4bc46481f4f30382ae65b0183d7636452de5f6d42c8bd48d040f3dd5a
 DIST wesnoth-1.17.17.tar.bz2 423574966 BLAKE2B 
08bcc889333a74b45882f0b1a87960f333eb833c135429f19e3e5805206a45d6e890baa5b2b944d54e8aa088295bcf697c592d96703ee1fb49314e080f3949d8
 SHA512 
721edb885f5f215d679f50ae5ec34c11631771d248320617d55808580f4d1ab22d24b5a4e4001113ad8990b2e0f4e13d64a97a57de30d5453bd82e54ee7949aa
 DIST wesnoth-1.17.19.tar.bz2 424402790 BLAKE2B 
bfb594b2c6421f8c553fda4db7ee9df57f7a5c9ed5589354c5360abe8e7d155720c9b904e8c480ade106308e4e0202ee209bb2550455a45b2dd4dc4a32428c14
 SHA512 
4c43d462a512525640448069c14bb0690ba3bddba793568810c1f3a3af6b26caa922d5e893b6ec5579f23ed244e4cce6604fbc9aa162809050422fe0e44364e4

diff --git a/games-strategy/wesnoth/wesnoth-1.17.11.ebuild 
b/games-strategy/wesnoth/wesnoth-1.17.11.ebuild
deleted file mode 100644
index 834aa1c3259c..
--- a/games-strategy/wesnoth/wesnoth-1.17.11.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org
-   https://github.com/wesnoth/wesnoth;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-# uneven minor versions are development versions
-if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
-   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-IUSE="dbus dedicated doc nls server"
-
-RDEPEND="
-   acct-group/wesnoth
-   acct-user/wesnoth
-   dev-libs/boost:=[bzip2,context,icu,nls]
-   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
-   !dedicated? (
-   dev-libs/glib:2
-   dev-libs/openssl:0=
-   >=media-libs/fontconfig-2.4.1
-   >=media-libs/sdl2-image-2.0.0[jpeg,png]
-   >=media-libs/sdl2-mixer-2.0.0[vorbis]
-   media-libs/libvorbis
-   >=x11-libs/pango-1.22.0
-   >=x11-libs/cairo-1.10.0
-   sys-libs/readline:0=
-   dbus? ( sys-apps/dbus )
-   )"
-DEPEND="${RDEPEND}
-   x11-libs/libX11
-"
-BDEPEND="
-   sys-devel/gettext
-   virtual/pkgconfig
-"
-
-src_prepare() {
-   cmake_src_prepare
-
-   if ! use doc ; then
-   sed -i \
-   -e '/manual/d' \
-   doc/CMakeLists.txt || die
-   fi
-
-   # respect LINGUAS (bug #483316)
-   if [[ ${LINGUAS+set} ]] ; then
-   local lang langs=()
-   for lang in $(cat po/LINGUAS) ; do
-   has ${lang} ${LINGUAS} && langs+=( ${lang} )
-   done
-   echo "${langs[@]}" > po/LINGUAS || die
-   fi
-}
-
-src_configure() {
-   filter-flags -ftracer -fomit-frame-pointer
-
-   local mycmakeargs=()
-
-   if use dedicated || use server ; then
-   mycmakeargs+=(
-   -DENABLE_CAMPAIGN_SERVER="ON"
-   -DENABLE_SERVER="ON"
-   -DSERVER_UID="${PN}"
-   -DSERVER_GID="${PN}"
-   -DFIFO_DIR="/run/wesnothd"
-   )
-   else
-   mycmakeargs+=(
-   -DENABLE_CAMPAIGN_SERVER="OFF"
-   -DENABLE_SERVER="OFF"
-

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

2023-07-18 Thread Pacho Ramos

commit: ba56375007d500503480468d8392a9143a41727d
Author: Pacho Ramos  gentoo  org>
AuthorDate: Tue Jul 18 07:09:19 2023 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Tue Jul 18 07:09:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba563750

games-strategy/wesnoth: add 1.17.19

Signed-off-by: Pacho Ramos  gentoo.org>

 games-strategy/wesnoth/Manifest   |   1 +
 games-strategy/wesnoth/wesnoth-1.17.19.ebuild | 102 ++
 2 files changed, 103 insertions(+)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 4105e896a19e..9d7ca80e3e07 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,3 +1,4 @@
 DIST wesnoth-1.16.8.tar.gz 518468407 BLAKE2B 
9c224757e0d1727acc66a5421266fa6e050bb3727040b457379dd164097c88850f9b2d8b81422ff277548cb8cd51da70f5da63254c2c4ccedc3a45d1789c6037
 SHA512 
9e41e1c574c9744ba9818298d77df1503d7fc70ee24e4bf9d1f59ef17c2bc123f38f0aa21eddccce88cc28b62f2a2d12133ab25dd111655abf5b620f18457bf7
 DIST wesnoth-1.17.11.tar.bz2 421068195 BLAKE2B 
43106bb72c6b4a39b4995fb9804733e5420b636db08254e75e7698c58740b84a33c387194bf048247bddf1808f73d0d07b3816f18687390760fb5fab7c2d8449
 SHA512 
8208ae1c02d5e6a9fe50a2cf533d3b0b207151e5b877c98b003117641ae3c46ad31dbbe4bc46481f4f30382ae65b0183d7636452de5f6d42c8bd48d040f3dd5a
 DIST wesnoth-1.17.17.tar.bz2 423574966 BLAKE2B 
08bcc889333a74b45882f0b1a87960f333eb833c135429f19e3e5805206a45d6e890baa5b2b944d54e8aa088295bcf697c592d96703ee1fb49314e080f3949d8
 SHA512 
721edb885f5f215d679f50ae5ec34c11631771d248320617d55808580f4d1ab22d24b5a4e4001113ad8990b2e0f4e13d64a97a57de30d5453bd82e54ee7949aa
+DIST wesnoth-1.17.19.tar.bz2 424402790 BLAKE2B 
bfb594b2c6421f8c553fda4db7ee9df57f7a5c9ed5589354c5360abe8e7d155720c9b904e8c480ade106308e4e0202ee209bb2550455a45b2dd4dc4a32428c14
 SHA512 
4c43d462a512525640448069c14bb0690ba3bddba793568810c1f3a3af6b26caa922d5e893b6ec5579f23ed244e4cce6604fbc9aa162809050422fe0e44364e4

diff --git a/games-strategy/wesnoth/wesnoth-1.17.19.ebuild 
b/games-strategy/wesnoth/wesnoth-1.17.19.ebuild
new file mode 100644
index ..b4c9db3eeff1
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.17.19.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+   https://github.com/wesnoth/wesnoth;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+# uneven minor versions are development versions
+if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
+   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+IUSE="dbus dedicated doc nls server"
+
+RDEPEND="
+   acct-group/wesnoth
+   acct-user/wesnoth
+   dev-libs/boost:=[bzip2,context,icu,nls]
+   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+   !dedicated? (
+   dev-libs/glib:2
+   dev-libs/openssl:0=
+   >=media-libs/fontconfig-2.4.1
+   >=media-libs/sdl2-image-2.0.0[jpeg,png,webp]
+   >=media-libs/sdl2-mixer-2.0.0[vorbis]
+   media-libs/libvorbis
+   >=x11-libs/pango-1.22.0
+   >=x11-libs/cairo-1.10.0
+   sys-libs/readline:0=
+   dbus? ( sys-apps/dbus )
+   )"
+DEPEND="${RDEPEND}
+   x11-libs/libX11
+"
+BDEPEND="
+   sys-devel/gettext
+   virtual/pkgconfig
+"
+
+src_prepare() {
+   cmake_src_prepare
+
+   if ! use doc ; then
+   sed -i \
+   -e '/manual/d' \
+   doc/CMakeLists.txt || die
+   fi
+
+   # respect LINGUAS (bug #483316)
+   if [[ ${LINGUAS+set} ]] ; then
+   local lang langs=()
+   for lang in $(cat po/LINGUAS) ; do
+   has ${lang} ${LINGUAS} && langs+=( ${lang} )
+   done
+   echo "${langs[@]}" > po/LINGUAS || die
+   fi
+}
+
+src_configure() {
+   filter-flags -ftracer -fomit-frame-pointer
+
+   local mycmakeargs=()
+
+   if use dedicated || use server ; then
+   mycmakeargs+=(
+   -DENABLE_CAMPAIGN_SERVER="ON"
+   -DENABLE_SERVER="ON"
+   -DSERVER_UID="${PN}"
+   -DSERVER_GID="${PN}"
+   -DFIFO_DIR="/run/wesnothd"
+   )
+   else
+   mycmakeargs+=(
+   -DENABLE_CAMPAIGN_SERVER="OFF"
+   -DENABLE_SERVER="OFF"
+   )
+   fi
+   mycmakeargs+=(
+   -Wno-dev
+   -DENABLE_GAME="$(usex !dedicated)"
+   -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+   -DENABLE_NLS="$(usex nls)"
+   -DENABLE_NOTIFICATIONS="$(usex dbus)"
+

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

2023-07-18 Thread Pacho Ramos

commit: 76bda37d674e49d56e3863543557297a71e8f3de
Author: Pacho Ramos  gentoo  org>
AuthorDate: Tue Jul 18 07:10:24 2023 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Tue Jul 18 07:10:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76bda37d

games-strategy/wesnoth: add 1.16.9

Signed-off-by: Pacho Ramos  gentoo.org>

 games-strategy/wesnoth/Manifest  |   1 +
 games-strategy/wesnoth/wesnoth-1.16.9.ebuild | 106 +++
 2 files changed, 107 insertions(+)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 9d7ca80e3e07..6acaa7ac96e7 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,4 +1,5 @@
 DIST wesnoth-1.16.8.tar.gz 518468407 BLAKE2B 
9c224757e0d1727acc66a5421266fa6e050bb3727040b457379dd164097c88850f9b2d8b81422ff277548cb8cd51da70f5da63254c2c4ccedc3a45d1789c6037
 SHA512 
9e41e1c574c9744ba9818298d77df1503d7fc70ee24e4bf9d1f59ef17c2bc123f38f0aa21eddccce88cc28b62f2a2d12133ab25dd111655abf5b620f18457bf7
+DIST wesnoth-1.16.9.tar.gz 518511920 BLAKE2B 
bc9bfa9b514e72ce732a4256f765976f5be806d12dd962b2b396ffa8646acaa84c1bb1f4b20368886579782f8236c0d71f296bb5bd2451d4b0d8f6ce46bc3a18
 SHA512 
313aaad95c66757a952c00f1e5a515ce61bcf7564d6555802bc2619714d038a9a5607f3395e3e8afe5f216205e5b9b07b651789a749b4de37b30f8b8a47cb47f
 DIST wesnoth-1.17.11.tar.bz2 421068195 BLAKE2B 
43106bb72c6b4a39b4995fb9804733e5420b636db08254e75e7698c58740b84a33c387194bf048247bddf1808f73d0d07b3816f18687390760fb5fab7c2d8449
 SHA512 
8208ae1c02d5e6a9fe50a2cf533d3b0b207151e5b877c98b003117641ae3c46ad31dbbe4bc46481f4f30382ae65b0183d7636452de5f6d42c8bd48d040f3dd5a
 DIST wesnoth-1.17.17.tar.bz2 423574966 BLAKE2B 
08bcc889333a74b45882f0b1a87960f333eb833c135429f19e3e5805206a45d6e890baa5b2b944d54e8aa088295bcf697c592d96703ee1fb49314e080f3949d8
 SHA512 
721edb885f5f215d679f50ae5ec34c11631771d248320617d55808580f4d1ab22d24b5a4e4001113ad8990b2e0f4e13d64a97a57de30d5453bd82e54ee7949aa
 DIST wesnoth-1.17.19.tar.bz2 424402790 BLAKE2B 
bfb594b2c6421f8c553fda4db7ee9df57f7a5c9ed5589354c5360abe8e7d155720c9b904e8c480ade106308e4e0202ee209bb2550455a45b2dd4dc4a32428c14
 SHA512 
4c43d462a512525640448069c14bb0690ba3bddba793568810c1f3a3af6b26caa922d5e893b6ec5579f23ed244e4cce6604fbc9aa162809050422fe0e44364e4

diff --git a/games-strategy/wesnoth/wesnoth-1.16.9.ebuild 
b/games-strategy/wesnoth/wesnoth-1.16.9.ebuild
new file mode 100644
index ..7a0223c3d681
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.16.9.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+   https://github.com/wesnoth/wesnoth;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# uneven minor versions are development versions
+if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
+   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+IUSE="dbus dedicated doc nls server"
+
+RDEPEND="
+   acct-group/wesnoth
+   acct-user/wesnoth
+   dev-libs/boost:=[bzip2,context,icu,nls]
+   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+   !dedicated? (
+   dev-libs/glib:2
+   dev-libs/openssl:0=
+   >=media-libs/fontconfig-2.4.1
+   >=media-libs/sdl2-image-2.0.0[jpeg,png]
+   >=media-libs/sdl2-mixer-2.0.0[vorbis]
+   media-libs/libvorbis
+   >=x11-libs/pango-1.22.0
+   >=x11-libs/cairo-1.10.0
+   sys-libs/readline:0=
+   dbus? ( sys-apps/dbus )
+   )"
+DEPEND="${RDEPEND}
+   x11-libs/libX11
+"
+BDEPEND="
+   sys-devel/gettext
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.16.8-gcc-13.patch
+)
+
+src_prepare() {
+   cmake_src_prepare
+
+   if ! use doc ; then
+   sed -i \
+   -e '/manual/d' \
+   doc/CMakeLists.txt || die
+   fi
+
+   # respect LINGUAS (bug #483316)
+   if [[ ${LINGUAS+set} ]] ; then
+   local lang langs=()
+   for lang in $(cat po/LINGUAS) ; do
+   has ${lang} ${LINGUAS} && langs+=( ${lang} )
+   done
+   echo "${langs[@]}" > po/LINGUAS || die
+   fi
+}
+
+src_configure() {
+   filter-flags -ftracer -fomit-frame-pointer
+
+   local mycmakeargs=()
+
+   if use dedicated || use server ; then
+   mycmakeargs+=(
+   -DENABLE_CAMPAIGN_SERVER="ON"
+   -DENABLE_SERVER="ON"
+   -DSERVER_UID="${PN}"
+   -DSERVER_GID="${PN}"
+   -DFIFO_DIR="/run/wesnothd"
+   )
+   else
+   mycmakeargs+=(
+

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

2023-05-28 Thread Pacho Ramos

commit: b8b4dda3b110d9a415e78fdff1ae75861e6f00fe
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun May 28 13:56:58 2023 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun May 28 13:56:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8b4dda3

games-strategy/wesnoth: add 1.17.17

Closes: https://bugs.gentoo.org/892762
Signed-off-by: Pacho Ramos  gentoo.org>

 games-strategy/wesnoth/Manifest   |   1 +
 games-strategy/wesnoth/wesnoth-1.17.17.ebuild | 102 ++
 2 files changed, 103 insertions(+)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 899e199d0e98..4105e896a19e 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,2 +1,3 @@
 DIST wesnoth-1.16.8.tar.gz 518468407 BLAKE2B 
9c224757e0d1727acc66a5421266fa6e050bb3727040b457379dd164097c88850f9b2d8b81422ff277548cb8cd51da70f5da63254c2c4ccedc3a45d1789c6037
 SHA512 
9e41e1c574c9744ba9818298d77df1503d7fc70ee24e4bf9d1f59ef17c2bc123f38f0aa21eddccce88cc28b62f2a2d12133ab25dd111655abf5b620f18457bf7
 DIST wesnoth-1.17.11.tar.bz2 421068195 BLAKE2B 
43106bb72c6b4a39b4995fb9804733e5420b636db08254e75e7698c58740b84a33c387194bf048247bddf1808f73d0d07b3816f18687390760fb5fab7c2d8449
 SHA512 
8208ae1c02d5e6a9fe50a2cf533d3b0b207151e5b877c98b003117641ae3c46ad31dbbe4bc46481f4f30382ae65b0183d7636452de5f6d42c8bd48d040f3dd5a
+DIST wesnoth-1.17.17.tar.bz2 423574966 BLAKE2B 
08bcc889333a74b45882f0b1a87960f333eb833c135429f19e3e5805206a45d6e890baa5b2b944d54e8aa088295bcf697c592d96703ee1fb49314e080f3949d8
 SHA512 
721edb885f5f215d679f50ae5ec34c11631771d248320617d55808580f4d1ab22d24b5a4e4001113ad8990b2e0f4e13d64a97a57de30d5453bd82e54ee7949aa

diff --git a/games-strategy/wesnoth/wesnoth-1.17.17.ebuild 
b/games-strategy/wesnoth/wesnoth-1.17.17.ebuild
new file mode 100644
index ..b4c9db3eeff1
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.17.17.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+   https://github.com/wesnoth/wesnoth;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+# uneven minor versions are development versions
+if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
+   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+IUSE="dbus dedicated doc nls server"
+
+RDEPEND="
+   acct-group/wesnoth
+   acct-user/wesnoth
+   dev-libs/boost:=[bzip2,context,icu,nls]
+   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+   !dedicated? (
+   dev-libs/glib:2
+   dev-libs/openssl:0=
+   >=media-libs/fontconfig-2.4.1
+   >=media-libs/sdl2-image-2.0.0[jpeg,png,webp]
+   >=media-libs/sdl2-mixer-2.0.0[vorbis]
+   media-libs/libvorbis
+   >=x11-libs/pango-1.22.0
+   >=x11-libs/cairo-1.10.0
+   sys-libs/readline:0=
+   dbus? ( sys-apps/dbus )
+   )"
+DEPEND="${RDEPEND}
+   x11-libs/libX11
+"
+BDEPEND="
+   sys-devel/gettext
+   virtual/pkgconfig
+"
+
+src_prepare() {
+   cmake_src_prepare
+
+   if ! use doc ; then
+   sed -i \
+   -e '/manual/d' \
+   doc/CMakeLists.txt || die
+   fi
+
+   # respect LINGUAS (bug #483316)
+   if [[ ${LINGUAS+set} ]] ; then
+   local lang langs=()
+   for lang in $(cat po/LINGUAS) ; do
+   has ${lang} ${LINGUAS} && langs+=( ${lang} )
+   done
+   echo "${langs[@]}" > po/LINGUAS || die
+   fi
+}
+
+src_configure() {
+   filter-flags -ftracer -fomit-frame-pointer
+
+   local mycmakeargs=()
+
+   if use dedicated || use server ; then
+   mycmakeargs+=(
+   -DENABLE_CAMPAIGN_SERVER="ON"
+   -DENABLE_SERVER="ON"
+   -DSERVER_UID="${PN}"
+   -DSERVER_GID="${PN}"
+   -DFIFO_DIR="/run/wesnothd"
+   )
+   else
+   mycmakeargs+=(
+   -DENABLE_CAMPAIGN_SERVER="OFF"
+   -DENABLE_SERVER="OFF"
+   )
+   fi
+   mycmakeargs+=(
+   -Wno-dev
+   -DENABLE_GAME="$(usex !dedicated)"
+   -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+   -DENABLE_NLS="$(usex nls)"
+   -DENABLE_NOTIFICATIONS="$(usex dbus)"
+   -DENABLE_STRICT_COMPILATION="OFF"
+   )
+   cmake_src_configure
+}
+
+src_install() {
+   local DOCS=( README.md changelog.md )
+   cmake_src_install
+   if use dedicated || use server ; then
+   rmdir "${ED}"/run{/wesnothd,} || die
+

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

2023-03-09 Thread Ionen Wolkens

commit: 1529adff6983c98bc94b04f74c0cc0edbe8535ca
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Mar  9 17:52:55 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Mar  9 20:12:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1529adff

games-strategy/wesnoth: drop 1.16.6

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

 games-strategy/wesnoth/Manifest|   1 -
 .../wesnoth-1.16.6-fix-build-with-boost-1.81.patch |  49 --
 games-strategy/wesnoth/wesnoth-1.16.6.ebuild   | 104 -
 3 files changed, 154 deletions(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 9cf9ac6ad743..899e199d0e98 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,3 +1,2 @@
-DIST wesnoth-1.16.6.tar.gz 518250360 BLAKE2B 
3fc5f5827beacc309a42d1d135eadefbace57866397eed4e3c5618ba6372ae31fc0350b2180c1323872ae59789ca67cd1b4a973c2257c7fac59508af93e0b758
 SHA512 
fcf9e50ce065f7c8d2b940eec88de27f18c3adbb9c7ae238bf6821eef233a45c2bdc7a58d5cd2abc4f37bcab6e503aa72d46f623c882c711d9f06b2826340bf5
 DIST wesnoth-1.16.8.tar.gz 518468407 BLAKE2B 
9c224757e0d1727acc66a5421266fa6e050bb3727040b457379dd164097c88850f9b2d8b81422ff277548cb8cd51da70f5da63254c2c4ccedc3a45d1789c6037
 SHA512 
9e41e1c574c9744ba9818298d77df1503d7fc70ee24e4bf9d1f59ef17c2bc123f38f0aa21eddccce88cc28b62f2a2d12133ab25dd111655abf5b620f18457bf7
 DIST wesnoth-1.17.11.tar.bz2 421068195 BLAKE2B 
43106bb72c6b4a39b4995fb9804733e5420b636db08254e75e7698c58740b84a33c387194bf048247bddf1808f73d0d07b3816f18687390760fb5fab7c2d8449
 SHA512 
8208ae1c02d5e6a9fe50a2cf533d3b0b207151e5b877c98b003117641ae3c46ad31dbbe4bc46481f4f30382ae65b0183d7636452de5f6d42c8bd48d040f3dd5a

diff --git 
a/games-strategy/wesnoth/files/wesnoth-1.16.6-fix-build-with-boost-1.81.patch 
b/games-strategy/wesnoth/files/wesnoth-1.16.6-fix-build-with-boost-1.81.patch
deleted file mode 100644
index 785a5440cbbf..
--- 
a/games-strategy/wesnoth/files/wesnoth-1.16.6-fix-build-with-boost-1.81.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-https://bugs.gentoo.org/886575
-https://github.com/wesnoth/wesnoth/issues/7215
-
-From d71e90ee50a89673cf9b6748bcb2975071d15445 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- 
-Date: Mon, 28 Nov 2022 23:21:38 +0700
-Subject: [PATCH] gettext: fix build with Boost.Locale 1.81
-
-See https://github.com/boostorg/locale/pull/128/
-
-(cherry picked from commit fd96415bdf0a2e3a05e1a587a1c3853847e2c2bc)
 a/src/gettext.cpp
-+++ b/src/gettext.cpp
-@@ -26,6 +26,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #if defined(__GNUC__)
- #pragma GCC diagnostic push
-@@ -224,8 +225,13 @@ namespace
-   }
- 
-   generator_.use_ansi_encoding(false);
-+#if BOOST_VERSION < 108100
-   generator_.categories(bl::message_facet | 
bl::information_facet | bl::collation_facet | bl::formatting_facet | 
bl::convert_facet);
-   generator_.characters(bl::char_facet);
-+#else
-+  generator_.categories(bl::category_t::message | 
bl::category_t::information | bl::category_t::collation | 
bl::category_t::formatting | bl::category_t::convert);
-+  generator_.characters(bl::char_facet_t::char_f);
-+#endif
-   // We cannot have current_locale_ be a non 
boost-generated locale since it might not supply
-   // the bl::info facet. As soon as we add message paths, 
update_locale_internal might fail,
-   // for example because of invalid .mo files. So make 
sure we call it at least once before adding paths/domains
-@@ -368,7 +374,12 @@ namespace
-   if(std::has_facet>(current_locale_)) 
{
-   res << "has bl::collator facet, ";
-   }
-+#if BOOST_VERSION < 108100
-   res << "generator categories='" << 
generator_.categories() << "'";
-+#else
-+  res << "generator categories='" <<
-+  
static_cast::type>(generator_.categories())
 << "'";
-+#endif
-   return res.str();
-   }
- 

diff --git a/games-strategy/wesnoth/wesnoth-1.16.6.ebuild 
b/games-strategy/wesnoth/wesnoth-1.16.6.ebuild
deleted file mode 100644
index f8edac88d9d7..
--- a/games-strategy/wesnoth/wesnoth-1.16.6.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org
-   https://github.com/wesnoth/wesnoth;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# uneven minor versions are development versions
-if [[

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

2023-01-26 Thread Sam James

commit: ad08b108753d55f6075c0a5cf6bd506f7b34ab4c
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 27 04:55:27 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 27 05:23:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad08b108

games-strategy/wesnoth: add 1.16.8

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

 games-strategy/wesnoth/Manifest|   1 +
 .../wesnoth/files/wesnoth-1.16.8-gcc-13.patch  |  32 +++
 games-strategy/wesnoth/wesnoth-1.16.8.ebuild   | 106 +
 3 files changed, 139 insertions(+)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index a621190038af..9cf9ac6ad743 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,2 +1,3 @@
 DIST wesnoth-1.16.6.tar.gz 518250360 BLAKE2B 
3fc5f5827beacc309a42d1d135eadefbace57866397eed4e3c5618ba6372ae31fc0350b2180c1323872ae59789ca67cd1b4a973c2257c7fac59508af93e0b758
 SHA512 
fcf9e50ce065f7c8d2b940eec88de27f18c3adbb9c7ae238bf6821eef233a45c2bdc7a58d5cd2abc4f37bcab6e503aa72d46f623c882c711d9f06b2826340bf5
+DIST wesnoth-1.16.8.tar.gz 518468407 BLAKE2B 
9c224757e0d1727acc66a5421266fa6e050bb3727040b457379dd164097c88850f9b2d8b81422ff277548cb8cd51da70f5da63254c2c4ccedc3a45d1789c6037
 SHA512 
9e41e1c574c9744ba9818298d77df1503d7fc70ee24e4bf9d1f59ef17c2bc123f38f0aa21eddccce88cc28b62f2a2d12133ab25dd111655abf5b620f18457bf7
 DIST wesnoth-1.17.11.tar.bz2 421068195 BLAKE2B 
43106bb72c6b4a39b4995fb9804733e5420b636db08254e75e7698c58740b84a33c387194bf048247bddf1808f73d0d07b3816f18687390760fb5fab7c2d8449
 SHA512 
8208ae1c02d5e6a9fe50a2cf533d3b0b207151e5b877c98b003117641ae3c46ad31dbbe4bc46481f4f30382ae65b0183d7636452de5f6d42c8bd48d040f3dd5a

diff --git a/games-strategy/wesnoth/files/wesnoth-1.16.8-gcc-13.patch 
b/games-strategy/wesnoth/files/wesnoth-1.16.8-gcc-13.patch
new file mode 100644
index ..f2d79ba6ad06
--- /dev/null
+++ b/games-strategy/wesnoth/files/wesnoth-1.16.8-gcc-13.patch
@@ -0,0 +1,32 @@
+https://github.com/wesnoth/wesnoth/commit/5fa07ea15c1736f74d89786d5ae449ed0f91c8a8
+
+From 5fa07ea15c1736f74d89786d5ae449ed0f91c8a8 Mon Sep 17 00:00:00 2001
+From: Martin Liska 
+Date: Mon, 23 May 2022 13:44:39 +0200
+Subject: [PATCH] Fix building with GCC 13.
+
+Fixes the following issue:
+base64.hpp:23:49: error: 'uint8_t' was not declared in this scope
+
+and:
+deprecation.hpp:20:22: error: found ':' in nested-name-specifier, expected '::'
+--- a/src/deprecation.hpp
 b/src/deprecation.hpp
+@@ -14,6 +14,7 @@
+ 
+ #pragma once
+ 
++#include 
+ #include 
+ 
+ /** See https://wiki.wesnoth.org/CompatibilityStandards for more info. */
+--- a/src/serialization/base64.hpp
 b/src/serialization/base64.hpp
+@@ -15,6 +15,7 @@
+ 
+ #pragma once
+ 
++#include 
+ #include 
+ #include 
+ 

diff --git a/games-strategy/wesnoth/wesnoth-1.16.8.ebuild 
b/games-strategy/wesnoth/wesnoth-1.16.8.ebuild
new file mode 100644
index ..7a0223c3d681
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.16.8.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+   https://github.com/wesnoth/wesnoth;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# uneven minor versions are development versions
+if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
+   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+IUSE="dbus dedicated doc nls server"
+
+RDEPEND="
+   acct-group/wesnoth
+   acct-user/wesnoth
+   dev-libs/boost:=[bzip2,context,icu,nls]
+   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+   !dedicated? (
+   dev-libs/glib:2
+   dev-libs/openssl:0=
+   >=media-libs/fontconfig-2.4.1
+   >=media-libs/sdl2-image-2.0.0[jpeg,png]
+   >=media-libs/sdl2-mixer-2.0.0[vorbis]
+   media-libs/libvorbis
+   >=x11-libs/pango-1.22.0
+   >=x11-libs/cairo-1.10.0
+   sys-libs/readline:0=
+   dbus? ( sys-apps/dbus )
+   )"
+DEPEND="${RDEPEND}
+   x11-libs/libX11
+"
+BDEPEND="
+   sys-devel/gettext
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.16.8-gcc-13.patch
+)
+
+src_prepare() {
+   cmake_src_prepare
+
+   if ! use doc ; then
+   sed -i \
+   -e '/manual/d' \
+   doc/CMakeLists.txt || die
+   fi
+
+   # respect LINGUAS (bug #483316)
+   if [[ ${LINGUAS+set} ]] ; then
+   local lang langs=()
+   for lang in $(cat po/LINGUAS) ; do
+   has ${lang} ${LINGUAS} && langs+=( ${lang} )
+   done
+   echo "${langs[@]}" > po/LINGUAS || die
+   fi
+}
+

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

2022-12-20 Thread Sam James

commit: 59198ccb92dfe55f90f39d0104a02c83c8b35dab
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 20 11:21:06 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 20 11:21:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59198ccb

games-strategy/wesnoth: drop 1.16.3

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

 games-strategy/wesnoth/Manifest  |   1 -
 games-strategy/wesnoth/wesnoth-1.16.3.ebuild | 100 ---
 2 files changed, 101 deletions(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 087146f1321c..a621190038af 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,3 +1,2 @@
-DIST wesnoth-1.16.3.tar.gz 518049863 BLAKE2B 
e862de2e6f71a1dfe11b0cb6343ea1da78c0eb035893d7bd16ca86586b689b21f39b5266ba86476829c1c9005f7abc37058c2f0ac8ea1ae2970d609880e0da20
 SHA512 
7f37a1a16ed51ffa935a457553b1a3890398b928bb5893720b746080b37a121a86e21ae402bdddfe30572adccf71a985bf1e3223a0eb443bf7a696ee213d9bf0
 DIST wesnoth-1.16.6.tar.gz 518250360 BLAKE2B 
3fc5f5827beacc309a42d1d135eadefbace57866397eed4e3c5618ba6372ae31fc0350b2180c1323872ae59789ca67cd1b4a973c2257c7fac59508af93e0b758
 SHA512 
fcf9e50ce065f7c8d2b940eec88de27f18c3adbb9c7ae238bf6821eef233a45c2bdc7a58d5cd2abc4f37bcab6e503aa72d46f623c882c711d9f06b2826340bf5
 DIST wesnoth-1.17.11.tar.bz2 421068195 BLAKE2B 
43106bb72c6b4a39b4995fb9804733e5420b636db08254e75e7698c58740b84a33c387194bf048247bddf1808f73d0d07b3816f18687390760fb5fab7c2d8449
 SHA512 
8208ae1c02d5e6a9fe50a2cf533d3b0b207151e5b877c98b003117641ae3c46ad31dbbe4bc46481f4f30382ae65b0183d7636452de5f6d42c8bd48d040f3dd5a

diff --git a/games-strategy/wesnoth/wesnoth-1.16.3.ebuild 
b/games-strategy/wesnoth/wesnoth-1.16.3.ebuild
deleted file mode 100644
index 1ee6998e389d..
--- a/games-strategy/wesnoth/wesnoth-1.16.3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org
-   https://github.com/wesnoth/wesnoth;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# uneven minor versions are development versions
-if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
-   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-IUSE="dbus dedicated doc nls server"
-
-RDEPEND="
-   acct-group/wesnoth
-   acct-user/wesnoth
-   dev-libs/boost:=[bzip2,context,icu,nls]
-   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
-   !dedicated? (
-   dev-libs/glib:2
-   dev-libs/openssl:0=
-   >=media-libs/fontconfig-2.4.1
-   >=media-libs/sdl2-image-2.0.0[jpeg,png]
-   >=media-libs/sdl2-mixer-2.0.0[vorbis]
-   media-libs/libvorbis
-   >=x11-libs/pango-1.22.0
-   >=x11-libs/cairo-1.10.0
-   sys-libs/readline:0=
-   dbus? ( sys-apps/dbus )
-   )"
-DEPEND="${RDEPEND}
-   x11-libs/libX11
-"
-BDEPEND="
-   sys-devel/gettext
-   virtual/pkgconfig
-"
-
-src_prepare() {
-   cmake_src_prepare
-
-   if ! use doc ; then
-   sed -i \
-   -e '/manual/d' \
-   doc/CMakeLists.txt || die
-   fi
-
-   # respect LINGUAS (bug #483316)
-   if [[ ${LINGUAS+set} ]] ; then
-   local lang langs=()
-   for lang in $(cat po/LINGUAS) ; do
-   has ${lang} ${LINGUAS} && langs+=( ${lang} )
-   done
-   echo "${langs[@]}" > po/LINGUAS || die
-   fi
-}
-
-src_configure() {
-   filter-flags -ftracer -fomit-frame-pointer
-
-   if use dedicated || use server ; then
-   mycmakeargs=(
-   -DENABLE_CAMPAIGN_SERVER="ON"
-   -DENABLE_SERVER="ON"
-   -DSERVER_UID="${PN}"
-   -DSERVER_GID="${PN}"
-   -DFIFO_DIR="/run/wesnothd"
-   )
-   else
-   mycmakeargs=(
-   -DENABLE_CAMPAIGN_SERVER="OFF"
-   -DENABLE_SERVER="OFF"
-   )
-   fi
-   mycmakeargs+=(
-   -Wno-dev
-   -DENABLE_GAME="$(usex !dedicated)"
-   -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
-   -DENABLE_NLS="$(usex nls)"
-   -DENABLE_NOTIFICATIONS="$(usex dbus)"
-   -DENABLE_STRICT_COMPILATION="OFF"
-   )
-   cmake_src_configure
-}
-
-src_install() {
-   local DOCS=( README.md changelog.md )
-   cmake_src_install
-   if use dedicated || use server ; then
-   rmdir "${ED}"/run{/wesnothd,} || die
-   newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
-

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

2022-12-20 Thread Sam James

commit: bab8eac341f3ec027c9fe38b51f51e37ba4d7589
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 20 11:19:44 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 20 11:19:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bab8eac3

games-strategy/wesnoth: style nit

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

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

diff --git a/games-strategy/wesnoth/wesnoth-1.16.6.ebuild 
b/games-strategy/wesnoth/wesnoth-1.16.6.ebuild
index ebb79a331120..1a92e4f2d992 100644
--- a/games-strategy/wesnoth/wesnoth-1.16.6.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.16.6.ebuild
@@ -43,7 +43,7 @@ BDEPEND="
virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}/wesnoth-1.16.6-fix-build-with-boost-1.81.patch" )
+PATCHES=( "${FILESDIR}"/${P}-fix-build-with-boost-1.81.patch )
 
 src_prepare() {
cmake_src_prepare

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

2022-12-20 Thread Sam James

commit: 25056d5c11eb72f321a8a794992f5c4013b02158
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 20 11:20:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 20 11:20:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25056d5c

games-strategy/wesnoth: add github upstream metadata

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

 games-strategy/wesnoth/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-strategy/wesnoth/metadata.xml 
b/games-strategy/wesnoth/metadata.xml
index 42cfc4670216..8ad2ac460037 100644
--- a/games-strategy/wesnoth/metadata.xml
+++ b/games-strategy/wesnoth/metadata.xml
@@ -10,5 +10,6 @@
   
   
 wesnoth
+wesnoth/wesnoth

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

2022-12-19 Thread Stefan Strogin

commit: 8b0083308cbcd70446e787d9bae93efa62f6fb4f
Author: Stefan Strogin  gentoo  org>
AuthorDate: Mon Dec 19 23:54:39 2022 +
Commit: Stefan Strogin  gentoo  org>
CommitDate: Mon Dec 19 23:56:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b008330

games-strategy/wesnoth: add 1.17.11; remove old

Signed-off-by: Stefan Strogin  gentoo.org>

 games-strategy/wesnoth/Manifest|   3 +-
 ...esnoth-1.17.5.ebuild => wesnoth-1.17.11.ebuild} |   0
 games-strategy/wesnoth/wesnoth-1.17.9.ebuild   | 100 -
 3 files changed, 1 insertion(+), 102 deletions(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index ace2a5cd6592..087146f1321c 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,4 +1,3 @@
 DIST wesnoth-1.16.3.tar.gz 518049863 BLAKE2B 
e862de2e6f71a1dfe11b0cb6343ea1da78c0eb035893d7bd16ca86586b689b21f39b5266ba86476829c1c9005f7abc37058c2f0ac8ea1ae2970d609880e0da20
 SHA512 
7f37a1a16ed51ffa935a457553b1a3890398b928bb5893720b746080b37a121a86e21ae402bdddfe30572adccf71a985bf1e3223a0eb443bf7a696ee213d9bf0
 DIST wesnoth-1.16.6.tar.gz 518250360 BLAKE2B 
3fc5f5827beacc309a42d1d135eadefbace57866397eed4e3c5618ba6372ae31fc0350b2180c1323872ae59789ca67cd1b4a973c2257c7fac59508af93e0b758
 SHA512 
fcf9e50ce065f7c8d2b940eec88de27f18c3adbb9c7ae238bf6821eef233a45c2bdc7a58d5cd2abc4f37bcab6e503aa72d46f623c882c711d9f06b2826340bf5
-DIST wesnoth-1.17.5.tar.bz2 418959651 BLAKE2B 
3b6e015192a4050e5d16b25b0e67f91894eeae772125e4bbbefa81082b17fc9c479cf0f4c68d3b74afc5e656c8680319d336d1c14f421f875a64df9b6adbd830
 SHA512 
7033673f058f3114fcaf9e9b0f5f457c4ed2243fdf04cf80775815d2661bead73d7323c00f4aa678ff82f3d2c23000d81aca97c58f33635060341368ef8c4377
-DIST wesnoth-1.17.9.tar.bz2 420547403 BLAKE2B 
8fcef89b72057ce60e292a7a986010f4b0d060e7542ff20029306cde4580473f5e8240f9d99a6248d23147be7a61345a04dca97fa70fb9a1fa039603b8ddd8d9
 SHA512 
c8f9eb8cc77ea239e710e52a2636700b34cea5fc8d73d5a62f80d0b58867ee633f556c170700e65e4ad234a69ea1746a1a4148efb64979cf22129ee59157
+DIST wesnoth-1.17.11.tar.bz2 421068195 BLAKE2B 
43106bb72c6b4a39b4995fb9804733e5420b636db08254e75e7698c58740b84a33c387194bf048247bddf1808f73d0d07b3816f18687390760fb5fab7c2d8449
 SHA512 
8208ae1c02d5e6a9fe50a2cf533d3b0b207151e5b877c98b003117641ae3c46ad31dbbe4bc46481f4f30382ae65b0183d7636452de5f6d42c8bd48d040f3dd5a

diff --git a/games-strategy/wesnoth/wesnoth-1.17.5.ebuild 
b/games-strategy/wesnoth/wesnoth-1.17.11.ebuild
similarity index 100%
rename from games-strategy/wesnoth/wesnoth-1.17.5.ebuild
rename to games-strategy/wesnoth/wesnoth-1.17.11.ebuild

diff --git a/games-strategy/wesnoth/wesnoth-1.17.9.ebuild 
b/games-strategy/wesnoth/wesnoth-1.17.9.ebuild
deleted file mode 100644
index 5724bdef29fa..
--- a/games-strategy/wesnoth/wesnoth-1.17.9.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org
-   https://github.com/wesnoth/wesnoth;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-# uneven minor versions are development versions
-if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
-   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-IUSE="dbus dedicated doc nls server"
-
-RDEPEND="
-   acct-group/wesnoth
-   acct-user/wesnoth
-   dev-libs/boost:=[bzip2,context,icu,nls]
-   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
-   !dedicated? (
-   dev-libs/glib:2
-   dev-libs/openssl:0=
-   >=media-libs/fontconfig-2.4.1
-   >=media-libs/sdl2-image-2.0.0[jpeg,png]
-   >=media-libs/sdl2-mixer-2.0.0[vorbis]
-   media-libs/libvorbis
-   >=x11-libs/pango-1.22.0
-   >=x11-libs/cairo-1.10.0
-   sys-libs/readline:0=
-   dbus? ( sys-apps/dbus )
-   )"
-DEPEND="${RDEPEND}
-   x11-libs/libX11
-"
-BDEPEND="
-   sys-devel/gettext
-   virtual/pkgconfig
-"
-
-src_prepare() {
-   cmake_src_prepare
-
-   if ! use doc ; then
-   sed -i \
-   -e '/manual/d' \
-   doc/CMakeLists.txt || die
-   fi
-
-   # respect LINGUAS (bug #483316)
-   if [[ ${LINGUAS+set} ]] ; then
-   local lang langs=()
-   for lang in $(cat po/LINGUAS) ; do
-   has ${lang} ${LINGUAS} && langs+=( ${lang} )
-   done
-   echo "${langs[@]}" > po/LINGUAS || die
-   fi
-}
-
-src_configure() {
-   filter-flags -ftracer -fomit-frame-pointer
-
-   if use dedicated || use server ; then
-   mycmakeargs=(
-   -DENABLE_CAMPAIGN_SERVER="ON"
-   -DENABLE_SERVER="ON"
-

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

2022-12-18 Thread Sam James

commit: ae18d0e0a580c608851e25cc1515d8bc13fb1e98
Author: Christophe Lermytte  lermytte  be>
AuthorDate: Sun Dec 18 21:58:31 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 19 02:59:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae18d0e0

games-strategy/wesnoth: fix build with boost-1.81

Signed-off-by: Christophe Lermytte  lermytte.be>
Closes: https://bugs.gentoo.org/886575
Closes: https://github.com/gentoo/gentoo/pull/28708
Signed-off-by: Sam James  gentoo.org>

 .../wesnoth-1.16.6-fix-build-with-boost-1.81.patch | 49 ++
 games-strategy/wesnoth/wesnoth-1.16.6.ebuild   |  2 +
 2 files changed, 51 insertions(+)

diff --git 
a/games-strategy/wesnoth/files/wesnoth-1.16.6-fix-build-with-boost-1.81.patch 
b/games-strategy/wesnoth/files/wesnoth-1.16.6-fix-build-with-boost-1.81.patch
new file mode 100644
index ..785a5440cbbf
--- /dev/null
+++ 
b/games-strategy/wesnoth/files/wesnoth-1.16.6-fix-build-with-boost-1.81.patch
@@ -0,0 +1,49 @@
+https://bugs.gentoo.org/886575
+https://github.com/wesnoth/wesnoth/issues/7215
+
+From d71e90ee50a89673cf9b6748bcb2975071d15445 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ 
+Date: Mon, 28 Nov 2022 23:21:38 +0700
+Subject: [PATCH] gettext: fix build with Boost.Locale 1.81
+
+See https://github.com/boostorg/locale/pull/128/
+
+(cherry picked from commit fd96415bdf0a2e3a05e1a587a1c3853847e2c2bc)
+--- a/src/gettext.cpp
 b/src/gettext.cpp
+@@ -26,6 +26,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #if defined(__GNUC__)
+ #pragma GCC diagnostic push
+@@ -224,8 +225,13 @@ namespace
+   }
+ 
+   generator_.use_ansi_encoding(false);
++#if BOOST_VERSION < 108100
+   generator_.categories(bl::message_facet | 
bl::information_facet | bl::collation_facet | bl::formatting_facet | 
bl::convert_facet);
+   generator_.characters(bl::char_facet);
++#else
++  generator_.categories(bl::category_t::message | 
bl::category_t::information | bl::category_t::collation | 
bl::category_t::formatting | bl::category_t::convert);
++  generator_.characters(bl::char_facet_t::char_f);
++#endif
+   // We cannot have current_locale_ be a non 
boost-generated locale since it might not supply
+   // the bl::info facet. As soon as we add message paths, 
update_locale_internal might fail,
+   // for example because of invalid .mo files. So make 
sure we call it at least once before adding paths/domains
+@@ -368,7 +374,12 @@ namespace
+   if(std::has_facet>(current_locale_)) 
{
+   res << "has bl::collator facet, ";
+   }
++#if BOOST_VERSION < 108100
+   res << "generator categories='" << 
generator_.categories() << "'";
++#else
++  res << "generator categories='" <<
++  
static_cast::type>(generator_.categories())
 << "'";
++#endif
+   return res.str();
+   }
+ 

diff --git a/games-strategy/wesnoth/wesnoth-1.16.6.ebuild 
b/games-strategy/wesnoth/wesnoth-1.16.6.ebuild
index 1ee6998e389d..ebb79a331120 100644
--- a/games-strategy/wesnoth/wesnoth-1.16.6.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.16.6.ebuild
@@ -43,6 +43,8 @@ BDEPEND="
virtual/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}/wesnoth-1.16.6-fix-build-with-boost-1.81.patch" )
+
 src_prepare() {
cmake_src_prepare

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

2022-10-23 Thread Pacho Ramos

commit: ab8dacfc5ce237174b18ddd331ba4d9b374f68b7
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Oct 23 22:00:32 2022 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Oct 23 22:21:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab8dacfc

games-strategy/wesnoth: add 1.17.9

Signed-off-by: Pacho Ramos  gentoo.org>

 games-strategy/wesnoth/Manifest  |   1 +
 games-strategy/wesnoth/wesnoth-1.17.9.ebuild | 100 +++
 2 files changed, 101 insertions(+)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 46760920e34e..33d60618a5e0 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,2 +1,3 @@
 DIST wesnoth-1.16.3.tar.gz 518049863 BLAKE2B 
e862de2e6f71a1dfe11b0cb6343ea1da78c0eb035893d7bd16ca86586b689b21f39b5266ba86476829c1c9005f7abc37058c2f0ac8ea1ae2970d609880e0da20
 SHA512 
7f37a1a16ed51ffa935a457553b1a3890398b928bb5893720b746080b37a121a86e21ae402bdddfe30572adccf71a985bf1e3223a0eb443bf7a696ee213d9bf0
 DIST wesnoth-1.17.5.tar.bz2 418959651 BLAKE2B 
3b6e015192a4050e5d16b25b0e67f91894eeae772125e4bbbefa81082b17fc9c479cf0f4c68d3b74afc5e656c8680319d336d1c14f421f875a64df9b6adbd830
 SHA512 
7033673f058f3114fcaf9e9b0f5f457c4ed2243fdf04cf80775815d2661bead73d7323c00f4aa678ff82f3d2c23000d81aca97c58f33635060341368ef8c4377
+DIST wesnoth-1.17.9.tar.bz2 420547403 BLAKE2B 
8fcef89b72057ce60e292a7a986010f4b0d060e7542ff20029306cde4580473f5e8240f9d99a6248d23147be7a61345a04dca97fa70fb9a1fa039603b8ddd8d9
 SHA512 
c8f9eb8cc77ea239e710e52a2636700b34cea5fc8d73d5a62f80d0b58867ee633f556c170700e65e4ad234a69ea1746a1a4148efb64979cf22129ee59157

diff --git a/games-strategy/wesnoth/wesnoth-1.17.9.ebuild 
b/games-strategy/wesnoth/wesnoth-1.17.9.ebuild
new file mode 100644
index ..5724bdef29fa
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.17.9.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+   https://github.com/wesnoth/wesnoth;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+# uneven minor versions are development versions
+if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
+   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+IUSE="dbus dedicated doc nls server"
+
+RDEPEND="
+   acct-group/wesnoth
+   acct-user/wesnoth
+   dev-libs/boost:=[bzip2,context,icu,nls]
+   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+   !dedicated? (
+   dev-libs/glib:2
+   dev-libs/openssl:0=
+   >=media-libs/fontconfig-2.4.1
+   >=media-libs/sdl2-image-2.0.0[jpeg,png]
+   >=media-libs/sdl2-mixer-2.0.0[vorbis]
+   media-libs/libvorbis
+   >=x11-libs/pango-1.22.0
+   >=x11-libs/cairo-1.10.0
+   sys-libs/readline:0=
+   dbus? ( sys-apps/dbus )
+   )"
+DEPEND="${RDEPEND}
+   x11-libs/libX11
+"
+BDEPEND="
+   sys-devel/gettext
+   virtual/pkgconfig
+"
+
+src_prepare() {
+   cmake_src_prepare
+
+   if ! use doc ; then
+   sed -i \
+   -e '/manual/d' \
+   doc/CMakeLists.txt || die
+   fi
+
+   # respect LINGUAS (bug #483316)
+   if [[ ${LINGUAS+set} ]] ; then
+   local lang langs=()
+   for lang in $(cat po/LINGUAS) ; do
+   has ${lang} ${LINGUAS} && langs+=( ${lang} )
+   done
+   echo "${langs[@]}" > po/LINGUAS || die
+   fi
+}
+
+src_configure() {
+   filter-flags -ftracer -fomit-frame-pointer
+
+   if use dedicated || use server ; then
+   mycmakeargs=(
+   -DENABLE_CAMPAIGN_SERVER="ON"
+   -DENABLE_SERVER="ON"
+   -DSERVER_UID="${PN}"
+   -DSERVER_GID="${PN}"
+   -DFIFO_DIR="/run/wesnothd"
+   )
+   else
+   mycmakeargs=(
+   -DENABLE_CAMPAIGN_SERVER="OFF"
+   -DENABLE_SERVER="OFF"
+   )
+   fi
+   mycmakeargs+=(
+   -Wno-dev
+   -DENABLE_GAME="$(usex !dedicated)"
+   -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+   -DENABLE_NLS="$(usex nls)"
+   -DENABLE_NOTIFICATIONS="$(usex dbus)"
+   -DENABLE_STRICT_COMPILATION="OFF"
+   )
+   cmake_src_configure
+}
+
+src_install() {
+   local DOCS=( README.md changelog.md )
+   cmake_src_install
+   if use dedicated || use server ; then
+   rmdir "${ED}"/run{/wesnothd,} || die
+   newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
+   fi
+}

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

2022-10-23 Thread Pacho Ramos

commit: 1913acbb25040b56dd55a622a129f633ebd32abe
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Oct 23 22:21:29 2022 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Oct 23 22:21:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1913acbb

games-strategy/wesnoth: add 1.16.6

Signed-off-by: Pacho Ramos  gentoo.org>

 games-strategy/wesnoth/Manifest  |   1 +
 games-strategy/wesnoth/wesnoth-1.16.6.ebuild | 100 +++
 2 files changed, 101 insertions(+)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 33d60618a5e0..ace2a5cd6592 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,3 +1,4 @@
 DIST wesnoth-1.16.3.tar.gz 518049863 BLAKE2B 
e862de2e6f71a1dfe11b0cb6343ea1da78c0eb035893d7bd16ca86586b689b21f39b5266ba86476829c1c9005f7abc37058c2f0ac8ea1ae2970d609880e0da20
 SHA512 
7f37a1a16ed51ffa935a457553b1a3890398b928bb5893720b746080b37a121a86e21ae402bdddfe30572adccf71a985bf1e3223a0eb443bf7a696ee213d9bf0
+DIST wesnoth-1.16.6.tar.gz 518250360 BLAKE2B 
3fc5f5827beacc309a42d1d135eadefbace57866397eed4e3c5618ba6372ae31fc0350b2180c1323872ae59789ca67cd1b4a973c2257c7fac59508af93e0b758
 SHA512 
fcf9e50ce065f7c8d2b940eec88de27f18c3adbb9c7ae238bf6821eef233a45c2bdc7a58d5cd2abc4f37bcab6e503aa72d46f623c882c711d9f06b2826340bf5
 DIST wesnoth-1.17.5.tar.bz2 418959651 BLAKE2B 
3b6e015192a4050e5d16b25b0e67f91894eeae772125e4bbbefa81082b17fc9c479cf0f4c68d3b74afc5e656c8680319d336d1c14f421f875a64df9b6adbd830
 SHA512 
7033673f058f3114fcaf9e9b0f5f457c4ed2243fdf04cf80775815d2661bead73d7323c00f4aa678ff82f3d2c23000d81aca97c58f33635060341368ef8c4377
 DIST wesnoth-1.17.9.tar.bz2 420547403 BLAKE2B 
8fcef89b72057ce60e292a7a986010f4b0d060e7542ff20029306cde4580473f5e8240f9d99a6248d23147be7a61345a04dca97fa70fb9a1fa039603b8ddd8d9
 SHA512 
c8f9eb8cc77ea239e710e52a2636700b34cea5fc8d73d5a62f80d0b58867ee633f556c170700e65e4ad234a69ea1746a1a4148efb64979cf22129ee59157

diff --git a/games-strategy/wesnoth/wesnoth-1.16.6.ebuild 
b/games-strategy/wesnoth/wesnoth-1.16.6.ebuild
new file mode 100644
index ..1ee6998e389d
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.16.6.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+   https://github.com/wesnoth/wesnoth;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# uneven minor versions are development versions
+if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
+   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+IUSE="dbus dedicated doc nls server"
+
+RDEPEND="
+   acct-group/wesnoth
+   acct-user/wesnoth
+   dev-libs/boost:=[bzip2,context,icu,nls]
+   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+   !dedicated? (
+   dev-libs/glib:2
+   dev-libs/openssl:0=
+   >=media-libs/fontconfig-2.4.1
+   >=media-libs/sdl2-image-2.0.0[jpeg,png]
+   >=media-libs/sdl2-mixer-2.0.0[vorbis]
+   media-libs/libvorbis
+   >=x11-libs/pango-1.22.0
+   >=x11-libs/cairo-1.10.0
+   sys-libs/readline:0=
+   dbus? ( sys-apps/dbus )
+   )"
+DEPEND="${RDEPEND}
+   x11-libs/libX11
+"
+BDEPEND="
+   sys-devel/gettext
+   virtual/pkgconfig
+"
+
+src_prepare() {
+   cmake_src_prepare
+
+   if ! use doc ; then
+   sed -i \
+   -e '/manual/d' \
+   doc/CMakeLists.txt || die
+   fi
+
+   # respect LINGUAS (bug #483316)
+   if [[ ${LINGUAS+set} ]] ; then
+   local lang langs=()
+   for lang in $(cat po/LINGUAS) ; do
+   has ${lang} ${LINGUAS} && langs+=( ${lang} )
+   done
+   echo "${langs[@]}" > po/LINGUAS || die
+   fi
+}
+
+src_configure() {
+   filter-flags -ftracer -fomit-frame-pointer
+
+   if use dedicated || use server ; then
+   mycmakeargs=(
+   -DENABLE_CAMPAIGN_SERVER="ON"
+   -DENABLE_SERVER="ON"
+   -DSERVER_UID="${PN}"
+   -DSERVER_GID="${PN}"
+   -DFIFO_DIR="/run/wesnothd"
+   )
+   else
+   mycmakeargs=(
+   -DENABLE_CAMPAIGN_SERVER="OFF"
+   -DENABLE_SERVER="OFF"
+   )
+   fi
+   mycmakeargs+=(
+   -Wno-dev
+   -DENABLE_GAME="$(usex !dedicated)"
+   -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+   -DENABLE_NLS="$(usex nls)"
+   -DENABLE_NOTIFICATIONS="$(usex dbus)"
+

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

2022-08-11 Thread Ionen Wolkens

commit: b13f4e115ebb3fd6ab62a4a2d27468bc77205e63
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Aug 11 07:02:52 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Aug 11 07:37:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b13f4e11

games-strategy/wesnoth: drop 1.16.2

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

 games-strategy/wesnoth/Manifest  |   1 -
 games-strategy/wesnoth/wesnoth-1.16.2.ebuild | 100 ---
 2 files changed, 101 deletions(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index a2c775399807..46760920e34e 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,3 +1,2 @@
-DIST wesnoth-1.16.2.tar.gz 517313669 BLAKE2B 
b1b9a2795a7a298edd1d952547db518a31f217f983aaf39cdde7a14773f2538485c980205e9242d4a1c8f933011a09a7e858de128c7d17c16c552e34b2a59bf3
 SHA512 
19cb4c64d9cce780ffbb54e357bf88c3cf2eedc835fab7162bd9caa62485a60ab2a1ba68ab0c4b98dc05bab4fb22889f4a8237b9542baa5478fbda08034d9f66
 DIST wesnoth-1.16.3.tar.gz 518049863 BLAKE2B 
e862de2e6f71a1dfe11b0cb6343ea1da78c0eb035893d7bd16ca86586b689b21f39b5266ba86476829c1c9005f7abc37058c2f0ac8ea1ae2970d609880e0da20
 SHA512 
7f37a1a16ed51ffa935a457553b1a3890398b928bb5893720b746080b37a121a86e21ae402bdddfe30572adccf71a985bf1e3223a0eb443bf7a696ee213d9bf0
 DIST wesnoth-1.17.5.tar.bz2 418959651 BLAKE2B 
3b6e015192a4050e5d16b25b0e67f91894eeae772125e4bbbefa81082b17fc9c479cf0f4c68d3b74afc5e656c8680319d336d1c14f421f875a64df9b6adbd830
 SHA512 
7033673f058f3114fcaf9e9b0f5f457c4ed2243fdf04cf80775815d2661bead73d7323c00f4aa678ff82f3d2c23000d81aca97c58f33635060341368ef8c4377

diff --git a/games-strategy/wesnoth/wesnoth-1.16.2.ebuild 
b/games-strategy/wesnoth/wesnoth-1.16.2.ebuild
deleted file mode 100644
index 17cdd9a055f7..
--- a/games-strategy/wesnoth/wesnoth-1.16.2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org
-   https://github.com/wesnoth/wesnoth;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# uneven minor versions are development versions
-if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
-   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-IUSE="dbus dedicated doc nls server"
-
-RDEPEND="
-   acct-group/wesnoth
-   acct-user/wesnoth
-   dev-libs/boost:=[bzip2,context,icu,nls,threads(+)]
-   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
-   !dedicated? (
-   dev-libs/glib:2
-   dev-libs/openssl:0=
-   >=media-libs/fontconfig-2.4.1
-   >=media-libs/sdl2-image-2.0.0[jpeg,png]
-   >=media-libs/sdl2-mixer-2.0.0[vorbis]
-   media-libs/libvorbis
-   >=x11-libs/pango-1.22.0
-   >=x11-libs/cairo-1.10.0
-   sys-libs/readline:0=
-   dbus? ( sys-apps/dbus )
-   )"
-DEPEND="${RDEPEND}
-   x11-libs/libX11
-"
-BDEPEND="
-   sys-devel/gettext
-   virtual/pkgconfig
-"
-
-src_prepare() {
-   cmake_src_prepare
-
-   if ! use doc ; then
-   sed -i \
-   -e '/manual/d' \
-   doc/CMakeLists.txt || die
-   fi
-
-   # respect LINGUAS (bug #483316)
-   if [[ ${LINGUAS+set} ]] ; then
-   local lang langs=()
-   for lang in $(cat po/LINGUAS) ; do
-   has ${lang} ${LINGUAS} && langs+=( ${lang} )
-   done
-   echo "${langs[@]}" > po/LINGUAS || die
-   fi
-}
-
-src_configure() {
-   filter-flags -ftracer -fomit-frame-pointer
-
-   if use dedicated || use server ; then
-   mycmakeargs=(
-   -DENABLE_CAMPAIGN_SERVER="ON"
-   -DENABLE_SERVER="ON"
-   -DSERVER_UID="${PN}"
-   -DSERVER_GID="${PN}"
-   -DFIFO_DIR="/run/wesnothd"
-   )
-   else
-   mycmakeargs=(
-   -DENABLE_CAMPAIGN_SERVER="OFF"
-   -DENABLE_SERVER="OFF"
-   )
-   fi
-   mycmakeargs+=(
-   -Wno-dev
-   -DENABLE_GAME="$(usex !dedicated)"
-   -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
-   -DENABLE_NLS="$(usex nls)"
-   -DENABLE_NOTIFICATIONS="$(usex dbus)"
-   -DENABLE_STRICT_COMPILATION="OFF"
-   )
-   cmake_src_configure
-}
-
-src_install() {
-   local DOCS=( README.md changelog.md )
-   cmake_src_install
-   if use dedicated || use server ; then
-   rmdir "${ED}"/run{/wesnothd,} || die
-   newinitd

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

2022-06-19 Thread Lars Wendler

commit: 2670dcf22431f24a3022ad4f82012d374c7098a5
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Jun 19 18:14:02 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Jun 19 18:15:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2670dcf2

games-strategy/wesnoth: Added 1.17.5 development release

Changed SRC_URI to fetch from sourceforge as the auto-generated
GitHub source tarballs are incomplete.

Signed-off-by: Lars Wendler  gentoo.org>

 games-strategy/wesnoth/Manifest  |   1 +
 games-strategy/wesnoth/wesnoth-1.17.5.ebuild | 100 +++
 2 files changed, 101 insertions(+)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 181f218e3336..a2c775399807 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,2 +1,3 @@
 DIST wesnoth-1.16.2.tar.gz 517313669 BLAKE2B 
b1b9a2795a7a298edd1d952547db518a31f217f983aaf39cdde7a14773f2538485c980205e9242d4a1c8f933011a09a7e858de128c7d17c16c552e34b2a59bf3
 SHA512 
19cb4c64d9cce780ffbb54e357bf88c3cf2eedc835fab7162bd9caa62485a60ab2a1ba68ab0c4b98dc05bab4fb22889f4a8237b9542baa5478fbda08034d9f66
 DIST wesnoth-1.16.3.tar.gz 518049863 BLAKE2B 
e862de2e6f71a1dfe11b0cb6343ea1da78c0eb035893d7bd16ca86586b689b21f39b5266ba86476829c1c9005f7abc37058c2f0ac8ea1ae2970d609880e0da20
 SHA512 
7f37a1a16ed51ffa935a457553b1a3890398b928bb5893720b746080b37a121a86e21ae402bdddfe30572adccf71a985bf1e3223a0eb443bf7a696ee213d9bf0
+DIST wesnoth-1.17.5.tar.bz2 418959651 BLAKE2B 
3b6e015192a4050e5d16b25b0e67f91894eeae772125e4bbbefa81082b17fc9c479cf0f4c68d3b74afc5e656c8680319d336d1c14f421f875a64df9b6adbd830
 SHA512 
7033673f058f3114fcaf9e9b0f5f457c4ed2243fdf04cf80775815d2661bead73d7323c00f4aa678ff82f3d2c23000d81aca97c58f33635060341368ef8c4377

diff --git a/games-strategy/wesnoth/wesnoth-1.17.5.ebuild 
b/games-strategy/wesnoth/wesnoth-1.17.5.ebuild
new file mode 100644
index ..764fb71cac25
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.17.5.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+   https://github.com/wesnoth/wesnoth;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+# uneven minor versions are development versions
+if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
+   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+IUSE="dbus dedicated doc nls server"
+
+RDEPEND="
+   acct-group/wesnoth
+   acct-user/wesnoth
+   dev-libs/boost:=[bzip2,context,icu,nls,threads(+)]
+   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+   !dedicated? (
+   dev-libs/glib:2
+   dev-libs/openssl:0=
+   >=media-libs/fontconfig-2.4.1
+   >=media-libs/sdl2-image-2.0.0[jpeg,png]
+   >=media-libs/sdl2-mixer-2.0.0[vorbis]
+   media-libs/libvorbis
+   >=x11-libs/pango-1.22.0
+   >=x11-libs/cairo-1.10.0
+   sys-libs/readline:0=
+   dbus? ( sys-apps/dbus )
+   )"
+DEPEND="${RDEPEND}
+   x11-libs/libX11
+"
+BDEPEND="
+   sys-devel/gettext
+   virtual/pkgconfig
+"
+
+src_prepare() {
+   cmake_src_prepare
+
+   if ! use doc ; then
+   sed -i \
+   -e '/manual/d' \
+   doc/CMakeLists.txt || die
+   fi
+
+   # respect LINGUAS (bug #483316)
+   if [[ ${LINGUAS+set} ]] ; then
+   local lang langs=()
+   for lang in $(cat po/LINGUAS) ; do
+   has ${lang} ${LINGUAS} && langs+=( ${lang} )
+   done
+   echo "${langs[@]}" > po/LINGUAS || die
+   fi
+}
+
+src_configure() {
+   filter-flags -ftracer -fomit-frame-pointer
+
+   if use dedicated || use server ; then
+   mycmakeargs=(
+   -DENABLE_CAMPAIGN_SERVER="ON"
+   -DENABLE_SERVER="ON"
+   -DSERVER_UID="${PN}"
+   -DSERVER_GID="${PN}"
+   -DFIFO_DIR="/run/wesnothd"
+   )
+   else
+   mycmakeargs=(
+   -DENABLE_CAMPAIGN_SERVER="OFF"
+   -DENABLE_SERVER="OFF"
+   )
+   fi
+   mycmakeargs+=(
+   -Wno-dev
+   -DENABLE_GAME="$(usex !dedicated)"
+   -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+   -DENABLE_NLS="$(usex nls)"
+   -DENABLE_NOTIFICATIONS="$(usex dbus)"
+   -DENABLE_STRICT_COMPILATION="OFF"
+   )
+   cmake_src_configure
+}
+
+src_install() {
+   local DOCS=( README.md changelog.md )
+   cmake_src_install
+   if use dedicated || use server ; then
+

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

2022-06-19 Thread Lars Wendler

commit: 66959fabf450c970ec63195b9f882dc3d8f0a7d9
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Jun 19 17:22:42 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Jun 19 17:23:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66959fab

games-strategy/wesnoth: Bump to version 1.16.3

Closes: https://bugs.gentoo.org/835587
Signed-off-by: Lars Wendler  gentoo.org>

 games-strategy/wesnoth/Manifest  |   1 +
 games-strategy/wesnoth/wesnoth-1.16.3.ebuild | 100 +++
 2 files changed, 101 insertions(+)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index fd1ae547afc1..afa25880c8f0 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,2 +1,3 @@
 DIST wesnoth-1.16.0.tar.gz 515780018 BLAKE2B 
1a9d6aa9b294b9919d3b51528928f43d786f30fda739f0af2e62ebbb210b8f071945fe6130c00e2055d3726ae7eabf63b57fd2f1d5d8981a4cd0feedbfbffbfb
 SHA512 
6d999a99e140916ef2070c524898ef69c7b45b3240f208aa380e81a1d1822a02c05a7fc9c5049a05a230e5126d8ff8723e16b6a62ba532b81c031f78ad8c85fe
 DIST wesnoth-1.16.2.tar.gz 517313669 BLAKE2B 
b1b9a2795a7a298edd1d952547db518a31f217f983aaf39cdde7a14773f2538485c980205e9242d4a1c8f933011a09a7e858de128c7d17c16c552e34b2a59bf3
 SHA512 
19cb4c64d9cce780ffbb54e357bf88c3cf2eedc835fab7162bd9caa62485a60ab2a1ba68ab0c4b98dc05bab4fb22889f4a8237b9542baa5478fbda08034d9f66
+DIST wesnoth-1.16.3.tar.gz 518049863 BLAKE2B 
e862de2e6f71a1dfe11b0cb6343ea1da78c0eb035893d7bd16ca86586b689b21f39b5266ba86476829c1c9005f7abc37058c2f0ac8ea1ae2970d609880e0da20
 SHA512 
7f37a1a16ed51ffa935a457553b1a3890398b928bb5893720b746080b37a121a86e21ae402bdddfe30572adccf71a985bf1e3223a0eb443bf7a696ee213d9bf0

diff --git a/games-strategy/wesnoth/wesnoth-1.16.3.ebuild 
b/games-strategy/wesnoth/wesnoth-1.16.3.ebuild
new file mode 100644
index ..17cdd9a055f7
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.16.3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+   https://github.com/wesnoth/wesnoth;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# uneven minor versions are development versions
+if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
+   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+IUSE="dbus dedicated doc nls server"
+
+RDEPEND="
+   acct-group/wesnoth
+   acct-user/wesnoth
+   dev-libs/boost:=[bzip2,context,icu,nls,threads(+)]
+   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+   !dedicated? (
+   dev-libs/glib:2
+   dev-libs/openssl:0=
+   >=media-libs/fontconfig-2.4.1
+   >=media-libs/sdl2-image-2.0.0[jpeg,png]
+   >=media-libs/sdl2-mixer-2.0.0[vorbis]
+   media-libs/libvorbis
+   >=x11-libs/pango-1.22.0
+   >=x11-libs/cairo-1.10.0
+   sys-libs/readline:0=
+   dbus? ( sys-apps/dbus )
+   )"
+DEPEND="${RDEPEND}
+   x11-libs/libX11
+"
+BDEPEND="
+   sys-devel/gettext
+   virtual/pkgconfig
+"
+
+src_prepare() {
+   cmake_src_prepare
+
+   if ! use doc ; then
+   sed -i \
+   -e '/manual/d' \
+   doc/CMakeLists.txt || die
+   fi
+
+   # respect LINGUAS (bug #483316)
+   if [[ ${LINGUAS+set} ]] ; then
+   local lang langs=()
+   for lang in $(cat po/LINGUAS) ; do
+   has ${lang} ${LINGUAS} && langs+=( ${lang} )
+   done
+   echo "${langs[@]}" > po/LINGUAS || die
+   fi
+}
+
+src_configure() {
+   filter-flags -ftracer -fomit-frame-pointer
+
+   if use dedicated || use server ; then
+   mycmakeargs=(
+   -DENABLE_CAMPAIGN_SERVER="ON"
+   -DENABLE_SERVER="ON"
+   -DSERVER_UID="${PN}"
+   -DSERVER_GID="${PN}"
+   -DFIFO_DIR="/run/wesnothd"
+   )
+   else
+   mycmakeargs=(
+   -DENABLE_CAMPAIGN_SERVER="OFF"
+   -DENABLE_SERVER="OFF"
+   )
+   fi
+   mycmakeargs+=(
+   -Wno-dev
+   -DENABLE_GAME="$(usex !dedicated)"
+   -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+   -DENABLE_NLS="$(usex nls)"
+   -DENABLE_NOTIFICATIONS="$(usex dbus)"
+   -DENABLE_STRICT_COMPILATION="OFF"
+   )
+   cmake_src_configure
+}
+
+src_install() {
+   local DOCS=( README.md changelog.md )
+   cmake_src_install
+   if use dedicated || use server ; then
+   rmdir "${ED}"/run{/wesnothd,} || die
+

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

2022-06-19 Thread Lars Wendler

commit: b3576714fa2808a8365e9321cac9a013a2e2235f
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Jun 19 17:23:09 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Jun 19 17:23:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3576714

games-strategy/wesnoth: Removed old

Signed-off-by: Lars Wendler  gentoo.org>

 games-strategy/wesnoth/Manifest |   1 -
 games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild | 100 
 2 files changed, 101 deletions(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index afa25880c8f0..181f218e3336 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,3 +1,2 @@
-DIST wesnoth-1.16.0.tar.gz 515780018 BLAKE2B 
1a9d6aa9b294b9919d3b51528928f43d786f30fda739f0af2e62ebbb210b8f071945fe6130c00e2055d3726ae7eabf63b57fd2f1d5d8981a4cd0feedbfbffbfb
 SHA512 
6d999a99e140916ef2070c524898ef69c7b45b3240f208aa380e81a1d1822a02c05a7fc9c5049a05a230e5126d8ff8723e16b6a62ba532b81c031f78ad8c85fe
 DIST wesnoth-1.16.2.tar.gz 517313669 BLAKE2B 
b1b9a2795a7a298edd1d952547db518a31f217f983aaf39cdde7a14773f2538485c980205e9242d4a1c8f933011a09a7e858de128c7d17c16c552e34b2a59bf3
 SHA512 
19cb4c64d9cce780ffbb54e357bf88c3cf2eedc835fab7162bd9caa62485a60ab2a1ba68ab0c4b98dc05bab4fb22889f4a8237b9542baa5478fbda08034d9f66
 DIST wesnoth-1.16.3.tar.gz 518049863 BLAKE2B 
e862de2e6f71a1dfe11b0cb6343ea1da78c0eb035893d7bd16ca86586b689b21f39b5266ba86476829c1c9005f7abc37058c2f0ac8ea1ae2970d609880e0da20
 SHA512 
7f37a1a16ed51ffa935a457553b1a3890398b928bb5893720b746080b37a121a86e21ae402bdddfe30572adccf71a985bf1e3223a0eb443bf7a696ee213d9bf0

diff --git a/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild 
b/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild
deleted file mode 100644
index f5718459c555..
--- a/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org
-   https://github.com/wesnoth/wesnoth;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# uneven minor versions are development versions
-if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
-   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-IUSE="dbus dedicated doc nls server"
-
-RDEPEND="
-   acct-group/wesnoth
-   acct-user/wesnoth
-   dev-libs/boost:=[bzip2,context,icu,nls,threads(+)]
-   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
-   !dedicated? (
-   dev-libs/glib:2
-   dev-libs/openssl:0=
-   >=media-libs/fontconfig-2.4.1
-   >=media-libs/sdl2-image-2.0.0[jpeg,png]
-   >=media-libs/sdl2-mixer-2.0.0[vorbis]
-   media-libs/libvorbis
-   >=x11-libs/pango-1.22.0
-   >=x11-libs/cairo-1.10.0
-   sys-libs/readline:0=
-   dbus? ( sys-apps/dbus )
-   )"
-DEPEND="${RDEPEND}
-   x11-libs/libX11
-"
-BDEPEND="
-   sys-devel/gettext
-   virtual/pkgconfig
-"
-
-src_prepare() {
-   cmake_src_prepare
-
-   if ! use doc ; then
-   sed -i \
-   -e '/manual/d' \
-   doc/CMakeLists.txt || die
-   fi
-
-   # respect LINGUAS (bug #483316)
-   if [[ ${LINGUAS+set} ]] ; then
-   local lang langs=()
-   for lang in $(cat po/LINGUAS) ; do
-   has ${lang} ${LINGUAS} && langs+=( ${lang} )
-   done
-   echo "${langs[@]}" > po/LINGUAS || die
-   fi
-}
-
-src_configure() {
-   filter-flags -ftracer -fomit-frame-pointer
-
-   if use dedicated || use server ; then
-   mycmakeargs=(
-   -DENABLE_CAMPAIGN_SERVER="ON"
-   -DENABLE_SERVER="ON"
-   -DSERVER_UID="${PN}"
-   -DSERVER_GID="${PN}"
-   -DFIFO_DIR="/run/wesnothd"
-   )
-   else
-   mycmakeargs=(
-   -DENABLE_CAMPAIGN_SERVER="OFF"
-   -DENABLE_SERVER="OFF"
-   )
-   fi
-   mycmakeargs+=(
-   -Wno-dev
-   -DENABLE_GAME="$(usex !dedicated)"
-   -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
-   -DENABLE_NLS="$(usex nls)"
-   -DENABLE_NOTIFICATIONS="$(usex dbus)"
-   -DENABLE_STRICT_COMPILATION="OFF"
-   )
-   cmake_src_configure
-}
-
-src_install() {
-   local DOCS=( README.md changelog.md )
-   cmake_src_install
-   if use dedicated || use server; then
-   rmdir "${ED}"/run{/wesnothd,} || die
-   newinitd

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

2022-05-23 Thread Conrad Kostecki

commit: d989d95d121ba0663cb31f6392989b346faa81e2
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun May 22 11:19:38 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Mon May 23 11:58:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d989d95d

games-strategy/wesnoth: remove unused patch

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/25597
Signed-off-by: Conrad Kostecki  gentoo.org>

 games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch | 14 --
 1 file changed, 14 deletions(-)

diff --git a/games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch 
b/games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch
deleted file mode 100644
index 4a7c8cf41e72..
--- a/games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Leave default AR as is, https://bugs.gentoo.org/732096
-
-diff -r 419bf3de54e5 CMakeLists.txt
 a/CMakeLists.txt   Sat Oct 24 19:50:25 2020 +
-+++ b/CMakeLists.txt   Sat Oct 24 19:50:53 2020 +
-@@ -390,8 +390,6 @@
-   MESSAGE("Using ar, ranlib, and default linker")
-   find_program(NON_LTO_AR NAMES ar)
-   find_program(NON_LTO_RANLIB NAMES ranlib)
--  set(CMAKE_AR "${NON_LTO_AR}" CACHE STRING "Does not support LTO" FORCE)
--  set(CMAKE_RANLIB "${NON_LTO_RANLIB}" CACHE STRING "Does not support 
LTO" FORCE)
- endif()
- MARK_AS_ADVANCED(LTO_AR LTO_RANLIB NON_LTO_AR NON_LTO_RANLIB)
-

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

2022-05-16 Thread Sam James

commit: c345259bec0d8f00e949af9cf6d6b6f2ce770b5a
Author: Sam James  gentoo  org>
AuthorDate: Tue May 17 01:31:48 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 17 05:33:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c345259b

games-strategy/wesnoth: [QA] drop (very) stale GCC version checks

There's no way that GCC 3.x is usable on a modern system and it was released in
~2005.

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

 games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild | 6 +-
 games-strategy/wesnoth/wesnoth-1.16.2.ebuild| 6 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild 
b/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild
index 12aaafe9867e..f5718459c555 100644
--- a/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake flag-o-matic toolchain-funcs xdg
+inherit cmake flag-o-matic xdg
 
 DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
 HOMEPAGE="http://www.wesnoth.org
@@ -64,10 +64,6 @@ src_prepare() {
 
 src_configure() {
filter-flags -ftracer -fomit-frame-pointer
-   if [[ $(gcc-major-version) -eq 3 ]] ; then
-   filter-flags -fstack-protector
-   append-flags -fno-stack-protector
-   fi
 
if use dedicated || use server ; then
mycmakeargs=(

diff --git a/games-strategy/wesnoth/wesnoth-1.16.2.ebuild 
b/games-strategy/wesnoth/wesnoth-1.16.2.ebuild
index 9c2f089d6905..17cdd9a055f7 100644
--- a/games-strategy/wesnoth/wesnoth-1.16.2.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.16.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake flag-o-matic toolchain-funcs xdg
+inherit cmake flag-o-matic xdg
 
 DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
 HOMEPAGE="http://www.wesnoth.org
@@ -64,10 +64,6 @@ src_prepare() {
 
 src_configure() {
filter-flags -ftracer -fomit-frame-pointer
-   if [[ $(gcc-major-version) -eq 3 ]] ; then
-   filter-flags -fstack-protector
-   append-flags -fno-stack-protector
-   fi
 
if use dedicated || use server ; then
mycmakeargs=(

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

2022-05-16 Thread Lars Wendler

commit: 47838dea4099ea7ca475dd845dc96b889b9258b1
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon May 16 09:38:47 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon May 16 09:38:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47838dea

games-strategy/wesnoth: Removed unused local USE flag description

Signed-off-by: Lars Wendler  gentoo.org>

 games-strategy/wesnoth/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/games-strategy/wesnoth/metadata.xml 
b/games-strategy/wesnoth/metadata.xml
index 55f36d0dfad5..42cfc4670216 100644
--- a/games-strategy/wesnoth/metadata.xml
+++ b/games-strategy/wesnoth/metadata.xml
@@ -7,7 +7,6 @@
   
   
 Enable compilation of server
-Support for right-to-left languages
   
   
 wesnoth

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

2022-05-16 Thread Lars Wendler

commit: 381c84d717ce3ec12b13f9f9e10659b0c8db6723
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon May 16 09:25:12 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon May 16 09:25:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=381c84d7

games-strategy/wesnoth: Removed old

Signed-off-by: Lars Wendler  gentoo.org>

 games-strategy/wesnoth/Manifest  |   2 -
 games-strategy/wesnoth/wesnoth-1.14.14-r1.ebuild | 111 ---
 games-strategy/wesnoth/wesnoth-1.15.15.ebuild| 106 --
 3 files changed, 219 deletions(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 4531e7bac927..fd1ae547afc1 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,4 +1,2 @@
-DIST wesnoth-1.14.14.tar.gz 502931191 BLAKE2B 
25bbead74d74bbce9c47b5ac9339fd5b4d996cb9f80137f0b1d9a600c71c82b732ed66937419a4dd59995311685960630415daf3fd3f51e8cf891f29a16ec024
 SHA512 
3924aa26b59445568472a10c5fe0e1ddf87eb0a878faf2bcc52d4618f5743dfeda103d1f4025f4a129628e6a25f4c16407e968d594769a0751ada2c9a733e2e4
-DIST wesnoth-1.15.15.tar.gz 512968280 BLAKE2B 
2b5c979244fb168e674d120a5eeef3905560992a7ca50735ef30918144ad7b21a9d57bef8cf19d564e02226955fb1c6922b27151fef36825a9b06cbe3d9e40ee
 SHA512 
7f59ac11223e6ca93f926ca978638828e366ea2fd75530b317656e5edd8b0f042f86beb57fd17b8cc9b2d3d093d60580cd3449e1c3bf53b8ee37f656df7198a2
 DIST wesnoth-1.16.0.tar.gz 515780018 BLAKE2B 
1a9d6aa9b294b9919d3b51528928f43d786f30fda739f0af2e62ebbb210b8f071945fe6130c00e2055d3726ae7eabf63b57fd2f1d5d8981a4cd0feedbfbffbfb
 SHA512 
6d999a99e140916ef2070c524898ef69c7b45b3240f208aa380e81a1d1822a02c05a7fc9c5049a05a230e5126d8ff8723e16b6a62ba532b81c031f78ad8c85fe
 DIST wesnoth-1.16.2.tar.gz 517313669 BLAKE2B 
b1b9a2795a7a298edd1d952547db518a31f217f983aaf39cdde7a14773f2538485c980205e9242d4a1c8f933011a09a7e858de128c7d17c16c552e34b2a59bf3
 SHA512 
19cb4c64d9cce780ffbb54e357bf88c3cf2eedc835fab7162bd9caa62485a60ab2a1ba68ab0c4b98dc05bab4fb22889f4a8237b9542baa5478fbda08034d9f66

diff --git a/games-strategy/wesnoth/wesnoth-1.14.14-r1.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.14-r1.ebuild
deleted file mode 100644
index 4350dcbc1a9b..
--- a/games-strategy/wesnoth/wesnoth-1.14.14-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic toolchain-funcs xdg
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org
-   https://github.com/wesnoth/wesnoth;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# uneven minor versions are development versions
-if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
-   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-IUSE="dbus dedicated doc fribidi nls server"
-
-RDEPEND="
-   acct-group/wesnoth
-   acct-user/wesnoth
-   >=dev-libs/boost-1.50:=[nls,threads(+),icu]
-   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
-   !dedicated? (
-   dev-libs/glib:2
-   dev-libs/openssl:0=
-   >=media-libs/fontconfig-2.4.1
-   >=media-libs/sdl2-image-2.0.0[jpeg,png]
-   >=media-libs/sdl2-mixer-2.0.0[vorbis]
-   >=media-libs/sdl2-ttf-2.0.12
-   media-libs/libvorbis
-   >=x11-libs/pango-1.22.0
-   >=x11-libs/cairo-1.10.0
-   sys-libs/readline:0=
-   dbus? ( sys-apps/dbus )
-   fribidi? ( dev-libs/fribidi )
-   )"
-DEPEND="${RDEPEND}
-   x11-libs/libX11
-"
-BDEPEND="
-   sys-devel/gettext
-   virtual/pkgconfig
-"
-
-PATCHES=(
-   "${FILESDIR}/wesnoth-1.14.14-ar.patch"
-)
-
-src_prepare() {
-   cmake_src_prepare
-
-   if ! use doc ; then
-   sed -i \
-   -e '/manual/d' \
-   doc/CMakeLists.txt || die
-   fi
-
-   # respect LINGUAS (bug #483316)
-   if [[ ${LINGUAS+set} ]] ; then
-   local lang langs=()
-   for lang in $(cat po/LINGUAS) ; do
-   has ${lang} ${LINGUAS} && langs+=( ${lang} )
-   done
-   echo "${langs[@]}" > po/LINGUAS || die
-   fi
-}
-
-src_configure() {
-   filter-flags -ftracer -fomit-frame-pointer
-   if [[ $(gcc-major-version) -eq 3 ]] ; then
-   filter-flags -fstack-protector
-   append-flags -fno-stack-protector
-   fi
-
-   if use dedicated || use server ; then
-   mycmakeargs=(
-   -DENABLE_CAMPAIGN_SERVER="ON"
-   -DENABLE_SERVER="ON"
-   -DSERVER_UID="${PN}"
-   -DSERVER_GID="${PN}"
-   -DFIFO_DIR="/run/wesnothd"
-   )
-   else
-

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

2022-05-16 Thread Lars Wendler

commit: 42911e89ccd7faa91bb2fff8d5c1037759bcbba4
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon May 16 09:17:04 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon May 16 09:25:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42911e89

games-strategy/wesnoth: Bump to version 1.16.2

Signed-off-by: Lars Wendler  gentoo.org>

 games-strategy/wesnoth/Manifest  |   1 +
 games-strategy/wesnoth/wesnoth-1.16.2.ebuild | 104 +++
 2 files changed, 105 insertions(+)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 088b5bb879df..4531e7bac927 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,3 +1,4 @@
 DIST wesnoth-1.14.14.tar.gz 502931191 BLAKE2B 
25bbead74d74bbce9c47b5ac9339fd5b4d996cb9f80137f0b1d9a600c71c82b732ed66937419a4dd59995311685960630415daf3fd3f51e8cf891f29a16ec024
 SHA512 
3924aa26b59445568472a10c5fe0e1ddf87eb0a878faf2bcc52d4618f5743dfeda103d1f4025f4a129628e6a25f4c16407e968d594769a0751ada2c9a733e2e4
 DIST wesnoth-1.15.15.tar.gz 512968280 BLAKE2B 
2b5c979244fb168e674d120a5eeef3905560992a7ca50735ef30918144ad7b21a9d57bef8cf19d564e02226955fb1c6922b27151fef36825a9b06cbe3d9e40ee
 SHA512 
7f59ac11223e6ca93f926ca978638828e366ea2fd75530b317656e5edd8b0f042f86beb57fd17b8cc9b2d3d093d60580cd3449e1c3bf53b8ee37f656df7198a2
 DIST wesnoth-1.16.0.tar.gz 515780018 BLAKE2B 
1a9d6aa9b294b9919d3b51528928f43d786f30fda739f0af2e62ebbb210b8f071945fe6130c00e2055d3726ae7eabf63b57fd2f1d5d8981a4cd0feedbfbffbfb
 SHA512 
6d999a99e140916ef2070c524898ef69c7b45b3240f208aa380e81a1d1822a02c05a7fc9c5049a05a230e5126d8ff8723e16b6a62ba532b81c031f78ad8c85fe
+DIST wesnoth-1.16.2.tar.gz 517313669 BLAKE2B 
b1b9a2795a7a298edd1d952547db518a31f217f983aaf39cdde7a14773f2538485c980205e9242d4a1c8f933011a09a7e858de128c7d17c16c552e34b2a59bf3
 SHA512 
19cb4c64d9cce780ffbb54e357bf88c3cf2eedc835fab7162bd9caa62485a60ab2a1ba68ab0c4b98dc05bab4fb22889f4a8237b9542baa5478fbda08034d9f66

diff --git a/games-strategy/wesnoth/wesnoth-1.16.2.ebuild 
b/games-strategy/wesnoth/wesnoth-1.16.2.ebuild
new file mode 100644
index ..9c2f089d6905
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.16.2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+   https://github.com/wesnoth/wesnoth;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# uneven minor versions are development versions
+if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
+   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+IUSE="dbus dedicated doc nls server"
+
+RDEPEND="
+   acct-group/wesnoth
+   acct-user/wesnoth
+   dev-libs/boost:=[bzip2,context,icu,nls,threads(+)]
+   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+   !dedicated? (
+   dev-libs/glib:2
+   dev-libs/openssl:0=
+   >=media-libs/fontconfig-2.4.1
+   >=media-libs/sdl2-image-2.0.0[jpeg,png]
+   >=media-libs/sdl2-mixer-2.0.0[vorbis]
+   media-libs/libvorbis
+   >=x11-libs/pango-1.22.0
+   >=x11-libs/cairo-1.10.0
+   sys-libs/readline:0=
+   dbus? ( sys-apps/dbus )
+   )"
+DEPEND="${RDEPEND}
+   x11-libs/libX11
+"
+BDEPEND="
+   sys-devel/gettext
+   virtual/pkgconfig
+"
+
+src_prepare() {
+   cmake_src_prepare
+
+   if ! use doc ; then
+   sed -i \
+   -e '/manual/d' \
+   doc/CMakeLists.txt || die
+   fi
+
+   # respect LINGUAS (bug #483316)
+   if [[ ${LINGUAS+set} ]] ; then
+   local lang langs=()
+   for lang in $(cat po/LINGUAS) ; do
+   has ${lang} ${LINGUAS} && langs+=( ${lang} )
+   done
+   echo "${langs[@]}" > po/LINGUAS || die
+   fi
+}
+
+src_configure() {
+   filter-flags -ftracer -fomit-frame-pointer
+   if [[ $(gcc-major-version) -eq 3 ]] ; then
+   filter-flags -fstack-protector
+   append-flags -fno-stack-protector
+   fi
+
+   if use dedicated || use server ; then
+   mycmakeargs=(
+   -DENABLE_CAMPAIGN_SERVER="ON"
+   -DENABLE_SERVER="ON"
+   -DSERVER_UID="${PN}"
+   -DSERVER_GID="${PN}"
+   -DFIFO_DIR="/run/wesnothd"
+   )
+   else
+   mycmakeargs=(
+   -DENABLE_CAMPAIGN_SERVER="OFF"
+   -DENABLE_SERVER="OFF"
+   )
+   fi
+   mycmakeargs+=(
+   -Wno-dev
+   -DENABLE_GAME="$(usex !dedicated)"

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

2022-03-12 Thread Arthur Zamarin

commit: ace2b1064bbfead3fd5d1adf39329c8414803a9e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar 12 12:00:55 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar 12 12:00:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ace2b106

games-strategy/wesnoth: Keyword 1.16.0-r1 ppc64, #834861

Signed-off-by: Arthur Zamarin  gentoo.org>

 games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild 
b/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild
index c85b1bf02302..12aaafe9867e 100644
--- a/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 # uneven minor versions are development versions
 if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
-   KEYWORDS="~amd64 ~ppc ~x86"
+   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 fi
 IUSE="dbus dedicated doc nls server"

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

2022-03-09 Thread Sam James

commit: e246aef11aa1681455fc6a3c2af5369d0db9178e
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar 10 02:20:54 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 10 02:20:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e246aef1

games-strategy/wesnoth: Keyword 1.16.0-r1 ppc, #834861

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

 games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild 
b/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild
index 0d53e174d56e..c85b1bf02302 100644
--- a/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.16.0-r1.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
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 # uneven minor versions are development versions
 if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="~amd64 ~ppc ~x86"
 fi
 IUSE="dbus dedicated doc nls server"

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

2021-10-27 Thread Ionen Wolkens

commit: 33c9ee82b146a03aeb5d1a14addc6a28ef8fa2cc
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Oct 27 11:44:50 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Oct 27 13:25:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33c9ee82

games-strategy/wesnoth: add missing dep on boost[bzip2,context]

[context] wrt bug #820470 is newly needed for server. However, it
still failed due to the coroutine removal seds. It's /possible/
to skip these with non-server but feels messy. Remove them and
unconditionally depend on [context] as upstream is expecting and
possibly avoid future issues.

May be older, but lacking [bzip2] also happened to cause failure.

Side-adjusted /run rmdir to avoid a QA warning. Likely other small
issues, did not do a thorough revision.

Closes: https://bugs.gentoo.org/820470
Signed-off-by: Ionen Wolkens  gentoo.org>

 .../wesnoth/{wesnoth-1.16.0.ebuild => wesnoth-1.16.0-r1.ebuild} | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/games-strategy/wesnoth/wesnoth-1.16.0.ebuild 
b/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild
similarity index 92%
rename from games-strategy/wesnoth/wesnoth-1.16.0.ebuild
rename to games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild
index c9a69554f39..0d53e174d56 100644
--- a/games-strategy/wesnoth/wesnoth-1.16.0.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild
@@ -21,7 +21,7 @@ IUSE="dbus dedicated doc nls server"
 RDEPEND="
acct-group/wesnoth
acct-user/wesnoth
-   >=dev-libs/boost-1.50:=[nls,threads(+),icu]
+   dev-libs/boost:=[bzip2,context,icu,nls,threads(+)]
>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
!dedicated? (
dev-libs/glib:2
@@ -46,8 +46,6 @@ BDEPEND="
 src_prepare() {
cmake_src_prepare
 
-   sed 's@ coroutine@@' -i CMakeLists.txt || die
-   sed '/Boost::coroutine/d' -i src/CMakeLists.txt || die
if ! use doc ; then
sed -i \
-e '/manual/d' \
@@ -100,7 +98,7 @@ src_install() {
local DOCS=( README.md changelog.md )
cmake_src_install
if use dedicated || use server; then
-   rmdir "${ED}/run/wesnothd" || die
+   rmdir "${ED}"/run{/wesnothd,} || die
newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
fi
 }

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

2021-10-26 Thread Piotr Karbowski

commit: eec9a7e13f21c2ce79d60d0b08bc2077e6a653aa
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Tue Oct 26 22:07:53 2021 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Tue Oct 26 22:08:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eec9a7e1

games-strategy/wesnoth: 1.16.0 version bump.

Signed-off-by: Piotr Karbowski  gentoo.org>

 games-strategy/wesnoth/Manifest  |   1 +
 games-strategy/wesnoth/wesnoth-1.16.0.ebuild | 106 +++
 2 files changed, 107 insertions(+)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index cb67db84b79..088b5bb879d 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,2 +1,3 @@
 DIST wesnoth-1.14.14.tar.gz 502931191 BLAKE2B 
25bbead74d74bbce9c47b5ac9339fd5b4d996cb9f80137f0b1d9a600c71c82b732ed66937419a4dd59995311685960630415daf3fd3f51e8cf891f29a16ec024
 SHA512 
3924aa26b59445568472a10c5fe0e1ddf87eb0a878faf2bcc52d4618f5743dfeda103d1f4025f4a129628e6a25f4c16407e968d594769a0751ada2c9a733e2e4
 DIST wesnoth-1.15.15.tar.gz 512968280 BLAKE2B 
2b5c979244fb168e674d120a5eeef3905560992a7ca50735ef30918144ad7b21a9d57bef8cf19d564e02226955fb1c6922b27151fef36825a9b06cbe3d9e40ee
 SHA512 
7f59ac11223e6ca93f926ca978638828e366ea2fd75530b317656e5edd8b0f042f86beb57fd17b8cc9b2d3d093d60580cd3449e1c3bf53b8ee37f656df7198a2
+DIST wesnoth-1.16.0.tar.gz 515780018 BLAKE2B 
1a9d6aa9b294b9919d3b51528928f43d786f30fda739f0af2e62ebbb210b8f071945fe6130c00e2055d3726ae7eabf63b57fd2f1d5d8981a4cd0feedbfbffbfb
 SHA512 
6d999a99e140916ef2070c524898ef69c7b45b3240f208aa380e81a1d1822a02c05a7fc9c5049a05a230e5126d8ff8723e16b6a62ba532b81c031f78ad8c85fe

diff --git a/games-strategy/wesnoth/wesnoth-1.16.0.ebuild 
b/games-strategy/wesnoth/wesnoth-1.16.0.ebuild
new file mode 100644
index 000..c9a69554f39
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.16.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+   https://github.com/wesnoth/wesnoth;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# uneven minor versions are development versions
+if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
+   KEYWORDS="~amd64 ~x86"
+fi
+IUSE="dbus dedicated doc nls server"
+
+RDEPEND="
+   acct-group/wesnoth
+   acct-user/wesnoth
+   >=dev-libs/boost-1.50:=[nls,threads(+),icu]
+   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+   !dedicated? (
+   dev-libs/glib:2
+   dev-libs/openssl:0=
+   >=media-libs/fontconfig-2.4.1
+   >=media-libs/sdl2-image-2.0.0[jpeg,png]
+   >=media-libs/sdl2-mixer-2.0.0[vorbis]
+   media-libs/libvorbis
+   >=x11-libs/pango-1.22.0
+   >=x11-libs/cairo-1.10.0
+   sys-libs/readline:0=
+   dbus? ( sys-apps/dbus )
+   )"
+DEPEND="${RDEPEND}
+   x11-libs/libX11
+"
+BDEPEND="
+   sys-devel/gettext
+   virtual/pkgconfig
+"
+
+src_prepare() {
+   cmake_src_prepare
+
+   sed 's@ coroutine@@' -i CMakeLists.txt || die
+   sed '/Boost::coroutine/d' -i src/CMakeLists.txt || die
+   if ! use doc ; then
+   sed -i \
+   -e '/manual/d' \
+   doc/CMakeLists.txt || die
+   fi
+
+   # respect LINGUAS (bug #483316)
+   if [[ ${LINGUAS+set} ]] ; then
+   local lang langs=()
+   for lang in $(cat po/LINGUAS) ; do
+   has ${lang} ${LINGUAS} && langs+=( ${lang} )
+   done
+   echo "${langs[@]}" > po/LINGUAS || die
+   fi
+}
+
+src_configure() {
+   filter-flags -ftracer -fomit-frame-pointer
+   if [[ $(gcc-major-version) -eq 3 ]] ; then
+   filter-flags -fstack-protector
+   append-flags -fno-stack-protector
+   fi
+
+   if use dedicated || use server ; then
+   mycmakeargs=(
+   -DENABLE_CAMPAIGN_SERVER="ON"
+   -DENABLE_SERVER="ON"
+   -DSERVER_UID="${PN}"
+   -DSERVER_GID="${PN}"
+   -DFIFO_DIR="/run/wesnothd"
+   )
+   else
+   mycmakeargs=(
+   -DENABLE_CAMPAIGN_SERVER="OFF"
+   -DENABLE_SERVER="OFF"
+   )
+   fi
+   mycmakeargs+=(
+   -Wno-dev
+   -DENABLE_GAME="$(usex !dedicated)"
+   -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+   -DENABLE_NLS="$(usex nls)"
+   -DENABLE_NOTIFICATIONS="$(usex dbus)"
+   -DENABLE_STRICT_COMPILATION="OFF"
+

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

2021-07-19 Thread Lars Wendler

commit: 9fb253163c13da4a50f36a9ecb426fb014116db0
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Jul 19 18:09:58 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Jul 19 18:09:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fb25316

games-strategy/wesnoth: Bump to version 1.15.15. Removed old

Signed-off-by: Lars Wendler  gentoo.org>

 games-strategy/wesnoth/Manifest | 2 +-
 .../wesnoth/{wesnoth-1.15.14.ebuild => wesnoth-1.15.15.ebuild}  | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index e06f025a280..cb67db84b79 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,2 +1,2 @@
 DIST wesnoth-1.14.14.tar.gz 502931191 BLAKE2B 
25bbead74d74bbce9c47b5ac9339fd5b4d996cb9f80137f0b1d9a600c71c82b732ed66937419a4dd59995311685960630415daf3fd3f51e8cf891f29a16ec024
 SHA512 
3924aa26b59445568472a10c5fe0e1ddf87eb0a878faf2bcc52d4618f5743dfeda103d1f4025f4a129628e6a25f4c16407e968d594769a0751ada2c9a733e2e4
-DIST wesnoth-1.15.14.tar.gz 513004602 BLAKE2B 
04d0ec57a2b0627f778d1a82e592d11f360bf80b445b1faae7e3d708599b22e272be85848942edd9f2c1393bbe1979aaf3a249996ce9ae682c34de24b5c88c29
 SHA512 
09f803c34452d20aade2a8373c15be2f595d2ae8633885e321870aac742250430f376b753090fc6f03f19307f650972ba8477a2cc255e0fbafb2d7270d9610d2
+DIST wesnoth-1.15.15.tar.gz 512968280 BLAKE2B 
2b5c979244fb168e674d120a5eeef3905560992a7ca50735ef30918144ad7b21a9d57bef8cf19d564e02226955fb1c6922b27151fef36825a9b06cbe3d9e40ee
 SHA512 
7f59ac11223e6ca93f926ca978638828e366ea2fd75530b317656e5edd8b0f042f86beb57fd17b8cc9b2d3d093d60580cd3449e1c3bf53b8ee37f656df7198a2

diff --git a/games-strategy/wesnoth/wesnoth-1.15.14.ebuild 
b/games-strategy/wesnoth/wesnoth-1.15.15.ebuild
similarity index 100%
rename from games-strategy/wesnoth/wesnoth-1.15.14.ebuild
rename to games-strategy/wesnoth/wesnoth-1.15.15.ebuild

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

2021-06-21 Thread Lars Wendler

commit: d283def7fe37f6545426f00acbc4cfb411dc4bfc
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Jun 21 20:14:36 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Jun 21 20:17:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d283def7

games-strategy/wesnoth: Bump to version 1.15.14. Removed old

Signed-off-by: Lars Wendler  gentoo.org>

 games-strategy/wesnoth/Manifest | 2 +-
 .../wesnoth/{wesnoth-1.15.12-r1.ebuild => wesnoth-1.15.14.ebuild}   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 879f4b44c8f..e06f025a280 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,2 +1,2 @@
 DIST wesnoth-1.14.14.tar.gz 502931191 BLAKE2B 
25bbead74d74bbce9c47b5ac9339fd5b4d996cb9f80137f0b1d9a600c71c82b732ed66937419a4dd59995311685960630415daf3fd3f51e8cf891f29a16ec024
 SHA512 
3924aa26b59445568472a10c5fe0e1ddf87eb0a878faf2bcc52d4618f5743dfeda103d1f4025f4a129628e6a25f4c16407e968d594769a0751ada2c9a733e2e4
-DIST wesnoth-1.15.12.tar.gz 509770568 BLAKE2B 
6bdbbb132938ff1fd8c47fee8fd7311176e442c96261fafa4a2ba75798a87422f38dd1e6b9547828d5c86332473d03a82f923bc5070e65777ccc60046d949b27
 SHA512 
a8e104154cf91cb3c2d0d053cbb56f1b59f71b6a05510d49d1ee81368f2b8782ceceef37dc3961925c7d54b5bca6c649c8993cca0d4b9dc179fa3309827b7a59
+DIST wesnoth-1.15.14.tar.gz 513004602 BLAKE2B 
04d0ec57a2b0627f778d1a82e592d11f360bf80b445b1faae7e3d708599b22e272be85848942edd9f2c1393bbe1979aaf3a249996ce9ae682c34de24b5c88c29
 SHA512 
09f803c34452d20aade2a8373c15be2f595d2ae8633885e321870aac742250430f376b753090fc6f03f19307f650972ba8477a2cc255e0fbafb2d7270d9610d2

diff --git a/games-strategy/wesnoth/wesnoth-1.15.12-r1.ebuild 
b/games-strategy/wesnoth/wesnoth-1.15.14.ebuild
similarity index 97%
rename from games-strategy/wesnoth/wesnoth-1.15.12-r1.ebuild
rename to games-strategy/wesnoth/wesnoth-1.15.14.ebuild
index 8c511175a73..c9a69554f39 100644
--- a/games-strategy/wesnoth/wesnoth-1.15.12-r1.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.15.14.ebuild
@@ -47,6 +47,7 @@ src_prepare() {
cmake_src_prepare
 
sed 's@ coroutine@@' -i CMakeLists.txt || die
+   sed '/Boost::coroutine/d' -i src/CMakeLists.txt || die
if ! use doc ; then
sed -i \
-e '/manual/d' \

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

2021-06-18 Thread David Seifert

commit: e5dd9b8fb6343aa09f2bf661291bf072d160785c
Author: David Seifert  gentoo  org>
AuthorDate: Fri Jun 18 19:16:44 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Jun 18 19:16:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5dd9b8f

games-strategy/wesnoth: Depend on dev-libs/boost:=[threads(+)]

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: David Seifert  gentoo.org>

 .../wesnoth/{wesnoth-1.14.14.ebuild => wesnoth-1.14.14-r1.ebuild}   | 2 +-
 .../wesnoth/{wesnoth-1.15.12.ebuild => wesnoth-1.15.12-r1.ebuild}   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-strategy/wesnoth/wesnoth-1.14.14.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.14-r1.ebuild
similarity index 98%
rename from games-strategy/wesnoth/wesnoth-1.14.14.ebuild
rename to games-strategy/wesnoth/wesnoth-1.14.14-r1.ebuild
index 925a360324c..4350dcbc1a9 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.14.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.14-r1.ebuild
@@ -21,7 +21,7 @@ IUSE="dbus dedicated doc fribidi nls server"
 RDEPEND="
acct-group/wesnoth
acct-user/wesnoth
-   >=dev-libs/boost-1.50:=[nls,threads,icu]
+   >=dev-libs/boost-1.50:=[nls,threads(+),icu]
>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
!dedicated? (
dev-libs/glib:2

diff --git a/games-strategy/wesnoth/wesnoth-1.15.12.ebuild 
b/games-strategy/wesnoth/wesnoth-1.15.12-r1.ebuild
similarity index 98%
rename from games-strategy/wesnoth/wesnoth-1.15.12.ebuild
rename to games-strategy/wesnoth/wesnoth-1.15.12-r1.ebuild
index 420f1980fb1..8c511175a73 100644
--- a/games-strategy/wesnoth/wesnoth-1.15.12.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.15.12-r1.ebuild
@@ -21,7 +21,7 @@ IUSE="dbus dedicated doc nls server"
 RDEPEND="
acct-group/wesnoth
acct-user/wesnoth
-   >=dev-libs/boost-1.50:=[nls,threads,icu]
+   >=dev-libs/boost-1.50:=[nls,threads(+),icu]
>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
!dedicated? (
dev-libs/glib:2

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

2021-05-03 Thread Mikle Kolyada

commit: a5f2e2ff9078df4a399ac0506f14ae6e0600d353
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon May  3 06:57:30 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon May  3 06:57:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5f2e2ff

games-strategy/wesnoth: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 games-strategy/wesnoth/wesnoth-1.14.14.ebuild | 7 +++
 games-strategy/wesnoth/wesnoth-1.15.12.ebuild | 5 ++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/games-strategy/wesnoth/wesnoth-1.14.14.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.14.ebuild
index c7b3e8e7b14..925a360324c 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.14.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SLOT="0"
 if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 fi
-IUSE="dbus dedicated doc fribidi libressl nls server"
+IUSE="dbus dedicated doc fribidi nls server"
 
 RDEPEND="
acct-group/wesnoth
@@ -25,8 +25,7 @@ RDEPEND="
>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
!dedicated? (
dev-libs/glib:2
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
+   dev-libs/openssl:0=
>=media-libs/fontconfig-2.4.1
>=media-libs/sdl2-image-2.0.0[jpeg,png]
>=media-libs/sdl2-mixer-2.0.0[vorbis]

diff --git a/games-strategy/wesnoth/wesnoth-1.15.12.ebuild 
b/games-strategy/wesnoth/wesnoth-1.15.12.ebuild
index 1733f0d2734..420f1980fb1 100644
--- a/games-strategy/wesnoth/wesnoth-1.15.12.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.15.12.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
KEYWORDS="~amd64 ~x86"
 fi
-IUSE="dbus dedicated doc libressl nls server"
+IUSE="dbus dedicated doc nls server"
 
 RDEPEND="
acct-group/wesnoth
@@ -25,8 +25,7 @@ RDEPEND="
>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
!dedicated? (
dev-libs/glib:2
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
+   dev-libs/openssl:0=
>=media-libs/fontconfig-2.4.1
>=media-libs/sdl2-image-2.0.0[jpeg,png]
>=media-libs/sdl2-mixer-2.0.0[vorbis]

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

2021-04-19 Thread Lars Wendler

commit: 6542e021a6e543aaaf8d88cde724db30a7fca9af
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Apr 19 15:25:37 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Apr 19 15:29:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6542e021

games-strategy/wesnoth: Bump to version 1.15.12. Removed old

Signed-off-by: Lars Wendler  gentoo.org>

 games-strategy/wesnoth/Manifest  | 2 +-
 .../wesnoth/{wesnoth-1.15.11.ebuild => wesnoth-1.15.12.ebuild}   | 5 +
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 2b72748d3e3..879f4b44c8f 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,2 +1,2 @@
 DIST wesnoth-1.14.14.tar.gz 502931191 BLAKE2B 
25bbead74d74bbce9c47b5ac9339fd5b4d996cb9f80137f0b1d9a600c71c82b732ed66937419a4dd59995311685960630415daf3fd3f51e8cf891f29a16ec024
 SHA512 
3924aa26b59445568472a10c5fe0e1ddf87eb0a878faf2bcc52d4618f5743dfeda103d1f4025f4a129628e6a25f4c16407e968d594769a0751ada2c9a733e2e4
-DIST wesnoth-1.15.11.tar.gz 509311523 BLAKE2B 
3b08b94d81c70b13922eb31467f43d9d811a836b0861a1516678dc6de1485ac4a661bcc4d5e8c61707f07ceea552f6b8fef5e2ab40be0d93fcacdea9e30f56a7
 SHA512 
fc30e3e59e42f82120ad61857adac8d496b847b57316ea57a6e43212b64c05631d5e50f5fab632786da4d4265228244224033c6aa34a622a47bc530a57b7cfab
+DIST wesnoth-1.15.12.tar.gz 509770568 BLAKE2B 
6bdbbb132938ff1fd8c47fee8fd7311176e442c96261fafa4a2ba75798a87422f38dd1e6b9547828d5c86332473d03a82f923bc5070e65777ccc60046d949b27
 SHA512 
a8e104154cf91cb3c2d0d053cbb56f1b59f71b6a05510d49d1ee81368f2b8782ceceef37dc3961925c7d54b5bca6c649c8993cca0d4b9dc179fa3309827b7a59

diff --git a/games-strategy/wesnoth/wesnoth-1.15.11.ebuild 
b/games-strategy/wesnoth/wesnoth-1.15.12.ebuild
similarity index 93%
rename from games-strategy/wesnoth/wesnoth-1.15.11.ebuild
rename to games-strategy/wesnoth/wesnoth-1.15.12.ebuild
index e57800e4c3c..1733f0d2734 100644
--- a/games-strategy/wesnoth/wesnoth-1.15.11.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.15.12.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
KEYWORDS="~amd64 ~x86"
 fi
-IUSE="dbus dedicated doc fribidi libressl nls server"
+IUSE="dbus dedicated doc libressl nls server"
 
 RDEPEND="
acct-group/wesnoth
@@ -30,13 +30,11 @@ RDEPEND="
>=media-libs/fontconfig-2.4.1
>=media-libs/sdl2-image-2.0.0[jpeg,png]
>=media-libs/sdl2-mixer-2.0.0[vorbis]
-   >=media-libs/sdl2-ttf-2.0.12
media-libs/libvorbis
>=x11-libs/pango-1.22.0
>=x11-libs/cairo-1.10.0
sys-libs/readline:0=
dbus? ( sys-apps/dbus )
-   fribidi? ( dev-libs/fribidi )
)"
 DEPEND="${RDEPEND}
x11-libs/libX11
@@ -93,7 +91,6 @@ src_configure() {
-DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
-DENABLE_NLS="$(usex nls)"
-DENABLE_NOTIFICATIONS="$(usex dbus)"
-   -DENABLE_FRIBIDI="$(usex fribidi)"
-DENABLE_STRICT_COMPILATION="OFF"
)
cmake_src_configure

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

2021-04-01 Thread Lars Wendler

commit: fb53762882abb5fc9b947160709cb2fbd824120a
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Apr  1 21:44:17 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Apr  1 21:44:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb537628

games-strategy/wesnoth: Bump to version 1.15.11. Removed old

Signed-off-by: Lars Wendler  gentoo.org>

 games-strategy/wesnoth/Manifest| 2 +-
 .../wesnoth/{wesnoth-1.15.4.ebuild => wesnoth-1.15.11.ebuild}  | 7 ++-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 0c3cc9f0e9c..2b72748d3e3 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,2 +1,2 @@
 DIST wesnoth-1.14.14.tar.gz 502931191 BLAKE2B 
25bbead74d74bbce9c47b5ac9339fd5b4d996cb9f80137f0b1d9a600c71c82b732ed66937419a4dd59995311685960630415daf3fd3f51e8cf891f29a16ec024
 SHA512 
3924aa26b59445568472a10c5fe0e1ddf87eb0a878faf2bcc52d4618f5743dfeda103d1f4025f4a129628e6a25f4c16407e968d594769a0751ada2c9a733e2e4
-DIST wesnoth-1.15.4.tar.gz 500087559 BLAKE2B 
bb46766369cfcb1432b5b5e8df62636e2a45ff45bf3ec4381aa9e73b20a4a5a6e196f0355b10d2b86ffad608cfdd24f8d2fad21061db9b18f1a2decf11b0e466
 SHA512 
b209e584a187934b0ca3808cb870f4703b49edd5de357b6a6b01bdad2c71b8d755b81d3628c5281cd19f82ee8d030716d6bf64a806e6636426949b0a3d85ee9d
+DIST wesnoth-1.15.11.tar.gz 509311523 BLAKE2B 
3b08b94d81c70b13922eb31467f43d9d811a836b0861a1516678dc6de1485ac4a661bcc4d5e8c61707f07ceea552f6b8fef5e2ab40be0d93fcacdea9e30f56a7
 SHA512 
fc30e3e59e42f82120ad61857adac8d496b847b57316ea57a6e43212b64c05631d5e50f5fab632786da4d4265228244224033c6aa34a622a47bc530a57b7cfab

diff --git a/games-strategy/wesnoth/wesnoth-1.15.4.ebuild 
b/games-strategy/wesnoth/wesnoth-1.15.11.ebuild
similarity index 96%
rename from games-strategy/wesnoth/wesnoth-1.15.4.ebuild
rename to games-strategy/wesnoth/wesnoth-1.15.11.ebuild
index 4d50bca2725..e57800e4c3c 100644
--- a/games-strategy/wesnoth/wesnoth-1.15.4.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.15.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -46,13 +46,10 @@ BDEPEND="
virtual/pkgconfig
 "
 
-PATCHES=(
-   "${FILESDIR}/wesnoth-1.14.14-ar.patch"
-)
-
 src_prepare() {
cmake_src_prepare
 
+   sed 's@ coroutine@@' -i CMakeLists.txt || die
if ! use doc ; then
sed -i \
-e '/manual/d' \

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

2020-11-26 Thread Sam James

commit: 9c2f580719b410d7e72e9edda8021eb58d2a4b5b
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov 26 11:11:14 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 26 11:11:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c2f5807

games-strategy/wesnoth: Keyword 1.14.14 ppc, #756730

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

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

diff --git a/games-strategy/wesnoth/wesnoth-1.14.14.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.14.ebuild
index f0e7d3c8405..c7b3e8e7b14 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.14.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.14.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 # uneven minor versions are development versions
 if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
-   KEYWORDS="~amd64 ~ppc64 ~x86"
+   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 fi
 IUSE="dbus dedicated doc fribidi libressl nls server"

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

2020-11-26 Thread Sam James

commit: e97b521ef37d357f64fd27d91d5ebbdfa2ef436b
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov 26 11:11:03 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 26 11:11:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e97b521e

games-strategy/wesnoth: Keyword 1.14.14 ppc64, #756730

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

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

diff --git a/games-strategy/wesnoth/wesnoth-1.14.14.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.14.ebuild
index 4d50bca2725..f0e7d3c8405 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.14.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.14.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 # uneven minor versions are development versions
 if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 IUSE="dbus dedicated doc fribidi libressl nls server"

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

2020-11-15 Thread David Seifert

commit: 79d173ed34da3b7669cbc945767a57df1f7d50e2
Author: Alexey Sokolov  google  com>
AuthorDate: Sun Nov 15 20:02:56 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Nov 15 20:02:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79d173ed

games-strategy/wesnoth: fix build without native-symlinks

Closes: https://bugs.gentoo.org/732096
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Alexey Sokolov  asokolov.org>
Signed-off-by: David Seifert  gentoo.org>

 games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch | 14 ++
 games-strategy/wesnoth/wesnoth-1.14.14.ebuild |  4 
 games-strategy/wesnoth/wesnoth-1.15.4.ebuild  |  4 
 3 files changed, 22 insertions(+)

diff --git a/games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch 
b/games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch
new file mode 100644
index 000..4a7c8cf41e7
--- /dev/null
+++ b/games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch
@@ -0,0 +1,14 @@
+Leave default AR as is, https://bugs.gentoo.org/732096
+
+diff -r 419bf3de54e5 CMakeLists.txt
+--- a/CMakeLists.txt   Sat Oct 24 19:50:25 2020 +
 b/CMakeLists.txt   Sat Oct 24 19:50:53 2020 +
+@@ -390,8 +390,6 @@
+   MESSAGE("Using ar, ranlib, and default linker")
+   find_program(NON_LTO_AR NAMES ar)
+   find_program(NON_LTO_RANLIB NAMES ranlib)
+-  set(CMAKE_AR "${NON_LTO_AR}" CACHE STRING "Does not support LTO" FORCE)
+-  set(CMAKE_RANLIB "${NON_LTO_RANLIB}" CACHE STRING "Does not support 
LTO" FORCE)
+ endif()
+ MARK_AS_ADVANCED(LTO_AR LTO_RANLIB NON_LTO_AR NON_LTO_RANLIB)
+ 

diff --git a/games-strategy/wesnoth/wesnoth-1.14.14.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.14.ebuild
index 407e3840468..e259a887936 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.14.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.14.ebuild
@@ -46,6 +46,10 @@ BDEPEND="
virtual/pkgconfig
 "
 
+PATCHES=(
+   "${FILESDIR}/wesnoth-1.14.14-ar.patch"
+)
+
 src_prepare() {
cmake_src_prepare
 

diff --git a/games-strategy/wesnoth/wesnoth-1.15.4.ebuild 
b/games-strategy/wesnoth/wesnoth-1.15.4.ebuild
index 407e3840468..e259a887936 100644
--- a/games-strategy/wesnoth/wesnoth-1.15.4.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.15.4.ebuild
@@ -46,6 +46,10 @@ BDEPEND="
virtual/pkgconfig
 "
 
+PATCHES=(
+   "${FILESDIR}/wesnoth-1.14.14-ar.patch"
+)
+
 src_prepare() {
cmake_src_prepare

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

2020-11-15 Thread David Seifert

commit: b5d039943c2f034d1675f46495215494946a7069
Author: Alexey Sokolov  google  com>
AuthorDate: Sun Nov 15 20:03:03 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Nov 15 20:03:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5d03994

games-strategy/wesnoth: drop 1.14.13

Closes: https://github.com/gentoo/gentoo/pull/18025
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Alexey Sokolov  asokolov.org>
Signed-off-by: David Seifert  gentoo.org>

 games-strategy/wesnoth/Manifest   |   1 -
 games-strategy/wesnoth/wesnoth-1.14.13.ebuild | 111 --
 2 files changed, 112 deletions(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 88463ebb505..0c3cc9f0e9c 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,3 +1,2 @@
-DIST wesnoth-1.14.13.tar.gz 502959933 BLAKE2B 
48f2e4340e9ae015c2e45f75f419ddfbb95a436a4ffbebbe417fdcf322e162ed0ad799680757adb88e19cba717cc48ec0e3d83c4c170e3502fea7be73a39a0c7
 SHA512 
ee1b7a93e2ae49698ec185cf6385cd93a49116315ebdec474bd5d5b73ab6af59db92ee5621fab68581edd81c74d8584237d5068fd30362054377d84a3dcb5ea0
 DIST wesnoth-1.14.14.tar.gz 502931191 BLAKE2B 
25bbead74d74bbce9c47b5ac9339fd5b4d996cb9f80137f0b1d9a600c71c82b732ed66937419a4dd59995311685960630415daf3fd3f51e8cf891f29a16ec024
 SHA512 
3924aa26b59445568472a10c5fe0e1ddf87eb0a878faf2bcc52d4618f5743dfeda103d1f4025f4a129628e6a25f4c16407e968d594769a0751ada2c9a733e2e4
 DIST wesnoth-1.15.4.tar.gz 500087559 BLAKE2B 
bb46766369cfcb1432b5b5e8df62636e2a45ff45bf3ec4381aa9e73b20a4a5a6e196f0355b10d2b86ffad608cfdd24f8d2fad21061db9b18f1a2decf11b0e466
 SHA512 
b209e584a187934b0ca3808cb870f4703b49edd5de357b6a6b01bdad2c71b8d755b81d3628c5281cd19f82ee8d030716d6bf64a806e6636426949b0a3d85ee9d

diff --git a/games-strategy/wesnoth/wesnoth-1.14.13.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.13.ebuild
deleted file mode 100644
index 407e3840468..000
--- a/games-strategy/wesnoth/wesnoth-1.14.13.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic toolchain-funcs xdg
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org
-   https://github.com/wesnoth/wesnoth;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# uneven minor versions are development versions
-if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
-   KEYWORDS="~amd64 ~x86"
-fi
-IUSE="dbus dedicated doc fribidi libressl nls server"
-
-RDEPEND="
-   acct-group/wesnoth
-   acct-user/wesnoth
-   >=dev-libs/boost-1.50:=[nls,threads,icu]
-   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
-   !dedicated? (
-   dev-libs/glib:2
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   >=media-libs/fontconfig-2.4.1
-   >=media-libs/sdl2-image-2.0.0[jpeg,png]
-   >=media-libs/sdl2-mixer-2.0.0[vorbis]
-   >=media-libs/sdl2-ttf-2.0.12
-   media-libs/libvorbis
-   >=x11-libs/pango-1.22.0
-   >=x11-libs/cairo-1.10.0
-   sys-libs/readline:0=
-   dbus? ( sys-apps/dbus )
-   fribidi? ( dev-libs/fribidi )
-   )"
-DEPEND="${RDEPEND}
-   x11-libs/libX11
-"
-BDEPEND="
-   sys-devel/gettext
-   virtual/pkgconfig
-"
-
-src_prepare() {
-   cmake_src_prepare
-
-   if ! use doc ; then
-   sed -i \
-   -e '/manual/d' \
-   doc/CMakeLists.txt || die
-   fi
-
-   # respect LINGUAS (bug #483316)
-   if [[ ${LINGUAS+set} ]] ; then
-   local lang langs=()
-   for lang in $(cat po/LINGUAS) ; do
-   has ${lang} ${LINGUAS} && langs+=( ${lang} )
-   done
-   echo "${langs[@]}" > po/LINGUAS || die
-   fi
-}
-
-src_configure() {
-   filter-flags -ftracer -fomit-frame-pointer
-   if [[ $(gcc-major-version) -eq 3 ]] ; then
-   filter-flags -fstack-protector
-   append-flags -fno-stack-protector
-   fi
-
-   # Work around eclass
-   append-flags -UNDEBUG
-
-   if use dedicated || use server ; then
-   mycmakeargs=(
-   -DENABLE_CAMPAIGN_SERVER="ON"
-   -DENABLE_SERVER="ON"
-   -DSERVER_UID="${PN}"
-   -DSERVER_GID="${PN}"
-   -DFIFO_DIR="/run/wesnothd"
-   )
-   else
-   mycmakeargs=(
-   -DENABLE_CAMPAIGN_SERVER="OFF"
-   -DENABLE_SERVER="OFF"
-   )
-   fi
-   mycmakeargs+=(
-   -Wno-dev
-

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

2020-11-15 Thread David Seifert

commit: 4ec5a851dc88455fc31c35a44280c34237c23ee6
Author: Alexey Sokolov  google  com>
AuthorDate: Sun Nov 15 20:02:59 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Nov 15 20:02:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ec5a851

games-strategy/wesnoth: drop workaround for old cmake-utils

Closes: https://bugs.gentoo.org/639604
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Alexey Sokolov  asokolov.org>
Signed-off-by: David Seifert  gentoo.org>

 games-strategy/wesnoth/wesnoth-1.14.14.ebuild | 3 ---
 games-strategy/wesnoth/wesnoth-1.15.4.ebuild  | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/games-strategy/wesnoth/wesnoth-1.14.14.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.14.ebuild
index e259a887936..4d50bca2725 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.14.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.14.ebuild
@@ -76,9 +76,6 @@ src_configure() {
append-flags -fno-stack-protector
fi
 
-   # Work around eclass
-   append-flags -UNDEBUG
-
if use dedicated || use server ; then
mycmakeargs=(
-DENABLE_CAMPAIGN_SERVER="ON"

diff --git a/games-strategy/wesnoth/wesnoth-1.15.4.ebuild 
b/games-strategy/wesnoth/wesnoth-1.15.4.ebuild
index e259a887936..4d50bca2725 100644
--- a/games-strategy/wesnoth/wesnoth-1.15.4.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.15.4.ebuild
@@ -76,9 +76,6 @@ src_configure() {
append-flags -fno-stack-protector
fi
 
-   # Work around eclass
-   append-flags -UNDEBUG
-
if use dedicated || use server ; then
mycmakeargs=(
-DENABLE_CAMPAIGN_SERVER="ON"

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

2020-09-17 Thread Lars Wendler

commit: 5a80371ffa1f4f625342406fce6ffaac0ba274a7
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Sep 17 07:36:26 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Sep 17 07:36:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a80371f

games-strategy/wesnoth: Removed old

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

 games-strategy/wesnoth/Manifest   |   1 -
 games-strategy/wesnoth/wesnoth-1.14.11.ebuild | 111 --
 2 files changed, 112 deletions(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 7a0a7786d91..88463ebb505 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,4 +1,3 @@
-DIST wesnoth-1.14.11.tar.gz 500178610 BLAKE2B 
27af594bc86845eedb8cd8e45c814c3583e35bd94942947f91b6fa888018ae203dbd100e01ab26b5cd59712895151049105ff446d8ad3a8b2d86133d913a92cc
 SHA512 
3c878f679e51d3657dd4d76205bdeadd6a1a95d0771cd7ab0e29f33f36e32f1963e4a96f4529dbc4b860183b3cb5a4219e86108e0e26194b8a32d3d08a5fd469
 DIST wesnoth-1.14.13.tar.gz 502959933 BLAKE2B 
48f2e4340e9ae015c2e45f75f419ddfbb95a436a4ffbebbe417fdcf322e162ed0ad799680757adb88e19cba717cc48ec0e3d83c4c170e3502fea7be73a39a0c7
 SHA512 
ee1b7a93e2ae49698ec185cf6385cd93a49116315ebdec474bd5d5b73ab6af59db92ee5621fab68581edd81c74d8584237d5068fd30362054377d84a3dcb5ea0
 DIST wesnoth-1.14.14.tar.gz 502931191 BLAKE2B 
25bbead74d74bbce9c47b5ac9339fd5b4d996cb9f80137f0b1d9a600c71c82b732ed66937419a4dd59995311685960630415daf3fd3f51e8cf891f29a16ec024
 SHA512 
3924aa26b59445568472a10c5fe0e1ddf87eb0a878faf2bcc52d4618f5743dfeda103d1f4025f4a129628e6a25f4c16407e968d594769a0751ada2c9a733e2e4
 DIST wesnoth-1.15.4.tar.gz 500087559 BLAKE2B 
bb46766369cfcb1432b5b5e8df62636e2a45ff45bf3ec4381aa9e73b20a4a5a6e196f0355b10d2b86ffad608cfdd24f8d2fad21061db9b18f1a2decf11b0e466
 SHA512 
b209e584a187934b0ca3808cb870f4703b49edd5de357b6a6b01bdad2c71b8d755b81d3628c5281cd19f82ee8d030716d6bf64a806e6636426949b0a3d85ee9d

diff --git a/games-strategy/wesnoth/wesnoth-1.14.11.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.11.ebuild
deleted file mode 100644
index 407e3840468..000
--- a/games-strategy/wesnoth/wesnoth-1.14.11.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic toolchain-funcs xdg
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org
-   https://github.com/wesnoth/wesnoth;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# uneven minor versions are development versions
-if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
-   KEYWORDS="~amd64 ~x86"
-fi
-IUSE="dbus dedicated doc fribidi libressl nls server"
-
-RDEPEND="
-   acct-group/wesnoth
-   acct-user/wesnoth
-   >=dev-libs/boost-1.50:=[nls,threads,icu]
-   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
-   !dedicated? (
-   dev-libs/glib:2
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   >=media-libs/fontconfig-2.4.1
-   >=media-libs/sdl2-image-2.0.0[jpeg,png]
-   >=media-libs/sdl2-mixer-2.0.0[vorbis]
-   >=media-libs/sdl2-ttf-2.0.12
-   media-libs/libvorbis
-   >=x11-libs/pango-1.22.0
-   >=x11-libs/cairo-1.10.0
-   sys-libs/readline:0=
-   dbus? ( sys-apps/dbus )
-   fribidi? ( dev-libs/fribidi )
-   )"
-DEPEND="${RDEPEND}
-   x11-libs/libX11
-"
-BDEPEND="
-   sys-devel/gettext
-   virtual/pkgconfig
-"
-
-src_prepare() {
-   cmake_src_prepare
-
-   if ! use doc ; then
-   sed -i \
-   -e '/manual/d' \
-   doc/CMakeLists.txt || die
-   fi
-
-   # respect LINGUAS (bug #483316)
-   if [[ ${LINGUAS+set} ]] ; then
-   local lang langs=()
-   for lang in $(cat po/LINGUAS) ; do
-   has ${lang} ${LINGUAS} && langs+=( ${lang} )
-   done
-   echo "${langs[@]}" > po/LINGUAS || die
-   fi
-}
-
-src_configure() {
-   filter-flags -ftracer -fomit-frame-pointer
-   if [[ $(gcc-major-version) -eq 3 ]] ; then
-   filter-flags -fstack-protector
-   append-flags -fno-stack-protector
-   fi
-
-   # Work around eclass
-   append-flags -UNDEBUG
-
-   if use dedicated || use server ; then
-   mycmakeargs=(
-   -DENABLE_CAMPAIGN_SERVER="ON"
-   -DENABLE_SERVER="ON"
-   -DSERVER_UID="${PN}"
-   -DSERVER_GID="${PN}"
-   -DFIFO_DIR="/run/wesnothd"
-   )
-   else
-

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

2020-09-17 Thread Lars Wendler

commit: 857fe86cd3a096f25a5a4c44e492e621c8e2d50b
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Sep 17 07:35:40 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Sep 17 07:36:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=857fe86c

games-strategy/wesnoth: Bump to versions 1.14.14 and 1.15.4

Closes: https://bugs.gentoo.org/743028
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Lars Wendler  gentoo.org>

 games-strategy/wesnoth/Manifest| 3 ++-
 .../wesnoth/{wesnoth-1.15.3.ebuild => wesnoth-1.14.14.ebuild}  | 0
 .../wesnoth/{wesnoth-1.15.3.ebuild => wesnoth-1.15.4.ebuild}   | 0
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index e04201a27c9..7a0a7786d91 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,3 +1,4 @@
 DIST wesnoth-1.14.11.tar.gz 500178610 BLAKE2B 
27af594bc86845eedb8cd8e45c814c3583e35bd94942947f91b6fa888018ae203dbd100e01ab26b5cd59712895151049105ff446d8ad3a8b2d86133d913a92cc
 SHA512 
3c878f679e51d3657dd4d76205bdeadd6a1a95d0771cd7ab0e29f33f36e32f1963e4a96f4529dbc4b860183b3cb5a4219e86108e0e26194b8a32d3d08a5fd469
 DIST wesnoth-1.14.13.tar.gz 502959933 BLAKE2B 
48f2e4340e9ae015c2e45f75f419ddfbb95a436a4ffbebbe417fdcf322e162ed0ad799680757adb88e19cba717cc48ec0e3d83c4c170e3502fea7be73a39a0c7
 SHA512 
ee1b7a93e2ae49698ec185cf6385cd93a49116315ebdec474bd5d5b73ab6af59db92ee5621fab68581edd81c74d8584237d5068fd30362054377d84a3dcb5ea0
-DIST wesnoth-1.15.3.tar.gz 495645949 BLAKE2B 
aa6b8636ff1b134af5e6e9cfbefefee3189a46ccd20c2a3a3f361d77d3de48d1ae38bf8376087b6292bcacc465ad72bd60ab7aa16b3ca536ce963b6f644b8ff1
 SHA512 
2a5993c2c2f41939346f88104722e31a1bd0f68b39c84bdf657a7156c1348e6c65089e2766c088a2b5a2c2df8c3cd8c5cf736d66538c87cf175585634e31adbb
+DIST wesnoth-1.14.14.tar.gz 502931191 BLAKE2B 
25bbead74d74bbce9c47b5ac9339fd5b4d996cb9f80137f0b1d9a600c71c82b732ed66937419a4dd59995311685960630415daf3fd3f51e8cf891f29a16ec024
 SHA512 
3924aa26b59445568472a10c5fe0e1ddf87eb0a878faf2bcc52d4618f5743dfeda103d1f4025f4a129628e6a25f4c16407e968d594769a0751ada2c9a733e2e4
+DIST wesnoth-1.15.4.tar.gz 500087559 BLAKE2B 
bb46766369cfcb1432b5b5e8df62636e2a45ff45bf3ec4381aa9e73b20a4a5a6e196f0355b10d2b86ffad608cfdd24f8d2fad21061db9b18f1a2decf11b0e466
 SHA512 
b209e584a187934b0ca3808cb870f4703b49edd5de357b6a6b01bdad2c71b8d755b81d3628c5281cd19f82ee8d030716d6bf64a806e6636426949b0a3d85ee9d

diff --git a/games-strategy/wesnoth/wesnoth-1.15.3.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.14.ebuild
similarity index 100%
copy from games-strategy/wesnoth/wesnoth-1.15.3.ebuild
copy to games-strategy/wesnoth/wesnoth-1.14.14.ebuild

diff --git a/games-strategy/wesnoth/wesnoth-1.15.3.ebuild 
b/games-strategy/wesnoth/wesnoth-1.15.4.ebuild
similarity index 100%
rename from games-strategy/wesnoth/wesnoth-1.15.3.ebuild
rename to games-strategy/wesnoth/wesnoth-1.15.4.ebuild

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

2020-07-08 Thread Lars Wendler

commit: 6c31357f5293f1f89b51ea0de263f1bff655d597
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jul  8 23:04:05 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jul  8 23:15:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c31357f

games-strategy/wesnoth: Removed old

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

 games-strategy/wesnoth/Manifest  |   1 -
 games-strategy/wesnoth/wesnoth-1.14.9.ebuild | 114 ---
 2 files changed, 115 deletions(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index cf8fbffebd1..e04201a27c9 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,4 +1,3 @@
 DIST wesnoth-1.14.11.tar.gz 500178610 BLAKE2B 
27af594bc86845eedb8cd8e45c814c3583e35bd94942947f91b6fa888018ae203dbd100e01ab26b5cd59712895151049105ff446d8ad3a8b2d86133d913a92cc
 SHA512 
3c878f679e51d3657dd4d76205bdeadd6a1a95d0771cd7ab0e29f33f36e32f1963e4a96f4529dbc4b860183b3cb5a4219e86108e0e26194b8a32d3d08a5fd469
 DIST wesnoth-1.14.13.tar.gz 502959933 BLAKE2B 
48f2e4340e9ae015c2e45f75f419ddfbb95a436a4ffbebbe417fdcf322e162ed0ad799680757adb88e19cba717cc48ec0e3d83c4c170e3502fea7be73a39a0c7
 SHA512 
ee1b7a93e2ae49698ec185cf6385cd93a49116315ebdec474bd5d5b73ab6af59db92ee5621fab68581edd81c74d8584237d5068fd30362054377d84a3dcb5ea0
-DIST wesnoth-1.14.9.tar.gz 497393449 BLAKE2B 
b5235de6ce84164ef97a105339549a8a1009d7b7ed243ae355994610e56afc584b8a37b1275e0b929729a24cd2eb94d4c208e7bd22e79b76113a1e1b91c8f92d
 SHA512 
b3e93956a40ffc48dd02e118be1d46854a2eed34ad0dca3fb34a28d0b58b4b563cb5cca588208f3525300bf075786bebe95a25c045c8098a0bdfe531a2d81e4f
 DIST wesnoth-1.15.3.tar.gz 495645949 BLAKE2B 
aa6b8636ff1b134af5e6e9cfbefefee3189a46ccd20c2a3a3f361d77d3de48d1ae38bf8376087b6292bcacc465ad72bd60ab7aa16b3ca536ce963b6f644b8ff1
 SHA512 
2a5993c2c2f41939346f88104722e31a1bd0f68b39c84bdf657a7156c1348e6c65089e2766c088a2b5a2c2df8c3cd8c5cf736d66538c87cf175585634e31adbb

diff --git a/games-strategy/wesnoth/wesnoth-1.14.9.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.9.ebuild
deleted file mode 100644
index dd0a982c833..000
--- a/games-strategy/wesnoth/wesnoth-1.14.9.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic toolchain-funcs user xdg
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org
-   https://github.com/wesnoth/wesnoth;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# uneven minor versions are development versions
-if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
-   KEYWORDS="~amd64 ~x86"
-fi
-IUSE="dbus dedicated doc fribidi libressl nls server"
-
-RDEPEND="
-   >=dev-libs/boost-1.50:=[nls,threads,icu]
-   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
-   !dedicated? (
-   dev-libs/glib:2
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   >=media-libs/fontconfig-2.4.1
-   >=media-libs/sdl2-image-2.0.0[jpeg,png]
-   >=media-libs/sdl2-mixer-2.0.0[vorbis]
-   >=media-libs/sdl2-ttf-2.0.12
-   media-libs/libvorbis
-   >=x11-libs/pango-1.22.0
-   >=x11-libs/cairo-1.10.0
-   sys-libs/readline:0=
-   dbus? ( sys-apps/dbus )
-   fribidi? ( dev-libs/fribidi )
-   )"
-DEPEND="${RDEPEND}
-   x11-libs/libX11
-"
-BDEPEND="
-   sys-devel/gettext
-   virtual/pkgconfig
-"
-
-pkg_setup() {
-   enewgroup ${PN}
-   enewuser ${PN} -1 /bin/bash -1 ${PN}
-}
-
-src_prepare() {
-   cmake_src_prepare
-
-   if ! use doc ; then
-   sed -i \
-   -e '/manual/d' \
-   doc/CMakeLists.txt || die
-   fi
-
-   # respect LINGUAS (bug #483316)
-   if [[ ${LINGUAS+set} ]] ; then
-   local lang langs=()
-   for lang in $(cat po/LINGUAS) ; do
-   has ${lang} ${LINGUAS} && langs+=( ${lang} )
-   done
-   echo "${langs[@]}" > po/LINGUAS || die
-   fi
-}
-
-src_configure() {
-   filter-flags -ftracer -fomit-frame-pointer
-   if [[ $(gcc-major-version) -eq 3 ]] ; then
-   filter-flags -fstack-protector
-   append-flags -fno-stack-protector
-   fi
-
-   # Work around eclass
-   append-flags -UNDEBUG
-
-   if use dedicated || use server ; then
-   mycmakeargs=(
-   -DENABLE_CAMPAIGN_SERVER="ON"
-   -DENABLE_SERVER="ON"
-   -DSERVER_UID="${PN}"
-   -DSERVER_GID="${PN}"
-   -DFIFO_DIR="/run/wesnothd"
-

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

2020-07-08 Thread Lars Wendler

commit: f234e45140b05a2af796d5e7d1ae240cde35bfd9
Author: Jack Todaro  posteo  org>
AuthorDate: Tue Jul  7 22:08:09 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jul  8 23:15:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f234e451

games-strategy/wesnoth: bump up to 1.14.13

Closes: https://bugs.gentoo.org/731794
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Jack Todaro  posteo.org>
Closes: https://github.com/gentoo/gentoo/pull/16631
Signed-off-by: Lars Wendler  gentoo.org>

 games-strategy/wesnoth/Manifest   |   1 +
 games-strategy/wesnoth/wesnoth-1.14.13.ebuild | 111 ++
 2 files changed, 112 insertions(+)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 3ccf218ae76..cf8fbffebd1 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,3 +1,4 @@
 DIST wesnoth-1.14.11.tar.gz 500178610 BLAKE2B 
27af594bc86845eedb8cd8e45c814c3583e35bd94942947f91b6fa888018ae203dbd100e01ab26b5cd59712895151049105ff446d8ad3a8b2d86133d913a92cc
 SHA512 
3c878f679e51d3657dd4d76205bdeadd6a1a95d0771cd7ab0e29f33f36e32f1963e4a96f4529dbc4b860183b3cb5a4219e86108e0e26194b8a32d3d08a5fd469
+DIST wesnoth-1.14.13.tar.gz 502959933 BLAKE2B 
48f2e4340e9ae015c2e45f75f419ddfbb95a436a4ffbebbe417fdcf322e162ed0ad799680757adb88e19cba717cc48ec0e3d83c4c170e3502fea7be73a39a0c7
 SHA512 
ee1b7a93e2ae49698ec185cf6385cd93a49116315ebdec474bd5d5b73ab6af59db92ee5621fab68581edd81c74d8584237d5068fd30362054377d84a3dcb5ea0
 DIST wesnoth-1.14.9.tar.gz 497393449 BLAKE2B 
b5235de6ce84164ef97a105339549a8a1009d7b7ed243ae355994610e56afc584b8a37b1275e0b929729a24cd2eb94d4c208e7bd22e79b76113a1e1b91c8f92d
 SHA512 
b3e93956a40ffc48dd02e118be1d46854a2eed34ad0dca3fb34a28d0b58b4b563cb5cca588208f3525300bf075786bebe95a25c045c8098a0bdfe531a2d81e4f
 DIST wesnoth-1.15.3.tar.gz 495645949 BLAKE2B 
aa6b8636ff1b134af5e6e9cfbefefee3189a46ccd20c2a3a3f361d77d3de48d1ae38bf8376087b6292bcacc465ad72bd60ab7aa16b3ca536ce963b6f644b8ff1
 SHA512 
2a5993c2c2f41939346f88104722e31a1bd0f68b39c84bdf657a7156c1348e6c65089e2766c088a2b5a2c2df8c3cd8c5cf736d66538c87cf175585634e31adbb

diff --git a/games-strategy/wesnoth/wesnoth-1.14.13.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.13.ebuild
new file mode 100644
index 000..407e3840468
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.14.13.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+   https://github.com/wesnoth/wesnoth;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# uneven minor versions are development versions
+if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
+   KEYWORDS="~amd64 ~x86"
+fi
+IUSE="dbus dedicated doc fribidi libressl nls server"
+
+RDEPEND="
+   acct-group/wesnoth
+   acct-user/wesnoth
+   >=dev-libs/boost-1.50:=[nls,threads,icu]
+   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+   !dedicated? (
+   dev-libs/glib:2
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   >=media-libs/fontconfig-2.4.1
+   >=media-libs/sdl2-image-2.0.0[jpeg,png]
+   >=media-libs/sdl2-mixer-2.0.0[vorbis]
+   >=media-libs/sdl2-ttf-2.0.12
+   media-libs/libvorbis
+   >=x11-libs/pango-1.22.0
+   >=x11-libs/cairo-1.10.0
+   sys-libs/readline:0=
+   dbus? ( sys-apps/dbus )
+   fribidi? ( dev-libs/fribidi )
+   )"
+DEPEND="${RDEPEND}
+   x11-libs/libX11
+"
+BDEPEND="
+   sys-devel/gettext
+   virtual/pkgconfig
+"
+
+src_prepare() {
+   cmake_src_prepare
+
+   if ! use doc ; then
+   sed -i \
+   -e '/manual/d' \
+   doc/CMakeLists.txt || die
+   fi
+
+   # respect LINGUAS (bug #483316)
+   if [[ ${LINGUAS+set} ]] ; then
+   local lang langs=()
+   for lang in $(cat po/LINGUAS) ; do
+   has ${lang} ${LINGUAS} && langs+=( ${lang} )
+   done
+   echo "${langs[@]}" > po/LINGUAS || die
+   fi
+}
+
+src_configure() {
+   filter-flags -ftracer -fomit-frame-pointer
+   if [[ $(gcc-major-version) -eq 3 ]] ; then
+   filter-flags -fstack-protector
+   append-flags -fno-stack-protector
+   fi
+
+   # Work around eclass
+   append-flags -UNDEBUG
+
+   if use dedicated || use server ; then
+   mycmakeargs=(
+   -DENABLE_CAMPAIGN_SERVER="ON"
+   -DENABLE_SERVER="ON"
+   -DSERVER_UID="${PN}"
+

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

2020-06-03 Thread James Le Cuirot

commit: 101a9aa9115ffb09b35a8b7d426499bb6ea00ce1
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Thu May 21 10:58:43 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Jun  3 20:16:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=101a9aa9

games-strategy/wesnoth: add missing flag-o-matic inherit

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15902
Signed-off-by: James Le Cuirot  gentoo.org>

 games-strategy/wesnoth/wesnoth-1.14.11.ebuild | 2 +-
 games-strategy/wesnoth/wesnoth-1.14.9.ebuild  | 2 +-
 games-strategy/wesnoth/wesnoth-1.15.3.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/games-strategy/wesnoth/wesnoth-1.14.11.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.11.ebuild
index f11fafb5b6d..407e3840468 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.11.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake toolchain-funcs xdg
+inherit cmake flag-o-matic toolchain-funcs xdg
 
 DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
 HOMEPAGE="http://www.wesnoth.org

diff --git a/games-strategy/wesnoth/wesnoth-1.14.9.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.9.ebuild
index 6f718f0b23e..dd0a982c833 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.9.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake toolchain-funcs user xdg
+inherit cmake flag-o-matic toolchain-funcs user xdg
 
 DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
 HOMEPAGE="http://www.wesnoth.org

diff --git a/games-strategy/wesnoth/wesnoth-1.15.3.ebuild 
b/games-strategy/wesnoth/wesnoth-1.15.3.ebuild
index f11fafb5b6d..407e3840468 100644
--- a/games-strategy/wesnoth/wesnoth-1.15.3.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.15.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake toolchain-funcs xdg
+inherit cmake flag-o-matic toolchain-funcs xdg
 
 DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
 HOMEPAGE="http://www.wesnoth.org

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

2020-05-09 Thread James Le Cuirot

commit: d45feeaeec9e47c8d1feca7778a9cb30d0bac763
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sat May  9 17:49:36 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat May  9 20:07:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d45feeae

games-strategy/wesnoth: remove unused patch

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15731
Signed-off-by: James Le Cuirot  gentoo.org>

 .../wesnoth/files/wesnoth-1.14.7-boost-1.70.patch  | 24 --
 1 file changed, 24 deletions(-)

diff --git a/games-strategy/wesnoth/files/wesnoth-1.14.7-boost-1.70.patch 
b/games-strategy/wesnoth/files/wesnoth-1.14.7-boost-1.70.patch
deleted file mode 100644
index 90c526789c5..000
--- a/games-strategy/wesnoth/files/wesnoth-1.14.7-boost-1.70.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 9d0e3bae096563297c9f51355968f27a67dbfdec Mon Sep 17 00:00:00 2001
-From: Charles Dang 
-Date: Mon, 15 Jul 2019 03:18:31 +1100
-Subject: [PATCH] Removed redundant std::ref causing problems with Boost 1.70
- (fixes #3990)
-
-The asio socket ctor already takes a reference.

- src/server/server_base.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/server/server_base.cpp b/src/server/server_base.cpp
-index 82b46e912025..8bcf974a62d1 100644
 a/src/server/server_base.cpp
-+++ b/src/server/server_base.cpp
-@@ -65,7 +65,7 @@ void server_base::start_server()
- 
- void server_base::serve()
- {
--  socket_ptr socket = 
std::make_shared(std::ref(io_service_));
-+  socket_ptr socket = 
std::make_shared(io_service_);
-   acceptor_.async_accept(*socket, 
std::bind(_base::accept_connection, this, _1, socket));
- }
-

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

2020-03-12 Thread Lars Wendler

commit: 279bab4317aac04d2bed8ef6456adee4680c3ea1
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Mar 12 10:36:20 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Mar 12 10:37:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=279bab43

games-strategy/wesnoth: Bump to versions 1.14.11 and 1.15.3

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

 games-strategy/wesnoth/Manifest  | 3 ++-
 .../wesnoth/{wesnoth-1.15.3.ebuild => wesnoth-1.14.11.ebuild}| 9 +++--
 games-strategy/wesnoth/wesnoth-1.15.3.ebuild | 9 +++--
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index d9c0f9155fd..cf60e399b6c 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,3 +1,4 @@
+DIST wesnoth-1.14.11.tar.gz 500178610 BLAKE2B 
27af594bc86845eedb8cd8e45c814c3583e35bd94942947f91b6fa888018ae203dbd100e01ab26b5cd59712895151049105ff446d8ad3a8b2d86133d913a92cc
 SHA512 
3c878f679e51d3657dd4d76205bdeadd6a1a95d0771cd7ab0e29f33f36e32f1963e4a96f4529dbc4b860183b3cb5a4219e86108e0e26194b8a32d3d08a5fd469
 DIST wesnoth-1.14.7.tar.gz 493837595 BLAKE2B 
a80781d4f9ec79514c6431c5d45a6cdcb913aabc6329cefe46e7980805d06b60d479110bb6432f2c35a058e551da6b6fa8e0e4f6f1bdf9a159f6329ddb74aa2a
 SHA512 
dbca2b904147f592cc712b11d6414a47bd557d3c677e6b3eacb4fc1ca5420a264f15fdbe45c8c3469ecfb5d1ffa1ac19cceb58c1378aec0e8b4597baa348ca3b
 DIST wesnoth-1.14.9.tar.gz 497393449 BLAKE2B 
b5235de6ce84164ef97a105339549a8a1009d7b7ed243ae355994610e56afc584b8a37b1275e0b929729a24cd2eb94d4c208e7bd22e79b76113a1e1b91c8f92d
 SHA512 
b3e93956a40ffc48dd02e118be1d46854a2eed34ad0dca3fb34a28d0b58b4b563cb5cca588208f3525300bf075786bebe95a25c045c8098a0bdfe531a2d81e4f
-DIST wesnoth-1.15.2.tar.gz 500575489 BLAKE2B 
c94ff72034f0253c3a2ceb29f10617227c407baa6365116a8cd23c70dd960d9898f5a6291235347769780798438380fe78ada8fb75b4dd83e2d2831f495360ae
 SHA512 
c15bdc214147a222ceb2e6243a75e2dbe4f10eb6153a32c10f37b1ec163a7e0b8f6fb12747917602773fd149d23dc8a6b3ed0b0c017f44f713388743126d6b94
+DIST wesnoth-1.15.3.tar.gz 495645949 BLAKE2B 
aa6b8636ff1b134af5e6e9cfbefefee3189a46ccd20c2a3a3f361d77d3de48d1ae38bf8376087b6292bcacc465ad72bd60ab7aa16b3ca536ce963b6f644b8ff1
 SHA512 
2a5993c2c2f41939346f88104722e31a1bd0f68b39c84bdf657a7156c1348e6c65089e2766c088a2b5a2c2df8c3cd8c5cf736d66538c87cf175585634e31adbb

diff --git a/games-strategy/wesnoth/wesnoth-1.15.3.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.11.ebuild
similarity index 95%
copy from games-strategy/wesnoth/wesnoth-1.15.3.ebuild
copy to games-strategy/wesnoth/wesnoth-1.14.11.ebuild
index e78b5be4d42..f11fafb5b6d 100644
--- a/games-strategy/wesnoth/wesnoth-1.15.3.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake user toolchain-funcs xdg
+inherit cmake toolchain-funcs xdg
 
 DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
 HOMEPAGE="http://www.wesnoth.org
@@ -19,6 +19,8 @@ fi
 IUSE="dbus dedicated doc fribidi libressl nls server"
 
 RDEPEND="
+   acct-group/wesnoth
+   acct-user/wesnoth
>=dev-libs/boost-1.50:=[nls,threads,icu]
>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
!dedicated? (
@@ -44,11 +46,6 @@ BDEPEND="
virtual/pkgconfig
 "
 
-pkg_setup() {
-   enewgroup ${PN}
-   enewuser ${PN} -1 /bin/bash -1 ${PN}
-}
-
 src_prepare() {
cmake_src_prepare
 

diff --git a/games-strategy/wesnoth/wesnoth-1.15.3.ebuild 
b/games-strategy/wesnoth/wesnoth-1.15.3.ebuild
index e78b5be4d42..f11fafb5b6d 100644
--- a/games-strategy/wesnoth/wesnoth-1.15.3.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.15.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake user toolchain-funcs xdg
+inherit cmake toolchain-funcs xdg
 
 DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
 HOMEPAGE="http://www.wesnoth.org
@@ -19,6 +19,8 @@ fi
 IUSE="dbus dedicated doc fribidi libressl nls server"
 
 RDEPEND="
+   acct-group/wesnoth
+   acct-user/wesnoth
>=dev-libs/boost-1.50:=[nls,threads,icu]
>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
!dedicated? (
@@ -44,11 +46,6 @@ BDEPEND="
virtual/pkgconfig
 "
 
-pkg_setup() {
-   enewgroup ${PN}
-   enewuser ${PN} -1 /bin/bash -1 ${PN}
-}
-
 src_prepare() {
cmake_src_prepare

[gentoo-commits] repo/gentoo:master commit in: games-strategy/wesnoth/, acct-user/wesnoth/

2020-03-12 Thread Lars Wendler

commit: a2181469d0d33441826384adb4a3e565f2772ef7
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Mar 12 10:31:42 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Mar 12 10:37:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2181469

acct-user/wesnoth: Initial commit

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

 acct-user/wesnoth/metadata.xml  |  8 
 acct-user/wesnoth/wesnoth-0.ebuild  | 13 +
 .../{wesnoth-1.15.2.ebuild => wesnoth-1.15.3.ebuild}|  0
 3 files changed, 21 insertions(+)

diff --git a/acct-user/wesnoth/metadata.xml b/acct-user/wesnoth/metadata.xml
new file mode 100644
index 000..26079e608be
--- /dev/null
+++ b/acct-user/wesnoth/metadata.xml
@@ -0,0 +1,8 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   ga...@gentoo.org
+   Gentoo Games Project
+   
+

diff --git a/acct-user/wesnoth/wesnoth-0.ebuild 
b/acct-user/wesnoth/wesnoth-0.ebuild
new file mode 100644
index 000..cf9126ff0b8
--- /dev/null
+++ b/acct-user/wesnoth/wesnoth-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for games-strategy/wesnoth"
+ACCT_USER_ID=419
+ACCT_USER_GROUPS=( wesnoth )
+ACCT_USER_SHELL="/bin/bash"
+
+acct-user_add_deps

diff --git a/games-strategy/wesnoth/wesnoth-1.15.2.ebuild 
b/games-strategy/wesnoth/wesnoth-1.15.3.ebuild
similarity index 100%
rename from games-strategy/wesnoth/wesnoth-1.15.2.ebuild
rename to games-strategy/wesnoth/wesnoth-1.15.3.ebuild

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

2020-03-12 Thread Lars Wendler

commit: 8ee4834ceff9048f070ee390c76bf7e1ac59ba89
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Mar 12 10:36:50 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Mar 12 10:37:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ee4834c

games-strategy/wesnoth: Removed old

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

 games-strategy/wesnoth/Manifest  |   1 -
 games-strategy/wesnoth/wesnoth-1.14.7.ebuild | 121 ---
 2 files changed, 122 deletions(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index cf60e399b6c..3ccf218ae76 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,4 +1,3 @@
 DIST wesnoth-1.14.11.tar.gz 500178610 BLAKE2B 
27af594bc86845eedb8cd8e45c814c3583e35bd94942947f91b6fa888018ae203dbd100e01ab26b5cd59712895151049105ff446d8ad3a8b2d86133d913a92cc
 SHA512 
3c878f679e51d3657dd4d76205bdeadd6a1a95d0771cd7ab0e29f33f36e32f1963e4a96f4529dbc4b860183b3cb5a4219e86108e0e26194b8a32d3d08a5fd469
-DIST wesnoth-1.14.7.tar.gz 493837595 BLAKE2B 
a80781d4f9ec79514c6431c5d45a6cdcb913aabc6329cefe46e7980805d06b60d479110bb6432f2c35a058e551da6b6fa8e0e4f6f1bdf9a159f6329ddb74aa2a
 SHA512 
dbca2b904147f592cc712b11d6414a47bd557d3c677e6b3eacb4fc1ca5420a264f15fdbe45c8c3469ecfb5d1ffa1ac19cceb58c1378aec0e8b4597baa348ca3b
 DIST wesnoth-1.14.9.tar.gz 497393449 BLAKE2B 
b5235de6ce84164ef97a105339549a8a1009d7b7ed243ae355994610e56afc584b8a37b1275e0b929729a24cd2eb94d4c208e7bd22e79b76113a1e1b91c8f92d
 SHA512 
b3e93956a40ffc48dd02e118be1d46854a2eed34ad0dca3fb34a28d0b58b4b563cb5cca588208f3525300bf075786bebe95a25c045c8098a0bdfe531a2d81e4f
 DIST wesnoth-1.15.3.tar.gz 495645949 BLAKE2B 
aa6b8636ff1b134af5e6e9cfbefefee3189a46ccd20c2a3a3f361d77d3de48d1ae38bf8376087b6292bcacc465ad72bd60ab7aa16b3ca536ce963b6f644b8ff1
 SHA512 
2a5993c2c2f41939346f88104722e31a1bd0f68b39c84bdf657a7156c1348e6c65089e2766c088a2b5a2c2df8c3cd8c5cf736d66538c87cf175585634e31adbb

diff --git a/games-strategy/wesnoth/wesnoth-1.14.7.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
deleted file mode 100644
index b34a3091077..000
--- a/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake toolchain-funcs user
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org
-   https://github.com/wesnoth/wesnoth;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# uneven minor versions are development versions
-if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
-   KEYWORDS="~amd64 ~x86"
-fi
-IUSE="dbus dedicated doc fribidi libressl nls openmp server"
-
-RDEPEND="
-   >=dev-libs/boost-1.50:=[nls,threads,icu]
-   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
-   !dedicated? (
-   dev-libs/glib:2
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   >=media-libs/fontconfig-2.4.1
-   >=media-libs/sdl2-image-2.0.0[jpeg,png]
-   >=media-libs/sdl2-mixer-2.0.0[vorbis]
-   >=media-libs/sdl2-ttf-2.0.12
-   media-libs/libvorbis
-   >=x11-libs/pango-1.22.0
-   >=x11-libs/cairo-1.10.0
-   sys-libs/readline:0=
-   dbus? ( sys-apps/dbus )
-   fribidi? ( dev-libs/fribidi )
-   )"
-DEPEND="${RDEPEND}
-   x11-libs/libX11
-"
-BDEPEND="
-   sys-devel/gettext
-   virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${P}-boost-1.70.patch )
-
-pkg_setup() {
-   if use openmp; then
-   tc-has-openmp || die "Please switch to an openmp compatible 
compiler"
-   fi
-
-   enewgroup ${PN}
-   enewuser ${PN} -1 /bin/bash -1 ${PN}
-}
-
-src_prepare() {
-   cmake_src_prepare
-
-   if ! use doc ; then
-   sed -i \
-   -e '/manual/d' \
-   doc/CMakeLists.txt || die
-   fi
-
-   # respect LINGUAS (bug #483316)
-   if [[ ${LINGUAS+set} ]] ; then
-   local lang langs=()
-   for lang in $(cat po/LINGUAS) ; do
-   has ${lang} ${LINGUAS} && langs+=( ${lang} )
-   done
-   echo "${langs[@]}" > po/LINGUAS || die
-   fi
-}
-
-src_configure() {
-   filter-flags -ftracer -fomit-frame-pointer
-   if [[ $(gcc-major-version) -eq 3 ]] ; then
-   filter-flags -fstack-protector
-   append-flags -fno-stack-protector
-   fi
-
-   # Work around eclass
-   append-flags -UNDEBUG
-
-   if use dedicated || use server ; then
-   mycmakeargs=(
-   -DENABLE_CAMPAIGN_SERVER="ON"
-

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

2019-10-22 Thread Lars Wendler

commit: 883219385ae89d5c9ba7b52af1ebce3c3c074bce
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Oct 22 09:15:07 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Oct 22 09:15:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88321938

games-strategy/wesnoth: Bump to versions 1.14.9 and 1.15.2. Removed old

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

 games-strategy/wesnoth/Manifest| 3 ++-
 .../wesnoth/{wesnoth-1.15.1.ebuild => wesnoth-1.14.9.ebuild}   | 0
 .../wesnoth/{wesnoth-1.15.1.ebuild => wesnoth-1.15.2.ebuild}   | 0
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 93b3713e475..d9c0f9155fd 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,2 +1,3 @@
 DIST wesnoth-1.14.7.tar.gz 493837595 BLAKE2B 
a80781d4f9ec79514c6431c5d45a6cdcb913aabc6329cefe46e7980805d06b60d479110bb6432f2c35a058e551da6b6fa8e0e4f6f1bdf9a159f6329ddb74aa2a
 SHA512 
dbca2b904147f592cc712b11d6414a47bd557d3c677e6b3eacb4fc1ca5420a264f15fdbe45c8c3469ecfb5d1ffa1ac19cceb58c1378aec0e8b4597baa348ca3b
-DIST wesnoth-1.15.1.tar.gz 499339559 BLAKE2B 
f382411ee01444b603edeaf1d64187716d0dce6a3fa99d18862818289b9f0e0a48bfe1dcd98cbad5cfe2099d1e51755a9bd9f3e847243a3cd193334a8589218c
 SHA512 
abc76a1cd4b459ee28736d1160ba91d4c18b2ee1dbc68c2165f9c27b872e4c8b11246a85ece2c3aa7eeb1f0fc9d5817c56b2a211c0e49ad3952186bac433ecd2
+DIST wesnoth-1.14.9.tar.gz 497393449 BLAKE2B 
b5235de6ce84164ef97a105339549a8a1009d7b7ed243ae355994610e56afc584b8a37b1275e0b929729a24cd2eb94d4c208e7bd22e79b76113a1e1b91c8f92d
 SHA512 
b3e93956a40ffc48dd02e118be1d46854a2eed34ad0dca3fb34a28d0b58b4b563cb5cca588208f3525300bf075786bebe95a25c045c8098a0bdfe531a2d81e4f
+DIST wesnoth-1.15.2.tar.gz 500575489 BLAKE2B 
c94ff72034f0253c3a2ceb29f10617227c407baa6365116a8cd23c70dd960d9898f5a6291235347769780798438380fe78ada8fb75b4dd83e2d2831f495360ae
 SHA512 
c15bdc214147a222ceb2e6243a75e2dbe4f10eb6153a32c10f37b1ec163a7e0b8f6fb12747917602773fd149d23dc8a6b3ed0b0c017f44f713388743126d6b94

diff --git a/games-strategy/wesnoth/wesnoth-1.15.1.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.9.ebuild
similarity index 100%
copy from games-strategy/wesnoth/wesnoth-1.15.1.ebuild
copy to games-strategy/wesnoth/wesnoth-1.14.9.ebuild

diff --git a/games-strategy/wesnoth/wesnoth-1.15.1.ebuild 
b/games-strategy/wesnoth/wesnoth-1.15.2.ebuild
similarity index 100%
rename from games-strategy/wesnoth/wesnoth-1.15.1.ebuild
rename to games-strategy/wesnoth/wesnoth-1.15.2.ebuild

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

2019-10-11 Thread Michał Górny

commit: 4a6fb481f2588ca0567f9befc9b1e390ca4a5a54
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Oct 11 15:35:39 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Oct 11 15:35:39 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a6fb481

games-strategy: Remove *-fbsd KEYWORDS

Signed-off-by: Michał Górny  gentoo.org>

 games-strategy/wesnoth/wesnoth-1.14.7.ebuild | 2 +-
 games-strategy/wesnoth/wesnoth-1.15.1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-strategy/wesnoth/wesnoth-1.14.7.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
index e4bfda3bc80..510a59e68be 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 # uneven minor versions are development versions
 if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
-   KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+   KEYWORDS="~amd64 ~x86"
 fi
 IUSE="dbus dedicated doc fribidi libressl nls openmp server"
 

diff --git a/games-strategy/wesnoth/wesnoth-1.15.1.ebuild 
b/games-strategy/wesnoth/wesnoth-1.15.1.ebuild
index 24ae216df06..807170165f0 100644
--- a/games-strategy/wesnoth/wesnoth-1.15.1.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.15.1.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 # uneven minor versions are development versions
 if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
-   KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+   KEYWORDS="~amd64 ~x86"
 fi
 IUSE="dbus dedicated doc fribidi libressl nls server"

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

2019-08-25 Thread Stefan Strogin

commit: 9f5d4fcf1e2820e0840057954fb63615a19de045
Author: Stefan Strogin  gentoo  org>
AuthorDate: Sun Aug 25 15:13:52 2019 +
Commit: Stefan Strogin  gentoo  org>
CommitDate: Sun Aug 25 15:15:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f5d4fcf

games-strategy/wesnoth: inherit xdg to fix QA issues

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

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

diff --git a/games-strategy/wesnoth/wesnoth-1.15.1.ebuild 
b/games-strategy/wesnoth/wesnoth-1.15.1.ebuild
index f45abfd28f2..24ae216df06 100644
--- a/games-strategy/wesnoth/wesnoth-1.15.1.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.15.1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-utils user
+
+inherit cmake-utils user xdg
 
 DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
 HOMEPAGE="http://www.wesnoth.org

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

2019-08-24 Thread Lars Wendler

commit: ed1fa786e52a77816693b10ccb348d539317d816
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Aug 24 13:19:17 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Aug 24 13:19:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed1fa786

games-strategy/wesnoth: Bump to version 1.15.1. Removed old.

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

 games-strategy/wesnoth/Manifest | 2 +-
 games-strategy/wesnoth/{wesnoth-1.15.0.ebuild => wesnoth-1.15.1.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index bc19e03d869..93b3713e475 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,2 +1,2 @@
 DIST wesnoth-1.14.7.tar.gz 493837595 BLAKE2B 
a80781d4f9ec79514c6431c5d45a6cdcb913aabc6329cefe46e7980805d06b60d479110bb6432f2c35a058e551da6b6fa8e0e4f6f1bdf9a159f6329ddb74aa2a
 SHA512 
dbca2b904147f592cc712b11d6414a47bd557d3c677e6b3eacb4fc1ca5420a264f15fdbe45c8c3469ecfb5d1ffa1ac19cceb58c1378aec0e8b4597baa348ca3b
-DIST wesnoth-1.15.0.tar.gz 499338620 BLAKE2B 
1ff679ae3ff5df7cd7f7b0decce0baa9064db77f017201a12132fa4c6a96ce30c88c6e335dd80bed6cb30643619d78ead44c8c1eb9069a5146401d2900883ecb
 SHA512 
4b36618d0cab697833ad59d85a29b236e07d4f10544cb3b831119a6bb76463ad58a1f80b59600ba1d38053b7300a13c394fdb8fa934fedb71d9cd591ef985865
+DIST wesnoth-1.15.1.tar.gz 499339559 BLAKE2B 
f382411ee01444b603edeaf1d64187716d0dce6a3fa99d18862818289b9f0e0a48bfe1dcd98cbad5cfe2099d1e51755a9bd9f3e847243a3cd193334a8589218c
 SHA512 
abc76a1cd4b459ee28736d1160ba91d4c18b2ee1dbc68c2165f9c27b872e4c8b11246a85ece2c3aa7eeb1f0fc9d5817c56b2a211c0e49ad3952186bac433ecd2

diff --git a/games-strategy/wesnoth/wesnoth-1.15.0.ebuild 
b/games-strategy/wesnoth/wesnoth-1.15.1.ebuild
similarity index 100%
rename from games-strategy/wesnoth/wesnoth-1.15.0.ebuild
rename to games-strategy/wesnoth/wesnoth-1.15.1.ebuild

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

2019-08-20 Thread Lars Wendler

commit: 8d53db0b2e75d40b4e5dee316647cd3d531051fd
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Aug 20 21:13:40 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Aug 20 21:14:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d53db0b

games-strategy/wesnoth: Only keyword release versions

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

 games-strategy/wesnoth/wesnoth-1.14.7.ebuild | 5 -
 games-strategy/wesnoth/wesnoth-1.15.0.ebuild | 5 -
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/games-strategy/wesnoth/wesnoth-1.14.7.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
index e0b1b37602e..e4bfda3bc80 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
@@ -11,7 +11,10 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+# uneven minor versions are development versions
+if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
+   KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+fi
 IUSE="dbus dedicated doc fribidi libressl nls openmp server"
 
 RDEPEND="

diff --git a/games-strategy/wesnoth/wesnoth-1.15.0.ebuild 
b/games-strategy/wesnoth/wesnoth-1.15.0.ebuild
index 6ab67dcc94a..f45abfd28f2 100644
--- a/games-strategy/wesnoth/wesnoth-1.15.0.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.15.0.ebuild
@@ -11,7 +11,10 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-#KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+# uneven minor versions are development versions
+if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
+   KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+fi
 IUSE="dbus dedicated doc fribidi libressl nls server"
 
 RDEPEND="

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

2019-08-20 Thread Lars Wendler

commit: 1a70c54d73ee6867712744592ec77651093bdf24
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Aug 20 20:25:17 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Aug 20 20:25:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a70c54d

games-strategy/wesnoth: Unkeyword development version

Closes: https://bugs.gentoo.org/692620
Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Lars Wendler  gentoo.org>

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

diff --git a/games-strategy/wesnoth/wesnoth-1.15.0.ebuild 
b/games-strategy/wesnoth/wesnoth-1.15.0.ebuild
index 4857db1f198..6ab67dcc94a 100644
--- a/games-strategy/wesnoth/wesnoth-1.15.0.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.15.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+#KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="dbus dedicated doc fribidi libressl nls server"
 
 RDEPEND="

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

2019-08-19 Thread Lars Wendler

commit: 602899f88baad69658ca2953ccc24e1e106c47e5
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Aug 19 09:07:12 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Aug 19 09:14:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=602899f8

games-strategy/wesnoth: Bump to version 1.15.0

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

 games-strategy/wesnoth/Manifest  |   1 +
 games-strategy/wesnoth/wesnoth-1.15.0.ebuild | 111 +++
 2 files changed, 112 insertions(+)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 5e686434198..b56ab3b89f2 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,2 +1,3 @@
 DIST wesnoth-1.14.6.tar.gz 491891860 BLAKE2B 
e15512eefbb7b118ec80a5612c23edce41555fc2869b652d4799bc052f26592852a2b4d1cb76dee3203d8a26c18c4cf9de58dea1ee81403b9881642e902cf2f3
 SHA512 
f29b78605f5e3c2e9af8884925b43a262d6fce469bf30a4697e2c8bef8a49d0fea17bd6dc1a3e78113a50e6f21e29aedb5ee26ff2b0493371120f8c64b894096
 DIST wesnoth-1.14.7.tar.gz 493837595 BLAKE2B 
a80781d4f9ec79514c6431c5d45a6cdcb913aabc6329cefe46e7980805d06b60d479110bb6432f2c35a058e551da6b6fa8e0e4f6f1bdf9a159f6329ddb74aa2a
 SHA512 
dbca2b904147f592cc712b11d6414a47bd557d3c677e6b3eacb4fc1ca5420a264f15fdbe45c8c3469ecfb5d1ffa1ac19cceb58c1378aec0e8b4597baa348ca3b
+DIST wesnoth-1.15.0.tar.gz 499338620 BLAKE2B 
1ff679ae3ff5df7cd7f7b0decce0baa9064db77f017201a12132fa4c6a96ce30c88c6e335dd80bed6cb30643619d78ead44c8c1eb9069a5146401d2900883ecb
 SHA512 
4b36618d0cab697833ad59d85a29b236e07d4f10544cb3b831119a6bb76463ad58a1f80b59600ba1d38053b7300a13c394fdb8fa934fedb71d9cd591ef985865

diff --git a/games-strategy/wesnoth/wesnoth-1.15.0.ebuild 
b/games-strategy/wesnoth/wesnoth-1.15.0.ebuild
new file mode 100644
index 000..4857db1f198
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.15.0.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-utils user
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+   https://github.com/wesnoth/wesnoth;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="dbus dedicated doc fribidi libressl nls server"
+
+RDEPEND="
+   >=dev-libs/boost-1.50:=[nls,threads,icu]
+   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+   !dedicated? (
+   dev-libs/glib:2
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   >=media-libs/fontconfig-2.4.1
+   >=media-libs/sdl2-image-2.0.0[jpeg,png]
+   >=media-libs/sdl2-mixer-2.0.0[vorbis]
+   >=media-libs/sdl2-ttf-2.0.12
+   media-libs/libvorbis
+   >=x11-libs/pango-1.22.0
+   >=x11-libs/cairo-1.10.0
+   sys-libs/readline:0=
+   dbus? ( sys-apps/dbus )
+   fribidi? ( dev-libs/fribidi )
+   )"
+DEPEND="${RDEPEND}
+   x11-libs/libX11
+"
+BDEPEND="
+   sys-devel/gettext
+   virtual/pkgconfig
+"
+
+pkg_setup() {
+   enewgroup ${PN}
+   enewuser ${PN} -1 /bin/bash -1 ${PN}
+}
+
+src_prepare() {
+   cmake-utils_src_prepare
+
+   if ! use doc ; then
+   sed -i \
+   -e '/manual/d' \
+   doc/CMakeLists.txt || die
+   fi
+
+   # respect LINGUAS (bug #483316)
+   if [[ ${LINGUAS+set} ]] ; then
+   local lang langs=()
+   for lang in $(cat po/LINGUAS) ; do
+   has ${lang} ${LINGUAS} && langs+=( ${lang} )
+   done
+   echo "${langs[@]}" > po/LINGUAS || die
+   fi
+}
+
+src_configure() {
+   filter-flags -ftracer -fomit-frame-pointer
+   if [[ $(gcc-major-version) -eq 3 ]] ; then
+   filter-flags -fstack-protector
+   append-flags -fno-stack-protector
+   fi
+
+   # Work around eclass
+   append-flags -UNDEBUG
+
+   if use dedicated || use server ; then
+   mycmakeargs=(
+   -DENABLE_CAMPAIGN_SERVER="ON"
+   -DENABLE_SERVER="ON"
+   -DSERVER_UID="${PN}"
+   -DSERVER_GID="${PN}"
+   -DFIFO_DIR="/run/wesnothd"
+   )
+   else
+   mycmakeargs=(
+   -DENABLE_CAMPAIGN_SERVER="OFF"
+   -DENABLE_SERVER="OFF"
+   )
+   fi
+   mycmakeargs+=(
+   -Wno-dev
+   -DENABLE_GAME="$(usex !dedicated)"
+   -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+   -DENABLE_NLS="$(usex nls)"
+

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

2019-08-19 Thread Lars Wendler

commit: 1ac8ef7671c0ccac7275c6daa79a264e2e960685
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Aug 19 09:08:12 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Aug 19 09:14:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ac8ef76

games-strategy/wesnoth: Removed old.

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

 games-strategy/wesnoth/Manifest  |   1 -
 games-strategy/wesnoth/wesnoth-1.14.6.ebuild | 116 ---
 2 files changed, 117 deletions(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index b56ab3b89f2..bc19e03d869 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,3 +1,2 @@
-DIST wesnoth-1.14.6.tar.gz 491891860 BLAKE2B 
e15512eefbb7b118ec80a5612c23edce41555fc2869b652d4799bc052f26592852a2b4d1cb76dee3203d8a26c18c4cf9de58dea1ee81403b9881642e902cf2f3
 SHA512 
f29b78605f5e3c2e9af8884925b43a262d6fce469bf30a4697e2c8bef8a49d0fea17bd6dc1a3e78113a50e6f21e29aedb5ee26ff2b0493371120f8c64b894096
 DIST wesnoth-1.14.7.tar.gz 493837595 BLAKE2B 
a80781d4f9ec79514c6431c5d45a6cdcb913aabc6329cefe46e7980805d06b60d479110bb6432f2c35a058e551da6b6fa8e0e4f6f1bdf9a159f6329ddb74aa2a
 SHA512 
dbca2b904147f592cc712b11d6414a47bd557d3c677e6b3eacb4fc1ca5420a264f15fdbe45c8c3469ecfb5d1ffa1ac19cceb58c1378aec0e8b4597baa348ca3b
 DIST wesnoth-1.15.0.tar.gz 499338620 BLAKE2B 
1ff679ae3ff5df7cd7f7b0decce0baa9064db77f017201a12132fa4c6a96ce30c88c6e335dd80bed6cb30643619d78ead44c8c1eb9069a5146401d2900883ecb
 SHA512 
4b36618d0cab697833ad59d85a29b236e07d4f10544cb3b831119a6bb76463ad58a1f80b59600ba1d38053b7300a13c394fdb8fa934fedb71d9cd591ef985865

diff --git a/games-strategy/wesnoth/wesnoth-1.14.6.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.6.ebuild
deleted file mode 100644
index 971ba1f87a9..000
--- a/games-strategy/wesnoth/wesnoth-1.14.6.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake-utils user
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org
-   https://github.com/wesnoth/wesnoth;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="dbus dedicated doc fribidi libressl nls openmp server"
-
-RDEPEND="
-   >=dev-libs/boost-1.50:=[nls,threads,icu]
-   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
-   !dedicated? (
-   dev-libs/glib:2
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   >=media-libs/fontconfig-2.4.1
-   >=media-libs/sdl2-image-2.0.0[jpeg,png]
-   >=media-libs/sdl2-mixer-2.0.0[vorbis]
-   >=media-libs/sdl2-ttf-2.0.12
-   media-libs/libvorbis
-   >=x11-libs/pango-1.22.0
-   >=x11-libs/cairo-1.10.0
-   sys-libs/readline:0=
-   dbus? ( sys-apps/dbus )
-   fribidi? ( dev-libs/fribidi )
-   )"
-DEPEND="${RDEPEND}
-   x11-libs/libX11
-"
-BDEPEND="
-   sys-devel/gettext
-   virtual/pkgconfig
-"
-
-pkg_setup() {
-   if use openmp; then
-   tc-has-openmp || die "Please switch to an openmp compatible 
compiler"
-   fi
-
-   enewgroup ${PN}
-   enewuser ${PN} -1 /bin/bash -1 ${PN}
-}
-
-src_prepare() {
-   cmake-utils_src_prepare
-
-   if ! use doc ; then
-   sed -i \
-   -e '/manual/d' \
-   doc/CMakeLists.txt || die
-   fi
-
-   # respect LINGUAS (bug #483316)
-   if [[ ${LINGUAS+set} ]] ; then
-   local lang langs=()
-   for lang in $(cat po/LINGUAS) ; do
-   has ${lang} ${LINGUAS} && langs+=( ${lang} )
-   done
-   echo "${langs[@]}" > po/LINGUAS || die
-   fi
-}
-
-src_configure() {
-   filter-flags -ftracer -fomit-frame-pointer
-   if [[ $(gcc-major-version) -eq 3 ]] ; then
-   filter-flags -fstack-protector
-   append-flags -fno-stack-protector
-   fi
-
-   # Work around eclass
-   append-flags -UNDEBUG
-
-   if use dedicated || use server ; then
-   mycmakeargs=(
-   -DENABLE_CAMPAIGN_SERVER="ON"
-   -DENABLE_SERVER="ON"
-   -DSERVER_UID="${PN}"
-   -DSERVER_GID="${PN}"
-   -DFIFO_DIR="/run/wesnothd"
-   )
-   else
-   mycmakeargs=(
-   -DENABLE_CAMPAIGN_SERVER="OFF"
-   -DENABLE_SERVER="OFF"
-   )
-   fi
-   mycmakeargs+=(
-   -Wno-dev
-   -DENABLE_GAME="$(usex !dedicated)"
-

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

2019-07-26 Thread Andreas Sturmlechner

commit: 428d22aca09a7b9fda1bab325ef24642d3e07448
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Jul 26 18:21:23 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jul 26 18:23:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=428d22ac

games-strategy/wesnoth: Fix build with boost-1.70

Closes: https://bugs.gentoo.org/690772
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../wesnoth/files/wesnoth-1.14.7-boost-1.70.patch  | 24 ++
 games-strategy/wesnoth/wesnoth-1.14.7.ebuild   |  2 ++
 2 files changed, 26 insertions(+)

diff --git a/games-strategy/wesnoth/files/wesnoth-1.14.7-boost-1.70.patch 
b/games-strategy/wesnoth/files/wesnoth-1.14.7-boost-1.70.patch
new file mode 100644
index 000..90c526789c5
--- /dev/null
+++ b/games-strategy/wesnoth/files/wesnoth-1.14.7-boost-1.70.patch
@@ -0,0 +1,24 @@
+From 9d0e3bae096563297c9f51355968f27a67dbfdec Mon Sep 17 00:00:00 2001
+From: Charles Dang 
+Date: Mon, 15 Jul 2019 03:18:31 +1100
+Subject: [PATCH] Removed redundant std::ref causing problems with Boost 1.70
+ (fixes #3990)
+
+The asio socket ctor already takes a reference.
+---
+ src/server/server_base.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/server/server_base.cpp b/src/server/server_base.cpp
+index 82b46e912025..8bcf974a62d1 100644
+--- a/src/server/server_base.cpp
 b/src/server/server_base.cpp
+@@ -65,7 +65,7 @@ void server_base::start_server()
+ 
+ void server_base::serve()
+ {
+-  socket_ptr socket = 
std::make_shared(std::ref(io_service_));
++  socket_ptr socket = 
std::make_shared(io_service_);
+   acceptor_.async_accept(*socket, 
std::bind(_base::accept_connection, this, _1, socket));
+ }
+ 

diff --git a/games-strategy/wesnoth/wesnoth-1.14.7.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
index 971ba1f87a9..e0b1b37602e 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
@@ -40,6 +40,8 @@ BDEPEND="
virtual/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}"/${P}-boost-1.70.patch )
+
 pkg_setup() {
if use openmp; then
tc-has-openmp || die "Please switch to an openmp compatible 
compiler"

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

2019-04-15 Thread Lars Wendler

commit: 009b42f6449684999c677bc946de8d8a9408eafa
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Apr 15 13:03:22 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Apr 15 14:54:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=009b42f6

games-strategy/wesnoth: Bump to version 1.14.7

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

 games-strategy/wesnoth/Manifest  |   1 +
 games-strategy/wesnoth/wesnoth-1.14.7.ebuild | 116 +++
 2 files changed, 117 insertions(+)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 7fc6b901fb9..5e686434198 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1 +1,2 @@
 DIST wesnoth-1.14.6.tar.gz 491891860 BLAKE2B 
e15512eefbb7b118ec80a5612c23edce41555fc2869b652d4799bc052f26592852a2b4d1cb76dee3203d8a26c18c4cf9de58dea1ee81403b9881642e902cf2f3
 SHA512 
f29b78605f5e3c2e9af8884925b43a262d6fce469bf30a4697e2c8bef8a49d0fea17bd6dc1a3e78113a50e6f21e29aedb5ee26ff2b0493371120f8c64b894096
+DIST wesnoth-1.14.7.tar.gz 493837595 BLAKE2B 
a80781d4f9ec79514c6431c5d45a6cdcb913aabc6329cefe46e7980805d06b60d479110bb6432f2c35a058e551da6b6fa8e0e4f6f1bdf9a159f6329ddb74aa2a
 SHA512 
dbca2b904147f592cc712b11d6414a47bd557d3c677e6b3eacb4fc1ca5420a264f15fdbe45c8c3469ecfb5d1ffa1ac19cceb58c1378aec0e8b4597baa348ca3b

diff --git a/games-strategy/wesnoth/wesnoth-1.14.7.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
new file mode 100644
index 000..971ba1f87a9
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-utils user
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+   https://github.com/wesnoth/wesnoth;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="dbus dedicated doc fribidi libressl nls openmp server"
+
+RDEPEND="
+   >=dev-libs/boost-1.50:=[nls,threads,icu]
+   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+   !dedicated? (
+   dev-libs/glib:2
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   >=media-libs/fontconfig-2.4.1
+   >=media-libs/sdl2-image-2.0.0[jpeg,png]
+   >=media-libs/sdl2-mixer-2.0.0[vorbis]
+   >=media-libs/sdl2-ttf-2.0.12
+   media-libs/libvorbis
+   >=x11-libs/pango-1.22.0
+   >=x11-libs/cairo-1.10.0
+   sys-libs/readline:0=
+   dbus? ( sys-apps/dbus )
+   fribidi? ( dev-libs/fribidi )
+   )"
+DEPEND="${RDEPEND}
+   x11-libs/libX11
+"
+BDEPEND="
+   sys-devel/gettext
+   virtual/pkgconfig
+"
+
+pkg_setup() {
+   if use openmp; then
+   tc-has-openmp || die "Please switch to an openmp compatible 
compiler"
+   fi
+
+   enewgroup ${PN}
+   enewuser ${PN} -1 /bin/bash -1 ${PN}
+}
+
+src_prepare() {
+   cmake-utils_src_prepare
+
+   if ! use doc ; then
+   sed -i \
+   -e '/manual/d' \
+   doc/CMakeLists.txt || die
+   fi
+
+   # respect LINGUAS (bug #483316)
+   if [[ ${LINGUAS+set} ]] ; then
+   local lang langs=()
+   for lang in $(cat po/LINGUAS) ; do
+   has ${lang} ${LINGUAS} && langs+=( ${lang} )
+   done
+   echo "${langs[@]}" > po/LINGUAS || die
+   fi
+}
+
+src_configure() {
+   filter-flags -ftracer -fomit-frame-pointer
+   if [[ $(gcc-major-version) -eq 3 ]] ; then
+   filter-flags -fstack-protector
+   append-flags -fno-stack-protector
+   fi
+
+   # Work around eclass
+   append-flags -UNDEBUG
+
+   if use dedicated || use server ; then
+   mycmakeargs=(
+   -DENABLE_CAMPAIGN_SERVER="ON"
+   -DENABLE_SERVER="ON"
+   -DSERVER_UID="${PN}"
+   -DSERVER_GID="${PN}"
+   -DFIFO_DIR="/run/wesnothd"
+   )
+   else
+   mycmakeargs=(
+   -DENABLE_CAMPAIGN_SERVER="OFF"
+   -DENABLE_SERVER="OFF"
+   )
+   fi
+   mycmakeargs+=(
+   -Wno-dev
+   -DENABLE_GAME="$(usex !dedicated)"
+   -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+   -DENABLE_NLS="$(usex nls)"
+   -DENABLE_NOTIFICATIONS="$(usex dbus)"
+   -DENABLE_FRIBIDI="$(usex fribidi)"
+   -DENABLE_OMP="$(usex openmp)"
+   -DENABLE_STRICT_COMPILATION="OFF"
+

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

2019-04-13 Thread Pacho Ramos

commit: 66dd25a26698683c6a46e76522a2090c404677e5
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Apr 13 22:40:06 2019 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Apr 13 22:44:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66dd25a2

games-strategy/wesnoth: Drop old

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Pacho Ramos  gentoo.org>

 games-strategy/wesnoth/Manifest  |   1 -
 games-strategy/wesnoth/wesnoth-1.14.5.ebuild | 115 ---
 2 files changed, 116 deletions(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index af0ef226cf2..7fc6b901fb9 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,2 +1 @@
-DIST wesnoth-1.14.5.tar.gz 489848620 BLAKE2B 
abbf1ae2bb20cfdd2575f5e21eea7db9b32f0a9c7e85101652206477f3dca8ae0aefbf4b0a252c4522565c08900b0a04d39fd5eadb5feb49168dc95db732e50e
 SHA512 
115c7fda3ef77079d871aeae4bc448bf8de1829d7723179f634db10f23ab8c15d2d92c5a36c11aa8dc79fb8f914e95f06143565e2ae950947da35af5f71e1b6e
 DIST wesnoth-1.14.6.tar.gz 491891860 BLAKE2B 
e15512eefbb7b118ec80a5612c23edce41555fc2869b652d4799bc052f26592852a2b4d1cb76dee3203d8a26c18c4cf9de58dea1ee81403b9881642e902cf2f3
 SHA512 
f29b78605f5e3c2e9af8884925b43a262d6fce469bf30a4697e2c8bef8a49d0fea17bd6dc1a3e78113a50e6f21e29aedb5ee26ff2b0493371120f8c64b894096

diff --git a/games-strategy/wesnoth/wesnoth-1.14.5.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.5.ebuild
deleted file mode 100644
index 4cd3506d2b9..000
--- a/games-strategy/wesnoth/wesnoth-1.14.5.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils user
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org
-   https://github.com/wesnoth/wesnoth;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="dbus dedicated doc fribidi libressl nls openmp server"
-
-RDEPEND="
-   >=dev-libs/boost-1.50:=[nls,threads,icu]
-   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
-   !dedicated? (
-   dev-libs/glib:2
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   >=media-libs/fontconfig-2.4.1
-   >=media-libs/sdl2-image-2.0.0[jpeg,png]
-   >=media-libs/sdl2-mixer-2.0.0[vorbis]
-   >=media-libs/sdl2-ttf-2.0.12
-   media-libs/libvorbis
-   >=x11-libs/pango-1.22.0
-   >=x11-libs/cairo-1.10.0
-   sys-libs/readline:0=
-   dbus? ( sys-apps/dbus )
-   fribidi? ( dev-libs/fribidi )
-   )"
-DEPEND="${RDEPEND}
-   sys-devel/gettext
-   virtual/pkgconfig
-   x11-libs/libX11
-"
-
-pkg_setup() {
-   if use openmp; then
-   tc-has-openmp || die "Please switch to an openmp compatible 
compiler"
-   fi
-
-   enewgroup ${PN}
-   enewuser ${PN} -1 /bin/bash -1 ${PN}
-}
-
-src_prepare() {
-   cmake-utils_src_prepare
-
-   if ! use doc ; then
-   sed -i \
-   -e '/manual/d' \
-   doc/CMakeLists.txt || die
-   fi
-
-   # respect LINGUAS (bug #483316)
-   if [[ ${LINGUAS+set} ]] ; then
-   local langs
-   for lang in $(cat po/LINGUAS)
-   do
-   has $lang $LINGUAS && langs+="$lang "
-   done
-   echo "$langs" > po/LINGUAS || die
-   fi
-}
-
-src_configure() {
-   filter-flags -ftracer -fomit-frame-pointer
-   if [[ $(gcc-major-version) -eq 3 ]] ; then
-   filter-flags -fstack-protector
-   append-flags -fno-stack-protector
-   fi
-
-   # Work around eclass
-   append-flags -UNDEBUG
-
-   if use dedicated || use server ; then
-   mycmakeargs=(
-   -DENABLE_CAMPAIGN_SERVER="ON"
-   -DENABLE_SERVER="ON"
-   -DSERVER_UID="${PN}"
-   -DSERVER_GID="${PN}"
-   -DFIFO_DIR="/run/wesnothd"
-   )
-   else
-   mycmakeargs=(
-   -DENABLE_CAMPAIGN_SERVER="OFF"
-   -DENABLE_SERVER="OFF"
-   )
-   fi
-   mycmakeargs+=(
-   -Wno-dev
-   -DENABLE_GAME="$(usex !dedicated)"
-   -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
-   -DENABLE_NLS="$(usex nls)"
-   -DENABLE_NOTIFICATIONS="$(usex dbus)"
-   -DENABLE_FRIBIDI="$(usex fribidi)"
-   -DENABLE_OMP="$(usex openmp)"
-   -DENABLE_STRICT_COMPILATION="OFF"
-

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

2019-02-28 Thread Lars Wendler

commit: 1853cd01377e9de21c66a4809c18a81f49a757c3
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Feb 28 10:01:31 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Feb 28 10:42:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1853cd01

games-strategy/wesnoth: Bump to version 1.14.6

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

 games-strategy/wesnoth/Manifest  |   1 +
 games-strategy/wesnoth/wesnoth-1.14.6.ebuild | 116 +++
 2 files changed, 117 insertions(+)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index e7fa1df1e40..af0ef226cf2 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1 +1,2 @@
 DIST wesnoth-1.14.5.tar.gz 489848620 BLAKE2B 
abbf1ae2bb20cfdd2575f5e21eea7db9b32f0a9c7e85101652206477f3dca8ae0aefbf4b0a252c4522565c08900b0a04d39fd5eadb5feb49168dc95db732e50e
 SHA512 
115c7fda3ef77079d871aeae4bc448bf8de1829d7723179f634db10f23ab8c15d2d92c5a36c11aa8dc79fb8f914e95f06143565e2ae950947da35af5f71e1b6e
+DIST wesnoth-1.14.6.tar.gz 491891860 BLAKE2B 
e15512eefbb7b118ec80a5612c23edce41555fc2869b652d4799bc052f26592852a2b4d1cb76dee3203d8a26c18c4cf9de58dea1ee81403b9881642e902cf2f3
 SHA512 
f29b78605f5e3c2e9af8884925b43a262d6fce469bf30a4697e2c8bef8a49d0fea17bd6dc1a3e78113a50e6f21e29aedb5ee26ff2b0493371120f8c64b894096

diff --git a/games-strategy/wesnoth/wesnoth-1.14.6.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.6.ebuild
new file mode 100644
index 000..971ba1f87a9
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.14.6.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-utils user
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+   https://github.com/wesnoth/wesnoth;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="dbus dedicated doc fribidi libressl nls openmp server"
+
+RDEPEND="
+   >=dev-libs/boost-1.50:=[nls,threads,icu]
+   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+   !dedicated? (
+   dev-libs/glib:2
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   >=media-libs/fontconfig-2.4.1
+   >=media-libs/sdl2-image-2.0.0[jpeg,png]
+   >=media-libs/sdl2-mixer-2.0.0[vorbis]
+   >=media-libs/sdl2-ttf-2.0.12
+   media-libs/libvorbis
+   >=x11-libs/pango-1.22.0
+   >=x11-libs/cairo-1.10.0
+   sys-libs/readline:0=
+   dbus? ( sys-apps/dbus )
+   fribidi? ( dev-libs/fribidi )
+   )"
+DEPEND="${RDEPEND}
+   x11-libs/libX11
+"
+BDEPEND="
+   sys-devel/gettext
+   virtual/pkgconfig
+"
+
+pkg_setup() {
+   if use openmp; then
+   tc-has-openmp || die "Please switch to an openmp compatible 
compiler"
+   fi
+
+   enewgroup ${PN}
+   enewuser ${PN} -1 /bin/bash -1 ${PN}
+}
+
+src_prepare() {
+   cmake-utils_src_prepare
+
+   if ! use doc ; then
+   sed -i \
+   -e '/manual/d' \
+   doc/CMakeLists.txt || die
+   fi
+
+   # respect LINGUAS (bug #483316)
+   if [[ ${LINGUAS+set} ]] ; then
+   local lang langs=()
+   for lang in $(cat po/LINGUAS) ; do
+   has ${lang} ${LINGUAS} && langs+=( ${lang} )
+   done
+   echo "${langs[@]}" > po/LINGUAS || die
+   fi
+}
+
+src_configure() {
+   filter-flags -ftracer -fomit-frame-pointer
+   if [[ $(gcc-major-version) -eq 3 ]] ; then
+   filter-flags -fstack-protector
+   append-flags -fno-stack-protector
+   fi
+
+   # Work around eclass
+   append-flags -UNDEBUG
+
+   if use dedicated || use server ; then
+   mycmakeargs=(
+   -DENABLE_CAMPAIGN_SERVER="ON"
+   -DENABLE_SERVER="ON"
+   -DSERVER_UID="${PN}"
+   -DSERVER_GID="${PN}"
+   -DFIFO_DIR="/run/wesnothd"
+   )
+   else
+   mycmakeargs=(
+   -DENABLE_CAMPAIGN_SERVER="OFF"
+   -DENABLE_SERVER="OFF"
+   )
+   fi
+   mycmakeargs+=(
+   -Wno-dev
+   -DENABLE_GAME="$(usex !dedicated)"
+   -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+   -DENABLE_NLS="$(usex nls)"
+   -DENABLE_NOTIFICATIONS="$(usex dbus)"
+   -DENABLE_FRIBIDI="$(usex fribidi)"
+   -DENABLE_OMP="$(usex openmp)"
+   -DENABLE_STRICT_COMPILATION="OFF"
+

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

2019-01-08 Thread Lars Wendler

commit: 577b69c7fa88b334c51220e0d7972f1ebd7c9b4d
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jan  8 08:30:05 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jan  8 09:25:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=577b69c7

games-strategy/wesnoth: Added sub-slot dep for sys-libs/readline

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

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

diff --git a/games-strategy/wesnoth/wesnoth-1.14.5.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.5.ebuild
index 9ce29bd54b0..4cd3506d2b9 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.5.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.5.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
@@ -28,7 +28,7 @@ RDEPEND="
media-libs/libvorbis
>=x11-libs/pango-1.22.0
>=x11-libs/cairo-1.10.0
-   sys-libs/readline:0
+   sys-libs/readline:0=
dbus? ( sys-apps/dbus )
fribidi? ( dev-libs/fribidi )
)"

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

2019-01-08 Thread Lars Wendler

commit: 4a04712713af5aeffc4e57c9dc9914e92cbf14e8
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jan  8 08:29:09 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jan  8 09:25:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a047127

games-strategy/wesnoth: Removed old.

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

 games-strategy/wesnoth/Manifest  |   1 -
 games-strategy/wesnoth/wesnoth-1.14.4.ebuild | 115 ---
 2 files changed, 116 deletions(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 6dd16fa3c36..e7fa1df1e40 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,2 +1 @@
-DIST wesnoth-1.14.4.tar.gz 489503950 BLAKE2B 
2802098a83169d1dd3d0d38052145b7da006992843d748fdc263fe04ed0f485c2a46a93569e2728e152d76361d3651f0f207d2cfdd7b6bb59ae7cdec43680cd7
 SHA512 
d867d68278075536c61eb87c32dd43bcd832de0dd20f9c941e2c5a2f413b95ba1897b5401721a0e895934afe79bb568ea155d8fe648dac58c519289fc7d12885
 DIST wesnoth-1.14.5.tar.gz 489848620 BLAKE2B 
abbf1ae2bb20cfdd2575f5e21eea7db9b32f0a9c7e85101652206477f3dca8ae0aefbf4b0a252c4522565c08900b0a04d39fd5eadb5feb49168dc95db732e50e
 SHA512 
115c7fda3ef77079d871aeae4bc448bf8de1829d7723179f634db10f23ab8c15d2d92c5a36c11aa8dc79fb8f914e95f06143565e2ae950947da35af5f71e1b6e

diff --git a/games-strategy/wesnoth/wesnoth-1.14.4.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.4.ebuild
deleted file mode 100644
index 9ce29bd54b0..000
--- a/games-strategy/wesnoth/wesnoth-1.14.4.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils user
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org
-   https://github.com/wesnoth/wesnoth;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="dbus dedicated doc fribidi libressl nls openmp server"
-
-RDEPEND="
-   >=dev-libs/boost-1.50:=[nls,threads,icu]
-   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
-   !dedicated? (
-   dev-libs/glib:2
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   >=media-libs/fontconfig-2.4.1
-   >=media-libs/sdl2-image-2.0.0[jpeg,png]
-   >=media-libs/sdl2-mixer-2.0.0[vorbis]
-   >=media-libs/sdl2-ttf-2.0.12
-   media-libs/libvorbis
-   >=x11-libs/pango-1.22.0
-   >=x11-libs/cairo-1.10.0
-   sys-libs/readline:0
-   dbus? ( sys-apps/dbus )
-   fribidi? ( dev-libs/fribidi )
-   )"
-DEPEND="${RDEPEND}
-   sys-devel/gettext
-   virtual/pkgconfig
-   x11-libs/libX11
-"
-
-pkg_setup() {
-   if use openmp; then
-   tc-has-openmp || die "Please switch to an openmp compatible 
compiler"
-   fi
-
-   enewgroup ${PN}
-   enewuser ${PN} -1 /bin/bash -1 ${PN}
-}
-
-src_prepare() {
-   cmake-utils_src_prepare
-
-   if ! use doc ; then
-   sed -i \
-   -e '/manual/d' \
-   doc/CMakeLists.txt || die
-   fi
-
-   # respect LINGUAS (bug #483316)
-   if [[ ${LINGUAS+set} ]] ; then
-   local langs
-   for lang in $(cat po/LINGUAS)
-   do
-   has $lang $LINGUAS && langs+="$lang "
-   done
-   echo "$langs" > po/LINGUAS || die
-   fi
-}
-
-src_configure() {
-   filter-flags -ftracer -fomit-frame-pointer
-   if [[ $(gcc-major-version) -eq 3 ]] ; then
-   filter-flags -fstack-protector
-   append-flags -fno-stack-protector
-   fi
-
-   # Work around eclass
-   append-flags -UNDEBUG
-
-   if use dedicated || use server ; then
-   mycmakeargs=(
-   -DENABLE_CAMPAIGN_SERVER="ON"
-   -DENABLE_SERVER="ON"
-   -DSERVER_UID="${PN}"
-   -DSERVER_GID="${PN}"
-   -DFIFO_DIR="/run/wesnothd"
-   )
-   else
-   mycmakeargs=(
-   -DENABLE_CAMPAIGN_SERVER="OFF"
-   -DENABLE_SERVER="OFF"
-   )
-   fi
-   mycmakeargs+=(
-   -Wno-dev
-   -DENABLE_GAME="$(usex !dedicated)"
-   -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
-   -DENABLE_NLS="$(usex nls)"
-   -DENABLE_NOTIFICATIONS="$(usex dbus)"
-   -DENABLE_FRIBIDI="$(usex fribidi)"
-   -DENABLE_OMP="$(usex openmp)"
-   -DENABLE_STRICT_COMPILATION="OFF"
-

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

2018-09-21 Thread Lars Wendler

commit: 9eb909ff1071a96ae12a926d218c84eeacec547c
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Sep 21 11:34:31 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Sep 21 11:37:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eb909ff

games-strategy/wesnoth: Bump to version 1.14.5

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 games-strategy/wesnoth/Manifest  |   1 +
 games-strategy/wesnoth/wesnoth-1.14.5.ebuild | 115 +++
 2 files changed, 116 insertions(+)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 763dbe3bb7a..6dd16fa3c36 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1 +1,2 @@
 DIST wesnoth-1.14.4.tar.gz 489503950 BLAKE2B 
2802098a83169d1dd3d0d38052145b7da006992843d748fdc263fe04ed0f485c2a46a93569e2728e152d76361d3651f0f207d2cfdd7b6bb59ae7cdec43680cd7
 SHA512 
d867d68278075536c61eb87c32dd43bcd832de0dd20f9c941e2c5a2f413b95ba1897b5401721a0e895934afe79bb568ea155d8fe648dac58c519289fc7d12885
+DIST wesnoth-1.14.5.tar.gz 489848620 BLAKE2B 
abbf1ae2bb20cfdd2575f5e21eea7db9b32f0a9c7e85101652206477f3dca8ae0aefbf4b0a252c4522565c08900b0a04d39fd5eadb5feb49168dc95db732e50e
 SHA512 
115c7fda3ef77079d871aeae4bc448bf8de1829d7723179f634db10f23ab8c15d2d92c5a36c11aa8dc79fb8f914e95f06143565e2ae950947da35af5f71e1b6e

diff --git a/games-strategy/wesnoth/wesnoth-1.14.5.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.5.ebuild
new file mode 100644
index 000..9ce29bd54b0
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.14.5.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils user
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+   https://github.com/wesnoth/wesnoth;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="dbus dedicated doc fribidi libressl nls openmp server"
+
+RDEPEND="
+   >=dev-libs/boost-1.50:=[nls,threads,icu]
+   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+   !dedicated? (
+   dev-libs/glib:2
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   >=media-libs/fontconfig-2.4.1
+   >=media-libs/sdl2-image-2.0.0[jpeg,png]
+   >=media-libs/sdl2-mixer-2.0.0[vorbis]
+   >=media-libs/sdl2-ttf-2.0.12
+   media-libs/libvorbis
+   >=x11-libs/pango-1.22.0
+   >=x11-libs/cairo-1.10.0
+   sys-libs/readline:0
+   dbus? ( sys-apps/dbus )
+   fribidi? ( dev-libs/fribidi )
+   )"
+DEPEND="${RDEPEND}
+   sys-devel/gettext
+   virtual/pkgconfig
+   x11-libs/libX11
+"
+
+pkg_setup() {
+   if use openmp; then
+   tc-has-openmp || die "Please switch to an openmp compatible 
compiler"
+   fi
+
+   enewgroup ${PN}
+   enewuser ${PN} -1 /bin/bash -1 ${PN}
+}
+
+src_prepare() {
+   cmake-utils_src_prepare
+
+   if ! use doc ; then
+   sed -i \
+   -e '/manual/d' \
+   doc/CMakeLists.txt || die
+   fi
+
+   # respect LINGUAS (bug #483316)
+   if [[ ${LINGUAS+set} ]] ; then
+   local langs
+   for lang in $(cat po/LINGUAS)
+   do
+   has $lang $LINGUAS && langs+="$lang "
+   done
+   echo "$langs" > po/LINGUAS || die
+   fi
+}
+
+src_configure() {
+   filter-flags -ftracer -fomit-frame-pointer
+   if [[ $(gcc-major-version) -eq 3 ]] ; then
+   filter-flags -fstack-protector
+   append-flags -fno-stack-protector
+   fi
+
+   # Work around eclass
+   append-flags -UNDEBUG
+
+   if use dedicated || use server ; then
+   mycmakeargs=(
+   -DENABLE_CAMPAIGN_SERVER="ON"
+   -DENABLE_SERVER="ON"
+   -DSERVER_UID="${PN}"
+   -DSERVER_GID="${PN}"
+   -DFIFO_DIR="/run/wesnothd"
+   )
+   else
+   mycmakeargs=(
+   -DENABLE_CAMPAIGN_SERVER="OFF"
+   -DENABLE_SERVER="OFF"
+   )
+   fi
+   mycmakeargs+=(
+   -Wno-dev
+   -DENABLE_GAME="$(usex !dedicated)"
+   -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+   -DENABLE_NLS="$(usex nls)"
+   -DENABLE_NOTIFICATIONS="$(usex dbus)"
+   -DENABLE_FRIBIDI="$(usex fribidi)"
+   -DENABLE_OMP="$(usex openmp)"
+   -DENABLE_STRICT_COMPILATION="OFF"
+   -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+   )

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

2018-07-24 Thread Lars Wendler

commit: 92031a3a64174023a65c278e2bf455d70fbdf252
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jul 24 08:12:41 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jul 24 08:12:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92031a3a

games-strategy/wesnoth: Fixed installation of docs.

Package-Manager: Portage-2.3.43, Repoman-2.3.10

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

diff --git a/games-strategy/wesnoth/wesnoth-1.14.4.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.4.ebuild
index 27cde05f1ad..9ce29bd54b0 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.4.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.4.ebuild
@@ -106,7 +106,8 @@ src_configure() {
 }
 
 src_install() {
-   DOCS="README.md changelog.md players_changelog.md" 
cmake-utils_src_install
+   local DOCS=( README.md changelog.md )
+   cmake-utils_src_install
if use dedicated || use server; then
rmdir "${ED%/}/run/wesnothd" || die
newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd

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

2018-07-23 Thread Jeroen Roovers

commit: 06c3f5a4afbb62c9615cb678916e51ade7151ec5
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Jul 23 21:26:36 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Jul 23 21:26:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06c3f5a4

games-strategy/wesnoth: Version 1.14.4.

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 games-strategy/wesnoth/Manifest  |   1 +
 games-strategy/wesnoth/wesnoth-1.14.4.ebuild | 114 +++
 2 files changed, 115 insertions(+)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 341607d03ad..34ffc87a15a 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,2 +1,3 @@
 DIST wesnoth-1.14.2.tar.gz 489041516 BLAKE2B 
f38f3596edd97096e39ee1e87e13a3d0402d0f9f0f67f25ce1e4a28123abc62ca7b2410c8420a4091d505bf64219cdf92c1cfed562ae2f3705c37685d7c2c20e
 SHA512 
010dcdeaf03d3855192d2480facbfce134459b71acb06515196968dd66b5e1fc40bd75eeeb8b7dd7fc30c9b43af004784d9907893c4b1d61e57436457afc30bb
 DIST wesnoth-1.14.3.tar.gz 489258637 BLAKE2B 
bc6c49a768d07387f8f4a285801964acd4476819075cedfd9dd2a0bbe36706e93badd78d4bd4468b687d3d34073c59e4a67dde7a578dabfd26f224233eb87413
 SHA512 
57c6766edce3b7984da9e6bc795913e1a582e4afac8c287b603ad2173f49d26095af903b3f10938a3b04d4f2921c3a2a5f2239c6c3a4d88222fabd9601a833aa
+DIST wesnoth-1.14.4.tar.gz 489503950 BLAKE2B 
2802098a83169d1dd3d0d38052145b7da006992843d748fdc263fe04ed0f485c2a46a93569e2728e152d76361d3651f0f207d2cfdd7b6bb59ae7cdec43680cd7
 SHA512 
d867d68278075536c61eb87c32dd43bcd832de0dd20f9c941e2c5a2f413b95ba1897b5401721a0e895934afe79bb568ea155d8fe648dac58c519289fc7d12885

diff --git a/games-strategy/wesnoth/wesnoth-1.14.4.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.4.ebuild
new file mode 100644
index 000..27cde05f1ad
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.14.4.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils user
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+   https://github.com/wesnoth/wesnoth;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="dbus dedicated doc fribidi libressl nls openmp server"
+
+RDEPEND="
+   >=dev-libs/boost-1.50:=[nls,threads,icu]
+   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+   !dedicated? (
+   dev-libs/glib:2
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   >=media-libs/fontconfig-2.4.1
+   >=media-libs/sdl2-image-2.0.0[jpeg,png]
+   >=media-libs/sdl2-mixer-2.0.0[vorbis]
+   >=media-libs/sdl2-ttf-2.0.12
+   media-libs/libvorbis
+   >=x11-libs/pango-1.22.0
+   >=x11-libs/cairo-1.10.0
+   sys-libs/readline:0
+   dbus? ( sys-apps/dbus )
+   fribidi? ( dev-libs/fribidi )
+   )"
+DEPEND="${RDEPEND}
+   sys-devel/gettext
+   virtual/pkgconfig
+   x11-libs/libX11
+"
+
+pkg_setup() {
+   if use openmp; then
+   tc-has-openmp || die "Please switch to an openmp compatible 
compiler"
+   fi
+
+   enewgroup ${PN}
+   enewuser ${PN} -1 /bin/bash -1 ${PN}
+}
+
+src_prepare() {
+   cmake-utils_src_prepare
+
+   if ! use doc ; then
+   sed -i \
+   -e '/manual/d' \
+   doc/CMakeLists.txt || die
+   fi
+
+   # respect LINGUAS (bug #483316)
+   if [[ ${LINGUAS+set} ]] ; then
+   local langs
+   for lang in $(cat po/LINGUAS)
+   do
+   has $lang $LINGUAS && langs+="$lang "
+   done
+   echo "$langs" > po/LINGUAS || die
+   fi
+}
+
+src_configure() {
+   filter-flags -ftracer -fomit-frame-pointer
+   if [[ $(gcc-major-version) -eq 3 ]] ; then
+   filter-flags -fstack-protector
+   append-flags -fno-stack-protector
+   fi
+
+   # Work around eclass
+   append-flags -UNDEBUG
+
+   if use dedicated || use server ; then
+   mycmakeargs=(
+   -DENABLE_CAMPAIGN_SERVER="ON"
+   -DENABLE_SERVER="ON"
+   -DSERVER_UID="${PN}"
+   -DSERVER_GID="${PN}"
+   -DFIFO_DIR="/run/wesnothd"
+   )
+   else
+   mycmakeargs=(
+   -DENABLE_CAMPAIGN_SERVER="OFF"
+   -DENABLE_SERVER="OFF"
+   )
+   fi
+   mycmakeargs+=(
+   -Wno-dev
+   -DENABLE_GAME="$(usex !dedicated)"
+   -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+

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

2018-07-23 Thread Jeroen Roovers

commit: fadb8bb35ca652c1770e08358a74ce80c529fe78
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Jul 23 21:27:28 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Jul 23 21:27:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fadb8bb3

games-strategy/wesnoth: Old.

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 games-strategy/wesnoth/Manifest  |   2 -
 games-strategy/wesnoth/wesnoth-1.14.2.ebuild | 114 ---
 games-strategy/wesnoth/wesnoth-1.14.3.ebuild | 114 ---
 3 files changed, 230 deletions(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 34ffc87a15a..763dbe3bb7a 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,3 +1 @@
-DIST wesnoth-1.14.2.tar.gz 489041516 BLAKE2B 
f38f3596edd97096e39ee1e87e13a3d0402d0f9f0f67f25ce1e4a28123abc62ca7b2410c8420a4091d505bf64219cdf92c1cfed562ae2f3705c37685d7c2c20e
 SHA512 
010dcdeaf03d3855192d2480facbfce134459b71acb06515196968dd66b5e1fc40bd75eeeb8b7dd7fc30c9b43af004784d9907893c4b1d61e57436457afc30bb
-DIST wesnoth-1.14.3.tar.gz 489258637 BLAKE2B 
bc6c49a768d07387f8f4a285801964acd4476819075cedfd9dd2a0bbe36706e93badd78d4bd4468b687d3d34073c59e4a67dde7a578dabfd26f224233eb87413
 SHA512 
57c6766edce3b7984da9e6bc795913e1a582e4afac8c287b603ad2173f49d26095af903b3f10938a3b04d4f2921c3a2a5f2239c6c3a4d88222fabd9601a833aa
 DIST wesnoth-1.14.4.tar.gz 489503950 BLAKE2B 
2802098a83169d1dd3d0d38052145b7da006992843d748fdc263fe04ed0f485c2a46a93569e2728e152d76361d3651f0f207d2cfdd7b6bb59ae7cdec43680cd7
 SHA512 
d867d68278075536c61eb87c32dd43bcd832de0dd20f9c941e2c5a2f413b95ba1897b5401721a0e895934afe79bb568ea155d8fe648dac58c519289fc7d12885

diff --git a/games-strategy/wesnoth/wesnoth-1.14.2.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.2.ebuild
deleted file mode 100644
index 27cde05f1ad..000
--- a/games-strategy/wesnoth/wesnoth-1.14.2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils user
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org
-   https://github.com/wesnoth/wesnoth;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="dbus dedicated doc fribidi libressl nls openmp server"
-
-RDEPEND="
-   >=dev-libs/boost-1.50:=[nls,threads,icu]
-   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
-   !dedicated? (
-   dev-libs/glib:2
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   >=media-libs/fontconfig-2.4.1
-   >=media-libs/sdl2-image-2.0.0[jpeg,png]
-   >=media-libs/sdl2-mixer-2.0.0[vorbis]
-   >=media-libs/sdl2-ttf-2.0.12
-   media-libs/libvorbis
-   >=x11-libs/pango-1.22.0
-   >=x11-libs/cairo-1.10.0
-   sys-libs/readline:0
-   dbus? ( sys-apps/dbus )
-   fribidi? ( dev-libs/fribidi )
-   )"
-DEPEND="${RDEPEND}
-   sys-devel/gettext
-   virtual/pkgconfig
-   x11-libs/libX11
-"
-
-pkg_setup() {
-   if use openmp; then
-   tc-has-openmp || die "Please switch to an openmp compatible 
compiler"
-   fi
-
-   enewgroup ${PN}
-   enewuser ${PN} -1 /bin/bash -1 ${PN}
-}
-
-src_prepare() {
-   cmake-utils_src_prepare
-
-   if ! use doc ; then
-   sed -i \
-   -e '/manual/d' \
-   doc/CMakeLists.txt || die
-   fi
-
-   # respect LINGUAS (bug #483316)
-   if [[ ${LINGUAS+set} ]] ; then
-   local langs
-   for lang in $(cat po/LINGUAS)
-   do
-   has $lang $LINGUAS && langs+="$lang "
-   done
-   echo "$langs" > po/LINGUAS || die
-   fi
-}
-
-src_configure() {
-   filter-flags -ftracer -fomit-frame-pointer
-   if [[ $(gcc-major-version) -eq 3 ]] ; then
-   filter-flags -fstack-protector
-   append-flags -fno-stack-protector
-   fi
-
-   # Work around eclass
-   append-flags -UNDEBUG
-
-   if use dedicated || use server ; then
-   mycmakeargs=(
-   -DENABLE_CAMPAIGN_SERVER="ON"
-   -DENABLE_SERVER="ON"
-   -DSERVER_UID="${PN}"
-   -DSERVER_GID="${PN}"
-   -DFIFO_DIR="/run/wesnothd"
-   )
-   else
-   mycmakeargs=(
-   -DENABLE_CAMPAIGN_SERVER="OFF"
-   -DENABLE_SERVER="OFF"
-   )
-   fi
-   mycmakeargs+=(
-   -Wno-dev
-   -DENABLE_GAME="$(usex

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

2018-06-13 Thread Lars Wendler

commit: b7361e5a9c3b7bf530e661a5747dd449ca0de7bd
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jun 13 15:48:25 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jun 13 16:20:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7361e5a

games-strategy/wesnoth: Removed old.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 games-strategy/wesnoth/Manifest |   1 -
 games-strategy/wesnoth/wesnoth-1.14.1-r1.ebuild | 114 
 2 files changed, 115 deletions(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 13fd084581d..341607d03ad 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,3 +1,2 @@
-DIST wesnoth-1.14.1.tar.gz 481355736 BLAKE2B 
2cc41a36706919bbc505a9a6726ea9b0fbfd5bfde677da937fdde2645587f4407fb6ed2f7271efaf1763f9ab69a57d153130291d5dc0a79862e554963dd37079
 SHA512 
0372eb9479d3d24dc4bf692a83fe310d5b4493989f18f0a23070ee19a4bee2672efd38babe1579b08a321e3acba1ede5823376619c8a90102f968e53cc6e3f02
 DIST wesnoth-1.14.2.tar.gz 489041516 BLAKE2B 
f38f3596edd97096e39ee1e87e13a3d0402d0f9f0f67f25ce1e4a28123abc62ca7b2410c8420a4091d505bf64219cdf92c1cfed562ae2f3705c37685d7c2c20e
 SHA512 
010dcdeaf03d3855192d2480facbfce134459b71acb06515196968dd66b5e1fc40bd75eeeb8b7dd7fc30c9b43af004784d9907893c4b1d61e57436457afc30bb
 DIST wesnoth-1.14.3.tar.gz 489258637 BLAKE2B 
bc6c49a768d07387f8f4a285801964acd4476819075cedfd9dd2a0bbe36706e93badd78d4bd4468b687d3d34073c59e4a67dde7a578dabfd26f224233eb87413
 SHA512 
57c6766edce3b7984da9e6bc795913e1a582e4afac8c287b603ad2173f49d26095af903b3f10938a3b04d4f2921c3a2a5f2239c6c3a4d88222fabd9601a833aa

diff --git a/games-strategy/wesnoth/wesnoth-1.14.1-r1.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.1-r1.ebuild
deleted file mode 100644
index 5a1f6c5af2e..000
--- a/games-strategy/wesnoth/wesnoth-1.14.1-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils user
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org
-   https://github.com/wesnoth/wesnoth;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="dbus dedicated doc fribidi libressl nls openmp server"
-
-RDEPEND="
-   >=dev-libs/boost-1.50:=[nls,threads,icu]
-   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
-   !dedicated? (
-   dev-libs/glib:2
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   >=media-libs/fontconfig-2.4.1
-   >=media-libs/sdl2-image-2.0.0[jpeg,png]
-   >=media-libs/sdl2-mixer-2.0.0[vorbis]
-   >=media-libs/sdl2-ttf-2.0.12
-   media-libs/libvorbis
-   >=x11-libs/pango-1.22.0
-   >=x11-libs/cairo-1.10.0
-   sys-libs/readline:0
-   dbus? ( sys-apps/dbus )
-   fribidi? ( dev-libs/fribidi )
-   )"
-DEPEND="${RDEPEND}
-   sys-devel/gettext
-   virtual/pkgconfig
-   x11-libs/libX11
-"
-
-pkg_setup() {
-   if use openmp; then
-   tc-has-openmp || die "Please switch to an openmp compatible 
compiler"
-   fi
-
-   enewgroup ${PN}
-   enewuser ${PN} -1 /bin/bash -1 ${PN}
-}
-
-src_prepare() {
-   cmake-utils_src_prepare
-
-   if ! use doc ; then
-   sed -i \
-   -e '/manual/d' \
-   doc/CMakeLists.txt || die
-   fi
-
-   # respect LINGUAS (bug #483316)
-   if [[ ${LINGUAS+set} ]] ; then
-   local langs
-   for lang in $(cat po/LINGUAS)
-   do
-   has $lang $LINGUAS && langs+="$lang "
-   done
-   echo "$langs" > po/LINGUAS || die
-   fi
-}
-
-src_configure() {
-   filter-flags -ftracer -fomit-frame-pointer
-   if [[ $(gcc-major-version) -eq 3 ]] ; then
-   filter-flags -fstack-protector
-   append-flags -fno-stack-protector
-   fi
-
-   # Work around eclass
-   append-flags -UNDEBUG
-
-   if use dedicated || use server ; then
-   mycmakeargs=(
-   -DENABLE_CAMPAIGN_SERVER="ON"
-   -DENABLE_SERVER="ON"
-   -DSERVER_UID="${PN}"
-   -DSERVER_GID="${PN}"
-   -DFIFO_DIR="/run/wesnothd"
-   )
-   else
-   mycmakeargs=(
-   -DENABLE_CAMPAIGN_SERVER="OFF"
-   -DENABLE_SERVER="OFF"
-   )
-   fi
-   mycmakeargs+=(
-   -Wno-dev
-   -DENABLE_GAME="$(usex !dedicated)"
-   -DENABLE_DESKTOP_ENTRY="$(usex

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

2018-06-13 Thread Lars Wendler

commit: 143b6a02f15f6e04dd4c1124db7f936fc482e07c
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jun 13 15:37:55 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jun 13 16:20:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=143b6a02

games-strategy/wesnoth: Bump to version 1.14.3

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 games-strategy/wesnoth/Manifest  |   1 +
 games-strategy/wesnoth/wesnoth-1.14.3.ebuild | 114 +++
 2 files changed, 115 insertions(+)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index ecefe36c0dd..13fd084581d 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,2 +1,3 @@
 DIST wesnoth-1.14.1.tar.gz 481355736 BLAKE2B 
2cc41a36706919bbc505a9a6726ea9b0fbfd5bfde677da937fdde2645587f4407fb6ed2f7271efaf1763f9ab69a57d153130291d5dc0a79862e554963dd37079
 SHA512 
0372eb9479d3d24dc4bf692a83fe310d5b4493989f18f0a23070ee19a4bee2672efd38babe1579b08a321e3acba1ede5823376619c8a90102f968e53cc6e3f02
 DIST wesnoth-1.14.2.tar.gz 489041516 BLAKE2B 
f38f3596edd97096e39ee1e87e13a3d0402d0f9f0f67f25ce1e4a28123abc62ca7b2410c8420a4091d505bf64219cdf92c1cfed562ae2f3705c37685d7c2c20e
 SHA512 
010dcdeaf03d3855192d2480facbfce134459b71acb06515196968dd66b5e1fc40bd75eeeb8b7dd7fc30c9b43af004784d9907893c4b1d61e57436457afc30bb
+DIST wesnoth-1.14.3.tar.gz 489258637 BLAKE2B 
bc6c49a768d07387f8f4a285801964acd4476819075cedfd9dd2a0bbe36706e93badd78d4bd4468b687d3d34073c59e4a67dde7a578dabfd26f224233eb87413
 SHA512 
57c6766edce3b7984da9e6bc795913e1a582e4afac8c287b603ad2173f49d26095af903b3f10938a3b04d4f2921c3a2a5f2239c6c3a4d88222fabd9601a833aa

diff --git a/games-strategy/wesnoth/wesnoth-1.14.3.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.3.ebuild
new file mode 100644
index 000..27cde05f1ad
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.14.3.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils user
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+   https://github.com/wesnoth/wesnoth;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="dbus dedicated doc fribidi libressl nls openmp server"
+
+RDEPEND="
+   >=dev-libs/boost-1.50:=[nls,threads,icu]
+   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+   !dedicated? (
+   dev-libs/glib:2
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   >=media-libs/fontconfig-2.4.1
+   >=media-libs/sdl2-image-2.0.0[jpeg,png]
+   >=media-libs/sdl2-mixer-2.0.0[vorbis]
+   >=media-libs/sdl2-ttf-2.0.12
+   media-libs/libvorbis
+   >=x11-libs/pango-1.22.0
+   >=x11-libs/cairo-1.10.0
+   sys-libs/readline:0
+   dbus? ( sys-apps/dbus )
+   fribidi? ( dev-libs/fribidi )
+   )"
+DEPEND="${RDEPEND}
+   sys-devel/gettext
+   virtual/pkgconfig
+   x11-libs/libX11
+"
+
+pkg_setup() {
+   if use openmp; then
+   tc-has-openmp || die "Please switch to an openmp compatible 
compiler"
+   fi
+
+   enewgroup ${PN}
+   enewuser ${PN} -1 /bin/bash -1 ${PN}
+}
+
+src_prepare() {
+   cmake-utils_src_prepare
+
+   if ! use doc ; then
+   sed -i \
+   -e '/manual/d' \
+   doc/CMakeLists.txt || die
+   fi
+
+   # respect LINGUAS (bug #483316)
+   if [[ ${LINGUAS+set} ]] ; then
+   local langs
+   for lang in $(cat po/LINGUAS)
+   do
+   has $lang $LINGUAS && langs+="$lang "
+   done
+   echo "$langs" > po/LINGUAS || die
+   fi
+}
+
+src_configure() {
+   filter-flags -ftracer -fomit-frame-pointer
+   if [[ $(gcc-major-version) -eq 3 ]] ; then
+   filter-flags -fstack-protector
+   append-flags -fno-stack-protector
+   fi
+
+   # Work around eclass
+   append-flags -UNDEBUG
+
+   if use dedicated || use server ; then
+   mycmakeargs=(
+   -DENABLE_CAMPAIGN_SERVER="ON"
+   -DENABLE_SERVER="ON"
+   -DSERVER_UID="${PN}"
+   -DSERVER_GID="${PN}"
+   -DFIFO_DIR="/run/wesnothd"
+   )
+   else
+   mycmakeargs=(
+   -DENABLE_CAMPAIGN_SERVER="OFF"
+   -DENABLE_SERVER="OFF"
+   )
+   fi
+   mycmakeargs+=(
+   -Wno-dev
+   -DENABLE_GAME="$(usex !dedicated)"
+   -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+

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

2018-06-06 Thread Andreas Sturmlechner

commit: 9320a11fecbd758ca073072ebc06750313fbcdbb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jun  3 13:54:54 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun  6 08:06:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9320a11f

games-strategy/wesnoth: Drop old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 games-strategy/wesnoth/Manifest  |   1 -
 games-strategy/wesnoth/files/wesnothd.rc |  22 -
 games-strategy/wesnoth/wesnoth-1.12.6.ebuild | 119 ---
 3 files changed, 142 deletions(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 2a8b2573b38..ecefe36c0dd 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,3 +1,2 @@
-DIST wesnoth-1.12.6.tar.bz2 387869758 BLAKE2B 
53328f8ebbaaabb266064fea57c0d28779183ba1b77ae8522c4dbb01c4a9ad9068d76307b48cec6576648132bf34f9a45efdb93ad36e03d035ed06e84711c9b6
 SHA512 
12ca3b5de8fd385b05cc8e76604f7aed68127a7542599d6e97cce793e10636e00bd65dcb088701e20ccc7191f41b1d67a00b291f885df880fac00d13d6fbde7a
 DIST wesnoth-1.14.1.tar.gz 481355736 BLAKE2B 
2cc41a36706919bbc505a9a6726ea9b0fbfd5bfde677da937fdde2645587f4407fb6ed2f7271efaf1763f9ab69a57d153130291d5dc0a79862e554963dd37079
 SHA512 
0372eb9479d3d24dc4bf692a83fe310d5b4493989f18f0a23070ee19a4bee2672efd38babe1579b08a321e3acba1ede5823376619c8a90102f968e53cc6e3f02
 DIST wesnoth-1.14.2.tar.gz 489041516 BLAKE2B 
f38f3596edd97096e39ee1e87e13a3d0402d0f9f0f67f25ce1e4a28123abc62ca7b2410c8420a4091d505bf64219cdf92c1cfed562ae2f3705c37685d7c2c20e
 SHA512 
010dcdeaf03d3855192d2480facbfce134459b71acb06515196968dd66b5e1fc40bd75eeeb8b7dd7fc30c9b43af004784d9907893c4b1d61e57436457afc30bb

diff --git a/games-strategy/wesnoth/files/wesnothd.rc 
b/games-strategy/wesnoth/files/wesnothd.rc
deleted file mode 100644
index f8662b0981f..000
--- a/games-strategy/wesnoth/files/wesnothd.rc
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-   use net
-}
-
-start() {
-   ebegin "Starting wesnothd"
-   start-stop-daemon --start --quiet -b -m \
-   --pidfile "GAMES_STATEDIR"/run/wesnothd/wesnothd.pid \
-   -c GAMES_USER_DED:GAMES_GROUP \
-   --exec "GAMES_BINDIR"/wesnothd
-   eend $?
-}
-
-stop() {
-   ebegin "Stopping wesnothd"
-   start-stop-daemon --stop --quiet --pidfile 
"GAMES_STATEDIR"/run/wesnothd/wesnothd.pid
-   eend $?
-}

diff --git a/games-strategy/wesnoth/wesnoth-1.12.6.ebuild 
b/games-strategy/wesnoth/wesnoth-1.12.6.ebuild
deleted file mode 100644
index 3c5d8cf3cf0..000
--- a/games-strategy/wesnoth/wesnoth-1.12.6.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils eutils multilib toolchain-funcs flag-o-matic games
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org/;
-SRC_URI="mirror://sourceforge/wesnoth/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dbus dedicated doc fribidi nls server"
-
-RDEPEND=">=media-libs/libsdl-1.2.7:0[joystick,video,X]
-   media-libs/sdl-net
-   !dedicated? (
-   >=media-libs/sdl-ttf-2.0.8
-   >=media-libs/sdl-mixer-1.2[vorbis]
-   >=media-libs/sdl-image-1.2[jpeg,png]
-   fribidi? ( dev-libs/fribidi )
-   dbus? ( sys-apps/dbus )
-   sys-libs/zlib
-   x11-libs/pango
-   dev-lang/lua:0
-   media-libs/fontconfig
-   )
-   >=dev-libs/boost-1.48:=[nls,threads]
-   virtual/libintl"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   sys-devel/gettext"
-
-src_prepare() {
-   cmake-utils_src_prepare
-
-   if use dedicated || use server ; then
-   sed \
-   -e "s:GAMES_BINDIR:${GAMES_BINDIR}:" \
-   -e "s:GAMES_STATEDIR:${GAMES_STATEDIR}:" \
-   -e "s/GAMES_USER_DED/${GAMES_USER_DED}/" \
-   -e "s/GAMES_GROUP/${GAMES_GROUP}/" 
"${FILESDIR}"/wesnothd.rc \
-   > "${T}"/wesnothd || die
-   fi
-   if ! use doc ; then
-   sed -i \
-   -e '/manual/d' \
-   doc/CMakeLists.txt || die
-   fi
-   # bug #472994
-   mv icons/wesnoth-icon-Mac.png icons/wesnoth-icon.png || die
-   mv icons/map-editor-icon-Mac.png icons/wesnoth_editor-icon.png || die
-
-   # respect LINGUAS (bug #483316)
-   if [[ ${LINGUAS+set} ]] ; then
-   local langs
-   for lang in $(cat po/LINGUAS)
-   do
-   has $lang $LINGUAS && langs+="$lang "
-   done
-

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

2018-06-02 Thread Sergei Trofimovich

commit: 4e91ef4aa3f3611122a32855b4cd82d2d12be6d1
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jun  2 21:45:13 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jun  2 21:47:47 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e91ef4a

games-strategy/wesnoth: add basic prefix support

Package-Manager: Portage-2.3.38, Repoman-2.3.9

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

diff --git a/games-strategy/wesnoth/wesnoth-1.14.2.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.2.ebuild
index 5a1f6c5af2e..27cde05f1ad 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.2.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.2.ebuild
@@ -100,7 +100,7 @@ src_configure() {
-DENABLE_FRIBIDI="$(usex fribidi)"
-DENABLE_OMP="$(usex openmp)"
-DENABLE_STRICT_COMPILATION="OFF"
-   -DCMAKE_INSTALL_PREFIX="/usr"
+   -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
)
cmake-utils_src_configure
 }

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

2018-06-01 Thread Lars Wendler

commit: 038dbf3ffee6eb901497068b7fc47d32df5ffaae
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Jun  1 14:01:24 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jun  1 14:10:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=038dbf3f

games-strategy/wesnoth: Bump to version 1.14.2

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 games-strategy/wesnoth/Manifest  |   1 +
 games-strategy/wesnoth/wesnoth-1.14.2.ebuild | 114 +++
 2 files changed, 115 insertions(+)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 64a3d351e79..2a8b2573b38 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,2 +1,3 @@
 DIST wesnoth-1.12.6.tar.bz2 387869758 BLAKE2B 
53328f8ebbaaabb266064fea57c0d28779183ba1b77ae8522c4dbb01c4a9ad9068d76307b48cec6576648132bf34f9a45efdb93ad36e03d035ed06e84711c9b6
 SHA512 
12ca3b5de8fd385b05cc8e76604f7aed68127a7542599d6e97cce793e10636e00bd65dcb088701e20ccc7191f41b1d67a00b291f885df880fac00d13d6fbde7a
 DIST wesnoth-1.14.1.tar.gz 481355736 BLAKE2B 
2cc41a36706919bbc505a9a6726ea9b0fbfd5bfde677da937fdde2645587f4407fb6ed2f7271efaf1763f9ab69a57d153130291d5dc0a79862e554963dd37079
 SHA512 
0372eb9479d3d24dc4bf692a83fe310d5b4493989f18f0a23070ee19a4bee2672efd38babe1579b08a321e3acba1ede5823376619c8a90102f968e53cc6e3f02
+DIST wesnoth-1.14.2.tar.gz 489041516 BLAKE2B 
f38f3596edd97096e39ee1e87e13a3d0402d0f9f0f67f25ce1e4a28123abc62ca7b2410c8420a4091d505bf64219cdf92c1cfed562ae2f3705c37685d7c2c20e
 SHA512 
010dcdeaf03d3855192d2480facbfce134459b71acb06515196968dd66b5e1fc40bd75eeeb8b7dd7fc30c9b43af004784d9907893c4b1d61e57436457afc30bb

diff --git a/games-strategy/wesnoth/wesnoth-1.14.2.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.2.ebuild
new file mode 100644
index 000..5a1f6c5af2e
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.14.2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils user
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+   https://github.com/wesnoth/wesnoth;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="dbus dedicated doc fribidi libressl nls openmp server"
+
+RDEPEND="
+   >=dev-libs/boost-1.50:=[nls,threads,icu]
+   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+   !dedicated? (
+   dev-libs/glib:2
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   >=media-libs/fontconfig-2.4.1
+   >=media-libs/sdl2-image-2.0.0[jpeg,png]
+   >=media-libs/sdl2-mixer-2.0.0[vorbis]
+   >=media-libs/sdl2-ttf-2.0.12
+   media-libs/libvorbis
+   >=x11-libs/pango-1.22.0
+   >=x11-libs/cairo-1.10.0
+   sys-libs/readline:0
+   dbus? ( sys-apps/dbus )
+   fribidi? ( dev-libs/fribidi )
+   )"
+DEPEND="${RDEPEND}
+   sys-devel/gettext
+   virtual/pkgconfig
+   x11-libs/libX11
+"
+
+pkg_setup() {
+   if use openmp; then
+   tc-has-openmp || die "Please switch to an openmp compatible 
compiler"
+   fi
+
+   enewgroup ${PN}
+   enewuser ${PN} -1 /bin/bash -1 ${PN}
+}
+
+src_prepare() {
+   cmake-utils_src_prepare
+
+   if ! use doc ; then
+   sed -i \
+   -e '/manual/d' \
+   doc/CMakeLists.txt || die
+   fi
+
+   # respect LINGUAS (bug #483316)
+   if [[ ${LINGUAS+set} ]] ; then
+   local langs
+   for lang in $(cat po/LINGUAS)
+   do
+   has $lang $LINGUAS && langs+="$lang "
+   done
+   echo "$langs" > po/LINGUAS || die
+   fi
+}
+
+src_configure() {
+   filter-flags -ftracer -fomit-frame-pointer
+   if [[ $(gcc-major-version) -eq 3 ]] ; then
+   filter-flags -fstack-protector
+   append-flags -fno-stack-protector
+   fi
+
+   # Work around eclass
+   append-flags -UNDEBUG
+
+   if use dedicated || use server ; then
+   mycmakeargs=(
+   -DENABLE_CAMPAIGN_SERVER="ON"
+   -DENABLE_SERVER="ON"
+   -DSERVER_UID="${PN}"
+   -DSERVER_GID="${PN}"
+   -DFIFO_DIR="/run/wesnothd"
+   )
+   else
+   mycmakeargs=(
+   -DENABLE_CAMPAIGN_SERVER="OFF"
+   -DENABLE_SERVER="OFF"
+   )
+   fi
+   mycmakeargs+=(
+   -Wno-dev
+   -DENABLE_GAME="$(usex !dedicated)"
+   -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+

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

2018-05-31 Thread Lars Wendler

commit: 4e4ea8746ff0c79b77dc4326dcd67db3db7eed64
Author: Matija Skala  gmx  com>
AuthorDate: Thu May 17 06:02:28 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu May 31 11:15:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e4ea874

games-strategy/wesnoth: new wesnothd.rc file for 1.14

Bug: https://bugs.gentoo.org/654440
Closes: https://github.com/gentoo/gentoo/pull/8440

 games-strategy/wesnoth/files/wesnothd.rc-r1| 23 ++
 ...noth-1.14.1.ebuild => wesnoth-1.14.1-r1.ebuild} |  4 ++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/games-strategy/wesnoth/files/wesnothd.rc-r1 
b/games-strategy/wesnoth/files/wesnothd.rc-r1
new file mode 100644
index 000..c1a0d9d2016
--- /dev/null
+++ b/games-strategy/wesnoth/files/wesnothd.rc-r1
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+   use net
+}
+
+start() {
+   checkpath -q -d -m 0750 -o wesnoth:wesnoth /run/wesnothd
+   ebegin "Starting wesnothd"
+   start-stop-daemon --start --quiet -b -m \
+   --pidfile /run/wesnothd/wesnothd.pid \
+   -c wesnoth:wesnoth \
+   --exec /usr/bin/wesnothd
+   eend $?
+}
+
+stop() {
+   ebegin "Stopping wesnothd"
+   start-stop-daemon --stop --quiet --pidfile /run/wesnothd/wesnothd.pid
+   eend $?
+}

diff --git a/games-strategy/wesnoth/wesnoth-1.14.1.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.1-r1.ebuild
similarity index 96%
rename from games-strategy/wesnoth/wesnoth-1.14.1.ebuild
rename to games-strategy/wesnoth/wesnoth-1.14.1-r1.ebuild
index 7372ade39d6..5a1f6c5af2e 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.1.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.1-r1.ebuild
@@ -108,7 +108,7 @@ src_configure() {
 src_install() {
DOCS="README.md changelog.md players_changelog.md" 
cmake-utils_src_install
if use dedicated || use server; then
-   keepdir "/run/wesnothd"
-   newinitd "${FILESDIR}"/wesnothd.rc wesnothd
+   rmdir "${ED%/}/run/wesnothd" || die
+   newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
fi
 }

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

2018-05-18 Thread Aaron Bauman

commit: cabe6450ad66417b8813454cd66f978e9a32b92d
Author: Stefan Strogin  gmail  com>
AuthorDate: Wed May 16 14:19:49 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Fri May 18 12:31:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cabe6450

games-strategy/wesnoth libressl support

Closes: https://bugs.gentoo.org/655864
Closes: https://github.com/gentoo/gentoo/pull/8430

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

diff --git a/games-strategy/wesnoth/wesnoth-1.14.1.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.1.ebuild
index d66a51cc028..7372ade39d6 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.1.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.1.ebuild
@@ -12,14 +12,15 @@ 
SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="dbus dedicated doc fribidi nls openmp server"
+IUSE="dbus dedicated doc fribidi libressl nls openmp server"
 
 RDEPEND="
>=dev-libs/boost-1.50:=[nls,threads,icu]
>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
!dedicated? (
dev-libs/glib:2
-   dev-libs/openssl:0=
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
>=media-libs/fontconfig-2.4.1
>=media-libs/sdl2-image-2.0.0[jpeg,png]
>=media-libs/sdl2-mixer-2.0.0[vorbis]

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

2018-05-09 Thread Lars Wendler

commit: 28ccb4d81b4ce57fc0e5ad379b1817558c3e0eaa
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed May  9 15:26:36 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed May  9 15:26:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28ccb4d8

games-strategy/wesnoth: Bump to version 1.14.1

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 games-strategy/wesnoth/Manifest  |   1 +
 games-strategy/wesnoth/wesnoth-1.14.1.ebuild | 113 +++
 2 files changed, 114 insertions(+)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index ff57338edf1..64a3d351e79 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1 +1,2 @@
 DIST wesnoth-1.12.6.tar.bz2 387869758 BLAKE2B 
53328f8ebbaaabb266064fea57c0d28779183ba1b77ae8522c4dbb01c4a9ad9068d76307b48cec6576648132bf34f9a45efdb93ad36e03d035ed06e84711c9b6
 SHA512 
12ca3b5de8fd385b05cc8e76604f7aed68127a7542599d6e97cce793e10636e00bd65dcb088701e20ccc7191f41b1d67a00b291f885df880fac00d13d6fbde7a
+DIST wesnoth-1.14.1.tar.gz 481355736 BLAKE2B 
2cc41a36706919bbc505a9a6726ea9b0fbfd5bfde677da937fdde2645587f4407fb6ed2f7271efaf1763f9ab69a57d153130291d5dc0a79862e554963dd37079
 SHA512 
0372eb9479d3d24dc4bf692a83fe310d5b4493989f18f0a23070ee19a4bee2672efd38babe1579b08a321e3acba1ede5823376619c8a90102f968e53cc6e3f02

diff --git a/games-strategy/wesnoth/wesnoth-1.14.1.ebuild 
b/games-strategy/wesnoth/wesnoth-1.14.1.ebuild
new file mode 100644
index 000..d66a51cc028
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.14.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils user
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+   https://github.com/wesnoth/wesnoth;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="dbus dedicated doc fribidi nls openmp server"
+
+RDEPEND="
+   >=dev-libs/boost-1.50:=[nls,threads,icu]
+   >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+   !dedicated? (
+   dev-libs/glib:2
+   dev-libs/openssl:0=
+   >=media-libs/fontconfig-2.4.1
+   >=media-libs/sdl2-image-2.0.0[jpeg,png]
+   >=media-libs/sdl2-mixer-2.0.0[vorbis]
+   >=media-libs/sdl2-ttf-2.0.12
+   media-libs/libvorbis
+   >=x11-libs/pango-1.22.0
+   >=x11-libs/cairo-1.10.0
+   sys-libs/readline:0
+   dbus? ( sys-apps/dbus )
+   fribidi? ( dev-libs/fribidi )
+   )"
+DEPEND="${RDEPEND}
+   sys-devel/gettext
+   virtual/pkgconfig
+   x11-libs/libX11
+"
+
+pkg_setup() {
+   if use openmp; then
+   tc-has-openmp || die "Please switch to an openmp compatible 
compiler"
+   fi
+
+   enewgroup ${PN}
+   enewuser ${PN} -1 /bin/bash -1 ${PN}
+}
+
+src_prepare() {
+   cmake-utils_src_prepare
+
+   if ! use doc ; then
+   sed -i \
+   -e '/manual/d' \
+   doc/CMakeLists.txt || die
+   fi
+
+   # respect LINGUAS (bug #483316)
+   if [[ ${LINGUAS+set} ]] ; then
+   local langs
+   for lang in $(cat po/LINGUAS)
+   do
+   has $lang $LINGUAS && langs+="$lang "
+   done
+   echo "$langs" > po/LINGUAS || die
+   fi
+}
+
+src_configure() {
+   filter-flags -ftracer -fomit-frame-pointer
+   if [[ $(gcc-major-version) -eq 3 ]] ; then
+   filter-flags -fstack-protector
+   append-flags -fno-stack-protector
+   fi
+
+   # Work around eclass
+   append-flags -UNDEBUG
+
+   if use dedicated || use server ; then
+   mycmakeargs=(
+   -DENABLE_CAMPAIGN_SERVER="ON"
+   -DENABLE_SERVER="ON"
+   -DSERVER_UID="${PN}"
+   -DSERVER_GID="${PN}"
+   -DFIFO_DIR="/run/wesnothd"
+   )
+   else
+   mycmakeargs=(
+   -DENABLE_CAMPAIGN_SERVER="OFF"
+   -DENABLE_SERVER="OFF"
+   )
+   fi
+   mycmakeargs+=(
+   -Wno-dev
+   -DENABLE_GAME="$(usex !dedicated)"
+   -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+   -DENABLE_NLS="$(usex nls)"
+   -DENABLE_NOTIFICATIONS="$(usex dbus)"
+   -DENABLE_FRIBIDI="$(usex fribidi)"
+   -DENABLE_OMP="$(usex openmp)"
+   -DENABLE_STRICT_COMPILATION="OFF"
+   -DCMAKE_INSTALL_PREFIX="/usr"
+   )
+   cmake-utils_src_configure
+}
+
+src_install() {
+   DOCS="README.md

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

2017-12-20 Thread David Seifert

commit: 268ffa654bc273d43f891b936892f22f698280b7
Author: David Seifert  gentoo  org>
AuthorDate: Wed Dec 20 21:30:33 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Dec 21 01:56:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=268ffa65

games-strategy/wesnoth: Remove old

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 games-strategy/wesnoth/Manifest  |   1 -
 games-strategy/wesnoth/wesnoth-1.12.5.ebuild | 119 ---
 2 files changed, 120 deletions(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 7019003223b..ff57338edf1 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,2 +1 @@
-DIST wesnoth-1.12.5.tar.bz2 387726941 BLAKE2B 
205483c8d1ef9de27f57766a26da045ecfbd9d1aeb6b15d3caff22be50585cf9a283e711600dae35a277eec4d92685128f54e8552345fa896885a3e2594e5d97
 SHA512 
1a785c02389cd4bdc79b61f62c5bb98f01fde61c3923527195a5a8e8f8986349fcda3d40a4fb14248626ea8e79eba12b8232e39cce08bfea7fbdf3d9627d53b4
 DIST wesnoth-1.12.6.tar.bz2 387869758 BLAKE2B 
53328f8ebbaaabb266064fea57c0d28779183ba1b77ae8522c4dbb01c4a9ad9068d76307b48cec6576648132bf34f9a45efdb93ad36e03d035ed06e84711c9b6
 SHA512 
12ca3b5de8fd385b05cc8e76604f7aed68127a7542599d6e97cce793e10636e00bd65dcb088701e20ccc7191f41b1d67a00b291f885df880fac00d13d6fbde7a

diff --git a/games-strategy/wesnoth/wesnoth-1.12.5.ebuild 
b/games-strategy/wesnoth/wesnoth-1.12.5.ebuild
deleted file mode 100644
index 3c5d8cf3cf0..000
--- a/games-strategy/wesnoth/wesnoth-1.12.5.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils eutils multilib toolchain-funcs flag-o-matic games
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org/;
-SRC_URI="mirror://sourceforge/wesnoth/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dbus dedicated doc fribidi nls server"
-
-RDEPEND=">=media-libs/libsdl-1.2.7:0[joystick,video,X]
-   media-libs/sdl-net
-   !dedicated? (
-   >=media-libs/sdl-ttf-2.0.8
-   >=media-libs/sdl-mixer-1.2[vorbis]
-   >=media-libs/sdl-image-1.2[jpeg,png]
-   fribidi? ( dev-libs/fribidi )
-   dbus? ( sys-apps/dbus )
-   sys-libs/zlib
-   x11-libs/pango
-   dev-lang/lua:0
-   media-libs/fontconfig
-   )
-   >=dev-libs/boost-1.48:=[nls,threads]
-   virtual/libintl"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   sys-devel/gettext"
-
-src_prepare() {
-   cmake-utils_src_prepare
-
-   if use dedicated || use server ; then
-   sed \
-   -e "s:GAMES_BINDIR:${GAMES_BINDIR}:" \
-   -e "s:GAMES_STATEDIR:${GAMES_STATEDIR}:" \
-   -e "s/GAMES_USER_DED/${GAMES_USER_DED}/" \
-   -e "s/GAMES_GROUP/${GAMES_GROUP}/" 
"${FILESDIR}"/wesnothd.rc \
-   > "${T}"/wesnothd || die
-   fi
-   if ! use doc ; then
-   sed -i \
-   -e '/manual/d' \
-   doc/CMakeLists.txt || die
-   fi
-   # bug #472994
-   mv icons/wesnoth-icon-Mac.png icons/wesnoth-icon.png || die
-   mv icons/map-editor-icon-Mac.png icons/wesnoth_editor-icon.png || die
-
-   # respect LINGUAS (bug #483316)
-   if [[ ${LINGUAS+set} ]] ; then
-   local langs
-   for lang in $(cat po/LINGUAS)
-   do
-   has $lang $LINGUAS && langs+="$lang "
-   done
-   echo "$langs" > po/LINGUAS || die
-   fi
-}
-
-src_configure() {
-   filter-flags -ftracer -fomit-frame-pointer
-   if [[ $(gcc-major-version) -eq 3 ]] ; then
-   filter-flags -fstack-protector
-   append-flags -fno-stack-protector
-   fi
-   # Work around eclass
-   append-flags -UNDEBUG
-   if use dedicated || use server ; then
-   mycmakeargs=(
-   "-DENABLE_CAMPAIGN_SERVER=TRUE"
-   "-DENABLE_SERVER=TRUE"
-   "-DSERVER_UID=${GAMES_USER_DED}"
-   "-DSERVER_GID=${GAMES_GROUP}"
-   "-DFIFO_DIR=${GAMES_STATEDIR}/run/wesnothd"
-   )
-   else
-   mycmakeargs=(
-   $(cmake-utils_use_enable fribidi FRIBIDI)
-   "-DENABLE_CAMPAIGN_SERVER=FALSE"
-   "-DENABLE_SERVER=FALSE"
-   )
-   fi
-   mycmakeargs+=(
-   $(cmake-utils_use_enable !dedicated GAME)
-   $(cmake-utils_use_enable !dedicated ENABLE_DESKTOP_ENTRY)
-   $(cmake-utils_use_enable nls NLS)
-

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

2017-10-15 Thread David Seifert

commit: cea350a91059dbbbccb3831e6012052669233544
Author: David Seifert  gentoo  org>
AuthorDate: Mon Oct 16 00:00:36 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Oct 16 00:08:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cea350a9

games-strategy/wesnoth: [QA] Add cmake-utils_src_prepare

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 games-strategy/wesnoth/wesnoth-1.12.5.ebuild | 4 +++-
 games-strategy/wesnoth/wesnoth-1.12.6.ebuild | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/games-strategy/wesnoth/wesnoth-1.12.5.ebuild 
b/games-strategy/wesnoth/wesnoth-1.12.5.ebuild
index 5fdf8efcd60..e2434dbe0a4 100644
--- a/games-strategy/wesnoth/wesnoth-1.12.5.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.12.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -33,6 +33,8 @@ DEPEND="${RDEPEND}
sys-devel/gettext"
 
 src_prepare() {
+   cmake-utils_src_prepare
+
if use dedicated || use server ; then
sed \
-e "s:GAMES_BINDIR:${GAMES_BINDIR}:" \

diff --git a/games-strategy/wesnoth/wesnoth-1.12.6.ebuild 
b/games-strategy/wesnoth/wesnoth-1.12.6.ebuild
index 140ffac1776..e2434dbe0a4 100644
--- a/games-strategy/wesnoth/wesnoth-1.12.6.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.12.6.ebuild
@@ -33,6 +33,8 @@ DEPEND="${RDEPEND}
sys-devel/gettext"
 
 src_prepare() {
+   cmake-utils_src_prepare
+
if use dedicated || use server ; then
sed \
-e "s:GAMES_BINDIR:${GAMES_BINDIR}:" \

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

2017-01-04 Thread Agostino Sarubbo

commit: 75e82814391c6f142c3950f3d60ab82486f9f85e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jan  4 15:28:59 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jan  4 15:29:52 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75e82814

games-strategy/wesnoth: x86 stable wrt bug #586232

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

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

diff --git a/games-strategy/wesnoth/wesnoth-1.12.6.ebuild 
b/games-strategy/wesnoth/wesnoth-1.12.6.ebuild
index 69b9bbd..d194abf 100644
--- a/games-strategy/wesnoth/wesnoth-1.12.6.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.12.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
 # $Id$
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/wesnoth/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="dbus dedicated doc fribidi nls server"
 
 RDEPEND=">=media-libs/libsdl-1.2.7:0[joystick,video,X]

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

2016-09-26 Thread Agostino Sarubbo

commit: f405974f78aacb3e969eed623743612f9702e169
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Sep 26 12:34:50 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Sep 26 12:35:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f405974f

games-strategy/wesnoth: amd64 stable wrt bug #586232

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

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

diff --git a/games-strategy/wesnoth/wesnoth-1.12.6.ebuild 
b/games-strategy/wesnoth/wesnoth-1.12.6.ebuild
index 7a71ad6..69b9bbd 100644
--- a/games-strategy/wesnoth/wesnoth-1.12.6.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.12.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/wesnoth/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="dbus dedicated doc fribidi nls server"
 
 RDEPEND=">=media-libs/libsdl-1.2.7:0[joystick,video,X]

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

2016-05-17 Thread Michael Sterrett

commit: 49bbbd5f445c6e1174b79b071abd989b77e15e91
Author: Michael Sterrett  gentoo  org>
AuthorDate: Wed May 18 03:37:36 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Wed May 18 03:37:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49bbbd5f

games-strategy/wesnoth: version bump

Package-Manager: portage-2.2.28

 games-strategy/wesnoth/Manifest  |   1 +
 games-strategy/wesnoth/wesnoth-1.12.6.ebuild | 118 +++
 2 files changed, 119 insertions(+)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 2c2c5b3..21296af 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1 +1,2 @@
 DIST wesnoth-1.12.5.tar.bz2 387726941 SHA256 
599aad40da4b271c5138ac5a4391d9ff9c367ee51f5c30ca138f6baf92aea81d SHA512 
1a785c02389cd4bdc79b61f62c5bb98f01fde61c3923527195a5a8e8f8986349fcda3d40a4fb14248626ea8e79eba12b8232e39cce08bfea7fbdf3d9627d53b4
 WHIRLPOOL 
7afbbf28de36ce3a55a177bc5b6de7f635c4e18de5934378fce6ea6a1da7ab95c55ff6c35b4a3166927efc17138fb18ef600e08969b29001455e21a260c8f6b6
+DIST wesnoth-1.12.6.tar.bz2 387869758 SHA256 
a50f384cead15f68f31cfa1a311e76a12098428702cb674d3521eb169eb92e4e SHA512 
12ca3b5de8fd385b05cc8e76604f7aed68127a7542599d6e97cce793e10636e00bd65dcb088701e20ccc7191f41b1d67a00b291f885df880fac00d13d6fbde7a
 WHIRLPOOL 
a1ca73e86ab66cb263e288f12d005210b1b9275012a9de470f1d60a1fa8b80d81d834c9bb9002920b8a6c94b13a413f451a5703d377bd8fbadfe455a41967221

diff --git a/games-strategy/wesnoth/wesnoth-1.12.6.ebuild 
b/games-strategy/wesnoth/wesnoth-1.12.6.ebuild
new file mode 100644
index 000..7a71ad6
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.12.6.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils eutils multilib toolchain-funcs flag-o-matic games
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org/;
+SRC_URI="mirror://sourceforge/wesnoth/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="dbus dedicated doc fribidi nls server"
+
+RDEPEND=">=media-libs/libsdl-1.2.7:0[joystick,video,X]
+   media-libs/sdl-net
+   !dedicated? (
+   >=media-libs/sdl-ttf-2.0.8
+   >=media-libs/sdl-mixer-1.2[vorbis]
+   >=media-libs/sdl-image-1.2[jpeg,png]
+   fribidi? ( dev-libs/fribidi )
+   dbus? ( sys-apps/dbus )
+   sys-libs/zlib
+   x11-libs/pango
+   dev-lang/lua:0
+   media-libs/fontconfig
+   )
+   >=dev-libs/boost-1.48:=[nls,threads]
+   virtual/libintl"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   sys-devel/gettext"
+
+src_prepare() {
+   if use dedicated || use server ; then
+   sed \
+   -e "s:GAMES_BINDIR:${GAMES_BINDIR}:" \
+   -e "s:GAMES_STATEDIR:${GAMES_STATEDIR}:" \
+   -e "s/GAMES_USER_DED/${GAMES_USER_DED}/" \
+   -e "s/GAMES_GROUP/${GAMES_GROUP}/" 
"${FILESDIR}"/wesnothd.rc \
+   > "${T}"/wesnothd || die
+   fi
+   if ! use doc ; then
+   sed -i \
+   -e '/manual/d' \
+   doc/CMakeLists.txt || die
+   fi
+   # bug #472994
+   mv icons/wesnoth-icon-Mac.png icons/wesnoth-icon.png || die
+   mv icons/map-editor-icon-Mac.png icons/wesnoth_editor-icon.png || die
+
+   # respect LINGUAS (bug #483316)
+   if [[ ${LINGUAS+set} ]] ; then
+   local langs
+   for lang in $(cat po/LINGUAS)
+   do
+   has $lang $LINGUAS && langs+="$lang "
+   done
+   echo "$langs" > po/LINGUAS || die
+   fi
+}
+
+src_configure() {
+   filter-flags -ftracer -fomit-frame-pointer
+   if [[ $(gcc-major-version) -eq 3 ]] ; then
+   filter-flags -fstack-protector
+   append-flags -fno-stack-protector
+   fi
+   # Work around eclass
+   append-flags -UNDEBUG
+   if use dedicated || use server ; then
+   mycmakeargs=(
+   "-DENABLE_CAMPAIGN_SERVER=TRUE"
+   "-DENABLE_SERVER=TRUE"
+   "-DSERVER_UID=${GAMES_USER_DED}"
+   "-DSERVER_GID=${GAMES_GROUP}"
+   "-DFIFO_DIR=${GAMES_STATEDIR}/run/wesnothd"
+   )
+   else
+   mycmakeargs=(
+   $(cmake-utils_use_enable fribidi FRIBIDI)
+   "-DENABLE_CAMPAIGN_SERVER=FALSE"
+   "-DENABLE_SERVER=FALSE"
+   )
+   fi
+   mycmakeargs+=(
+   $(cmake-utils_use_enable !dedicated GAME)
+   $(cmake-utils_use_enable !dedicated

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

2015-12-28 Thread Michael Sterrett

commit: 24cfdd5230eeaf7413f8028a7a8dd2393d55aa59
Author: Michael Sterrett  gentoo  org>
AuthorDate: Tue Dec 29 03:58:16 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Tue Dec 29 07:40:40 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24cfdd52

old

Package-Manager: portage-2.2.24

 games-strategy/wesnoth/Manifest  |   1 -
 games-strategy/wesnoth/wesnoth-1.12.4.ebuild | 118 ---
 2 files changed, 119 deletions(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 03d4eb7..2c2c5b3 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,2 +1 @@
-DIST wesnoth-1.12.4.tar.bz2 392278313 SHA256 
bf525060da4201f1e62f861ed021f13175766e074a8a490b995052453df51ea7 SHA512 
d8ea6d8c14b69318f4458d7e6dcace28979230ea13b76d07635ae9be7f2c675d4aa9822ff376a9617fe9fc1560999afdcf3165319842a5c2f0a4f87a31c170e9
 WHIRLPOOL 
d4767d809f6085ef979c02928482b4bb16d3a1bdf34246bdb8b9eae0c8a7650f9d7160a851318c24b969fef777064ab7fda7c7687aab09c49a52f08327f4af0f
 DIST wesnoth-1.12.5.tar.bz2 387726941 SHA256 
599aad40da4b271c5138ac5a4391d9ff9c367ee51f5c30ca138f6baf92aea81d SHA512 
1a785c02389cd4bdc79b61f62c5bb98f01fde61c3923527195a5a8e8f8986349fcda3d40a4fb14248626ea8e79eba12b8232e39cce08bfea7fbdf3d9627d53b4
 WHIRLPOOL 
7afbbf28de36ce3a55a177bc5b6de7f635c4e18de5934378fce6ea6a1da7ab95c55ff6c35b4a3166927efc17138fb18ef600e08969b29001455e21a260c8f6b6

diff --git a/games-strategy/wesnoth/wesnoth-1.12.4.ebuild 
b/games-strategy/wesnoth/wesnoth-1.12.4.ebuild
deleted file mode 100644
index 59bb840..000
--- a/games-strategy/wesnoth/wesnoth-1.12.4.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils eutils multilib toolchain-funcs flag-o-matic games
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org/;
-SRC_URI="mirror://sourceforge/wesnoth/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
-IUSE="dbus dedicated doc fribidi nls server"
-
-RDEPEND=">=media-libs/libsdl-1.2.7:0[joystick,video,X]
-   media-libs/sdl-net
-   !dedicated? (
-   >=media-libs/sdl-ttf-2.0.8
-   >=media-libs/sdl-mixer-1.2[vorbis]
-   >=media-libs/sdl-image-1.2[jpeg,png]
-   fribidi? ( dev-libs/fribidi )
-   dbus? ( sys-apps/dbus )
-   sys-libs/zlib
-   x11-libs/pango
-   dev-lang/lua:0
-   media-libs/fontconfig
-   )
-   >=dev-libs/boost-1.48:=[nls,threads]
-   virtual/libintl"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   sys-devel/gettext"
-
-src_prepare() {
-   if use dedicated || use server ; then
-   sed \
-   -e "s:GAMES_BINDIR:${GAMES_BINDIR}:" \
-   -e "s:GAMES_STATEDIR:${GAMES_STATEDIR}:" \
-   -e "s/GAMES_USER_DED/${GAMES_USER_DED}/" \
-   -e "s/GAMES_GROUP/${GAMES_GROUP}/" 
"${FILESDIR}"/wesnothd.rc \
-   > "${T}"/wesnothd || die
-   fi
-   if ! use doc ; then
-   sed -i \
-   -e '/manual/d' \
-   doc/CMakeLists.txt || die
-   fi
-   # bug #472994
-   mv icons/wesnoth-icon-Mac.png icons/wesnoth-icon.png || die
-   mv icons/map-editor-icon-Mac.png icons/wesnoth_editor-icon.png || die
-
-   # respect LINGUAS (bug #483316)
-   if [[ ${LINGUAS+set} ]] ; then
-   local langs
-   for lang in $(cat po/LINGUAS)
-   do
-   has $lang $LINGUAS && langs+="$lang "
-   done
-   echo "$langs" > po/LINGUAS || die
-   fi
-}
-
-src_configure() {
-   filter-flags -ftracer -fomit-frame-pointer
-   if [[ $(gcc-major-version) -eq 3 ]] ; then
-   filter-flags -fstack-protector
-   append-flags -fno-stack-protector
-   fi
-   # Work around eclass
-   append-flags -UNDEBUG
-   if use dedicated || use server ; then
-   mycmakeargs=(
-   "-DENABLE_CAMPAIGN_SERVER=TRUE"
-   "-DENABLE_SERVER=TRUE"
-   "-DSERVER_UID=${GAMES_USER_DED}"
-   "-DSERVER_GID=${GAMES_GROUP}"
-   "-DFIFO_DIR=${GAMES_STATEDIR}/run/wesnothd"
-   )
-   else
-   mycmakeargs=(
-   $(cmake-utils_use_enable fribidi FRIBIDI)
-   "-DENABLE_CAMPAIGN_SERVER=FALSE"
-   "-DENABLE_SERVER=FALSE"
-   )
-   fi
-   mycmakeargs+=(
-   $(cmake-utils_use_enable !dedicated GAME)
-   $(cmake-utils_use_enable !dedicated ENABLE_DESKTOP_ENTRY)
-

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

2015-12-25 Thread Agostino Sarubbo

commit: 1382d597af361a261375c7d22f695fd6c4f9549c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Dec 25 16:19:42 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Dec 25 16:19:42 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1382d597

games-strategy/wesnoth: x86 stable wrt bug #567670

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

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

diff --git a/games-strategy/wesnoth/wesnoth-1.12.5.ebuild 
b/games-strategy/wesnoth/wesnoth-1.12.5.ebuild
index 9727e0f..59bb840 100644
--- a/games-strategy/wesnoth/wesnoth-1.12.5.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.12.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/wesnoth/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="dbus dedicated doc fribidi nls server"
 
 RDEPEND=">=media-libs/libsdl-1.2.7:0[joystick,video,X]

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

2015-12-07 Thread Agostino Sarubbo

commit: 0600b7e4f82bf201d1bdf2cc96fe080a0129234f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Dec  7 10:01:52 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Dec  7 10:01:52 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0600b7e4

games-strategy/wesnoth: amd64 stable wrt bug #567670

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

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

diff --git a/games-strategy/wesnoth/wesnoth-1.12.5.ebuild 
b/games-strategy/wesnoth/wesnoth-1.12.5.ebuild
index 080e59e..9727e0f 100644
--- a/games-strategy/wesnoth/wesnoth-1.12.5.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.12.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/wesnoth/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="dbus dedicated doc fribidi nls server"
 
 RDEPEND=">=media-libs/libsdl-1.2.7:0[joystick,video,X]

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

2015-11-22 Thread Michael Sterrett

commit: 34ef15c8547dfc5f69561c24ab1183551dec2052
Author: Michael Sterrett  gentoo  org>
AuthorDate: Sun Nov 22 14:16:05 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Sun Nov 22 14:16:22 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34ef15c8

clean old

Package-Manager: portage-2.2.20.1

 games-strategy/wesnoth/Manifest  |   1 -
 games-strategy/wesnoth/wesnoth-1.12.2.ebuild | 118 ---
 2 files changed, 119 deletions(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 6ba2e28..03d4eb7 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,3 +1,2 @@
-DIST wesnoth-1.12.2.tar.bz2 392234446 SHA256 
1f4f76e5fd0ce175a3eb7b9855aff7a58dc75899c534d7653d97ac9fd4fe798b SHA512 
023df596da0cbcc53d44a91a56635c9f31cfc2f3f4315c4029b44084c07ba838d22a10e378f14fab0c27dd1befe6e1a4d9e2c92ef47890748a30d36c9355c590
 WHIRLPOOL 
cd65d622afad67d96acb3df33841740f2db25e8850addfc979a4b63b79b959699810be9ffc0df855453fc92e385ac27f52db4db6222d66ef2b94c9ed0a6aa911
 DIST wesnoth-1.12.4.tar.bz2 392278313 SHA256 
bf525060da4201f1e62f861ed021f13175766e074a8a490b995052453df51ea7 SHA512 
d8ea6d8c14b69318f4458d7e6dcace28979230ea13b76d07635ae9be7f2c675d4aa9822ff376a9617fe9fc1560999afdcf3165319842a5c2f0a4f87a31c170e9
 WHIRLPOOL 
d4767d809f6085ef979c02928482b4bb16d3a1bdf34246bdb8b9eae0c8a7650f9d7160a851318c24b969fef777064ab7fda7c7687aab09c49a52f08327f4af0f
 DIST wesnoth-1.12.5.tar.bz2 387726941 SHA256 
599aad40da4b271c5138ac5a4391d9ff9c367ee51f5c30ca138f6baf92aea81d SHA512 
1a785c02389cd4bdc79b61f62c5bb98f01fde61c3923527195a5a8e8f8986349fcda3d40a4fb14248626ea8e79eba12b8232e39cce08bfea7fbdf3d9627d53b4
 WHIRLPOOL 
7afbbf28de36ce3a55a177bc5b6de7f635c4e18de5934378fce6ea6a1da7ab95c55ff6c35b4a3166927efc17138fb18ef600e08969b29001455e21a260c8f6b6

diff --git a/games-strategy/wesnoth/wesnoth-1.12.2.ebuild 
b/games-strategy/wesnoth/wesnoth-1.12.2.ebuild
deleted file mode 100644
index 1c325fd..000
--- a/games-strategy/wesnoth/wesnoth-1.12.2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils eutils multilib toolchain-funcs flag-o-matic games
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org/;
-SRC_URI="mirror://sourceforge/wesnoth/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
-IUSE="dbus dedicated doc fribidi nls server"
-
-RDEPEND=">=media-libs/libsdl-1.2.7:0[joystick,video,X]
-   media-libs/sdl-net
-   !dedicated? (
-   >=media-libs/sdl-ttf-2.0.8
-   >=media-libs/sdl-mixer-1.2[vorbis]
-   >=media-libs/sdl-image-1.2[jpeg,png]
-   fribidi? ( dev-libs/fribidi )
-   dbus? ( sys-apps/dbus )
-   sys-libs/zlib
-   x11-libs/pango
-   dev-lang/lua:0
-   media-libs/fontconfig
-   )
-   >=dev-libs/boost-1.48[nls,threads]
-   virtual/libintl"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   sys-devel/gettext"
-
-src_prepare() {
-   if use dedicated || use server ; then
-   sed \
-   -e "s:GAMES_BINDIR:${GAMES_BINDIR}:" \
-   -e "s:GAMES_STATEDIR:${GAMES_STATEDIR}:" \
-   -e "s/GAMES_USER_DED/${GAMES_USER_DED}/" \
-   -e "s/GAMES_GROUP/${GAMES_GROUP}/" 
"${FILESDIR}"/wesnothd.rc \
-   > "${T}"/wesnothd || die
-   fi
-   if ! use doc ; then
-   sed -i \
-   -e '/manual/d' \
-   doc/CMakeLists.txt || die
-   fi
-   # bug #472994
-   mv icons/wesnoth-icon-Mac.png icons/wesnoth-icon.png || die
-   mv icons/map-editor-icon-Mac.png icons/wesnoth_editor-icon.png || die
-
-   # respect LINGUAS (bug #483316)
-   if [[ ${LINGUAS+set} ]] ; then
-   local langs
-   for lang in $(cat po/LINGUAS)
-   do
-   has $lang $LINGUAS && langs+="$lang "
-   done
-   echo "$langs" > po/LINGUAS || die
-   fi
-}
-
-src_configure() {
-   filter-flags -ftracer -fomit-frame-pointer
-   if [[ $(gcc-major-version) -eq 3 ]] ; then
-   filter-flags -fstack-protector
-   append-flags -fno-stack-protector
-   fi
-   # Work around eclass
-   append-flags -UNDEBUG
-   if use dedicated || use server ; then
-   mycmakeargs=(
-   "-DENABLE_CAMPAIGN_SERVER=TRUE"
-   "-DENABLE_SERVER=TRUE"
-   "-DSERVER_UID=${GAMES_USER_DED}"
-   "-DSERVER_GID=${GAMES_GROUP}"
-   "-DFIFO_DIR=${GAMES_STATEDIR}/run/wesnothd"
-   )
-   else
-

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

2015-11-06 Thread Michael Sterrett

commit: 93b35f2226efc206258bb9513d3444e77515738a
Author: Michael Sterrett  gentoo  org>
AuthorDate: Fri Nov  6 09:13:22 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Fri Nov  6 09:13:22 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93b35f22

version bump

Package-Manager: portage-2.2.20.1

 games-strategy/wesnoth/Manifest  |   1 +
 games-strategy/wesnoth/wesnoth-1.12.5.ebuild | 118 +++
 2 files changed, 119 insertions(+)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 17a83aa..6ba2e28 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,2 +1,3 @@
 DIST wesnoth-1.12.2.tar.bz2 392234446 SHA256 
1f4f76e5fd0ce175a3eb7b9855aff7a58dc75899c534d7653d97ac9fd4fe798b SHA512 
023df596da0cbcc53d44a91a56635c9f31cfc2f3f4315c4029b44084c07ba838d22a10e378f14fab0c27dd1befe6e1a4d9e2c92ef47890748a30d36c9355c590
 WHIRLPOOL 
cd65d622afad67d96acb3df33841740f2db25e8850addfc979a4b63b79b959699810be9ffc0df855453fc92e385ac27f52db4db6222d66ef2b94c9ed0a6aa911
 DIST wesnoth-1.12.4.tar.bz2 392278313 SHA256 
bf525060da4201f1e62f861ed021f13175766e074a8a490b995052453df51ea7 SHA512 
d8ea6d8c14b69318f4458d7e6dcace28979230ea13b76d07635ae9be7f2c675d4aa9822ff376a9617fe9fc1560999afdcf3165319842a5c2f0a4f87a31c170e9
 WHIRLPOOL 
d4767d809f6085ef979c02928482b4bb16d3a1bdf34246bdb8b9eae0c8a7650f9d7160a851318c24b969fef777064ab7fda7c7687aab09c49a52f08327f4af0f
+DIST wesnoth-1.12.5.tar.bz2 387726941 SHA256 
599aad40da4b271c5138ac5a4391d9ff9c367ee51f5c30ca138f6baf92aea81d SHA512 
1a785c02389cd4bdc79b61f62c5bb98f01fde61c3923527195a5a8e8f8986349fcda3d40a4fb14248626ea8e79eba12b8232e39cce08bfea7fbdf3d9627d53b4
 WHIRLPOOL 
7afbbf28de36ce3a55a177bc5b6de7f635c4e18de5934378fce6ea6a1da7ab95c55ff6c35b4a3166927efc17138fb18ef600e08969b29001455e21a260c8f6b6

diff --git a/games-strategy/wesnoth/wesnoth-1.12.5.ebuild 
b/games-strategy/wesnoth/wesnoth-1.12.5.ebuild
new file mode 100644
index 000..080e59e
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.12.5.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils eutils multilib toolchain-funcs flag-o-matic games
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org/;
+SRC_URI="mirror://sourceforge/wesnoth/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="dbus dedicated doc fribidi nls server"
+
+RDEPEND=">=media-libs/libsdl-1.2.7:0[joystick,video,X]
+   media-libs/sdl-net
+   !dedicated? (
+   >=media-libs/sdl-ttf-2.0.8
+   >=media-libs/sdl-mixer-1.2[vorbis]
+   >=media-libs/sdl-image-1.2[jpeg,png]
+   fribidi? ( dev-libs/fribidi )
+   dbus? ( sys-apps/dbus )
+   sys-libs/zlib
+   x11-libs/pango
+   dev-lang/lua:0
+   media-libs/fontconfig
+   )
+   >=dev-libs/boost-1.48:=[nls,threads]
+   virtual/libintl"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   sys-devel/gettext"
+
+src_prepare() {
+   if use dedicated || use server ; then
+   sed \
+   -e "s:GAMES_BINDIR:${GAMES_BINDIR}:" \
+   -e "s:GAMES_STATEDIR:${GAMES_STATEDIR}:" \
+   -e "s/GAMES_USER_DED/${GAMES_USER_DED}/" \
+   -e "s/GAMES_GROUP/${GAMES_GROUP}/" 
"${FILESDIR}"/wesnothd.rc \
+   > "${T}"/wesnothd || die
+   fi
+   if ! use doc ; then
+   sed -i \
+   -e '/manual/d' \
+   doc/CMakeLists.txt || die
+   fi
+   # bug #472994
+   mv icons/wesnoth-icon-Mac.png icons/wesnoth-icon.png || die
+   mv icons/map-editor-icon-Mac.png icons/wesnoth_editor-icon.png || die
+
+   # respect LINGUAS (bug #483316)
+   if [[ ${LINGUAS+set} ]] ; then
+   local langs
+   for lang in $(cat po/LINGUAS)
+   do
+   has $lang $LINGUAS && langs+="$lang "
+   done
+   echo "$langs" > po/LINGUAS || die
+   fi
+}
+
+src_configure() {
+   filter-flags -ftracer -fomit-frame-pointer
+   if [[ $(gcc-major-version) -eq 3 ]] ; then
+   filter-flags -fstack-protector
+   append-flags -fno-stack-protector
+   fi
+   # Work around eclass
+   append-flags -UNDEBUG
+   if use dedicated || use server ; then
+   mycmakeargs=(
+   "-DENABLE_CAMPAIGN_SERVER=TRUE"
+   "-DENABLE_SERVER=TRUE"
+   "-DSERVER_UID=${GAMES_USER_DED}"
+   "-DSERVER_GID=${GAMES_GROUP}"
+   "-DFIFO_DIR=${GAMES_STATEDIR}/run/wesnothd"
+   )
+   else
+

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

2015-09-19 Thread Agostino Sarubbo

commit: 868b5dec85cd32c602eb2d07040e4715d37ffcd2
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Sep 19 18:39:22 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Sep 19 18:39:22 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=868b5dec

games-strategy/wesnoth: amd64 stable wrt bug #558872

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

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

diff --git a/games-strategy/wesnoth/wesnoth-1.12.4.ebuild 
b/games-strategy/wesnoth/wesnoth-1.12.4.ebuild
index 080e59e..9727e0f 100644
--- a/games-strategy/wesnoth/wesnoth-1.12.4.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.12.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/wesnoth/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="dbus dedicated doc fribidi nls server"
 
 RDEPEND=">=media-libs/libsdl-1.2.7:0[joystick,video,X]

92 matches

Mail list logo