gentoo auto-resync : 11:03:2024 - 12:45:51

4 files changed, 3 insertions, 79 deletions

diff --git a/games-util/cartridges/Manifest b/games-util/cartridges/Manifest
index edb861996cdf..49fc4e1a822f 100644
--- a/games-util/cartridges/Manifest
+++ b/games-util/cartridges/Manifest
@@ -1,11 +1,8 @@
-AUX cartridges-1.5.4-dont-validate-appstream.patch 304 BLAKE2B bc6f26ccc39f2029a0d09a767843139b219692159e1b3036e40845a14db2bf43f4510ab29b626cc9acfa140123a841b36536b767187b792ce545737914bebd1e SHA512 2a5b2a8a4dbd0614f7fdabb487e2df5c63c0718b11320fefa8894c1dd166438d7238e1d4703c9e9aeac2bf540ecaa4c0cbf6e5a64343d8bce80d5e1033a6dd14
-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.2.tar.gz 1094408 BLAKE2B 462c4117e0cc3050b9deac508704e863dab0f389e825007392a51a44fffb9eb9a98d8f915379b1eb7ecb696ed85a9027a3705835038109d814e96282a865883f SHA512 3dc9118034d8e5491c10b12515e099a05505da97aa19658509e6e36c6de1da5b34998973dfc5ea010c754eff5e44ce2603ed65037a213af4ed3db9107ddaa83c
 DIST cartridges-2.7.3.tar.gz 1097578 BLAKE2B 71ac72127d1034a9f4eb64250f3595d4ff5efa4e4f062e7bd0847e2e8a513dcdbe827c3bae93db875c8467beeb2012363654e54fe4ba62987b48578ba3c420dd SHA512 67f9f9b4f4b396c57e989a0649f8261eed14729ad6bbc7d20557abe7d7c6e64ea7ef2cdcc80ef1aa6fe71b0bce34f91ed56e51595cbf9f14697aa439ea6ad601
-EBUILD cartridges-2.6.1-r1.ebuild 1266 BLAKE2B 7ac26c1bdc81be4a718f1735bd0f1fc65ceea51441a8badc46b983dc4e4a93732d8dda6fe853eb44d0d01cd8da9a042213e867c1623f632cf8c53f99570be918 SHA512 8bb6b68531cac545ca2ccf7bcaa23587cf0120984f946a76617adb93ce1618aa723d208b5ef1714447c57a59adb888e93d05297c8c05c40c98430538d677952d
-EBUILD cartridges-2.6.2-r1.ebuild 1267 BLAKE2B 88991d9e11bda5462ff23a8bf07630c3abee55a36592bdc8072d3d4a560170e6dd0626ab0541b64714302939e310798c822ce0b6e044942006df11b5b13739f4 SHA512 ab9c1695569f63a698bdf358f6f6bb9ebec0f52929fcb7f383d0dd92a854a9470ba10a956b328561a61ec914e7d657469ea58aea523eae242ebf2c2c0831f6f9
+DIST cartridges-2.7.4.tar.gz 1099412 BLAKE2B 0f15bbe53d8a893dd22b54b0b9435e8a301536c3654b99a302622655dc1207dc657ec21f9c0b8bb7526465126e62d86f7b35ce5561ccf0c275282ce04b685a44 SHA512 3f0c8b7fb83454296d5d676a5a69a8e6c9ae0e833a092b43a45fe0ff39c9eeeb0593a8ae8cf6bf936f84fa2ed8141d8c35fc26a4a05d4eb9ab04e04c627ae4e9
 EBUILD cartridges-2.7.2-r1.ebuild 1197 BLAKE2B 7aad9d90a1f502d3960e8edbe8ddcb0945a3030f7d85bb1f8359167a88a2790991c3aab284ed0955c8407b3dcd7d1d1f4cdd309ab01927cc03f398df6030309e SHA512 7263ed1758a932795bf701a6ce96094bdddf0e0b2be0a93066219d594145580a67d4448649d982bda6c30271ce87a83664dd02f37d9120b8b5ef3eebf19d9ff1
 EBUILD cartridges-2.7.3.ebuild 1198 BLAKE2B 988979e1fc60a4e1f5ef0eb57580ab64f73de8fb12e361da56705719e8dbe44cf589c3a42c04b867d38d9d01423cd41642b1580289e9868ac4a7d712a6adacb6 SHA512 eb107d9788c16e3e2cd61128d5754daee3483d56d61abbc88d86090e3621a8bb488c6bea17a661142d3174b812a99208a5b7abba7f404d2d4b570accf2952c5a
