Fix building against sys-libs/ncurses[tinfo] (bug #526582).

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 36 insertions, 19 deletions

diff --git a/games-puzzle/seatris/ChangeLog b/games-puzzle/seatris/ChangeLog
index 8efeb8e7ddb6..afb8552d1cae 100644
--- a/games-puzzle/seatris/ChangeLog
+++ b/games-puzzle/seatris/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/seatris
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/seatris/ChangeLog,v 1.8 2009/02/10 11:55:04 tupone Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/seatris/ChangeLog,v 1.9 2014/10/30 22:18:33 jer Exp $
+
+  30 Oct 2014; Jeroen Roovers <jer@gentoo.org>
+  files/seatris-0.0.14-as-needed.patch, seatris-0.0.14.ebuild:
+  Fix building against sys-libs/ncurses[tinfo] (bug #526582).
 
   10 Feb 2009; Alfredo Tupone <tupone@gentoo.org>
   +files/seatris-0.0.14-as-needed.patch, seatris-0.0.14.ebuild:
@@ -30,4 +34,3 @@
   11 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> +metadata.xml,
   +seatris-0.0.14.ebuild:
   initial commit - in response to bug #54939
-
diff --git a/games-puzzle/seatris/Manifest b/games-puzzle/seatris/Manifest
index 44fc8384d5a8..c3d4032a5bd3 100644
--- a/games-puzzle/seatris/Manifest
+++ b/games-puzzle/seatris/Manifest
@@ -1,5 +1,15 @@
-AUX seatris-0.0.14-as-needed.patch 287 RMD160 bd5646de76c9b5cd06f0d58a78da3bd388e21d2a SHA1 82b9077f77fce6545f23b4ce9b2f4117bb184fdc SHA256 f091ad5b91d6da30c9e21eb797b6c3d907b17d177109d967d95dcc4f7eaa8328
-DIST seatris-0.0.14.tar.gz 53056 RMD160 fe2701b7ef8164618412d5ec91c7d181dddaa2e9 SHA1 8afae884d0763f3f850e9fc71ee23e5df6407644 SHA256 797ec1403dec2e6c790ec77d41bc5201055cfbef4d9ad7054270845c909d0a2e
-EBUILD seatris-0.0.14.ebuild 959 RMD160 728c2bd7a884de3e9bd70e037d9416b87e9ee673 SHA1 bf37b56fbafed7413c9e7f82279dfe410823be61 SHA256 4927a3e1810d9c81a40094d25ce61f04ddb624dd05059d6b402d041d26c0def1
-MISC ChangeLog 1148 RMD160 547cdc46e57f35f24bdfb87b9bd387593deabdba SHA1 72e110ea2b48a54c79164210f4ff6f6f1dcce5bb SHA256 7c00acf5d5e21029747d76555e4f2ce1aaf33a70fea739250e5a377ce2f549d0
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX seatris-0.0.14-as-needed.patch 215 SHA256 9f4960b8b16b0449de238b5b0acc7e5d054613818d370d323e7ff31f6c5375d7 SHA512 587f8f4f555b6a97d38a0c7bb8069674e6612ff5e3027b7c7327a02178aabdc20a6d32f63b7a667eac31480e435f575844afdd79523707d0fcf586417d8fd38b WHIRLPOOL 76be32daf1705d14f46bf9598b3652820c87918aa881eb6116d271b1d9e6f265a40ff835b3243935c7c0c1d10cc4ea0e23422b1ae07d68190d27140e428a36fe
+DIST seatris-0.0.14.tar.gz 53056 SHA256 797ec1403dec2e6c790ec77d41bc5201055cfbef4d9ad7054270845c909d0a2e SHA512 105722ddbeaa8ae3863331126cf816e7d590ebe4ca244b32d3275071c2537c2865183a90f60f8dbf46cfacbcee4e811b653ff9cc6d2eae51c9ed6efa9263fac2 WHIRLPOOL 97a509c9a2c5cc6595e647029a69ad59bf20df255a958ce777a3598dcaeb7055a98cf8b2897d08ac0230bb71ff80684d45bcb9367c67699fd66157f809f28964
+EBUILD seatris-0.0.14.ebuild 1021 SHA256 469b3e1db00363b6734557581675845dfe6f6623e74c2b54a9808228ef786170 SHA512 1191d0a205f2f7b929c439475ad502721f04604dc511e15777f9dc0175634b655b1723559f6406b13da30c9fcf8f39ca8a2a4441bbb85430507ea97e5395dc94 WHIRLPOOL 68dcfa09de3ac5ee39d51af1be547cdc799b7c8b05a326f055c356c6ac0edebbeea8a1fc72437ff5dcf5724f0be858072b9d27f10f16c14f8fbd4ca5fd88d0ba
+MISC ChangeLog 1317 SHA256 ac787f655e92da4eb133c90da07ccb2e417728f1e7269c34fb0b28353fcd6f45 SHA512 09dbf412f491ca5c446f83173f60af31fc0681efa245a7b8fe177b121d13996dfa56a7f2d9e9413f1597f95a3a6a2b27cc59b2a93040941d353382d8c81ee0eb WHIRLPOOL 7a55a0deb49f3366298b8f758feae8e6fb4b7eb5936ad323e4dc35c156f0227434f6ce0c6f3c5386bb1fd4102fe923f3164c65ae1768986ac77a7ed5c1d8e3c5
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlRSuToACgkQVWmRsqeSphM3vACeOpjPZ/YZr/AlQ425yiFpewmA
+zC0An3O5ZFMPKteqbrysM3cdo9ZPg9p2
+=sua2
+-----END PGP SIGNATURE-----
diff --git a/games-puzzle/seatris/files/seatris-0.0.14-as-needed.patch b/games-puzzle/seatris/files/seatris-0.0.14-as-needed.patch
index 1cd22fb52fd9..e77c0dd75077 100644
--- a/games-puzzle/seatris/files/seatris-0.0.14-as-needed.patch
+++ b/games-puzzle/seatris/files/seatris-0.0.14-as-needed.patch
@@ -1,5 +1,5 @@
---- Makefile.in.old	2009-02-10 12:54:35.000000000 +0100
-+++ Makefile.in	2009-02-10 12:55:16.000000000 +0100
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -11,7 +11,7 @@
  	parse.o readcfg.o
  
diff --git a/games-puzzle/seatris/seatris-0.0.14.ebuild b/games-puzzle/seatris/seatris-0.0.14.ebuild
index 381d0e689e09..48984f9d6a76 100644
--- a/games-puzzle/seatris/seatris-0.0.14.ebuild
+++ b/games-puzzle/seatris/seatris-0.0.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/seatris/seatris-0.0.14.ebuild,v 1.10 2009/02/10 11:55:04 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/seatris/seatris-0.0.14.ebuild,v 1.11 2014/10/30 22:18:33 jer Exp $
 
-EAPI=2
-inherit eutils games
+EAPI=5
+inherit eutils games toolchain-funcs
 
 DESCRIPTION="A color ncurses tetris clone"
 HOMEPAGE="http://www.earth.li/projectpurple/progs/seatris.html"
@@ -12,20 +12,24 @@ SRC_URI="http://www.earth.li/projectpurple/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ppc64 x86"
-IUSE=""
 
-DEPEND="sys-libs/ncurses"
+RDEPEND="sys-libs/ncurses"
+DEPEND="${DEPEND}"
 
 src_prepare() {
 	sed -i \
 		-e "s:/var/lib/games:${GAMES_STATEDIR}:" \
-		scoring.h seatris.6 \
-		|| die "sed failed"
+		scoring.h seatris.6 || die
+
 	epatch "${FILESDIR}"/${P}-as-needed.patch
 }
 
+src_compile() {
+	emake LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
+}
+
 src_install () {
-	dogamesbin seatris || die "dogamesbin failed"
+	dogamesbin seatris || die
 	doman seatris.6
 	dodoc ACKNOWLEDGEMENTS HISTORY README TODO example.seatrisrc
 	dodir "${GAMES_STATEDIR}"