From a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 28 Apr 2018 20:02:04 +0100
Subject: gentoo resync : 28.04.2018

---
 games-arcade/netris/Manifest              |  2 +-
 games-arcade/netris/netris-0.52-r1.ebuild | 57 -----------------------------
 games-arcade/netris/netris-0.52-r2.ebuild | 61 +++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 58 deletions(-)
 delete mode 100644 games-arcade/netris/netris-0.52-r1.ebuild
 create mode 100644 games-arcade/netris/netris-0.52-r2.ebuild

(limited to 'games-arcade/netris')

diff --git a/games-arcade/netris/Manifest b/games-arcade/netris/Manifest
index c63731185f6c..01b092e6b623 100644
--- a/games-arcade/netris/Manifest
+++ b/games-arcade/netris/Manifest
@@ -1,4 +1,4 @@
 DIST netris-0.52.tar.gz 33135 BLAKE2B e6958494b3f1e269b87d5e6833355af98c3936e282870afd8153711603b8115998cebe91f5e86afacc58b20cc8ad9ea2fae69906fa544948de7cb6ad77425cfd SHA512 842ad8602394dee929c3c4ba222f9f5ffe628e52348c3faf7c9098bbd5b0b0279fffc7927320f8ee8a5102537c995a8ed605d851f1cd32e4bd8976a7889c84e1
 DIST netris_0.52-9.diff.gz 14482 BLAKE2B 746410106ca944949e1c589f9bc1dcb011269a70339bfff8adcd2ca6eefb51f32cc77b61cc6b25f64a75629e915bf2dc0a8fcc6a9e76d0f7c4dae1d651e8e77f SHA512 4bed230091ddecf5a0dc043981ec9b0a177bee01262715b9cb9a2af0adefe2db52555416b795a70dd496e6fb0b132586bc7f32d2a480f1cfd6c4d40304076109
-EBUILD netris-0.52-r1.ebuild 1222 BLAKE2B 1f1c1a388d5154a3658364507e8dadb8d5d8288a15af9c3cf4215010c9119c8e16a916eaf8c15541bd827c5340f725b634a8aa43697419f41335992d475a74b3 SHA512 301539d538ff54dc7210feac0f04100cc932ad38cd93cbf952c429e91929259bb1d8ed3ef321e2c6058186f50627c0d5797c6c23898a0e33d546735c6dc5eadb
+EBUILD netris-0.52-r2.ebuild 1249 BLAKE2B 6b08a3e8d84fe8fd60f4e2edb956636fb7260f4d5da45f5f62405950edf9ba8d2b6fcf6d927d89156d712d232aa1c8542dc9e3fa6f0452c202fca2c993c82bd3 SHA512 2ba751c4e8aa8d8b0f28895ceb2569efdc6737fe60513847a19544836b1258001b80a4d41f52e8c229a235282c8721970a61f0b60d259a1598a55a86730ddc7e
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/netris/netris-0.52-r1.ebuild b/games-arcade/netris/netris-0.52-r1.ebuild
deleted file mode 100644
index 0052d3ee208a..000000000000
--- a/games-arcade/netris/netris-0.52-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-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() {
-	epatch "${WORKDIR}"/netris_${PV}-${DEB_VER}.diff
-	epatch netris-0.52/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() {
-	dogamesbin netris sr
-	dodoc FAQ README robot_desc
-	prepgamesdirs
-}
diff --git a/games-arcade/netris/netris-0.52-r2.ebuild b/games-arcade/netris/netris-0.52-r2.ebuild
new file mode 100644
index 000000000000..16cf7b4c01d3
--- /dev/null
+++ b/games-arcade/netris/netris-0.52-r2.ebuild
@@ -0,0 +1,61 @@
+# 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
+}
-- 
cgit v1.2.3