games-misc/bsd-games: drop 2.17-r5 (games.eclass) => rebase patches as -p1

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

9 files changed, 14 insertions, 158 deletions

diff --git a/games-misc/bsd-games/Manifest b/games-misc/bsd-games/Manifest
index fa75813e0150..7bc99d0ea376 100644
--- a/games-misc/bsd-games/Manifest
+++ b/games-misc/bsd-games/Manifest
@@ -1,6 +1,4 @@
-DIST bsd-games-2.17.tar.gz 2563311 BLAKE2B 9dfff4e70929e14a422c536c661cd95c5f1ac81d9112494525b9ef13d7a39b66bd59b6a264e614cfb29784fdb63364f56b12b4d284b125b5b3c12e92def07fb0 SHA512 cb2ee60474f164d42e3d47700270bbeeda3c8279d64da409c9cc05e36437ef95b92d0a85543298e97604635fcf3e068f3a5cc812e90b5c61fb8d146cf35bc38f
 DIST bsd-games-3.1-verbose-build.patch.gz 4633 BLAKE2B cc75175ac2ef9d476c03bdb08b8c054d13090d6cdd1a14dd44022d13290112c68a7663d0c03f9ca7535ea10f2bb5e49a84acca4f782f0ced59685f762efd5151 SHA512 120c0859bb73a026dae017bcc2bc7505ca156b454bf5f87c91b4887417d5ac62f3dec706af91b22b11be8b5bce11d168f9205d722a9fd30dea654f682a66b1c8
 DIST bsd-games-3.1.tar.gz 267636 BLAKE2B 116b340e383430fc56e9d2379a398494b43664aa124157bfa01f2c6a76ebdc90128cc676abae83b6d74680b0ad9396d24f1c0d11adcff1f552a3e68717b8cc8f SHA512 3f311e89481913b734a21fc7d0765628637af8251228d5a38349c27cc702c307240e81711785bbd7428e208a142bd07597630d29e97e2c7bf5bd9cac1ebc6ada
-DIST bsdgames_2.17-22.debian.tar.xz 32268 BLAKE2B 2485abc1d80b8319c7eb68e2747c0a4166d18079047eca67c1de549cd011f75a767b6fe69021cb4ce09aaf029823a097e6ac658efcab5e19e976a89ed798d06f SHA512 902d86557dd3813c31333fe18437d8046ae100814c9c1b340ab1f8266c817545f21e000702b1ca93babb9d632896ea5bada1e146436abfa7916b469681fceed5
 DIST bsdgames_2.17-28.debian.tar.xz 58464 BLAKE2B 3f5a70322341b153a8b3cb8df81fea1e773971d0f3b79ba8fb0c0877e95c61c8e8689952333f8ac4263948d781c2dc64c8178f9dac6a1c09ae702f91794b9583 SHA512 7e2db9f830c0657f3fcd1371635bda4a87e7a68180e486e44752904740c0710c02271522ff2d4b606542b3c502dd28795fcecf883360c3ac5bea78c148281f6a
 DIST bsdgames_2.17.orig.tar.gz 2563311 BLAKE2B 9dfff4e70929e14a422c536c661cd95c5f1ac81d9112494525b9ef13d7a39b66bd59b6a264e614cfb29784fdb63364f56b12b4d284b125b5b3c12e92def07fb0 SHA512 cb2ee60474f164d42e3d47700270bbeeda3c8279d64da409c9cc05e36437ef95b92d0a85543298e97604635fcf3e068f3a5cc812e90b5c61fb8d146cf35bc38f
