gentoo resync : 12.05.2022

4 files changed, 16 insertions, 79 deletions

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