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 221D21382C5 for ; Wed, 7 Apr 2021 09:02:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 713C1E0980; Wed, 7 Apr 2021 09:02:44 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 4D7CFE0980 for ; Wed, 7 Apr 2021 09:02:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 29C21340CBB for ; Wed, 7 Apr 2021 09:02:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8CF4F641 for ; Wed, 7 Apr 2021 09:02:41 +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: <1617786149.b469e5f06a6bd3fbcbc5c234ba671e829d775f18.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-arcade/jardinains/, games-arcade/jardinains/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-arcade/jardinains/files/strings-pt.patch games-arcade/jardinains/jardinains-2.0-r1.ebuild games-arcade/jardinains/jardinains-2.0-r2.ebuild X-VCS-Directories: games-arcade/jardinains/files/ games-arcade/jardinains/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b469e5f06a6bd3fbcbc5c234ba671e829d775f18 X-VCS-Branch: master Date: Wed, 7 Apr 2021 09:02:41 +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: a79956b1-2aac-45ec-a4dd-ae4a1364cfd2 X-Archives-Hash: 41925c4b768ffc44a63f353d4715de37 commit: b469e5f06a6bd3fbcbc5c234ba671e829d775f18 Author: Sam James gentoo org> AuthorDate: Wed Apr 7 09:01:59 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Apr 7 09:02:29 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b469e5f0 games-arcade/jardinains: port to EAPI 7, games.eclass-- Signed-off-by: Sam James gentoo.org> games-arcade/jardinains/files/strings-pt.patch | 4 +- ...ains-2.0-r1.ebuild => jardinains-2.0-r2.ebuild} | 58 +++++++++++++--------- 2 files changed, 36 insertions(+), 26 deletions(-) diff --git a/games-arcade/jardinains/files/strings-pt.patch b/games-arcade/jardinains/files/strings-pt.patch index 246017a3f5b..f4dfe3f5d46 100644 --- a/games-arcade/jardinains/files/strings-pt.patch +++ b/games-arcade/jardinains/files/strings-pt.patch @@ -1,5 +1,5 @@ ---- data/strings.xml 2006-11-11 23:45:28.000000000 +0000 -+++ data/strings.xml 2007-02-02 14:14:14.000000000 +0000 +--- a/data/strings.xml ++++ b/data/strings.xml @@ -35,5 +35,5 @@ Espaņol Italiano diff --git a/games-arcade/jardinains/jardinains-2.0-r1.ebuild b/games-arcade/jardinains/jardinains-2.0-r2.ebuild similarity index 53% rename from games-arcade/jardinains/jardinains-2.0-r1.ebuild rename to games-arcade/jardinains/jardinains-2.0-r2.ebuild index e98d0da5f03..177944be5b6 100644 --- a/games-arcade/jardinains/jardinains-2.0-r1.ebuild +++ b/games-arcade/jardinains/jardinains-2.0-r2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=7 + +inherit desktop wrapper DESCRIPTION="Arkanoid with Gnomes" HOMEPAGE="http://www.jardinains2.com" @@ -11,20 +12,26 @@ SRC_URI="mirror://gentoo/JN2_1_FREE_LIN.tar.gz" LICENSE="jardinains" SLOT="0" KEYWORDS="-* ~amd64 ~x86" -IUSE="" + RESTRICT="strip" -QA_EXECSTACK="${GAMES_PREFIX_OPT:1}/jardinains/jardinains" +QA_EXECSTACK="opt/jardinains/jardinains" -DEPEND="" -RDEPEND="sys-libs/libstdc++-v3:5 - amd64? ( sys-libs/libstdc++-v3:5[multilib] ) +RDEPEND=" + acct-group/gamestat + sys-libs/libstdc++-v3:5 >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=virtual/glu-9.0-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]" + >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] + amd64? ( sys-libs/libstdc++-v3:5[multilib] ) +" + +dir=opt/${PN} +QA_PREBUILT="${dir}/${PN}" -dir=${GAMES_PREFIX_OPT}/${PN} -QA_PREBUILT="${dir:1}/${PN}" +PATCHES=( + "${FILESDIR}"/strings-pt.patch +) src_unpack() { unpack JN2_1_FREE_LIN.tar.gz @@ -33,30 +40,33 @@ src_unpack() { } src_prepare() { + default + # clean Mac fork files (bug #295782) - find . -type f -name "._*" -exec rm -f '{}' + - epatch "${FILESDIR}"/strings-pt.patch + find . -type f -name "._*" -exec rm -f '{}' + || die } src_install() { - exeinto "${dir}" + exeinto ${dir} doexe jardinains - insinto "${dir}" - doins -r LICENSE.txt data help - games_make_wrapper jardinains ./jardinains "${dir}" "${dir}" + insinto ${dir} + doins -r LICENSE.txt data help + make_wrapper jardinains ./jardinains "${dir}" "${dir}" make_desktop_entry jardinains "Jardinains 2" - touch "${D}${dir}/data/prefs.xml" - prepgamesdirs - chmod g+rw "${D}${dir}/data/prefs.xml" - chmod -R g+rw "${D}${dir}/data/players" + touch "${ED}"/${dir}/data/prefs.xml || die + + chmod g+rw "${ED}"/${dir}/data/prefs.xml || die + chmod -R g+rw "${ED}"/${dir}/data/players || die + + fperms -R 660 /opt/${PN}/data + fowners -R root:gamestat /opt/${PN}/data + fperms g+s /opt/${PN}/${PN} } pkg_postinst() { - games_pkg_postinst elog "Due to the way this software is designed all user preferences for" elog "graphics, audio and other in game data are shared among all users" - elog "of the computer. For that reason some files in the installation" - elog "folder are writable by any user in the games group." + elog "of the computer." }