EAPI=5; tidy; fix underlinking again (bug #527462)

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64

5 files changed, 73 insertions, 24 deletions

diff --git a/games-simulation/senken/ChangeLog b/games-simulation/senken/ChangeLog
index 6a9db83279d4..9c8044ec0065 100644
--- a/games-simulation/senken/ChangeLog
+++ b/games-simulation/senken/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-simulation/senken
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/senken/ChangeLog,v 1.10 2009/02/11 13:05:34 tupone Exp $
+# Copyright 2000-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/senken/ChangeLog,v 1.11 2014/10/30 15:31:43 mr_bones_ Exp $
+
+  30 Oct 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/senken-0.3.0-warnings.patch, files/senken-0.3.0-as-needed.patch,
+  senken-0.3.0.ebuild:
+  EAPI=5; tidy; fix underlinking again (bug #527462)
 
   11 Feb 2009; Alfredo Tupone <tupone@gentoo.org>
   +files/senken-0.3.0-as-needed.patch, senken-0.3.0.ebuild:
diff --git a/games-simulation/senken/Manifest b/games-simulation/senken/Manifest
index 531c8ec613e2..68b904fa9a38 100644
--- a/games-simulation/senken/Manifest
+++ b/games-simulation/senken/Manifest
@@ -1,5 +1,6 @@
-AUX senken-0.3.0-as-needed.patch 374 RMD160 cb7d4ec7d908c11c1a10a49939818eae1c68890c SHA1 e53b6de2612e7848cb720105e6d38079ead445c2 SHA256 804aeb17fd7da562870bffe3707b2b08ea7d9e1759774cafcdf3e0ee1e461adb
-DIST senken-0.3.0.tar.gz 1391010 RMD160 1a9bdbc16342ac550c613393f3571b05da219dea SHA1 701fc4d1f4fb6f677f69060f0350681deeebd982 SHA256 2b0c6c0f08a9dcc1c15d2c94f7c5f494953cb83bc387749fe46c1dc6fb7cb880
-EBUILD senken-0.3.0.ebuild 1359 RMD160 488c868b10538b3471d5523d0862b855ae8ea84b SHA1 7bfc97959543fe796b72cc18daf7f346c18fa649 SHA256 b253d5b2eb67a030904068c830a963324df1b1539e529985b0f495c0bccd2827
-MISC ChangeLog 1282 RMD160 ed3edf2a88926c3fd2a183560f555ba814d71629 SHA1 8605d4ca9a4ccd23f6a37c03752ddf30692ec815 SHA256 cdc90b60729cb9a8ab914e9c880bc7241c0e469eff9a328f4444008e229eb018
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+AUX senken-0.3.0-as-needed.patch 947 SHA256 fa6d58741720474cbafa0118aea8d94518434898cbaeb96a2b8918468e9cf0c7 SHA512 6f1f5ae454b9f186624a2ac9d3d5d802c973fadcedf236d83b47020302645c197683ee8765c9b3536866d5281fd37ce94ebdafebde5b5653c1a2188a81fd6a44 WHIRLPOOL ee83805c25685a6897a18ab314504b090cfb2fc23e3d9278b1f302ac62ea39079920350d3a8fe71c7cd5d6e069b86a181e53123dea1ac532332448f7cbda64cb
+AUX senken-0.3.0-warnings.patch 1099 SHA256 0775fd63808f156de3d5f890ce0a56c77e6bd57e3e2b7d48e91a0166ee0c0084 SHA512 5e48805adcec08e8deab671df7bf5a8303c29d8d2679bf9ce6608674d225e5acafc3f0f66b07c0362f9da735263773259db8f77dfe7028f268dbe13ce67e6b10 WHIRLPOOL f3e62ca2de28ab22ec9b843bbba2d8fd6177be628b5fc05c5b3ccdd347e5777c42e29c5f480a1c5663df4c4f163d68cc127890a6b755ffc9487155f1055caf48
+DIST senken-0.3.0.tar.gz 1391010 SHA256 2b0c6c0f08a9dcc1c15d2c94f7c5f494953cb83bc387749fe46c1dc6fb7cb880 SHA512 df0c15cabf667fb7b56db40baf03fcae6695aa9ec0e42a7db682ff20877a5b89ee67e7799e762b4a78cf0f3fdee7f001419091f0683df74ba1bbe6b9501f0272 WHIRLPOOL fec07f5237c6b0961611caf7e6a3398f0dc5366ff391008668179af470a3bb6069aadea6a5d938cc943a30bc83e6a63e8f006be743a181aa53dadd69ddfbe204
+EBUILD senken-0.3.0.ebuild 1233 SHA256 14656a353321ecfd5246f7c2492b72435b4838eb6dad85b48e1c958350d54db0 SHA512 41db4c55911b098a1e3b5d78c6a89fcef05ceea5ad3983ee79eb0faebcc35a811a56c931c9de788eb719a903dd13a5efb832d618726700af51c4f655ac04060b WHIRLPOOL 3984f4fd7fa84e4537fdacaa4b22dfc9253dc4b8ad44743bc624b2e33f1d10cbdeb845ad29f6439ca4f8459f83e1c852896b96e8c1c2b4427e63e0bf12afb637
+MISC ChangeLog 1491 SHA256 88bcaa9830b149d07b78ba4033810e9d1b931d5d71d5d47f964127aa8fca6789 SHA512 ccbd7d85fb07cdc7528fb13b0f9b1339371d4d094218b3857af4bf6d7442f3536e2dded7c6f995c79c190ddf088073a734798711aaec3b182a51dfdd45a7048e WHIRLPOOL 9313f7a8b28638714895290a6352cf26ea8d8ecfb3673b710df2492a9795795a32a4897581f555d01dd5d573ac20b41157b0d5713b912e84b6d6dbf8e1e67e37
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-simulation/senken/files/senken-0.3.0-as-needed.patch b/games-simulation/senken/files/senken-0.3.0-as-needed.patch
index 6cb3417ce8a6..428cbc9ee4c6 100644
--- a/games-simulation/senken/files/senken-0.3.0-as-needed.patch
+++ b/games-simulation/senken/files/senken-0.3.0-as-needed.patch
@@ -1,5 +1,6 @@
---- server/Makefile.in.old      2009-02-11 12:45:10.000000000 +0100
-+++ server/Makefile.in  2009-02-11 12:45:18.000000000 +0100
+diff -ru senken-0.3.0.orig/server/Makefile.in senken-0.3.0/server/Makefile.in
+--- senken-0.3.0.orig/server/Makefile.in	2003-11-20 02:30:15.000000000 -0500
++++ senken-0.3.0/server/Makefile.in	2014-10-30 10:58:51.202157036 -0400
 @@ -10,7 +10,7 @@
  
  DEFS = @DEFS@
@@ -9,3 +10,15 @@
  
  prefix = @prefix@
  exec_prefix = @exec_prefix@
+diff -ru senken-0.3.0.orig/src/Makefile.in senken-0.3.0/src/Makefile.in
+--- senken-0.3.0.orig/src/Makefile.in	2003-11-20 02:30:16.000000000 -0500
++++ senken-0.3.0/src/Makefile.in	2014-10-30 10:59:05.154704393 -0400
+@@ -8,7 +8,7 @@
+ 
+ DEFS = @DEFS@
+ CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @GTK_CFLAGS@
+-LIBS = ../lib/libsenken.a @LIBS@ @GTK_LIBS@
++LIBS = ../lib/libsenken.a @LIBS@ @GTK_LIBS@ -lm
+ 
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
diff --git a/games-simulation/senken/files/senken-0.3.0-warnings.patch b/games-simulation/senken/files/senken-0.3.0-warnings.patch
new file mode 100644
index 000000000000..b15565ad0a90
--- /dev/null
+++ b/games-simulation/senken/files/senken-0.3.0-warnings.patch
@@ -0,0 +1,31 @@
+diff -ru senken-0.3.0.orig/server/protocol.c senken-0.3.0/server/protocol.c
+--- senken-0.3.0.orig/server/protocol.c	2003-11-20 02:30:15.000000000 -0500
++++ senken-0.3.0/server/protocol.c	2014-10-30 11:04:39.831848871 -0400
+@@ -294,7 +294,7 @@
+     /*
+      * If transaction active just save this for later
+      */
+-    if (connection_txn_active) {
++    if (connection_txn_active(conn)) {
+ 	set_op_t *op = calloc(1, sizeof(set_op_t));
+ 	int r;
+ 
+diff -ru senken-0.3.0.orig/src/gtkhelp_reports.c senken-0.3.0/src/gtkhelp_reports.c
+--- senken-0.3.0.orig/src/gtkhelp_reports.c	2003-11-20 02:30:16.000000000 -0500
++++ senken-0.3.0/src/gtkhelp_reports.c	2014-10-30 11:06:43.795828908 -0400
+@@ -1,3 +1,4 @@
++#include <string.h>
+ #include <gtk/gtk.h>
+ #include <gdk/gdk.h>
+ 
+diff -ru senken-0.3.0.orig/src/main.c senken-0.3.0/src/main.c
+--- senken-0.3.0.orig/src/main.c	2003-11-20 02:30:16.000000000 -0500
++++ senken-0.3.0/src/main.c	2014-10-30 11:06:28.147336339 -0400
+@@ -25,6 +25,7 @@
+ #  include <config.h>
+ #endif
+ 
++#include <string.h>
+ #include <unistd.h>
+ #include <signal.h>
+ #include <gtk/gtk.h>
diff --git a/games-simulation/senken/senken-0.3.0.ebuild b/games-simulation/senken/senken-0.3.0.ebuild
index 4b019cfe961d..e1f67ed24c4a 100644
--- a/games-simulation/senken/senken-0.3.0.ebuild
+++ b/games-simulation/senken/senken-0.3.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/senken/senken-0.3.0.ebuild,v 1.10 2011/03/01 07:20:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/senken/senken-0.3.0.ebuild,v 1.11 2014/10/30 15:31:43 mr_bones_ Exp $
 
-EAPI=2
+EAPI=5
 inherit eutils games
 
 DESCRIPTION="city simulation game"
 HOMEPAGE="http://www.contrib.andrew.cmu.edu/~tmartin/senken/"
-SRC_URI="http://www.contrib.andrew.cmu.edu/~tmartin/senken/download/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -24,28 +24,27 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	sed -i \
 		-e "s:/usr/local/share:${GAMES_DATADIR}:" \
-		lib/utils.h \
-		|| die "sed lib/utils.h failed"
-	epatch "${FILESDIR}"/${P}-as-needed.patch
+		lib/utils.h || die
+	epatch \
+		"${FILESDIR}"/${P}-as-needed.patch \
+		"${FILESDIR}"/${P}-warnings.patch
 }
 src_configure() {
-	egamesconf $(use_enable nls) || die
+	egamesconf $(use_enable nls)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS README TODO
+	default
 
 	dodir "${GAMES_DATADIR}"
-	mv "${D}/${GAMES_PREFIX}/share/senken" "${D}/${GAMES_DATADIR}/" \
-		|| die "mv failed"
-	rm -rf "${D}/${GAMES_PREFIX}"/{include,lib,man,share}
+	mv "${D}/${GAMES_PREFIX}/share/senken" "${D}/${GAMES_DATADIR}/" || die
+	rm -rf "${D}/${GAMES_PREFIX}"/{include,lib,man,share} || die
 
 	insinto "${GAMES_DATADIR}/senken/img"
 	doins img/*.png
 
-	find "${D}/${GAMES_DATADIR}/" -type f -exec chmod a-x \{\} \;
-	find "${D}/${GAMES_DATADIR}/" -name "Makefile.*" -exec rm -f \{\} \;
+	find "${D}/${GAMES_DATADIR}/" -type f -exec chmod a-x \{\} +
+	find "${D}/${GAMES_DATADIR}/" -name "Makefile.*" -exec rm -f \{\} +
 
 	prepgamesdirs
 }