mr_bones_ 14/12/18 22:41:46 Modified: bsd-games-2.17-r5.ebuild ChangeLog Log: EAPI=5; update Debian patch; export GAMES_ variables for bug #531200 (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.7 games-misc/bsd-games/bsd-games-2.17-r5.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-misc/bsd-games/bsd-games-2.17-r5.ebuild?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-misc/bsd-games/bsd-games-2.17-r5.ebuild?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-misc/bsd-games/bsd-games-2.17-r5.ebuild?r1=1.6&r2=1.7 Index: bsd-games-2.17-r5.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-misc/bsd-games/bsd-games-2.17-r5.ebuild,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- bsd-games-2.17-r5.ebuild 12 Nov 2013 17:49:40 -0000 1.6 +++ bsd-games-2.17-r5.ebuild 18 Dec 2014 22:41:46 -0000 1.7 @@ -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 @@ 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 @@ 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 @@ -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 @@ } 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 @@ 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 } 1.57 games-misc/bsd-games/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-misc/bsd-games/ChangeLog?rev=1.57&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-misc/bsd-games/ChangeLog?rev=1.57&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-misc/bsd-games/ChangeLog?r1=1.56&r2=1.57 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-misc/bsd-games/ChangeLog,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- ChangeLog 14 Nov 2013 18:01:35 -0000 1.56 +++ ChangeLog 18 Dec 2014 22:41:46 -0000 1.57 @@ -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 <[email protected]> bsd-games-2.17-r5.ebuild: + EAPI=5; update Debian patch; export GAMES_ variables for bug #531200 14 Nov 2013; Michael Sterrett <[email protected]> -bsd-games-2.17-r4.ebuild:
