gentoo resync : 20.06.2021

6 files changed, 75 insertions, 89 deletions

diff --git a/games-action/shootingstar/Manifest b/games-action/shootingstar/Manifest
index 40f1c12747f6..a09ccfb52b74 100644
--- a/games-action/shootingstar/Manifest
+++ b/games-action/shootingstar/Manifest
@@ -1,5 +1,4 @@
-AUX 1.2.0-gcc34.patch 1053 BLAKE2B 7e10e3fa04dcc4431c7991755ede638a59906c2c545d72bff6156825662fc9246e00a4f5dd84e36a6eb8b88c10685ea59938b2aff91bcc20e4f2c341efe46260 SHA512 0941733f645f1fa97dfc860d2f9d33bf6e96a75ada97fd477d60d9aa21a693a067731834df3c31fd2abfde3e7d2a4fe429b8aeeb154100cd730c0713a70cd247
-AUX shootingstar-1.2.0-gcc44.patch 324 BLAKE2B 392579c1792b3863134047f64b0df1d2dfe44ee11eeb640d6b738565ad349cf1df211679121f8e0b0c1ea559fcf0e25a843d4d3dbb675bc5849d2396ea94d893 SHA512 3bda8a966ed6d6536390b228606bc65b4789d8c2adde8e993089b8e63a62bbdceae4d0ec97c3c7f5d87b5b9c3149eb85d4eee64db295b5aa8c67f2f5349b21f1
+AUX shootingstar-1.2.0-basic-fixes.patch 776 BLAKE2B 95f78181ba4955f4db4900697cad12c964d76655568c33cc17dac7836f9a0b57f3fde1730f5af57ce46c5d361c3ffef5a724e3341817eb1bf83a68578cc1b0d2 SHA512 eed32a44ecc3dd0b9f7427452f49d8e8b8760738789694d4b44fe077088bdb5ac1781f889e9fb52b28a4a99dc62520a95e23c1497d28aae3a5b42e679ed8d17c
 DIST shootingstar-1.2.0.tar.gz 7755911 BLAKE2B 22e48044a4a17d7282abd408a6ccc727d60c56da16d170230b287927adb95729a0c6da0b0a9f70ad7d39e647be16dff96cf55aef9e3efbf3396402b4a684527a SHA512 5bc13a444c925ab834482fad7f055ea02eac471f454a3f0ed80e50c3b0956586b7bfa68db82e3034696fa2e8ce5beaf10fc8b8583508e1c29c276469ef7b2b74
