gentoo auto-resync : 09:04:2024 - 12:31:21

5 files changed, 62 insertions, 27 deletions

diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index b0956d3ee4e7..b725be85d336 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/heroic-bin/Manifest b/games-util/heroic-bin/Manifest
index 73976b6bef4d..3862bf27a174 100644
--- a/games-util/heroic-bin/Manifest
+++ b/games-util/heroic-bin/Manifest
@@ -1,9 +1,9 @@
+DIST com.heroicgameslauncher.hgl.2.13.0.desktop 317 BLAKE2B e4c7cc834bc8688703b982897b13542543a3d28c50f7fe3f8e680c233762d612c0b24f7036919571451b96002f493cb55fb6d75241e124879ae486c5b4053f96 SHA512 314c7449ee7b83c77eda117536d0c2da1c5d3882a3f08f5fe0381451de734ed388e8941de8440521dad2f2fc335d214345e7301a2929b8fefa4f64a7a2ff804e
+DIST com.heroicgameslauncher.hgl.2.13.0.png 9797 BLAKE2B c6f76df4ec2fd25323f5c37e03605647ede8f8c2ed48cfbb8af11aad22ae90182d3678b943633b46a2d8dfb0c1cbd1a275b6c62dde238b9b0f68cbafb4bf3697 SHA512 68e9881fb4f123008398409825aa8cf70cec34365a23adb1234f7c054a14f40d159e7d8912cfedac0bb2b12f1d3c3c980469c2fca9735d4bc06bd4074aecc7e3
 DIST com.heroicgameslauncher.hgl.2.14.1.desktop 317 BLAKE2B e4c7cc834bc8688703b982897b13542543a3d28c50f7fe3f8e680c233762d612c0b24f7036919571451b96002f493cb55fb6d75241e124879ae486c5b4053f96 SHA512 314c7449ee7b83c77eda117536d0c2da1c5d3882a3f08f5fe0381451de734ed388e8941de8440521dad2f2fc335d214345e7301a2929b8fefa4f64a7a2ff804e
 DIST com.heroicgameslauncher.hgl.2.14.1.png 9797 BLAKE2B c6f76df4ec2fd25323f5c37e03605647ede8f8c2ed48cfbb8af11aad22ae90182d3678b943633b46a2d8dfb0c1cbd1a275b6c62dde238b9b0f68cbafb4bf3697 SHA512 68e9881fb4f123008398409825aa8cf70cec34365a23adb1234f7c054a14f40d159e7d8912cfedac0bb2b12f1d3c3c980469c2fca9735d4bc06bd4074aecc7e3
-DIST com.heroicgameslauncher.hgl.desktop-6dfb2758e531af693f0baffa15240f152aadd68b 317 BLAKE2B e4c7cc834bc8688703b982897b13542543a3d28c50f7fe3f8e680c233762d612c0b24f7036919571451b96002f493cb55fb6d75241e124879ae486c5b4053f96 SHA512 314c7449ee7b83c77eda117536d0c2da1c5d3882a3f08f5fe0381451de734ed388e8941de8440521dad2f2fc335d214345e7301a2929b8fefa4f64a7a2ff804e
-DIST com.heroicgameslauncher.hgl.png-6dfb2758e531af693f0baffa15240f152aadd68b 9797 BLAKE2B c6f76df4ec2fd25323f5c37e03605647ede8f8c2ed48cfbb8af11aad22ae90182d3678b943633b46a2d8dfb0c1cbd1a275b6c62dde238b9b0f68cbafb4bf3697 SHA512 68e9881fb4f123008398409825aa8cf70cec34365a23adb1234f7c054a14f40d159e7d8912cfedac0bb2b12f1d3c3c980469c2fca9735d4bc06bd4074aecc7e3
 DIST heroic-bin-2.13.0.tar.xz 105883932 BLAKE2B 93161f87fc734540338914bf63b2231b7bd7bb4a265092a831043fa6d771cff2211395f0cf92dacff12eebb369e8c5d8687b7662c559dc72635f91f858341122 SHA512 59466b2516b4e42fb3ea7dc9f96834ee8598e2424a9615acbd9de65d4035634f82181a4b5e6664eb186173b7199b191418c3eab7e582450a489295e60ed39d1d
 DIST heroic-bin-2.14.1.tar.xz 106272512 BLAKE2B 2bacc905a5ec71df0051e5ea5c1b34a1596fb6d7c4530ee0d81b8984b53bfcc097210d63ca133e6cae608a6d44ee92c108ff9f114e4a159e95c6e420a7ae5474 SHA512 564089f606f309cc7faddc0ee8afc2303d4c729492a3be14acbf773e38cc2fece0ebea34f6294dbdeacd6fdcf7a28e1608115e27bdcf0618c7950a5b024f0e1c
