gentoo resync : 21.06.2020

4 files changed, 2 insertions, 167 deletions

diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 2d6dbdb8c8dc..8b5c2178fb9a 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,10 +1,6 @@
-AUX 3.32.2-fix-tests-without-locale.patch 2883 BLAKE2B 437a89de9d59781e0a3d6ceb46401abb8cca1d0325ace9f081b90f8e32c81ee283c3062e53a107129f00716d30e3ecc48df8be9889d7828bfcd0d4f38dc27622 SHA512 a33ed8fab6b4c0dba96250aabe56075e2f3ded3354f533e23dd9a222981d351a9900f7d3cf3427a2f24912ff78e843a5f08e9aaf94d71a16c7e81e99e08a8d81
 AUX 3.32.2-optional-introspection.patch 1376 BLAKE2B de57d769aab0cdc6a7fda25c0265f34d5d0fd555ae60a519273512021cf4f065db1e22ab72ce9004a914a47d077551b5a12ffbd5e81a9b8cf098a4762a0e461d SHA512 ea76e41aff067281497b98c86b66d8c382124ceead5b18e729342615a50b6aa3401f4d7c5553023b5d78ca0ea02823c7d6026ba9acca862804351269e4107d18
-DIST gnome-desktop-3.32.2-patchset.tar.xz 7404 BLAKE2B ecc821d3338957d0a123d625607d727019d9500915a76ff6d10d3000e1fc1e51fc7c0382374752582aef641d005cd73d39148466b08c53dc1ce9872e73a21215 SHA512 0471f0a6d9213ea60e867bd4f381575f6a94fa0fde57cc1a360e2d4ef98c11f2f973d3d95347db8f24aacb2249ba84ffc4e35e05bb595d9d3b6debe561ed88da
-DIST gnome-desktop-3.32.2.tar.xz 709128 BLAKE2B f0335d1ad583f0b000c47826cd4b6eb24624862b22b00e9d42759ed1cfcf3dba6f091dd85504c9c8da8b9789bf78cf53d284942ba6e2d3c630db028b4a0a69c6 SHA512 7dfa5c3e4b77637cc40e6244eb8ce8cb314cf92d865b64e36c5dffa8a699e91c81bd359f0a89a725c064eafec965d2b9d119aa05f1de103cd836a4bff9119a99
 DIST gnome-desktop-3.34.5.tar.xz 718008 BLAKE2B a09daf4f575b26774beeef8e9edb4ed757ead7c0155aab4d7c132bf503d29096c40b06d52aa261594c6db367ac7a638c33de4445748ab3d94a095c23f8ddd705 SHA512 bc59b420d5698b15697404efcf452e830933efa23b6dba9011eade1c7521dbd4fb6f6e6e2be822d231611b2133e36f2ec42ed49ecabd175127366e0e7d59955c
-DIST gnome-desktop-3.34.6.tar.xz 718144 BLAKE2B 7379f45b7028ed16f4f707b82adfd1c95150791da9988ff52f3b49a9be68effefc04e32512fb4316368d695ae531afd8ad58168214e483fd0164b45a2de7f1d1 SHA512 a4e6c8ec1f5cea785bc58635dc72dae39a0a118db5433a02919c8fd3c4f7276d6f1093e8f52b1def5756c161effbedce20c6dcfe282a5a3d2458acc82af60aa5
-EBUILD gnome-desktop-3.32.2.ebuild 2251 BLAKE2B 4db77f0b8ee01c122943d3e9f3cfff22d1d2a626066588308b9750bde7ffdc6854f93af56f5de9b6ab9d2e8e6f7b9eb2d82aa573a9ec1901722efbd6667bc2c7 SHA512 c39916311e8b2b49dce90c9d122a4cd92732f1b0f2d41212a8ad1f4ea4b406d24480d93b9cc80999369324dd48310d11ebb3f51b41de4f7e55aac3597a2ee75f
+DIST gnome-desktop-3.34.7.tar.xz 718220 BLAKE2B 89bfd00a356cd47d865aa4df1079b37b08c6a85f4380b5424181ce247248c7f11f0ca135858afb0c00fc4ff47175ff2acbb0b67cebe75e0b0a9f27263f0a9d69 SHA512 efc466d2a7a8a142e76a07c8cb75bad51aafbb2e70432e339713965890e6a83554a5f77ef6cdb6aa9e3ebace4883fb6d3d06004d7a2446d6960319cacbec7639
 EBUILD gnome-desktop-3.34.5.ebuild 2022 BLAKE2B 67eb2266a63db598d5fa7fe26a7f8ca9206335685c310d821da32c5bd47319aafd703e4f12353310776098734eb5496e3842c20ed3dff55213843ed3eb1037b1 SHA512 0a32a031cb21a1b977997aa498edae51979674b01f15cf79f8876e3dca0e6498280eab2242a0fd948b1a7443239fc87d69113ca6b3b8b103f32dab5bba889301
