[gentoo-commits] proj/gamerlay:master commit in: games-action/deadlysoccerball/, games-action/deadlysoccerball/files/

[Azamat H. Hackimov]

commit:     3cbc47be6ff2483e7e4012f84b57b095c020e055
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Fri Feb  7 19:27:53 2020 +0000
Commit:     Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Fri Feb  7 20:08:17 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=3cbc47be

games-action/deadlysoccerball: update package

Migrate to EAPI 7

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>

 .../deadlysoccerball/deadlysoccerball-0.1.ebuild   | 39 +++++++++-------------
 ...cerball-0.1.diff => deadlysoccerball-0.1.patch} |  6 ++--
 .../files/digest-deadlysoccerball-0.1              |  3 --
 games-action/deadlysoccerball/metadata.xml         |  6 ++--
 4 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/games-action/deadlysoccerball/deadlysoccerball-0.1.ebuild b/games-action/deadlysoccerball/deadlysoccerball-0.1.ebuild
index 4ac4a3b..3af6757 100644
--- a/games-action/deadlysoccerball/deadlysoccerball-0.1.ebuild
+++ b/games-action/deadlysoccerball/deadlysoccerball-0.1.ebuild
@@ -1,53 +1,44 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI="2"
+EAPI=7
 
-inherit eutils games
-
-MY_PN=deadlysoccerball
+inherit desktop eutils
 
 DESCRIPTION="space soccer ball shooting missiles around"
 HOMEPAGE="http://www-graphics.stanford.edu/courses/cs248-videogame-competition/cs248-05/"
 SRC_URI="http://www-graphics.stanford.edu/courses/cs248-videogame-competition/cs248-05/theDeadlySoccerBall.tar.gz"
 
-LICENSE="unknown"
+LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl
 	media-libs/mesa"
-RDEPEND=""
 
-S=${WORKDIR}/${MY_PN}
+S="${WORKDIR}"
+
+PATCHES=( "${FILESDIR}/${P}.patch" )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}.diff
-	cd src/
+	default
+
 	sed -i \
-	-e 's:"\(Sounds/[^"]*\)":"'${GAMES_DATADIR}'/'${PN}'/\1":g' -i World.cpp \
-	-e 's:"\(Textures/[^"]*\)":"'${GAMES_DATADIR}'/'${PN}'/\1":g' -i World.cpp \
+	-e 's:"\(Sounds/[^"]*\)":"/usr/share/'${PN}'/\1":g' -i src/World.cpp \
+	-e 's:"\(Textures/[^"]*\)":"/usr/share/'${PN}'/\1":g' -i src/World.cpp \
 		|| die "sed failed"
 	sed -s \
-	-e 's/\theDeadlySoccerBall/deadlysoccerball/g' -i Makefile \
+	-e 's/\theDeadlySoccerBall/deadlysoccerball/g' -i src/Makefile \
 		|| die "sed failed"
 }
 
 src_install() {
-	dogamesbin theDeadlySoccerBall
+	dobin theDeadlySoccerBall
 
-	local datadir="${GAMES_DATADIR}"/${PN}
-	dodir ${datadir}
-	insinto "${GAMES_DATADIR}"/${PN}
+	insinto "/usr/share/${PN}"
 	doins -r Sounds Textures || die
-	newicon "${FILESDIR}"/${PN}.png ${PN}.png
+	doicon "${FILESDIR}/${PN}.png"
 	make_desktop_entry theDeadlySoccerBall ${PN}
 	dodoc README.txt
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
 }

diff --git a/games-action/deadlysoccerball/files/deadlysoccerball-0.1.diff b/games-action/deadlysoccerball/files/deadlysoccerball-0.1.patch
similarity index 64%
rename from games-action/deadlysoccerball/files/deadlysoccerball-0.1.diff
rename to games-action/deadlysoccerball/files/deadlysoccerball-0.1.patch
index 3d793c8..145ec28 100644
--- a/games-action/deadlysoccerball/files/deadlysoccerball-0.1.diff
+++ b/games-action/deadlysoccerball/files/deadlysoccerball-0.1.patch
@@ -1,6 +1,6 @@
-diff -Naur src/World.cpp src-gentoo/World.cpp
---- src/World.cpp	2005-12-07 20:32:58.000000000 +0100
-+++ src-gentoo/World.cpp	2007-11-01 11:31:46.000000000 +0100
+diff -Nuar deadlysoccerball.orig/src/World.cpp deadlysoccerball/src/World.cpp
+--- deadlysoccerball.orig/src/World.cpp	2020-02-07 22:16:50.755587682 +0300
++++ deadlysoccerball/src/World.cpp	2020-02-07 22:17:50.117590300 +0300
 @@ -712,7 +712,7 @@
      Sphere::loadTexture("Textures/welcome.bmp", &this->welcomeTextureId);
      Sphere::loadTexture("Textures/white.bmp", &this->whiteTextureId);

diff --git a/games-action/deadlysoccerball/files/digest-deadlysoccerball-0.1 b/games-action/deadlysoccerball/files/digest-deadlysoccerball-0.1
deleted file mode 100644
index d9651d4..0000000
--- a/games-action/deadlysoccerball/files/digest-deadlysoccerball-0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 78b88c0dbe6130209d305bed0e4ac76a theDeadlySoccerBall.tar.gz 1496687
-RMD160 c7d364a6f48d7f8d578dc724cb94347f8102e2aa theDeadlySoccerBall.tar.gz 1496687
-SHA256 3dc85df981d6faca07f2b37137fff708ea69755016b754ae1be08c6423b692d7 theDeadlySoccerBall.tar.gz 1496687

diff --git a/games-action/deadlysoccerball/metadata.xml b/games-action/deadlysoccerball/metadata.xml
index 5d0ede2..c18eb4b 100644
--- a/games-action/deadlysoccerball/metadata.xml
+++ b/games-action/deadlysoccerball/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>frostworks@×××.de</email>
-	<name>Marcel Unbehaun</name>
+<maintainer type="person">
+  <email>frostworks@×××.de</email>
+  <name>Marcel Unbehaun</name>
 </maintainer>
 </pkgmetadata>