EAPI=5

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

3 files changed, 23 insertions, 41 deletions

diff --git a/games-strategy/uqm/ChangeLog b/games-strategy/uqm/ChangeLog
index c447c02af465..32cda6c83cb8 100644
--- a/games-strategy/uqm/ChangeLog
+++ b/games-strategy/uqm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/uqm
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/uqm/ChangeLog,v 1.45 2014/05/15 17:07:33 ulm Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/uqm/ChangeLog,v 1.46 2015/02/19 09:29:18 mr_bones_ Exp $
+
+  19 Feb 2015; Michael Sterrett <mr_bones_@gentoo.org> uqm-0.7.0-r2.ebuild:
+  EAPI=5
 
   15 May 2014; Ulrich Müller <ulm@gentoo.org> uqm-0.7.0-r2.ebuild:
   Fix USE dependency on media-libs/libsdl, "audio" USE flag was renamed to
diff --git a/games-strategy/uqm/Manifest b/games-strategy/uqm/Manifest
index 486c4f77569b..44245fae3a89 100644
--- a/games-strategy/uqm/Manifest
+++ b/games-strategy/uqm/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST uqm-0.7.0-3domusic.uqm 18980671 SHA256 c57085e64dad4bddf8a679a9aa2adf63f2156d5f6cbabe63af80519033dbcb82 SHA512 e7d723194685388813d72e1add9a710ecd3de9b33381dfe66acee6c31a31634ee9031ecc83c2003a5222b9381efe150a2f2a9289f8505d842182ca03b012183b WHIRLPOOL c975e37f7ade37891e9009c84b1219d57b17c354efec6d7d777623385c8e1ea8c82ac11a05d14391052a262645205d5f9f9c04f41e5b7590e6103c77a85f59cb
 DIST uqm-0.7.0-content.uqm 11538533 SHA256 b8f6db8ba29f0628fb1d5c233830896b19f441aee3744bda671ea264b44da3bf SHA512 c80aa9f1158d07534abc1ef625662dfcd5021cb5e8091d46b3e9a2d96a0fffbe7e9e6cc88680b43d810c8e68a580f7a0d4b62c08e9f7b948ae7f017e4ad20dd2 WHIRLPOOL 328bbbd68701d560eb1bb3f838166afa0f958bb8bd7e6dcc5f7c223a1a5d79c57f08a48cda33612e99d7904d55a0e23b78eabe419f5c5a35ba009cd0b45d8104
 DIST uqm-0.7.0-source.tgz 1562003 SHA256 a3695c5f7f0be7ec9c0f80ec569907b382023a1fee6e635532bd53b7b53bb221 SHA512 443ac13da401d45743f913755647b3309834c57f371fb673c3ea2cacb81184bf30430db10af9001de854363520d1f792f47faffd690c8c2b2f3d12d63b217815 WHIRLPOOL 2e35a334ed575d13c3b48dd819298442cbe30554b00c34dd3cf687a30793c9b4d403339cf807331307d51dd609f253d063930b4dc9f2ce68ce9aff86480cce99
@@ -8,20 +5,6 @@ DIST uqm-0.7.0-voice.uqm 115143439 SHA256 bcccf801b4ba37594ff6217b292744ea586ee2
 DIST uqm-remix-disc1.uqm 50188876 SHA256 b697694745d939311e8ebffdd5edf692e010c25d7966e1481074940a4d0487e8 SHA512 fed2a6e260ee96802898ad9b6c968acaac3613187fe38370fb557d6d220b499b922447ea04edd15763d0161f5c156ce03bc9d55a86ed3b4e2e0140a4fb17e99b WHIRLPOOL fee79171e43fb203dcc2b8cbca7d3e2edfa4c6334a1f0996fa8951dc67ef94e67f06edbe250810e1385f5887834a7a0755e1e40a9aa3cdae0cdfb937e238fe46
 DIST uqm-remix-disc2.uqm 60282662 SHA256 7fbb4744102e31273e4459b01a156da052ec537c128fe91793643e348bc1bade SHA512 3053693417facef6d01cdb366a15c1bd2a6272961df5870c4151a928845dd76e4ac5fc59f232da5034d56fd9476d3074840a2e9f16d63dba341aeffd92827c4e WHIRLPOOL e52f1eb1c8cd0007eb77d80719f8feeb044c61bb2d72c14fae92ba62ea8ad1225ffa427db39dadd864304818839c4df0e1e0fe9c0d8a2b265ceead14f70df56e
 DIST uqm-remix-disc3.uqm 39924875 SHA256 e6d89f8f66cf1df1cb278fca1e92261b1776ee670dff26132e33f14dbd31e91d SHA512 2337752e3a2447ab048cc6782153bbb120d2d6b890c5bfae9cbef60a46d12abf716917863286b0196bf6f5e8ef301b5f84338237520880b10cbf75e450076951 WHIRLPOOL ba1ed49bb6761d9955fe9beced1987dd4458cd0203a9c8e712bb55034fd8d278f489c995969866cb7096bea75e88b330031f070b7aeb7e09f48fda0ece862e36
