[gentoo-commits] repo/gentoo:master commit in: games-util/etswitch/files/, games-util/etswitch/

[gentoo-commits] repo/gentoo:master commit in: games-util/etswitch/files/, games-util/etswitch/

[Austin English]

commit:     ac8d3049ffe6b50811f6f1874cdee650ec88569e
Author:     Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 29 23:13:50 2016 +0000
Commit:     Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 23:17:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac8d3049

games-util/etswitch: remove deprecated games eclass

Also update to EAPI 6

Gentoo-Bug: https://bugs.gentoo.org/574082

Package-Manager: portage-2.2.28

 games-util/etswitch/etswitch-0.1.14-r1.ebuild      | 33 ++++++++++++++++++++++
 .../files/etswitch-0.1.14-desktop-entry.patch      |  4 +--
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/games-util/etswitch/etswitch-0.1.14-r1.ebuild b/games-util/etswitch/etswitch-0.1.14-r1.ebuild
new file mode 100644
index 0000000..5889357
--- /dev/null
+++ b/games-util/etswitch/etswitch-0.1.14-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="*nix minimizer for a few games"
+HOMEPAGE="http://hem.bredband.net/b400150/"
+SRC_URI="http://hem.bredband.net/b400150/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXxf86vm
+	x11-libs/libXmu
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-libs/libXt
+	x11-proto/recordproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xproto"
+
+PATCHES=(
+		"${FILESDIR}"/${P}-desktop-entry.patch
+		"${FILESDIR}"/${P}-glibc.patch
+)
+
+src_configure() {
+	econf --datadir=/usr/share
+}

diff --git a/games-util/etswitch/files/etswitch-0.1.14-desktop-entry.patch b/games-util/etswitch/files/etswitch-0.1.14-desktop-entry.patch
index a7c5080..f3e6b5d 100644
--- a/games-util/etswitch/files/etswitch-0.1.14-desktop-entry.patch
+++ b/games-util/etswitch/files/etswitch-0.1.14-desktop-entry.patch
@@ -1,5 +1,5 @@
---- etswitch.desktop.in.orig	2008-02-02 10:54:51.000000000 -0500
-+++ etswitch.desktop.in	2008-02-02 11:17:40.000000000 -0500
+--- a/etswitch.desktop.in	2008-02-02 10:54:51.000000000 -0500
++++ b/etswitch.desktop.in	2008-02-02 11:17:40.000000000 -0500
 @@ -1,5 +1,4 @@
  [Desktop Entry]
 -Encoding=UTF-8

[gentoo-commits] repo/gentoo:master commit in: games-util/etswitch/files/, games-util/etswitch/

[David Seifert]

commit:     5a362eb9543216d757cd05899853951968845055
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 22 16:43:50 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 16:43:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a362eb9

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 <soap <AT> gentoo.org>

 games-util/etswitch/etswitch-0.1.14-r1.ebuild      | 17 +++++++----------
 .../files/etswitch-0.1.14-fno-common.patch         | 22 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/games-util/etswitch/etswitch-0.1.14-r1.ebuild b/games-util/etswitch/etswitch-0.1.14-r1.ebuild
index da46e7ba497..61b5ce23001 100644
--- 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
new file mode 100644
index 00000000000..f0bdebcb6a7
--- /dev/null
+++ 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 */
+ 
+ 
+