gentoo resync : 22.12.2021

5 files changed, 11 insertions, 89 deletions

diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 2efb867a566f..623c77ac7f3b 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,10 +1,8 @@
 AUX 3.32.2-optional-introspection.patch 1376 BLAKE2B de57d769aab0cdc6a7fda25c0265f34d5d0fd555ae60a519273512021cf4f065db1e22ab72ce9004a914a47d077551b5a12ffbd5e81a9b8cf098a4762a0e461d SHA512 ea76e41aff067281497b98c86b66d8c382124ceead5b18e729342615a50b6aa3401f4d7c5553023b5d78ca0ea02823c7d6026ba9acca862804351269e4107d18
-DIST gnome-desktop-40.2.tar.xz 721852 BLAKE2B a7258d0465b17c5c9c78a066acd72571c002054f196d847e07b10055b1d72900d6efc80ac623f118ff11a87a4d5042ac9902f7f3f9d5a181ad3d80429cf9f904 SHA512 2fd3ba5eb0263aecc43978d84070619c16af4de998b344bc2aaac16aa0e734d93235aa218c2684ad993b471136434b97dffae52f183798daaa4ec47574cc51b3
-DIST gnome-desktop-40.3.tar.xz 721788 BLAKE2B bfdb77995d8cb392805a9d4a7a1276608aa53ea7c73604b12817c1660176c4e0274ba6954523cd0bec067230520c2736ed77885726696e463c97d09992186243 SHA512 96f2069ec3eb1bd1f6c2056c73d268eed5521398818cc05c22cdedfd1c09805fe5abc7f450abc7752690e809f3bdca502dfc107564236bbb03e262531418804f
-DIST gnome-desktop-40.4.tar.xz 721840 BLAKE2B f663460ce6a2b2d03543e92eab9e2f127da4a7c8e800149842f5f30e4f885c104786806be8e8f32e0783003b18015d39b4501f3ceccdee0ab94206031bf671b4 SHA512 4e91438c17faa2d12e7d6a9914fe4308543bbd5f8821e94dee9052f087110e2a3776109c203de6ef7bf66ae1825fc5e890d969ce2ebab2654cc157e9629fe6fc
 DIST gnome-desktop-40.5.tar.xz 722316 BLAKE2B 1f2e214eaea74295c892a465f767d29175ac0719a66d8d5b60b924c448f7b8317d3f9e23361d65b4d171018edd206dce764c38545a716ad9c83f20214fe5c4e9 SHA512 a65bf42be69d04efd80da6a8c8b08c4adc09db1c6627b93d4eecc3396376bc4407bfad914fc131d16d78b3b3263e635c925ed3dcff92af069525f809bea21afc