-EBUILD heroic-bin-2.13.0.ebuild 3097 BLAKE2B 185cdfe2c53456e80d8e1049a66691a942bf9054dc4080b8a48a0b5c72c1294b23618c9eb84549607757d0d409a80bf61b6ca75db220c4441abfe4db77e35756 SHA512 46409a66a0dd5ce2ebd87458ea08b3eef58c6c25c947d33189601baf6da8510424a1372ef8b5b5701f159e0b70f1fb83ce77a6318403a5abcdb71888b4037915
-EBUILD heroic-bin-2.14.1.ebuild 2937 BLAKE2B d92f1593e4a4c315d6ee6c2ef833b8f77b42f4a54380be80d2d937a7a038ea5421074df4a72db36cd84f02b9e602511c4923d2d730eed982b7c508a44c4cbf35 SHA512 b4b3984cd37107ad46abe0539edaab038b7cf2a8c6fdcdf43d57ce1b32aa0f3805eff23aad4b23952f1a19e87443708efa1d9ca0d778c9fdf817fca1a466a166
-MISC metadata.xml 722 BLAKE2B 19d137d5dcec4b96df88c354ae315256395d83cf6c49b51f626fa42f6bcbd3e2ea5b512c537e340d3e6960657fe6e69ee50d9e976ca0e5cb3ddbba3446e596ba SHA512 b6c1bccf1dda93964732bf8d2b94fcd123b9b73c5b6272e8b53427ef456655232583443fe94506749d0cb7980d5266d7d1231eedd940441b1b927f989f0241cf
+EBUILD heroic-bin-2.13.0-r1.ebuild 3856 BLAKE2B 2ac03c2a7083267c6d168ddd18f12232498113aa82f54418fe119df1d2658aa7d34b768d76a8246c331beb54ce3fa1055b5f3081a844284da153510ca8a6e17b SHA512 95069b5ae56d5de9873d8a5e4fbf3cf95e8f93002b29f06115338c46ae4d63f3ce20b18c8904ff7ec4b36993eaa631e24efafbcb719b9dfe5c8eaa48cd8c399b
+EBUILD heroic-bin-2.14.1-r1.ebuild 3856 BLAKE2B 2ac03c2a7083267c6d168ddd18f12232498113aa82f54418fe119df1d2658aa7d34b768d76a8246c331beb54ce3fa1055b5f3081a844284da153510ca8a6e17b SHA512 95069b5ae56d5de9873d8a5e4fbf3cf95e8f93002b29f06115338c46ae4d63f3ce20b18c8904ff7ec4b36993eaa631e24efafbcb719b9dfe5c8eaa48cd8c399b
+MISC metadata.xml 1072 BLAKE2B 629aa00cb90467901da132375532f520cf2e9dd3720686487278056aa415d024e00a19249ef16af82adefabad698e381112a2d54d2335b62bfa26476f0763223 SHA512 794387073bbede506485de30babe902fc829ad955673173444bd450415c14a976236b967497253db9934f5a661bb11561ddc11550071b53faef9b2d9c434636e
diff --git a/games-util/heroic-bin/heroic-bin-2.14.1.ebuild b/games-util/heroic-bin/heroic-bin-2.13.0-r1.ebuild
index 28c41dfca7d8..4710be3359f5 100644
--- a/games-util/heroic-bin/heroic-bin-2.14.1.ebuild
+++ b/games-util/heroic-bin/heroic-bin-2.13.0-r1.ebuild
@@ -28,6 +28,7 @@ S="${WORKDIR}/${P/-bin}"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="gamescope"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
@@ -82,6 +83,7 @@ RDEPEND="
 	x11-libs/libxkbcommon
 	x11-libs/pango
 	x11-libs/pixman
