gentoo resync : 22.01.2021

3 files changed, 18 insertions, 69 deletions

diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index d34754b86177..c36ee4b0a266 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -2,8 +2,6 @@ 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.1.1-Source.tar.gz 163363780 BLAKE2B 313c25a74b950fc292821739c9edfe5c5878fad5f74e6ba6957fb3fa3740b2dafebc443211c090c46eb30aa9906768774cae6d245ea0c88d86ef80e77283e866 SHA512 9c4b535d5c55b3a582b05dab4ffb9658fd3d500165d428eb9e69c91b03e90dcf7517cadfa99554485950085764e6589e6a0a83304abebf7911e4c5a240270c10
 DIST SuperTux-v0.6.2-Source.tar.gz 174295862 BLAKE2B 1179a5ecf92dfb2ac56b87afe4fed21a2bdc1d7f91641fea8aafc2994ccfe49745420411f41b2145f06fa9714c73d75ecbc85160e85edcbd71c472026cefe708 SHA512 5baa783ee589b42a9bbce3740659dbb7b617ebfcc00c0a038c03d31b56700e3923c8548700ccebe42b325ca03bd85186bc5edef9f6580d93dc48d8aca88cbf74
-EBUILD supertux-0.6.1.1.ebuild 1358 BLAKE2B 210189a07f9766cb6fd3f51f07a595dbbde42e55537c1dc6b954b62bb55fa7a36d5b9d7dc34196c6a69559c78d8eea03f17ef798332bdc0945653de4194e3052 SHA512 b7c0107970b68e011a678b63fae9fc827a6c7a6391575cf241c2e74550f065312adfbefd6684e0ad6584566764a16d9060ab9b089aed074024bcbfc7b44693fd
-EBUILD supertux-0.6.2.ebuild 1387 BLAKE2B e54a9a72c33f7d952e1b393c3582f2057e61197280154b3b8c77a77976b581322608527b7171f16aae4f75423d184f3eb9835ac4741ebc6f1919915b93d76748 SHA512 c38a3a3467eb797570a54485ff8f00713a79d5c994dc519d3acd0149587c2fc94a48a703ef5b3479fa3f2cbc44a8380d6efe8c9d4dfcca972c3cbb0385c36239
+EBUILD supertux-0.6.2-r1.ebuild 1654 BLAKE2B 6c865732e4639b76bce8f9a4bfd2bba89c5171814eb13e545fd35f9bdd18ae9d9b441113becde3fe77644afb28784ad20bd65c0c89c194997200c67adbcd6d4a SHA512 cd4664c97ec59339d8ad77cddaed767563a617f9ccd2f9f9331d38e6a70abc30853f57019b198b7a9e42e39c5786e8f718ca7d099d52f022c6b3734e91d09b6c
 MISC metadata.xml 389 BLAKE2B 960cbba61ef7e12c35b66f36620ba2570e159517b06a520b0c233496c0910b2949f4f87b789f3c948621b6beb2ba0a4d5e8bdb277516213cbbc115d31af58698 SHA512 e61b89a6c0da8bf74f2b126e185fbf4be02b7ac7bc80082bd4c6e80384ab00db73a196af1ed9448a31435dbb62768b7eee8c8e64a40c51a6257bffe8170deb65
diff --git a/games-arcade/supertux/supertux-0.6.1.1.ebuild b/games-arcade/supertux/supertux-0.6.1.1.ebuild
deleted file mode 100644
index 35562950c4e6..000000000000
--- a/games-arcade/supertux/supertux-0.6.1.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 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_P="SuperTux-v${PV}-Source"
-
-DESCRIPTION="A game similar to Super Mario Bros."
-HOMEPAGE="https://supertux.org/"
-SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${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 ~x86"
-IUSE="debug"
-
-RDEPEND=">=dev-games/physfs-3.0
-	dev-libs/boost:=
-	media-libs/glew:=
-	virtual/opengl
-	media-libs/libvorbis
-	media-libs/openal
-	>=media-libs/libsdl2-2.0.1[joystick,video]
-	>=media-libs/sdl2-image-2.0.0[png,jpeg]
-	>=net-misc/curl-7.21.7"
-DEPEND="${RDEPEND}
-	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.2.ebuild b/games-arcade/supertux/supertux-0.6.2-r1.ebuild
index a107f3e14c29..9dafa4b81e21 100644
--- a/games-arcade/supertux/supertux-0.6.2.ebuild
+++ b/games-arcade/supertux/supertux-0.6.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,17 +18,27 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-RDEPEND=">=dev-games/physfs-3.0
+# =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:=
+	media-libs/freetype
 	media-libs/glew:=
-	virtual/opengl
+	media-libs/libpng:0=
+	>=media-libs/libsdl2-2.0.1[joystick,video]
 	media-libs/libvorbis
 	media-libs/openal
-	>=media-libs/libsdl2-2.0.1[joystick,video]
 	>=media-libs/sdl2-image-2.0.0[png,jpeg]
-	>=net-misc/curl-7.21.7"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	>=net-misc/curl-7.21.7
+	virtual/opengl
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 S="${WORKDIR}/${MY_P}"