gentoo resync : 28.04.2019

13 files changed, 226 insertions, 124 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 04f5ea24537b..4766f5b8c252 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/freecol/Manifest b/games-strategy/freecol/Manifest
index 9a9aef337104..17ecf8b61321 100644
--- a/games-strategy/freecol/Manifest
+++ b/games-strategy/freecol/Manifest
@@ -1,4 +1,5 @@
-AUX freecol-0.11.6-gentoo.patch 1251 BLAKE2B 7de241498bba19c665812236a7898cf8295ffa9be0123a56ff0b65c85e9173dbfb3e458c26c632538230035320d9b93f0ba57b4eb6e8cf606c82b20befcf11ac SHA512 c94fa10fb210547b67b38562faa2d1e39f17264cdfc8819c5b6b856ba068757d88e29ea43bec573400a81b081965f687aea93335b62969b15122d9373290f224
+AUX commons-cli-1.3.patch 791 BLAKE2B 3fde34112ae8fba464a1dc9d282fce6a7eddb37c802861588005c44e3b5f1cf22d9b2495553954ab47681fa016c1c7cb9ff5b0887e48e67381d1d73a7ec58ea6 SHA512 eb2e1eeb5fe02d8d8601b1577847195f2b5a83ba875d70010f33ef8fe1fe57706e01a84ee442cd43bcbb72dc22d79a8e6de832be0e23742dae23e8e38bf6aa48
+AUX freecol-0.11.6-gentoo.patch 923 BLAKE2B f1e8632a75a3a9e4c1b2433eefdf50dc6b437da7052b2531e1a8d67fac1887a4ebad888795a9e96567ce4e5faaf5a2bc643b93f72cf72165de1b4e4146aed4d2 SHA512 85a1a7f9ac9031e61e57bbe88a292716d0249109308a6da0ef60f2e0ea547674f0d379b1f516980bfde567e2d8a2c518eef873fe40159af772b950791bec7bdf
 DIST freecol-0.11.6-src.zip 45002451 BLAKE2B 1d0e56b43f63557e3a520d6d30b8831db6c0284ac6cfebf68f3a11264d8bcfc80b883c8d4fe82e4fbd992f02a82ffdf36ed102613010d28375b61cfa30874f68 SHA512 fbfec95ad7128477d631be92b750d639d42bde3e052c94265590933e841adf66e670d5e1b2f6e8ef05629afeafded60cbb495ef93272ebc14ce7fd2f2eaa53de
-EBUILD freecol-0.11.6.ebuild 1669 BLAKE2B c1250ab2b190f052f838af33c5de61c1f3974e38c8cdd3c9a6b9237b71a60732a1734f1654d6659a25bac29bd54f930641659dfc9d87b8d5af4444a598a4dcb4 SHA512 f17d732be0523537ac0a467da97a54063b16804013525caa2893497c0b03cfebcd536fc6ddc99206962fac6d1f2066ac71146e1c75422036567e439bdad36b34
+EBUILD freecol-0.11.6-r1.ebuild 1180 BLAKE2B d7aef2d83596f0c8ff17a9804efc58c0c260777fe90bdf8f9cf32eb74923caa4869ec2532d567b0f224601fe3735e102dd8cc81f5f7e78b16743432040d37850 SHA512 d852bc225ec08cb7b86a2dfa57ce40fe4fa64a4ef4b7a7c62dab6b994dd28646662d46a98729de88886e460eb6528a5c5158830dbc09f2dc95875afbffa88784
 MISC metadata.xml 330 BLAKE2B ae0631cafebbd8fdebafaf416d6a8c7ca0152f83915aecca6366b74026523914e60761219eab4034401673fce1e54ea3c548bcbae7a084f301aaf6922569e61b SHA512 a626ad559d71b69d9f074fc7a223d226c3e911f21adecfaea48425f81fd81accf443e7518f16bbbadb1b92854f7c99e3eafda22ba0aa787bae3d44b02f8d71ab
