games-util/etswitch: Port to EAPI 7

Closes: https://bugs.gentoo.org/706950 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: David Seifert <[email protected]>
johu · Nov 22, 2020 · 5a362eb · 5a362eb
1 parent fdcfeb1
commit 5a362eb
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 10 deletions.
diff --git a/games-util/etswitch/etswitch-0.1.14-r1.ebuild b/games-util/etswitch/etswitch-0.1.14-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="*nix minimizer for a few games"
 HOMEPAGE="http://hem.bredband.net/b400150/"
@@ -10,9 +10,9 @@ SRC_URI="http://hem.bredband.net/b400150/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="x11-libs/libX11
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXxf86vm
 	x11-libs/libXmu
 	x11-libs/libXpm"
@@ -21,10 +21,7 @@ DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
 PATCHES=(
-		"${FILESDIR}"/${P}-desktop-entry.patch
-		"${FILESDIR}"/${P}-glibc.patch
+	"${FILESDIR}"/${P}-desktop-entry.patch
+	"${FILESDIR}"/${P}-glibc.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
-
-src_configure() {
-	econf --datadir=/usr/share
-}
diff --git a/games-util/etswitch/files/etswitch-0.1.14-fno-common.patch b/games-util/etswitch/files/etswitch-0.1.14-fno-common.patch
@@ -0,0 +1,22 @@
+--- a/src/read_wid.c
++++ b/src/read_wid.c
+@@ -62,6 +62,8 @@
+ #include <errno.h>
+ extern int errno;
+
++wid_info_struct *wid;
++
+ /*
+ will try and read the wid file and malloc the game struct 
+ if wid file is missing it will read the internal one
+--- a/src/read_wid.h
++++ b/src/read_wid.h
+@@ -38,7 +38,7 @@
+     char *first_struct;
+ } wid_info_struct;
+
+-wid_info_struct *wid;				/* global wid array */
++extern wid_info_struct *wid;				/* global wid array */
+
+
+