+EBUILD cartridges-2.7.4.ebuild 1198 BLAKE2B 988979e1fc60a4e1f5ef0eb57580ab64f73de8fb12e361da56705719e8dbe44cf589c3a42c04b867d38d9d01423cd41642b1580289e9868ac4a7d712a6adacb6 SHA512 eb107d9788c16e3e2cd61128d5754daee3483d56d61abbc88d86090e3621a8bb488c6bea17a661142d3174b812a99208a5b7abba7f404d2d4b570accf2952c5a
 EBUILD cartridges-9999.ebuild 1198 BLAKE2B bfcc09cd2eee04746834d5d01ff6b4151bc7865582652080c02638967e8ec5b2345695f048cfad03cf40cdfeef5974b48619504b5a64ef0cb0d7d25fac598f49 SHA512 a25a323a218bfbda76535c08e3e66208a4590a9593862fa23980357c722f318725dd1302b35c6144c986b1767978e72827e8274a0338bf63e55dc20f16978660
 MISC metadata.xml 760 BLAKE2B f57df1306fd66ac7c1275d2c77ced58a333f3e47a7f02ae643d8fe4bceb7f28dfc796e3898fb28eef7f6e4ee250e762ca208c662be94a12e89a098ec45d5b482 SHA512 e70a9f88c0cdb41276783878ccaf24623f8c97fafc55d88ab564604cb534b4ea7426eb50d3c9ba9ee091e7adf5bea6d68e919c0c84a496be3d8c6497394cd2b7
diff --git a/games-util/cartridges/cartridges-2.6.1-r1.ebuild b/games-util/cartridges/cartridges-2.6.1-r1.ebuild
deleted file mode 100644
index 09205490fed1..000000000000
--- a/games-util/cartridges/cartridges-2.6.1-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 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"
-RESTRICT="test"             # Just appstream file validation that uses network.
-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
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.5.4-dont-validate-appstream.patch" )
-
-src_install() {
-	meson_src_install
-
-	python_fix_shebang "${ED}/usr/bin"
-	python_optimize "${ED}/usr"
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	xdg_pkg_postrm
-}
diff --git a/games-util/cartridges/cartridges-2.6.2-r1.ebuild b/games-util/cartridges/cartridges-2.7.4.ebuild
index 60e5df3c430c..bda78a7b129c 100644
--- a/games-util/cartridges/cartridges-2.6.2-r1.ebuild
+++ b/games-util/cartridges/cartridges-2.7.4.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit gnome2-utils meson python-single-r1 xdg
+inherit gnome2-utils python-single-r1 meson xdg
 
 DESCRIPTION="Simple game launcher written in Python using GTK4 and Libadwaita"
 HOMEPAGE="https://github.com/kra-mo/cartridges/"
@@ -41,8 +41,6 @@ BDEPEND="
 	dev-util/desktop-file-utils
 "
 
-PATCHES=( "${FILESDIR}/${PN}-1.5.4-dont-validate-appstream.patch" )
-
 src_install() {
 	meson_src_install
 
diff --git a/games-util/cartridges/files/cartridges-1.5.4-dont-validate-appstream.patch b/games-util/cartridges/files/cartridges-1.5.4-dont-validate-appstream.patch
deleted file mode 100644
index 7cfc09376292..000000000000
--- a/games-util/cartridges/files/cartridges-1.5.4-dont-validate-appstream.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -54,7 +54,6 @@ appstream_file = i18n.merge_file(
- 
- appstream_util = find_program('appstream-util', required: false)
- if appstream_util.found()
--  test('Validate appstream file', appstream_util, args: ['validate', appstream_file])
- endif
- 
- install_data(