diff --git a/games-misc/bsd-games/bsd-games-2.17-r5.ebuild b/games-misc/bsd-games/bsd-games-2.17-r5.ebuild
deleted file mode 100644
index 6679e61b5fc7..000000000000
--- a/games-misc/bsd-games/bsd-games-2.17-r5.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs games
-
-DEB_PATCH_VER=22
-DESCRIPTION="collection of games from NetBSD"
-HOMEPAGE="https://www.polyomino.org.uk/computer/software/bsd-games/"
-SRC_URI="https://www.polyomino.org.uk/computer/software/bsd-games/${P}.tar.gz
-	mirror://debian/pool/main/b/bsdgames/bsdgames_${PV}-${DEB_PATCH_VER}.debian.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!games-misc/wtf
-	!app-misc/banner
-	!games-puzzle/hangman
-	sys-libs/ncurses:0
-	sys-apps/miscfiles"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison
-	virtual/pkgconfig"
-
-# Set GAMES_TO_BUILD variable to whatever you want
-GAMES_TO_BUILD=${GAMES_TO_BUILD:=adventure arithmetic atc
-backgammon banner battlestar bcd boggle caesar canfield countmail cribbage
-dab dm factor fish gomoku hack hangman hunt mille monop morse
-number phantasia pig pom ppt primes quiz rain random robots sail snake
-tetris trek wargames worm worms wtf}
-
-src_prepare() {
-	local d="${WORKDIR}"/debian/patches
-	EPATCH_SOURCE="${d}" epatch $(<"${d}"/series)
-
-	# Used by gentoo config.params. See bug 531200
-	export GAMES_BINDIR GAMES_DATADIR GAMES_STATEDIR
-
-	epatch \
-		"${FILESDIR}"/${P}-64bitutmp.patch \
-		"${FILESDIR}"/${P}-headers.patch \
-		"${FILESDIR}"/${P}-bg.patch \
-		"${FILESDIR}"/${P}-gcc4.patch
-
-	# Use pkg-config to query Libs: from ncurses.pc (for eg. -ltinfo) wrt #459652
-	sed -i \
-		-e "/ncurses_lib/s:-lncurses:'$($(tc-getPKG_CONFIG) --libs-only-l ncurses)':" \
-		configure || die
-
-	sed -i \
-		-e "s:/usr/games:${GAMES_BINDIR}:" \
-		wargames/wargames || die
-
-	sed -i \
-		-e '/^CC :=/d' \
-		-e '/^CXX :=/d' \
-		-e '/^CFLAGS/s/OPTIMIZE/CFLAGS/' \
-		-e '/^CXXFLAGS/s/OPTIMIZE/CXXFLAGS/' \
-		-e '/^LDFLAGS/s/LDFLAGS := /LDFLAGS := \$(LDFLAGS) /' \
-		Makeconfig.in || die
-
-	cp "${FILESDIR}"/config.params-gentoo config.params || die
-	echo bsd_games_cfg_usrlibdir=\"$(games_get_libdir)\" >> ./config.params || die
-	echo bsd_games_cfg_build_dirs=\"${GAMES_TO_BUILD}\" >> ./config.params || die
-	echo bsd_games_cfg_docdir=\"/usr/share/doc/${PF}\" >> ./config.params || die
-}
-
-src_test() {
-	addwrite /dev/full
-	emake -j1 check
-}
-
-build_game() {
-	has ${1} ${GAMES_TO_BUILD}
-}
-
-do_statefile() {
-	touch "${D}/${GAMES_STATEDIR}/${1}" || die
-	chmod ug+rw "${D}/${GAMES_STATEDIR}/${1}" || die
-}
-
-src_install() {
-	dodir "${GAMES_BINDIR}" "${GAMES_STATEDIR}" /usr/share/man/man{1,6}
-	emake -j1 DESTDIR="${D}" install
-
-	dodoc AUTHORS BUGS ChangeLog ChangeLog.0 \
-		README PACKAGING SECURITY THANKS TODO YEAR2000
-
-	# set some binaries to run as games group (+S)
-	build_game atc && fperms g+s "${GAMES_BINDIR}"/atc
-	build_game battlestar && fperms g+s "${GAMES_BINDIR}"/battlestar
-	build_game canfield && fperms g+s "${GAMES_BINDIR}"/canfield
-	build_game cribbage && fperms g+s "${GAMES_BINDIR}"/cribbage
-	build_game phantasia && fperms g+s "${GAMES_BINDIR}"/phantasia
-	build_game robots && fperms g+s "${GAMES_BINDIR}"/robots
-	build_game sail && fperms g+s "${GAMES_BINDIR}"/sail
-	build_game snake && fperms g+s "${GAMES_BINDIR}"/snake
-	build_game tetris && fperms g+s "${GAMES_BINDIR}"/tetris-bsd
-
-	# state files
-	build_game atc && do_statefile atc_score
-	build_game battlestar && do_statefile battlestar.log
-	build_game canfield && do_statefile cfscores
-	build_game cribbage && do_statefile criblog
-	build_game hack && keepdir "${GAMES_STATEDIR}"/hack
-	build_game robots && do_statefile robots_roll
-	build_game sail && do_statefile saillog
-	build_game snake && do_statefile snake.log && do_statefile snakerawscores
-	build_game tetris && do_statefile tetris-bsd.scores
-
-	# extra docs
-	build_game atc && { docinto atc ; dodoc atc/BUGS; }
-	build_game boggle && { docinto boggle ; dodoc boggle/README; }
-	build_game hack && { docinto hack ; dodoc hack/{OWNER,Original_READ_ME,READ_ME,help}; }
-	build_game hunt && { docinto hunt ; dodoc hunt/README; }
-	build_game phantasia && { docinto phantasia ; dodoc phantasia/{OWNER,README}; }
-
-	# Since factor is usually not installed, and primes.6 is a symlink to
-	# factor.6, make sure that primes.6 is ok ...
-	if build_game primes && [[ ! $(build_game factor) ]] ; then
-		rm -f "${D}"/usr/share/man/man6/{factor,primes}.6
-		newman factor/factor.6 primes.6
-	fi
-
-	prepgamesdirs
-
-	# state dirs
-	chmod -R ug+rw "${D}/${GAMES_STATEDIR}"/* || die
-}
diff --git a/games-misc/bsd-games/bsd-games-2.17_p28.ebuild b/games-misc/bsd-games/bsd-games-2.17_p28.ebuild
index fc382f97d8c0..2ed12a52b33e 100644
--- a/games-misc/bsd-games/bsd-games-2.17_p28.ebuild
+++ b/games-misc/bsd-games/bsd-games-2.17_p28.ebuild
@@ -47,16 +47,14 @@ src_prepare() {
 		eapply "${debian_patch_dir}"/${patch}
 	done
 
+	# Additional patches on top of Debian patchset
 	eapply "${FILESDIR}"/${PN}-2.17-64bitutmp.patch
-	eapply -p0 "${FILESDIR}"/${PN}-2.17-bg.patch
-	eapply -p0 "${FILESDIR}"/${PN}-2.17-gcc4.patch
+	eapply "${FILESDIR}"/${PN}-2.17-bg.patch
+	eapply "${FILESDIR}"/${PN}-2.17-gcc4.patch
 	eapply "${FILESDIR}"/${PN}-2.17-rename-getdate-clash.patch
 
 	default
 
-	# TODO: Check this?
-	# Used by gentoo config.params. See bug 531200
-
 	# Use pkg-config to query Libs: from ncurses.pc (for eg. -ltinfo) wrt #459652
 	sed -i \
 		-e "/ncurses_lib/s:-lncurses:'$($(tc-getPKG_CONFIG) --libs-only-l ncurses)':" \
@@ -74,7 +72,7 @@ src_prepare() {
 		-e '/^LDFLAGS/s/LDFLAGS := /LDFLAGS := \$(LDFLAGS) /' \
 		Makeconfig.in || die
 
-    # export GAMES_BINDIR GAMES_DATADIR GAMES_STATEDIR
+	# Used by config.params
 	export GAMES_BINDIR=/usr/bin
 	export GAMES_DATADIR=/usr/share
 	export GAMES_STATEDIR=/var/games
diff --git a/games-misc/bsd-games/files/bsd-games-2.17-64bitutmp.patch b/games-misc/bsd-games/files/bsd-games-2.17-64bitutmp.patch
index 3be1b3de074b..7afd0019efb4 100644
--- a/games-misc/bsd-games/files/bsd-games-2.17-64bitutmp.patch
+++ b/games-misc/bsd-games/files/bsd-games-2.17-64bitutmp.patch
@@ -7,8 +7,8 @@ structure.  Work around is to assign the submembers instead.
 
 http://bugs.gentoo.org/show_bug.cgi?id=102667
 
---- bsd-games/dm/utmpentry.c
-+++ bsd-games/dm/utmpentry.c
+--- a/dm/utmpentry.c
++++ b/dm/utmpentry.c
 @@ -291,7 +291,8 @@
  	e->line[sizeof(e->line) - 1] = '\0';
  	(void)strncpy(e->host, up->ut_host, sizeof(up->ut_host));
diff --git a/games-misc/bsd-games/files/bsd-games-2.17-bg.patch b/games-misc/bsd-games/files/bsd-games-2.17-bg.patch
index 07dc520b77e4..6503d9afcb5d 100644
--- a/games-misc/bsd-games/files/bsd-games-2.17-bg.patch
+++ b/games-misc/bsd-games/files/bsd-games-2.17-bg.patch
@@ -1,5 +1,5 @@
---- backgammon/common_source/fancy.c.old	2007-05-16 20:16:46.000000000 +0200
-+++ backgammon/common_source/fancy.c	2007-05-16 20:19:00.000000000 +0200
+--- a/backgammon/common_source/fancy.c
++++ b/backgammon/common_source/fancy.c
 @@ -58,7 +58,7 @@
  int     lUP;			/* length of UP */
  int     CO;			/* number of columns */
diff --git a/games-misc/bsd-games/files/bsd-games-2.17-gcc4.patch b/games-misc/bsd-games/files/bsd-games-2.17-gcc4.patch
index 7de07effc25d..dabb38460a66 100644
--- a/games-misc/bsd-games/files/bsd-games-2.17-gcc4.patch
+++ b/games-misc/bsd-games/files/bsd-games-2.17-gcc4.patch
@@ -1,5 +1,5 @@
---- trek/getpar.h.orig	2005-08-14 19:45:29.000000000 -0400
-+++ trek/getpar.h	2005-08-14 19:46:33.000000000 -0400
+--- a/trek/getpar.h
++++ b/trek/getpar.h
 @@ -31,6 +31,9 @@
   *	@(#)getpar.h	8.1 (Berkeley) 5/31/93
   */
@@ -16,8 +16,8 @@
  int readdelim(int);
 +
 +#endif /*__GETPAR_H_*/
---- trek/trek.h.orig	2005-08-14 19:45:37.000000000 -0400
-+++ trek/trek.h	2005-08-14 19:48:17.000000000 -0400
+--- a/trek/trek.h
++++ b/trek/trek.h
 @@ -31,6 +31,13 @@
   *	@(#)trek.h	8.1 (Berkeley) 5/31/93
   */
diff --git a/games-misc/bsd-games/files/bsd-games-2.17-headers.patch b/games-misc/bsd-games/files/bsd-games-2.17-headers.patch
index 953a5d35765a..418d411660e0 100644
--- a/games-misc/bsd-games/files/bsd-games-2.17-headers.patch
+++ b/games-misc/bsd-games/files/bsd-games-2.17-headers.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/128348
 
---- include/stdio.h
-+++ include/stdio.h
+--- a/include/stdio.h
++++ b/include/stdio.h
 @@ -35,5 +35,11 @@
  #include_next <stdio.h>
  
diff --git a/games-misc/bsd-games/files/bsd-games-2.17-rename-getdate-clash.patch b/games-misc/bsd-games/files/bsd-games-2.17-rename-getdate-clash.patch
index 6cda335d7aed..0618abd0d3dc 100644
--- a/games-misc/bsd-games/files/bsd-games-2.17-rename-getdate-clash.patch
+++ b/games-misc/bsd-games/files/bsd-games-2.17-rename-getdate-clash.patch
@@ -1,5 +1,3 @@
-diff --git a/hack/extern.h b/hack/extern.h
-index e2ef242..7c5085f 100644
 --- a/hack/extern.h
 +++ b/hack/extern.h
 @@ -583,7 +583,7 @@ int role_index(int);
@@ -11,8 +9,6 @@ index e2ef242..7c5085f 100644
  int phase_of_the_moon(void);
  int night(void);
  int midnight(void);
-diff --git a/hack/hack.end.c b/hack/hack.end.c
-index 3145fd7..36e4796 100644
 --- a/hack/hack.end.c
 +++ b/hack/hack.end.c
 @@ -360,7 +360,7 @@ topten()
@@ -24,8 +20,6 @@ index 3145fd7..36e4796 100644
  
  	/* assure minimum number of points */
  	if (t0->points < POINTSMIN)
-diff --git a/hack/hack.unix.c b/hack/hack.unix.c
-index 13f9724..ef17788 100644
 --- a/hack/hack.unix.c
 +++ b/hack/hack.unix.c
 @@ -118,7 +118,7 @@ getyear()
diff --git a/games-misc/bsd-games/files/bsd-games-3.1-no-install-manpages-automatically.patch b/games-misc/bsd-games/files/bsd-games-3.1-no-install-manpages-automatically.patch
index 46645e162a47..590b595afa5f 100644
--- a/games-misc/bsd-games/files/bsd-games-3.1-no-install-manpages-automatically.patch
+++ b/games-misc/bsd-games/files/bsd-games-3.1-no-install-manpages-automatically.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile b/Makefile
-index 9de05a8..e047213 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -20,10 +20,6 @@ $O%.o:	%.c