EAPI=5; update Debian patch; export GAMES_ variables for bug #531200

Package-Manager: portage-2.2.14/cvs/Linux x86_64

3 files changed, 27 insertions, 24 deletions

diff --git a/games-misc/bsd-games/ChangeLog b/games-misc/bsd-games/ChangeLog
index 3a47f0f7eb71..1db51a203917 100644
--- a/games-misc/bsd-games/ChangeLog
+++ b/games-misc/bsd-games/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-misc/bsd-games
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/ChangeLog,v 1.56 2013/11/14 18:01:35 mr_bones_ Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/ChangeLog,v 1.57 2014/12/18 22:41:46 mr_bones_ Exp $
+
+  18 Dec 2014; Michael Sterrett <mr_bones_@gentoo.org> bsd-games-2.17-r5.ebuild:
+  EAPI=5; update Debian patch; export GAMES_ variables for bug #531200
 
   14 Nov 2013; Michael Sterrett <mr_bones_@gentoo.org>
   -bsd-games-2.17-r4.ebuild:
diff --git a/games-misc/bsd-games/Manifest b/games-misc/bsd-games/Manifest
index 61c32642ee3a..15b4677b5bf8 100644
--- a/games-misc/bsd-games/Manifest
+++ b/games-misc/bsd-games/Manifest
@@ -7,7 +7,7 @@ AUX bsd-games-2.17-glibc2.10.patch 4213 SHA256 ff5b298e1e4599b02ad42dda648a4d940
 AUX bsd-games-2.17-headers.patch 268 SHA256 c21d06479c6758b6091b04676d636298c01d9709dabd5587111c74ad1db662d7 SHA512 cc7c62109e835b31db0dfbb84de35fcb962bebee04b901c727b7ff087c194bfb12e4edac6b7e2f3ca0e414bd486c18962e8f5ad1f33a997e2782f58b9b62469f WHIRLPOOL bf219252c4c3b743b90504db7ce8d57213d857dcc6011b49d60149b8905142478630a064b9fb7ec6b631574bb4d670328345befa108a40b0fc2871ba5c8525ac
 AUX config.params-gentoo 1204 SHA256 74737471f9fa6a3f523d8e91af65a175cccfa94ce162eb8e5ecef08372047414 SHA512 b6734409235caec3deb531bbcdb37527b3090c41b803ccc11895ea403543722437f84bdfa044c6aa70b306384ce94a40979a347e6031bc1d937841c7222d6618 WHIRLPOOL 0e4dc8250d7dc190a8eeaa7829d3386eb1c3a53018905502005058a7b947ebefa97df9fd96689d9850983a3758c8bf0b128d51ad1374116c098824b745eb7867
 DIST bsd-games-2.17.tar.gz 2563311 SHA256 066f924aef6c1c5ea946f588e36f303021f5dfc093944738f025d8edbc6fff60 SHA512 cb2ee60474f164d42e3d47700270bbeeda3c8279d64da409c9cc05e36437ef95b92d0a85543298e97604635fcf3e068f3a5cc812e90b5c61fb8d146cf35bc38f WHIRLPOOL 4a8e4bcbf040997645d1b88ef17a3f0df6414a5ad922ea68045759eeafb09ff473ad3ed1a95304a82a4eace02ebc05c1c3966bfe46a204f22e29d4d945ad2566
