gentoo Easter resync : 12.04.2020

5 files changed, 132 insertions, 80 deletions

diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index a2203a467ebc..86c00d70204d 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,6 +1,6 @@
+AUX widelands-0.20-glvnd.patch 780 BLAKE2B ec09d7624e9432e9adf339efc2ce0b094d7007834e34ed6be8620fa7e9ed91bd6c4963ea452e2e769abdd521d7f679c012a2f5c5ceee9ef9f7643af6b116ac5e SHA512 9c05d8744eeacc13ec84ffda49e055fe29420a4104e7628da3a0d1c0f4e4cc4740531879c7bd88b41cb5e7ef5827c132a33c795eefedd9a4718afc738b452f05
 AUX widelands-0.20_rc1-cxxflags.patch 1060 BLAKE2B 1cc356c615037ab293877a2f65a3db2fc979ebfec370e3968da4f466873c92b523671b6e7193ae7bb1dc948b713901421586266e1837f34a19d50279f02224d9 SHA512 da3f5b9e5680c84d48740c202fd937aeb76465647b1a24e4eee5a6d3df44b2f4abda819606ff7294ee1d8fe27ceb3281e4a00ca7f03d944af933bcac0e490059
-DIST widelands-build20-rc1.tar.bz2 232490916 BLAKE2B 7dd13c325fa0dc891a5ab3cc643ae86025c5e853909d172b39d9d1cd2a41132d099f3d03349322b03dc52353f1465391ec006a83e70eb6554be133199efd96b8 SHA512 2d713db8e4a0774e8a6615b6f0dbec4f29870d69fa9bf48db8694316f7320b58ee5afa5a7796e0886471c9c787954c21f478b1364f52ce01a23212a7512465a6
 DIST widelands-build20.tar.bz2 232364340 BLAKE2B 1d8e2cd28d2ac3e2425c91a9872a3f158d7063a2c6c669d95df347561ef35dfca479fd81252d61008a3282c99a2ce70c4d904622272dd86477a731fc711306b1 SHA512 25280db6a57adeb37d13db35ce9eb41a5478534b04772240f6228c180f5a41a55fc414dab66e724945442985cbbba7a8a59a582291aca176e0bd8ae6c08760e5
-EBUILD widelands-0.20.ebuild 1534 BLAKE2B 8dd6cf5d45d89e99f13a41538806f1a7ecba87b4aadd34619a71e5e81ce4915c08a13d9863f2ffe21a0d9c1a567a49f0ccbe28e2e1c48b4f373fd63c0108630e SHA512 f0fe8fba49ba0ad0f0cdeb3fbd2ccc03eae06f8c4ea585a38254b8e47e466995394f8f5d8012e7f7ff3673e7d4ac2df93f4a0bf87428f3e91cd98448a6754f4b
-EBUILD widelands-0.20_rc1.ebuild 1540 BLAKE2B b97b42a215817bdf119baee64fd83a47f600859efde3e90e7d62a3032899d6c7e056574d909140d9eb4ae63c39eba425a8e33085dea4e9e2097a5b96146c0691 SHA512 8f8d78b9cc7c7a698c255dcbda48c788bda5976a559567f736cd7f5d5b6279fab2505e69b5953e9e2439e7583aa8ccfaa383ac2292971871b63ee93c59899cb6
+EBUILD widelands-0.20-r1.ebuild 1628 BLAKE2B acf5bc94c7b8134dc27df70ff0c21e2e3dd8ee2b3a112a00b61e84ff96c20ea11b7444a9b1a1b451c059e5d22b243b4ee355f788b9a9ce541c45cb8114a3542c SHA512 47a5d7362e30b7d2af157d0c95df4e084c80f17713232f5f678561b0d3d845fc90c36a7f631c9491967d0625e2150a1e8a118990b407b37112cb82b6ce1eb983
+EBUILD widelands-9999.ebuild 2147 BLAKE2B cbb3bebf0d529ff2c4e1abb9e880ca25f35f627651fda3c2e2ade59da3056affa43a844784f9d9fca53bfbc3938836bbdcbdfb1e17f7be6de4d655f3ba947c1d SHA512 2916a379a5feeeb1cf98c527f0fe514501c461c6777a086fd8710bf263915af08f5c8d266f0ece0b82fc2126571fcef210253e1f56dc98a54905b86a530a0a5b
 MISC metadata.xml 330 BLAKE2B 40ce3c95a2be4fd32bc1d9cc214fb4a61435b869c5d0c6406094ddab24a1e4a7b64f28b866e4c712d1d7020a047f28a239e9b8d51092242f2a43269d13934cc4 SHA512 a56671f43b3ce3e6274b9101b7c5ea1a4b2ff261fb94366e80d2655519a07c52fa0629b762d3ca76f82693075a1c717795bff2a69122938c9749ea249dc1e75d
