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

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

[Azamat H. Hackimov]

commit:     1c699164b6c99c6f3f2e30e40673fe038f33c007
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Fri Feb  7 20:03:28 2020 +0000
Commit:     Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Fri Feb  7 20:08:25 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=1c699164

games-action/supertirititran: update package

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

 .../supertirititran/files/0.9-gentoopath.diff      | 24 ------------------
 .../files/supertirititran-0.9_lm.patch             | 12 +++++++++
 games-action/supertirititran/metadata.xml          |  6 ++---
 .../supertirititran/supertirititran-0.9.ebuild     | 29 ++++++++--------------
 4 files changed, 26 insertions(+), 45 deletions(-)

diff --git a/games-action/supertirititran/files/0.9-gentoopath.diff b/games-action/supertirititran/files/0.9-gentoopath.diff
deleted file mode 100644
index 336ca99..0000000
--- a/games-action/supertirititran/files/0.9-gentoopath.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur org/Makefile patch/Makefile
---- org/Makefile	2006-09-05 14:53:11.000000000 +0200
-+++ patch/Makefile	2009-08-20 10:47:22.000000000 +0200
-@@ -27,7 +27,7 @@
- #       OBJETIVOS
- #---------------------------
- 
--NAME_EXE= tirititran
-+NAME_EXE= supertirititran
- PROGRAMA = $(SRCDIR)/tirititran.cpp
- 
- DEP = SDL_rotozoom.o barra.o cargar.o configuracion.o disparojugador.o disparosenemigos.o elementos.o explosion.o fuente.o intercom.o joystick.o juego.o mapa.o niveles.o opciones.o pantalla.o SDL_Animation.o sonido.o tiempo.o unrarlib.o tirititran.o
-diff -Naur org/src/defines.h patch/src/defines.h
---- org/src/defines.h	2006-09-17 19:05:07.000000000 +0200
-+++ patch/src/defines.h	2009-08-20 10:47:32.000000000 +0200
-@@ -30,7 +30,7 @@
- #ifndef DEFINES_H_
- #define DEFINES_H_
- 
--#define DATA_DIR "/usr/share/tirititran/data"
-+#define DATA_DIR "/usr/share/games/supertirititran/data"
- 
- #define NOPCIONES 8
- #define NOPCIONES_OPCIONES 8

diff --git a/games-action/supertirititran/files/supertirititran-0.9_lm.patch b/games-action/supertirititran/files/supertirititran-0.9_lm.patch
new file mode 100644
index 0000000..a4a2c50
--- /dev/null
+++ b/games-action/supertirititran/files/supertirititran-0.9_lm.patch
@@ -0,0 +1,12 @@
+diff -Nuar work.orig/Makefile work/Makefile
+--- work.orig/Makefile	2020-02-07 22:57:48.858696072 +0300
++++ work/Makefile	2020-02-07 22:57:59.321696533 +0300
+@@ -20,7 +20,7 @@
+ 
+ #---- Compilador
+ CC = gcc
+-CFLAGS = -Wall  `sdl-config --cflags` `sdl-config --libs` -lSDL_image -lSDL_ttf -lSDL_mixer -lexpat
++CFLAGS = -Wall  `sdl-config --cflags` `sdl-config --libs` -lSDL_image -lSDL_ttf -lSDL_mixer -lexpat -lm
+ 
+ 
+ #---------------------------

diff --git a/games-action/supertirititran/metadata.xml b/games-action/supertirititran/metadata.xml
index 5d0ede2..c18eb4b 100644
--- a/games-action/supertirititran/metadata.xml
+++ b/games-action/supertirititran/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@gmx.de</email>
-	<name>Marcel Unbehaun</name>
+<maintainer type="person">
+  <email>frostworks@gmx.de</email>
+  <name>Marcel Unbehaun</name>
 </maintainer>
 </pkgmetadata>

diff --git a/games-action/supertirititran/supertirititran-0.9.ebuild b/games-action/supertirititran/supertirititran-0.9.ebuild
index cf7bb0d..c07157c 100644
--- a/games-action/supertirititran/supertirititran-0.9.ebuild
+++ b/games-action/supertirititran/supertirititran-0.9.ebuild
@@ -1,17 +1,16 @@
-# 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
+inherit desktop eutils
 
 DESCRIPTION="super hero shoot em up"
 HOMEPAGE="http://www.super-tirititran.com"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-09-linux-sources.tar.gz"
-LICENSE="CCPL-Attribution-NonCommercial-NoDerivs-2.0"
+LICENSE="CPL-1.0 GPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl
@@ -19,22 +18,16 @@ DEPEND="media-libs/libsdl
 	media-libs/sdl-mixer
 	media-libs/sdl-ttf
 	dev-libs/expat"
-RDEPEND=""
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-gentoopath.diff || die "patch failed"
-}
+S="${WORKDIR}"
+
+PATCHES=( "${FILESDIR}/${P}_lm.patch" )
 
 src_install() {
-	dogamesbin supertirititran
+	dobin supertirititran
 	dodoc README
-	insinto "${GAMES_DATADIR}"/"${PN}"
+	insinto "/usr/share/${PN}"
 	doins -r data || die
-	newicon "${FILESDIR}"/${PN}.png ${PN}.png
+	doicon "${FILESDIR}/${PN}.png"
 	make_desktop_entry ${PN} ${PN}
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
 }