gentoo resync : 12.03.2021

12 files changed, 104 insertions, 137 deletions

diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index b5f8728c1356..634db315da9d 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/clanbomber/Manifest b/games-action/clanbomber/Manifest
index 85651a00de3d..1d7ac2660842 100644
--- a/games-action/clanbomber/Manifest
+++ b/games-action/clanbomber/Manifest
@@ -1,3 +1,3 @@
 DIST clanbomber-2.2.0.tar.xz 2118672 BLAKE2B fd384d01552231fb3d823b07a1248c6ca0d1c5bb5f7f8d7dae3a71387d457d789c2dfabb69817233fac95699b9bd96e52846e736de8c55735bb67be7edb5b158 SHA512 307921d118286dcfd29ce96e0a35dfdc389dae6bd71a7dfd088311f611a75b167c1018542b5dc59c26bfb808a985011f6691c297cc8dd472da0fe5e005a401d5
-EBUILD clanbomber-2.2.0.ebuild 1007 BLAKE2B f8d0159e1a9fa401fb8c20151dc1af8fb0e42d3a3096655dec4479a5922485d8dfd34149d120e09b8b651dead12537edfec6f9d0284c65197816b67c63ef368f SHA512 21c77a4ac41feaeda27d73d1f2a08662e0b0e45f3ff0a41b41a09d6f7a6659aea531dab21eae221e8e286a7df8a040e60d80da6734c4f1af66d32f67876bd27d
+EBUILD clanbomber-2.2.0.ebuild 1017 BLAKE2B 8866cb090d111d0c4c84a8a153f1269fa803c7ce8630ae12776d42023f8fe39b68df73689adac4009c2ffb539f2a98d8842fd6d1e850b2b1ce287f9118353c51 SHA512 b439dd377a05ac6d2328f83a572abe898d12dd28097523b215ff8ad98cd072a18fc8b45a4e9e0d6a4805a8f1006292f0193fc1b61987bdaf7335cd76f0e36300
 MISC metadata.xml 755 BLAKE2B 6d1d3b5426723f6b8f98d4fb59a2bc098323f34bb1b0ad99b7296debdd3e216075fc4ee8b38c29ff78e1cdb0dfb877d205f14a97ba66348a3dde51afa5255245 SHA512 b46a19a5ba071d38cc18c23019d0077893ac8f1303aba357343afe129ad4f7f6e3b194f765485945712cef788291c93a105ba59c9e94dc507937d9f78f28b387
diff --git a/games-action/clanbomber/clanbomber-2.2.0.ebuild b/games-action/clanbomber/clanbomber-2.2.0.ebuild
index 4458ddf64950..71f15a7e73ad 100644
--- a/games-action/clanbomber/clanbomber-2.2.0.ebuild
+++ b/games-action/clanbomber/clanbomber-2.2.0.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=7
 
-inherit autotools
+inherit autotools desktop
 
 DESCRIPTION="Bomberman-like multiplayer game"
 HOMEPAGE="https://savannah.nongnu.org/projects/clanbomber/"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.xz"
