gentoo resync : 31.05.2021

4 files changed, 2 insertions, 135 deletions

diff --git a/gnome-extra/gnome-tweaks/Manifest b/gnome-extra/gnome-tweaks/Manifest
index 5f8f7190291a..e68e364acad5 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 3.34.0-fix-python.patch 2877 BLAKE2B 95a064d63c4f70ee3a79015b96d371b9fa394d50cbc5b9bb7561b641901775dd3f49ebaa1d29c481159b083b9fb07d9e7314d0748cab1d3b312973eb4bffdd84 SHA512 ecdc7a0d5df02b70dcc50c8d5ac03198871e96671521e3820b192ee6547953146783ef35571d5cc8c3eaf4ea044d3b60ad603f0f2fd45aad2df9a04c2a5dc0b5
-DIST gnome-tweaks-3.34.1.tar.xz 247980 BLAKE2B 55fbb16bcdb1a9ea4b5ca84df802266e07347377eab3712284973146fcc0797af59df5985725b1a95a1fba0d26b580a1c9862675978876de5eeb0de9c0060be3 SHA512 c922bf696b9ff48c8c39fd4ae06f4b72ea7b18645ad41552b0367859066d7601bc59521643335931e1cce799344a1c1ac9a7c28408de4c19bfa4127594a2ec7d
 DIST gnome-tweaks-40.0.tar.xz 251908 BLAKE2B 4280e7565da3f95d7bcd81ba874d2f15e8c3834ab052cb4cf7cde8060eaea016670acf6f441d2cbce4b7566ba0bb7a7f9666b257893bc7b22b1cdc4d5a0edee2 SHA512 c3467f40af6bb79c2b10cb429e93aa29261066c2a5fd744bf2801c4e596cc270d45302ebfa942ee0c40067849c12e1ccd404c40e7f594bcff4c44cfe3f90bb97
-EBUILD gnome-tweaks-3.34.1.ebuild 1266 BLAKE2B 1fd2dcfade422e0b1cc4e79307a82c1c0d6c265c25c36ae6daf279bf8c7e8303a8f80f9bc68387e2b1a01b35bf924ea5dd3e7af1e7d9271c4d41d224a55be65a SHA512 058336d23e6fa7c8612ff9bc6c83e9bcde71495a8183ac41e6af9115ca06d59a0999057053852cb83cc90176ff5689653238022d68900b9104a3d3a002b2c71b
-EBUILD gnome-tweaks-40.0.ebuild 1229 BLAKE2B 4ecff75ea4caee1342c1173fd57aa0f507a05702df58808f69e39a22bb7aefc8b2e2a87b4c955c24436f53f2b29f6256e8a055082d217be2a3728180d29c6189 SHA512 2ad0bd9a05439fcb2f937cda44464e5b3e55a5ba35b1e41ed6c0a8681a15243b38759b3fd76afe88e326f69519b0226a3884205290358c14fc2dc4f9928e3ade
+EBUILD gnome-tweaks-40.0.ebuild 1227 BLAKE2B 50ce2441e4bd9f6726a398dfbe153119981bc8705a913ebedb98613d13457d867de3d2b6e8fe9483093f1a5553a8c374f1b20a2b4225cacd8e5360f19fbff58b SHA512 57496151b37405d1e8ebccb5914da0867e7d17a12831d82a6c30ea41cd44e9707bea99b9e0f082fdb7d01d9bcba0e8cbf5d7c807f30aad494d44f50d05c9305b
 MISC metadata.xml 556 BLAKE2B 0964398067f54577410c361418ce6f70d1afc4e1f064e3f67a1b3b6a7d37489124b7405f75c1bda57f0f25f74bc0b6ae144a4d5e04fd29bf1d180b5b4245a1a6 SHA512 1e6abce7e7e566d0c382956311c35ce9d70d044c8ee672103dc443eddcd7492e7bb4940b889213dfd7b49accce41269d820bb0b39d32e81857e3c6775609f67d
