From c93fad6785f328af09f2ef7f2fed3d87c2ef2d24 Mon Sep 17 00:00:00 2001
From: Michael Sterrett <mr_bones_@gentoo.org>
Date: Thu, 29 Jan 2009 03:34:28 +0000
Subject: EAPI=2; try to fix bug #185332; bump Debian patch; fix warnings;
 honor CC (Portage version: 2.1.6.4/cvs/Linux 2.6.28.1 i686)

---
 games-arcade/netris/ChangeLog          |  7 ++--
 games-arcade/netris/netris-0.52.ebuild | 65 +++++++++++++++++++++++++---------
 2 files changed, 54 insertions(+), 18 deletions(-)

(limited to 'games-arcade/netris')

diff --git a/games-arcade/netris/ChangeLog b/games-arcade/netris/ChangeLog
index b0dd98cd2352..fa7decab5167 100644
--- a/games-arcade/netris/ChangeLog
+++ b/games-arcade/netris/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-arcade/netris
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/netris/ChangeLog,v 1.11 2007/04/24 14:49:27 drizzt Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/netris/ChangeLog,v 1.12 2009/01/29 03:34:28 mr_bones_ Exp $
+
+  29 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org> netris-0.52.ebuild:
+  EAPI=2; try to fix bug #185332; bump Debian patch; fix warnings; honor CC
 
   24 Apr 2007; Timothy Redaelli <drizzt@gentoo.org> netris-0.52.ebuild:
   Add ~x86-fbsd keyword.
diff --git a/games-arcade/netris/netris-0.52.ebuild b/games-arcade/netris/netris-0.52.ebuild
index e931d1d4a390..b6d39d913c96 100644
--- a/games-arcade/netris/netris-0.52.ebuild
+++ b/games-arcade/netris/netris-0.52.ebuild
@@ -1,29 +1,62 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/netris/netris-0.52.ebuild,v 1.13 2007/04/24 14:49:27 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/netris/netris-0.52.ebuild,v 1.14 2009/01/29 03:34:28 mr_bones_ Exp $
 
+EAPI=2
 inherit eutils games
 
-DESCRIPTION="Classic networked version of T*tris"
-HOMEPAGE="http://www.netris.org/"
+DEB_VER=7
+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}-6.diff.gz"
+	mirror://debian/pool/main/n/netris/netris_${PV}-${DEB_VER}.diff.gz"
 
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 mips ppc ~sparc x86 ~x86-fbsd"
-IUSE=""
+LICENSE='GPL-2'
+SLOT='0'
+KEYWORDS='amd64 mips ppc ~sparc x86 ~x86-fbsd'
+IUSE=''
 
-DEPEND="sys-libs/ncurses"
+DEPEND='sys-libs/ncurses'
 
-src_unpack() {
-	unpack ${A}
-	epatch netris_${PV}-6.diff
+src_prepare() {
+	epatch "${WORKDIR}"/netris_${PV}-${DEB_VER}.diff
+	# 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 failed'
+	sed -i \
+		-e '/curses\.h/ a\
+#include <term.h>
+' \
+		curses.c \
+		|| die 'sed failed'
+	sed -i \
+		-e 's/volatile //g' \
+		-e '/Be more forgiving/d' \
+		-e 's/static myRandSeed/static int myRandSeed/' \
+		util.c \
+		|| die 'sed failed'
+	sed -i \
+		-e 's/\(long pauseTimeLeft\)/\1 = 0/' \
+		game.c \
+		|| die 'sed failed'
+	sed -i \
+		-e '/^CC/d' \
+		-e '/^COPT/d' \
+		-e '/^CFLAGS/d' \
+		-e 's/(LFLAGS)/(LDFLAGS) $(LFLAGS)/' \
+		Configure \
+		|| die 'sed failed'
 }
 
-src_compile() {
-	./Configure --copt "${CFLAGS}" || die "Configure failed"
-	emake || die "emake failed"
+src_configure() {
+	./Configure -O || die 'Configure failed'
 }
 
 src_install() {
-- 
cgit v1.2.3-65-gdbad