+SRC_URI="https://download.savannah.gnu.org/releases/${PN}/${P}.tar.xz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
diff --git a/games-action/lugaru/Manifest b/games-action/lugaru/Manifest
index 8ff640b2f526..6ba8018c1b33 100644
--- a/games-action/lugaru/Manifest
+++ b/games-action/lugaru/Manifest
@@ -1,5 +1,3 @@
-AUX lugaru-20151204-dir.patch 317 BLAKE2B 47b73dad97c8a853eb14d6718db18e0541607770419da6b95eb56791f5629a0ebcb1600506934aea30d3cb216c91d38fa8cf45735b0049435693a39a229c48aa SHA512 c0830385ca57dfda082596f65e7166ba71148fcb2b99e416a4a6ef8882c280a823e6308fce9fcfab62127667a10f0ed0ef49df60f1f39627615ff21c9ffd62e2
-AUX lugaru-20151204-jpeg-9c.patch 362 BLAKE2B 5d3da9005dc4f9b957c36e5bb9e9b4453fd4794b5adb611f6ddd1b2f810765dd069747bc98a9df79d4a670baf919fc350902ea72bf6129f97528462173e3335c SHA512 12fea82021782563efab139a9a7e1b0d9aed9ee708e833552ec15ddcaad91a3c8fce37859d174eb86c0861717e594750d704c712cbaa9772c82c66bb13bc3e83
-DIST lugaru-20151204.tar.bz2 88950866 BLAKE2B d1d42f8d06d20d8f06fbe52d95c925fefc0453cc577dc5a023189eb77508361737ab01298f2035c3071ac7f8a239ee47c13bb8bafa852dd3b5cdecc971e9b4ed SHA512 8e448b782847376ac10585996a91a571fd005ac51e0e510765a35bf44bfcbb09e566d9a9c3d87277e69511b0f8d74c04edcc4b59f467bed640d8ba7c74045e30
-EBUILD lugaru-20151204-r1.ebuild 1130 BLAKE2B 1db1609ab7e2f212aac8199682a94be8fe37118f5eb5ee3a28a1d112470f914c37cfde4b2c2249d929d2e775b5467a75f9cae494330f1daab35dcd3a12f41075 SHA512 7238109349fe113ea8fb2e7391711ab9d8ed8dcf128990dc15de12434e2cf2d3204b8b1f355825a010e9c99fd65801f0c0f090488a121cd2c406ad1684895223
-MISC metadata.xml 337 BLAKE2B 5fa6d71103f9aad7af7d0766be33b63f5dcdcbba20c043a2d1183b18a23f4910d49d411defb7f1c604ef085437956af72a55fa366734be5827a3d736bc71f72f SHA512 10af1cda47d8d683fc8245f23c05243fb5809636399d75779081a3da09209829da31a8d5fa070687656e9c235e78c75f1571b5b4f1a686359a11d1232a543b5e
+DIST lugaru-1.2.tar.bz2 35508563 BLAKE2B f7b50ce7b2e65e64ba52d5b9f564cf4ba27c2ae17589297f9b63c4b5ae660c2abb9830ce16e5e02881cd58aa48b5bbe90a877a061f3b2aebbcd52cb6ca7a6192 SHA512 091f588523721617b973d72a26c0cfbeb75fe519707faefd00652cfd770b3be463b61b5c2be3721c644aac2337fa8f8455bc43a461b5a19b4c0e9741b517b9a4
+EBUILD lugaru-1.2.ebuild 734 BLAKE2B ffb5125cd9edcb9ef4a16d9a91118ef14dd969c6a7b81379bbd88ef39cd3b16780a357aa980c9c62c4a297f1103888c45a389a94752e8a519ad47519dcb848a2 SHA512 97ba97b7ebcb881d9c8a8f4068f8545a7a9848e20ad17fdf7f8032a973f84b26e901bec6558e079fbae10809bd026e9acfadf3a8be3c32b606f582b5cdddcaa9
+MISC metadata.xml 334 BLAKE2B 27b19191231fc5869b0bfcefdb14a39121139ad42f77cb038e3c3b215843eef9d2517cb094ce1170807e11501c7251f26c27f6c31921b36534e4f259d3af9be1 SHA512 ee81651c5187b4510b7a7e9892ee4bab5b57847f2804ab0a8ab1d7362957c0b6e5da0ef32590c8ba15583739ac9ee0e6909a0ff8a83afdcc9c2882454916ae1d
diff --git a/games-action/lugaru/files/lugaru-20151204-dir.patch b/games-action/lugaru/files/lugaru-20151204-dir.patch
deleted file mode 100644
index da9310dde58e..000000000000
--- a/games-action/lugaru/files/lugaru-20151204-dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Source/OpenGL_Windows.cpp	2015-01-14 23:57:19.799186785 -0500
-+++ b/Source/OpenGL_Windows.cpp	2015-01-14 23:57:36.022643953 -0500
-@@ -1330,7 +1330,7 @@
- 
-     // !!! FIXME: we could use a Win32 API for this.  --ryan.
- #ifndef WIN32
--    chdirToAppPath(argv[0]);
-+    chdir("@GENTOO_DIR@");
- #endif
- 
- 	LOGFUNC;
diff --git a/games-action/lugaru/files/lugaru-20151204-jpeg-9c.patch b/games-action/lugaru/files/lugaru-20151204-jpeg-9c.patch
deleted file mode 100644
index ac0ee48f62d6..000000000000
--- a/games-action/lugaru/files/lugaru-20151204-jpeg-9c.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/652930
-
---- a/Source/OpenGL_Windows.cpp
-+++ b/Source/OpenGL_Windows.cpp
-@@ -839,7 +839,7 @@
-     (void) jpeg_read_header(&cinfo, TRUE);
- 
-     cinfo.out_color_space = JCS_RGB;
--    cinfo.quantize_colors = 0;
-+    cinfo.quantize_colors = FALSE;
-     (void) jpeg_calc_output_dimensions(&cinfo);
-     (void) jpeg_start_decompress(&cinfo);
- 
diff --git a/games-action/lugaru/lugaru-1.2.ebuild b/games-action/lugaru/lugaru-1.2.ebuild
new file mode 100644
index 000000000000..f5db0e2ec427
--- /dev/null
+++ b/games-action/lugaru/lugaru-1.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="3D arcade with unique fighting system and anthropomorphic characters"
+HOMEPAGE="https://osslugaru.gitlab.io/"
+SRC_URI="https://gitlab.com/osslugaru/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0 CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/jsoncpp:=
+	media-libs/libpng:0=
+	media-libs/libsdl2:=[opengl,video]
+	media-libs/libvorbis:=
+	media-libs/openal:=
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSTEM_INSTALL=ON
+	)
+	cmake_src_configure
+}
diff --git a/games-action/lugaru/lugaru-20151204-r1.ebuild b/games-action/lugaru/lugaru-20151204-r1.ebuild
deleted file mode 100644
index 5b6ae2298770..000000000000
--- a/games-action/lugaru/lugaru-20151204-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop
-
-DESCRIPTION="3D arcade with unique fighting system and anthropomorphic characters"
-HOMEPAGE="https://bitbucket.org/osslugaru/lugaru/wiki/Home"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2+ free-noncomm CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libpng:0=
-	media-libs/libsdl:=[opengl,video]
-	media-libs/libvorbis:=
-	media-libs/openal:=
-	sys-libs/zlib:=
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-dir.patch
-	"${FILESDIR}"/${P}-jpeg-9c.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -i \
-		-e "s:@GENTOO_DIR@:/usr/share/${PN}:" \
-		Source/OpenGL_Windows.cpp || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=TRUE
-		-DLUGARU_FORCE_INTERNAL_OPENGL=False
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/lugaru
-	insinto /usr/share/${PN}
-	doins -r Data
-	newicon Source/win-res/Lugaru.png ${PN}.png
-	make_desktop_entry ${PN} Lugaru ${PN}
-}
diff --git a/games-action/lugaru/metadata.xml b/games-action/lugaru/metadata.xml
index f50d5486c2ab..14d1d733cdd3 100644
--- a/games-action/lugaru/metadata.xml
+++ b/games-action/lugaru/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="bitbucket">osslugaru/lugaru</remote-id>
+		<remote-id type="gitlab">osslugaru/lugaru</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-action/supermariowar/Manifest b/games-action/supermariowar/Manifest
index c27cbf5c08fe..b9f8750fe2f7 100644
--- a/games-action/supermariowar/Manifest
+++ b/games-action/supermariowar/Manifest
@@ -1,5 +1,6 @@
 AUX smwd.initd 902 BLAKE2B 51705ecd466e19f809d9a31dd33a20290fd0aa27832fe52514f1eaffb2ddd89787ff41420614773767c85ade56cccf8bcfb7241d07db47fddbea77c3d94d8b02 SHA512 0c3c9efaa9d239899abf754dee6af71b59f4706e057484502e76abbc0b8ae3a620581c0b3eb7a7ef2f2d050676de46854b033c34d87596b18f195fb7d19495a0
