Updating patchset from debian. Fix hunt unplayable on amd64 Bug #288749

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

4 files changed, 153 insertions, 12 deletions

diff --git a/games-misc/bsd-games/ChangeLog b/games-misc/bsd-games/ChangeLog
index 1f08ea9cf713..ed9564d6ed6e 100644
--- a/games-misc/bsd-games/ChangeLog
+++ b/games-misc/bsd-games/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-misc/bsd-games
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/ChangeLog,v 1.37 2009/06/13 16:53:38 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/ChangeLog,v 1.38 2009/11/09 13:33:01 tupone Exp $
+
+*bsd-games-2.17-r4 (09 Nov 2009)
+
+  09 Nov 2009; Alfredo Tupone <tupone@gentoo.org> +bsd-games-2.17-r4.ebuild,
+  +files/bsd-games-2.17-64bitutmp.patch:
+  Updating patchset from debian. Fix hunt unplayable on amd64 Bug #288749 by
+  Keith Nickum
 
   13 Jun 2009; Tristan Heaven <nyhm@gentoo.org> bsd-games-2.17-r3.ebuild,
   +files/bsd-games-2.17-glibc2.10.patch:
diff --git a/games-misc/bsd-games/Manifest b/games-misc/bsd-games/Manifest
index 02deacbc4d55..d55b0540515e 100644
--- a/games-misc/bsd-games/Manifest
+++ b/games-misc/bsd-games/Manifest
@@ -1,7 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX bsd-games-2.17-64bit.patch 1322 RMD160 c987b732b83cdf55bb15c6c3ddbc59212f28773d SHA1 0bd044bff85f18cf188dd6068c297dda17196865 SHA256 cbe649fa75bc3e16f27032d05b8ce770ae036df83435211e429379852528fcfe
+AUX bsd-games-2.17-64bitutmp.patch 681 RMD160 4589099e91e56852dc3d6df0b8cacf3b18577b0f SHA1 520950dfcb58016bd1a2d3b11e79646f93b08596 SHA256 992f8602661cc41c3253317bfc157abe0b2041cd7d32f5a31811708e2f8c4e23
 AUX bsd-games-2.17-bg.patch 732 RMD160 c7f5c44b151111e1da8b493c6e376b61e187a6b9 SHA1 197ae9a7ce927bbc1331aaa4f7b28eb971e75f4e SHA256 d25eb2b0e6790b6a852bce08f384994fed7b37a9d33d12d01b65e67fbd8f67d7
 AUX bsd-games-2.17-gcc4.patch 893 RMD160 d48cde21ad4dd239e802cf08e1e94c91a12296bb SHA1 adbdf06c228ee81ccc0a694db979ae4aab7591bc SHA256 96639f25206401c0dde3f9f28ac287c9e26c3efb526481fa48b482f8c9ab4ac0
 AUX bsd-games-2.17-gcc43.patch 741 RMD160 11c2be32ee2d610f7e379bf724bb0b7272247b2c SHA1 7bfa30aefe38340ea8a2c214f39a23d259b45cd6 SHA256 7b07a21db2d5198f8a698ad3772b355424dd58cab04dc12cf2a4c749c9eed7ee
@@ -9,14 +7,9 @@ AUX bsd-games-2.17-glibc2.10.patch 4213 RMD160 57c70071e302618ca800cdff030ce862b
 AUX bsd-games-2.17-headers.patch 268 RMD160 cc0e97f981581c0635e549ce41d97549c2f7ed33 SHA1 ebce73dc15fc11859fb4ca577dbdd977628b1501 SHA256 c21d06479c6758b6091b04676d636298c01d9709dabd5587111c74ad1db662d7
 AUX config.params-gentoo 1204 RMD160 2a76258f9da2641d0c2465d40dba461eb3a91452 SHA1 3cba205238ab8cb08347bff219fa66dedb376fca SHA256 74737471f9fa6a3f523d8e91af65a175cccfa94ce162eb8e5ecef08372047414
 DIST bsd-games-2.17.tar.gz 2563311 RMD160 a8f9c829bb09dfa071ecafbd6cb15560dba888d8 SHA1 8e48a9808908e2898126fdd285196ab71c9a59c0 SHA256 066f924aef6c1c5ea946f588e36f303021f5dfc093944738f025d8edbc6fff60
+DIST bsdgames_2.17-16.diff.gz 15897 RMD160 d40d9825b042deedff5ecb91f9ff3e4da43cda1b SHA1 4e68aec31f095dd10332e138f51c8fa541658fdf SHA256 e97f561ff2253bc4da422082ca1de0575855eb48cacbcabc83a3f8436992c683
 DIST bsdgames_2.17-7.diff.gz 12530 RMD160 4c213632111ac8035058214889fd9229723b9785 SHA1 e19b34faeea0941395e07d78e74939837f5aa70c SHA256 41b4b99ae96f1b42beb37818f377cc194ab4146fe845818e8d29663d4f52ff88
 EBUILD bsd-games-2.17-r3.ebuild 4123 RMD160 8543e73bfab8bfdff9bfe8d9d328bc2c75be143f SHA1 996da5ed1c330d858537c0ecf971a9e4b75a554e SHA256 e74c484319161d0980ff2881a913003d4138344bd94fcac30931ec97caa0514e