-EBUILD uqm-0.7.0-r2.ebuild 3237 SHA256 c64127604b83aaade62616145b0d726dcc1171e363130b2cb28d7dccd525da6e SHA512 695f71e37083fd0d3e73e5970f5d9ec1b015d582987667066eed74dcf5163dd09b7e3c2a66edaa12d0fef4ce9ace2b5217206fb122f83f99d67f3142ab9b12e0 WHIRLPOOL e4b2622b97347c652543b98c23fd7e85f2137de971520a0de54cb742d2f99da8da06da0640fc26373f9f9ed10496e2f903fcae0ec168fb75c6459104de037d2d
-MISC ChangeLog 5500 SHA256 9c53cc8fc97e7d626355eff57587e13e6c6a8a21b4825b8b326d23b3b6caac2e SHA512 354097f33d57ebc87067170a8f82b869f6021c8cb95b3b9376dffbb5091015bca6979d3b68c40512404ddc75ff8bba01d31b287ffa5a927f74695dfa44ddf8b6 WHIRLPOOL b75610855a02c760005cc7fbab6111cf328b58adc9576cbbeb2e488ba1751c9866709ea34f8859797cc0caeaeae2719307231fef3bb536d661b6cbbaa9b00f2d
+EBUILD uqm-0.7.0-r2.ebuild 2926 SHA256 499d8b346ec52f415d3e0513bc169faafa9f8c9a3028d0cc0858786270d53263 SHA512 e792f59422658b82d815a780960bd28a71da0b7aed8bbece654dfcf91b7d49cf0bc9c6252e8c68c15774a19a653eb2c4b4e1a0cb73b79af2e1cc98f373ca06b3 WHIRLPOOL efb2b775c006e15a85a6ca0fa749ac6e6914951b195392b592d0e0f09dbe25bdab5bdce6ce902e4cba6b6d71f0b1bbd1d23a47ad09809270c588a7878fdaeed9
+MISC ChangeLog 5592 SHA256 0564f46cb79702e57bd5a030c5c5d09d8b9d0efbb2e0460be5c138468061c7e1 SHA512 ccd04c64fea498ef925e2d59b7c59161d47811202cc11b6e1e9d1c6b552a7b6a0d8aa56aaa80331bb4c3133bcf772a3bce753133ff358877a043d22388c835fd WHIRLPOOL 330760097fd0a9202e2f438e770187128d7c0557daafd0efb41fc9733d7d3d9861fa5c9295ab9fc9b335ca5477cbd60e3a3f79f586836706032ce2b644889b52
 MISC metadata.xml 396 SHA256 b6d936f701a8b3777501f3fa1c255f7aec921f1dd1cc999a2d75432ec849df16 SHA512 7f6567cabd77dfa78c23f5d4c0bba1cdc6fcc1672bc3833b64f3ba4fb4df4e73929ddecc7b1d5d712aeb7f49821d06cb36bce47e48d907e881ac71fdc291835a WHIRLPOOL 06f32726592b9c8a7c6c2e25664718cd383c0c3f7a2c944344340b94c0cc5ac289f6678d9f4ac1e2c912027e2c39afd2899e4050c4e53c4ab78cfd7560b9cd28
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQGcBAEBCAAGBQJTdPRjAAoJEJQzkH1pP7W4pG4L/19L6TyFe8BTip2ubA6BuWRe
-v93TIkTvf6IxjFhZUQALFvnaJJ2LrVpDuQialoy3zrkvdlXLa9RSM2TFsK1sSyK1
-OXLEpo0gP73DiOxTCn9C4PrJUGCUcXWQvHSvZgHbnDExTIJHkG8UJpjdxmO1HSLy
-2BzZJ0VOW0p3+vRbThrSgFYxoxn52kegYyc0RyBu7vwkHFvPLA+1RWLlFzEEi+cN
-aB9SqXz9Jz6SPrxkOXZu5py8Xrf/SPD/Oht2vBnZTlDcalHaR417FaYbtr9SSnpY
-0/WDAsSRz4BVtoKtFiEusz+mkRgmtkmFCC822J8mbpjsxprBw6DR/zMYr2bCdjyd
-uV0HuuqBy6TCvS5DrJx2p4BYlVCBHf9urXGBmcgbMLqB9DoHd3AV/m5atmbPUyEa
-STDqNMs5CETIyciaRD1Up7yuGvzkE1+B6uBoPEbz4CZSr/CNB90fbKhQvA1oLcnd
-5aFahgsESxtLp+tDfqNjS1CL/Vt4HhNwrDSnBaB4Zw==
-=HZFB
------END PGP SIGNATURE-----
diff --git a/games-strategy/uqm/uqm-0.7.0-r2.ebuild b/games-strategy/uqm/uqm-0.7.0-r2.ebuild
index 099434fa1e69..0fc520c0a8d6 100644
--- a/games-strategy/uqm/uqm-0.7.0-r2.ebuild
+++ b/games-strategy/uqm/uqm-0.7.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/uqm/uqm-0.7.0-r2.ebuild,v 1.6 2014/05/15 17:07:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/uqm/uqm-0.7.0-r2.ebuild,v 1.7 2015/02/19 09:29:18 mr_bones_ Exp $
 
