gentoo resync : 03.03.2021

7 files changed, 39 insertions, 146 deletions

diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index 0a7b0cf7a405..3497b34a054f 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/sumwars/Manifest b/games-rpg/sumwars/Manifest
index 4cb596ae9f3c..438a805cd294 100644
--- a/games-rpg/sumwars/Manifest
+++ b/games-rpg/sumwars/Manifest
@@ -1,5 +1,4 @@
 AUX sumwars-0.5.8-cmake_lua_version.patch 286 BLAKE2B abe2013a9e0928cac9625719014eeb3cae3592938fc16930c73d6ffebf188c1b4120abc51d9c0a77896479384e9153cceb25ff87b30390873690b7d23b71b975 SHA512 5962aa04b8c296b30248de424375107274119971e9db3020d0b66f121b36cb65f840423a097839674311ffa986d73a93e735c6e4fb592a971c6eec890c9e4af1
 DIST sumwars-0.5.8-src.tar.bz2 107811288 BLAKE2B d7eef29ae9ba91d7a368730169d49c4b84e5db5cdbd4be7aa183e91baa50fd45be2b91928903e9cb17d947c2a4947094138c65efe076cdc85f14fbfacadddbd1 SHA512 ccf156f4484b0aeb8984631321d6691dc180ad63fdfa59d92aaa05ada3e871fc10656f32f9ba1b65abe7342e1481e14ca01f025ffc0ec5797cd8e91d97240cf1
-EBUILD sumwars-0.5.8-r1.ebuild 1917 BLAKE2B 270f82d9eb275df0f211ffdf752e8278190d37a1f9b5954406d2e33c094e6fd684f6a4f9be68b7f9ad17d570f95a12bf0c636a72a45aa0730ad06a354c0bda18 SHA512 35ec46e0888370d1d896c154089e9d65dba0a86ff81decbc6dc2bb6c0478b1bc6b45e2062586d3b272ad7d20a2925189755a0ffe64ba708182a98fa93224eb73
 EBUILD sumwars-0.5.8-r100.ebuild 2053 BLAKE2B 290340af0e0a176c5f20ccd4a7be053a1cc849c1f4567691fe13f5704c7babfc8fbe8292f399e2c57c61b78d4f3f1f8ef8a1e39b006912be9bc7295f7e0b4111 SHA512 a856057bdbbb59b88a7099961ebe7a65e129533c303945bf7e7759c5e025b36732317a472ea51d76e170c9f66f490af47f41110c5c56f3dbd6e01e8d97e2c899
 MISC metadata.xml 521 BLAKE2B 773a7729ffb1deb23e15e7ad061596099bfce5e590fd6a4dd04014527df7ab7a91384b86429221960e54331ab094472277e0f23a9ea8e61f1b02a869437a57a7 SHA512 8ff8a6777a1d50900f210f97c22a80c68491d452c550550578cd0481653d4dbc52e3e88ae40dfcd547c62f0f43ad15c5d766330522e04a096c59a93265a470c0
