5 files changed, 60 insertions, 141 deletions
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index dec7185da0e4..39b176b2ac1f 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/cartridges/Manifest b/games-util/cartridges/Manifest
index 2d5992d96d0e..ea37515fb70d 100644
--- a/games-util/cartridges/Manifest
+++ b/games-util/cartridges/Manifest
@@ -2,8 +2,10 @@ AUX cartridges-1.5.4-dont-validate-appstream.patch 304 BLAKE2B bc6f26ccc39f2029a
 DIST cartridges-2.3.tar.gz 1282083 BLAKE2B 1e6ef65ba223af5b65af922c90b61b5c1bca1859b4231632b2c2996258f562719340f7cb9c6facc6f8151bac8388bcfe3c549131bee9b249d0d03310a622538b SHA512 d5f2d29414d1e347e0459003890f018e585450cc3b6663e922696f04c1eff3a864364a08dfa17ea6fe4e87aa47c28485f0954a4376c1d1695039e478a7dbe7f4
 DIST cartridges-2.6.1.tar.gz 1083018 BLAKE2B a760cc3651775139d6151530df20d94a292841f60918cd76e9f77b9d081bbbc71571173d60766b7e7880d7c6f74cadad2711c3d16e6b2bcf904e13b05a1494cd SHA512 dfe5a0c2bcf9cbf83811915cfb00b0f625dd7847ac979e5cb45ca0b907d59c010cc13c048db779b9543d45a5ddc8a4f1bd01322f64f76d0b39433969458bb75f
 DIST cartridges-2.6.2.tar.gz 1083203 BLAKE2B ee7ff5efea06f61152e913b351dfefb9f3355e853966b8425d09912463a28165207908cae2f4bdd3af19a0020fe82eb0f1f0bdbaa7ee2d94de294daf81439818 SHA512 8521c859f33ae78c4ed7d75fed73f6a9b695f89ae21e3072f9cb878facdd85dffefb8ea8491def0732c415c89965f5152d8458cbe5c25433b0f7a44388ff7da5
+DIST cartridges-2.7.1.tar.gz 1094433 BLAKE2B a1ba5563bb084b0ba44660f8cfd17fa576fadf0371d42ca9c539c5093064f66141829962e736a2eed3d8a8de4eb940ecf0c33cd89880daebc36b12787af9450d SHA512 191ee3231d08093868e9a73be61dde1619bb77286a69d21e54002890857bfbf5ba3c04faa7009159b8c354666514ecf307dc070faa12ba5c5510d31ec6d6c1cc
 EBUILD cartridges-2.3.ebuild 1210 BLAKE2B 601e7149b337cb55f4cb287db1fed12e8b991d9383fb45f9fa841818e3b62cdda70770d94350aadd6070a97a4fae2922da322c7d2f69788cdbf733b864929d3f SHA512 dc76fee26ca7c5a6e27c641fed1172af916b4901a98b3930246f12cb5a11cb7edbbfc2d1e2abdaeebb8f7a6341c7446636c6a1875cae8f6d5b1ea09fb6b95456
 EBUILD cartridges-2.6.1.ebuild 1215 BLAKE2B 63466a82eae0d57b908d99059b7bdf45d072bfeb050295cabd38e78009ed58a21da8b3a176e6fa05f05b9d4e1c3d2f597874810c587b9bb37822cae465e80eea SHA512 79de146cc9ca4e023f01db3c81b6e33e2fd861c4d6d17e081e8d69470085f33fe607d0137eaa389c84d4b11ca567a1d3dfd0bca5e71e85bbd27a4c62c9377c51
 EBUILD cartridges-2.6.2.ebuild 1215 BLAKE2B 63466a82eae0d57b908d99059b7bdf45d072bfeb050295cabd38e78009ed58a21da8b3a176e6fa05f05b9d4e1c3d2f597874810c587b9bb37822cae465e80eea SHA512 79de146cc9ca4e023f01db3c81b6e33e2fd861c4d6d17e081e8d69470085f33fe607d0137eaa389c84d4b11ca567a1d3dfd0bca5e71e85bbd27a4c62c9377c51