-EBUILD gnome-desktop-3.34.6.ebuild 2025 BLAKE2B d6d578b59bc7154ca8d5e5c452c4fb96c187f4e9c5cb8d33de6a443d83f410a9b027aec5352a70ce46aeb681495f414ce51fe03b95b837c4487fb57f8012a493 SHA512 14d7eac731b31f23346dadbcc00eb7f3a99da34a085a278fd3c1ce7f46bae40d75ce5eb9c7567fe603c31b15520fa873806d7777e5f5fd6376c26f60b86a082e
+EBUILD gnome-desktop-3.34.7.ebuild 2025 BLAKE2B d6d578b59bc7154ca8d5e5c452c4fb96c187f4e9c5cb8d33de6a443d83f410a9b027aec5352a70ce46aeb681495f414ce51fe03b95b837c4487fb57f8012a493 SHA512 14d7eac731b31f23346dadbcc00eb7f3a99da34a085a278fd3c1ce7f46bae40d75ce5eb9c7567fe603c31b15520fa873806d7777e5f5fd6376c26f60b86a082e
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-base/gnome-desktop/files/3.32.2-fix-tests-without-locale.patch b/gnome-base/gnome-desktop/files/3.32.2-fix-tests-without-locale.patch
deleted file mode 100644
index bd4df1ca1a91..000000000000
--- a/gnome-base/gnome-desktop/files/3.32.2-fix-tests-without-locale.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 9ae847ec875efe443d51d584fa6c61966c7c3c7c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
-Date: Wed, 4 Sep 2019 22:09:26 +0100
-Subject: [PATCH] tests/wall*: Do not fail if some of the locales is missing
-
----
- tests/wall-clock.c        | 14 ++++++++++++++
- tests/wallclock-reftest.c |  5 +++++
- 2 files changed, 19 insertions(+)
-
-diff --git a/tests/wall-clock.c b/tests/wall-clock.c
-index 4937ee66..23929ebd 100644
---- a/tests/wall-clock.c
-+++ b/tests/wall-clock.c
-@@ -48,6 +48,7 @@ test_utf8_character (const char *utf8_char,
- 	/* In the C locale, make sure the time string is formatted with regular
-          * colons */
- 	locale = newlocale (LC_ALL_MASK, "C", (locale_t) 0);
-+	g_assert_true (locale != (locale_t)0);
- 	save_locale = uselocale (locale);
- 	clock = gnome_wall_clock_new ();
- 	str = gnome_wall_clock_string_for_datetime (clock,
-@@ -60,6 +61,10 @@ test_utf8_character (const char *utf8_char,
- 
- 	/* In a UTF8 locale, we want ratio characters and no colons. */
- 	locale = newlocale (LC_ALL_MASK, "en_US.utf8", locale);
-+	if (locale == (locale_t)0) {
-+		g_test_skip("en_US.utf8 locale not found, skipping");
-+		return;
-+	}
- 	uselocale (locale);
- 	clock = gnome_wall_clock_new ();
- 	str = gnome_wall_clock_string_for_datetime (clock,
-@@ -73,6 +78,10 @@ test_utf8_character (const char *utf8_char,
- 	/* ... and same thing with an RTL locale: should be formatted with
-          * ratio characters */
- 	locale = newlocale (LC_ALL_MASK, "he_IL.utf8", locale);
-+	if (locale == (locale_t)0) {
-+		g_test_skip("he_IL.utf8 locale not found, skipping");
-+		return;
-+	}
- 	uselocale (locale);
- 	clock = gnome_wall_clock_new ();
- 	str = gnome_wall_clock_string_for_datetime (clock,
-@@ -112,6 +121,10 @@ test_clock_format_setting (void)
- 	const char *str;
- 
- 	locale = newlocale (LC_ALL_MASK, "en_US.utf8", (locale_t) 0);
-+	if (locale == (locale_t)0) {
-+		g_test_skip("en_US.utf8 locale not found, skipping");
-+		return;
-+	}
- 	save_locale = uselocale (locale);
- 
- 	settings = g_settings_new ("org.gnome.desktop.interface");
-@@ -192,6 +205,7 @@ test_weekday_setting (void)
- 
- 	/* Save current locale */
- 	locale = newlocale (LC_ALL_MASK, "C", (locale_t) 0);
-+	g_assert_true (locale != (locale_t)0);
- 	save_locale = uselocale (locale);
- 	settings = g_settings_new ("org.gnome.desktop.interface");
- 
-diff --git a/tests/wallclock-reftest.c b/tests/wallclock-reftest.c
-index 8ac630f2..0a7e812d 100644
---- a/tests/wallclock-reftest.c
-+++ b/tests/wallclock-reftest.c
-@@ -446,6 +446,11 @@ test_ui_file (GFile         *file,
-   locale = get_locale_for_file (ui_file);
-   g_assert (locale);
-   loc = newlocale (LC_ALL_MASK, locale, (locale_t) 0);
-+  if (loc == (locale_t)0)
-+    {
-+      g_test_skip("locale not found, skipping");
-+      return;
-+    }
-   previous_locale = uselocale (loc);
-   g_assert_true (previous_locale != (locale_t) 0);
- 
--- 
-2.20.1
-
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild
deleted file mode 100644
index cee93712f2cc..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="Library with common API for various GNOME modules"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
-SLOT="3/17" # subslot = libgnome-desktop-3 soname version
-IUSE="debug gtk-doc +introspection seccomp udev"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-# cairo[X] needed for gnome-bg
-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
-	app-text/iso-codes
-	x11-libs/libX11
-	udev? (
-		sys-apps/hwids
-		virtual/libudev:= )
-	seccomp? ( sys-libs/libseccomp )
-
-	x11-libs/cairo:=[X]
-	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=(
-	# Translation updates and nvidia builtin display detection fix from origin/gnome-3-32
-	"${WORKDIR}"/patches/
-	"${FILESDIR}"/${PV}-optional-introspection.patch # add introspection meson option
-	"${FILESDIR}"/${PV}-fix-tests-without-locale.patch # fix tests when he_IL.utf8 or other tested locales not present
-)
-
-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_use gtk-doc gtk_doc)
-		-Dinstalled_tests=false
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.34.6.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.34.7.ebuild
index 5018ba92f323..5018ba92f323 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.34.6.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.34.7.ebuild