EAPI=2; honor LDFLAGS; read hours file correctly (bug #316389)

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 49 insertions, 12 deletions

diff --git a/games-roguelike/moria/ChangeLog b/games-roguelike/moria/ChangeLog
index 496212da429f..3539925cecf4 100644
--- a/games-roguelike/moria/ChangeLog
+++ b/games-roguelike/moria/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-roguelike/moria
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/moria/ChangeLog,v 1.8 2006/07/18 07:59:25 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/moria/ChangeLog,v 1.9 2010/05/05 20:28:21 mr_bones_ Exp $
+
+  05 May 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/5.5.2-hours.patch, moria-5.5.2.ebuild:
+  EAPI=2; honor LDFLAGS; read hours file correctly (bug #316389)
 
   18 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/5.5.2-fbsd.patch, files/5.5.2-glibc.patch, moria-5.5.2.ebuild:
diff --git a/games-roguelike/moria/Manifest b/games-roguelike/moria/Manifest
index f4c460c00f0a..3e84b2adbc43 100644
--- a/games-roguelike/moria/Manifest
+++ b/games-roguelike/moria/Manifest
@@ -1,8 +1,9 @@
 AUX 5.5.2-fbsd.patch 6904 RMD160 8063eba76df2712753fa118e522d492da44c4a31 SHA1 56d7eeaa8e9112505a5c505261f5bc6db221b912 SHA256 14d431275e60b320c33ee30a0fdf446a04d8786fa51080f9cad60f87b630894c
 AUX 5.5.2-gentoo-paths.patch 2363 RMD160 fe0ab8a34a6d1382c4408230b23af9364d7218cb SHA1 f8ca19ec55ebba45de0303854db7a5bb86ea4a2b SHA256 40a8402d7b49bb296eb13e5f3b76fec50a6b484c7ffde7943269e11e92829a35
 AUX 5.5.2-glibc.patch 9777 RMD160 03ba54df23a4c4673949a88cb256d7826193d3c4 SHA1 d77b5842eb2e8fd936a22801406674e9ede68240 SHA256 96126fc9231d88f43694db49793bbae7d56abf9548ead6e7b07bf7056eabc1c2
+AUX 5.5.2-hours.patch 1343 RMD160 0d8c7f1e4661d3cb6d62f9c3f297dfa65b7b320b SHA1 fa9c57b22f0d6d6bed0e91664bf460bddeb5d3f0 SHA256 821d0085fc025419ae57aa4725f7084f6934bf07070d7463118aede4c414f3c4
 DIST moria-extras.tar.bz2 57324 RMD160 1224849eeade7a2b7d1858abc6da816607e1bed1 SHA1 3216dace81698d2c4c0c79a878af2e85a1f220c5 SHA256 60f2a7d7bf8615a090cacafd17cf6fae8f9f0af78700439022e25014384b5076
 DIST um5.5.2.tar.Z 910536 RMD160 1556c76f151d7ea29da79071a57398f63d0b138b SHA1 69c7a7bf4e2c5be123ee7a82f5ad12ad5d0f5b08 SHA256 fffab65703c77058a1aadd8647cc1f44bd4349065af0b334702986f36007b2ed
-EBUILD moria-5.5.2.ebuild 1904 RMD160 91144448fc1be9c922285b33e2e1b0a6d9ff8b14 SHA1 29c5b3f6d6794a2fe9373632e5c87d7262ea5965 SHA256 eb480db8b98281e0c91530db3006b9a08660b33f803320b4c1cfb8cd4d803e1f
-MISC ChangeLog 1122 RMD160 13eb81d60f8b8ba4250b16b39e6cbeed6ef1c0cd SHA1 7de0994352466ed85ef8de8aa5b3d626c648a83a SHA256 b39778b932f20d7f20d53cec97269f3f0455a4defb80f53a86bb023d99137d42
+EBUILD moria-5.5.2.ebuild 2045 RMD160 a739f4a506f70f81e9fc6435006025cb0ea98ba9 SHA1 2ecac6f98d29f70bd1add1d92d8904f291e9fafe SHA256 e38852ce5f69abe4e08eef6435767fb60f3287b5474440badcadd6f611e11d21
+MISC ChangeLog 1291 RMD160 feb6a70eab020bf0672bf1befa6a279fc5908f7a SHA1 b6ff7107c240b01ef340a422e285f53db66bd4ec SHA256 a993b8e42c8d88b371b01d02bfb92b546b7a937b5fbf777feb42eea1361922a3
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-roguelike/moria/files/5.5.2-hours.patch b/games-roguelike/moria/files/5.5.2-hours.patch
new file mode 100644
index 000000000000..3d1c329d9b9b
--- /dev/null
+++ b/games-roguelike/moria/files/5.5.2-hours.patch
@@ -0,0 +1,30 @@
+diff -ru umoria.orig/source/files.c umoria/source/files.c
+--- umoria.orig/source/files.c	1994-07-21 21:47:22.000000000 -0400
++++ umoria/source/files.c	2010-05-05 14:51:44.334588483 -0400
+@@ -130,19 +130,19 @@
+ 	if (strlen(in_line) > 3)
+ 	  {
+ 	    if (!strncmp(in_line, "SUN:", 4))
+-	      (void) strcpy(days[0], in_line);
++	      (void) snprintf(days[0], sizeof(days[0]), "%s", in_line);
+ 	    else if (!strncmp(in_line, "MON:", 4))
+-	      (void) strcpy(days[1], in_line);
++	      (void) snprintf(days[1], sizeof(days[0]), "%s", in_line);
+ 	    else if (!strncmp(in_line, "TUE:", 4))
+-	      (void) strcpy(days[2], in_line);
++	      (void) snprintf(days[2], sizeof(days[0]), "%s", in_line);
+ 	    else if (!strncmp(in_line, "WED:", 4))
+-	      (void) strcpy(days[3], in_line);
++	      (void) snprintf(days[3], sizeof(days[0]), "%s", in_line);
+ 	    else if (!strncmp(in_line, "THU:", 4))
+-	      (void) strcpy(days[4], in_line);
++	      (void) snprintf(days[4], sizeof(days[0]), "%s", in_line);
+ 	    else if (!strncmp(in_line, "FRI:", 4))
+-	      (void) strcpy(days[5], in_line);
++	      (void) snprintf(days[5], sizeof(days[0]), "%s", in_line);
+ 	    else if (!strncmp(in_line, "SAT:", 4))
+-	      (void) strcpy(days[6], in_line);
++	      (void) snprintf(days[6], sizeof(days[0]), "%s", in_line);
+ 	  }
+       (void) fclose(file1);
+     }
diff --git a/games-roguelike/moria/moria-5.5.2.ebuild b/games-roguelike/moria/moria-5.5.2.ebuild
index 825685874db3..8f51392922f0 100644
--- a/games-roguelike/moria/moria-5.5.2.ebuild
+++ b/games-roguelike/moria/moria-5.5.2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/moria/moria-5.5.2.ebuild,v 1.11 2006/07/18 07:59:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/moria/moria-5.5.2.ebuild,v 1.12 2010/05/05 20:28:21 mr_bones_ Exp $
 
+EAPI=2
 inherit eutils toolchain-funcs games
 
 DESCRIPTION="Rogue-like D&D curses game similar to nethack (BUT BETTER)"
@@ -21,16 +22,14 @@ DEPEND=">=sys-libs/ncurses-5"
 
 S=${WORKDIR}/umoria
 
-src_unpack() {
+src_prepare() {
 	local f
 
-	unpack ${A}
-	cd "${S}"
-
 	epatch \
 		"${FILESDIR}"/${PV}-gentoo-paths.patch \
 		"${FILESDIR}"/${PV}-glibc.patch \
-		"${FILESDIR}"/${PV}-fbsd.patch
+		"${FILESDIR}"/${PV}-fbsd.patch \
+		"${FILESDIR}"/${PV}-hours.patch
 
 	for f in source/* unix/* ; do
 		ln -s ${f} $(basename ${f})
@@ -42,6 +41,8 @@ src_unpack() {
 		-e "s:GENTOO_STATEDIR:${GAMES_STATEDIR}:" \
 		config.h \
 		|| die "sed failed"
+	echo "#include <stdlib.h>" >> config.h
+	echo "#include <stdio.h>" >> config.h
 	sed -i \
 		-e "/^STATEDIR =/s:=.*:=\$(DESTDIR)${GAMES_STATEDIR}:" \
 		-e "/^BINDIR = /s:=.*:=\$(DESTDIR)${GAMES_BINDIR}:" \
@@ -50,6 +51,7 @@ src_unpack() {
 		-e "/^OWNER = /s:=.*:=${GAMES_USER}:" \
 		-e "/^GROUP = /s:=.*:=${GAMES_GROUP}:" \
 		-e "/^CC = /s:=.*:=$(tc-getCC):" \
+		-e '/^LFLAGS = /s:=.*:= $(LDFLAGS):' \
 		Makefile \
 		|| die "sed failed"
 	mv doc/moria.6 "${S}" || die "mv failed"
@@ -57,7 +59,7 @@ src_unpack() {
 
 src_install() {
 	dodir "${GAMES_BINDIR}" "${GAMES_DATADIR}/${PN}" "${GAMES_STATEDIR}"
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 
 	doman moria.6
 	dodoc README doc/* "${WORKDIR}"/${PN}-extras/*