gentoo resync : 18.08.2019

11 files changed, 34 insertions, 24 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 0ae50030b800..8d620bde08ba 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/dopewars/Manifest b/games-strategy/dopewars/Manifest
index c469820a201b..66ab1b46973d 100644
--- a/games-strategy/dopewars/Manifest
+++ b/games-strategy/dopewars/Manifest
@@ -1,4 +1,4 @@
 AUX dopewars-1.5.12-CVE-2009-3591.patch 696 BLAKE2B a627b4b714af717942f310411154a069b5ee9a9e98454f325e085354bf1d534528048404cf8c0f78150d5f6af9ca1f8e9aac2d95c90d864e3bea5de51546086d SHA512 3f9476db27f1de31363470688f8a5ec97fa51fda4eb6025da513a1ad1640e5faa802ee7202e0698970eb3bbcb0edadfd304d839f2a3643a64d50e7354c8a049e
 DIST dopewars-1.5.12.tar.gz 1419725 BLAKE2B 930a0406bbf36f874d3bb00c7883c7d47136022e0209ec3993302cd75979d9f80033c973e23d60c4db70a335bfd3b8ff99075af470cb382ded59fc9289ee0edc SHA512 cfabaf9326c847aed6210a852ace64c697df5845a66b3179b8dc8dea7b99a11e1f91358d4ee54929a56c70d5f3a76f9f7bb4079fdef765601f165b4cd06cba5a
-EBUILD dopewars-1.5.12-r3.ebuild 1403 BLAKE2B a213900d842e325726df7df70fc7f54b959c15fde83349bd342e9c6cedf441f168eaeb19b02e60cb4cd38729bdae8c7c8e8a2462558c125e98ca1a642e666cd1 SHA512 6892d2e0feb45c180e9430e2718571cfb01c2caa9274c9f1b7f8de1355f8745988aea987604770ec960c523d91141a8c0398beab66eba9f47d08f07c68ef4eb9
+EBUILD dopewars-1.5.12-r3.ebuild 1504 BLAKE2B f84e67f880840e61f606a344ee51702c3b658c14721dd7cdbf40d93fce7b4216e870d475991fc0f2dbeb655e7d5142d1ad499b3b308999e0dd59f4c267426fc7 SHA512 a8407811ef881a1ddd2f03f5f79d6cb7c86062a2d9a941ed7bb94d78479111fb811c7a4aa4c167a761e0aab6e9c6c7ed02cc754068776c5e8af969894fd01a5a
 MISC metadata.xml 331 BLAKE2B af8487e0de1082dcc36415bf1216b7fcfdf35a3caf93fe3e5a0f40de32978b442eac43dfc7283a82a5403e5abfc73ff2b48ee6fce3b489a6fbc88529c4db28ab SHA512 26259f05b18c933c638d693805a106d26288c96ba220a719d8ec12d65b28c9abdb1d120694d31c07194282081e92dd83522e936771ab71e2ce86ea12d629d5b4
diff --git a/games-strategy/dopewars/dopewars-1.5.12-r3.ebuild b/games-strategy/dopewars/dopewars-1.5.12-r3.ebuild
index 4d1c38437619..7da820832395 100644
--- a/games-strategy/dopewars/dopewars-1.5.12-r3.ebuild
+++ b/games-strategy/dopewars/dopewars-1.5.12-r3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit desktop
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Re-Write of the game Drug Wars"
 HOMEPAGE="http://dopewars.sourceforge.net/"
