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>

diff --git a/games-arcade/netris/Manifest b/games-arcade/netris/Manifest
index c989e0beaad36d3c91b03af10e2b0e8d15a7f73a..3d03e4938193cae1a2e9f6b1697bfd78007defda 100644 (file)
--- 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 (file)
index 0000000..2b2363a
--- /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-r3.ebuild
similarity index 82%
rename from games-arcade/netris/netris-0.52-r2.ebuild
rename to games-arcade/netris/netris-0.52-r3.ebuild
index 16cf7b4c01d36a74cc9f381366f716a2eb24c95d..e4533111a8b0a3fa9f897c054cc53c2b5819ac7a 100644 (file)
--- a/games-arcade/netris/netris-0.52-r2.ebuild
+++ b/games-arcade/netris/netris-0.52-r3.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit toolchain-funcs
 
-DEB_VER="9"
+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}.diff.gz"
+       mirror://debian/pool/main/n/netris/netris_${PV}-${DEB_VER}.debian.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -23,8 +24,8 @@ src_prepare() {
 
        tc-export CC CXX LD AR RANLIB
 
-       eapply "${WORKDIR}"/netris_${PV}-${DEB_VER}.diff
-       eapply "${S}"/debian/patches/[01]*
+       eapply "${S}"/../debian/patches/[01]*
+       eapply "${FILESDIR}"/${P}-tinfo.patch
 
        # bug #185332
        sed -i \