gentoo resync : 29.12.2022

4 files changed, 2 insertions, 97 deletions

diff --git a/gnome-extra/gnome-tweaks/Manifest b/gnome-extra/gnome-tweaks/Manifest
index aeb18288d40a..090b51403644 100644
--- a/gnome-extra/gnome-tweaks/Manifest
+++ b/gnome-extra/gnome-tweaks/Manifest
@@ -1,7 +1,4 @@
 AUX 3.28.1-gentoo-cursor-themes.patch 1019 BLAKE2B 1dc92c4f8e53c1303f884f6acc332a7a0f1bd11b463e91ddd4ae731938e678f75499692044b5c13021f24dd9bf61264c4454fab734fe65609b3b4c009cb2eee2 SHA512 e502e1ae5945517e7a69cd15436bc07e34fe0db739350e0617d02c9b7a45264f585229f80352a93595e1246d5f9c6e987242772dfb7293de06b400fbaf676971
-AUX gnome-tweaks-40.0-meson-0.61.patch 944 BLAKE2B b7ecf7ec1a492610fb7001721e8c1b60e0d8dd1d6c50ce443acd395c27e09f664db68a7c160e3143538bc6df48516f216ef4d8ccd4352e0786057837856620d2 SHA512 ff7ffd60a4c187fd7caeb6bebb5b06c1841d5e921d7d7d2d549f67e5d367a152d2545a49e07c6e8c1954b203a2e3826e692e1a37b81a62db14196a504cf8faaf
-DIST gnome-tweaks-40.0.tar.xz 251908 BLAKE2B 4280e7565da3f95d7bcd81ba874d2f15e8c3834ab052cb4cf7cde8060eaea016670acf6f441d2cbce4b7566ba0bb7a7f9666b257893bc7b22b1cdc4d5a0edee2 SHA512 c3467f40af6bb79c2b10cb429e93aa29261066c2a5fd744bf2801c4e596cc270d45302ebfa942ee0c40067849c12e1ccd404c40e7f594bcff4c44cfe3f90bb97
 DIST gnome-tweaks-40.10.tar.xz 251712 BLAKE2B 7e9e04b86ffcff25cafd2a6dfc0c7be14c8caa4ae003369c34ed2c40c36ce857b05de9994f7c2187cbdd535f464b92f782ec91b835318c2b5d2219ad817fbe56 SHA512 1247933ad2f93bd7817af367d715468591840df4840d45641033ca19ea26c64239828ba3e24fafb8694014a98024b911266c314172ba8e37d6c4165e7e6e8a29
-EBUILD gnome-tweaks-40.0.ebuild 1392 BLAKE2B 78eb50a92f55665a95e11d08b4770c5558690f0ec9868432de4225b14c6d831ac3480cf5c3afadda2fdfcd0f403e5983ce8daa04866e757dbd31fafa80994aef SHA512 ccff3f0cc0aaffc9f994ef971222c0ac2813366553a2d5c4925308609d037d83e12a30cfa14669842931deeed3dd3f3ef2088a275b396e402bfee392171b66bd
-EBUILD gnome-tweaks-40.10.ebuild 1351 BLAKE2B 7e48ef65d327c8516e9efc04329f0786e0972ac44e2dbfa74cdbfdd93c06a6441eaaf729ccfac746f6f9f68bf5b12ec8c605646138ef782e95b6d00e3c72201d SHA512 5787088aa284ed5f3c3c41ae1994954c2aab1e568690a76f2c43f0cc926ca202199d9a552e767d5eba72d51b39c18c36d0462fe58d635ade871f59ac9dcd28d4
+EBUILD gnome-tweaks-40.10.ebuild 1348 BLAKE2B b8e170da11721de60b5305efbcfdf03d7f611d99ee3bf49fc7063e70515cf4e93959b7fade4ad539e5dcaa5216b81c711b30a3dc5f268dc774b18bd232c66072 SHA512 40d9e6f3f39c4fd5266403828213f991258e6c5910a16502dda48ca7d82ec8daaa45ee1d618c7600a5646dd51566c4627155e5a53de04c753741e1cce227668e
 MISC metadata.xml 557 BLAKE2B 377b3b95f3dfade66ceb83a955bae45820c7db9cb286fbc9fb7f597909d6e58b3ccbdde1acc5bc01bda97bcde90a062a8e4676c8593edfc95c46f27c311ca83e SHA512 9a24c8eedb00ba7ceaba017cfeef778a7def43d7baf62c23067376f7648fad3b333e16a9dc4f8c41f66279b4bbe8acf54844ab5460d56366d32c325ea5d06e2d
