gentoo resync : 12.05.2022

7 files changed, 62 insertions, 79 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 06c06e1a5456..e1909b4deb08 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/cdogs-sdl/Manifest b/games-arcade/cdogs-sdl/Manifest
index 78ad0364237d..895efc6f1cf1 100644
--- a/games-arcade/cdogs-sdl/Manifest
+++ b/games-arcade/cdogs-sdl/Manifest
@@ -1,4 +1,6 @@
 AUX cdogs-sdl-1.1.1-cmake.patch 410 BLAKE2B b2a36bf3644e885dcf05147f63c4c72e5936acc7727fc37daf9f1732ab3edd699d7a990f63f1977e9e2e9e775b8102429fbba6ffdaf77834a9e7acd3e1933023 SHA512 dd2ffe17f21640d50dec2021fa133baed11f93eba53686792116f15d21d37aed144cc03708baf633d0e0b1c74999202fe58a92eae9f15b81f61bb1b215d39ac4
 DIST cdogs-sdl-1.2.0.tar.gz 35018104 BLAKE2B 1a87f0c6e4af0fda69c0dd98249b319b58411a5b0b7377c21ebef51939f2b6e76959a00bf7fd5602b07bebb9eaab22c840699ae1c54e5d4dcb1aa26852fb8ba0 SHA512 70a5a4bb8e48cf53a4497807b14d8a70e26ad6b74f0c4675b3d98667c867d499d372f323e7abb669ebef08b1d6b5ac9c840ab14eada38e7b868d3099ed6b3e35
+DIST cdogs-sdl-1.3.0.tar.gz 35201522 BLAKE2B bdfeab22edc0e5bfe46d23862bb0e8a829eb8c782519f473340a73d6823fcf6236d61892dff5f6be52e985a8560ce2175b5aab50fb899359d47d3acdf937fe5d SHA512 913ee8a70ab2190259a88891e4f3e30034b7a88dac5fa1a79fcc9452a42fe9fa6679e24104848fab63c7aace8dac311d2166fa01c7175f14243d8658f25aee69
 EBUILD cdogs-sdl-1.2.0.ebuild 1024 BLAKE2B 3519b9c3f554a654e70ca2c68172eb7debd13d11b272bf0c8b7b3b8e640157b3b66c812d5af487a4e029b03cd1b5390eaea1005dba706fbe759e5e0d83452134 SHA512 ead8c69d596c43166e145a688b5c32c8453111c23e37dd38c7207e7fc74b56d88fdb55fb139b80fba48bb453e8404e4fe8c190497924f55eb9e46b8d7f5e93eb
+EBUILD cdogs-sdl-1.3.0.ebuild 1000 BLAKE2B b3cf3c37eef6678721c351290556dbf29fa6fe8a387995de55653d902d5c63f06657c59aa80fb580ceac99acc21fb9d3ca86da3faa5cee19de04c4badab6b53e SHA512 ac53d6208a4137e808fc4f2bc1b00336be1eb53fa1be09cb3cbbb85edd908cfd56788f3b665d312960eed608343ba15f88505ecce1c1d8540f24ef8ff72813b7
 MISC metadata.xml 738 BLAKE2B d88ddca3d0f022c5dc03aa79cd3e64bc11e3328c53e75ec0ce719edb389ee4d119e044ded0c1c3fa7de058c62a6614459f2d3927d745cb3cb3a3e55e32ddac39 SHA512 49e02eb89ad38a8b2e8375940a9e30e2368d970c01a88095dd679e828ba91a6054c9db264a0af038648cf42f8da99800f682a6394db77c0278d98a87dc6648cb
