From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-856827-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 20BC21388BF
for <garchives@archives.gentoo.org>; Tue, 12 Jan 2016 07:47:59 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 25F5C21C008;
Tue, 12 Jan 2016 07:47:57 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id A611B21C008
for <gentoo-commits@lists.gentoo.org>; Tue, 12 Jan 2016 07:47:56 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 99F8D340831
for <gentoo-commits@lists.gentoo.org>; Tue, 12 Jan 2016 07:47:55 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 42560D22
for <gentoo-commits@lists.gentoo.org>; Tue, 12 Jan 2016 07:47:53 +0000 (UTC)
From: "Michael Sterrett" <mr_bones_@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michael Sterrett" <mr_bones_@gentoo.org>
Message-ID: <1452584860.518849507a5f7d466ef010bc8eb60f109e58b6ee.mr_bones_@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: games-fps/quake1-data/
X-VCS-Repository: repo/gentoo
X-VCS-Files: games-fps/quake1-data/quake1-data-2.40.ebuild
X-VCS-Directories: games-fps/quake1-data/
X-VCS-Committer: mr_bones_
X-VCS-Committer-Name: Michael Sterrett
X-VCS-Revision: 518849507a5f7d466ef010bc8eb60f109e58b6ee
X-VCS-Branch: master
Date: Tue, 12 Jan 2016 07:47:53 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 2af6c77c-cd94-4788-b45d-e00a9bd0f117
X-Archives-Hash: 43e6d57eb54c478fb53e660ec9077c0c
commit: 518849507a5f7d466ef010bc8eb60f109e58b6ee
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 12 07:45:14 2016 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Tue Jan 12 07:47:40 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51884950
games-fps/quake1-data: EAPI=5
Package-Manager: portage-2.2.26
games-fps/quake1-data/quake1-data-2.40.ebuild | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/games-fps/quake1-data/quake1-data-2.40.ebuild b/games-fps/quake1-data/quake1-data-2.40.ebuild
index 1e7eff5..03074c5 100644
--- a/games-fps/quake1-data/quake1-data-2.40.ebuild
+++ b/games-fps/quake1-data/quake1-data-2.40.ebuild
@@ -7,7 +7,7 @@
# http://linux.omnipotent.net/article.php?article_id=11287
# ftp://ftp.cdrom.com/pub/idgames/idstuff/quake/quake106.zip
-EAPI=2
+EAPI=5
inherit eutils cdrom games
DESCRIPTION="iD Software's Quake 1 ... the data files"
@@ -41,27 +41,25 @@ src_unpack() {
echo ">>> Unpacking q101_int.lha to ${PWD}"
cat "${CDROM_ROOT}"/q101_int.1 "${CDROM_ROOT}"/q101_int.2 > \
"${S}"/q101_int.exe
- lha xqf "${S}"/q101_int.exe || die "failure unpacking q101_int.exe"
+ lha xqf "${S}"/q101_int.exe || die
rm -f q101_int.exe
elif [[ ${CDROM_SET} == "3" ]] ; then
echo ">>> Unpacking resource.1 to ${PWD}"
- lha xqf "${CDROM_ROOT}"/resource.1 || die "failure unpacking resource.1"
+ lha xqf "${CDROM_ROOT}"/resource.1 || die
fi
}
src_install() {
insinto "${GAMES_DATADIR}"/quake1/id1
case ${CDROM_SET} in
- 0) doins "${CDROM_ROOT}"/id1/* || die "doins pak files"
+ 0) doins "${CDROM_ROOT}"/id1/*
dodoc "${CDROM_ROOT}"/*.txt
;;
- 1|3)doins id1/* || die "doins pak files"
+ 1|3)doins id1/*
dodoc *.txt
;;
- 2) newins "${CDROM_ROOT}"/Setup/ID1/PAK0.PAK pak0.pak \
- || die "ins pak0.pak failed"
- newins "${CDROM_ROOT}"/Setup/ID1/PAK1.PAK pak1.pak \
- || die "ins pak1.pak failed"
+ 2) newins "${CDROM_ROOT}"/Setup/ID1/PAK0.PAK pak0.pak
+ newins "${CDROM_ROOT}"/Setup/ID1/PAK1.PAK pak1.pak
dodoc "${CDROM_ROOT}"/Docs/*
;;
esac