From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C03A61382C5 for ; Fri, 9 Apr 2021 19:57:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BD6F0E0857; Fri, 9 Apr 2021 19:57:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A5E66E0857 for ; Fri, 9 Apr 2021 19:57:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A8BE7340C59 for ; Fri, 9 Apr 2021 19:57:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ED43263E for ; Fri, 9 Apr 2021 19:57:34 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1617997206.5a626a628bb8fa7b3edd3b4966b72a8454a8a6ec.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/ja2-stracciatella-data/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-strategy/ja2-stracciatella-data/ja2-stracciatella-data-1-r1.ebuild games-strategy/ja2-stracciatella-data/ja2-stracciatella-data-1.ebuild X-VCS-Directories: games-strategy/ja2-stracciatella-data/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5a626a628bb8fa7b3edd3b4966b72a8454a8a6ec X-VCS-Branch: master Date: Fri, 9 Apr 2021 19:57:34 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2ceba76d-02a2-4ea6-91a0-55f22065f679 X-Archives-Hash: 106199e6724422a6c5a3f9a841a25649 commit: 5a626a628bb8fa7b3edd3b4966b72a8454a8a6ec Author: Sam James gentoo org> AuthorDate: Fri Apr 9 19:40:06 2021 +0000 Commit: Sam James gentoo org> CommitDate: Fri Apr 9 19:40:06 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a626a62 games-strategy/ja2-stracciatella-data: port to EAPI 7, games.eclass-- Closes: https://bugs.gentoo.org/780675 Signed-off-by: Sam James gentoo.org> ...1.ebuild => ja2-stracciatella-data-1-r1.ebuild} | 27 +++++++++------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/games-strategy/ja2-stracciatella-data/ja2-stracciatella-data-1.ebuild b/games-strategy/ja2-stracciatella-data/ja2-stracciatella-data-1-r1.ebuild similarity index 82% rename from games-strategy/ja2-stracciatella-data/ja2-stracciatella-data-1.ebuild rename to games-strategy/ja2-stracciatella-data/ja2-stracciatella-data-1-r1.ebuild index 8b035b0ff0a..b440da46393 100644 --- a/games-strategy/ja2-stracciatella-data/ja2-stracciatella-data-1.ebuild +++ b/games-strategy/ja2-stracciatella-data/ja2-stracciatella-data-1-r1.ebuild @@ -1,24 +1,21 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit cdrom check-reqs games +EAPI=7 + +CHECKREQS_DISK_BUILD="3G" +CHECKREQS_DISK_USR="1G" +inherit cdrom check-reqs DESCRIPTION="A port of Jagged Alliance 2 to SDL (data files)" HOMEPAGE="http://tron.homeunix.org/ja2/" -SRC_URI="" +S="${WORKDIR}" LICENSE="SIR-TECH" SLOT="0" KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="" -DEPEND="app-arch/unshield" - -S=${WORKDIR} - -CHECKREQS_DISK_BUILD="3G" -CHECKREQS_DISK_USR="1G" +BDEPEND="app-arch/unshield" src_unpack() { export CDROM_NAME="INSTALL_CD" @@ -31,8 +28,8 @@ src_unpack() { src_prepare() { cd "${S}"/Ja2_Files/Data || die - local lower i + local lower i # convert to lowercase find . \( -iname "*.jsd" -o -iname "*.wav" -o -iname "*.sti" -o -iname "*.slf" \) \ -exec sh -c 'echo "${1}" @@ -41,17 +38,15 @@ src_prepare() { [ "${1}" = "${lower}" ] || mv "${1}" "${lower}"' - {} \; # remove possible leftover - rm -r ./TILECACHE ./STSOUNDS + rm -r ./TILECACHE ./STSOUNDS || die } src_install() { - insinto "${GAMES_DATADIR}"/ja2/data + insinto /usr/share/ja2/data doins -r "${S}"/Ja2_Files/Data/* - prepgamesdirs } pkg_postinst() { - games_pkg_postinst elog "This is just the data portion of the game. You will need to install" elog "games-strategy/ja2-stracciatella to play the game." }