diff --git a/gnome-extra/gnome-tweaks/files/3.34.0-fix-python.patch b/gnome-extra/gnome-tweaks/files/3.34.0-fix-python.patch
deleted file mode 100644
index 8845a0d26ca9..000000000000
--- a/gnome-extra/gnome-tweaks/files/3.34.0-fix-python.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 024bf6cbccc4ceb9c1e8243f43df225f5dff9098 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 29 Mar 2020 16:05:36 +0300
-Subject: [PATCH] build: Fix python files installation handling
-
-The deprecated meson python3 module tends to end up installing only
-to a python version that meson is installed for too, possibly
-breaking some expectations downstream that want it installed to
-a specific python3 version, that might not match what the build
-machine uses for meson.
-Fix it by using the non-deprecated python module and methods from it.
-
-The python module exists since 0.46, which should be safe to require
-by now. There were meson 0.50 features used already, but unnecessarily,
-as the configure_file install parameter was added then, but all versions
-default to `true` anyhow. However in practice this only emitted a
-warning with newer meson versions and was able to build fine with older
-versions too. However fix it too, so that we are now warning-free for
-meson features after raising of the meson version dep.
----
- gtweak/meson.build |  5 ++---
- meson.build        | 10 +++++++---
- 2 files changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/gtweak/meson.build b/gtweak/meson.build
-index 3d9a743..4e558b4 100644
---- a/gtweak/meson.build
-+++ b/gtweak/meson.build
-@@ -11,7 +11,6 @@ configure_file(
-   input: 'defs.py.in',
-   output: 'defs.py',
-   configuration: defs_conf,
--  install: true,
-   install_dir: gtweakdir
- )
- 
-@@ -46,5 +45,5 @@ tweak_sources = [
-   'tweaks/tweak_wacom.py',
- ]
- 
--install_data(shell_sources, install_dir: gtweakdir)
--install_data(tweak_sources, install_dir: gtweakdir + '/tweaks')
-+python3.install_sources(shell_sources, subdir: 'gtweak')
-+python3.install_sources(tweak_sources, subdir: join_paths('gtweak', 'tweaks'))
-diff --git a/meson.build b/meson.build
-index cffa8af..60141c5 100644
---- a/meson.build
-+++ b/meson.build
-@@ -5,7 +5,12 @@ project('gnome-tweaks',
- 
- gnome = import('gnome')
- i18n = import('i18n')
--python3 = import('python3')
-+pymod = import('python')
-+python3 = pymod.find_installation('python3')
-+
-+if not python3.found()
-+    error('No valid python3 installation found')
-+endif
- 
- prefix = get_option('prefix')
- 
-@@ -13,13 +18,12 @@ bindir = join_paths(prefix, get_option('bindir'))
- datadir = join_paths(prefix, get_option('datadir'))
- libexecdir = join_paths(prefix, get_option('libexecdir'))
- localedir = join_paths(prefix, get_option('localedir'))
--pythondir = join_paths(prefix, python3.sysconfig_path('purelib'))
- 
- pkgdatadir = join_paths(datadir, meson.project_name())
- 
- appdatadir = join_paths(datadir, 'metainfo')
- desktopdir = join_paths(datadir, 'applications')
--gtweakdir = join_paths(pythondir, 'gtweak')
-+gtweakdir = python3.get_install_dir(subdir: 'gtweak')
- icondir = join_paths(datadir, 'icons', 'hicolor')
- schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
- 
--- 
-2.26.2
-
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.1.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.1.ebuild
deleted file mode 100644
index 1590ddd10d26..000000000000
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit gnome.org meson python-single-r1 xdg
-
-DESCRIPTION="Customize advanced GNOME 3 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 ~ppc ~ppc64 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_MULTI_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:0.0[introspection]
-	net-libs/libsoup:2.4[introspection]
-	x11-libs/libnotify[introspection]
-
-	>=gnome-base/gsettings-desktop-schemas-3.33.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}"/3.34.0-fix-python.patch
-)
-
-src_install() {
-	meson_src_install
-	python_optimize
-	python_fix_shebang "${ED}"/usr/bin/
-}
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild
index 127de63566b9..4595dba16af3 100644
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 DEPEND="${PYTHON_DEPS}"
 # See README.md for list of deps