@@ -36,6 +37,8 @@ src_prepare() {
 		-e "/\/doc\// s:DPDATADIR:\"/usr/share\":" \
 		-e 's:index.html:html/index.html:' \
 		src/dopewars.c || die
+	sed -i -e "s/\-lncurses/$($(tc-getPKG_CONFIG) --libs ncurses)/g" \
+		configure || die
 }
 
 src_configure() {
diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index 9078a03c68fe..af53de9e725b 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -2,7 +2,7 @@ AUX freeorion-0.4.7.1-backport-sdl2-include-dir-fix.patch 1030 BLAKE2B d0b4a58e8
 AUX freeorion.envd 70 BLAKE2B a893f14754bfb7617f4a250dce8d64ea3de6c0ed3ad51fb62d46baf39ac3e4ead44a51e22e934d206eeef77b5bbdb2e4240178e856def0280ed38607647b4909 SHA512 ed9e2adf837cd381241dacf4da446a8ded1486c51a011eaf0cdf84b62831cd005f3e210b8f31847f9aba1d54ddd5f352fde6b33eefb215ab264ff53c3e3be74b
 DIST freeorion-0.4.7.1.tar.gz 105942075 BLAKE2B f75940ac79e329fd7e03e85b1cd712ff6dcf06583ad8feff43f8b2d6e28a53c9029724d1450d26d2367bafd1d04858e3659b8e47986df96657d91526f594eb5e SHA512 9c8d0437ee827a1104a541e1123ce6b5d229bd6253bfe275028805a4c34de882ca3a9d5361e3f64098f935d0926a656a64fe468690c8d195e05de86cd1b2699d
 DIST freeorion-0.4.8_p20190501.tar.gz 106506540 BLAKE2B 5442eeeaff486a5525b4282c7ef72001a935c4429fea89a720f94a033a2c29e56855605376efe22d13194ae3f49105fe26f37554d2c8d560bfb76dc69d738128 SHA512 d378c0e9b63118261bf5ac1c99190929ff0cd52b3a270e43fe2be80cc7993457bcc7b70083ff493a6b96b250e1988e40470bef410af5ce3d49644ccf934974d3
-EBUILD freeorion-0.4.7.1-r4.ebuild 1772 BLAKE2B 3ad940d0d84c67cdb19c1ac21a9a15e8bfd933869fdb5fb66fc55145d7dc7d1579db052020416caf565b5511968c9ff0dd377b94536ecbe9cfc4a7a0bcf6e70a SHA512 c1bea06c10cec7172b21baefcf858c4f73ce9aaccb7745d233e55a68ec862443999faf4404a945df284fb6423d265c5b0ad3acf9e725d31d6b16e89a37fa66b2
-EBUILD freeorion-0.4.8_p20190501.ebuild 1726 BLAKE2B edef9e706747e2d5738461fd0fab96d46317a020ef30e88e6f71ee79887a4843310e1203cd50656fa09dbcd9b727364a5a8cc157a3a066c62fa13206ab93e0fb SHA512 31850b9df32e557f73494bf60c187f563b7c2b2fed16121bd92cda3d1480319752dfb2538ff3362df9ab008d640c95894965bb155b55b012dfaaae1f1389e469
-EBUILD freeorion-9999.ebuild 1726 BLAKE2B edef9e706747e2d5738461fd0fab96d46317a020ef30e88e6f71ee79887a4843310e1203cd50656fa09dbcd9b727364a5a8cc157a3a066c62fa13206ab93e0fb SHA512 31850b9df32e557f73494bf60c187f563b7c2b2fed16121bd92cda3d1480319752dfb2538ff3362df9ab008d640c95894965bb155b55b012dfaaae1f1389e469
+EBUILD freeorion-0.4.7.1-r4.ebuild 1811 BLAKE2B 8fb0d60828dfb967a9115202062e262c72553ffedb2549aa10249d242da80f4a65c8a7b4190f4e5677709b40f4f6938f4ba26a78fb461e4a376f9fe7aea9b015 SHA512 a0f9cd75e48170d9b66e0a51af2d4c5e155c08451b65ac88f8842c86b6b470a4732b6592047f48878122f9032b8264e9a7633c50c1ef17bb8c1fe1c05d5f9ce0
+EBUILD freeorion-0.4.8_p20190501.ebuild 1725 BLAKE2B 4c23ba5d2a30ab8ff85f5bf6766c1fd610e29c08e7d9544255afea91ea12213f2e8e1afe9e4f9329d85d7441ca390f5eef6e91487fe158631bfad8d5a7263391 SHA512 511c32e97b8ffd149d26ffd154e280f765069e024f55c1a80d323cb693ee190399061f0cc3bfb9eb77febc67334c4294b4b48e824d6f21284b0114be8cb6bdc9
+EBUILD freeorion-9999.ebuild 1725 BLAKE2B 4c23ba5d2a30ab8ff85f5bf6766c1fd610e29c08e7d9544255afea91ea12213f2e8e1afe9e4f9329d85d7441ca390f5eef6e91487fe158631bfad8d5a7263391 SHA512 511c32e97b8ffd149d26ffd154e280f765069e024f55c1a80d323cb693ee190399061f0cc3bfb9eb77febc67334c4294b4b48e824d6f21284b0114be8cb6bdc9
 MISC metadata.xml 684 BLAKE2B 1c415c0258973d2953f7ee0a9ff5811b17cff7000a499e2568c56b09f6c7ca40aedd345c1f377822bb0d30d50638fe76eb1e12da19da0a86b76bba9919633199 SHA512 e569a1bb722ad194a47292a6c67670fef05f5f1ac390245c81140e8fcc57f2699eec4e8037e3cae31d46d7e62eac8504d69971dc7db76226f2a31f85bb531bb1
diff --git a/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild b/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild
index e3471161e466..e827e00ef9ec 100644
--- a/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild
@@ -23,6 +23,8 @@ LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
 SLOT="0"
 IUSE=""
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 RDEPEND="
 	>=dev-libs/boost-1.56:=[python,threads,${PYTHON_USEDEP}]
 	media-libs/freealut
@@ -37,11 +39,11 @@ RDEPEND="
 	sci-physics/bullet
 	sys-libs/zlib
 	virtual/opengl
+	${PYTHON_DEPS}
 	!dev-games/gigi"
 	# Use bundled gigi as of freeorion-0.4.3
 
 DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
 	virtual/pkgconfig"
 
 PATCHES=( "${FILESDIR}/${P}-backport-sdl2-include-dir-fix.patch" )
diff --git a/games-strategy/freeorion/freeorion-0.4.8_p20190501.ebuild b/games-strategy/freeorion/freeorion-0.4.8_p20190501.ebuild
index 2c29c8b5c266..3aea6bd3b5d9 100644
--- a/games-strategy/freeorion/freeorion-0.4.8_p20190501.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.8_p20190501.ebuild
@@ -48,10 +48,9 @@ RDEPEND="
 		virtual/opengl
 	)
 	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 "
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	# build system is using FindPythonLibs.cmake which needs python:2
diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
index 2c29c8b5c266..3aea6bd3b5d9 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-9999.ebuild
@@ -48,10 +48,9 @@ RDEPEND="
 		virtual/opengl
 	)
 	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 "
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	# build system is using FindPythonLibs.cmake which needs python:2
diff --git a/games-strategy/lightyears/Manifest b/games-strategy/lightyears/Manifest
index 7cf7cebecb57..8a3e3026011e 100644
--- a/games-strategy/lightyears/Manifest
+++ b/games-strategy/lightyears/Manifest
@@ -1,4 +1,4 @@
 AUX lightyears-1.4-gentoo.patch 1280 BLAKE2B fd247d049fe7e32264a0d86ffa06f37ca8a8ffb4fd7b5651adce2008f089b1b83758286b46e33555c61b4a62fb79e6ed93475bf51aff599117fc5eedbfe70680 SHA512 4a8770b29c7aa8b489a8afaac7ba3ec9a2efc1466f6263f35ee531a8e4498a1490080bd390a87309983d62ac0d3a722421058d671c32c7cda91bcc6a94d81be3
 DIST lightyears-1.4.tar.bz2 693877 BLAKE2B 871b8f66088c3a947de50e7b47a8aeef4d06f9c7919f4f361a6719ff0dfa6b48acabb759dca6969d09255e2c89c158caa0cd560ef02567df6e46bbcda2eb9417 SHA512 68f576d820d54b353adbc504f8aa3341547e2e56474717cc59aecc2368fc0eb533458e09876b3cd2a9062914a8a58d39a35ce944256372bb9e15830210924597