diff --git a/games-arcade/cdogs-sdl/cdogs-sdl-1.3.0.ebuild b/games-arcade/cdogs-sdl/cdogs-sdl-1.3.0.ebuild
new file mode 100644
index 000000000000..70ed391a2e22
--- /dev/null
+++ b/games-arcade/cdogs-sdl/cdogs-sdl-1.3.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Classic overhead run-and-gun game"
+HOMEPAGE="https://cxong.github.io/cdogs-sdl/"
+SRC_URI="https://github.com/cxong/cdogs-sdl/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ BSD-2 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-3.0 CC0-1.0 WTFPL-2 XMAME"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/libsdl2[haptic,opengl]
+	media-libs/sdl2-image[png]
+	media-libs/sdl2-mixer[mp3,vorbis,wav]
+	net-libs/enet:1.3="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.1-cmake.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCDOGS_DATA_DIR="${EPREFIX}"/usr/share/${PN}/
+		-DBUILD_EDITOR=OFF
+		-DUSE_SHARED_ENET=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	dodoc doc/{AUTHORS,original_readme.txt}
+
+	# CREDITS is used at runtime, rest is licenses or duplicates
+	find "${ED}"/usr/share/${PN}/doc -type f ! -name CREDITS -delete || die
+}
diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index 54904e97cb78..00d479c07b92 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -2,8 +2,7 @@ AUX supertux-0.5.0-tinygettext.patch 920 BLAKE2B 9558c2df82a03e1893ae10c0f283f25
 AUX supertux-0.6.0-icon.patch 531 BLAKE2B ffe235acd0ebaac3ecb2588d195496ac2ea34a906874e01fead00df73b6b9e694aa92d335bf3e69c42e4f773c3bfdd8c7a191d8610e400381e102a82a10357d2 SHA512 c1ec17a90100fb12d52561e028366264e6588e08fa1af1ace0438ebc4c2ea8b783c8720d47a9bf43e907ea8fcc3c6a91c510a221ac9c488234205a18ec567b6e
 AUX supertux-0.6.0-license.patch 696 BLAKE2B 76ba58368ce9c02ce66f2a51f54e6c95ede9058130dc54e9560ad060f69806623ea6496a3cb89d823cfbae8d84ce00e4da19eb38e60519f48726a083a3633b76 SHA512 8b4baf774be6625ff253614bb68436ddc26149722af7acea0a4f0772d496c6b30013a22fd3777b11275bd901128caf11b968a37b6a7b99ab344bac78309a6e8e
 AUX supertux-0.6.0-obstack.patch 1063 BLAKE2B ab251d7514f38a8a641e680df6c69bea88b8cfb360fc93b7e91a5274ca20e0ef4210429f8ab0694cd5c3e9eee89c6ee955b54a20dd04b11cb385bccc5bb6be6c SHA512 32da8175888fca98b76640739aa531fbfcc132dbce0a89e76be49bca29bc5878266c702e5f4c7499ddd0473804b344c62d03f39f6b14941f0e669e20d2c2241d
-DIST SuperTux-v0.6.2-Source.tar.gz 174295862 BLAKE2B 1179a5ecf92dfb2ac56b87afe4fed21a2bdc1d7f91641fea8aafc2994ccfe49745420411f41b2145f06fa9714c73d75ecbc85160e85edcbd71c472026cefe708 SHA512 5baa783ee589b42a9bbce3740659dbb7b617ebfcc00c0a038c03d31b56700e3923c8548700ccebe42b325ca03bd85186bc5edef9f6580d93dc48d8aca88cbf74
+AUX supertux-0.6.3-missing-include.patch 214 BLAKE2B ea83aa555192689f12d4d9aa6a170f8631aab11a5bde4d5995d06bf2f318aa795ff84249cb40a6a023d3c5cbda790de216be7e6660de690125bf374f4cbd2229 SHA512 be149515773888d26e792e636cb0083bc838d489824ee0b1c52cf892d7d9db6a38075f8917c443cb710475a16d3ca87231e38723dccfd98b74afb3e4b67511a1
 DIST SuperTux-v0.6.3-Source.tar.gz 182065428 BLAKE2B c4acbe2c61306e6e462a375205b4e95af174c87dbc391f15211e1fac365ab51147d7a83d20a90e35f7d7a994c72b560631ddf1686fee2e1f937f97a711fb1003 SHA512 c6540bab1b3befbd975756031c4587e5569d9613d9539dc829c728b574d1a4da92816d6a7e68947b32963cc13d9b8b52312701c199138640e9f89e5885433798
-EBUILD supertux-0.6.2-r2.ebuild 1665 BLAKE2B c4feecc859a8f45b5b40c2a5395a201006bb538353bf1deefcf95be7ffce6d6efbb64c1cb351fe7937e51c12eea3dde6fdcc71cb4307cd5d65900a10d4bbbf72 SHA512 afa400e3b9de4b20e9c019af96bac6c5316f955275f46510d87065e5011ea8eb8308d5bfd62c356c52f01bd792c2a7d7e5a8a2afad787f5395053f0e1695bf72
-EBUILD supertux-0.6.3.ebuild 1518 BLAKE2B 429df8b63924329933ec1e5eea1612d6c1d97eb117510173ccd9a49891ba3c989da537acd762b027b4523bbbd088cea59f1c1b2487c5ff4b2eb704b4eba7c628 SHA512 4f8b375117b3afe20a6af5e97c71fef9ec15d9ee30703cadd119db19d023f0d4e575ff8a8f4051f808228fbe96899004427c38759ee3eb0eafa4619cebede2b6
+EBUILD supertux-0.6.3.ebuild 1524 BLAKE2B 1644a9d9350945551bf06e7d6ccfe826908df5798fbda94b2d26edd54e39cd9688bc627b78a1bbec702b7b7ba94077ef29d9fa46f8bd6ce1a35020907e4dbc96 SHA512 b94651f7b3bf4844e34d60298f53c28b8d3ddca539ec442b2c4f34ab01be8a4a401dced11854ab90a12955f32d3c939784629a3d4badd004f412475ab136ed02
 MISC metadata.xml 390 BLAKE2B a850f1d65a3de8f6ba0f4835c4fe013e748abf1da785b984a1ea5df2c7c176c8646c240b30137b42708e8e00b75a78fa236748991a9c32f6264d20b6312e5a22 SHA512 b814077d7680ad9cd8d3dd67f136ad09d7c321cb9fe8c019d256db495b88346b32d20791630956773dafe2ddfba76984bf2ef1d366f5575534712ef42f41a949