-MISC ChangeLog 5296 RMD160 f51b254a047f114eea6b7f19910c4fd4b08414b4 SHA1 cbb07e0e55aa84fc407e66a67309a2affde7a224 SHA256 26ee81c0eeff619799641e601e88c259f5fbf02598af22afbbfdd20f14c149fb
+EBUILD bsd-games-2.17-r4.ebuild 4043 RMD160 070092d7f20da13900ce9a2305c25c99aa647d43 SHA1 ddd2c2e7f684597b16afe7cc7ca2e755b5085253 SHA256 862a5e128cc9f5364b9caebf8e7282cc5e0d0c1999e228f8ae369f4d97209fbd
+MISC ChangeLog 5543 RMD160 8ec14c789afcc74dd195c52a487ba2640a65af2f SHA1 261f8fda89f74d05e03ece0527ca898a8180bfb5 SHA256 a474ea68236ab3e8cf303c08fb5bae881bae33146ee225bf3be570d844f1f869
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoz/tgACgkQdz7hIScOURGZPQCfaNbo32lNPdbAoT7l4cbc5Cj0
-N98AoOZ16zgzfvfkYm/k9ZaoMfq8z6A6
-=0LnJ
------END PGP SIGNATURE-----
diff --git a/games-misc/bsd-games/bsd-games-2.17-r4.ebuild b/games-misc/bsd-games/bsd-games-2.17-r4.ebuild
new file mode 100644
index 000000000000..27382f751e11
--- /dev/null
+++ b/games-misc/bsd-games/bsd-games-2.17-r4.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2009 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-r4.ebuild,v 1.1 2009/11/09 13:33:01 tupone Exp $
+EAPI=2
+
+inherit eutils games
+
+DEB_PATCH_VER=16
+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}.diff.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="!games-misc/wtf
+	!app-misc/banner
+	!games-board/ace
+	sys-libs/ncurses
+	sys-apps/miscfiles"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison"
+
+# Set GAMES_TO_BUILD variable to whatever you want
+export 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 wump}
+
+src_prepare() {
+	epatch \
+		"${WORKDIR}"/bsdgames_${PV}-${DEB_PATCH_VER}.diff \
+		"${FILESDIR}"/${P}-64bitutmp.patch \
+		"${FILESDIR}"/${P}-headers.patch \
+		"${FILESDIR}"/${P}-bg.patch \
+		"${FILESDIR}"/${P}-gcc4.patch \
+		"${FILESDIR}"/${P}-glibc2.10.patch
+
+	sed -i \
+		-e "s:/usr/games:${GAMES_BINDIR}:" \
+		wargames/wargames \
+		|| die "sed wargames 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
+}
+
+src_compile() {
+	emake OPTIMIZE="${CFLAGS}" || die "emake failed"
+}
+
+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}
+	make DESTDIR="${D}" install || die "make 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
+	# state dirs
+	chmod -R ug+rw "${D}/${GAMES_STATEDIR}"/*
+
+	# 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}; }
+	build_game trek && { docinto trek ; dodoc trek/USD.doc/trek.me; }
+
+	# 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
+}
diff --git a/games-misc/bsd-games/files/bsd-games-2.17-64bitutmp.patch b/games-misc/bsd-games/files/bsd-games-2.17-64bitutmp.patch
new file mode 100644
index 000000000000..3be1b3de074b
--- /dev/null
+++ b/games-misc/bsd-games/files/bsd-games-2.17-64bitutmp.patch
@@ -0,0 +1,21 @@
+About utmpentry.c:
+
+the utmpx structure defines the ut_tv member a little differently on 
+64bit hosts so that a 32bit and 64bit structure can be shared.  So the 
+ut_tv is a custom 32bit structure rather than the native 64bit timeval 
+structure.  Work around is to assign the submembers instead.
+
+http://bugs.gentoo.org/show_bug.cgi?id=102667
+
+--- bsd-games/dm/utmpentry.c
++++ bsd-games/dm/utmpentry.c
+@@ -291,7 +291,8 @@
+ 	e->line[sizeof(e->line) - 1] = '\0';
+ 	(void)strncpy(e->host, up->ut_host, sizeof(up->ut_host));
+ 	e->name[sizeof(e->host) - 1] = '\0';
+-	e->tv = up->ut_tv;
++	e->tv.tv_sec = up->ut_tv.tv_sec;
++	e->tv.tv_usec = up->ut_tv.tv_usec;
+ 	adjust_size(e);
+ }
+ #endif