diff --git a/games-rpg/sumwars/sumwars-0.5.8-r1.ebuild b/games-rpg/sumwars/sumwars-0.5.8-r1.ebuild
deleted file mode 100644
index caba1802db8a..000000000000
--- a/games-rpg/sumwars/sumwars-0.5.8-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils eutils flag-o-matic gnome2-utils
-
-DESCRIPTION="a multi-player, 3D action role-playing game"
-HOMEPAGE="http://sumwars.org"
-SRC_URI="mirror://sourceforge/sumwars/${P//_/-}-src.tar.bz2"
-
-LICENSE="GPL-3 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+tools debug"
-
-LANGS="de en it pl pt ru uk"
-for L in ${LANGS} ; do
-	IUSE="${IUSE} l10n_${L}"
-done
-unset L
-
-RDEPEND="
-	>=dev-games/cegui-0.8[ogre]
-	>=dev-games/ogre-1.7.4-r1[freeimage,opengl]
-	dev-games/ois
-	dev-games/physfs
-	>=dev-lang/lua-5.1:0
-	>=dev-libs/tinyxml-2.6.2-r2
-	media-libs/freealut
-	media-libs/openal
-	media-libs/libogg
-	media-libs/libvorbis
-	>=net-libs/enet-1.3.0
-	x11-libs/libX11
-	x11-libs/libXrandr
-	tools? ( dev-libs/boost )"
-DEPEND=${RDEPEND}
-
-S=${WORKDIR}/${PN}-${PV%_*}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-
-	use debug && CMAKE_BUILD_TYPE=Debug
-
-	local l langs
-	for l in ${LANGS}; do
-		if use l10n_${l}; then
-			langs="${langs} ${l}"
-		fi
-	done
-
-	[[ -z "${langs}" ]] && langs="en"
-
-	# configure sumwars with cmake
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX=""
-		-DSUMWARS_BUILD_TOOLS="$(usex tools)"
-		-DSUMWARS_DOC_DIR="/usr/share/doc/${PF}"
-		-DSUMWARS_EXECUTABLE_DIR="/usr/bin"
-		-DSUMWARS_LANGUAGES="${langs}"
-		-DSUMWARS_NO_ENET=ON
-		-DSUMWARS_NO_TINYXML=ON
-		-DSUMWARS_PORTABLE_MODE=OFF
-		-DSUMWARS_POST_BUILD_COPY=OFF
-		-DSUMWARS_RANDOM_REGIONS=ON
-		-DSUMWARS_SHARE_DIR="/usr/share/${PN}"
-		-DSUMWARS_STANDALONE_MODE=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	newicon -s 128 share/icon/SumWarsIcon_128x128.png ${PN}.png
-	make_desktop_entry ${PN} "Summoning Wars"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/zsdx/Manifest b/games-rpg/zsdx/Manifest
index e486a3865c69..b0c2274e08a8 100644
--- a/games-rpg/zsdx/Manifest
+++ b/games-rpg/zsdx/Manifest
@@ -1,3 +1,3 @@
-DIST zsdx-1.9.0.tar.gz 20757184 BLAKE2B 392aa36cfddaa82367cd3aa6769ffeb95f5e7235b5574d2793af629f289da107a67b70bfc2ad7d86651d2145a3f956bc000102919ca65ee18a1d83eac282d119 SHA512 2fc540d19856734050674945dd4903f254b325cab08ae0199722ae014447523ad9e979b54ddfd59d5cbc290b783481c79d5e155115c90f24feab5587d52804ee
-EBUILD zsdx-1.9.0-r1.ebuild 1130 BLAKE2B 24034d6b972196710ca4d9921c941bc661e0c05ece6dc5680e181ef884d225c1c1694843131c9c2cd2c0ebc792052d2e4dcb96d828fca5d6296ceff3427a5115 SHA512 29d003036632b3ac85d49db00ba01667ec31e20400d99bb49a67c6bb0743edf9ccac64972556b0b492ce064216d6e47d64b9f3b68948a39d3c1fcbb21ad62735
+DIST zsdx-zsdx-1.9.0.tar.gz 20760682 BLAKE2B 7063b7bc34a03c5e1879eaae78d28dcf28ae9799eed2ef2b4422f3fad709234ae6ebb67f641d76df370b27b72eb6f9ed6d611b8bead37b87287637cb28b072cb SHA512 673a7db1dadfae09df23b189b9e18af1182cb731897e4067f47867387c04b21308991116c6f840cb228adee9c459565c2f5e6f1a01e885ea23c00347d4d64540
+EBUILD zsdx-1.9.0-r1.ebuild 1136 BLAKE2B d5f5350b45db9affff5c685f542a2686d89bb7508e55714a6741059a52922773f1ad8b0e664aff46abbd0e626f80744ce9b0febfa3b0e54801e0996bacc9b3c1 SHA512 93406617f8762a1a6a24a0331d61856451fc7fcf2fef2d33ad2e539529fabe9ecf5933ada5418ea72ff9e4625efecc807785729ec99663440ac632f6b769f34c
 MISC metadata.xml 333 BLAKE2B 34c8b3d3b3ef4c78241d40bd05613959e3d541561f6973c47c57489b0eea0e84ef21909fcb21102bdb4b5eaf0b8051c075a9649fe0975ead3c4cd1ff4c1471f7 SHA512 8135204b08f68188a8dc178b3083600e01a860b043cbc26415a111f6b23030cc067754dff74d77ac476e757caece3d44688f12126e81c17eaff74e4840f59ec9