-EAPI=2
+EAPI=5
 inherit eutils multilib toolchain-funcs games
 
 DESCRIPTION="The Ur-Quan Masters: Port of Star Control 2"
@@ -51,54 +51,50 @@ src_prepare() {
 
 	# Take out the read so we can be non-interactive.
 	sed -i \
-		-e '/read CHOICE/d' build/unix/menu_functions \
-		|| die "sed menu_functions failed"
+		-e '/read CHOICE/d' build/unix/menu_functions || die
 
 	# respect CFLAGS
 	sed -i \
-		-e "s/-O3//" build/unix/build.config \
-		|| die "sed build.config failed"
+		-e "s/-O3//" build/unix/build.config || die
 
 	sed -i \
-		-e "s:@INSTALL_LIBDIR@:$(games_get_libdir)/:g" build/unix/uqm-wrapper.in \
-		|| die "sed uqm-wrapper.in failed"
+		-e "s:@INSTALL_LIBDIR@:$(games_get_libdir)/:g" \
+		build/unix/uqm-wrapper.in || die
 
 	# respect CC
 	sed -i \
 		-e "s/PROG_gcc_FILE=\"gcc\"/PROG_gcc_FILE=\"$(tc-getCC)\"/" \
-		build/unix/config_proginfo_build \
-		|| die "sed config_proginfo_build failed"
+		build/unix/config_proginfo_build || die
 }
 
 src_compile() {
-	MAKE_VERBOSE=1 ./build.sh uqm || die "build failed"
+	MAKE_VERBOSE=1 ./build.sh uqm || die
 }
 
 src_install() {
 	# Using the included install scripts seems quite painful.
 	# This manual install is totally fragile but maybe they'll
 	# use a sane build system for the next release.
-	newgamesbin uqm-wrapper uqm || die "newgamesbin failed"
+	newgamesbin uqm-wrapper uqm
 	exeinto "$(games_get_libdir)"/${PN}
-	doexe uqm || die "doexe failed"
+	doexe uqm
 
 	insinto "${GAMES_DATADIR}"/${PN}/content/packages
-	doins "${DISTDIR}"/${P}-content.uqm || die "doins failed"
-	echo ${P} > "${D}${GAMES_DATADIR}"/${PN}/content/version \
-		|| die "creating version file failed"
+	doins "${DISTDIR}"/${P}-content.uqm
+	echo ${P} > "${D}${GAMES_DATADIR}"/${PN}/content/version || die
 
 	insinto "${GAMES_DATADIR}"/${PN}/content/addons
 	if use music; then
-		doins "${DISTDIR}"/${P}-3domusic.uqm || die "doins failed"
+		doins "${DISTDIR}"/${P}-3domusic.uqm
 	fi
 
 	if use voice; then
-		doins "${DISTDIR}"/${P}-voice.uqm || die "doins failed"
+		doins "${DISTDIR}"/${P}-voice.uqm
 	fi
 
 	if use remix; then
 		insinto "${GAMES_DATADIR}"/${PN}/content/addons
-		doins "${DISTDIR}"/${PN}-remix-disc{1,2,3}.uqm || die "doins failed"
+		doins "${DISTDIR}"/${PN}-remix-disc{1,2,3}.uqm
 	fi
 
 	dodoc AUTHORS ChangeLog Contributing README WhatsNew doc/users/manual.txt