+EBUILD cartridges-2.7.1.ebuild 1146 BLAKE2B 7f188ab5f607b19568ccfea00b12eb84ba4934844b8313d46c059e00ea18981a54168ba45577b41d1238d18f479dc50db19d9cee9ba844abdd59e0b608018d9b SHA512 5379c8bfba5e0d838e839d6ba5fb392e014f0fecc00d76f402a5a612d4aaa54821ae18027cbbea55fb1cd76dcbedb092f721958b0a9219f99adc37c7a4a97ac5
 EBUILD cartridges-9999.ebuild 1211 BLAKE2B 0e60e0ea4c9e0648cf1a7ef8b19984297119434aa842b306eca685420fb52e42c9722386104c6157ec02e6833e30375564162d0575f7790047558f27c60a9cae SHA512 42c13c130ea48ceb33eeab935d66c74a3943fa742c2a3d8e562cd33810836d4038174724a296117758386abc43819d7f50eb15c30173d44d6907e3259ed61bef
 MISC metadata.xml 760 BLAKE2B f57df1306fd66ac7c1275d2c77ced58a333f3e47a7f02ae643d8fe4bceb7f28dfc796e3898fb28eef7f6e4ee250e762ca208c662be94a12e89a098ec45d5b482 SHA512 e70a9f88c0cdb41276783878ccaf24623f8c97fafc55d88ab564604cb534b4ea7426eb50d3c9ba9ee091e7adf5bea6d68e919c0c84a496be3d8c6497394cd2b7
diff --git a/games-util/cartridges/cartridges-2.7.1.ebuild b/games-util/cartridges/cartridges-2.7.1.ebuild
new file mode 100644
index 000000000000..4992bea5ad7b
--- /dev/null
+++ b/games-util/cartridges/cartridges-2.7.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="Simple game launcher written in Python using GTK4 and Libadwaita"
+HOMEPAGE="https://github.com/kra-mo/cartridges/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/kra-mo/${PN}.git"
+else
+	SRC_URI="https://github.com/kra-mo/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=gui-libs/libadwaita-1.4.0:1[introspection]
+	gui-libs/gtk:4[introspection]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	dev-libs/appstream-glib
+	dev-util/blueprint-compiler
+	dev-util/desktop-file-utils
+"
+
+src_install() {
+	meson_src_install
+
+	python_fix_shebang "${ED}/usr/bin"
+	python_optimize "${ED}/usr/share/cartridges/cartridges"
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_pkg_postrm
+}
diff --git a/games-util/heroic-bin/Manifest b/games-util/heroic-bin/Manifest
index 83030f0de16c..ffde4ffbcb2b 100644
--- a/games-util/heroic-bin/Manifest
+++ b/games-util/heroic-bin/Manifest
@@ -1,7 +1,5 @@
 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.10.0.tar.xz 103110396 BLAKE2B 6f6921f8e75802427cd6f21a7666b33a67b553b79937de2a4ebae0a690cf87657b730b5306f61e909bccab80fd68b923346b14be6cc674d913769d1e4ed9f268 SHA512 1748f80341276d6ca9bd3375333c11fb22908413eb69ad47f61b2450fa98015a4e12426d8b825b8113cd218f4a01567faeff6cf41f5aa4b87dbf7c06d7feedad
 DIST heroic-bin-2.11.0.tar.xz 103219320 BLAKE2B 9988ea1ae6ec4bd7d7b93d6d39cacf3b4bb954688109f2d111e90c77c64677182140f5d8d7075e756893bc17b546ec95d4813a9fe2b802542d9458ee0d06d490 SHA512 364a9300cb1e026470ffe69052ecb1fa9936811c3c84a89338929c51774eaf421e326463b359b6e069c4499a074f05458937a80b66837ede7387e3b9ccee35b3