diff --git a/games-rpg/zsdx/zsdx-1.9.0-r1.ebuild b/games-rpg/zsdx/zsdx-1.9.0-r1.ebuild
index dc00fda49542..ac6267f86cb6 100644
--- a/games-rpg/zsdx/zsdx-1.9.0-r1.ebuild
+++ b/games-rpg/zsdx/zsdx-1.9.0-r1.ebuild
@@ -1,12 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit cmake-utils eutils gnome2-utils
+EAPI=7
 
-DESCRIPTION="A free 2D Zelda fangame"
-HOMEPAGE="http://www.solarus-games.org/"
-SRC_URI="http://www.zelda-solarus.com/downloads/${PN}/${P}.tar.gz"
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake desktop xdg
+
+DESCRIPTION="Free 2D Zelda fangame"
+HOMEPAGE="https://www.solarus-games.org/"
+SRC_URI="https://gitlab.com/solarus-games/${PN}/-/archive/${PN}-${PV}/${PN}-${PN}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-${PV}"
 
 LICENSE="all-rights-reserved CC-BY-SA-3.0 GPL-3"
 SLOT="0"
@@ -20,34 +23,28 @@ RDEPEND="
 "
 DEPEND="app-arch/zip"
 
+DOCS=( ChangeLog readme.txt )
+
+src_prepare() {
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DSOLARUS_INSTALL_DATAROOTDIR="/usr/share"
 		-DSOLARUS_INSTALL_BINDIR="/usr/bin"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	newicon -s 48 build/icons/${PN}_icon_48.png ${PN}.png
 	newicon -s 256 build/icons/${PN}_icon_256.png ${PN}.png
 
 	# install proper wrapper script
-	rm -f "${ED}"/usr/bin/${PN}
+	rm "${ED}"/usr/bin/${PN} || die
 	make_wrapper ${PN} "solarus \"/usr/share/solarus/${PN}\""
 
 	make_desktop_entry "${PN}" "Zelda: Mystery of Solarus DX"
 }
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/zsxd/Manifest b/games-rpg/zsxd/Manifest
index b730b625bc28..3251ad53e721 100644
--- a/games-rpg/zsxd/Manifest
+++ b/games-rpg/zsxd/Manifest
@@ -1,3 +1,3 @@
-DIST zsxd-1.9.0.tar.gz 3706125 BLAKE2B 3d83fff945bfecc387b79126628e3d1f45a461ae7b58b702dbe0c0f1799d6b57c53ecd4b1bfeb7a9ccebd279a3b299da8c328a2aca3126bea09f4865e1bfea1e SHA512 cecb8b4ff40b7129bb516cf71e9bbbc92e10ace944c735eb2885dbf0e0b8adef80491c1874ee91efb2c9779b819d0217639fe85f9e3a085c980af6a2972e571e
-EBUILD zsxd-1.9.0-r1.ebuild 1221 BLAKE2B 522806ed5eeb62fb95c5f59b79ef96f5995b4b877398bd1da3c80bcc7a65b29ca8f6c4ca3c6b17a7f24663d97f5c202e6b75715933a2546084307abe34767a21 SHA512 8ad18d02ef616549686d705f085f3d2145f37c03330e01e5021a6b4df6e57e1bf62cf815c1652429318d0adc1b1eef408e27335a66fb9acf35799682f9ae4f1f
+DIST zsxd-zsxd-1.9.0.tar.gz 3690390 BLAKE2B c5b6a671c5b5f8ba702ba23f447c0858aa870730a752761f65092b8e1f4a0879f2877fabf0e52a71be380ff25628f0be94f01f6a02009bfe4f7d1952f50ba5f4 SHA512 a457374adc7a8f4b7872b6f6693051d1499320f4349d55009e581132b62f5eebd6e35cc80c1ac14c5c80b74145fb7ac26b312f3f329df71c36e71d9a38383f05
+EBUILD zsxd-1.9.0-r1.ebuild 1154 BLAKE2B cc093c3a0bcf6bf60a90de29a2368a71a5e12ea9c9d55099da6f1593f7213f9579ad4874470de35f00c01b911275382549ee1b770f8fcf1df06268b830888ba4 SHA512 4de13ed1924b8a55d2217986aafea1f319f5b327ead84b3a973b5d7588bfb9118d551660db50c055c5f87107f92d344ce7b4318d187f61fae39b34c4a4d55f87
 MISC metadata.xml 333 BLAKE2B 81d8a164a8319a24109c072f73e7959380cee2aef798b0ccceb6100825abfe51a6267f1e4f44da5c5ad4ec8881a36e09ac0a38187d936924e0ee85ebe59ee274 SHA512 bb078fd150a98e9326870e54347db0f9962d1f00707d7dcae5814808946e1ca673c45073d9bf886d6cb1d456e3ece9a236c6bb1b8448c3b9d9ef583acdf731f4
