gentoo resync : 06.08.2019

9 files changed, 23 insertions, 62 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 8d620bde08ba..a327e11a560e 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/outerspace/Manifest b/games-strategy/outerspace/Manifest
index feafc91522f6..6e874a997db0 100644
--- a/games-strategy/outerspace/Manifest
+++ b/games-strategy/outerspace/Manifest
@@ -2,5 +2,5 @@ AUX outerspace 169 BLAKE2B 432402aa2fa9b80c2a5d22f22e5858dd6d618145d37abe54736d7
 AUX outerspace-0.5.68-setup.patch 1652 BLAKE2B 60d940c6c6c8c95452288abc13873aceff6d8cd6dd1216a61ca02de5bd1e834365fd2bbc0d6dd38500b1e2b764ccd1d629831871b40d2d45c708460939d23120 SHA512 b3d7f604724e6990436808dc62214a55325278cc04006fbe8438a213e772615a46b2969f88b03364332154af3cf996c7bdce05cc40dd5d24938bf6b537f9884b
 DIST outerspace-0.5.68.tar.gz 2249703 BLAKE2B 16b8c2d6c4e0516867d9a07a2762112da39f9a1074dffad9a9a3c343dd75662cba74d50f2a028b530013f320ffd7481317d061a3ebb449e9acf2f41bf56312a3 SHA512 dc2cbebf16fefabcc3356efb496766b90a5eabbf218f085fdc83cf956ca9503e99ef3154e0905c2432a3bf7caabd1f2af585a43397ba368581cd66546fcddc6b
 DIST outerspace_0.5.68-0ubuntu1_all.deb 2634188 BLAKE2B fd1667ae130e9a0ed603c369e9751d0b83414f20dd06c2f7e9941e2c465bdad0ff050ca41a928906bc5cc755eb05c0a5dfa18a8c35c868650c3fec6cf2e4f1f8 SHA512 9520cf1207a59497d6253b42bc34d580f9b805cf4ae55a5c921082e965892aa67921c4624ea94a5145c911dc2b24a1cca2806c06770ef8d1ded10855fb42666c
-EBUILD outerspace-0.5.68-r1.ebuild 1607 BLAKE2B 0f40261cf16d047c90c3bc49591b5e510c282eb2267e591ad027f80a537f33bc1f579bac8c2f179a230b7d9d2bcecdb31ccc9873f0c40b705b21d988a3a78666 SHA512 778a9c0879b0c03ff527f6918f0e8bf8ebaec479aa02d5a43fe791e6c73d8daa912dc37cd19f35d2e36191b7fb2f5155fcdbc03a432dd5b8969d92f177247ae7
+EBUILD outerspace-0.5.68-r1.ebuild 1603 BLAKE2B be05cbb59ec93992e875d9ef8d685dfb7b51f5d00634a8503fd57a81593a16f4aa5a1d53fc3d10affda9abfbbca1eff4846c0c059f72224965ecb2a57364b2c4 SHA512 d3b95c85a666a5c99345e0ea56130dc2eb784b84fd6da717d0faf2a881630a4ef0bbf126d5fd69e5ed9badd0a04ba96330d1f1e1f6a6571e1d2420bf14af9383
 MISC metadata.xml 831 BLAKE2B 2eb39d75eca89288ab8dcb4ff274891d62e4c9a9540ceb2a2f887e2743c28c4d04b8692a093e24c0226b88d2dbe938b268ef17de4974e5c127422ed387bac6a7 SHA512 d607343f2cc56162b694e28523cf256339a306b03bcca9c0148c59700491249a9acc6cfc193467cbdd04d8ea9bb564816747276143b3e4e1bf3dc7deab480d1e
