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 DFF50138334 for ; Sat, 7 Jul 2018 22:57:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7AA9E09C8; Sat, 7 Jul 2018 22:57:01 +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 6D507E09C8 for ; Sat, 7 Jul 2018 22:57:01 +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 D62C3335C60 for ; Sat, 7 Jul 2018 22:56:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 560FD354 for ; Sat, 7 Jul 2018 22:56:58 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1531004184.88d8489cdf74c37c0fe6435486e6cbfcf65bbbdd.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-puzzle/world-of-goo/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-puzzle/world-of-goo/world-of-goo-1.41-r1.ebuild games-puzzle/world-of-goo/world-of-goo-1.41-r2.ebuild X-VCS-Directories: games-puzzle/world-of-goo/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 88d8489cdf74c37c0fe6435486e6cbfcf65bbbdd X-VCS-Branch: master Date: Sat, 7 Jul 2018 22:56:58 +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: f40ec966-e307-4931-aa09-a1341f2bba04 X-Archives-Hash: 228a40bde2a1b6531780d3747d1e448d commit: 88d8489cdf74c37c0fe6435486e6cbfcf65bbbdd Author: Ulrich Müller gentoo org> AuthorDate: Sat Jul 7 22:55:50 2018 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sat Jul 7 22:56:24 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88d8489c games-puzzle/world-of-goo: Don't inherit games.eclass. Bump EAPI to 6. Fix DISTDIR usage in pkg_nofetch. Closes: https://bugs.gentoo.org/659334 Package-Manager: Portage-2.3.41, Repoman-2.3.9 ...-1.41-r1.ebuild => world-of-goo-1.41-r2.ebuild} | 27 +++++++++++----------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/games-puzzle/world-of-goo/world-of-goo-1.41-r1.ebuild b/games-puzzle/world-of-goo/world-of-goo-1.41-r2.ebuild similarity index 72% rename from games-puzzle/world-of-goo/world-of-goo-1.41-r1.ebuild rename to games-puzzle/world-of-goo/world-of-goo-1.41-r2.ebuild index b941fe96f8d..51f7f12ff56 100644 --- a/games-puzzle/world-of-goo/world-of-goo-1.41-r1.ebuild +++ b/games-puzzle/world-of-goo/world-of-goo-1.41-r2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 + +inherit desktop eutils # eutils for make_wrapper() DESCRIPTION="A puzzle game with a strong emphasis on physics" HOMEPAGE="http://2dboy.com/" @@ -18,8 +19,7 @@ fi LICENSE="2dboy-EULA" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -RESTRICT="fetch strip" +RESTRICT="fetch bindist strip" RDEPEND="media-libs/libsdl[alsa,sound,opengl,video] media-libs/sdl-mixer[vorbis] @@ -27,10 +27,9 @@ RDEPEND="media-libs/libsdl[alsa,sound,opengl,video] virtual/opengl virtual/glu >=sys-devel/gcc-3.4" -DEPEND="" -S=${WORKDIR}/${MY_PN} -dir=${GAMES_PREFIX_OPT}/${PN} +S="${WORKDIR}/${MY_PN}" +dir="/opt/${PN}" QA_PREBUILT="${dir:1}/${MY_PN%Demo}.bin32 ${dir:1}/${MY_PN%Demo}.bin64" @@ -38,9 +37,10 @@ QA_PREBUILT="${dir:1}/${MY_PN%Demo}.bin32 pkg_nofetch() { if [[ ${PN} == *-demo ]] ; then elog "To download the demo, visit http://worldofgoo.com/dl2.php?lk=demo" - elog "and download ${A} and place it in ${DISTDIR}" + elog "and download ${A} and place it in your DISTDIR directory." else - elog "Download ${A} from ${HOMEPAGE} and place it in ${DISTDIR}" + elog "Download ${A} from ${HOMEPAGE}" + elog "and place it in your DISTDIR directory." fi } @@ -48,7 +48,7 @@ src_install() { exeinto "${dir}" doexe ${MY_PN%Demo}{,.$(usex amd64 bin64 bin32)} - games_make_wrapper ${PN} "${dir}"/${MY_PN%Demo} + make_wrapper ${PN} "${dir}"/${MY_PN%Demo} insinto "${dir}" doins -r icons properties res @@ -61,7 +61,6 @@ src_install() { fi dodoc linux-issues.txt - dohtml readme.html - - prepgamesdirs + docinto html + dodoc readme.html }