diff --git a/games-rpg/zsxd/zsxd-1.9.0-r1.ebuild b/games-rpg/zsxd/zsxd-1.9.0-r1.ebuild
index 76a8fc0fe7f1..b8e0195e4681 100644
--- a/games-rpg/zsxd/zsxd-1.9.0-r1.ebuild
+++ b/games-rpg/zsxd/zsxd-1.9.0-r1.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils gnome2-utils cmake-utils
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake desktop xdg
 
-DESCRIPTION="A free 2D Zelda fangame parody"
-HOMEPAGE="http://www.solarus-games.org/"
-SRC_URI="http://www.zelda-solarus.com/downloads/${PN}/${P}.tar.gz"
+DESCRIPTION="Free 2D Zelda fangame parody"
+HOMEPAGE="https://www.solarus-games.org/"
+SRC_URI="https://gitlab.com/solarus-games/${PN}/-/archive/${PN}-${PV}/${PN}-${PN}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-${PV}"
 
 LICENSE="all-rights-reserved CC-BY-SA-3.0 GPL-3"
 SLOT="0"
@@ -15,14 +17,16 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="mirror bindist"
 
-RDEPEND=">=games-engines/solarus-1.3.1-r1
-	<games-engines/solarus-1.4.0"
+RDEPEND="
+	>=games-engines/solarus-1.3.1-r1
+	<games-engines/solarus-1.4.0
+"
 DEPEND="app-arch/zip"
 
 DOCS=( ChangeLog readme.txt )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -30,29 +34,17 @@ src_configure() {
 		-DSOLARUS_INSTALL_DATAROOTDIR="/usr/share"
 		-DSOLARUS_INSTALL_BINDIR="/usr/bin"
 	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	newicon -s 48 build/icons/${PN}_icon_48.png ${PN}.png
 	newicon -s 256 build/icons/${PN}_icon_256.png ${PN}.png
 
 	# install proper wrapper script
-	rm -f "${ED%/}/usr/bin/${PN}
-	make_wrapper ${PN} "solarus \"/usr/share/solarus/${PN}\"
+	rm "${ED}"/usr/bin/${PN} || die
+	make_wrapper ${PN} "solarus \"/usr/share/solarus/${PN}\""
 
 	make_desktop_entry "${PN}" "Zelda: Mystery of Solarus XD"
 }
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}