gentoo resync : 04.05.2019

5 files changed, 74 insertions, 84 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 4766f5b8c252..44d4c61421b4 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index 5689aa5f527c..9d36c2954a2f 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,7 +1,6 @@
-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
+DIST widelands-build20.tar.bz2 232364340 BLAKE2B 1d8e2cd28d2ac3e2425c91a9872a3f158d7063a2c6c669d95df347561ef35dfca479fd81252d61008a3282c99a2ce70c4d904622272dd86477a731fc711306b1 SHA512 25280db6a57adeb37d13db35ce9eb41a5478534b04772240f6228c180f5a41a55fc414dab66e724945442985cbbba7a8a59a582291aca176e0bd8ae6c08760e5
+EBUILD widelands-0.20.ebuild 1558 BLAKE2B 2482813be293046c44d0c3931ef49a37dd6d9d04a9af72057fa9b44ec685239cc8abc3fd16efed654e1946625ad7c64c6e39fc282341192771fff77cd0daf01e SHA512 d44f3f88d188bf1b6c6e585cf2806baf02b0b7bbef2dd2edb5a7a4ad17f36b6ccd28ccb2c6fc5a12266ac6d905822d6e282cb1ed38499f7f0d476ae2bef1f9f8
 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.18-cxxflags.patch b/games-strategy/widelands/files/widelands-0.18-cxxflags.patch
deleted file mode 100644
index f6b65400bf82..000000000000
--- a/games-strategy/widelands/files/widelands-0.18-cxxflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru widelands-build18-src.orig/CMakeLists.txt widelands-build18-src/CMakeLists.txt
---- widelands-build18-src.orig/CMakeLists.txt	2014-02-22 04:06:51.000000000 -0500
-+++ widelands-build18-src/CMakeLists.txt	2016-03-23 23:04:50.536259815 -0400
-@@ -271,7 +271,7 @@
-   ENDIF (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
- ENDIF (CMAKE_COMPILER_IS_GNUCXX)
- 
--set (CMAKE_CXX_FLAGS_RELEASE "${WL_COMPILERFLAG_CXXSTD} ${WL_COMPILERFLAG_OPTIMIZATIONS} -DNDEBUG${WL_COMPILERFLAG_OLDSTYLECAST}${WL_COMPILERFLAG_GENERICWARNINGS}${WL_COMPILERFLAG_EXTRAWARNINGS}${WL_COMPILERFLAG_GCCWARNINGS}${WL_COMPILERFLAG_STRICT}" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
-+set (CMAKE_CXX_FLAGS_RELEASE "${WL_COMPILERFLAG_CXXSTD} -DNDEBUG${WL_COMPILERFLAG_OLDSTYLECAST}${WL_COMPILERFLAG_GENERICWARNINGS}${WL_COMPILERFLAG_EXTRAWARNINGS}${WL_COMPILERFLAG_GCCWARNINGS}${WL_COMPILERFLAG_STRICT}" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
- 
- #If building with MSVC, then check for 3rdparty libs
- if (DEFINED MSVC)
diff --git a/games-strategy/widelands/widelands-0.18-r1.ebuild b/games-strategy/widelands/widelands-0.18-r1.ebuild
deleted file mode 100644
index adee0947e0bc..000000000000
--- a/games-strategy/widelands/widelands-0.18-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils versionator cmake-utils
-
-MY_PV=build$(get_version_component_range 2)
-MY_P=${PN}-${MY_PV}-src
-
-DESCRIPTION="A game similar to Settlers 2"
-HOMEPAGE="http://www.widelands.org/"
-SRC_URI="https://launchpad.net/widelands/${MY_PV}/build-$(get_version_component_range 2)/+download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-lang/lua:0
-	>=dev-libs/boost-1.48:=
-	media-libs/glew:0=
-	media-libs/libpng:0=
-	media-libs/libsdl[video]
-	media-libs/sdl-gfx
-	media-libs/sdl-image[jpeg,png]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-net
-	media-libs/sdl-ttf
-	sys-libs/zlib[minizip]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-CMAKE_BUILD_TYPE=Release
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cxxflags.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i -e 's:__ppc__:__PPC__:' src/s2map.cc || die
-	sed -i -e '/WL_VERSION_MINOR/s/17/18/' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWL_VERSION_STANDARD=true
-
-		# Game is NOT happy being moved from /usr/share/games
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr/share/games/${PN}
-
-		-DWL_INSTALL_PREFIX="${EPREFIX}"/usr/games
-		-DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/games/${PN}
-		-DWL_INSTALL_LOCALEDIR="${EPREFIX}"/usr/share/games/${PN}/locale
-		-DWL_INSTALL_BINDIR="${EPREFIX}"/usr/bin
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newicon pics/wl-ico-128.png ${PN}.png
-	make_desktop_entry ${PN} ${PN^}
-}
diff --git a/games-strategy/widelands/widelands-0.20.ebuild b/games-strategy/widelands/widelands-0.20.ebuild
new file mode 100644
index 000000000000..b1bdd2677338
--- /dev/null
+++ b/games-strategy/widelands/widelands-0.20.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}"
+
+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^}
+}