From f852753fbcded429107d55b542666b8c31e4df3e Mon Sep 17 00:00:00 2001
From: Stefan Strogin <steils@gentoo.org>
Date: Tue, 30 Jul 2019 10:18:13 +0300
Subject: games-arcade/netris: add patch to build with ncurses[tinfo]

- Update Debian patchset
- EAPI=7

Closes: https://bugs.gentoo.org/687992
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Stefan Strogin <steils@gentoo.org>
---
 games-arcade/netris/Manifest                      |  2 +-
 games-arcade/netris/files/netris-0.52-tinfo.patch | 14 +++++
 games-arcade/netris/netris-0.52-r2.ebuild         | 61 ----------------------
 games-arcade/netris/netris-0.52-r3.ebuild         | 62 +++++++++++++++++++++++
 4 files changed, 77 insertions(+), 62 deletions(-)
 create mode 100644 games-arcade/netris/files/netris-0.52-tinfo.patch
 delete mode 100644 games-arcade/netris/netris-0.52-r2.ebuild
 create mode 100644 games-arcade/netris/netris-0.52-r3.ebuild

(limited to 'games-arcade/netris')

diff --git a/games-arcade/netris/Manifest b/games-arcade/netris/Manifest
index c989e0beaad3..3d03e4938193 100644
--- a/games-arcade/netris/Manifest
+++ b/games-arcade/netris/Manifest
@@ -1,2 +1,2 @@
 DIST netris-0.52.tar.gz 33135 BLAKE2B e6958494b3f1e269b87d5e6833355af98c3936e282870afd8153711603b8115998cebe91f5e86afacc58b20cc8ad9ea2fae69906fa544948de7cb6ad77425cfd SHA512 842ad8602394dee929c3c4ba222f9f5ffe628e52348c3faf7c9098bbd5b0b0279fffc7927320f8ee8a5102537c995a8ed605d851f1cd32e4bd8976a7889c84e1
