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

2020-04-30 Thread James Le Cuirot
commit: 6fdb4adf6d200ec17787798b9e02ccadb684955a
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Apr 30 23:35:23 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Apr 30 23:38:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fdb4adf

games-puzzle/world-of-goo-gog: Fix bad usex usage on x86

Closes: https://bugs.gentoo.org/720186
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: James Le Cuirot  gentoo.org>

 games-puzzle/world-of-goo-gog/world-of-goo-gog-1.51.29337.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-puzzle/world-of-goo-gog/world-of-goo-gog-1.51.29337.ebuild 
b/games-puzzle/world-of-goo-gog/world-of-goo-gog-1.51.29337.ebuild
index 186582c1e15..28a6b68bfec 100644
--- a/games-puzzle/world-of-goo-gog/world-of-goo-gog-1.51.29337.ebuild
+++ b/games-puzzle/world-of-goo-gog/world-of-goo-gog-1.51.29337.ebuild
@@ -47,12 +47,12 @@ src_unpack() {
 
 src_install() {
exeinto "${dir}"
-   newexe data/noarch/game/${MY_PN}.bin.x86$(usex amd64 _64) ${MY_PN}.bin
+   newexe data/noarch/game/${MY_PN}.bin.x86$(usex amd64 _64 "") 
${MY_PN}.bin
dosym "../..${dir}"/${MY_PN}.bin /usr/bin/${PN%-*}
 
insinto "${dir}"
doins -r data/noarch/game/game/
-   use bundled-libs && doins -r data/noarch/game/lib$(usex amd64 64)/
+   use bundled-libs && doins -r data/noarch/game/lib$(usex amd64 64 "")/
 
newicon -s 256 data/noarch/game/game/gooicon.png ${PN%-*}.png
make_desktop_entry ${PN%-*} "World of Goo" ${PN%-*}



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

2020-04-28 Thread James Le Cuirot
commit: e00abba0a36cc19d4fa2d62a883b636fef1466de
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Apr 28 23:15:57 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Apr 28 23:15:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e00abba0

games-puzzle/world-of-goo-gog: Fix icon path

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: James Le Cuirot  gentoo.org>

 games-puzzle/world-of-goo-gog/world-of-goo-gog-1.51.29337.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-puzzle/world-of-goo-gog/world-of-goo-gog-1.51.29337.ebuild 
b/games-puzzle/world-of-goo-gog/world-of-goo-gog-1.51.29337.ebuild
index af12c0ed1fc..186582c1e15 100644
--- a/games-puzzle/world-of-goo-gog/world-of-goo-gog-1.51.29337.ebuild
+++ b/games-puzzle/world-of-goo-gog/world-of-goo-gog-1.51.29337.ebuild
@@ -54,7 +54,7 @@ src_install() {
doins -r data/noarch/game/game/
use bundled-libs && doins -r data/noarch/game/lib$(usex amd64 64)/
 
-   newicon -s 256 data/noarch/game/gooicon.png ${PN%-*}.png
+   newicon -s 256 data/noarch/game/game/gooicon.png ${PN%-*}.png
make_desktop_entry ${PN%-*} "World of Goo" ${PN%-*}
 
dodoc data/noarch/docs/linux-issues.txt



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

2020-04-28 Thread James Le Cuirot
commit: df287b48f840db3025fe38af276bf0b844a0da89
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Apr 28 22:21:00 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Apr 28 22:32:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df287b48

games-puzzle/world-of-goo-gog: Various improvements following split

* app-arch/unzip is BDEPEND, not DEPEND.
* Use unpacker and xdg eclasses.
* libsdl2[alsa] is not specifically needed.
* virtual/glu is no longer needed.
* Clarify pkg_nofetch text.
* Use rpath rather than LD_LIBRARY_PATH.
* Swap wrapper for symlink.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: James Le Cuirot  gentoo.org>

 .../world-of-goo-gog-1.51.29337.ebuild | 44 +++---
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/games-puzzle/world-of-goo-gog/world-of-goo-gog-1.51.29337.ebuild 
b/games-puzzle/world-of-goo-gog/world-of-goo-gog-1.51.29337.ebuild
index 15ac77073cf..af12c0ed1fc 100644
--- a/games-puzzle/world-of-goo-gog/world-of-goo-gog-1.51.29337.ebuild
+++ b/games-puzzle/world-of-goo-gog/world-of-goo-gog-1.51.29337.ebuild
@@ -3,58 +3,58 @@
 
 EAPI=7
 
-inherit desktop eutils # eutils for make_wrapper()
+inherit desktop unpacker xdg
 
 MY_PN="WorldOfGoo"
 
 DESCRIPTION="A puzzle game with a strong emphasis on physics (GOG edition)"
-HOMEPAGE="http://2dboy.com/;
+HOMEPAGE="https://2dboy.com/;
 SRC_URI="world_of_goo_${PV//./_}.sh"
 
 LICENSE="2dboy-EULA"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="bundled-libs"
-RESTRICT="fetch bindist strip bundled-libs? ( splitdebug )"
+RESTRICT="bindist fetch strip bundled-libs? ( splitdebug )"
 
-DEPEND="app-arch/unzip"
-RDEPEND="!bundled-libs? (
-   media-libs/libsdl2[alsa,sound,opengl,video]
+BDEPEND="app-arch/unzip"
+
+RDEPEND="
+   !bundled-libs? (
+   media-libs/libsdl2[opengl,sound,video]
media-libs/sdl2-mixer[vorbis]
)
+   >=sys-devel/gcc-3.4
sys-libs/glibc
virtual/opengl
-   virtual/glu
-   >=sys-devel/gcc-3.4
!games-puzzle/world-of-goo
-   !games-puzzle/world-of-goo-hb"
+   !games-puzzle/world-of-goo-hb
+"
 
 dir="/opt/${PN%-*}"
-
-QA_PREBUILT="${dir:1}/${MY_PN}.bin.x86
-   ${dir:1}/${MY_PN}.bin.x86_64"
+S="${WORKDIR}"
+QA_PREBUILT="${dir#/}/*"
 
 pkg_nofetch() {
-   elog "Download ${A} from www.gog.com"
-   elog "and place it in your DISTDIR directory."
+   elog "Please buy and download ${A} from:"
+   elog "  https://www.gog.com/game/world_of_goo;
+   elog "and move it to your distfiles directory."
 }
 
 src_unpack() {
-   unzip -d "${S}" "${DISTDIR}/${A}"
+   unpack_zip ${A}
 }
 
 src_install() {
exeinto "${dir}"
-   doexe data/noarch/game/${MY_PN}.bin.x86$(usex amd64 _64)
-
-   make_wrapper "${PN%-*}" "${dir}"/${MY_PN}.bin.x86$(usex amd64 _64) \
-   $(use bundled-libs && (printf '"%s" "%s/lib%s"' "${dir}" 
"${dir}" $(usex amd64 64) || die))
+   newexe data/noarch/game/${MY_PN}.bin.x86$(usex amd64 _64) ${MY_PN}.bin
+   dosym "../..${dir}"/${MY_PN}.bin /usr/bin/${PN%-*}
 
insinto "${dir}"
-   doins -r data/noarch/game/game
-   use bundled-libs && doins -r data/noarch/game/lib$(usex amd64 64)
-   newicon data/noarch/game/game/gooicon.png ${PN%-*}.png
+   doins -r data/noarch/game/game/
+   use bundled-libs && doins -r data/noarch/game/lib$(usex amd64 64)/
 
+   newicon -s 256 data/noarch/game/gooicon.png ${PN%-*}.png
make_desktop_entry ${PN%-*} "World of Goo" ${PN%-*}
 
dodoc data/noarch/docs/linux-issues.txt



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

2020-04-28 Thread James Le Cuirot
commit: 2d2b07371eeadd8ace277e35d60cfb854b072dc8
Author: Quentin Retornaz  retornaz  com>
AuthorDate: Fri Apr 17 14:15:59 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Apr 28 22:32:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d2b0737

games-puzzle/world-of-goo-gog-1.51.29337: new package

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Quentin Retornaz  retornaz.com>
Closes: https://github.com/gentoo/gentoo/pull/15388
Signed-off-by: James Le Cuirot  gentoo.org>

 games-puzzle/world-of-goo-gog/Manifest |  1 +
 games-puzzle/world-of-goo-gog/metadata.xml | 11 
 .../world-of-goo-gog-1.51.29337.ebuild | 63 ++
 3 files changed, 75 insertions(+)

diff --git a/games-puzzle/world-of-goo-gog/Manifest 
b/games-puzzle/world-of-goo-gog/Manifest
new file mode 100644
index 000..161254a8768
--- /dev/null
+++ b/games-puzzle/world-of-goo-gog/Manifest
@@ -0,0 +1 @@
+DIST world_of_goo_1_51_29337.sh 181640558 BLAKE2B 
9993b1a25d256b3adbf7b9bd7297cddc4af11b8f83b35a9e44704e6a75a68da4212cc726a406cd60f6665852e9fcf76c7c63a44e551df133242c61176652aa9c
 SHA512 
650e3841d282cd919907912343e12d5d8d7aa6f7a58591e1343c6c9f6f00d74dbfe2086202bad92ef16a6023802ec79fdb3848c63ba38e466d743e5582331310

diff --git a/games-puzzle/world-of-goo-gog/metadata.xml 
b/games-puzzle/world-of-goo-gog/metadata.xml
new file mode 100644
index 000..b010f5d66be
--- /dev/null
+++ b/games-puzzle/world-of-goo-gog/metadata.xml
@@ -0,0 +1,11 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   ga...@gentoo.org
+   Gentoo Games Project
+   
+   
+   Use bundled libs
+   
+

diff --git a/games-puzzle/world-of-goo-gog/world-of-goo-gog-1.51.29337.ebuild 
b/games-puzzle/world-of-goo-gog/world-of-goo-gog-1.51.29337.ebuild
new file mode 100644
index 000..15ac77073cf
--- /dev/null
+++ b/games-puzzle/world-of-goo-gog/world-of-goo-gog-1.51.29337.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils # eutils for make_wrapper()
+
+MY_PN="WorldOfGoo"
+
+DESCRIPTION="A puzzle game with a strong emphasis on physics (GOG edition)"
+HOMEPAGE="http://2dboy.com/;
+SRC_URI="world_of_goo_${PV//./_}.sh"
+
+LICENSE="2dboy-EULA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bundled-libs"
+RESTRICT="fetch bindist strip bundled-libs? ( splitdebug )"
+
+DEPEND="app-arch/unzip"
+RDEPEND="!bundled-libs? (
+   media-libs/libsdl2[alsa,sound,opengl,video]
+   media-libs/sdl2-mixer[vorbis]
+   )
+   sys-libs/glibc
+   virtual/opengl
+   virtual/glu
+   >=sys-devel/gcc-3.4
+   !games-puzzle/world-of-goo
+   !games-puzzle/world-of-goo-hb"
+
+dir="/opt/${PN%-*}"
+
+QA_PREBUILT="${dir:1}/${MY_PN}.bin.x86
+   ${dir:1}/${MY_PN}.bin.x86_64"
+
+pkg_nofetch() {
+   elog "Download ${A} from www.gog.com"
+   elog "and place it in your DISTDIR directory."
+}
+
+src_unpack() {
+   unzip -d "${S}" "${DISTDIR}/${A}"
+}
+
+src_install() {
+   exeinto "${dir}"
+   doexe data/noarch/game/${MY_PN}.bin.x86$(usex amd64 _64)
+
+   make_wrapper "${PN%-*}" "${dir}"/${MY_PN}.bin.x86$(usex amd64 _64) \
+   $(use bundled-libs && (printf '"%s" "%s/lib%s"' "${dir}" 
"${dir}" $(usex amd64 64) || die))
+
+   insinto "${dir}"
+   doins -r data/noarch/game/game
+   use bundled-libs && doins -r data/noarch/game/lib$(usex amd64 64)
+   newicon data/noarch/game/game/gooicon.png ${PN%-*}.png
+
+   make_desktop_entry ${PN%-*} "World of Goo" ${PN%-*}
+
+   dodoc data/noarch/docs/linux-issues.txt
+   docinto html
+   dodoc data/noarch/game/readme.html
+}