EAPI=5; tidy install; avoid bashism (bug #527202)

(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 100 insertions, 14 deletions

diff --git a/games-roguelike/zangband/ChangeLog b/games-roguelike/zangband/ChangeLog
index bcaf258393ee..ce3a80060d6f 100644
--- a/games-roguelike/zangband/ChangeLog
+++ b/games-roguelike/zangband/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-roguelike/zangband
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/ChangeLog,v 1.20 2013/01/13 04:39:19 mr_bones_ Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/ChangeLog,v 1.21 2015/01/21 07:28:07 mr_bones_ Exp $
+
+  21 Jan 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/zangband-2.7.4c-configure.patch, +files/zangband-2.7.4c-makefile.patch,
+  files/zangband-2.7.4c-rng.patch, files/zangband-2.7.4c-tk85.patch,
+  zangband-2.7.4c.ebuild:
+  EAPI=5; tidy install; avoid bashism (bug #527202)
 
   13 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org>
   files/zangband-2.7.4c-rng.patch, files/zangband-2.7.4c-tk85.patch:
diff --git a/games-roguelike/zangband/files/zangband-2.7.4c-configure.patch b/games-roguelike/zangband/files/zangband-2.7.4c-configure.patch
new file mode 100644
index 000000000000..756ea757845c
--- /dev/null
+++ b/games-roguelike/zangband/files/zangband-2.7.4c-configure.patch
@@ -0,0 +1,51 @@
+--- configure.in.orig
++++ configure.in
+@@ -236,48 +236,5 @@
+ AC_CHECK_FUNCS([Tk_SetClassProcs TkpSync])
+ AC_CHECK_FUNCS([mkstemp usleep getpwuid getpwnam shmget])
+ 
+-dnl A nice function to test compiler options (like warnings)
+-AC_DEFUN(AC_CHECK_CC_OPT,
+-[FLAG=`echo zangband_cv_cflag_$1 | sed s/-/_/g`
+-AC_CACHE_CHECK([whether ${CC-cc} accepts $1],
+-[$FLAG],
+-[echo 'void f(void); void f(){}' > conftest.c
+-if test -z "`${CC-cc} -c ${CFLAGS} $1 conftest.c 2>&1`"; then
+-  eval $FLAG=yes
+-else
+-  eval $FLAG=no
+-fi])
+-if test ${!FLAG} = yes ; then
+-  CFLAGS="$1 $CFLAGS"
+-fi
+-])
+-
+-dnl Check for lots of extra warning options
+-AC_CHECK_CC_OPT(-pedantic)
+-AC_CHECK_CC_OPT(-W)
+-AC_CHECK_CC_OPT(-Wall)
+-AC_CHECK_CC_OPT(-Wmissing-prototypes)
+-AC_CHECK_CC_OPT(-Wmissing-declarations)
+-AC_CHECK_CC_OPT(-Wno-long-long)
+-AC_CHECK_CC_OPT(-Wwrite-strings)
+-AC_CHECK_CC_OPT(-Wpointer-arith)
+-AC_CHECK_CC_OPT(-Wbad-function-cast)
+-AC_CHECK_CC_OPT(-Waggregate-return)
+-AC_CHECK_CC_OPT(-Wstrict-prototypes)
+-AC_CHECK_CC_OPT(-Wredundant-decls)
+-dnl AC_CHECK_CC_OPT(-Wunreachable-code)
+-AC_CHECK_CC_OPT(-Wchar-subscripts)
+-AC_CHECK_CC_OPT(-Wimplicit)
+-AC_CHECK_CC_OPT(-Wparentheses)
+-AC_CHECK_CC_OPT(-Wsequence-point)
+-AC_CHECK_CC_OPT(-Wreturn-type)
+-AC_CHECK_CC_OPT(-Wswitch)
+-AC_CHECK_CC_OPT(-Wunused)
+-AC_CHECK_CC_OPT(-Wuninitialized)
+-AC_CHECK_CC_OPT(-Wundef)
+-AC_CHECK_CC_OPT(-Wnested-externs)
+-AC_CHECK_CC_OPT(-Wdeclaration-after-statement)
+-AC_CHECK_CC_OPT(-Wsign-compare)
+-
+ AC_CONFIG_FILES([makefile])
+ AC_OUTPUT
diff --git a/games-roguelike/zangband/files/zangband-2.7.4c-makefile.patch b/games-roguelike/zangband/files/zangband-2.7.4c-makefile.patch
new file mode 100644
index 000000000000..bae74904cf02
--- /dev/null
+++ b/games-roguelike/zangband/files/zangband-2.7.4c-makefile.patch
@@ -0,0 +1,29 @@
+--- makefile.in.orig
++++ makefile.in
+@@ -111,17 +111,6 @@
+ %.o: %.c
+ 	$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $< -c -o $@ $(DEFS)
+ 
+-##
+-## Hack - make sure the build system is consistant.
+-##
+-makefile: configure makefile.in
+-	$(CONFIGURE)
+-	
+-configure: configure.in
+-	aclocal
+-	autoheader
+-	autoconf
+-
+ dirs:
+ 	-mkdir $(DESTDIR)
+ 	-mkdir $(addprefix $(DESTDIR),$(filter-out $(srcdirlist), $(dirlist)))
+@@ -205,7 +194,7 @@
+ 	@echo $(srcdirlist) $(srcfiles)
+ 
+ # Hack to remake files depending on DEFAULT_PATH
+-.default_path: makefile
++.default_path: 
+ 	@if [ ! -r .default_path ]; then \
+ 		echo "$(DESTDIR)" > .default_path; \
+ 	fi
diff --git a/games-roguelike/zangband/zangband-2.7.4c.ebuild b/games-roguelike/zangband/zangband-2.7.4c.ebuild
index 4aa553fe2e1c..792dfa529934 100644
--- a/games-roguelike/zangband/zangband-2.7.4c.ebuild
+++ b/games-roguelike/zangband/zangband-2.7.4c.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/zangband-2.7.4c.ebuild,v 1.11 2010/03/04 00:52:42 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/zangband-2.7.4c.ebuild,v 1.12 2015/01/21 07:28:07 mr_bones_ Exp $
 
-EAPI=2
+EAPI=5
 inherit autotools eutils games
 
 DESCRIPTION="An enhanced version of the Roguelike game Angband"
@@ -25,7 +25,10 @@ S=${WORKDIR}/${PN}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-tk85.patch \
-		"${FILESDIR}"/${P}-rng.patch
+		"${FILESDIR}"/${P}-rng.patch \
+		"${FILESDIR}"/${P}-configure.patch \
+		"${FILESDIR}"/${P}-makefile.patch
+	mv configure.in configure.ac || die
 	eautoreconf
 }
 
@@ -39,19 +42,16 @@ src_configure() {
 
 src_install() {
 	# Keep some important dirs we want to chmod later
-	keepdir "${GAMES_DATADIR}"/${PN}/lib/apex \
-		"${GAMES_DATADIR}"/${PN}/lib/user \
-		"${GAMES_DATADIR}"/${PN}/lib/save
+	keepdir "${GAMES_DATADIR}"/${PN}/lib/{apex,user,save,bone,info,xtra/help,xtra/music}
 
 	# Install the basic files but remove unneeded crap
-	emake DESTDIR="${D}/${GAMES_DATADIR}"/${PN}/ installbase \
-		|| die "emake installbase failed"
+	emake DESTDIR="${D}/${GAMES_DATADIR}"/${PN}/ installbase
 	rm "${D}${GAMES_DATADIR}"/${PN}/{angdos.cfg,readme,z_faq.txt,z_update.txt}
 
 	# Install everything else and fix the permissions
-	dogamesbin zangband || die "dogamesbin failed"
-	dodoc readme z_faq.txt z_update.txt || die "dodoc failed"
-	find "${D}${GAMES_DATADIR}/zangband/lib" -type f -exec chmod a-x \{\} \;
+	dogamesbin zangband
+	dodoc readme z_faq.txt z_update.txt
+	find "${D}${GAMES_DATADIR}/zangband/lib" -type f -exec chmod a-x \{\} +
 
 	prepgamesdirs
 	# All users in the games group need write permissions to