-EBUILD lightyears-1.4-r2.ebuild 1020 BLAKE2B d692c8e1087689b67a62a8785869d5c66511bdfd8114e9b27378ab0c3b35418b733eb8c4d37bfcfa25a2943a035207648d0e39eb39b3ec3b318f4c3197491e9e SHA512 1721d4023d7a275d67f691e867d857200d7c9e71b871b4b7fec34302707324ebf8d88c47d03d0331e149ca9ace89daceece333415c45225f690220574cdae087
+EBUILD lightyears-1.4-r3.ebuild 1113 BLAKE2B d85187fbb3ea6e6d7a5bd03c3baa409d3ab839825ed66cf7c8b8e0577513fa9e01b72a4fac04ad5216d5a8de53c6a24b3e1a93f164001d88c6c44d9a986d0e41 SHA512 8568b59351e3a2f1fd6149b0796187d026e0a6dd42781b6a75bd6f997c46f36317d0d390f17e886382f99a85b25996d7a9b44bb4ce759b88901f8ba8e113134a
 MISC metadata.xml 457 BLAKE2B 7f250bdb961fe6d994ebc983f8dfaf3cbe7c4763b766fbcbc199b2db3f33ca273136e827adece324f4c00b611521882b932a1750a372258e0d52daf691a2c1bb SHA512 354fad5eed1305fc7e5ed69de92f7033b651371a1993ccd90d3d6fd9f49975e30e8b5b4c8cfcf8bb6f1284b5ef0df790adf863f76f580945ff3699ff275d5c13
