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

[Azamat H. Hackimov]

commit:     367a9881d85734dda47a5b8b6b0c07b4ee1e1a28
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Mon Feb 10 16:42:34 2020 +0000
Commit:     Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Mon Feb 10 18:11:00 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=367a9881

games-rpg/zeldaolb: update package

Migrate to EAPI7, cleanup

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

 games-rpg/zeldaolb/files/zeldaolb-homedir.patch | 12 ++++----
 games-rpg/zeldaolb/metadata.xml                 |  6 ++--
 games-rpg/zeldaolb/zeldaolb-3.6.ebuild          | 40 +++++++++++--------------
 3 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/games-rpg/zeldaolb/files/zeldaolb-homedir.patch b/games-rpg/zeldaolb/files/zeldaolb-homedir.patch
index 87dbf73..bc078c4 100644
--- a/games-rpg/zeldaolb/files/zeldaolb-homedir.patch
+++ b/games-rpg/zeldaolb/files/zeldaolb-homedir.patch
@@ -1,6 +1,6 @@
-diff -Naur ZeldaOLB_US-src-linux/src/Joueur.cpp ZeldaOLB_US-src-linux/src/Joueur.cpp
---- ZeldaOLB_US-src-linux/src/Joueur.cpp	2009-03-15 13:49:57.000000000 +0100
-+++ ZeldaOLB_US-src-linux/src/Joueur.cpp	2010-10-10 11:52:17.000000000 +0200
+diff -Naur a/Joueur.cpp b/Joueur.cpp
+--- a/Joueur.cpp	2009-03-15 13:49:57.000000000 +0100
++++ b/Joueur.cpp	2010-10-10 11:52:17.000000000 +0200
 @@ -18,6 +18,9 @@
  #include "Projectile.h"
  #include "Jeu.h"
@@ -63,9 +63,9 @@ diff -Naur ZeldaOLB_US-src-linux/src/Joueur.cpp ZeldaOLB_US-src-linux/src/Joueur
      if(!f.is_open()) return;
      f.read((char *)&temps,sizeof(int));
      f.read((char *)&zone,sizeof(int)); gpJeu->setZone(zone);
-diff -Naur ZeldaOLB_US-src-linux/src/Keyboard.cpp ZeldaOLB_US-src-linux/src/Keyboard.cpp
---- ZeldaOLB_US-src-linux/src/Keyboard.cpp	2009-03-15 13:46:19.000000000 +0100
-+++ ZeldaOLB_US-src-linux/src/Keyboard.cpp	2010-10-10 12:14:24.000000000 +0200
+diff -Naur a/Keyboard.cpp b/Keyboard.cpp
+--- a/Keyboard.cpp	2009-03-15 13:46:19.000000000 +0100
++++ b/Keyboard.cpp	2010-10-10 12:14:24.000000000 +0200
 @@ -13,6 +13,7 @@
  #include <SDL/SDL.h>
  

diff --git a/games-rpg/zeldaolb/metadata.xml b/games-rpg/zeldaolb/metadata.xml
index 5d0ede2..c18eb4b 100644
--- a/games-rpg/zeldaolb/metadata.xml
+++ b/games-rpg/zeldaolb/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>

diff --git a/games-rpg/zeldaolb/zeldaolb-3.6.ebuild b/games-rpg/zeldaolb/zeldaolb-3.6.ebuild
index b607dc2..532a2a1 100644
--- a/games-rpg/zeldaolb/zeldaolb-3.6.ebuild
+++ b/games-rpg/zeldaolb/zeldaolb-3.6.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/zeldaolb/zeldaolb-3.6.ebuild,v 1.0 2010/10/10 09:17:32 frostwork Exp $
 
-EAPI="2"
+EAPI=7
 
 MY_PN="ZeldaOLB_US-src-linux"
 
-inherit games
+inherit desktop eutils
 
 DESCRIPTION="The Legend of Zelda - Onilink Begins"
 HOMEPAGE="http://www.zeldaroth.fr/us/zolb.php"
@@ -14,7 +13,7 @@ SRC_URI="http://www.zeldaroth.fr/us/files/OLB/Linux/${MY_PN}.zip"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
@@ -24,27 +23,22 @@ RDEPEND="
 	media-libs/sdl-mixer[midi]
 "
 
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-homedir.patch"
-	sed -i -e "s:ZeldaOLB:"${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
-}
+S="${WORKDIR}/${MY_PN}/src"
+PATCHES=( "${FILESDIR}/${PN}-homedir.patch" )
 
-src_compile() {
-	cd ${MY_PN}/src
-	emake || die "emake failed"
+src_prepare() {
+	default
+	sed -i -e "s:ZeldaOLB:"${PN}":g" -i Makefile
+	sed -i -e "s:CFLAGS  =:#CFLAGS  =:g" -i Makefile
+	for i in `find . -name "*.cpp"`; do
+		sed -i "$i" -e "s:data/:/usr/share/"${PN}"/data/:g";
+	done
 }
 
-
 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/graal.ico ${PN}.png
+	dobin ${PN}
+	insinto "/usr/share/${PN}"
+	doins -r data  || die "data install failed"
+	newicon data/images/logos/graal.ico ${PN}.png
 	make_desktop_entry ${PN}
-
-	prepgamesdirs
 }
-
-