diff --git a/games-strategy/widelands/files/widelands-0.20-glvnd.patch b/games-strategy/widelands/files/widelands-0.20-glvnd.patch
new file mode 100644
index 000000000000..94d1aa3850c7
--- /dev/null
+++ b/games-strategy/widelands/files/widelands-0.20-glvnd.patch
@@ -0,0 +1,25 @@
+From 4661768699c4651df1668fbfe0e24bb02bf10db1 Mon Sep 17 00:00:00 2001
+From: franku <somal@arcor.de>
+Date: Thu, 18 Jul 2019 19:30:34 +0200
+Subject: [PATCH] use link_libraries instead of set(CMAKE_EXE_LINKER_FLAGS...
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5c5ca8a60b..bcff2db2ff 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -181,7 +181,7 @@ endif(OPTION_ASAN)
+ 
+ # This is set to avoid linker errors when using GLVND-libs on Linux
+ if("${OpenGL_GL_PREFERENCE}" STREQUAL "GLVND")
+-   set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lGL")
++   link_libraries("GL")
+    add_compile_definitions(WL_USE_GLVND)
+    message(STATUS "Adding linker flags for GLVND.")
+ endif()
+-- 
+2.25.1
+
diff --git a/games-strategy/widelands/widelands-0.20.ebuild b/games-strategy/widelands/widelands-0.20-r1.ebuild
index 366325c6dfe0..335598744fef 100644
--- a/games-strategy/widelands/widelands-0.20.ebuild
+++ b/games-strategy/widelands/widelands-0.20-r1.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
-inherit desktop cmake
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit desktop cmake python-any-r1
 
 MY_PV="build$(ver_cut 2-)"
 MY_P="${PN}-${MY_PV/_/-}"
@@ -18,19 +20,21 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	dev-lang/lua:0
-	dev-libs/icu:=
 	>=dev-libs/boost-1.48:=
+	dev-libs/icu:=
 	media-libs/glew:0=
+	media-libs/libglvnd
 	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}
+	${PYTHON_DEPS}
+	dev-lang/lua:0
+"
+BDEPEND="
 	sys-devel/gettext
 "
 
@@ -40,6 +44,7 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.20_rc1-cxxflags.patch"
+	"${FILESDIR}/${PN}-0.20-glvnd.patch"
 )
 
 src_prepare() {
diff --git a/games-strategy/widelands/widelands-0.20_rc1.ebuild b/games-strategy/widelands/widelands-0.20_rc1.ebuild
deleted file mode 100644
index 52af37a24664..000000000000
--- a/games-strategy/widelands/widelands-0.20_rc1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop cmake
-
-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_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_src_configure
-}
-
-src_install() {
-	cmake_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^}
-}
diff --git a/games-strategy/widelands/widelands-9999.ebuild b/games-strategy/widelands/widelands-9999.ebuild
new file mode 100644
index 000000000000..2c2694479039
--- /dev/null
+++ b/games-strategy/widelands/widelands-9999.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake python-any-r1 xdg
+
+MY_PV="build$(ver_cut 2-)"
+MY_P="${PN}-${MY_PV/_/-}"
+
+DESCRIPTION="A game similar to Settlers 2"
+HOMEPAGE="http://www.widelands.org/"
+
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/widelands/widelands.git"
+else
+	SRC_URI="https://launchpad.net/widelands/build$(ver_cut 2)/${MY_PV/_/-}/+download/${MY_P}.tar.bz2"
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/boost-1.48:=
+	dev-libs/icu:=
+	media-libs/glew:0=
+	media-libs/libglvnd
+	media-libs/libpng:0=
+	media-libs/libsdl2[video]
+	media-libs/sdl2-image[jpeg,png]
+	media-libs/sdl2-mixer[vorbis]
+	media-libs/sdl2-ttf
+	sys-libs/zlib:=[minizip]"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-lang/lua:0
+"
+BDEPEND="
+	sys-devel/gettext
+"
+
+CMAKE_BUILD_TYPE="Release"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.20_rc1-cxxflags.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -i -e 's:__ppc__:__PPC__:' src/map_io/s2map.cc || die
+	# don't call gtk-update-icon-cache
+	sed '/^find_program(GTK_UPDATE_ICON_CACHE/d' \
+		-i xdg/CMakeLists.txt || die
+}
+
+src_configure() {
+	local WLDIR="${EPREFIX}/usr/share/${PN}"
+	local mycmakeargs=(
+		-DOPTION_BUILD_WEBSITE_TOOLS=OFF
+
+		# -DUSE_XDG=ON breaks finding of datadir
+		-DUSE_XDG=OFF
+
+		# Upstream's cmake files are totally fscked up...
+		# This just helps dealing with less crap in src_install
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DWL_INSTALL_BASEDIR="${WLDIR}"
+		-DWL_INSTALL_DATADIR="${WLDIR}/data"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# upstream CMakeLists.txt file is totally bonkers
+	local sharedir="${ED}/usr/share"
+	dodir /usr/bin
+	mv "${ED}"/usr/${PN} "${ED}"/usr/bin || die
+	mv "${ED}"/share/* "${sharedir}" || die
+	rmdir "${ED}"/share || die
+	rm "${sharedir}"/${PN}/{COPYING,CREDITS,ChangeLog} || die
+	mv "${sharedir}"/${PN}/VERSION "${sharedir}"/doc/${PF}/ || die
+
+	#newicon data/images/logos/wl-ico-128.png ${PN}.png
+	#make_desktop_entry ${PN} ${PN^}
+}