[gentoo-commits] repo/gentoo:master commit in: games-arcade/shovel-knight/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/shovel-knight/

[James Le Cuirot]

commit:     4cccd577d6d5d423f7324d77d895e62037fd2f25
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  3 22:21:06 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Sep  3 22:31:02 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cccd577

games-arcade/shovel-knight: New package

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-arcade/shovel-knight/Manifest                |  1 +
 games-arcade/shovel-knight/metadata.xml            |  8 +++
 .../shovel-knight/shovel-knight-3.3.ebuild         | 66 ++++++++++++++++++++++
 3 files changed, 75 insertions(+)

diff --git a/games-arcade/shovel-knight/Manifest b/games-arcade/shovel-knight/Manifest
new file mode 100644
index 00000000000..3eb8934d603
--- /dev/null
+++ b/games-arcade/shovel-knight/Manifest
@@ -0,0 +1 @@
+DIST shovel_knight_treasure_trove_en_3_3_15418.sh 226753557 BLAKE2B 3103871333f5dec931b109ccc8a8820054f8bd934d01daf97bb5ad84e9dfaebd2c79d1943fb7049468f49c9db87c51dec0e08d38469e364bafb8bc50fbd9d40d SHA512 6832593440cc5059f0df37be991bb2e87c071c7ed566b2c6d0f6cc418190be92c4f793f2c694f620b9378914cde13abf9049eba8cdd90b9dfe961ae9a65dc42a