-EBUILD shootingstar-1.2.0-r1.ebuild 989 BLAKE2B ffbb85e11d57299e17f7cb5db48838a5bcc3e689e61408c6c293b9954b82ee82612403fac3f7cadf9a55b845cd0b74efb9aca10a48c5d54f8eac28d18d0edbb1 SHA512 304ca6d9ae169c12bd6a7cc2a406f7bf9ad80fed48904dd494ad512bdeab43c2e26966d06034c4613707d8c191948dc8f8506c3a3911ed272a142b01e57001da
+EBUILD shootingstar-1.2.0-r2.ebuild 763 BLAKE2B 47c46d43987dd391baf7d4a18b634356f7be95628e5a89bc7d1b26710cb9c2948a32e626abd6fec2ceb049a78e17f58e14ce1e0f288e962b0d93569b691f4d3d SHA512 47ad99c3e520c0a54eb7a98d8d733a765ab7f6a62df025f51d9d314361d457b89104aa359736b984362fcb94637d97a88dc562669edae5801561718557424b09
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/shootingstar/files/1.2.0-gcc34.patch b/games-action/shootingstar/files/1.2.0-gcc34.patch
deleted file mode 100644
index b55997552fc8..000000000000
--- a/games-action/shootingstar/files/1.2.0-gcc34.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur shootingstar-1.2.0/src/engine/cTextureFont.cpp shootingstar-1.2.0.loz/src/engine/cTextureFont.cpp
---- shootingstar-1.2.0/src/engine/cTextureFont.cpp	2003-07-06 19:31:10.000000000 +0100
-+++ shootingstar-1.2.0.loz/src/engine/cTextureFont.cpp	2004-07-26 20:51:16.992768063 +0100
-@@ -31,6 +31,7 @@
- #include <stdio.h>
- #include <GL/gl.h>
- #include <GL/glu.h>
-+#include <math.h>
- #include "cTextureManager.hpp"
- #include "Debug.hpp"
- //------------------------------------------------------------------------------
-diff -ur shootingstar-1.2.0/src/game/cOptions.cpp shootingstar-1.2.0.loz/src/game/cOptions.cpp
---- shootingstar-1.2.0/src/game/cOptions.cpp	2003-12-22 05:09:06.000000000 +0000
-+++ shootingstar-1.2.0.loz/src/game/cOptions.cpp	2004-07-26 21:00:25.265284270 +0100
-@@ -201,7 +201,7 @@
- 			dbgError () << "Unable to read from options file\n";
- 			throw runtime_error ("Unable to load options");
- 		}
--		int (keys.keys[i]) = key;	// IS THIS SAFE?
-+		keys.keys[i] = (SDLKey)key;	// IS THIS SAFE?
- 		
- 		fin >> key;
- 		keys.buttons[i] = key;
diff --git a/games-action/shootingstar/files/shootingstar-1.2.0-basic-fixes.patch b/games-action/shootingstar/files/shootingstar-1.2.0-basic-fixes.patch
new file mode 100644
index 000000000000..48304070d5c8
--- /dev/null
+++ b/games-action/shootingstar/files/shootingstar-1.2.0-basic-fixes.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/58287 (math.h/SDLKey for gcc 3.4)
+https://bugs.gentoo.org/272374 (cstdio for gcc 4.4)
+https://bugs.gentoo.org/607428 (signed int for segfault)
+--- a/src/engine/cTextureFont.cpp
++++ b/src/engine/cTextureFont.cpp
+@@ -33,2 +33,3 @@
+ #include <GL/glu.h>
++#include <math.h>
+ #include "cTextureManager.hpp"
+--- a/src/engine/dbg.cpp
++++ b/src/engine/dbg.cpp
+@@ -26,2 +26,3 @@
+ #include <cstdlib>
++#include <cstdio>
+ #include <string>
+--- a/src/game/cMainMenu.cpp
++++ b/src/game/cMainMenu.cpp
+@@ -401,3 +401,3 @@
+ 	
+-	static unsigned int i = 0;
++	static int i = 0;
+ 	if ( mLastLetter + 100 < now )
+--- a/src/game/cOptions.cpp
++++ b/src/game/cOptions.cpp
+@@ -203,3 +203,3 @@
+ 		}
+-		int (keys.keys[i]) = key;	// IS THIS SAFE?
++		keys.keys[i] = (SDLKey)key;
+ 		
diff --git a/games-action/shootingstar/files/shootingstar-1.2.0-gcc44.patch b/games-action/shootingstar/files/shootingstar-1.2.0-gcc44.patch
deleted file mode 100644
index dfc1a8d8e77e..000000000000
--- a/games-action/shootingstar/files/shootingstar-1.2.0-gcc44.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/engine/dbg.cpp	2009-06-03 15:15:46.000000000 +0200
-+++ b/src/engine/dbg.cpp	2009-06-03 16:09:19.000000000 +0200
-@@ -28,6 +28,7 @@
- #include <vector>
- #include <map>
- #include <algorithm>
-+#include <cstdio>
- 
-     /**********************************************************************
-      * Implementation notes
diff --git a/games-action/shootingstar/shootingstar-1.2.0-r1.ebuild b/games-action/shootingstar/shootingstar-1.2.0-r1.ebuild
deleted file mode 100644
index 014fc4fb2580..000000000000
--- a/games-action/shootingstar/shootingstar-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop gnome2-utils
-
-# Note: currently segfaults on startup, but that's also in the previous ebuild
-# See https://bugs.gentoo.org/607428
-
-DESCRIPTION="A topdown shooter"
-HOMEPAGE="http://linux.softpedia.com/get/GAMES-ENTERTAINMENT/Arcade/Shooting-Star-19754.shtml"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	media-libs/libsdl[video]
-	media-libs/sdl-image
-	media-libs/sdl-mixer
-	virtual/glu
-	virtual/opengl"
-RDEPEND=${DEPEND}
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-gcc34.patch
-	"${FILESDIR}"/${P}-gcc44.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	newicon -s 128 data/textures/body1.png ${PN}.png
-	make_desktop_entry ${PN} "Shooting Star"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-action/shootingstar/shootingstar-1.2.0-r2.ebuild b/games-action/shootingstar/shootingstar-1.2.0-r2.ebuild
new file mode 100644
index 000000000000..7885724a6b03
--- /dev/null
+++ b/games-action/shootingstar/shootingstar-1.2.0-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop toolchain-funcs
+
+DESCRIPTION="A topdown shooter"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/libsdl[opengl,sound,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[vorbis]
+	virtual/glu
+	virtual/opengl"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-basic-fixes.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	newicon data/textures/body1.png ${PN}.png
+	make_desktop_entry ${PN} "Shooting Star"
+}