gentoo resync : 01.08.2021

10 files changed, 58 insertions, 113 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index ed6472530c54..afd5395b2b60 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/ascii-invaders/Manifest b/games-arcade/ascii-invaders/Manifest
index dbc1bbaa152b..7b5ab20880e6 100644
--- a/games-arcade/ascii-invaders/Manifest
+++ b/games-arcade/ascii-invaders/Manifest
@@ -1,5 +1,3 @@
 DIST ascii-invaders-1.0.1.tar.gz 37578 BLAKE2B 181509c07b1d9ae54f9147f7425c3d62a57f9bff9561fca6af3f3cc15b7fc96f62c809576bdbbe0ba6a2801947941e259e788f99980174848efedbc71c8a969c SHA512 326708ffc2c277e04575920c58f6a267e0bf46f8d2a3dbca9b5c317fb01006d4f673ab35f92f292549cc52dbee4400a84c85478eb81b9bd7703689a705547bc7
-DIST invaders0.1b.tgz 14597 BLAKE2B ecccca6636c4d8dffbc57b8cec82471efc2fd1a256648b9ac46fd256ef99d884205f1c86ff2bf0aedb7bb5996a59a7af3f301339944c6a4753355a8a4db23190 SHA512 3ac9dee0c532384e2849fdc8910bce885e3fdef362b629e8637df1cc0d82eba52c02a836a4925d811b339e9232f20caa7c761dbc1feeddc74e9b6f09e97046b8
-EBUILD ascii-invaders-0.1b-r2.ebuild 680 BLAKE2B 065c88431feb2b68f925c1e52ec5575adfc30576a5b01ff70b3bbdd2ce7b2db3c7803ca8fa47377bde9bcac596e60c0013b687bb4fe4a4b6021ad58bad4b8b4f SHA512 c787e980c3d1494a34c09083c564615f303c9cdb8d102f65cba512e773eea6cd538becfe2dbc86194435973be383ac811d201e73335f7a95cd29388b6c5d3921
 EBUILD ascii-invaders-1.0.1.ebuild 747 BLAKE2B ffc5e3c5c0e5d8abfc825e77e5b5dd8c95435db9c992225d7566101f9d4ecadb99bcf78f0bff79c596f6fdc353bb279d3deabfa572cf14c9c2e9acdba564a646 SHA512 f6f3bcba77cdd17a12ca7de5099890e63639c6f35da5bbe893a5faa5e84104c71ab7a3086c35919ec5bfed83a5d641631153b0c162fce5ec1fe955f4e2c41104
 MISC metadata.xml 340 BLAKE2B 2dc07ae0c7a5114d9d74aad74bcd7d00de690156767c3ccd2ffd2fff15c014aef1321dd51c07acd48fea24ab7795fbcafa9d6bb9b6c700bc03ad0b4c0aad5e48 SHA512 316b980e021ed3fa728432ec1e94b499eba243d592045f85f9d1dfa79645acbccfb7f7c28d99f56df53d837f541581e7c410274aeb965e4a633169102927686f
diff --git a/games-arcade/ascii-invaders/ascii-invaders-0.1b-r2.ebuild b/games-arcade/ascii-invaders/ascii-invaders-0.1b-r2.ebuild
deleted file mode 100644
index 407e574553b1..000000000000
--- a/games-arcade/ascii-invaders/ascii-invaders-0.1b-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Space invaders clone, using ncurses library"
-HOMEPAGE="https://packages.gentoo.org/package/games-arcade/ascii-invaders"
-SRC_URI="mirror://gentoo/invaders${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc64 ~x86 ~ppc-macos"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/invaders"
-
-src_prepare() {
-	default
-	rm -f Makefile
-}
-
-src_compile() {
-	emake LDLIBS="$($(tc-getPKG_CONFIG) ncurses --libs)" invaders
-}
-
-src_install() {
-	newbin invaders ${PN}
-	einstalldocs
-}
diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index c36ee4b0a266..9dbaf7468ff8 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -3,5 +3,5 @@ AUX supertux-0.6.0-icon.patch 531 BLAKE2B ffe235acd0ebaac3ecb2588d195496ac2ea34a
 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
-EBUILD supertux-0.6.2-r1.ebuild 1654 BLAKE2B 6c865732e4639b76bce8f9a4bfd2bba89c5171814eb13e545fd35f9bdd18ae9d9b441113becde3fe77644afb28784ad20bd65c0c89c194997200c67adbcd6d4a SHA512 cd4664c97ec59339d8ad77cddaed767563a617f9ccd2f9f9331d38e6a70abc30853f57019b198b7a9e42e39c5786e8f718ca7d099d52f022c6b3734e91d09b6c
+EBUILD supertux-0.6.2-r2.ebuild 1659 BLAKE2B 9d20ffa3966a675c41579cc0adab7112af44d9b2ab4be8efc530e85acdec49a71ee5b3e5b8335c78438f775a8fb674ee2ed4fec0f2c5bdb5cdf957b5a5cbdb1d SHA512 299c2f52397a1663d6cbde20a0aca47874423689b2f883c158630dfdc45cdba8359fb04f418931b1e0ede5ec2124cda2540166ca1aac452f0e685c0ffdb843a3
 MISC metadata.xml 389 BLAKE2B 960cbba61ef7e12c35b66f36620ba2570e159517b06a520b0c233496c0910b2949f4f87b789f3c948621b6beb2ba0a4d5e8bdb277516213cbbc115d31af58698 SHA512 e61b89a6c0da8bf74f2b126e185fbf4be02b7ac7bc80082bd4c6e80384ab00db73a196af1ed9448a31435dbb62768b7eee8c8e64a40c51a6257bffe8170deb65
