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 770041382C5 for ; Tue, 6 Apr 2021 18:18:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B338BE0978; Tue, 6 Apr 2021 18:18:41 +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 3920EE096F for ; Tue, 6 Apr 2021 18:18:41 +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 9A25833BDF0 for ; Tue, 6 Apr 2021 18:18:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ABE4664A for ; Tue, 6 Apr 2021 18:18:36 +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: <1617733095.6052f2dea19da59f8edfdcb8f3ea9cd0ae0f40e6.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-rpg/to-the-moon/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-rpg/to-the-moon/to-the-moon-0-r1.ebuild games-rpg/to-the-moon/to-the-moon-0.ebuild X-VCS-Directories: games-rpg/to-the-moon/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 6052f2dea19da59f8edfdcb8f3ea9cd0ae0f40e6 X-VCS-Branch: master Date: Tue, 6 Apr 2021 18:18:36 +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: aed2792f-0359-4d31-8ba4-28db9eeeb22c X-Archives-Hash: 9d5d905eda5126ede0cdd096fdcc912d commit: 6052f2dea19da59f8edfdcb8f3ea9cd0ae0f40e6 Author: Sam James gentoo org> AuthorDate: Tue Apr 6 02:12:36 2021 +0000 Commit: Sam James gentoo org> CommitDate: Tue Apr 6 18:18:15 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6052f2de games-rpg/to-the-moon: port to EAPI 7, games.eclass-- Signed-off-by: Sam James gentoo.org> ...o-the-moon-0.ebuild => to-the-moon-0-r1.ebuild} | 34 ++++++++++++---------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/games-rpg/to-the-moon/to-the-moon-0.ebuild b/games-rpg/to-the-moon/to-the-moon-0-r1.ebuild similarity index 85% rename from games-rpg/to-the-moon/to-the-moon-0.ebuild rename to games-rpg/to-the-moon/to-the-moon-0-r1.ebuild index b55f9b6f24f..14c390ecc21 100644 --- a/games-rpg/to-the-moon/to-the-moon-0.ebuild +++ b/games-rpg/to-the-moon/to-the-moon-0-r1.ebuild @@ -1,31 +1,34 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# TODO: unbundling sdl-sound breaks the game - -EAPI=5 +EAPI=7 -inherit eutils unpacker gnome2-utils games +inherit desktop gnome2-utils unpacker wrapper MY_PN=ToTheMoon DESCRIPTION="Two doctors traversing the memories of a dying man to fulfill his last wish" HOMEPAGE="http://freebirdgames.com/games/to-the-moon" SRC_URI="${MY_PN}_linux_1389114090.sh" +S="${WORKDIR}"/data LICENSE="all-rights-reserved bundled-libs? ( LGPL-2 LGPL-2.1 ZLIB )" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="bundled-libs" + RESTRICT="fetch bindist splitdebug" -QA_PREBUILT="${GAMES_PREFIX_OPT}/${PN}/${MY_PN}.bin*" +QA_PREBUILT="opt/${PN}/${MY_PN}.bin*" if [[ ${ARCH} == "amd64" ]] ; then QA_PREBUILT="${QA_PREBUILT} ${GAMES_PREFIX_OPT}/${PN}/lib64/*" else QA_PREBUILT="${QA_PREBUILT} ${GAMES_PREFIX_OPT}/${PN}/lib/*" fi +# TODO: unbundling sdl-sound breaks the game RDEPEND=" + sys-libs/zlib + virtual/opengl !bundled-libs? ( dev-libs/libsigc++:2 >=media-libs/libsdl2-2.0.1[X,joystick,opengl,sound,threads,video] @@ -33,10 +36,11 @@ RDEPEND=" media-libs/sdl2-image[png] media-libs/sdl2-ttf ) - sys-libs/zlib - virtual/opengl" - -S=${WORKDIR}/data +" +DEPEND=" + sys-apps/coreutils + sys-apps/grep +" pkg_nofetch() { einfo @@ -50,14 +54,16 @@ src_unpack() { # mojo stuff inside makeself archive, unpack_makeself fails local lastline=$(( $(grep -a -h -n -m 1 -F -e "Extra newline, because in very rare cases (OpenSolaris) stub is directly added after script" "${DISTDIR}/${A}" | cut -d':' -f1) + 1 )) [[ ${lastline} ]] || die "no last line" + local offset=$(head -n ${lastline} "${DISTDIR}/${A}" | wc -c) [[ ${offset} ]] || die "no offset" + dd ibs=${offset} skip=1 if="${DISTDIR}/${A}" of="${T}"/moon.zip || die unpack_zip "${T}"/moon.zip } src_install() { - local dir=${GAMES_PREFIX_OPT}/${PN} + local dir=opt/${PN} local libsuffix=$(usex amd64 "64" "") local arch=$(usex amd64 "x86_64" "x86") @@ -74,20 +80,16 @@ src_install() { doexe ${arch}/lib${libsuffix}/libSDL_sound-1.0.so.1 fi - games_make_wrapper ${PN} "./${MY_PN}.bin.${arch}" "${dir}" "${dir}/lib${libsuffix}" + make_wrapper ${PN} "./${MY_PN}.bin.${arch}" "${dir}" "${dir}/lib${libsuffix}" make_desktop_entry ${PN} "To the Moon" newicon -s 32 noarch/${MY_PN}.png ${PN}.png - - prepgamesdirs } pkg_preinst() { - games_pkg_preinst gnome2_icon_savelist } pkg_postinst() { - games_pkg_postinst gnome2_icon_cache_update }