diff --git a/games-strategy/outerspace/outerspace-0.5.68-r1.ebuild b/games-strategy/outerspace/outerspace-0.5.68-r1.ebuild
index a7d5680c16a5..ca9da045166c 100644
--- a/games-strategy/outerspace/outerspace-0.5.68-r1.ebuild
+++ b/games-strategy/outerspace/outerspace-0.5.68-r1.ebuild
@@ -35,8 +35,8 @@ python_install() {
 
 	# source tarball is missing files
 	# get them from ubuntu.deb
-	insinto "$(python_get_sitedir)"/ige/ospace/Rules
-	doins "${WORKDIR}"/usr/share/games/outerspace/libsrvr/ige/ospace/Rules/{Tech,techs}.spf
+	python_moduleinto ige.ospace.Rules
+	python_domodule "${WORKDIR}"/usr/share/games/outerspace/libsrvr/ige/ospace/Rules/{Tech,techs}.spf
 }
 
 src_prepare() {
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index aa7e7485e0ba..6321b6051e1e 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -1,8 +1,7 @@
-AUX warzone2100-3.3.0_beta1-gettext_version.patch 1166 BLAKE2B f90e299a287698b1b4c84dd6aa44166a151e737843cac2099ba8051c02e2001a473dc21dc4c97aa1eb7908d13e48abdff59cfec0f4adf4814823dcc403e0a4c5 SHA512 70bdd3446913e982ac6592c243d2c8976103c893a79762993aa665a3e65b821f30c6e41d7e48eaeec2df8971ba6bfc412b0e72493bae979e493823907eab67d2
 DIST warzone2100-3.2.3-qt_compile_fix.patch 680 BLAKE2B 1073ea1619640455326c63dc55bf031579c8e9cb0b1b159e4fb1f9e8aa63bfcc6985e91cb2667149e7cc4b354bf96726fc6b8f8a8f519375e0a88c4be21dcb69 SHA512 766698c25c02b4254424efdafb8aa7b37360c3c05d3cd2d6c7f9127cbdd6a25840f98e8e3aadd5d6af494b4632584e564214c1f20c0bd74eb637da305552e067
 DIST warzone2100-3.2.3.tar.xz 81314060 BLAKE2B 231be8c24d1c0967adb0a76ac9e441c2ea9f835720df9951f74227988473d100b24bccbfe4b5882a36c63a798368ed1a1f871751b6b363d90a82fea48c44ba65 SHA512 4b1bc0a0bb50a8b4726a2762a922ee233b92f9835e38bbab80c159a9cb301df7434a73ba5acfb17404031467c02a9b3480d6a0d44906d70896311b3468141746
-DIST warzone2100-3.3.0_beta1.tar.xz 85916776 BLAKE2B ec94e6fafff103e014e063f554b6a40411577d9c415733eb7857c4cd470195f1ab9878c2d5afd6c154e1f058c2f2a645a46738518d307da42ae97e0898fdf75a SHA512 17e9d81e7eadc71ad285147ff76517a92e8ea8747a05a6a08373d994725efa6bae11f87cd6bc9068cbfd78aa24d26fea95929c65a0906d03605b96469d972f4a
+DIST warzone2100-3.3.0_src.tar.xz 86605304 BLAKE2B 70bad66966e31009de7f16a039525b2bc3e84a9991e7d95227f8789ceca7313a219044f41c0ceec0ce357e8368a30833d7dc1cc35e9575d9b56efa20b9e35c03 SHA512 876e36578472d9de4c00651af9b26a79bbbc85161d03c58e381aac90be710999b9091524425332e950ed42b79d872ace6848798829e7d3d7bb6ae7dae0003559
 DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db2f3db4b0289edadeb58059a21aba7038b95219dc44cb807754461d1a9bdca60f0d7698be68622b8bd64a55efa949622d3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6
 EBUILD warzone2100-3.2.3.ebuild 2609 BLAKE2B 05ae8aea178cb29c3776e5c0fcab5ba4442765ec76766689bc35f5cfc23c51bb7524f2dc6b12abdd07e77e87688f74fa13d8fbb705f7a76a7f3acea95b7151ea SHA512 9dcc1c4b6b095ee4ef895abf5b3a5a5d1c4d1e5c371baeced194a2592304aaf71b005a6ecdc0443d0b32f3cfb7998897f6c63d5cf909f5855f0127e91920294c
-EBUILD warzone2100-3.3.0_beta1.ebuild 2407 BLAKE2B e908251343eb1425062650e8cef112ac119ef1abc65e350d421cff8ba7fdb8883b6e0a3111923c0db458b270a570a7942ac2517be516d1c65eb764e0a9aac963 SHA512 700929dc28d77a9a86053fd8739015463f9c03c06cc5cc3a2c669c08709ec7e129d61def20e1accfa8540f70681e49abde7c1f7c2200aea39b6b8c28b2b1839f
+EBUILD warzone2100-3.3.0.ebuild 2346 BLAKE2B a45c71a3e0f6b6592513e37d66658db108420f69a6ebc0a47213d151d3713c85d377ecb21bd07461b8affaee604f11410db0fe09d6a36d3400d8ce6dae9a9538 SHA512 0ae2aed3202e84c34f35fe77b16cfc903ce9aad6333c7a2974fd5cd3df98606c465bf27091de177ea38bf3d27aba648019be954df681aa352869e870135292dc
 MISC metadata.xml 674 BLAKE2B b0c40e88934cfbdbcbb7ffdbc277abcc3da3400de71f7508af51301f7ec5b6e00083ff2b59f59f7435a8e3f588291d7e5dbde19fa193b6fc78677b842cfb44ee SHA512 00aa4a109f41a0469e2b0e5daadcd33f9f3b255fdd2a724b7d116912ecb0b5fa4eb5e0dd7e4ae3e45f00c062c1034aa7d40143e48da0e66bab48da3d4e047dcc
diff --git a/games-strategy/warzone2100/files/warzone2100-3.3.0_beta1-gettext_version.patch b/games-strategy/warzone2100/files/warzone2100-3.3.0_beta1-gettext_version.patch
deleted file mode 100644
index 2d4b6c50a485..000000000000
--- a/games-strategy/warzone2100/files/warzone2100-3.3.0_beta1-gettext_version.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 5539b080824bd4bcd0f212829012993ef193dc41 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Thu, 1 Aug 2019 04:53:14 +0200
-Subject: [PATCH] configure.ac: Raise AM_GNU_GETTEXT_VERSION to 0.17
-
-the shipped copy of po/Makefile.in.in comes from gettext-0.17 and since
-m4/po.m4 has been changed to use AC_PROG_MKDIR_P (Trac ticket #4701)
-autopoint from gettext would produce a broken po/Makefile.in.in which has
-no MKDIR_P definition. This again would result in "make install" throwing
-the following error when invoking install-data-yes target in /po/ dir:
-
-  make[1]: execvp: /usr/share: Permission denied
-
-Raising AM_GNU_GETTEXT_VERSION fixes the described issue.
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7e9c31433..30a732447 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -71,7 +71,7 @@ AC_CHECK_HEADERS(alloca.h sys/ucontext.h)
- 
- # Check for gettext
- AM_GNU_GETTEXT([external])
--AM_GNU_GETTEXT_VERSION([0.15])
-+AM_GNU_GETTEXT_VERSION([0.17])
- 
- # Check for pkg-config
- PKG_PROG_PKG_CONFIG
--- 
-2.22.0
-
diff --git a/games-strategy/warzone2100/warzone2100-3.3.0_beta1.ebuild b/games-strategy/warzone2100/warzone2100-3.3.0.ebuild
index d8ab1ae7bb7d..fe91974e0f39 100644
--- a/games-strategy/warzone2100/warzone2100-3.3.0_beta1.ebuild
+++ b/games-strategy/warzone2100/warzone2100-3.3.0.ebuild
@@ -4,17 +4,17 @@
 EAPI=7
 inherit autotools toolchain-funcs xdg
 
-MY_PV=$(ver_cut 1-2)
+MY_PV="$(ver_cut 1-2)"
 VIDEOS_PV=2.2
-VIDEOS_P=${PN}-videos-${VIDEOS_PV}.wz
+VIDEOS_P="${PN}-videos-${VIDEOS_PV}.wz"
 DESCRIPTION="3D real-time strategy game"
 HOMEPAGE="http://wz2100.net/"
-SRC_URI="mirror://sourceforge/warzone2100/${P}.tar.xz
+SRC_URI="mirror://sourceforge/warzone2100/${P}_src.tar.xz
 	videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/${VIDEOS_PV}/high-quality-en/sequences.wz -> ${VIDEOS_P} )"
 
 LICENSE="GPL-2+ CC-BY-SA-3.0 public-domain"
 SLOT="0"
-#[[ "${PV}" == *_beta* ]] || \
+[[ "${PV}" == *_beta* ]] || \
 KEYWORDS="~amd64 ~x86"
 # upstream requested debug support
 IUSE="debug nls videos"
@@ -64,10 +64,6 @@ BDEPEND="
 
 S="${WORKDIR}/${PN}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3.0_beta1-gettext_version.patch
-)
-
 src_prepare() {
 	default
 
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index d0f7b724a36c..6328ad8d970d 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,7 +1,7 @@
 AUX wesnoth-1.14.7-boost-1.70.patch 914 BLAKE2B a5e4a48eb7c5ee75fb23348a396f86b8ca754f7fec1b4f4eac42e31b5956cfb56c43d6b70cdf91d12b22ad70508d3142e3f94965ae432ada1dfa7fd4931e43bb SHA512 5c37986c12ece8b11301bbf69e3b7111bf50da91157c066f954f9bf7062fe064fa7ddc9e858fa3c1413bfeb13f29a4cce63a45676c662a3d7de9e4331b88701e
 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab
-DIST wesnoth-1.14.6.tar.gz 491891860 BLAKE2B e15512eefbb7b118ec80a5612c23edce41555fc2869b652d4799bc052f26592852a2b4d1cb76dee3203d8a26c18c4cf9de58dea1ee81403b9881642e902cf2f3 SHA512 f29b78605f5e3c2e9af8884925b43a262d6fce469bf30a4697e2c8bef8a49d0fea17bd6dc1a3e78113a50e6f21e29aedb5ee26ff2b0493371120f8c64b894096
 DIST wesnoth-1.14.7.tar.gz 493837595 BLAKE2B a80781d4f9ec79514c6431c5d45a6cdcb913aabc6329cefe46e7980805d06b60d479110bb6432f2c35a058e551da6b6fa8e0e4f6f1bdf9a159f6329ddb74aa2a SHA512 dbca2b904147f592cc712b11d6414a47bd557d3c677e6b3eacb4fc1ca5420a264f15fdbe45c8c3469ecfb5d1ffa1ac19cceb58c1378aec0e8b4597baa348ca3b
-EBUILD wesnoth-1.14.6.ebuild 2682 BLAKE2B 6d395a57de1c5244a68cef436135b15d0fbde4502437d688bc3acec6bfd2106dcdb1f89388975f7f34b44d48e7e2fb6f3d8570b14e44ad65bf9a55d12aaa6bb6 SHA512 e372ea2192d70c90c8000755580b64f5b127e6f27c765c42e2d8ef7ca7dc6becc6658404ed037d4c99581883a98dcb4a3fb23f24ce1da6d13b171fcffe0320de
-EBUILD wesnoth-1.14.7.ebuild 2731 BLAKE2B dbb292c86d40fe75acb4668ad1a4afa8794b338a59de45c7c44efc296ea9c7982d178f1e943629d9a4e14038ef19503a24b394956e25a6a079488fefafb4919f SHA512 104d6de80ffd977b0591999dc089e200242969ebbc15c373a4cde8d5209ace402969f174a928f8ac123ee9c2cfb5ecae426f19bb9e05760acf31dff5a9a5d0c4
+DIST wesnoth-1.15.1.tar.gz 499339559 BLAKE2B f382411ee01444b603edeaf1d64187716d0dce6a3fa99d18862818289b9f0e0a48bfe1dcd98cbad5cfe2099d1e51755a9bd9f3e847243a3cd193334a8589218c SHA512 abc76a1cd4b459ee28736d1160ba91d4c18b2ee1dbc68c2165f9c27b872e4c8b11246a85ece2c3aa7eeb1f0fc9d5817c56b2a211c0e49ad3952186bac433ecd2
+EBUILD wesnoth-1.14.7.ebuild 2829 BLAKE2B d3ee24ef0b04a246b5ff79fd54e8186f220c97789c81f18a2f901d7c89c5ea79622d121c0b79a9c787f341fcb9a88bea7d15bf0e0931d271d15acaea0527bc2c SHA512 2482c67554292f868c25f498ccd570bd3c8c1bc2722d99eb655b8c7fe6487bde535119795df934306cbcadd29d6de374de07ec0c3a27e45ebd72fbf0a633dcd4
+EBUILD wesnoth-1.15.1.ebuild 2648 BLAKE2B 4332f4ae7797f9db6b399291017c2f0dcb8bdf8eb6230e890cc2ae3ba3a43cc65824a66820a3973dec1f5e390e01c29f0bb1094801655623d3e1ca1fd777e2e5 SHA512 b6a50672a0e1854cfb5df8f51051c947a9ab28c446261303a1ceb1eb90396149c0dccfe372d776fac0eee1d9d9a6477b323ac53acf5bece1f7988d8264d77618
 MISC metadata.xml 485 BLAKE2B f9a78a24d1cd5ddc70fb2e8c6b9b0fa081409d99523cb9a14b890b36866576afa2ab33cb11986b364ee34aac3e4ea30f0908692ba99d56f32199860c5b65e707 SHA512 ccc12cec7aa66b59d11f65d4b8b6127c86eab2e998c31587f4323020231b55c6460d0c1fad04d7298ccdb2fe1bd9abc43e3b93716a379cbbc46f60f6bcd68ef3
diff --git a/games-strategy/wesnoth/wesnoth-1.14.7.ebuild b/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
index e0b1b37602ec..e4bfda3bc803 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.14.6.ebuild b/games-strategy/wesnoth/wesnoth-1.15.1.ebuild
index 971ba1f87a94..24ae216df067 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.6.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
@@ -11,8 +12,11 @@ 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"
+# 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="
 	>=dev-libs/boost-1.50:=[nls,threads,icu]
@@ -41,10 +45,6 @@ BDEPEND="
 "
 
 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}
 }
@@ -99,7 +99,6 @@ src_configure() {
 		-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"
 		)