diff --git a/games-arcade/supertux/files/supertux-0.6.3-missing-include.patch b/games-arcade/supertux/files/supertux-0.6.3-missing-include.patch
new file mode 100644
index 000000000000..4515c9a6003f
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.6.3-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/external/partio_zip/zip_manager.hpp
++++ b/external/partio_zip/zip_manager.hpp
+@@ -41,6 +41,7 @@
+ #ifndef __ZIP__
+ #define __ZIP__
+ 
++#include <memory>
+ #include <fstream>
+ #include <iostream>
+ #include <map>
diff --git a/games-arcade/supertux/supertux-0.6.2-r2.ebuild b/games-arcade/supertux/supertux-0.6.2-r2.ebuild
deleted file mode 100644
index 76a941ef3820..000000000000
--- a/games-arcade/supertux/supertux-0.6.2-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-: ${CMAKE_MAKEFILE_GENERATOR:=emake}
-inherit cmake flag-o-matic
-
-MY_PV="${PV/_rc/-rc.}"
-MY_P="SuperTux-v${MY_PV}-Source"
-
-DESCRIPTION="A game similar to Super Mario Bros"
-HOMEPAGE="https://supertux.org/"
-SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug"
-
-# =media-libs/libsdl2-2.0.14-r0 can cause supertux binary to move entire
-# content of ${HOME} to ${HOME}/.local/share/supertux2/
-# DO NOT REMOVE THIS BLOCKER!!! See bug #764959
-RDEPEND="
-	!=media-libs/libsdl2-2.0.14-r0
-	>=dev-games/physfs-3.0
-	dev-libs/boost:=[nls]
-	media-libs/freetype
-	media-libs/glew:=
-	media-libs/libpng:0=
-	>=media-libs/libsdl2-2.0.1[joystick,video]
-	media-libs/libvorbis
-	media-libs/openal
-	>=media-libs/sdl2-image-2.0.0[png,jpeg]
-	>=net-misc/curl-7.21.7
-	virtual/opengl
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.5.0-tinygettext.patch
-	"${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# This is not a developer release so switch the logo to the non-dev one.
-	sed -e 's@logo_dev@logo@' \
-		-i data/images/objects/logo/logo.sprite || die
-}
-
-src_configure() {
-	append-cxxflags -std=c++11
-
-	local mycmakeargs=(
-		-DWERROR=OFF
-		-DINSTALL_SUBDIR_BIN=bin
-		-DINSTALL_SUBDIR_DOC=share/doc/${PF}
-		-DINSTALL_SUBDIR_SHARE=share/${PN}2
-		-DENABLE_SQDBG="$(usex debug)"
-		-DUSE_SYSTEM_PHYSFS=ON
-	)
-	cmake_src_configure
-}
diff --git a/games-arcade/supertux/supertux-0.6.3.ebuild b/games-arcade/supertux/supertux-0.6.3.ebuild
index 0a9fb27d74ef..173ea4e074c1 100644
--- a/games-arcade/supertux/supertux-0.6.3.ebuild
+++ b/games-arcade/supertux/supertux-0.6.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 #: ${CMAKE_MAKEFILE_GENERATOR:=emake}
-inherit cmake flag-o-matic
+inherit cmake
 
 MY_PV="${PV/_rc/-rc.}"
 MY_P="SuperTux-v${MY_PV}-Source"
@@ -12,6 +12,7 @@ MY_P="SuperTux-v${MY_PV}-Source"
 DESCRIPTION="A game similar to Super Mario Bros"
 HOMEPAGE="https://supertux.org/"
 SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
 SLOT="0"
@@ -41,16 +42,13 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.5.0-tinygettext.patch
 	"${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch
+	"${FILESDIR}"/${PN}-0.6.3-missing-include.patch
 )
 
 src_configure() {
-	append-cxxflags -std=c++11
-
 	local mycmakeargs=(
 		-DWERROR=OFF
 		-DINSTALL_SUBDIR_BIN=bin