| 1 |
commit: f852753fbcded429107d55b542666b8c31e4df3e |
| 2 |
Author: Stefan Strogin <steils <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 30 07:18:13 2019 +0000 |
| 4 |
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 30 07:26:06 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f852753f |
| 7 |
|
| 8 |
games-arcade/netris: add patch to build with ncurses[tinfo] |
| 9 |
|
| 10 |
- Update Debian patchset |
| 11 |
- EAPI=7 |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/687992 |
| 14 |
Package-Manager: Portage-2.3.69, Repoman-2.3.16 |
| 15 |
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org> |
| 16 |
|
| 17 |
games-arcade/netris/Manifest | 2 +- |
| 18 |
games-arcade/netris/files/netris-0.52-tinfo.patch | 14 ++++++++++++++ |
| 19 |
.../{netris-0.52-r2.ebuild => netris-0.52-r3.ebuild} | 13 +++++++------ |
| 20 |
3 files changed, 22 insertions(+), 7 deletions(-) |
| 21 |
|
| 22 |
diff --git a/games-arcade/netris/Manifest b/games-arcade/netris/Manifest |
| 23 |
index c989e0beaad..3d03e493819 100644 |
| 24 |
--- a/games-arcade/netris/Manifest |
| 25 |
+++ b/games-arcade/netris/Manifest |
| 26 |
@@ -1,2 +1,2 @@ |
| 27 |
DIST netris-0.52.tar.gz 33135 BLAKE2B e6958494b3f1e269b87d5e6833355af98c3936e282870afd8153711603b8115998cebe91f5e86afacc58b20cc8ad9ea2fae69906fa544948de7cb6ad77425cfd SHA512 842ad8602394dee929c3c4ba222f9f5ffe628e52348c3faf7c9098bbd5b0b0279fffc7927320f8ee8a5102537c995a8ed605d851f1cd32e4bd8976a7889c84e1 |
| 28 |
-DIST netris_0.52-9.diff.gz 14482 BLAKE2B 746410106ca944949e1c589f9bc1dcb011269a70339bfff8adcd2ca6eefb51f32cc77b61cc6b25f64a75629e915bf2dc0a8fcc6a9e76d0f7c4dae1d651e8e77f SHA512 4bed230091ddecf5a0dc043981ec9b0a177bee01262715b9cb9a2af0adefe2db52555416b795a70dd496e6fb0b132586bc7f32d2a480f1cfd6c4d40304076109 |
| 29 |
+DIST netris_0.52-10.debian.tar.xz 13160 BLAKE2B 80c4a27ecef79b63ddf72deffe10bcb9b4f83d1be8982d9b8761f2a5e7c1622ab03042fe51112882a188f431ecbf17db05ede7339dadcead98012ea5ad334873 SHA512 94b6fd6a938efe156a44687fdf3d4ba141513a13130548e552ec20864ee73625817d79c6821030bfcff7d05edecec69c78b5a1048b9597c932c7731165877469 |
| 30 |
|
| 31 |
diff --git a/games-arcade/netris/files/netris-0.52-tinfo.patch b/games-arcade/netris/files/netris-0.52-tinfo.patch |
| 32 |
new file mode 100644 |
| 33 |
index 00000000000..2b2363a1c61 |
| 34 |
--- /dev/null |
| 35 |
+++ b/games-arcade/netris/files/netris-0.52-tinfo.patch |
| 36 |
@@ -0,0 +1,14 @@ |
| 37 |
+diff --git a/Configure b/Configure |
| 38 |
+index a8bf8f6..3fa9097 100755 |
| 39 |
+--- a/Configure |
| 40 |
++++ b/Configure |
| 41 |
+@@ -80,6 +80,9 @@ for lib in -lcurses -lncurses; do |
| 42 |
+ LFLAGS="$lib" |
| 43 |
+ fi |
| 44 |
+ done |
| 45 |
++if $CC $CFLAGS $LEXTRA test.c -ltinfo > /dev/null 2>&1; then |
| 46 |
++ LFLAGS="$LFLAGS -ltinfo" |
| 47 |
++fi |
| 48 |
+ for lib in -lsocket -lnsl -ltermcap; do |
| 49 |
+ if $CC $CFLAGS $LEXTRA test.c $lib > /dev/null 2>&1; then |
| 50 |
+ LFLAGS="$LFLAGS $lib" |
| 51 |
|
| 52 |
diff --git a/games-arcade/netris/netris-0.52-r2.ebuild b/games-arcade/netris/netris-0.52-r3.ebuild |
| 53 |
similarity index 82% |
| 54 |
rename from games-arcade/netris/netris-0.52-r2.ebuild |
| 55 |
rename to games-arcade/netris/netris-0.52-r3.ebuild |
| 56 |
index 16cf7b4c01d..e4533111a8b 100644 |
| 57 |
--- a/games-arcade/netris/netris-0.52-r2.ebuild |
| 58 |
+++ b/games-arcade/netris/netris-0.52-r3.ebuild |
| 59 |
@@ -1,14 +1,15 @@ |
| 60 |
-# Copyright 1999-2018 Gentoo Foundation |
| 61 |
+# Copyright 1999-2019 Gentoo Authors |
| 62 |
# Distributed under the terms of the GNU General Public License v2 |
| 63 |
|
| 64 |
-EAPI=6 |
| 65 |
+EAPI=7 |
| 66 |
+ |
| 67 |
inherit toolchain-funcs |
| 68 |
|
| 69 |
-DEB_VER="9" |
| 70 |
+DEB_VER="10" |
| 71 |
DESCRIPTION="Classic networked version of T*tris" |
| 72 |
HOMEPAGE="http://www.netris.org/" |
| 73 |
SRC_URI="ftp://ftp.netris.org/pub/netris/${P}.tar.gz |
| 74 |
- mirror://debian/pool/main/n/netris/netris_${PV}-${DEB_VER}.diff.gz" |
| 75 |
+ mirror://debian/pool/main/n/netris/netris_${PV}-${DEB_VER}.debian.tar.xz" |
| 76 |
|
| 77 |
LICENSE="GPL-2" |
| 78 |
SLOT="0" |
| 79 |
@@ -23,8 +24,8 @@ src_prepare() { |
| 80 |
|
| 81 |
tc-export CC CXX LD AR RANLIB |
| 82 |
|
| 83 |
- eapply "${WORKDIR}"/netris_${PV}-${DEB_VER}.diff |
| 84 |
- eapply "${S}"/debian/patches/[01]* |
| 85 |
+ eapply "${S}"/../debian/patches/[01]* |
| 86 |
+ eapply "${FILESDIR}"/${P}-tinfo.patch |
| 87 |
|
| 88 |
# bug #185332 |
| 89 |
sed -i \ |
Archives