+AUX supermariowar-2.0_beta1-cmake-add_library-static.patch 541 BLAKE2B 5205bfc5e733b2523fd05d859158bff31b41d749bd0177040b60a449ab147d3a4eea85eea7172e635ef707d40845cdf18393fef81dfafa38b67bbd53f0f2d8f0 SHA512 87ecebe43ab12abf748460500a235f88f0b28ec2353aee3b296cbc4bd59b320c08a991fa8ec564526e06c5de4adbfb4bf467fc3f114927262f100b69f0ed974e
 AUX supermariowar-2.0_beta1-yaml-cpp-config.cmake 655 BLAKE2B 036aef4603f0cb91de6ece5c5de86fa8fa0e440398e022e4f560764a38030b9fead1ed127b9aebf6a97948660b2c999b20da3791b08691883b7c6e2c80166191 SHA512 a43d28d12962f23a0689533315415597e046bcb09c28a1457d2320da00e376e39939b89839b60e73f368c044ced42b5ccdb909dcdc40a1a345b70fa313ba0bfa
 DIST supermariowar-2.0_beta1.tar.gz 13545366 BLAKE2B 497f8d4a8b6e7073c07f2da56e1ace71354fc898660ff866f19ff1d8737e56358eb500d0994dfeeea640dc3ac5aa509be7f31daa75305afc72df8f1497cd5211 SHA512 0849d23ea613d69f32c184dd5f470815a4c68b15836e46e40c30c5a3a6ea2216d4d3305f356e8fdd5b42f4008d9b07f0b9fac84b9f801a4b9f888ba188c56e0b