+	gamescope? ( gui-wm/gamescope )
 "
 
 QA_PREBUILT=".*"
@@ -97,6 +99,17 @@ src_prepare() {
 
 	cd locales || die
 	chromium_remove_language_paks
+
+	# Create gamescope desktop file
+	if use gamescope; then
+		cp "${DISTDIR}"/com.heroicgameslauncher.hgl.${PV}.desktop \
+			"${WORKDIR}"/com.heroicgameslauncher.hgl.gamescope.${PV}.desktop || die
+
+		sed -i 's/Name=Heroic Games Launcher/Name=Heroic Games Launcher (Gamescope)/g' \
+			"${WORKDIR}"/com.heroicgameslauncher.hgl.gamescope.${PV}.desktop || die
+		sed -i 's/Exec=heroic-run %u/Exec=env GDK_BACKEND=wayland gamescope -w 1920 -h 1080 -f -R --RT --force-grab-cursor --prefer-vk-device --adaptive-sync --nested-unfocused-refresh 30 -- heroic-run --ozone-platform=x11 --enable-features=UseOzonePlatform,WaylandWindowDecorations/g' \
+			"${WORKDIR}"/com.heroicgameslauncher.hgl.gamescope.${PV}.desktop || die
+	fi
 }
 
 src_install() {
@@ -119,6 +132,10 @@ src_install() {
 	# Install resources: desktop file and icon.
 	newmenu "${DISTDIR}"/com.heroicgameslauncher.hgl.${PV}.desktop \
 			com.heroicgameslauncher.hgl.desktop
-	newicon "${DISTDIR}"/com.heroicgameslauncher.hgl.${PV}.png \
+	if use gamescope; then
+		newmenu "${WORKDIR}"/com.heroicgameslauncher.hgl.gamescope.${PV}.desktop \
+			com.heroicgameslauncher.hgl.gamescope.desktop
+	fi
+	newicon "${DISTDIR}"/com.heroicgameslauncher.hgl.${PV}.png	\
 			com.heroicgameslauncher.hgl.png
 }
diff --git a/games-util/heroic-bin/heroic-bin-2.13.0.ebuild b/games-util/heroic-bin/heroic-bin-2.14.1-r1.ebuild
index 658baf2dc193..4710be3359f5 100644
--- a/games-util/heroic-bin/heroic-bin-2.13.0.ebuild
+++ b/games-util/heroic-bin/heroic-bin-2.14.1-r1.ebuild
@@ -3,10 +3,6 @@
 
 EAPI=8
 
-APP_NAME="${P/-bin/}"
-APP_URI="https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher"
-APP_RESOURCES_COMMIT=6dfb2758e531af693f0baffa15240f152aadd68b
-
 CHROMIUM_LANGS="
 	af am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
 	hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
@@ -20,20 +16,19 @@ DESCRIPTION="GOG and Epic Games Launcher for Linux"
 HOMEPAGE="https://heroicgameslauncher.com/
 	https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/"
 SRC_URI="
-	${APP_URI}/releases/download/v${PV}/heroic-${PV}.tar.xz
+	https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/releases/download/v${PV}/heroic-${PV}.tar.xz
 		-> ${P}.tar.xz
-
-	${APP_URI}/raw/${APP_RESOURCES_COMMIT}/flatpak/com.heroicgameslauncher.hgl.desktop
-		-> com.heroicgameslauncher.hgl.desktop-${APP_RESOURCES_COMMIT}
-
-	${APP_URI}/raw/${APP_RESOURCES_COMMIT}/flatpak/com.heroicgameslauncher.hgl.png
-		-> com.heroicgameslauncher.hgl.png-${APP_RESOURCES_COMMIT}
+	https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/raw/v${PV}/flatpak/com.heroicgameslauncher.hgl.desktop
+		-> com.heroicgameslauncher.hgl.${PV}.desktop
+	https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/raw/v${PV}/flatpak/com.heroicgameslauncher.hgl.png
+		-> com.heroicgameslauncher.hgl.${PV}.png
 "
-S="${WORKDIR}/${APP_NAME}"
+S="${WORKDIR}/${P/-bin}"
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="gamescope"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
@@ -88,14 +83,11 @@ RDEPEND="
 	x11-libs/libxkbcommon
 	x11-libs/pango
 	x11-libs/pixman
+	gamescope? ( gui-wm/gamescope )
 "
 
 QA_PREBUILT=".*"
 
-src_unpack() {
-	unpack "${P}.tar.xz"
-}
-
 src_configure() {
 	default
 
@@ -107,10 +99,21 @@ src_prepare() {
 
 	cd locales || die
 	chromium_remove_language_paks
+
+	# Create gamescope desktop file
+	if use gamescope; then
+		cp "${DISTDIR}"/com.heroicgameslauncher.hgl.${PV}.desktop \
+			"${WORKDIR}"/com.heroicgameslauncher.hgl.gamescope.${PV}.desktop || die
+
+		sed -i 's/Name=Heroic Games Launcher/Name=Heroic Games Launcher (Gamescope)/g' \
+			"${WORKDIR}"/com.heroicgameslauncher.hgl.gamescope.${PV}.desktop || die
+		sed -i 's/Exec=heroic-run %u/Exec=env GDK_BACKEND=wayland gamescope -w 1920 -h 1080 -f -R --RT --force-grab-cursor --prefer-vk-device --adaptive-sync --nested-unfocused-refresh 30 -- heroic-run --ozone-platform=x11 --enable-features=UseOzonePlatform,WaylandWindowDecorations/g' \
+			"${WORKDIR}"/com.heroicgameslauncher.hgl.gamescope.${PV}.desktop || die
+	fi
 }
 
 src_install() {
-	local app_root=/opt/${APP_NAME}
+	local app_root=/opt/${P/-bin}
 	local app_dest="${ED}"/${app_root}
 
 	dodoc LICENSE.*
@@ -119,16 +122,20 @@ src_install() {
 	dodir "${app_root%/*}"
 	cp -r "${S}" "${app_dest}" || die
 
-	dosym -r "${PYTHON}"	\
-		  "${app_root}"/resources/app.asar.unpacked/node_modules/register-scheme/build/node_gyp_bins/python3
+	dosym -r "${PYTHON}" \
+		"${app_root}"/resources/app.asar.unpacked/node_modules/register-scheme/build/node_gyp_bins/python3
 
 	find "${app_dest}" -type f -name "*.a" -exec rm {} + || die
 
 	dosym -r "${app_root}"/heroic /usr/bin/heroic-run
 
 	# Install resources: desktop file and icon.
-	newmenu "${DISTDIR}"/com.heroicgameslauncher.hgl.desktop-${APP_RESOURCES_COMMIT}	\
+	newmenu "${DISTDIR}"/com.heroicgameslauncher.hgl.${PV}.desktop \
 			com.heroicgameslauncher.hgl.desktop
-	newicon "${DISTDIR}"/com.heroicgameslauncher.hgl.png-${APP_RESOURCES_COMMIT}	\
+	if use gamescope; then
+		newmenu "${WORKDIR}"/com.heroicgameslauncher.hgl.gamescope.${PV}.desktop \
+			com.heroicgameslauncher.hgl.gamescope.desktop
+	fi
+	newicon "${DISTDIR}"/com.heroicgameslauncher.hgl.${PV}.png	\
 			com.heroicgameslauncher.hgl.png
 }
diff --git a/games-util/heroic-bin/metadata.xml b/games-util/heroic-bin/metadata.xml
index 7b837541c34b..9f6e069b9dda 100644
--- a/games-util/heroic-bin/metadata.xml
+++ b/games-util/heroic-bin/metadata.xml
@@ -6,6 +6,17 @@
     <email>voyageur@gentoo.org</email>
     <name>Bernard Cafarelli</name>
   </maintainer>
+  <maintainer type="person">
+    <email>gonegrier.duarte@gmail.com</email>
+    <name>Gonçalo Negrier Duarte</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Gentoo Proxy Maintainers</name>
+  </maintainer>
+  <use>
+    <flag name="gamescope">Run Heroic Launcher inside gamescope</flag>
+  </use>
   <longdescription>
     Heroic is an Open Source Game Launcher for Linux, Windows and macOS. Right
     now it supports launching games from the Epic Games Store using Legendary