-EBUILD gnome-desktop-40.2.ebuild 1947 BLAKE2B 8b2233b157b3b50cb779149e18d46a14b5f2d4c6492f10d55767e4bc444bbc9bbf0b2eadbb10b8333b02675ffa2931ead810343f99b1ae5efa7adf71f45f89e6 SHA512 fe87b2876286c3d550bc9d353c5b347dc99d5a8f261e09514885798cb796ce2ec8917dd9652cd65631bd00e34d67da42a5bdd4c0c58ddfd2a0bdc6e1fc49b5b2
-EBUILD gnome-desktop-40.3.ebuild 1947 BLAKE2B 8b2233b157b3b50cb779149e18d46a14b5f2d4c6492f10d55767e4bc444bbc9bbf0b2eadbb10b8333b02675ffa2931ead810343f99b1ae5efa7adf71f45f89e6 SHA512 fe87b2876286c3d550bc9d353c5b347dc99d5a8f261e09514885798cb796ce2ec8917dd9652cd65631bd00e34d67da42a5bdd4c0c58ddfd2a0bdc6e1fc49b5b2
-EBUILD gnome-desktop-40.4.ebuild 1954 BLAKE2B 62c0f3a6ddf310f9080f80796e7286978d16e01b31647a0e0a9420e92ca6d95d100b03c88a6f68cd73a706e30d9d9b9105e9d90a73dfc41cb560d6117bb6545f SHA512 9cb70ccced6d748c6a293ef2568ea7a36ffd5fd553db859055ae06ea7bf2df092211fb678831d96a65e50ba0cb027b7e97058c8ae45cf14b9b1aa058385f35b6
-EBUILD gnome-desktop-40.5-r1.ebuild 1938 BLAKE2B 6d8c0468b7761d029ebb79d788a0a38daf1f547735871aa8593ef55b91de1021772c6e3889e769244e3deeece5e7a1af50f6392680169dd04a886469ed3bd560 SHA512 4c51e1809f827a833e9129a8f42aa6401a78a1b6d4b9aafe5e2318faa077fcaad6d4b68f47c695e5c84f81464263996e789304fc10dfcdde9506692ca7127b61
+DIST gnome-desktop-40.6.tar.xz 722388 BLAKE2B b13fbf4ba6c38a5b26f3275b973f834d41416f7163ccf192a20fc9092af8021d5a9ba34a7a44141b1f6f61a890fee1d3e4a89b047bd0b27c42d4296a98ca88a2 SHA512 0e1bd2c1add0485d6c6cdaf1ba816ad4cbe1dd338d494ff90b09f2ac8cef140433c136b4be4e6832478e4880fb8bfbf3cc931b3925cad29b64eca4573d6c4498
+DIST gnome-desktop-41.2.tar.xz 732788 BLAKE2B 5ae560fb31166db0fff56c3c3afd13a5890a540a748ba0602cee7a2f129facd023104198600379415a8f00f6edf1eba670769810cc0542e4c75dc1deb4da0f57 SHA512 1a520c84f7a781c59bfd8499c87c7049044a59b87033fac078c4a255c8bcaf79f9b614ad20985ea19c245424bb1972af744ad66fdafa5501800ad342b60fb531
+EBUILD gnome-desktop-40.5-r1.ebuild 1935 BLAKE2B 655bb10eb13bbb63ce08593677d7f4f9a253d3c75c42b2207c1c46c34947738a9441fb62ccd3d4481ac349c72d179795aaa01ec7197bcc5984064659ed51d3c7 SHA512 2d49209f19c7ec946b4388ae4b137fdc8c83efd0817e5f88b9c7026657ed6104829fb0a42cf3b8831269d9974a3f1cbb96371796c2ed4d6c4face250df4356fa
+EBUILD gnome-desktop-40.6.ebuild 1938 BLAKE2B 6d8c0468b7761d029ebb79d788a0a38daf1f547735871aa8593ef55b91de1021772c6e3889e769244e3deeece5e7a1af50f6392680169dd04a886469ed3bd560 SHA512 4c51e1809f827a833e9129a8f42aa6401a78a1b6d4b9aafe5e2318faa077fcaad6d4b68f47c695e5c84f81464263996e789304fc10dfcdde9506692ca7127b61
+EBUILD gnome-desktop-41.2.ebuild 1925 BLAKE2B b0c99ca78d26c9993bcf2069ff43e3379908d7094e1347e39731264a8e3473769df7dab835c70f359bca14b253ef6d367963f8c126435343d88e70a51a20ce1b SHA512 05a9b9d4250c5b97300269410d591576b9bd38dfb8d8abd0617facbee1ad7738f37ed02a84b39a3957b8deeffe1dc2b06fcf945bc77bef50c28b5005a1863cf6
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gnome-base/gnome-desktop/gnome-desktop-40.4.ebuild b/gnome-base/gnome-desktop/gnome-desktop-40.4.ebuild
deleted file mode 100644
index 7881aafc22c4..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-40.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Library with common API for various GNOME modules"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
-SLOT="3/19" # subslot = libgnome-desktop-3 soname version
-IUSE="debug gtk-doc +introspection seccomp systemd udev"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
-	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
-	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
-	>=dev-libs/glib-2.53.0:2
-	>=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
-	x11-misc/xkeyboard-config
-	x11-libs/libxkbcommon
-	app-text/iso-codes
-	systemd? ( sys-apps/systemd:= )
-	udev? (
-		sys-apps/hwids
-		virtual/libudev:= )
-	seccomp? ( sys-libs/libseccomp )
-
-	x11-libs/cairo:=
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${COMMON_DEPEND}
-	media-libs/fontconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	seccomp? ( sys-apps/bubblewrap )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	gtk-doc? ( >=dev-util/gtk-doc-1.14 )
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	x11-base/xorg-proto
-	virtual/pkgconfig
-"
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
-
-PATCHES=(
-	"${FILESDIR}"/3.32.2-optional-introspection.patch # add introspection meson option
-)
-
-src_prepare() {
-	# Don't build manual test programs that will never get run
-	sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dgnome_distributor=Gentoo
-		-Ddate_in_gnome_version=true
-		-Ddesktop_docs=true
-		$(meson_use debug debug_tools)
-		$(meson_use introspection)
-		$(meson_feature udev)
-		$(meson_feature systemd)
-		$(meson_use gtk-doc gtk_doc)
-		-Dinstalled_tests=false
-	)
-	meson_src_configure
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-40.5-r1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-40.5-r1.ebuild
index 4d52f427709e..61eeba43c70a 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-40.5-r1.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-40.5-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
 SLOT="3/19" # subslot = libgnome-desktop-3 soname version
 IUSE="debug gtk-doc +introspection seccomp systemd udev"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 COMMON_DEPEND="
 	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
diff --git a/gnome-base/gnome-desktop/gnome-desktop-40.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-40.6.ebuild
index e42379bab2e0..4d52f427709e 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-40.2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-40.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
 SLOT="3/19" # subslot = libgnome-desktop-3 soname version
 IUSE="debug gtk-doc +introspection seccomp systemd udev"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 COMMON_DEPEND="
 	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
@@ -21,9 +21,7 @@ COMMON_DEPEND="
 	x11-libs/libxkbcommon
 	app-text/iso-codes
 	systemd? ( sys-apps/systemd:= )
-	udev? (
-		sys-apps/hwids
-		virtual/libudev:= )
+	udev? ( virtual/libudev:= )
 	seccomp? ( sys-libs/libseccomp )
 
 	x11-libs/cairo:=
diff --git a/gnome-base/gnome-desktop/gnome-desktop-40.3.ebuild b/gnome-base/gnome-desktop/gnome-desktop-41.2.ebuild
index e42379bab2e0..2c2f814e2db1 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-40.3.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-41.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome.org gnome2-utils meson xdg
+inherit gnome.org meson xdg
 
 DESCRIPTION="Library with common API for various GNOME modules"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
 SLOT="3/19" # subslot = libgnome-desktop-3 soname version
 IUSE="debug gtk-doc +introspection seccomp systemd udev"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 COMMON_DEPEND="
 	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
@@ -21,9 +21,7 @@ COMMON_DEPEND="
 	x11-libs/libxkbcommon
 	app-text/iso-codes
 	systemd? ( sys-apps/systemd:= )
-	udev? (
-		sys-apps/hwids
-		virtual/libudev:= )
+	udev? ( virtual/libudev:= )
 	seccomp? ( sys-libs/libseccomp )
 
 	x11-libs/cairo:=