-DIST netris_0.52-9.diff.gz 14482 BLAKE2B 746410106ca944949e1c589f9bc1dcb011269a70339bfff8adcd2ca6eefb51f32cc77b61cc6b25f64a75629e915bf2dc0a8fcc6a9e76d0f7c4dae1d651e8e77f SHA512 4bed230091ddecf5a0dc043981ec9b0a177bee01262715b9cb9a2af0adefe2db52555416b795a70dd496e6fb0b132586bc7f32d2a480f1cfd6c4d40304076109
+DIST netris_0.52-10.debian.tar.xz 13160 BLAKE2B 80c4a27ecef79b63ddf72deffe10bcb9b4f83d1be8982d9b8761f2a5e7c1622ab03042fe51112882a188f431ecbf17db05ede7339dadcead98012ea5ad334873 SHA512 94b6fd6a938efe156a44687fdf3d4ba141513a13130548e552ec20864ee73625817d79c6821030bfcff7d05edecec69c78b5a1048b9597c932c7731165877469
diff --git a/games-arcade/netris/files/netris-0.52-tinfo.patch b/games-arcade/netris/files/netris-0.52-tinfo.patch
new file mode 100644
index 000000000000..2b2363a1c61a
--- /dev/null
+++ b/games-arcade/netris/files/netris-0.52-tinfo.patch
@@ -0,0 +1,14 @@
+diff --git a/Configure b/Configure
+index a8bf8f6..3fa9097 100755
+--- a/Configure
++++ b/Configure
+@@ -80,6 +80,9 @@ for lib in -lcurses -lncurses; do
+ 		LFLAGS="$lib"
+ 	fi
+ done
++if $CC $CFLAGS $LEXTRA test.c -ltinfo > /dev/null 2>&1; then
++	LFLAGS="$LFLAGS -ltinfo"
++fi
+ for lib in -lsocket -lnsl -ltermcap; do 
+ 	if $CC $CFLAGS $LEXTRA test.c $lib > /dev/null 2>&1; then
+ 		LFLAGS="$LFLAGS $lib"
diff --git a/games-arcade/netris/netris-0.52-r2.ebuild b/games-arcade/netris/netris-0.52-r2.ebuild
deleted file mode 100644
index 16cf7b4c01d3..000000000000
--- a/games-arcade/netris/netris-0.52-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DEB_VER="9"
-DESCRIPTION="Classic networked version of T*tris"
-HOMEPAGE="http://www.netris.org/"
-SRC_URI="ftp://ftp.netris.org/pub/netris/${P}.tar.gz
-	mirror://debian/pool/main/n/netris/netris_${PV}-${DEB_VER}.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="sys-libs/ncurses:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	tc-export CC CXX LD AR RANLIB
-
-	eapply "${WORKDIR}"/netris_${PV}-${DEB_VER}.diff
-	eapply "${S}"/debian/patches/[01]*
-
-	# bug #185332
-	sed -i \
-		-e '/sys\/time/ i\
-#include <sys/types.h> \
-#include <time.h>
-' \
-		-e '/netint2/ s/short/int16_t/' \
-		-e '/netint4/ s/long/int32_t/' \
-		netris.h || die
-	sed -i \
-		-e 's/volatile //g' \
-		-e '/Be more forgiving/d' \
-		-e 's/static myRandSeed/static int myRandSeed/' \
-		util.c || die
-	sed -i \
-		-e 's/\(long pauseTimeLeft\)/\1 = 0/' \
-		game.c || die
-	sed -i \
-		-e '/^CC/d' \
-		-e '/^COPT/d' \
-		-e '/^CFLAGS/d' \
-		-e 's/(LFLAGS)/(LDFLAGS) $(LFLAGS)/' \
-		Configure || die
-}
-
-src_configure() {
-	bash ./Configure -O || die
-}
-
-src_install() {
-	dobin netris sr
-	dodoc FAQ README robot_desc
-}
diff --git a/games-arcade/netris/netris-0.52-r3.ebuild b/games-arcade/netris/netris-0.52-r3.ebuild
new file mode 100644
index 000000000000..e4533111a8b0
--- /dev/null
+++ b/games-arcade/netris/netris-0.52-r3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DEB_VER="10"
+DESCRIPTION="Classic networked version of T*tris"
+HOMEPAGE="http://www.netris.org/"
+SRC_URI="ftp://ftp.netris.org/pub/netris/${P}.tar.gz
+	mirror://debian/pool/main/n/netris/netris_${PV}-${DEB_VER}.debian.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="sys-libs/ncurses:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	tc-export CC CXX LD AR RANLIB
+
+	eapply "${S}"/../debian/patches/[01]*
+	eapply "${FILESDIR}"/${P}-tinfo.patch
+
+	# bug #185332
+	sed -i \
+		-e '/sys\/time/ i\
+#include <sys/types.h> \
+#include <time.h>
+' \
+		-e '/netint2/ s/short/int16_t/' \
+		-e '/netint4/ s/long/int32_t/' \
+		netris.h || die
+	sed -i \
+		-e 's/volatile //g' \
+		-e '/Be more forgiving/d' \
+		-e 's/static myRandSeed/static int myRandSeed/' \
+		util.c || die
+	sed -i \
+		-e 's/\(long pauseTimeLeft\)/\1 = 0/' \
+		game.c || die
+	sed -i \
+		-e '/^CC/d' \
+		-e '/^COPT/d' \
+		-e '/^CFLAGS/d' \
+		-e 's/(LFLAGS)/(LDFLAGS) $(LFLAGS)/' \
+		Configure || die
+}
+
+src_configure() {
+	bash ./Configure -O || die
+}
+
+src_install() {
+	dobin netris sr
+	dodoc FAQ README robot_desc
+}
-- 
cgit v1.2.3-65-gdbad