From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 673C61388BF for ; Tue, 12 Jan 2016 07:47:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40DECE089C; Tue, 12 Jan 2016 07:47:56 +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 73734E0899 for ; Tue, 12 Jan 2016 07:47:55 +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 1EEDF340A38 for ; Tue, 12 Jan 2016 07:47:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DDC5BC7A for ; Tue, 12 Jan 2016 07:47:52 +0000 (UTC) From: "Michael Sterrett" 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" Message-ID: <1452584857.e2e6074ae168a9700b9b9119f9672f43fc22a46a.mr_bones_@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-fps/quake2-data/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-fps/quake2-data/quake2-data-3.20.ebuild X-VCS-Directories: games-fps/quake2-data/ X-VCS-Committer: mr_bones_ X-VCS-Committer-Name: Michael Sterrett X-VCS-Revision: e2e6074ae168a9700b9b9119f9672f43fc22a46a X-VCS-Branch: master Date: Tue, 12 Jan 2016 07:47:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: dbf112d4-a00b-4dbc-acaf-e398ddb4c802 X-Archives-Hash: 4bd92ce655ca05f140b6857bb938db2e commit: e2e6074ae168a9700b9b9119f9672f43fc22a46a Author: Michael Sterrett gentoo org> AuthorDate: Tue Jan 12 07:01:44 2016 +0000 Commit: Michael Sterrett gentoo org> CommitDate: Tue Jan 12 07:47:37 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2e6074a games-fps/quake2-data: EAPI=5 Package-Manager: portage-2.2.26 games-fps/quake2-data/quake2-data-3.20.ebuild | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/games-fps/quake2-data/quake2-data-3.20.ebuild b/games-fps/quake2-data/quake2-data-3.20.ebuild index 4bac1cd..985bad2 100644 --- a/games-fps/quake2-data/quake2-data-3.20.ebuild +++ b/games-fps/quake2-data/quake2-data-3.20.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=2 +EAPI=5 inherit unpacker eutils cdrom games DESCRIPTION="iD Software's Quake 2 ... the data files" @@ -56,16 +56,15 @@ src_install() { if use videos ; then insinto "${GAMES_DATADIR}"/quake2/baseq2/video - doins "${baseq2_cdpath}"/video/* || die "doins videos" + doins "${baseq2_cdpath}"/video/* fi insinto "${GAMES_DATADIR}"/quake2/baseq2 - doins "${baseq2_cdpath}"/pak0.pak || die "couldnt grab pak0.pak" - doins baseq2/*.pak || die "couldnt grab release paks" - doins baseq2/maps.lst || die "couldnt grab maps.lst" + doins "${baseq2_cdpath}"/pak0.pak + doins baseq2/*.pak baseq2/maps.lst dodir "${GAMES_DATADIR}"/quake2/baseq2/players cp -R "${baseq2_cdpath}"/players/* baseq2/players/* \ - "${D}/${GAMES_DATADIR}"/quake2/baseq2/players/ || die "couldnt grab player models" + "${D}/${GAMES_DATADIR}"/quake2/baseq2/players/ || die for mod in ctf rogue xatrix ; do if [[ -d ${baseq2_cdpath}/../${mod} ]] ; then @@ -75,13 +74,13 @@ src_install() { fi if [[ -n $(ls "${baseq2_cdpath}"/../${mod}/*.pak 2>/dev/null) ]] ; then insinto "${GAMES_DATADIR}"/quake2/${mod} - doins "${baseq2_cdpath}"/../${mod}/*.pak || die "doins ${mod} pak" + doins "${baseq2_cdpath}"/../${mod}/*.pak fi fi done insinto "${GAMES_DATADIR}"/quake2/ctf - doins ctf/*.{cfg,ico,pak} || die "couldnt grab ctf" + doins ctf/*.{cfg,ico,pak} prepgamesdirs }