gentoo resync : 03.03.2021

4 files changed, 25 insertions, 71 deletions

diff --git a/games-arcade/tuxanci/Manifest b/games-arcade/tuxanci/Manifest
index 6a6d88bbe2d7..ee0ad66799a4 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
 DIST tuxanci-20110429.tar.xz 4283540 BLAKE2B c45aef1a6f89284dc1d41de1718342f0f7d3303d7281698291c74acf5aee262c8ed782d73f955ad3e22a88015adb077d8950e3ce69c7295a9fe97116518045e2 SHA512 72305be823981699e9ac38c090dda2baafd45bd36554eba65bd438646e0b0b8a3ab17a7516610db17e225292c39e0cdabb383193f8b07d2d31d638483feafeea
-EBUILD tuxanci-20110429-r1.ebuild 1458 BLAKE2B 3451b8082acaea6e518531a73c62ca215eaaedf633891b7a3bc9f8e289f90d6352b40830112e4c1cf5c699d9ffe5f8816da82d93f7ea59f2259ee646d5937162 SHA512 a91a03d4592eef0ffeaea42355c3494cbf29fd9fbf3e744d87663fffa22a71f40b7c89f3ee552fb7ec1e2981fedd95a1a79d427cd6bfdbe58293960eac20927d
-EBUILD tuxanci-99999999.ebuild 1458 BLAKE2B 3451b8082acaea6e518531a73c62ca215eaaedf633891b7a3bc9f8e289f90d6352b40830112e4c1cf5c699d9ffe5f8816da82d93f7ea59f2259ee646d5937162 SHA512 a91a03d4592eef0ffeaea42355c3494cbf29fd9fbf3e744d87663fffa22a71f40b7c89f3ee552fb7ec1e2981fedd95a1a79d427cd6bfdbe58293960eac20927d
+EBUILD tuxanci-20110429-r1.ebuild 1538 BLAKE2B aa64b3eb01b00ee0bcd5b4317e506f38864c60a911a1c3f41cd208fef9727101430c3f407154c6d0423bde14b64217f696767bcdbb5c2a6338596645ffc61195 SHA512 0cc51cb7825729309da40bc6fe81de2f7fdf8b0e28d403691cffd0ff922d51cfeaa1dad26d7b084b11c1ac00d2d7d135de26644ff1435ded7ebd41779169ed44
 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
new file mode 100644
index 000000000000..4273114e41cc
--- /dev/null
+++ b/games-arcade/tuxanci/files/tuxanci-20110429-glu.patch
@@ -0,0 +1,11 @@
+--- 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/tuxanci-20110429-r1.ebuild b/games-arcade/tuxanci/tuxanci-20110429-r1.ebuild
index a03b0ba4176b..bbedae30502e 100644
--- a/games-arcade/tuxanci/tuxanci-20110429-r1.ebuild
+++ b/games-arcade/tuxanci/tuxanci-20110429-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
-DESCRIPTION="Tuxanci is first tux shooter inspired by game Bulanci"
+DESCRIPTION="First Tux shooter multi-player network game inspired by Bulanci"
 HOMEPAGE="https://repo.or.cz/w/tuxanci.git"
 
 if [[ ${PV} = *9999 ]]; then
@@ -25,22 +25,24 @@ RDEPEND="
 	!dedicated? (
 		>=media-libs/fontconfig-2.7.0
 		media-libs/libsdl[X,opengl?]
-		media-libs/sdl-ttf[X]
 		>=media-libs/sdl-image-1.2.10[png]
-		sound? (
-			>=media-libs/sdl-mixer-1.2.11[vorbis]
-		)
+		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}
+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)
@@ -55,5 +57,5 @@ src_configure() {
 		-DCMAKE_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF}
 		-DCMAKE_CONF_PATH="${EPREFIX}"/etc
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/games-arcade/tuxanci/tuxanci-99999999.ebuild b/games-arcade/tuxanci/tuxanci-99999999.ebuild
deleted file mode 100644
index a03b0ba4176b..000000000000
--- a/games-arcade/tuxanci/tuxanci-99999999.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Tuxanci is first tux shooter inspired by game 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-ttf[X]
-		>=media-libs/sdl-image-1.2.10[png]
-		sound? (
-			>=media-libs/sdl-mixer-1.2.11[vorbis]
-		)
-	)
-	physfs? ( dev-games/physfs[zip] )
-	!physfs? ( >=dev-libs/libzip-0.9 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-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-utils_src_configure
-}