diff --git a/gnome-extra/gnome-tweaks/files/gnome-tweaks-40.0-meson-0.61.patch b/gnome-extra/gnome-tweaks/files/gnome-tweaks-40.0-meson-0.61.patch
deleted file mode 100644
index 9ef4db33ecb5..000000000000
--- a/gnome-extra/gnome-tweaks/files/gnome-tweaks-40.0-meson-0.61.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://gitlab.gnome.org/GNOME/gnome-tweaks/-/merge_requests/86.patch
-https://bugs.gentoo.org/831937
-
-From 56f39dc7d04a1be91de1149683874f9c83b794fb Mon Sep 17 00:00:00 2001
-From: Mae Dartmann <mae@meanderingmind.me>
-Date: Sat, 22 Jan 2022 18:09:21 +0100
-Subject: [PATCH] meson: fix invalid positional argument
-
-This was deprecated in meson 0.60 and removed in 0.61. See
-https://github.com/mesonbuild/meson/pull/9445 for details.
-
-Signed-off-by: Mae Dartmann <mae@meanderingmind.me>
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -1,5 +1,5 @@
- appdata_file = 'org.gnome.tweaks.appdata.xml'
--i18n.merge_file(appdata_file,
-+i18n.merge_file(
-   input: appdata_file + '.in',
-   output: appdata_file,
-   po_dir: '../po',
-@@ -8,7 +8,7 @@ i18n.merge_file(appdata_file,
- )
- 
- desktop_file = 'org.gnome.tweaks.desktop'
--i18n.merge_file(desktop_file,
-+i18n.merge_file(
-   input: desktop_file + '.in',
-   output: desktop_file,
-   po_dir: '../po',
-GitLab
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild
deleted file mode 100644
index e290c8ab5396..000000000000
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="Customize advanced GNOME options"
-HOMEPAGE="https://wiki.gnome.org/Apps/Tweaks"
-
-LICENSE="GPL-3+ CC0-1.0"
-SLOT="0"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-DEPEND="${PYTHON_DEPS}"
-# See README.md for list of deps
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.10.2:3[${PYTHON_USEDEP}]
-	')
-	>=gnome-base/gnome-settings-daemon-3
-	x11-themes/sound-theme-freedesktop
-
-	>=dev-libs/glib-2.58:2
-	>=x11-libs/gtk+-3.12:3[introspection]
-	>=gnome-base/gnome-desktop-3.30:3[introspection]
-	gui-libs/libhandy:1[introspection]
-	net-libs/libsoup:2.4[introspection]
-	x11-libs/libnotify[introspection]
-
-	>=gnome-base/gsettings-desktop-schemas-40.0
-	>=gnome-base/gnome-shell-3.24
-	x11-wm/mutter
-"
-BDEPEND=">=sys-devel/gettext-0.19.8"
-
-PATCHES=(
-	"${FILESDIR}"/3.28.1-gentoo-cursor-themes.patch # Add contents of Gentoo's cursor theme directory to cursor theme list
-
-	"${FILESDIR}"/${PN}-40.0-meson-0.61.patch
-)
-
-src_install() {
-	meson_src_install
-	python_optimize
-	python_fix_shebang "${ED}"/usr/bin/
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-40.10.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-40.10.ebuild
index 30feae50500c..883e664b39ae 100644
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-40.10.ebuild
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-40.10.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 DEPEND="${PYTHON_DEPS}"
 # See README.md for list of deps