-DIST bsdgames_2.17-21.debian.tar.gz 36697 SHA256 f12b786e52548a5cb250a6128cb9b8eb2c1e7b57202f235fc0d61337108d17c5 SHA512 14e5202a3acdbd3ddf97d9fbc89a0c7b1d95f8ff972b4872e56faebd466c35ef9c0d46dbec617d862140d0b087f0ed5af4464d9f447ed50a3bd9f5872f47acbf WHIRLPOOL b52291279effd15615db1d82fd93b9118f8d22036632a4579016cec09f3283da0bca4341777ba04130abcfec1919d4a0d2299db20fa7f5a645c3117fa9f4014c
-EBUILD bsd-games-2.17-r5.ebuild 4420 SHA256 d8eac33225ae8bfad27bc1e6c7f11497162e303c82019eca800e033e3182c5ae SHA512 dae4052c6535b7a58e91e38c96750f617a81290c9569d3bdbe5bb73e975ae7dee424af35541fd40ae20d366cd7a9d39356fd6092f07c3a2bed2ba03d5c973ee7 WHIRLPOOL eeeb4786a720eed8e1e57ed138888c14e92a61f0dcc7c2a8d73ae410014897baa9cd055a0d6ce84c10fb755c692918ee831d5f06e71610b621f46d7e1dd0ab2b
-MISC ChangeLog 7790 SHA256 00da220b69dc49aaea8a4f6d9a26d086fc68c4575ee2e33210f9e518950b2102 SHA512 149c7529aa194f6b1f6c651c965d04fb045d3aac649aac14a8d7d51e9ac8a4024bc550987cde0103a53978d429dcc77d2d94df8f783ed3711f059666a8b0eb29 WHIRLPOOL 6f0f5b8dd52b6b76b65f2b399158961fce3d504347db785a0d2868195121764e80a74ea2b641966a2dba0b096d136fb494dc5ed888618495240b4a06abd481a5
+DIST bsdgames_2.17-22.debian.tar.xz 32268 SHA256 dd7457368e5b4cb5b223e91a2919aefae72237fa6ab840f162a779c209163d3e SHA512 902d86557dd3813c31333fe18437d8046ae100814c9c1b340ab1f8266c817545f21e000702b1ca93babb9d632896ea5bada1e146436abfa7916b469681fceed5 WHIRLPOOL e0b7214cafecd471c059d8a097d5df4706b41c2f4dcb0658522d65f7e0ddea7bdfcfdcb86d1b0dab0703b9182d63115b246a7dc3e77a715aaf53d7d59b48e0a6
+EBUILD bsd-games-2.17-r5.ebuild 4461 SHA256 16b6858fd29894fae9840ae1eebf644e22ef45478c57795dbeabe977193083c1 SHA512 9e2a411a275567363123b22553ad371ceb669548bd6cdadf3009b4caaf32683c446fbdd1d64d6f21225ec42c5f9a2bbf767ae5ff457e245350d854149853cecd WHIRLPOOL a38a99fd8738ba0831fbbab459b4a26b6ae037c32660745c0773415993b47e5bb07ffab6c4fbec5b538f3846c1ce0677d8b42a0c358425d4ee26ee1dbcd3ef6e
+MISC ChangeLog 7943 SHA256 d3a893deb9f9049dfadb56946cdebd8c579538a191c11dc3e1b339abc0575080 SHA512 67e06247efd0bc2971f0f5f4e53067adb081aa730c11ebd6d98f7de5d249f9f58ffa321bd5b1e6fa73c8988f31674479f5cd3e207567f5cc6b562ec03abe06da WHIRLPOOL 6f8431fe5de55bbadd6b121f07725f4c8de99391e28247fbb77dda05cad7277bedabde04f6ad14af6d590b8abcc9bf0ce826fcfa50daf4b852c0b7bb5aea33b0
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-misc/bsd-games/bsd-games-2.17-r5.ebuild b/games-misc/bsd-games/bsd-games-2.17-r5.ebuild
index af2df98978d6..dd4ddaceff72 100644
--- a/games-misc/bsd-games/bsd-games-2.17-r5.ebuild
+++ b/games-misc/bsd-games/bsd-games-2.17-r5.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/bsd-games-2.17-r5.ebuild,v 1.6 2013/11/12 17:49:40 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/bsd-games-2.17-r5.ebuild,v 1.7 2014/12/18 22:41:46 mr_bones_ Exp $
 
-EAPI=2
+EAPI=5
 inherit eutils toolchain-funcs games
 