diff --git a/games-arcade/supertux/supertux-0.6.2-r1.ebuild b/games-arcade/supertux/supertux-0.6.2-r2.ebuild
index 9dafa4b81e21..7682bb89378e 100644
--- a/games-arcade/supertux/supertux-0.6.2-r1.ebuild
+++ b/games-arcade/supertux/supertux-0.6.2-r2.ebuild
@@ -24,7 +24,7 @@ IUSE="debug"
 RDEPEND="
 	!=media-libs/libsdl2-2.0.14-r0
 	>=dev-games/physfs-3.0
-	dev-libs/boost:=
+	dev-libs/boost:=[nls]
 	media-libs/freetype
 	media-libs/glew:=
 	media-libs/libpng:0=
diff --git a/games-arcade/tuxanci/Manifest b/games-arcade/tuxanci/Manifest
index ee0ad66799a4..edc6cf71f66b 100644
--- a/games-arcade/tuxanci/Manifest
+++ b/games-arcade/tuxanci/Manifest
@@ -1,4 +1,4 @@
-AUX tuxanci-20110429-glu.patch 465 BLAKE2B bf6de17b99bde96779fa064969c95e351d58cbfa215611163aee449e551de9ca951939810c6e46fd5283cead74bd035ace5814e13e240af1b6688e31e7f95bd1 SHA512 9c26f868be5f1d42b14c3f5d1ee46345c75764e041d7172e3a657d21f34a3326503cfa8e7b90715d5011be9628527194fc47a52bf8bfc4a639f6d999f2db1c50
+AUX tuxanci-20110429-no-glver.patch 282 BLAKE2B 26b4e6676c93838978894a73b4e9bc8b2e1e5f53f30dcd6a8d168a05af19b0e0b6c1cdb78d9db7fb5c761357f3b402dbff58e4e3df267dfbc51b93cd76a897b5 SHA512 b40eb238ebaab9029d548b00824fbf07685d8c029aebc24baa4361ff65fd81056d5a96766933532d330d68224b91a2c5232cca25c18bc3b20d6a5d441435ca0a
 DIST tuxanci-20110429.tar.xz 4283540 BLAKE2B c45aef1a6f89284dc1d41de1718342f0f7d3303d7281698291c74acf5aee262c8ed782d73f955ad3e22a88015adb077d8950e3ce69c7295a9fe97116518045e2 SHA512 72305be823981699e9ac38c090dda2baafd45bd36554eba65bd438646e0b0b8a3ab17a7516610db17e225292c39e0cdabb383193f8b07d2d31d638483feafeea
-EBUILD tuxanci-20110429-r1.ebuild 1538 BLAKE2B aa64b3eb01b00ee0bcd5b4317e506f38864c60a911a1c3f41cd208fef9727101430c3f407154c6d0423bde14b64217f696767bcdbb5c2a6338596645ffc61195 SHA512 0cc51cb7825729309da40bc6fe81de2f7fdf8b0e28d403691cffd0ff922d51cfeaa1dad26d7b084b11c1ac00d2d7d135de26644ff1435ded7ebd41779169ed44
+EBUILD tuxanci-20110429-r2.ebuild 1014 BLAKE2B de6b14372cba777ef947142413d982a3301980e37a20709cbf39263a2bca693d4f51ec57e871960a561461ffdbf40fef12d869d1113a7e4fdf02dc8138db0e65 SHA512 e768f92fc95a93c390eed67fea87cca515fb4a87adcf92b2bb24f5024ba5aa76babd776eef3abc1eb118556aad23df4bcfb59cb84bd940065a93da76a46a521d
 MISC metadata.xml 391 BLAKE2B 9afeb2767b7924c11dc2b8407fd4f54beca1f223c2d1ebadb12a10b3a6a35e7576d63671a582197cd69e0969e676deaa924f68d381db9dc175c99dedc4b642c5 SHA512 f872f6da7bb29261230922b10e916705d073f4d780b868f25347081ffb89c96b514912b41898dc569c0b634551b925cbc18654707d40253d902ce5c74dd70414