diff --git a/games-arcade/shovel-knight/metadata.xml b/games-arcade/shovel-knight/metadata.xml
new file mode 100644
index 00000000000..26079e608be
--- /dev/null
+++ b/games-arcade/shovel-knight/metadata.xml
@@ -0,0 +1,8 @@
+<?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-arcade/shovel-knight/shovel-knight-3.3.ebuild b/games-arcade/shovel-knight/shovel-knight-3.3.ebuild
new file mode 100644
index 00000000000..656b2c15448
--- /dev/null
+++ b/games-arcade/shovel-knight/shovel-knight-3.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils desktop unpacker xdg-utils
+
+MY_PN="ShovelKnight"
+DESCRIPTION="Sweeping classic action adventure with an 8-bit retro aesthetic"
+HOMEPAGE="https://yachtclubgames.com/shovel-knight/"
+SRC_URI="${PN//-/_}_treasure_trove_en_3_3_15418.sh"
+LICENSE="Yacht-Club-Games-EULA"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist fetch splitdebug"
+
+# I packaged Box2D in the hope of unbundling it but it turns out this
+# game uses a custom version. -- Chewi :(
+
+RDEPEND="
+	media-libs/glew:1.10
+	media-libs/libsdl2[opengl,sound,video]
+	virtual/opengl
+"
+
+S="${WORKDIR}/data/noarch/game"
+
+DIR="/opt/${PN}"
+QA_PREBUILT="${DIR#/}/*"
+
+pkg_nofetch() {
+	einfo "Please buy and download ${SRC_URI} from:"
+	einfo "  https://www.gog.com/game/${PN//-/_}"
+	einfo "and move it to your distfiles directory."
+}
+
+src_unpack() {
+	unpack_zip ${A}
+}
+
+src_install() {
+	local BITS=$(usex amd64 64 32) LIB=
+
+	exeinto "${DIR}"
+	doexe ${BITS}/${MY_PN}
+	make_wrapper ${MY_PN} ./${MY_PN} "${DIR}"
+
+	exeinto "${DIR}"/lib
+	doexe ${BITS}/lib/lib{Box2D.so.*,fmod*-*.so}
+
+	# The FMOD libraries are duplicated rather than symlinked, which is
+	# silly, so create our own symlinks. Both sets of names are needed.
+	for LIB in ${BITS}/lib/libfmod*-*.so; do
+		LIB=${LIB##*/}
+		dosym "${LIB}" "${DIR}/lib/${LIB%-*}.so"
+	done
+
+	insinto "${DIR}"
+	doins -r data/
+
+	newicon -s 256 ../support/icon.png ${PN}.png
+	make_desktop_entry ${MY_PN} "Shovel Knight"
+}
+
+pkg_postinst() { xdg_icon_cache_update; }
+pkg_postrm() { xdg_icon_cache_update; }

[gentoo-commits] repo/gentoo:master commit in: games-arcade/shovel-knight/

[David Seifert]

commit:     45225ed4272168f1f63a032d1d6faaeaf22cfb5c
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Apr 24 22:02:34 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Apr 24 22:02:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45225ed4

games-arcade/shovel-knight: update eclasses

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 games-arcade/shovel-knight/shovel-knight-3.3.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/games-arcade/shovel-knight/shovel-knight-3.3.ebuild b/games-arcade/shovel-knight/shovel-knight-3.3.ebuild
index 656b2c15448..71159361753 100644
--- a/games-arcade/shovel-knight/shovel-knight-3.3.ebuild
+++ b/games-arcade/shovel-knight/shovel-knight-3.3.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils desktop unpacker xdg-utils
+inherit desktop unpacker wrapper xdg-utils
 
 MY_PN="ShovelKnight"
 DESCRIPTION="Sweeping classic action adventure with an 8-bit retro aesthetic"
 HOMEPAGE="https://yachtclubgames.com/shovel-knight/"
 SRC_URI="${PN//-/_}_treasure_trove_en_3_3_15418.sh"
+
 LICENSE="Yacht-Club-Games-EULA"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"

[gentoo-commits] repo/gentoo:master commit in: games-arcade/shovel-knight/

[James Le Cuirot]

commit:     8118a818c71db7092402b05d1c19dc9d524e2924
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 22:21:54 2022 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 22:21:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8118a818

games-arcade/shovel-knight: Bump to 4.1b, drop old 3.3

Closes: https://bugs.gentoo.org/835452
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-arcade/shovel-knight/Manifest                                 | 2 +-
 .../{shovel-knight-3.3.ebuild => shovel-knight-4.1b.ebuild}         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/games-arcade/shovel-knight/Manifest b/games-arcade/shovel-knight/Manifest
index 3eb8934d6031..4d88cf4691f3 100644
--- a/games-arcade/shovel-knight/Manifest
+++ b/games-arcade/shovel-knight/Manifest
@@ -1 +1 @@
-DIST shovel_knight_treasure_trove_en_3_3_15418.sh 226753557 BLAKE2B 3103871333f5dec931b109ccc8a8820054f8bd934d01daf97bb5ad84e9dfaebd2c79d1943fb7049468f49c9db87c51dec0e08d38469e364bafb8bc50fbd9d40d SHA512 6832593440cc5059f0df37be991bb2e87c071c7ed566b2c6d0f6cc418190be92c4f793f2c694f620b9378914cde13abf9049eba8cdd90b9dfe961ae9a65dc42a
+DIST shovel_knight_treasure_trove_4_1b_arby_s_46298.sh 338751327 BLAKE2B 6285266a6013331ed59b399fcbe4a3a2069e1efe403411c7e85a9c165a33e262c0a92085c7a5da7fca31573eaeb29b32915f006cc9093944be03214407e891ef SHA512 ecb5967de37e482aec8fcd992f4d7c269e8b676ed119785114f465dd85932453f3facfcd7e77d7bf3044033189d0d33692bb4de3332753ee57bac74b7adec499

diff --git a/games-arcade/shovel-knight/shovel-knight-3.3.ebuild b/games-arcade/shovel-knight/shovel-knight-4.1b.ebuild
similarity index 93%
rename from games-arcade/shovel-knight/shovel-knight-3.3.ebuild
rename to games-arcade/shovel-knight/shovel-knight-4.1b.ebuild
index c7f98580ae68..21b9866faf5d 100644
--- a/games-arcade/shovel-knight/shovel-knight-3.3.ebuild
+++ b/games-arcade/shovel-knight/shovel-knight-4.1b.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop unpacker wrapper xdg
 
 MY_PN="ShovelKnight"
 DESCRIPTION="Sweeping classic action adventure with an 8-bit retro aesthetic"
 HOMEPAGE="https://yachtclubgames.com/shovel-knight/"
-SRC_URI="${PN//-/_}_treasure_trove_en_3_3_15418.sh"
+SRC_URI="${PN//-/_}_treasure_trove_4_1b_arby_s_46298.sh"
 S="${WORKDIR}/data/noarch/game"
 
 LICENSE="Yacht-Club-Games-EULA"

[gentoo-commits] repo/gentoo:master commit in: games-arcade/shovel-knight/

[James Le Cuirot]

commit:     d350f7b0204384efd4006fc48e65bd7889c9cd03
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Aug  3 18:00:24 2022 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Aug  3 21:43:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d350f7b0

games-arcade/shovel-knight: update HOMEPAGE

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Portage 3.0.34 / pkgdev 0.2.1 / pkgcheck 0.10.11
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-arcade/shovel-knight/shovel-knight-4.1b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-arcade/shovel-knight/shovel-knight-4.1b.ebuild b/games-arcade/shovel-knight/shovel-knight-4.1b.ebuild
index 21b9866faf5d..f2b3660f73f9 100644
--- a/games-arcade/shovel-knight/shovel-knight-4.1b.ebuild
+++ b/games-arcade/shovel-knight/shovel-knight-4.1b.ebuild
@@ -7,7 +7,7 @@ inherit desktop unpacker wrapper xdg
 
 MY_PN="ShovelKnight"
 DESCRIPTION="Sweeping classic action adventure with an 8-bit retro aesthetic"
-HOMEPAGE="https://yachtclubgames.com/shovel-knight/"
+HOMEPAGE="https://yachtclubgames.com/games/shovel-knight-treasure-trove/"
 SRC_URI="${PN//-/_}_treasure_trove_4_1b_arby_s_46298.sh"
 S="${WORKDIR}/data/noarch/game"
 

[gentoo-commits] repo/gentoo:master commit in: games-arcade/shovel-knight/

[James Le Cuirot]

commit:     b1988d72f5a434d9eedb52fd25b6324a16b0922d
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 24 20:59:16 2023 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Jun 24 20:59:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1988d72

games-arcade/shovel-knight: Work around crash when a controller is connected

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

 .../shovel-knight/shovel-knight-4.1b-r1.ebuild     | 110 +++++++++++++++++++++
 1 file changed, 110 insertions(+)

diff --git a/games-arcade/shovel-knight/shovel-knight-4.1b-r1.ebuild b/games-arcade/shovel-knight/shovel-knight-4.1b-r1.ebuild
new file mode 100644
index 000000000000..185cfa3f331a
--- /dev/null
+++ b/games-arcade/shovel-knight/shovel-knight-4.1b-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop unpacker wrapper xdg
+
+MY_PN="ShovelKnight"
+DESCRIPTION="Sweeping classic action adventure with an 8-bit retro aesthetic"
+HOMEPAGE="https://yachtclubgames.com/games/shovel-knight-treasure-trove/"
+SRC_URI="${PN//-/_}_treasure_trove_4_1b_arby_s_46298.sh"
+S="${WORKDIR}/data/noarch/game"
+
+LICENSE="Yacht-Club-Games-EULA"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+joystick"
+RESTRICT="bindist fetch splitdebug"
+
+# I packaged Box2D in the hope of unbundling it but it turns out this
+# game uses a custom version. -- Chewi :(
+
+RDEPEND="
+	media-libs/glew:1.10
+	virtual/opengl
+	!x86? ( media-libs/libsdl2[joystick?,opengl,sound,video] )
+	x86? ( !joystick? ( media-libs/libsdl2[opengl,sound,video] ) )
+"
+
+BDEPEND="
+	dev-util/patchelf
+"
+
+DIR="/opt/${PN}"
+QA_PREBUILT="${DIR#/}/*"
+
+pkg_nofetch() {
+	einfo "Please buy and download ${SRC_URI} from:"
+	einfo "  https://www.gog.com/game/${PN//-/_}"
+	einfo "and move it to your distfiles directory."
+}
+
+src_unpack() {
+	unpack_zip ${A}
+}
+
+src_install() {
+	local BITS=$(usex amd64 64 32) LIB=
+
+	exeinto "${DIR}"
+	doexe ${BITS}/${MY_PN}
+	make_wrapper ${MY_PN} ./${MY_PN} "${DIR}"
+
+	exeinto "${DIR}"/lib
+	doexe ${BITS}/lib/lib{Box2D.so.*,fmod*-*.so}
+
+	for LIB in ${BITS}/lib/libfmod*-*.so; do
+		LIB=${LIB##*/}
+
+		# The FMOD libraries are duplicated rather than symlinked, which is
+		# silly, so create our own symlinks. Both sets of names are needed.
+		dosym "${LIB}" "${DIR}/lib/${LIB%-*}.so"
+
+		# The SONAMEs are also unset, which upsets our QA check, so fix.
+		patchelf --set-soname "${LIB%-*}.so" "${ED}${DIR}/lib/${LIB}" || die
+	done
+
+	if use joystick; then
+		local SDL=libSDL2-2.0.so.0
+		local SDLj=libSDL2-joystick.so
+
+		if use x86; then
+			# Under x86, using our own SDL2 causes the game to crash when a
+			# controller is connected, even after applying the workaround below.
+			# It is seemingly caused by a change to the SDL_GetJoystickGUIDInfo
+			# signature. We must therefore use the bundled SDL2.
+			doexe ${BITS}/lib/${SDL}
+		else
+			# The game uses internal SDL2 joystick functions. These functions
+			# have since been hidden and some have been removed. Using our own
+			# SDL2 therefore causes the game to crash when a controller is
+			# connected. We still want to use our own SDL2 for things like
+			# Wayland, but we can work around this by loading both, using the
+			# bundled one as a fallback.
+			newexe ${BITS}/lib/${SDL} ${SDLj}
+
+			# The bundled SDL2 SONAME has to be set to something different.
+			patchelf --set-soname ${SDLj} "${ED}${DIR}"/lib/${SDLj} || die
+
+			# We need to add the new SONAME as a NEEDED entry, but the order is
+			# important, so we also need to remove the existing NEEDED entry
+			# first and add it back again afterwards.
+			patchelf \
+				--remove-needed ${SDL} \
+				--add-needed ${SDLj} \
+				--add-needed ${SDL} \
+				"${ED}${DIR}"/${MY_PN} || die
+		fi
+	fi
+
+	# The RUNPATHs are not entirely correct so fix up.
+	patchelf --set-rpath '$ORIGIN/lib' "${ED}${DIR}"/${MY_PN} || die
+	patchelf --set-rpath '$ORIGIN' "${ED}${DIR}"/lib/libfmodevent*.so || die
+
+	insinto "${DIR}"
+	doins -r data/
+
+	newicon -s 256 ../support/icon.png ${PN}.png
+	make_desktop_entry ${MY_PN} "Shovel Knight"
+}