gentoo resync : 14.05.2020

3 files changed, 53 insertions, 70 deletions

diff --git a/games-puzzle/world-of-goo-demo/Manifest b/games-puzzle/world-of-goo-demo/Manifest
index b6a0397bcaf3..10bc5a2da646 100644
--- a/games-puzzle/world-of-goo-demo/Manifest
+++ b/games-puzzle/world-of-goo-demo/Manifest
@@ -1,3 +1,3 @@
 DIST WorldOfGooDemo.1.41.tar.gz 34729052 BLAKE2B 02700d337d3aa1daa436bd418131c7c01565244aab303eb239b59b0e437f1e40441b1879de48ade44e6b1c0842c043b4ef40e07809539db9fcacb37204c2092c SHA512 5dcaf7cdacedf0df92133284c4781e1d4ad14abbeddd623a35e59129fc5c1cbb3782d570ac83bc6201f3212c15195e5ca637400839e87fe95edddc5ca671077a
-EBUILD world-of-goo-demo-1.41-r2.ebuild 1422 BLAKE2B aaa8ea3d5a6e153e7e64e6ca335f7cf9e5173b809aa2f1780c842968474329ae3db68223a78a2bedf04bd3215248721c9d6a3e12691e30d21fa5c790397e1e9c SHA512 2ec3f29ebc91a265e0f254a58b56c7ece54c8402df1af9244f34c89ad8c32f74d315b6208f1d7de346e8a8bf457e1f3cec15c8faa807fef6d2ab3aaa5d123d99
+EBUILD world-of-goo-demo-1.41-r3.ebuild 1122 BLAKE2B ef99f0c07f4749a990b01a668817ad8373bed69239390a86fc272bf9f308a958663b64ee09e7f9401e074766fef459a4662175b3b206b3f90c5985fd4f29e31f SHA512 046298561c781e2e3a6399bacf29177dec33bdc210bea3f508ce07b8d9344da121775f769cce874464dae9e8f11e6c9e17e492741c662558181371617a3da6d0
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r2.ebuild b/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r2.ebuild
deleted file mode 100644
index 83b418f1b560..000000000000
--- a/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-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"
-IUSE=""
-RESTRICT="bindist fetch strip"
-
-RDEPEND="
-	media-libs/libsdl[sound,opengl,video]
-	media-libs/sdl-mixer[vorbis]
-	sys-libs/glibc
-	virtual/opengl
-	virtual/glu
-	>=sys-devel/gcc-3.4
-"
-DEPEND=""
-
-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 into your DISTDIR directory."
-	else
-		elog "Download ${A} from ${HOMEPAGE} and place it into your DISTDIR directory."
-	fi
-}
-
-src_install() {
-	exeinto "${dir}"
-	doexe ${MY_PN%Demo}*
-
-	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
-	HTML_DOCS="readme.html" einstalldocs
-}
diff --git a/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r3.ebuild b/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r3.ebuild
new file mode 100644
index 000000000000..c25a8830d831
--- /dev/null
+++ b/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils xdg
+
+MY_PN="WorldOfGooDemo"
+
+DESCRIPTION="A puzzle game with a strong emphasis on physics (demo version)"
+HOMEPAGE="https://2dboy.com/"
+SRC_URI="mirror://sourceforge/slackbuildsdirectlinks/worldofgoo/${MY_PN}.${PV}.tar.gz"
+
+LICENSE="2dboy-EULA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	media-libs/libsdl[opengl,sound,video]
+	media-libs/sdl-mixer[vorbis]
+	>=sys-devel/gcc-3.4
+	sys-libs/glibc
+	virtual/opengl
+	virtual/glu
+"
+
+dir="/opt/${PN}"
+S="${WORKDIR}/${MY_PN}"
+QA_PREBUILT="${dir#/}/*"
+
+src_install() {
+	exeinto "${dir}"
+	newexe ${MY_PN%Demo}.bin$(usex amd64 64 32) ${MY_PN%Demo}.bin
+	make_wrapper ${PN} ./${MY_PN%Demo}.bin "${dir}"
+
+	insinto "${dir}"
+	doins -r icons/ properties/ res/
+
+	local icon size
+	for icon in icons/*.{png,svg}; do
+		size=${icon##*/}
+		size=${size%%[x.]*}
+		newicon -s "${size}" "${icon}" "${PN}.${icon##*.}"
+	done
+
+	make_desktop_entry ${PN} "World of Goo (Demo)"
+
+	dodoc linux-issues.txt
+	docinto html
+	dodoc readme.html
+}