-EBUILD supermariowar-2.0_beta1-r1.ebuild 2442 BLAKE2B 892359f832d79345eb667a019767a6a2cbd0f2230de136183083ff3b42bf34c310003318c0ab82c201e66e6586ca2606ac00af5133791337b39a0f9b1ba40b07 SHA512 598e5d937dd5099233fa5817f4110e7ff486d4247d55d0b38b0e4bf261351750a5b371f45f0cf9c0949b39271371eb382e9b64954b032f34d144e75c81704ecf
+EBUILD supermariowar-2.0_beta1-r1.ebuild 2361 BLAKE2B d5e3172a564878ebfdc37c84e74890263ad20cbfe268e5b26cfd9497152bcf06515676d4a0dd7948f5a55cede971a5219c89b4e60a871c44773f0468eca5e0d8 SHA512 ec7a4eada56cb0f1deaff81377d5451873c64225e71de1421f410012b79428ba4c26c61ecc7e986ca60bfe0198936d1fed21fb65fab913f538e588cec475b18a
 MISC metadata.xml 430 BLAKE2B 020d88a651b04c55427bd67c3ab8efae38575b634ac31ac8b4be8b1527b4f61dd7adb3eb171457fffc83fec10f1a432e280ebce5b25a8a1e32f86a13db3f83fe SHA512 7f7e6599a60ee829ecc2a7db5d956c6ac23b8e213d2e56d8c414a30e1dc7ea5577c080bb79430287ae6df8cae863c99a268fabc0ca2cc06c7d301cc7d9668df1
diff --git a/games-action/supermariowar/files/supermariowar-2.0_beta1-cmake-add_library-static.patch b/games-action/supermariowar/files/supermariowar-2.0_beta1-cmake-add_library-static.patch
new file mode 100644
index 000000000000..2ecc26977598
--- /dev/null
+++ b/games-action/supermariowar/files/supermariowar-2.0_beta1-cmake-add_library-static.patch
@@ -0,0 +1,18 @@
+Fix linking with BUILD_SHARED_LIBS=ON default in EAPI-7
+
+--- a/src/common_netplay/CMakeLists.txt
++++ b/src/common_netplay/CMakeLists.txt
+@@ -1,4 +1,4 @@
+ 
+ if(NOT NO_NETWORK)
+-    add_library(NetplayFiles platform_enet/NetPeerENet.cpp)
++    add_library(NetplayFiles STATIC platform_enet/NetPeerENet.cpp)
+ endif()
+--- a/src/common/CMakeLists.txt
++++ b/src/common/CMakeLists.txt
+@@ -39,4 +39,4 @@
+     list(APPEND COMMON_SRCS src/savepng.cpp)
+ endif()
+ 
+-add_library(CommonFiles ${COMMON_SRCS})
++add_library(CommonFiles STATIC ${COMMON_SRCS})
diff --git a/games-action/supermariowar/supermariowar-2.0_beta1-r1.ebuild b/games-action/supermariowar/supermariowar-2.0_beta1-r1.ebuild
index 3a70f45083a9..193bd23cf4a5 100644
--- a/games-action/supermariowar/supermariowar-2.0_beta1-r1.ebuild
+++ b/games-action/supermariowar/supermariowar-2.0_beta1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils cmake-utils versionator
+inherit cmake
 
-MY_PV=$(replace_version_separator 2 '-')
+MY_PV=$(ver_rs 2 '-')
 MY_PV="${MY_PV/beta1/beta.1}"
 MY_PN="smw"
 
@@ -19,91 +19,87 @@ KEYWORDS="amd64 x86"
 IUSE="server"
 
 RDEPEND="
