update to latest Debian patch (bug #387575) with ebuild patch from Ben Kohler

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

3 files changed, 143 insertions, 2 deletions

diff --git a/games-misc/bsd-games/ChangeLog b/games-misc/bsd-games/ChangeLog
index d96d15356c46..423e11f99e3b 100644
--- a/games-misc/bsd-games/ChangeLog
+++ b/games-misc/bsd-games/ChangeLog
@@ -1,6 +1,12 @@
 # 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.49 2013/05/10 10:02:47 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/ChangeLog,v 1.50 2013/05/13 23:17:37 mr_bones_ Exp $
+
+*bsd-games-2.17-r5 (13 May 2013)
+
+  13 May 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  +bsd-games-2.17-r5.ebuild:
+  update to latest Debian patch (bug #387575) with ebuild patch from Ben Kohler
 
   10 May 2013; Patrick Lauer <patrick@gentoo.org> bsd-games-2.17-r4.ebuild:
   Whitespace
diff --git a/games-misc/bsd-games/Manifest b/games-misc/bsd-games/Manifest
index 295e82be93d9..073a12ad3785 100644
--- a/games-misc/bsd-games/Manifest
+++ b/games-misc/bsd-games/Manifest
@@ -8,6 +8,8 @@ AUX bsd-games-2.17-headers.patch 268 SHA256 c21d06479c6758b6091b04676d636298c01d
 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-16.diff.gz 15897 SHA256 e97f561ff2253bc4da422082ca1de0575855eb48cacbcabc83a3f8436992c683 SHA512 5edabd7471f064dda5b55f413a94ce7f93bcdbbca806346ab63a1cbf51e955aca3b8a06615eba525242040794e9e48d1911bb425499fe8380ebea43d1c9d7474 WHIRLPOOL a20d5c4ef4cfe25256f1be353faffbfa30718a0c8825e6fabf312c067f6e33d99c78044acaf113c638ee38e294530e012a7434690830044d31cb4754f0682678
+DIST bsdgames_2.17-21.debian.tar.gz 36697 SHA256 f12b786e52548a5cb250a6128cb9b8eb2c1e7b57202f235fc0d61337108d17c5 SHA512 14e5202a3acdbd3ddf97d9fbc89a0c7b1d95f8ff972b4872e56faebd466c35ef9c0d46dbec617d862140d0b087f0ed5af4464d9f447ed50a3bd9f5872f47acbf WHIRLPOOL b52291279effd15615db1d82fd93b9118f8d22036632a4579016cec09f3283da0bca4341777ba04130abcfec1919d4a0d2299db20fa7f5a645c3117fa9f4014c
 EBUILD bsd-games-2.17-r4.ebuild 4448 SHA256 f060d9bd1c2210846114ea1f748514ec7017337870710bd3a6c3949c4481e2c9 SHA512 0d41aa235c50fc289fdf80bf023083da71f045f64a0911e2caca6d13b13ee9a727fc981f16bf0f44213fa3b13c62ff6c4b2bd9b17131be8930beaeb87039c4cc WHIRLPOOL 17d436774a891d508b2f6a9a959f3335d1d7d0e588593b4e966bd0d920ec35613e5632366b2019c3ddbf09343a39734245f03dcec2d4e343a7f90ad7fb4f0f92
-MISC ChangeLog 6962 SHA256 0a3be05d80ab4a3e30e111a5b942baf2b2df2915eae05de9622113bd8641614c SHA512 79f8da3c722f6d0f7dbd779128a134eb49bb088d80d7ae3952fb075d139f67ca4565653d398f79eb2969382d1b8aae2c8a2f984499184387671317ade1b50c3c WHIRLPOOL a4b29fe6399c79e5b53c62dfe7f36dd0816803eb5b13366ec874ba5caea611c5e1c6ab58ea06fa1a9e3f3a1d3d1124ec5d67e374d74fde766f918b978f50d6eb
+EBUILD bsd-games-2.17-r5.ebuild 4427 SHA256 7d3e4e4beae92663a9d55a06d5d1c307a51f1e0d4f4328258b0371f4eea0fc2f SHA512 b161539009e7304a89f13a419823b57d2bc64e49137d41e8268d37162b9566a1810b743b7e28bb78d91b60ed396e2f6bbf08da941849c3b572118bfac5d24664 WHIRLPOOL 1ac69127fcdf1b5befb0d0a5f5c4307fd0661b46945a4965f584db9fce2565c1d196e2fa1a5f97d6e8561e8a6d449bef02a056bcb0c58425729345d8bb47a521
+MISC ChangeLog 7163 SHA256 ed119d1eec6c1500328f23c1cba5e6022a8c8a7cfe72c64c1ebdd875b0573efa SHA512 729c629d354f069a6884de27539851ae1c8d446f5f33358172e51fb1079a0466793a8152c469b9b462f5d4acf1528fa59a0a88f42374d0790d76cb16cacfd99a WHIRLPOOL 7119bbb6288b4beae10025c3ba5177ab1359ee6c3a47f9d45d46442c2df2f47de66fe5666b72e63295f90a5c040cb31c18d8c8e85bafbb8b68cb9f300b20001d
 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
new file mode 100644
index 000000000000..aa7ec6e7201e
--- /dev/null
+++ b/games-misc/bsd-games/bsd-games-2.17-r5.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2013 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.1 2013/05/13 23:17:37 mr_bones_ Exp $
+
+EAPI=2
+inherit eutils toolchain-funcs games
+
+DEB_PATCH_VER=21
+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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="!games-misc/wtf
+	!app-misc/banner
+	!games-puzzle/hangman
+	sys-libs/ncurses
+	sys-apps/miscfiles"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison
+	virtual/pkgconfig"
+
+# Set GAMES_TO_BUILD variable to whatever you want
+GAMES_TO_BUILD=${GAMES_TO_BUILD:=adventure arithmetic atc
+backgammon banner battlestar bcd boggle caesar canfield countmail cribbage
+dab dm factor fish gomoku hack hangman hunt mille monop morse
+number phantasia pig pom ppt primes quiz rain random robots sail snake
+tetris trek wargames worm worms wtf}
+
+src_prepare() {
+	local d="${WORKDIR}"/debian/patches
+	EPATCH_SOURCE="${d}" epatch $(<"${d}"/series)
+
+	epatch \
+		"${FILESDIR}"/${P}-64bitutmp.patch \
+		"${FILESDIR}"/${P}-headers.patch \
+		"${FILESDIR}"/${P}-bg.patch \
+		"${FILESDIR}"/${P}-gcc4.patch
+
+	# Use pkg-config to query Libs: from ncurses.pc (for eg. -ltinfo) wrt #459652
+	sed -i \
+		-e "/ncurses_lib/s:-lncurses:'$($(tc-getPKG_CONFIG) --libs-only-l ncurses)':" \
+		configure || die
+
+	sed -i \
+		-e "s:/usr/games:${GAMES_BINDIR}:" \
+		wargames/wargames \
+		|| die "sed wargames failed"
+
+	sed -i \
+		-e '/^CC :=/d' \
+		-e '/^CXX :=/d' \
+		-e '/^CFLAGS/s/OPTIMIZE/CFLAGS/' \
+		-e '/^CXXFLAGS/s/OPTIMIZE/CXXFLAGS/' \
+		-e '/^LDFLAGS/s/LDFLAGS := /LDFLAGS := \$(LDFLAGS) /' \
+		Makeconfig.in \
+		|| die 'sed failed'
+
+	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
+}
+
+src_test() {
+	addwrite /dev/full
+	emake -j1 check || die "make check failed"
+}
+
+build_game() {
+	has ${1} ${GAMES_TO_BUILD}
+}
+
+do_statefile() {
+	touch "${D}/${GAMES_STATEDIR}/${1}"
+	chmod ug+rw "${D}/${GAMES_STATEDIR}/${1}"
+}
+
+src_install() {
+	dodir "${GAMES_BINDIR}" "${GAMES_STATEDIR}" /usr/share/man/man{1,6}
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS BUGS ChangeLog ChangeLog.0 \
+		README PACKAGING SECURITY THANKS TODO YEAR2000
+
+	# set some binaries to run as games group (+S)
+	build_game atc && fperms g+s "${GAMES_BINDIR}"/atc
+	build_game battlestar && fperms g+s "${GAMES_BINDIR}"/battlestar
+	build_game canfield && fperms g+s "${GAMES_BINDIR}"/canfield
+	build_game cribbage && fperms g+s "${GAMES_BINDIR}"/cribbage
+	build_game phantasia && fperms g+s "${GAMES_BINDIR}"/phantasia
+	build_game robots && fperms g+s "${GAMES_BINDIR}"/robots
+	build_game sail && fperms g+s "${GAMES_BINDIR}"/sail
+	build_game snake && fperms g+s "${GAMES_BINDIR}"/snake
+	build_game tetris && fperms g+s "${GAMES_BINDIR}"/tetris-bsd
+
+	# state files
+	build_game atc && do_statefile atc_score
+	build_game battlestar && do_statefile battlestar.log
+	build_game canfield && do_statefile cfscores
+	build_game cribbage && do_statefile criblog
+	build_game hack && keepdir "${GAMES_STATEDIR}"/hack
+	build_game robots && do_statefile robots_roll
+	build_game sail && do_statefile saillog
+	build_game snake && do_statefile snake.log && do_statefile snakerawscores
+	build_game tetris && do_statefile tetris-bsd.scores
+
+	# extra docs
+	build_game atc && { docinto atc ; dodoc atc/BUGS; }
+	build_game boggle && { docinto boggle ; dodoc boggle/README; }
+	build_game hack && { docinto hack ; dodoc hack/{OWNER,Original_READ_ME,READ_ME,help}; }
+	build_game hunt && { docinto hunt ; dodoc hunt/README; }
+	build_game phantasia && { docinto phantasia ; dodoc phantasia/{OWNER,README}; }
+
+	# Since factor is usually not installed, and primes.6 is a symlink to
+	# factor.6, make sure that primes.6 is ok ...
+	if build_game primes && [[ ! $(build_game factor) ]] ; then
+		rm -f "${D}"/usr/share/man/man6/{factor,primes}.6
+		newman factor/factor.6 primes.6
+	fi
+
+	prepalldocs
+	prepgamesdirs
+
+	# state dirs
+	chmod -R ug+rw "${D}/${GAMES_STATEDIR}"/*
+}