gentoo resync : 15.06.2021

11 files changed, 163 insertions, 193 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 83005d0ad2af..db624e2c2534 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 2c43df92e460..66a4ba0597cb 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,3 +1,3 @@
 DIST freeciv-2.6.4.tar.bz2 52087948 BLAKE2B 00392974707d9a11e626ac7855fcb27780492b7bead020f6849726ad39833d9ada288bad7245664f8446d0905f027dccc205ee6c943361ba9ba455c55c52cd04 SHA512 4dca3a09f4538ce865f5bfef2fa0cdd00b21e30d80bd24343a6d77564bb5239101254155295ccc18593af6f9a32b77ecb8d50c38d0710a37960372e9b1227221
-EBUILD freeciv-2.6.4.ebuild 4743 BLAKE2B 617ad28e21a810514396044c77668f18f6dc2443001ffc7e62392399e3c573fc15d869daf7e18fcaa4198f261f9decf0facd4455b857a231e680cd56a9f3006a SHA512 a1961db7bc8027c1484963504c0d7a3adf9c2d3ed1e30c582379df1c55aa9074adfd9b580802f3ce35f56df953d4cd3565cd9eb52aa2cebdd7af42ec059e6717
+EBUILD freeciv-2.6.4.ebuild 4861 BLAKE2B c385708a6bba1ab946bebf957e96195ad15c9e4658a6362e287adaaa67bc781c069990a410aa41d78138025b9fea7cd7b7f3776c407dee78de4c1bb3e8088266 SHA512 b8753fd5ab8da3eddcc929c31e897a68691e85a1109bd8b07de6feeb0011aeab21ef2e9975b82cdf4563382148d2290fffdf823b675915a4ef49a46ff62e0b51
 MISC metadata.xml 1031 BLAKE2B 1421e4d2e504fbddc337b16cf2dc51af61957e954dc7c1752f537fd90ff1e3869b82c44635887dcd237eac274a5ca8b0d8c2b1cf92dd348a3301c804dd64142d SHA512 cbf6f0e418650f16f4b517895e6e03a9ffb3bdcd66563fab4ec067e6d4df79a1fb13d0cb9b7b314ad274839b430176405a3760e06a7d1f603f3464d1ff2bb201
diff --git a/games-strategy/freeciv/freeciv-2.6.4.ebuild b/games-strategy/freeciv/freeciv-2.6.4.ebuild
index 93312c18dcb0..93e090d0ab52 100644
--- a/games-strategy/freeciv/freeciv-2.6.4.ebuild
+++ b/games-strategy/freeciv/freeciv-2.6.4.ebuild
@@ -3,10 +3,12 @@
 
 EAPI=7
 
+LUA_COMPAT=( lua5-3 )
+
 MY_PV="${PV/_beta/-beta}"
 MY_PV="${MY_PV/_rc/-RC}"
 MY_P="${PN}-${MY_PV}"
-inherit desktop flag-o-matic qmake-utils xdg
+inherit desktop flag-o-matic lua-single qmake-utils xdg
 
 DESCRIPTION="Multiplayer strategy game (Civilization Clone)"
 HOMEPAGE="http://www.freeciv.org/"
@@ -20,6 +22,8 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="aimodules auth dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua"
 
+REQUIRED_USE="system-lua? ( ${LUA_REQUIRED_USE} )"
+
 RDEPEND="
 	app-arch/bzip2
 	app-arch/xz-utils
@@ -56,7 +60,7 @@ RDEPEND="
 		)
 	)
 	readline? ( sys-libs/readline:0= )
-	system-lua? ( >=dev-lang/lua-5.3:= )
+	system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}
 	!dedicated? ( x11-base/xorg-proto )