-	sys-libs/zlib:=
 	dev-cpp/yaml-cpp
-	net-libs/enet:1.3=
 	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-image[png,jpeg]"
-
-DEPEND="
-	${RDEPEND}
+	media-libs/sdl-image[png,jpeg]
+	net-libs/enet:1.3=
+	sys-libs/zlib:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-arch/unzip
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
+PATCHES=( "${FILESDIR}"/${P}-cmake-add_library-static.patch )
+
 src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
+	default
+	pushd "${S}" || die
 	unpack ./data.zip
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	einfo "Copying Findyaml-cpp.cmake"
-	cp "${FILESDIR}/${P}-yaml-cpp-config.cmake" cmake/Findyaml-cpp.cmake || die
-	eend $?
+	cp "${FILESDIR}"/${P}-yaml-cpp-config.cmake cmake/Findyaml-cpp.cmake || die
+	popd || die
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_STATIC_LIBS=OFF
-		-DSMW_BINDIR="${EPREFIX}/usr/bin"
-		-DSMW_DATADIR="${EPREFIX}/usr/share/${PF}"
+		-DSMW_BINDIR="${EPREFIX}"/usr/bin
+		-DSMW_DATADIR="${EPREFIX}"/usr/share/${PF}
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	local bin
-	for bin in "${ED}/usr/bin"/*; do
-		chmod 0755 "${bin}" || die
+	for bin in "${ED}"/usr/bin/*; do
+		chmod 0755 ${bin} || die
 	done
 
 	local smw_datadir="usr/share/${PF}"
 	local smw_bindir="${smw_datadir}/bin"
-	mkdir -p "${ED}/${smw_bindir}" || die
+	mkdir -p "${ED}"/${smw_bindir} || die
 
-	einfo "Moving ${PN} binary files to /${smw_bindir}"
-	mv "${ED}/usr/bin"/* "${ED}/${smw_bindir}" || die
+	ebegin "Moving ${PN} binary files to /${smw_bindir}"
+	mv "${ED}"/usr/bin/* "${ED}"/${smw_bindir} || die
 	eend $?
 
 	local base_bin
-	for bin in "${ED}/${smw_bindir}"/*; do
-		base_bin=$(basename "${bin}")
-		einfo "Creating ${base_bin} launcher in /usr/bin"
-		cat << EOF > "${base_bin}" || die
+	for bin in "${ED}"/${smw_bindir}/*; do
+		base_bin=$(basename ${bin})
+		ebegin "Creating ${base_bin} launcher in /usr/bin"
+		cat << EOF > ${base_bin} || die
 #!/usr/bin/env bash
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 # ${PF} launcher: ${base_bin}
 exec /${smw_bindir}/${base_bin} /${smw_datadir}
 EOF
-		dobin "${base_bin}"
+		dobin ${base_bin}
 		eend $?
 	done
 
 	if use server; then
-		local smw_server="${BUILD_DIR}/Binaries/Release/${MY_PN}-server"
+		local smw_server="${BUILD_DIR}"/Binaries/Release/${MY_PN}-server
 		local smw_serverdir="/${smw_datadir}/server"
 
-		einfo "Installing ${MY_PN}-server files"
+		ebegin "Installing ${MY_PN}-server files"
 		dosbin "${smw_server}"
 
-		dodir "${smw_serverdir}"
-		insinto "${smw_serverdir}"
-		doins "${S}/src/server/serverconfig"
+		dodir ${smw_serverdir}
+		insinto ${smw_serverdir}
+		doins "${S}"/src/server/serverconfig
 
-		dosym "${smw_serverdir}/serverconfig" "/etc/${MY_PN}d.conf"
+		dosym ${smw_serverdir}/serverconfig /etc/${MY_PN}d.conf
 
-		newinitd "${FILESDIR}/smwd.initd" "${MY_PN}d"
-		sed -i -e \
-			"s#@SMW_SERVERDIR@#${smw_serverdir}#g;" \
-			"${ED}/etc/init.d/${MY_PN}d" || die
+		newinitd "${FILESDIR}"/smwd.initd ${MY_PN}d
+		sed -e "s#@SMW_SERVERDIR@#${smw_serverdir}#g;" \
+			-i "${ED}"/etc/init.d/${MY_PN}d || die
 		eend $?
 	fi
 }