commit:     b778982bf81cdd300b39d311e58ea497a0a5abb5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  4 12:32:12 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar  5 18:04:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b778982b

games-arcade/xscavenger: port to EAPI 7

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-arcade/xscavenger/files/1.4.4-gentoo.patch     | 10 ++++------
 ...er-1.4.4-r1.ebuild => xscavenger-1.4.4-r2.ebuild} | 20 +++++++++++---------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/games-arcade/xscavenger/files/1.4.4-gentoo.patch 
b/games-arcade/xscavenger/files/1.4.4-gentoo.patch
index df5936ed3de..4c51b37d215 100644
--- a/games-arcade/xscavenger/files/1.4.4-gentoo.patch
+++ b/games-arcade/xscavenger/files/1.4.4-gentoo.patch
@@ -1,6 +1,5 @@
-diff -urN xscavenger-1.4.4.orig/src/Imakefile xscavenger-1.4.4/src/Imakefile
---- xscavenger-1.4.4.orig/src/Imakefile
-+++ xscavenger-1.4.4/src/Imakefile
+--- a/Imakefile
++++ b/Imakefile
 @@ -1,20 +1,36 @@
  # set this to the path where data files should be stored.  LIBDIR
  # is automatically defined by imake, usually to /usr/X11R6/lib/X11, so
@@ -44,9 +43,8 @@ diff -urN xscavenger-1.4.4.orig/src/Imakefile 
xscavenger-1.4.4/src/Imakefile
 +NormalProgramTarget(scavenger,$(OBJS),,,$(XLIB))
 +InstallProgram(scavenger,GENTOO_BINDIR)
  InstallMultipleFlags($(LIB_DATA),$(LIBNAME),-m 644)
-diff -urN xscavenger-1.4.4.orig/src/scav.c xscavenger-1.4.4/src/scav.c
---- xscavenger-1.4.4.orig/src/scav.c
-+++ xscavenger-1.4.4/src/scav.c
+--- a/scav.c
++++ b/scav.c
 @@ -240,15 +240,19 @@
  
  

diff --git a/games-arcade/xscavenger/xscavenger-1.4.4-r1.ebuild 
b/games-arcade/xscavenger/xscavenger-1.4.4-r2.ebuild
similarity index 80%
rename from games-arcade/xscavenger/xscavenger-1.4.4-r1.ebuild
rename to games-arcade/xscavenger/xscavenger-1.4.4-r2.ebuild
index 6a578398112..78c6be00a5a 100644
--- a/games-arcade/xscavenger/xscavenger-1.4.4-r1.ebuild
+++ b/games-arcade/xscavenger/xscavenger-1.4.4-r2.ebuild
@@ -1,28 +1,30 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit desktop epatch toolchain-funcs
+EAPI=7
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Lode-Runner-like arcade game"
 HOMEPAGE="http://www.xdr.com/dash/scavenger.html";
 SRC_URI="http://www.xdr.com/dash/${P}.tgz";
+S="${WORKDIR}/${P}/src"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
+BDEPEND="x11-misc/imake"
 RDEPEND="x11-libs/libXext"
-DEPEND="${RDEPEND}
-       x11-misc/imake
-"
+DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${P}/src"
+PATCHES=(
+       "${FILESDIR}/${PV}-gentoo.patch"
+)
 
 src_prepare() {
        default
-       epatch "${FILESDIR}/${PV}-gentoo.patch"
+
        sed -i \
                -e "s:GENTOO_DATADIR:/usr/share:" \
                -e "s:GENTOO_BINDIR:/usr/bin:" \

Reply via email to