[gentoo-commits] repo/gentoo:master commit in: games-arcade/primateplunge/files/, games-arcade/primateplunge/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/primateplunge/files/, games-arcade/primateplunge/

[David Seifert]

commit:     94d1d63f0c6234165b650f748b03af9f34238ac9
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 21 20:38:11 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Nov 21 20:38:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94d1d63f

games-arcade/primateplunge: Port to EAPI 7

Closes: https://bugs.gentoo.org/724414
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../files/primateplunge-1.1-fno-common.patch         | 11 +++++++++++
 .../primateplunge/primateplunge-1.1-r2.ebuild        | 20 +++++++++++++-------
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/games-arcade/primateplunge/files/primateplunge-1.1-fno-common.patch b/games-arcade/primateplunge/files/primateplunge-1.1-fno-common.patch
new file mode 100644
index 00000000000..7905b0372e7
--- /dev/null
+++ b/games-arcade/primateplunge/files/primateplunge-1.1-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/game.h
++++ b/src/game.h
+@@ -125,7 +125,7 @@
+ 
+ 
+ /* Glabals in main.c */
+-SDL_Surface *mainScreen;
++extern SDL_Surface *mainScreen;
+ 
+ /* Globals in game.c */
+ extern world* currentWorld;

diff --git a/games-arcade/primateplunge/primateplunge-1.1-r2.ebuild b/games-arcade/primateplunge/primateplunge-1.1-r2.ebuild
index 4023588bfee..b14ba0d459b 100644
--- a/games-arcade/primateplunge/primateplunge-1.1-r2.ebuild
+++ b/games-arcade/primateplunge/primateplunge-1.1-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools desktop
 
 DESCRIPTION="Help poor Monkey navigate his way down through treacherous areas"
@@ -11,22 +12,27 @@ SRC_URI="https://www.aelius.com/${PN}/${P}.tar.gz"
 LICENSE="Primate-Plunge"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 RESTRICT="mirror bindist" #465850
 
-DEPEND="media-libs/libsdl[sound,video]
+DEPEND="
+	media-libs/libsdl[sound,video]
 	media-libs/sdl-mixer"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-AC_SUBST.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
 src_prepare() {
 	default
-	eapply "${FILESDIR}"/${P}-AC_SUBST.patch
 	eautoreconf
 }
 
 src_install() {
 	default
 	dodoc TIPS
-	newicon graphics/idle.bmp ${PN}.bmp
-	make_desktop_entry ${PN} "Primate Plunge" /usr/share/pixmaps/${PN}.bmp
+
+	newicon graphics/idle.bmp primateplunge.bmp
+	make_desktop_entry primateplunge "Primate Plunge" /usr/share/pixmaps/primateplunge.bmp
 }