use check-reqs in pkg_pretend; clean old

(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 14 insertions, 94 deletions

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 <mr_bones_@gentoo.org>
+  -soldieroffortune-1.06a.ebuild, soldieroffortune-1.06a-r1.ebuild:
+  use check-reqs in pkg_pretend; clean old
 
   01 Feb 2015; Mikle Kolyada <zlogene@gentoo.org>
   soldieroffortune-1.06a-r1.ebuild:
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"
-}