diff --git a/games-strategy/freecol/files/commons-cli-1.3.patch b/games-strategy/freecol/files/commons-cli-1.3.patch
new file mode 100644
index 000000000000..84fc6e5064c1
--- /dev/null
+++ b/games-strategy/freecol/files/commons-cli-1.3.patch
@@ -0,0 +1,22 @@
+From: Markus Koschany <apo@debian.org>
+Date: Sun, 20 Dec 2015 18:49:11 +0100
+Subject: commons-cli 1.3
+
+Forwarded: not-needed
+---
+ src/net/sf/freecol/FreeCol.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/net/sf/freecol/FreeCol.java b/src/net/sf/freecol/FreeCol.java
+index d05ae3d..99b9cdc 100644
+--- a/src/net/sf/freecol/FreeCol.java
++++ b/src/net/sf/freecol/FreeCol.java
+@@ -426,7 +426,7 @@ public final class FreeCol {
+     private static void handleArgs(String[] args) {
+         Options options = new Options();
+         final String help = Messages.message("cli.help");
+-        final File dummy = new File("dummy");
++        final Class dummy = null;
+         final String argDirectory = Messages.message("cli.arg.directory");
+ 
+         // Help options.
diff --git a/games-strategy/freecol/files/freecol-0.11.6-gentoo.patch b/games-strategy/freecol/files/freecol-0.11.6-gentoo.patch
index c087193eb8c5..770279b69030 100644
--- a/games-strategy/freecol/files/freecol-0.11.6-gentoo.patch
+++ b/games-strategy/freecol/files/freecol-0.11.6-gentoo.patch
@@ -1,27 +1,18 @@
---- build.xml.orig	2015-12-09 21:10:08.272361404 -0500
-+++ build.xml	2015-12-09 21:11:26.189663216 -0500
-@@ -36,12 +36,11 @@
- 
-     <path id="libraries.classpath">
-         <!-- MigLayout manager -->
--        <pathelement location="${basedir}/${miglayout-swing.jar}"/>
--        <pathelement location="${basedir}/${miglayout-core.jar}"/>
-+        <pathelement location="${miglayout.jar}"/>
-         <!-- Command line processor -->
--        <pathelement location="${basedir}/${cli.jar}"/>
-+        <pathelement location="${cli.jar}"/>
-         <!-- Cortado Video Applet -->
--        <pathelement location="${basedir}/${cortado.jar}"/>
-+        <pathelement location="${cortado.jar}"/>
-         <!-- JOgg/JOrbis libraries -->
-         <pathelement location="${basedir}/jars/jogg-0.0.17.jar"/>
-         <pathelement location="${basedir}/jars/jorbis-0.0.17.jar"/>
-@@ -162,7 +161,7 @@
+diff -Naur a/build.xml b/build.xml
+--- a/build.xml	2015-10-17 07:54:48.000000000 +0100
++++ b/build.xml	2019-04-13 21:51:21.679100596 +0100
+@@ -162,14 +162,9 @@
  
      <target name="manifest" depends="git-revision"
              description="Creates the Manifest file.">
 -        <manifestclasspath property="jar.classpath"
-+        <manifestclasspath maxParentLevels="50" property="jar.classpath"
-                            jarfile="Freecol.jar">
-             <classpath refid="libraries.classpath" />
-         </manifestclasspath>
+-                           jarfile="Freecol.jar">
+-            <classpath refid="libraries.classpath" />
+-        </manifestclasspath>
+         <manifest file="${basedir}/src/MANIFEST.MF">
+             <attribute name="Created-By" value="FreeCol Team"/>
+             <attribute name="Main-Class" value="net.sf.freecol.FreeCol"/>
+-            <attribute name="Class-Path" value="${jar.classpath}"/>
+             <attribute name="Product-Name" value="FreeCol"/>
+             <attribute name="Package-Title" value="FreeCol"/>
+             <attribute name="Package-Version" value="${FreeCol.Revision}"/>
diff --git a/games-strategy/freecol/freecol-0.11.6-r1.ebuild b/games-strategy/freecol/freecol-0.11.6-r1.ebuild
new file mode 100644
index 000000000000..fad44bf0d1eb
--- /dev/null
+++ b/games-strategy/freecol/freecol-0.11.6-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop java-pkg-2 java-ant-2
+
+DESCRIPTION="An open source clone of the game Colonization"
+HOMEPAGE="http://www.freecol.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Rightly or wrongly, jogg and jorbis are bundled within Cortado but we
+# don't have packages for them anyway.
+
+CP_DEPEND="
+	dev-java/commons-cli:1
+	dev-java/cortado:0
+	dev-java/miglayout:0
+"
+
+DEPEND=">=virtual/jdk-1.8
+	app-arch/unzip
+	${CP_DEPEND}"
+
+RDEPEND=">=virtual/jre-1.8
+	${CP_DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}"/commons-cli-1.3.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+JAVA_ANT_REWRITE_CLASSPATH=true
+EANT_BUILD_TARGET=package
+
+src_prepare() {
+	default
+	rm -v jars/* || die
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	local datadir=/usr/share/${PN}
+
+	java-pkg_dojar FreeCol.jar
+	java-pkg_dolauncher ${PN} \
+		--pwd ${datadir} \
+		--main net.sf.freecol.FreeCol \
+		--java_args -Xmx512M
+
+	insinto ${datadir}
+	doins -r data schema
+
+	doicon data/${PN}.png
+	make_desktop_entry ${PN} FreeCol
+
+	dodoc README
+}
diff --git a/games-strategy/freecol/freecol-0.11.6.ebuild b/games-strategy/freecol/freecol-0.11.6.ebuild
deleted file mode 100644
index 8d7df3ab2726..000000000000
--- a/games-strategy/freecol/freecol-0.11.6.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils java-pkg-2 java-ant-2 games
-
-DESCRIPTION="An open source clone of the game Colonization"
-HOMEPAGE="http://www.freecol.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/jsr173
-	dev-java/wstx:3.2
-	dev-java/commons-cli:1
-	dev-java/cortado
-	dev-java/miglayout"
-DEPEND=">=virtual/jdk-1.8
-	app-arch/unzip
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.8
-	${COMMON_DEP}"
-
-S=${WORKDIR}/${PN}
-
-java_prepare() {
-	# jorbis isn't in portage yet
-	rm jars/{commons-cli-1.1,cortado-0.6.0,miglayout-core-4.2,miglayout-swing-4.2}.jar || die
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_prepare() {
-	java-pkg-2_src_prepare
-}
-
-src_configure() {
-	java-ant-2_src_configure
-}
-
-src_compile() {
-	EANT_BUILD_TARGET=package
-	EANT_EXTRA_ARGS="
-		-Dstax.jar=$(java-pkg_getjars jsr173)
-		-Dwoodstox.jar=$(java-pkg_getjars wstx-3.2)
-		-Dcli.jar=$(java-pkg_getjars commons-cli-1)
-		-Dmiglayout.jar=$(java-pkg_getjars miglayout)
-		-Dcortado.jar=$(java-pkg_getjars cortado)
-	"
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	java-pkg_jarinto "${GAMES_DATADIR}"/${PN}
-	java-pkg_dojar FreeCol.jar
-	java-pkg_dolauncher ${PN} \
-		-into "${GAMES_PREFIX}" \
-		--pwd "${GAMES_DATADIR}"/${PN} \
-		--jar FreeCol.jar \
-		--java_args -Xmx512M
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r data schema
-	doicon data/${PN}.png
-	make_desktop_entry ${PN} FreeCol
-	dodoc README
-	prepgamesdirs
-}
-
-pkg_setup() {
-	games_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	java-pkg-2_pkg_preinst
-}
diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index c0c01140c297..c2c4553864d2 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -4,5 +4,5 @@ DIST freeorion-0.4.7.1.tar.gz 105942075 BLAKE2B f75940ac79e329fd7e03e85b1cd712ff
 EBUILD freeorion-0.4.7.1-r3.ebuild 1704 BLAKE2B aeb98f2232bf05e0030efaa6041e5817afa53af6d228c9431f105e62b4004b0bb66316848114db2e42c044bdb2f8b3b40776dcd0b861457f0c09fc91a8c6fa70 SHA512 401e40826695b6aa1158f7b3a266d7d5db7ef862dfdc62bcc598c42069e9e580cc5ab23fd349bf5558bebf7562fc0d57f189f9ed7c166bc84e078f2496b74c20
 EBUILD freeorion-0.4.7.1-r4.ebuild 1772 BLAKE2B 3ad940d0d84c67cdb19c1ac21a9a15e8bfd933869fdb5fb66fc55145d7dc7d1579db052020416caf565b5511968c9ff0dd377b94536ecbe9cfc4a7a0bcf6e70a SHA512 c1bea06c10cec7172b21baefcf858c4f73ce9aaccb7745d233e55a68ec862443999faf4404a945df284fb6423d265c5b0ad3acf9e725d31d6b16e89a37fa66b2
 EBUILD freeorion-0.4.7.1.ebuild 1679 BLAKE2B d60e8dca3465f700cc629f8df45b4f92efbfa1814e6d4dd2c23b40c13684cc614c947c40e931810095487cf3070077dc8ba36b36a3fcf51e5b3c657f6b6f4607 SHA512 88f9d3905770f0a97a3938d58bad1c6698c5d8b651718a19cb634aaef857582023051700bc692ae59a2b8ee83b1da6841fff1a576078f7df1705e388b6faca7b
-EBUILD freeorion-9999.ebuild 1704 BLAKE2B aeb98f2232bf05e0030efaa6041e5817afa53af6d228c9431f105e62b4004b0bb66316848114db2e42c044bdb2f8b3b40776dcd0b861457f0c09fc91a8c6fa70 SHA512 401e40826695b6aa1158f7b3a266d7d5db7ef862dfdc62bcc598c42069e9e580cc5ab23fd349bf5558bebf7562fc0d57f189f9ed7c166bc84e078f2496b74c20
+EBUILD freeorion-9999.ebuild 1692 BLAKE2B 8c6b111d87af160ae503270c103e5c2de75af27d6674b2b0d61dfdd385396ae0aa9c0ab3bce9baaa7926e0f583a45fc8250576cded97cef8bb316bbc38fdf2a3 SHA512 ca81bc4ada8ecb3bfab5e80bcf6368cb9310c828977f54a2946f4df4c6c3bacb9fce136fa6b725f5f18010820cb45ad33a80249cf6d288dc7e9bbaf926a0c999
 MISC metadata.xml 684 BLAKE2B 1c415c0258973d2953f7ee0a9ff5811b17cff7000a499e2568c56b09f6c7ca40aedd345c1f377822bb0d30d50638fe76eb1e12da19da0a86b76bba9919633199 SHA512 e569a1bb722ad194a47292a6c67670fef05f5f1ac390245c81140e8fcc57f2699eec4e8037e3cae31d46d7e62eac8504d69971dc7db76226f2a31f85bb531bb1
diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
index 8d750687b353..578e570e2ffd 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-9999.ebuild
@@ -1,10 +1,10 @@
-# 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 cmake-utils python-single-r1 gnome2-utils
+inherit cmake-utils python-single-r1 xdg
 
 DESCRIPTION="A free turn-based space empire and galactic conquest game"
 HOMEPAGE="http://www.freeorion.org"
@@ -40,7 +40,8 @@ RDEPEND="
 	!dev-games/gigi"
 	# Use bundled gigi as of freeorion-0.4.3
 
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	${PYTHON_DEPS}
 	virtual/pkgconfig"
 
@@ -57,12 +58,11 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_BUILD_TYPEE=Release
-		-DRELEASE_COMPILE_FLAGS=""
+		-DCMAKE_BUILD_TYPE=Release
 		-DCMAKE_SKIP_RPATH=ON
 	)
 
-	append-cppflags -DBOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL
+	#append-cppflags -DBOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL
 
 	cmake-utils_src_configure
 }
@@ -74,10 +74,14 @@ src_install() {
 	newenvd "${FILESDIR}/${PN}.envd" 99${PN}
 }
 
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_pkg_postrm
 }
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 6a9edfcd5585..ce1b5473ddd6 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,6 +1,6 @@
 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab
-DIST wesnoth-1.14.5.tar.gz 489848620 BLAKE2B abbf1ae2bb20cfdd2575f5e21eea7db9b32f0a9c7e85101652206477f3dca8ae0aefbf4b0a252c4522565c08900b0a04d39fd5eadb5feb49168dc95db732e50e SHA512 115c7fda3ef77079d871aeae4bc448bf8de1829d7723179f634db10f23ab8c15d2d92c5a36c11aa8dc79fb8f914e95f06143565e2ae950947da35af5f71e1b6e
 DIST wesnoth-1.14.6.tar.gz 491891860 BLAKE2B e15512eefbb7b118ec80a5612c23edce41555fc2869b652d4799bc052f26592852a2b4d1cb76dee3203d8a26c18c4cf9de58dea1ee81403b9881642e902cf2f3 SHA512 f29b78605f5e3c2e9af8884925b43a262d6fce469bf30a4697e2c8bef8a49d0fea17bd6dc1a3e78113a50e6f21e29aedb5ee26ff2b0493371120f8c64b894096
-EBUILD wesnoth-1.14.5.ebuild 2652 BLAKE2B af84f260e5b35f7c575958b3ded2e139085ed9fd07f58fb93cf0d827abe5729a00f30aea85084878ec2a222651e18bd88e80d4fec2de9a9ba263b07ec8a2e144 SHA512 a3a503cf306139b69f0c912cf73a9d6f32e7089c0e2e44b6c9f06a13ed8df5eeb7889c9d3885884a4112a4121c1176c4e26f6d3756f48ce20e0e0ba455383d41
+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 2682 BLAKE2B 6d395a57de1c5244a68cef436135b15d0fbde4502437d688bc3acec6bfd2106dcdb1f89388975f7f34b44d48e7e2fb6f3d8570b14e44ad65bf9a55d12aaa6bb6 SHA512 e372ea2192d70c90c8000755580b64f5b127e6f27c765c42e2d8ef7ca7dc6becc6658404ed037d4c99581883a98dcb4a3fb23f24ce1da6d13b171fcffe0320de
 MISC metadata.xml 485 BLAKE2B f9a78a24d1cd5ddc70fb2e8c6b9b0fa081409d99523cb9a14b890b36866576afa2ab33cb11986b364ee34aac3e4ea30f0908692ba99d56f32199860c5b65e707 SHA512 ccc12cec7aa66b59d11f65d4b8b6127c86eab2e998c31587f4323020231b55c6460d0c1fad04d7298ccdb2fe1bd9abc43e3b93716a379cbbc46f60f6bcd68ef3
diff --git a/games-strategy/wesnoth/wesnoth-1.14.5.ebuild b/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
index 4cd3506d2b9c..971ba1f87a94 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.5.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit cmake-utils user
 
 DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
@@ -33,9 +33,11 @@ RDEPEND="
 		fribidi? ( dev-libs/fribidi )
 	)"
 DEPEND="${RDEPEND}
+	x11-libs/libX11
+"
+BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-libs/libX11
 "
 
 pkg_setup() {
@@ -58,12 +60,11 @@ src_prepare() {
 
 	# respect LINGUAS (bug #483316)
 	if [[ ${LINGUAS+set} ]] ; then
-		local langs
-		for lang in $(cat po/LINGUAS)
-		do
-			has $lang $LINGUAS && langs+="$lang "
+		local lang langs=()
+		for lang in $(cat po/LINGUAS) ; do
+			has ${lang} ${LINGUAS} && langs+=( ${lang} )
 		done
-		echo "$langs" > po/LINGUAS || die
+		echo "${langs[@]}" > po/LINGUAS || die
 	fi
 }
 
@@ -109,7 +110,7 @@ src_install() {
 	local DOCS=( README.md changelog.md )
 	cmake-utils_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
 }
diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index 412c4bbcc75b..5689aa5f527c 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,4 +1,7 @@
 AUX widelands-0.18-cxxflags.patch 1061 BLAKE2B e1cacaeebd60325cf79549f55b2968a77862cc34caac79dd86f4fae47d755730851c1f8b60c347ab69aeffcdacba39921fc5790c07cd0ed64c157f509170ea96 SHA512 ad911122384af9c07f3fc35446ed6f7e7bda86768983ee17668dbedcea2bc20eb88d4c43b051860553b6f455bc8655b226223b45b4d4f421ee5032cc380ad591
+AUX widelands-0.20_rc1-cxxflags.patch 1060 BLAKE2B 1cc356c615037ab293877a2f65a3db2fc979ebfec370e3968da4f466873c92b523671b6e7193ae7bb1dc948b713901421586266e1837f34a19d50279f02224d9 SHA512 da3f5b9e5680c84d48740c202fd937aeb76465647b1a24e4eee5a6d3df44b2f4abda819606ff7294ee1d8fe27ceb3281e4a00ca7f03d944af933bcac0e490059
 DIST widelands-build18-src.tar.bz2 183443325 BLAKE2B 100555b7a800cac1094a768edd40e6b44d6bd0d36386c6f057e0cd81f9b03404b249f259c85d3fae655d7343bb50c41a70f228651530c13092e50190fdd2f9b8 SHA512 9b01c0a7e197360ddd7e21292fc8ba5d1102e24f3a9ec35cfbbf67413a0e9d69abeccd2bc3f6aad05b42cabff32112466803738b41f61562d843779e0c974e72
+DIST widelands-build20-rc1.tar.bz2 232490916 BLAKE2B 7dd13c325fa0dc891a5ab3cc643ae86025c5e853909d172b39d9d1cd2a41132d099f3d03349322b03dc52353f1465391ec006a83e70eb6554be133199efd96b8 SHA512 2d713db8e4a0774e8a6615b6f0dbec4f29870d69fa9bf48db8694316f7320b58ee5afa5a7796e0886471c9c787954c21f478b1364f52ce01a23212a7512465a6
 EBUILD widelands-0.18-r1.ebuild 1570 BLAKE2B e580356d83d1698a8943428a811ba154d1582ad13b9fbb8e3004e20be18344e233e2934c03b05fc161afced21493f76e3b422238f3ac3637ba23978d2c7613a9 SHA512 2c3e11eadbe6d26e8d3f176ce2666f37c7e4d1315ecc48abc711c9e5a54de91840ab9322eef1746cc43ffde404cad3aac9f5b928dd8dd122e66d548f2f33a309
+EBUILD widelands-0.20_rc1.ebuild 1564 BLAKE2B 083dd593effc815f4e10aadd8d1cff0428f712237fc2899bc5576d34d56366c5e74790a1fcfabc267c1bae0db83a421e87cd94167b28933819f7993b1d96e2bf SHA512 e907d79e5ca6f87ae6b77e27caa5773d79714a398b8ce0116ebe4d07bf3e8fb6011926a53e607046e0fd636c5a9567705900f650e95ac541c212acf3228ab58b
 MISC metadata.xml 330 BLAKE2B 40ce3c95a2be4fd32bc1d9cc214fb4a61435b869c5d0c6406094ddab24a1e4a7b64f28b866e4c712d1d7020a047f28a239e9b8d51092242f2a43269d13934cc4 SHA512 a56671f43b3ce3e6274b9101b7c5ea1a4b2ff261fb94366e80d2655519a07c52fa0629b762d3ca76f82693075a1c717795bff2a69122938c9749ea249dc1e75d
diff --git a/games-strategy/widelands/files/widelands-0.20_rc1-cxxflags.patch b/games-strategy/widelands/files/widelands-0.20_rc1-cxxflags.patch
new file mode 100644
index 000000000000..ee8fda17ee4a
--- /dev/null
+++ b/games-strategy/widelands/files/widelands-0.20_rc1-cxxflags.patch
@@ -0,0 +1,24 @@
+--- widelands-build19-rc1/CMakeLists.txt
++++ widelands-build19-rc1/CMakeLists.txt
+@@ -146,19 +146,13 @@
+   option(OPTION_ASAN "Build with AddressSanitizer" ON)
+ elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
+   if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.2))
+-    message(STATUS "GCC >6.2.0 breaks -03, setting -02")
+-    set(WL_OPTIMIZE_FLAGS "-O2")
+-  else()
+-    set(WL_OPTIMIZE_FLAGS "-O3")
++    message(STATUS "GCC >6.2.0 breaks -03")
+   endif ()
+   set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
+   option(OPTION_ASAN "Build with AddressSanitizer" OFF)
+ elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+   if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.2))
+-    message(STATUS "GCC >6.2.0 breaks -03, setting -02")
+-    set(WL_OPTIMIZE_FLAGS "-O2")
+-  else()
+-    set(WL_OPTIMIZE_FLAGS "-O3")
++    message(STATUS "GCC >6.2.0 breaks -03")
+   endif ()
+   set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
+   option(OPTION_ASAN "Build with AddressSanitizer" ON)
diff --git a/games-strategy/widelands/widelands-0.20_rc1.ebuild b/games-strategy/widelands/widelands-0.20_rc1.ebuild
new file mode 100644
index 000000000000..9cfddcf425f9
--- /dev/null
+++ b/games-strategy/widelands/widelands-0.20_rc1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop cmake-utils
+
+MY_PV="build$(ver_cut 2-)"
+MY_P="${PN}-${MY_PV/_/-}"
+
+DESCRIPTION="A game similar to Settlers 2"
+HOMEPAGE="http://www.widelands.org/"
+SRC_URI="https://launchpad.net/widelands/build$(ver_cut 2)/${MY_PV/_/-}/+download/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-lang/lua:0
+	dev-libs/icu:=
+	>=dev-libs/boost-1.48:=
+	media-libs/glew:0=
+	media-libs/libpng:0=
+	media-libs/libsdl2[video]
+	media-libs/sdl2-gfx
+	media-libs/sdl2-image[jpeg,png]
+	media-libs/sdl2-mixer[vorbis]
+	media-libs/sdl2-net
+	media-libs/sdl2-ttf
+	sys-libs/zlib:=[minizip]"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+CMAKE_BUILD_TYPE="Release"
+
+S="${WORKDIR}/${MY_P/20/19}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.20_rc1-cxxflags.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i -e 's:__ppc__:__PPC__:' src/map_io/s2map.cc || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DOPTION_BUILD_WEBSITE_TOOLS=OFF
+
+		# Upstream's cmake files are totally fscked up...
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr/share/doc/${PF}
+		# Game is NOT happy being moved from /usr/share/games
+		-DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/games/${PN}
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# move game binary to correct location
+	dodir /usr/bin
+	mv "${ED}"/usr/share/doc/${PF}/${PN} "${ED}"/usr/bin || die
+
+	newicon data/images/logos/wl-ico-128.png ${PN}.png
+	make_desktop_entry ${PN} ${PN^}
+}