[gentoo-commits] repo/gentoo:master commit in: games-puzzle/world-of-goo/

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/world-of-goo/

[Ulrich Müller]

commit:     64b75549f8b565728bf0353f29dc4b5bdd3dd65e
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  9 12:38:13 2017 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Dec  9 12:38:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64b75549

games-puzzle/world-of-goo: Update Manifest hashes.

 games-puzzle/world-of-goo/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-puzzle/world-of-goo/Manifest b/games-puzzle/world-of-goo/Manifest
index 8ef0443fb8b..0650bba91eb 100644
--- a/games-puzzle/world-of-goo/Manifest
+++ b/games-puzzle/world-of-goo/Manifest
@@ -1 +1 @@
-DIST WorldOfGooSetup.1.41.tar.gz 66428181 SHA256 675a8a11bed6c9d810cd222bac5e9834f82acc31c2afc6990da40b45ba564566 SHA512 278dfb983cf9cf4de87f13d94f5e75b3830af07523e2ddc7a443d5afb6fead130ed50440357554986b5b0d99c17651f77ae11298f51f9f1072ebd40287cad396 WHIRLPOOL 784192ec8161faad3bfab8f0e94bb77b8b900922b7df90b10c887e9fc111e895b859a9dd111cc170523de0a32c0d0fae9e4418c7b27d68f08425939d6bb2da4f
+DIST WorldOfGooSetup.1.41.tar.gz 66428181 BLAKE2B 476c05f0b3f78fa952728b9f7b5b95942e7f3e57dde4842144ccaa28c9ad2d2c264b1a2277ba5a1f3edf25cb812c72a0380b0d26b2bc99dd9a77116badcf5477 SHA512 278dfb983cf9cf4de87f13d94f5e75b3830af07523e2ddc7a443d5afb6fead130ed50440357554986b5b0d99c17651f77ae11298f51f9f1072ebd40287cad396

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/world-of-goo/

[Ulrich Müller]

commit:     88d8489cdf74c37c0fe6435486e6cbfcf65bbbdd
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  7 22:55:50 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> 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
 }

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/world-of-goo/

[James Le Cuirot]

commit:     d6b04f8dd48fcdd62a43b4f1a732efe76ec1d02d
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 28 22:30:23 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Apr 28 22:33:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6b04f8d

games-puzzle/world-of-goo: Drop package in favour of world-of-goo-hb

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-puzzle/world-of-goo/Manifest                 |  1 -
 games-puzzle/world-of-goo/metadata.xml             |  8 ---
 .../world-of-goo/world-of-goo-1.41-r2.ebuild       | 66 ----------------------
 3 files changed, 75 deletions(-)

diff --git a/games-puzzle/world-of-goo/Manifest b/games-puzzle/world-of-goo/Manifest
deleted file mode 100644
index 0650bba91eb..00000000000
--- a/games-puzzle/world-of-goo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST WorldOfGooSetup.1.41.tar.gz 66428181 BLAKE2B 476c05f0b3f78fa952728b9f7b5b95942e7f3e57dde4842144ccaa28c9ad2d2c264b1a2277ba5a1f3edf25cb812c72a0380b0d26b2bc99dd9a77116badcf5477 SHA512 278dfb983cf9cf4de87f13d94f5e75b3830af07523e2ddc7a443d5afb6fead130ed50440357554986b5b0d99c17651f77ae11298f51f9f1072ebd40287cad396

diff --git a/games-puzzle/world-of-goo/metadata.xml b/games-puzzle/world-of-goo/metadata.xml
deleted file mode 100644
index 78274e0fa55..00000000000
--- a/games-puzzle/world-of-goo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>

diff --git a/games-puzzle/world-of-goo/world-of-goo-1.41-r2.ebuild b/games-puzzle/world-of-goo/world-of-goo-1.41-r2.ebuild
deleted file mode 100644
index 51f7f12ff56..00000000000
--- a/games-puzzle/world-of-goo/world-of-goo-1.41-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop eutils		# eutils for make_wrapper()
-
-DESCRIPTION="A puzzle game with a strong emphasis on physics"
-HOMEPAGE="http://2dboy.com/"
-
-if [[ ${PN} == *-demo ]] ; then
-	MY_PN="WorldOfGooDemo"
-	SRC_URI="${MY_PN}.${PV}.tar.gz"
-else
-	MY_PN="WorldOfGoo"
-	SRC_URI="${MY_PN}Setup.${PV}.tar.gz"
-fi
-
-LICENSE="2dboy-EULA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="fetch bindist strip"
-
-RDEPEND="media-libs/libsdl[alsa,sound,opengl,video]
-	media-libs/sdl-mixer[vorbis]
-	sys-libs/glibc
-	virtual/opengl
-	virtual/glu
-	>=sys-devel/gcc-3.4"
-
-S="${WORKDIR}/${MY_PN}"
-dir="/opt/${PN}"
-
-QA_PREBUILT="${dir:1}/${MY_PN%Demo}.bin32
-	${dir:1}/${MY_PN%Demo}.bin64"
-
-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 your DISTDIR directory."
-	else
-		elog "Download ${A} from ${HOMEPAGE}"
-		elog "and place it in your DISTDIR directory."
-	fi
-}
-
-src_install() {
-	exeinto "${dir}"
-	doexe ${MY_PN%Demo}{,.$(usex amd64 bin64 bin32)}
-
-	make_wrapper ${PN} "${dir}"/${MY_PN%Demo}
-
-	insinto "${dir}"
-	doins -r icons properties res
-	newicon icons/scalable.svg ${PN}.svg
-
-	if [[ ${PN} == *-demo ]] ; then
-		make_desktop_entry ${PN} "World of Goo (Demo)"
-	else
-		make_desktop_entry ${PN} "World of Goo"
-	fi
-
-	dodoc linux-issues.txt
-	docinto html
-	dodoc readme.html
-}