-EBUILD heroic-bin-2.10.0.ebuild 3302 BLAKE2B ab986a318231e5ac5444f31712da0ba1356bab3e5a96bbf48e50dd829bdf3b36592b8457d5cd48760e6eb4446b4a16e119ec618f8a4b449752c6d1c50d02d8ce SHA512 7abb6783cf62a319d2692f5eebb7ca7fe9ef3d671fd54aed25e771bdf4926bb3a50090dc0e1bcedfd26772c0915ee8b5603ce1e612f3b85f22824da6cad457ae
 EBUILD heroic-bin-2.11.0.ebuild 3302 BLAKE2B ab986a318231e5ac5444f31712da0ba1356bab3e5a96bbf48e50dd829bdf3b36592b8457d5cd48760e6eb4446b4a16e119ec618f8a4b449752c6d1c50d02d8ce SHA512 7abb6783cf62a319d2692f5eebb7ca7fe9ef3d671fd54aed25e771bdf4926bb3a50090dc0e1bcedfd26772c0915ee8b5603ce1e612f3b85f22824da6cad457ae
 MISC metadata.xml 713 BLAKE2B 3cc0678930075e7751c2368901934ba93bebe7934449f1fdec62d21d2b418f8902660c2b6e998aeaf20559cd97c2cd333054bdd465924fd3eef630b31113ea23 SHA512 038cf66c580bd66cc692764aa0a5144146d520182f42b730ecb238a123982e7d37370c074409dd3e430372fe8e89d4ffa68e9412545b957723e70787b9f4d180
diff --git a/games-util/heroic-bin/heroic-bin-2.10.0.ebuild b/games-util/heroic-bin/heroic-bin-2.10.0.ebuild
deleted file mode 100644
index 41737f425914..000000000000
--- a/games-util/heroic-bin/heroic-bin-2.10.0.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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
-	sw ta te th tr uk ur vi zh-CN zh-TW
-"
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit chromium-2 desktop python-single-r1 xdg
-
-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
-		-> ${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}
-"
-S="${WORKDIR}"/${APP_NAME}
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-accessibility/at-spi2-core
-	app-arch/brotli
-	app-arch/bzip2
-	dev-libs/expat
-	dev-libs/fribidi
-	dev-libs/glib
-	dev-libs/gmp
-	dev-libs/libffi
-	dev-libs/libpcre2
-	dev-libs/libtasn1
-	dev-libs/nettle
-	dev-libs/nspr
-	dev-libs/nss
-	dev-libs/wayland
-	media-fonts/freefont
-	media-gfx/graphite2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/harfbuzz
-	media-libs/libepoxy
-	media-libs/libjpeg-turbo
-	media-libs/libpng
-	media-libs/mesa
-	media-video/ffmpeg
-	net-dns/libidn2
-	net-libs/gnutls
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/glibc
-	sys-libs/zlib
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libdrm
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/pango
-	x11-libs/pixman
-"
-
-QA_PREBUILT=".*"
-
-src_unpack() {
-	unpack ${P}.tar.xz
-}
-
-src_configure() {
-	default
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
-	default
-
-	cd locales || die
-	chromium_remove_language_paks
-}
-
-src_install() {
-	local app_root=/opt/${APP_NAME}
-	local app_dest="${ED}"/${app_root}
-
-	dodoc LICENSE.*
-	rm LICENSE.* || die
-
-	dodir "${app_root%/*}"
-	cp -r "${S}" "${app_dest}" || die
-
-	# Chrome-sandbox requires the setuid bit to be specifically set.
-	# see https://github.com/electron/electron/issues/17972
-	fowners root "${app_root}"/chrome-sandbox
-	fperms 4711 "${app_root}"/chrome-sandbox
-
-	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}	\
-			com.heroicgameslauncher.hgl.desktop
-	newicon "${DISTDIR}"/com.heroicgameslauncher.hgl.png-${APP_RESOURCES_COMMIT}	\
-			com.heroicgameslauncher.hgl.png
-}