[gentoo-commits] proj/gamerlay:master commit in: games-rpg/zelda3t/files/, games-rpg/zelda3t/

[gentoo-commits] proj/gamerlay:master commit in: games-rpg/zelda3t/files/, games-rpg/zelda3t/

[Azamat H. Hackimov]

commit:     bc45f323b5c6310297bc573c90bf4598f255796d
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Sat Nov 10 23:32:26 2018 +0000
Commit:     Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Sat Nov 10 23:44:20 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=bc45f323

games-rpg/zelda3t: update ebuild

Migrate from games.eclass, cleanup

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

 games-rpg/zelda3t/files/zelda3t-homedir.patch | 12 ++++-----
 games-rpg/zelda3t/metadata.xml                |  2 +-
 games-rpg/zelda3t/zelda3t-1.9.ebuild          | 36 ++++++++++++---------------
 3 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/games-rpg/zelda3t/files/zelda3t-homedir.patch b/games-rpg/zelda3t/files/zelda3t-homedir.patch
index adc14e1..7c4f019 100644
--- a/games-rpg/zelda3t/files/zelda3t-homedir.patch
+++ b/games-rpg/zelda3t/files/zelda3t-homedir.patch
@@ -1,6 +1,6 @@
-diff -Naur Zelda3T_US-src-linux/src/Joueur.cpp Zelda3T_US-src-linux/src/Joueur.cpp
---- Zelda3T_US-src-linux/src/Joueur.cpp	2010-01-16 17:58:24.000000000 +0100
-+++ Zelda3T_US-src-linux/src/Joueur.cpp	2010-10-10 11:31:13.000000000 +0200
+diff -Naur a/Joueur.cpp b/Joueur.cpp
+--- a/Joueur.cpp	2010-01-16 17:58:24.000000000 +0100
++++ b/Joueur.cpp	2010-10-10 11:31:13.000000000 +0200
 @@ -18,6 +18,7 @@
  #include "Projectile.h"
  #include "Jeu.h"
@@ -60,9 +60,9 @@ diff -Naur Zelda3T_US-src-linux/src/Joueur.cpp Zelda3T_US-src-linux/src/Joueur.c
      if(!f.is_open()) return;
      f.read((char *)&temps,sizeof(int));
      f.read((char *)&zone,sizeof(int)); gpJeu->setZone(zone);
-diff -Naur Zelda3T_US-src-linux/src/Keyboard.cpp Zelda3T_US-src-linux/src/Keyboard.cpp
---- Zelda3T_US-src-linux/src/Keyboard.cpp	2009-08-14 08:10:58.000000000 +0200
-+++ Zelda3T_US-src-linux/src/Keyboard.cpp	2010-10-10 11:28:51.000000000 +0200
+diff -Naur a/Keyboard.cpp b/Keyboard.cpp
+--- a/Keyboard.cpp	2009-08-14 08:10:58.000000000 +0200
++++ b/Keyboard.cpp	2010-10-10 11:28:51.000000000 +0200
 @@ -13,6 +13,7 @@
  #include <SDL/SDL.h>
  

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

diff --git a/games-rpg/zelda3t/zelda3t-1.9.ebuild b/games-rpg/zelda3t/zelda3t-1.9.ebuild
index 37178b3..8c52089 100644
--- a/games-rpg/zelda3t/zelda3t-1.9.ebuild
+++ b/games-rpg/zelda3t/zelda3t-1.9.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/zelda3t/zelda3t-1.9.ebuild,v 1.0 2010/10/10 09:17:32 frostwork Exp $
 
-EAPI="2"
+EAPI=6
 
-MY_PN="Zelda3T_US-src-linux"
+inherit eutils
 
-inherit games
+MY_PN="Zelda3T_US-src-linux"
 
 DESCRIPTION="The Legend of Zelda - Time to Triumph"
 HOMEPAGE="http://www.zeldaroth.fr/us/z3t.php"
@@ -14,7 +13,7 @@ SRC_URI="http://www.zeldaroth.fr/us/files/3T/Linux/${MY_PN}.zip"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
@@ -24,27 +23,24 @@ RDEPEND="
 	media-libs/sdl-mixer[midi]
 "
 
+S="${WORKDIR}/${MY_PN}/src"
+
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-homedir.patch"
-	sed -i -e "s:Zelda3T:"${PN}":g" -i ${MY_PN}/src/Makefile
-	sed -i -e "s:CFLAGS  =:#CFLAGS  =:g" -i ${MY_PN}/src/Makefile
-	for i in `find ${MY_PN}/src -name *.cpp`; do sed -i "$i" -e "s:data/:"${GAMES_DATADIR}"/"${PN}/data/":g"; done
+	default
+	eapply "${FILESDIR}/${PN}-homedir.patch"
+	sed -i -e "s:Zelda3T:"${PN}":g" -i Makefile
+	sed -i -e "s:CFLAGS  =:#CFLAGS  =:g" -i Makefile
+#	for i in `find ${MY_PN}/src -name *.cpp`; do sed -i "$i" -e "s:data/:"${GAMES_DATADIR}"/"${PN}/data/":g"; done
 }
 
 src_compile() {
-	cd ${MY_PN}/src
 	emake || die "emake failed"
 }
 
-
 src_install() {
-	dogamesbin ${MY_PN}/src/${PN}
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r ${MY_PN}/src/data  || die "data install failed"
-	newicon ${MY_PN}/src/data/images/logos/ocarina.ico ${PN}.png
+	dobin ${PN}
+	insinto /usr/share/${PN}
+	doins -r data  || die "data install failed"
+	newicon data/images/logos/ocarina.ico ${PN}.png
 	make_desktop_entry ${PN}
-
-	prepgamesdirs
 }
-
-