diff --git a/games-strategy/lightyears/lightyears-1.4-r2.ebuild b/games-strategy/lightyears/lightyears-1.4-r3.ebuild
index 7e7344951fc2..4d4cfa964e45 100644
--- a/games-strategy/lightyears/lightyears-1.4-r2.ebuild
+++ b/games-strategy/lightyears/lightyears-1.4-r3.ebuild
@@ -1,34 +1,37 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 PYTHON_COMPAT=( python2_7 )
 
-inherit desktop python-single-r1
+inherit desktop python-single-r1 xdg-utils
 
 DESCRIPTION="A single-player game with a science-fiction theme"
-HOMEPAGE="http://www.jwhitham.org/20kly/"
-SRC_URI="http://www.jwhitham.org/20kly/${P}.tar.bz2"
-
+HOMEPAGE="https://www.jwhitham.org/20kly/"
+SRC_URI="https://www.jwhitham.org/20kly/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-python/pygame[${PYTHON_USEDEP}]
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}"-gentoo.patch
+)
 
 src_prepare() {
 	default
-	eapply "${FILESDIR}/${P}"-gentoo.patch
+
 	sed -i \
 		-e "s:@GENTOO_LIBDIR@:/usr/$(get_libdir)/${PN}:" \
 		-e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
 		${PN} || die
+
 	python_fix_shebang .
 }
 
@@ -48,3 +51,6 @@ src_install() {
 	newicon data/32.png ${PN}.png
 	make_desktop_entry ${PN} "Light Years Into Space"
 }
+
+pkg_postinst() { xdg_icon_cache_update; }
+pkg_postrm() { xdg_icon_cache_update; }
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index bdfcf44a4714..aa7e7485e0ba 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -4,5 +4,5 @@ DIST warzone2100-3.2.3.tar.xz 81314060 BLAKE2B 231be8c24d1c0967adb0a76ac9e441c2e
 DIST warzone2100-3.3.0_beta1.tar.xz 85916776 BLAKE2B ec94e6fafff103e014e063f554b6a40411577d9c415733eb7857c4cd470195f1ab9878c2d5afd6c154e1f058c2f2a645a46738518d307da42ae97e0898fdf75a SHA512 17e9d81e7eadc71ad285147ff76517a92e8ea8747a05a6a08373d994725efa6bae11f87cd6bc9068cbfd78aa24d26fea95929c65a0906d03605b96469d972f4a
 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 2388 BLAKE2B 1e8904a8bc1e994cf1ae7d65533b0910aab94e9cda6074d2c73e05cebd7dc655ee2a366da738d5c5afcf5b286c9669fed42b842f72935c71356bf18f3e26c3dc SHA512 1014b871cf4eb60e72066bf6e3b7faed0fbfd759501f50d457efcaa7e839c7a68196ca75ecbe349ff11a0bfdb7de0c37d12c092e14d3514494ba2e6f991f5e10
+EBUILD warzone2100-3.3.0_beta1.ebuild 2407 BLAKE2B e908251343eb1425062650e8cef112ac119ef1abc65e350d421cff8ba7fdb8883b6e0a3111923c0db458b270a570a7942ac2517be516d1c65eb764e0a9aac963 SHA512 700929dc28d77a9a86053fd8739015463f9c03c06cc5cc3a2c669c08709ec7e129d61def20e1accfa8540f70681e49abde7c1f7c2200aea39b6b8c28b2b1839f
 MISC metadata.xml 674 BLAKE2B b0c40e88934cfbdbcbb7ffdbc277abcc3da3400de71f7508af51301f7ec5b6e00083ff2b59f59f7435a8e3f588291d7e5dbde19fa193b6fc78677b842cfb44ee SHA512 00aa4a109f41a0469e2b0e5daadcd33f9f3b255fdd2a724b7d116912ecb0b5fa4eb5e0dd7e4ae3e45f00c062c1034aa7d40143e48da0e66bab48da3d4e047dcc
diff --git a/games-strategy/warzone2100/warzone2100-3.3.0_beta1.ebuild b/games-strategy/warzone2100/warzone2100-3.3.0_beta1.ebuild
index fddc09013785..d8ab1ae7bb7d 100644
--- a/games-strategy/warzone2100/warzone2100-3.3.0_beta1.ebuild
+++ b/games-strategy/warzone2100/warzone2100-3.3.0_beta1.ebuild
@@ -48,6 +48,7 @@ CDEPEND="
 "
 DEPEND="
 	${CDEPEND}
+	app-text/asciidoc
 	dev-libs/fribidi
 	media-libs/fontconfig
 "