From: Michael Sterrett Date: Thu, 5 Feb 2015 03:19:33 +0000 (+0000) Subject: use check-reqs in pkg_pretend; clean old X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b7a244e5fc585b5ed16e6dcd91d13ce22ac9f1eb;p=gentoo.git use check-reqs in pkg_pretend; clean old Package-Manager: portage-2.2.14/cvs/Linux x86_64 --- diff --git a/games-fps/soldieroffortune/ChangeLog b/games-fps/soldieroffortune/ChangeLog index ef7c40046d0c..645189604dac 100644 --- a/games-fps/soldieroffortune/ChangeLog +++ b/games-fps/soldieroffortune/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-fps/soldieroffortune # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/ChangeLog,v 1.32 2015/02/01 11:26:54 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/ChangeLog,v 1.33 2015/02/05 03:19:28 mr_bones_ Exp $ + + 05 Feb 2015; Michael Sterrett + -soldieroffortune-1.06a.ebuild, soldieroffortune-1.06a-r1.ebuild: + use check-reqs in pkg_pretend; clean old 01 Feb 2015; Mikle Kolyada soldieroffortune-1.06a-r1.ebuild: diff --git a/games-fps/soldieroffortune/Manifest b/games-fps/soldieroffortune/Manifest index 4f2a983dfdee..6de37892d4ed 100644 --- a/games-fps/soldieroffortune/Manifest +++ b/games-fps/soldieroffortune/Manifest @@ -1,17 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - DIST sof-1.06a-cdrom-x86.run 22928437 SHA256 44546073f26a610ec554f3d197e157a6691c0891651689308e62feccc01a1c16 SHA512 91ef3953bd6b6630ab602f64d15a3056f85d90139b18aa3eb9a9a0a75db2ece61ef683ddf1d03b63f0dfc902d7a27914ae673398713941f281e96555d9645078 WHIRLPOOL 986d4f7a5115203fec37ebb187c80e27ff4f986b19157afd42179af9f032b20bf305352cc4a3efe38a0b181ac8d3dcb8c98399fdf3b370b076cbe7615c4cd4d0 -EBUILD soldieroffortune-1.06a-r1.ebuild 2389 SHA256 62d3aa79c413b727b39d929f1a84b4c2bad1dd9a1f5e8d69585d738468cb02c9 SHA512 5d718ef7af4cdb4d5cea274e88ce8b63cd0f051a0be559e47749e5e3def00962e1f228c1e136d0374dbe79431a2a9a70b1f93136e92f0cdc3c3097dd788df40b WHIRLPOOL 64e4548142fa90a3e423b1ac811c1aa8a3cb6152629366de235dd366417e0941a29ea6b92606f3634129dac0323e60d1f26a335d930f8ab28b35ddc3b7e0ab71 -EBUILD soldieroffortune-1.06a.ebuild 2291 SHA256 932db5f5b01eb6ceb467f2965260d82f6412c6b0606150ff292a4fc97febb906 SHA512 a82a749413802aee18d418b488ef28e7e4c72f2e6a8d01c6230373d2db08bbdf5d3ca61199a28313a2b45b82c907ff2c69e248ec9230ef50d2b424e3115419a9 WHIRLPOOL f6937c6572a1225d4f7120938b77f8e73d20aa5c330338857976825a7f5788ddd73cca8c9f60f273a75c6ef7363e9496da54c6fa2c54c5afa9fc9d60c92d2206 -MISC ChangeLog 4758 SHA256 2a5d9f6449dfbfc5c99d069d257aef8363b2f0720dd3df28f1206d4986fbe086 SHA512 c6aac3d7459ad02e9cffbe925a80dd37c76d02807e26bb61f4d21b6360f5a39d450b1ac6992b64036aa3a379a0f8ffec194824646a2cc6c962e53b1772de1aed WHIRLPOOL 9dd5f687a530bd88fffd1ea8fd4a58a81ffe7ad53ea957a6598201594e68cfea520d40a65cf88afcdab4c7b11bccfbb704f80c21c896d3301b8f32a80fa95697 +EBUILD soldieroffortune-1.06a-r1.ebuild 2361 SHA256 7d7569a190d2283b991f76c5cedeb1b8be26d50d4a99f922dbe11c98af0467a7 SHA512 a0531bacde7a265f7d1561bdf997a00a72f0241de3f087ef456a4f6f33700d89822fe0ddd2f9669b8d477509cda82cf9c262f27d1f0df025435b0c83b17c945e WHIRLPOOL 50a4016ec1439d1517c259bf761e524d85eef8b6d8765d68ef38a41f805d84f93feeaf99ea8774827b2e2f85835bc108d4cdd3303dd62a68767e01746fcda19d +MISC ChangeLog 4927 SHA256 f892f867ff390476d9382a65aba5daf304bff4785a5143a832de81ab2ff0475c SHA512 b037428161ed7afe9f4567f28b0dd635a6456d05ed8d4816e3dc9663b9be03f36291a42c40859fe8e0cf1034e685bff6000ebf0326b472ee2360d7f1f63ec523 WHIRLPOOL 1e48cf374767aaa3ccf901c8b5748180ded2a94df6906ec30e3fa27e520589468174216ede98316a0925b8b962b29743a0cdca9389272d16a32c78f721b91c30 MISC metadata.xml 872 SHA256 96d85f872c5b4e35c415d883c79d042798f140ba5192135778a7292e96cd7b2b SHA512 48412f429a957e58074a7cac61efc7e3185419556279f94ff1364a82d48595159ca74665870af6f08b016383d1aa2366a41d33bf0ffcab3a63246061869c825c WHIRLPOOL 78905be5e4292ccd6bd729999763c9215b15b84f0d0a8c90b8cdb0fdff26586d14e6e8c27a2576762f64aa920469fa6dcd9e28a3e96791ad8f65e1d11c1a3fd5 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iJwEAQEIAAYFAlTODRwACgkQG9wOWsQutdbXZAQAq9DN+LoQaSKzKS/Oev0qhR/W -lvEqxZF4Js+FTFhiVtG9kSpnGDqPKBnSDaAAxkncdv2Ric5ZGT9sWveaS8VKky2l -Z3iEXi+56mgzvcPuZsjsEzJuDQc/hoq47wOKq8bCSDrSIfYRjMRf9YsyU/UldNI2 -UW7hoPwtjd0OumqlQA4= -=zE+F ------END PGP SIGNATURE----- diff --git a/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild b/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild index 060cbce8ed23..01560afbc504 100644 --- a/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild +++ b/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild,v 1.3 2015/02/01 11:26:54 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild,v 1.4 2015/02/05 03:19:28 mr_bones_ Exp $ EAPI=5 -inherit eutils unpacker cdrom games +inherit check-reqs eutils unpacker cdrom games DESCRIPTION="First-person shooter based on the mercenary trade" HOMEPAGE="http://www.lokigames.com/products/sof/" @@ -38,17 +38,18 @@ S=${WORKDIR} dir=${GAMES_PREFIX_OPT}/${PN} Ddir=${ED}/${dir} +CHECKREQS_DISK_BUILD="1450M" +CHECKREQS_DISK_USR="725M" + pkg_pretend() { - ewarn "The installed game takes about 725MB of space!" + check-reqs_pkg_pretend } src_unpack() { cdrom_get_cds sof.xpm unpack_makeself - tar xzf "${CDROM_ROOT}"/paks.tar.gz -C "${T}" \ - || die "uncompressing data" - tar xzf "${CDROM_ROOT}"/binaries.tar.gz -C "${T}" \ - || die "uncompressing binaries" + tar xzf "${CDROM_ROOT}"/paks.tar.gz -C "${T}" || die + tar xzf "${CDROM_ROOT}"/binaries.tar.gz -C "${T}" || die } src_install() { @@ -62,7 +63,7 @@ src_install() { cd "${S}" export _POSIX2_VERSION=199209 loki_patch --verify patch.dat - loki_patch patch.dat "${Ddir}" >& /dev/null || die "patching" + loki_patch patch.dat "${Ddir}" >& /dev/null || die # now, since these files are coming off a cd, the times/sizes/md5sums wont # be different ... that means portage will try to unmerge some files (!) diff --git a/games-fps/soldieroffortune/soldieroffortune-1.06a.ebuild b/games-fps/soldieroffortune/soldieroffortune-1.06a.ebuild deleted file mode 100644 index e6e35356c4bb..000000000000 --- a/games-fps/soldieroffortune/soldieroffortune-1.06a.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/soldieroffortune-1.06a.ebuild,v 1.30 2012/09/19 15:16:06 mr_bones_ Exp $ - -inherit eutils unpacker cdrom games - -DESCRIPTION="First-person shooter based on the mercenary trade" -HOMEPAGE="http://www.lokigames.com/products/sof/" -SRC_URI="mirror://lokigames/sof/sof-${PV}-cdrom-x86.run" - -LICENSE="LOKI-EULA" -SLOT="0" -KEYWORDS="amd64 x86" -RESTRICT="strip" -IUSE="" - -DEPEND="sys-libs/glibc - games-util/loki_patch" -RDEPEND="virtual/opengl - x86? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXau - x11-libs/libXdmcp - media-libs/libvorbis - media-libs/libogg - media-libs/smpeg ) - amd64? ( - app-emulation/emul-linux-x86-baselibs - app-emulation/emul-linux-x86-xlibs - app-emulation/emul-linux-x86-sdl - app-emulation/emul-linux-x86-soundlibs )" - -S=${WORKDIR} - -dir=${GAMES_PREFIX_OPT}/${PN} -Ddir=${D}/${dir} - -pkg_setup() { - games_pkg_setup - ewarn "The installed game takes about 725MB of space!" -} - -src_unpack() { - cdrom_get_cds sof.xpm - unpack_makeself - tar xzf "${CDROM_ROOT}"/paks.tar.gz -C "${T}" \ - || die "uncompressing data" - tar xzf "${CDROM_ROOT}"/binaries.tar.gz -C "${T}" \ - || die "uncompressing binaries" -} - -src_install() { - einfo "Copying files... this may take a while..." - exeinto "${dir}" - doexe "${CDROM_ROOT}"/bin/x86/glibc-2.1/sof || die "doexe" - insinto "${dir}" - doins -r "${T}"/* || die "doins data" - doins "${CDROM_ROOT}"/{README,kver.pub,sof.xpm} || die "doins" - - cd "${S}" - export _POSIX2_VERSION=199209 - loki_patch --verify patch.dat - loki_patch patch.dat "${Ddir}" >& /dev/null || die "patching" - - # now, since these files are coming off a cd, the times/sizes/md5sums wont - # be different ... that means portage will try to unmerge some files (!) - # we run touch on ${D} so as to make sure portage doesnt do any such thing - find "${Ddir}" -exec touch '{}' \; - - games_make_wrapper sof ./sof "${dir}" "${dir}" - sed -i \ - -e 's/^exec /__GL_ExtensionStringVersion=17700 exec /' \ - "${D}/${GAMES_BINDIR}/sof" || die - doicon "${CDROM_ROOT}"/sof.xpm - make_desktop_entry sof "Soldier of Fortune" sof - - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - elog "To play the game run:" - elog " sof" -}