diff --git a/games-arcade/tuxanci/files/tuxanci-20110429-glu.patch b/games-arcade/tuxanci/files/tuxanci-20110429-glu.patch
deleted file mode 100644
index 4273114e41cc..000000000000
--- a/games-arcade/tuxanci/files/tuxanci-20110429-glu.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt	2011-04-29 00:29:40.000000000 +0200
-+++ b/CMakeLists.txt	2021-02-27 00:48:05.172582259 +0100
-@@ -187,7 +187,7 @@
- 	pkg_check_modules(FONTCONFIG REQUIRED fontconfig)
- 	INCLUDE_DIRECTORIES ( ${FONTCONFIG_INCLUDE_DIRS} )
- 	IF ( WITH_OPENGL )
--		pkg_check_modules(OPENGL REQUIRED gl>=7.5)
-+		pkg_check_modules(OPENGL REQUIRED glu>=7.5)
- 		INCLUDE_DIRECTORIES ( ${OPENGL_INCLUDE_DIRS} )
- 	ENDIF ( WITH_OPENGL )
- 	pkg_check_modules(SDL REQUIRED sdl)
diff --git a/games-arcade/tuxanci/files/tuxanci-20110429-no-glver.patch b/games-arcade/tuxanci/files/tuxanci-20110429-no-glver.patch
new file mode 100644
index 000000000000..210e55d11998
--- /dev/null
+++ b/games-arcade/tuxanci/files/tuxanci-20110429-no-glver.patch
@@ -0,0 +1,9 @@
+https://bugs.gentoo.org/715132
+https://bugs.gentoo.org/798651
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -189,3 +189,3 @@
+ 	IF ( WITH_OPENGL )
+-		pkg_check_modules(OPENGL REQUIRED gl>=7.5)
++		pkg_check_modules(OPENGL REQUIRED gl)
+ 		INCLUDE_DIRECTORIES ( ${OPENGL_INCLUDE_DIRS} )
diff --git a/games-arcade/tuxanci/tuxanci-20110429-r1.ebuild b/games-arcade/tuxanci/tuxanci-20110429-r1.ebuild
deleted file mode 100644
index bbedae30502e..000000000000
--- a/games-arcade/tuxanci/tuxanci-20110429-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="First Tux shooter multi-player network game inspired by Bulanci"
-HOMEPAGE="https://repo.or.cz/w/tuxanci.git"
-
-if [[ ${PV} = *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://repo.or.cz/tuxanci.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug dedicated +ipv6 nls opengl physfs +sound"
-
-# >=x11-libs/cairo-1.8.8[X,svg]
-RDEPEND="
-	!dedicated? (
-		>=media-libs/fontconfig-2.7.0
-		media-libs/libsdl[X,opengl?]
-		>=media-libs/sdl-image-1.2.10[png]
-		media-libs/sdl-ttf[X]
-		sound? ( >=media-libs/sdl-mixer-1.2.11[vorbis] )
-	)
-	physfs? ( dev-games/physfs[zip] )
-	!physfs? ( >=dev-libs/libzip-0.9 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=( "${FILESDIR}/${P}-glu.patch" ) # bug 715132
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DEBUG=OFF
-		-DWITH_AUDIO=$(usex sound)
-		-DBUILD_SERVER=$(usex dedicated)
-		-DWITH_NLS=$(usex nls)
-		-DWITH_PHYSFS=$(usex physfs)
-		-DWITH_OPENGL=$(usex opengl)
-		-DENABLE_IPV6=$(usex ipv6)
-		-DDEVELOPER=$(usex debug)
-		-DCMAKE_INSTALL_ICONDIR="${EPREFIX}"/usr/pixmaps/
-		-DCMAKE_INSTALL_DESKTOPDIR="${EPREFIX}"/usr/applications/
-		-DCMAKE_DATA_PATH="${EPREFIX}"/usr/share/
-		-DCMAKE_LOCALE_PATH="${EPREFIX}"/usr/share/locale/
-		-DCMAKE_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF}
-		-DCMAKE_CONF_PATH="${EPREFIX}"/etc
-	)
-	cmake_src_configure
-}
diff --git a/games-arcade/tuxanci/tuxanci-20110429-r2.ebuild b/games-arcade/tuxanci/tuxanci-20110429-r2.ebuild
new file mode 100644
index 000000000000..4428d33da87f
--- /dev/null
+++ b/games-arcade/tuxanci/tuxanci-20110429-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="First Tux shooter multi-player network game inspired by Bulanci"
+HOMEPAGE="https://repo.or.cz/w/tuxanci.git"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="dedicated opengl physfs"
+
+RDEPEND="
+	!dedicated? (
+		media-libs/fontconfig
+		media-libs/libsdl[opengl?,sound,video]
+		media-libs/sdl-image[png]
+		media-libs/sdl-mixer[vorbis]
+		media-libs/sdl-ttf
+		opengl? ( virtual/opengl )
+	)
+	physfs? ( dev-games/physfs[zip] )
+	!physfs? ( dev-libs/libzip:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-glver.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SERVER=$(usex dedicated)
+		-DCMAKE_CONF_PATH="${EPREFIX}"/etc
+		-DCMAKE_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF}
+		-DENABLE_DEBUG=no
+		-DWITH_OPENGL=$(usex opengl)
+		-DWITH_PHYSFS=$(usex physfs)
+	)
+	cmake_src_configure
+}