@@ -74,6 +78,8 @@ pkg_setup() {
 		ewarn "Disabling server USE flag will make it impossible to start local"
 		ewarn "games, but you will still be able to join multiplayer games."
 	fi
+
+	use system-lua && lua-single_pkg_setup
 }
 
 src_prepare() {
diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index 9e9569143cf0..f4575b612cc8 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,7 +1,7 @@
-AUX widelands-0.20-boost-1.73.patch 854 BLAKE2B 2132909f12c366c3ddb21661a96d7131574f0cd6e05a1079d8499cd0239737d7b003b342519facd4e0b6d0d3bd88f5b9b39da547e9fe6522df35203bb95db016 SHA512 1df70918c8d7e010dc5e7d2cc2b0bc67ec8cf9117bac40c6f7d870c6c09dea9dc8447683065b2b45a523695316acd9b8719bab9aaeb58cd5171771efdee95a71
-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.tar.bz2 232364340 BLAKE2B 1d8e2cd28d2ac3e2425c91a9872a3f158d7063a2c6c669d95df347561ef35dfca479fd81252d61008a3282c99a2ce70c4d904622272dd86477a731fc711306b1 SHA512 25280db6a57adeb37d13db35ce9eb41a5478534b04772240f6228c180f5a41a55fc414dab66e724945442985cbbba7a8a59a582291aca176e0bd8ae6c08760e5
-EBUILD widelands-0.20-r1.ebuild 1654 BLAKE2B 8dc4f69b3715526dd567de0a728ec306a79eb0e98c1fdaaf4fb164f04898ecc15223b58d04de10b84289ab37ba6d92d0cd1ce588a9ea6c00eff254898d1a8290 SHA512 6441ef32715bd2748dafa6130bfac8cbe2a499290139561aed0560d0baf58c43d3314eeb1fb3f5d5f784f68ff102ae7b0d1ffd4840b63e55f87c1e4756a3dd88
-EBUILD widelands-9999.ebuild 2130 BLAKE2B 13cf797bfdcb773be0098d265adce7e5497c8fc1615f019eacf995a3414ecf00c8061e721bfe02268df8741fbecc206448ede38182ef700df21567bcbe839d52 SHA512 ee7306929bc78c723070efdb570f1ac5f87e7f0c07d00b70bf25c153c91a4dd20084bc6f7d20415d6e6ab5cc71849c3ff5d30d5ea669728b3db88ae03d7951ed
-MISC metadata.xml 330 BLAKE2B 40ce3c95a2be4fd32bc1d9cc214fb4a61435b869c5d0c6406094ddab24a1e4a7b64f28b866e4c712d1d7020a047f28a239e9b8d51092242f2a43269d13934cc4 SHA512 a56671f43b3ce3e6274b9101b7c5ea1a4b2ff261fb94366e80d2655519a07c52fa0629b762d3ca76f82693075a1c717795bff2a69122938c9749ea249dc1e75d
+DIST widelands-1.0.tar.gz 792124780 BLAKE2B 03f3eeacd8a9a867020be8ed086f139dc7f2fdf30b901edfc1d86bf9c245a71c3c4358d5589f1cd7734b6ac3bf93bab38870544050628f44863decbed86f6d47 SHA512 1092750944a8669682097dfbd2b578cdb8fab377f32cb81ce8d85b9d9b2e8ae8c4c73500c0a89be649b360fd7e086e19595eba37cecb8d64679e46f7da13e46e
+DIST widelands-build21-source.tar.gz 381374149 BLAKE2B 17f0491bf7bcd10449bcc274be94aec4a0a64625c19f52426a0d460c3356e04a59b51683e72b4492ba1f62bd6ea510250c3cedda89a7588b88a0071abb1cf0cf SHA512 8d36bd0407a72e4e221155121f9ab4ce7fdfb6d81ca70a2772baf12c3397fc6abbcad5006336adb471d2c5127a90b4cda735e941d69cf779be1f923d4a38960e
+EBUILD widelands-0.21.ebuild 1294 BLAKE2B 83dd55f08b40846aa9ccbe6ae4a1a77fe70e4e700978922b2642d5ed1cc19b03300fb5b1ff4046a5c30a1f58b5b799201b93aa5799517099bec4d4d0b642fc8f SHA512 d056e4c495b2279d1d95bdb5e3cfaf141b949c5db661783c08b204e7214e6a73cc780b00c04e93fe813350da3d70dc9b961e71f924a07a2439aca952cb82a475
+EBUILD widelands-1.0.ebuild 1357 BLAKE2B 569d0090f1af86933decd1a94000198ebee6249cc9540ed6a29a969df400cb212cb3bf78b4ef47e98dc64269b369073885ed886183ca8762425c1ab53c4cc671 SHA512 3cb9ee60a48c922e1584a75ff255f97ea91c829c0be012c99ed857fb09deb1c7254c4bc2644249df8622a2a1c8c161c1dab28c35591b9347d967889e21a8e3a7
+EBUILD widelands-9999.ebuild 1357 BLAKE2B 569d0090f1af86933decd1a94000198ebee6249cc9540ed6a29a969df400cb212cb3bf78b4ef47e98dc64269b369073885ed886183ca8762425c1ab53c4cc671 SHA512 3cb9ee60a48c922e1584a75ff255f97ea91c829c0be012c99ed857fb09deb1c7254c4bc2644249df8622a2a1c8c161c1dab28c35591b9347d967889e21a8e3a7
+MISC metadata.xml 389 BLAKE2B fe4a764c97dea6a413ad64f616b14f041d94682a5bbb92f02c07506f1c727c1c391fc1beae37c01bd16471a765d8ff5c96badfbfac2ab6647c88db4afa59499f SHA512 4192abec8b668283343c9066c80d89441f7a9491078589a792e9584ab1b9195f443313434350954979acdbfa23c8c048557e1884d18d7d0cac90d63919758dfd
diff --git a/games-strategy/widelands/files/widelands-0.20-boost-1.73.patch b/games-strategy/widelands/files/widelands-0.20-boost-1.73.patch
deleted file mode 100644
index 99a8c51190b2..000000000000
--- a/games-strategy/widelands/files/widelands-0.20-boost-1.73.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/editor/ui_menus/categorized_item_selection_menu.h
-+++ b/src/editor/ui_menus/categorized_item_selection_menu.h
-@@ -124,7 +124,7 @@
- 
- 			UI::Checkbox* cb = create_checkbox(horizontal, descriptions_.get(i));
- 			cb->set_state(tool_->is_enabled(i));
--			cb->changedto.connect(boost::bind(&CategorizedItemSelectionMenu::selected, this, i, _1));
-+			cb->changedto.connect(boost::bind(&CategorizedItemSelectionMenu::selected, this, i, boost::placeholders::_1));
- 			checkboxes_[i] = cb;
- 			horizontal->add(cb);
- 			horizontal->add_space(kSpacing);
---- a/src/ui_basic/box.cc
-+++ b/src/ui_basic/box.cc
-@@ -104,7 +104,7 @@
- 	int maxbreadth = mindesiredbreadth_;
- 
- 	for (uint32_t idx = 0; idx < items_.size(); ++idx) {
--		int depth, breadth = 0;
-+		int depth = 0, breadth = 0;
- 		get_item_desired_size(idx, &depth, &breadth);
- 
- 		totaldepth += depth;
diff --git a/games-strategy/widelands/files/widelands-0.20-glvnd.patch b/games-strategy/widelands/files/widelands-0.20-glvnd.patch
deleted file mode 100644
index 94d1aa3850c7..000000000000
--- a/games-strategy/widelands/files/widelands-0.20-glvnd.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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/metadata.xml b/games-strategy/widelands/metadata.xml
index 8910ce0417b5..27ed8bc858df 100644
--- a/games-strategy/widelands/metadata.xml
+++ b/games-strategy/widelands/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">widelands/widelands</remote-id>
 		<remote-id type="launchpad">widelands</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-strategy/widelands/widelands-0.20-r1.ebuild b/games-strategy/widelands/widelands-0.20-r1.ebuild
deleted file mode 100644
index 85634c7beb17..000000000000
--- a/games-strategy/widelands/widelands-0.20-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit desktop cmake python-any-r1
-
-MY_PV="build$(ver_cut 2-)"
-MY_P="${PN}-${MY_PV/_/-}"
-
-DESCRIPTION="A game similar to Settlers 2"
-HOMEPAGE="https://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-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}
-"
-BDEPEND="
-	sys-devel/gettext
-"
-
-CMAKE_BUILD_TYPE="Release"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.20_rc1-cxxflags.patch
-	"${FILESDIR}"/${PN}-0.20-glvnd.patch
-	"${FILESDIR}"/${PN}-0.20-boost-1.73.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-0.21.ebuild b/games-strategy/widelands/widelands-0.21.ebuild
new file mode 100644
index 000000000000..398bc433cb5a
--- /dev/null
+++ b/games-strategy/widelands/widelands-0.21.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit xdg cmake python-any-r1
+
+MY_PV="build$(ver_cut 2)"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Game similar to Settlers 2"
+HOMEPAGE="https://www.widelands.org/"
+SRC_URI="https://launchpad.net/widelands/${MY_PV}/${MY_PV}/+download/${MY_P}-source.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="|| ( Apache-2.0 GPL-3 ) BitstreamVera CC-BY-SA-3.0 GPL-2 GPL-2+ MIT OFL-1.1 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/icu:=
+	media-libs/glew:0=
+	media-libs/libglvnd
+	media-libs/libpng:=
+	media-libs/libsdl2[opengl,sound,video]
+	media-libs/sdl2-image[jpeg,png]
+	media-libs/sdl2-mixer[vorbis]
+	media-libs/sdl2-ttf
+	sys-libs/zlib:=
+	virtual/libintl"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-devel/gettext"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.20_rc1-cxxflags.patch
+)
+
+src_configure() {
+	CMAKE_BUILD_TYPE="Release"
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr/bin
+		-DWL_INSTALL_BASEDIR="${EPREFIX}"/usr/share/doc/${PF}
+		-DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/${PN}
+		-DGTK_UPDATE_ICON_CACHE=OFF
+		-DOPTION_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/games-strategy/widelands/widelands-1.0.ebuild b/games-strategy/widelands/widelands-1.0.ebuild
new file mode 100644
index 000000000000..180526607235
--- /dev/null
+++ b/games-strategy/widelands/widelands-1.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit xdg cmake python-any-r1
+
+DESCRIPTION="Game similar to Settlers 2"
+HOMEPAGE="https://www.widelands.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/widelands/widelands.git"
+else
+	SRC_URI="https://github.com/widelands/widelands/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="|| ( Apache-2.0 GPL-3 ) BitstreamVera CC-BY-SA-3.0 GPL-2 GPL-2+ MIT OFL-1.1 ZLIB"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/icu:=
+	media-libs/glew:0=
+	media-libs/libglvnd
+	media-libs/libpng:=
+	media-libs/libsdl2[opengl,sound,video]
+	media-libs/sdl2-image[jpeg,png]
+	media-libs/sdl2-mixer[vorbis]
+	media-libs/sdl2-ttf
+	net-misc/curl
+	sys-libs/zlib:=
+	virtual/libintl"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-devel/gettext"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.20_rc1-cxxflags.patch
+)
+
+src_configure() {
+	CMAKE_BUILD_TYPE="Release"
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr/bin
+		-DWL_INSTALL_BASEDIR="${EPREFIX}"/usr/share/doc/${PF}
+		-DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/${PN}
+		-DGTK_UPDATE_ICON_CACHE=OFF
+		-DOPTION_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/games-strategy/widelands/widelands-9999.ebuild b/games-strategy/widelands/widelands-9999.ebuild
index d258fbdebb23..180526607235 100644
--- a/games-strategy/widelands/widelands-9999.ebuild
+++ b/games-strategy/widelands/widelands-9999.ebuild
@@ -1,93 +1,61 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
-inherit cmake python-any-r1 xdg
+inherit xdg cmake python-any-r1
 
-MY_PV="build$(ver_cut 2-)"
-MY_P="${PN}-${MY_PV/_/-}"
-
-DESCRIPTION="A game similar to Settlers 2"
+DESCRIPTION="Game similar to Settlers 2"
 HOMEPAGE="https://www.widelands.org/"
 
-if [[ "${PV}" == *9999 ]] ; then
+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}"
+	SRC_URI="https://github.com/widelands/widelands/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
-LICENSE="GPL-2+"
+LICENSE="|| ( Apache-2.0 GPL-3 ) BitstreamVera CC-BY-SA-3.0 GPL-2 GPL-2+ MIT OFL-1.1 ZLIB"
 SLOT="0"
-IUSE=""
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 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/libpng:=
+	media-libs/libsdl2[opengl,sound,video]
 	media-libs/sdl2-image[jpeg,png]
 	media-libs/sdl2-mixer[vorbis]
 	media-libs/sdl2-ttf
-	sys-libs/zlib:=[minizip]"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-"
+	net-misc/curl
+	sys-libs/zlib:=
+	virtual/libintl"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost"
 BDEPEND="
-	sys-devel/gettext
-"
-
-CMAKE_BUILD_TYPE="Release"
+	${PYTHON_DEPS}
+	sys-devel/gettext"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.20_rc1-cxxflags.patch"
+	"${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
+	CMAKE_BUILD_TYPE="Release"
 
-		# -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"
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr/bin
+		-DWL_INSTALL_BASEDIR="${EPREFIX}"/usr/share/doc/${PF}
+		-DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/${PN}
+		-DGTK_UPDATE_ICON_CACHE=OFF
+		-DOPTION_BUILD_TESTS=$(usex test)
 	)
-	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^}
+	cmake_src_configure
 }