-DEB_PATCH_VER=21
+DEB_PATCH_VER=22
 DESCRIPTION="collection of games from NetBSD"
 HOMEPAGE="http://www.advogato.org/proj/bsd-games/"
 SRC_URI="ftp://metalab.unc.edu/pub/Linux/games/${P}.tar.gz
-	mirror://debian/pool/main/b/bsdgames/bsdgames_${PV}-${DEB_PATCH_VER}.debian.tar.gz"
+	mirror://debian/pool/main/b/bsdgames/bsdgames_${PV}-${DEB_PATCH_VER}.debian.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -37,6 +37,9 @@ src_prepare() {
 	local d="${WORKDIR}"/debian/patches
 	EPATCH_SOURCE="${d}" epatch $(<"${d}"/series)
 
+	# Used by gentoo config.params. See bug 531200
+	export GAMES_BINDIR GAMES_DATADIR GAMES_STATEDIR
+
 	epatch \
 		"${FILESDIR}"/${P}-64bitutmp.patch \
 		"${FILESDIR}"/${P}-headers.patch \
@@ -50,8 +53,7 @@ src_prepare() {
 
 	sed -i \
 		-e "s:/usr/games:${GAMES_BINDIR}:" \
-		wargames/wargames \
-		|| die "sed wargames failed"
+		wargames/wargames || die
 
 	sed -i \
 		-e '/^CC :=/d' \
@@ -59,18 +61,17 @@ src_prepare() {
 		-e '/^CFLAGS/s/OPTIMIZE/CFLAGS/' \
 		-e '/^CXXFLAGS/s/OPTIMIZE/CXXFLAGS/' \
 		-e '/^LDFLAGS/s/LDFLAGS := /LDFLAGS := \$(LDFLAGS) /' \
-		Makeconfig.in \
-		|| die 'sed failed'
+		Makeconfig.in || die
 
-	cp "${FILESDIR}"/config.params-gentoo config.params
-	echo bsd_games_cfg_usrlibdir=\"$(games_get_libdir)\" >> ./config.params
-	echo bsd_games_cfg_build_dirs=\"${GAMES_TO_BUILD}\" >> ./config.params
-	echo bsd_games_cfg_docdir=\"/usr/share/doc/${PF}\" >> ./config.params
+	cp "${FILESDIR}"/config.params-gentoo config.params || die
+	echo bsd_games_cfg_usrlibdir=\"$(games_get_libdir)\" >> ./config.params || die
+	echo bsd_games_cfg_build_dirs=\"${GAMES_TO_BUILD}\" >> ./config.params || die
+	echo bsd_games_cfg_docdir=\"/usr/share/doc/${PF}\" >> ./config.params || die
 }
 
 src_test() {
 	addwrite /dev/full
-	emake -j1 check || die "make check failed"
+	emake -j1 check
 }
 
 build_game() {
@@ -78,13 +79,13 @@ build_game() {
 }
 
 do_statefile() {
-	touch "${D}/${GAMES_STATEDIR}/${1}"
-	chmod ug+rw "${D}/${GAMES_STATEDIR}/${1}"
+	touch "${D}/${GAMES_STATEDIR}/${1}" || die
+	chmod ug+rw "${D}/${GAMES_STATEDIR}/${1}" || die
 }
 
 src_install() {
 	dodir "${GAMES_BINDIR}" "${GAMES_STATEDIR}" /usr/share/man/man{1,6}
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake -j1 DESTDIR="${D}" install
 
 	dodoc AUTHORS BUGS ChangeLog ChangeLog.0 \
 		README PACKAGING SECURITY THANKS TODO YEAR2000
@@ -125,9 +126,8 @@ src_install() {
 		newman factor/factor.6 primes.6
 	fi
 
-	prepalldocs
 	prepgamesdirs
 
 	# state dirs
-	chmod -R ug+rw "${D}/${GAMES_STATEDIR}"/*
+	chmod -R ug+rw "${D}/${GAMES_STATEDIR}"/* || die
 }