gentoo resync : 25.04.2020

6 files changed, 3 insertions, 219 deletions

diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 1c8b12550c10..a8e90bbde02d 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,14 +1,10 @@
 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
-AUX gnome-desktop-2.32.1-gold.patch 493 BLAKE2B 4a7e5a1d834bb2a8f753e279a96875a34e25126a4a51167a37bcc2d749e1c28694bc53ee32ffe5490e20f6dc1a4f82e9201b5d9753928119be2ff2f3e19ba53b SHA512 1ceb79f150cc271547766044277cb38c45cb8ebaab9edaf5fd7bfc29ed25920c80d4a0331fdc6ed91f5b47cb51d820270714d72d3bec7cd55939f1a1ef7a9c0b
-AUX gnome-desktop-2.32.1-thumbnails.patch 3530 BLAKE2B 5ebed12840808f13e8116ff6e55c08269813dcc5f6acd863c2f845b75efb1879c36539c7690e9812ed034a4756da6b04bd271ecd9f3f07e22831edd6c7e81734 SHA512 8683aae51ba9a97074442b226d24267857d64a911608fc1c8a207fadc69222583c26281d4c16dddfbf7c975eb76fc6d5c08291ff594468dbee6dd92ef0313263
-DIST gnome-desktop-2.32.1.tar.bz2 1633847 BLAKE2B 9c69504b0f904fe04bdaa2e2fd3c6fbdd0cdd67033bae6e21377cce2deb68f05ed85bc735547c036923978ebdb8952c262676a01a33f8d7acffb0b964f97366a SHA512 b8084d08366dab661a7ee369cd03ba62beddbdfa9a36b988b7d13d207b33d6916f7fa8691717fba7b6a70d8276779e35360b1dc385e6ec876f30ea7b8b373c28
 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.4.tar.xz 715280 BLAKE2B 34ee3d4a36e7b8212d5285f766b030ae9369ec99be90dbf86a10f6b6727f221770c43db012c9e4634b8c95c7ffb97d435fb3555b1bc184ec4127538ba6ab261b SHA512 de3ac71725f4cc55b22af4f6f04516d9a5cbdd27876f302fc78c864c1461e444967de3dae3a6944124b33335c9e6f4f96b9de63053c582917509b90844acbe3f
 DIST gnome-desktop-3.34.5.tar.xz 718008 BLAKE2B a09daf4f575b26774beeef8e9edb4ed757ead7c0155aab4d7c132bf503d29096c40b06d52aa261594c6db367ac7a638c33de4445748ab3d94a095c23f8ddd705 SHA512 bc59b420d5698b15697404efcf452e830933efa23b6dba9011eade1c7521dbd4fb6f6e6e2be822d231611b2133e36f2ec42ed49ecabd175127366e0e7d59955c
-EBUILD gnome-desktop-2.32.1-r2.ebuild 2275 BLAKE2B f8281ce2857d4908ab19bb131973c86eda9bf0f1fab550ef9bcfcb2d81a36938eb33abdfe2d3b36f301cef108aa18b785859397ea081a9b1a364cf2cdd822ab3 SHA512 a0786d20f581970dcc480ea0942d8064c13c5c489a0cddf2e30c11e97ab08a0c9783ecca443824e1b08102a4eff71fdd8d473bf522ab91bde0ecf92b8121a72f
 EBUILD gnome-desktop-3.32.2.ebuild 2251 BLAKE2B 4db77f0b8ee01c122943d3e9f3cfff22d1d2a626066588308b9750bde7ffdc6854f93af56f5de9b6ab9d2e8e6f7b9eb2d82aa573a9ec1901722efbd6667bc2c7 SHA512 c39916311e8b2b49dce90c9d122a4cd92732f1b0f2d41212a8ad1f4ea4b406d24480d93b9cc80999369324dd48310d11ebb3f51b41de4f7e55aac3597a2ee75f
 EBUILD gnome-desktop-3.34.4.ebuild 2025 BLAKE2B d6d578b59bc7154ca8d5e5c452c4fb96c187f4e9c5cb8d33de6a443d83f410a9b027aec5352a70ce46aeb681495f414ce51fe03b95b837c4487fb57f8012a493 SHA512 14d7eac731b31f23346dadbcc00eb7f3a99da34a085a278fd3c1ce7f46bae40d75ce5eb9c7567fe603c31b15520fa873806d7777e5f5fd6376c26f60b86a082e
-EBUILD gnome-desktop-3.34.5.ebuild 2025 BLAKE2B d6d578b59bc7154ca8d5e5c452c4fb96c187f4e9c5cb8d33de6a443d83f410a9b027aec5352a70ce46aeb681495f414ce51fe03b95b837c4487fb57f8012a493 SHA512 14d7eac731b31f23346dadbcc00eb7f3a99da34a085a278fd3c1ce7f46bae40d75ce5eb9c7567fe603c31b15520fa873806d7777e5f5fd6376c26f60b86a082e
-MISC metadata.xml 354 BLAKE2B f3504e89fa723ab0e4856f88e088fe1a3eff2bfee9635ffaae7404eff28b0090a636a9d9441e27dea8a3a62e980537636cf696097c946908554730ba12f1c358 SHA512 bfd7555f171ffd08174b134d34475d1dd40e6d325d188dd0a631d82d85836d92900a3ac641c6b200654ecdcd76371d7bbb4c3e34c4ee8b8410e8c6d8503a5bea
+EBUILD gnome-desktop-3.34.5.ebuild 2023 BLAKE2B b693bc00e37a4bcbbde69d8a90136b4f4738c4bb1f4c5e4882af2a10aff99c7f0e7adae5fa245aaa323d7418f82c519728bb4c3677c9608601f8424836847f1e SHA512 63e91f537de73f5263b553397e2851101fd75fa07db33b12d09f7b27f79afab460bf98cef6f475e0b35c3ef5e3494a99615af1cce9e4a44e39bcf5df5ddcb09b
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-gold.patch b/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-gold.patch
deleted file mode 100644
index 2e845da46e5b..000000000000
--- a/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-gold.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- libgnome-desktop/Makefile.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/libgnome-desktop/Makefile.in b/libgnome-desktop/Makefile.in
-index 39209f6..a57b09e 100644
---- a/libgnome-desktop/Makefile.in
-+++ b/libgnome-desktop/Makefile.in
-@@ -388,7 +388,7 @@ libgnome_desktop_2_la_SOURCES = \
- 
- libgnome_desktop_2_la_LIBADD = \
- 	$(XLIB_LIBS)		\
--	$(GNOME_DESKTOP_LIBS)
-+	$(GNOME_DESKTOP_LIBS) -lm
- 
- libgnome_desktop_2_la_LDFLAGS = \
- 	-version-info $(LT_VERSION) \
diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-thumbnails.patch b/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-thumbnails.patch
deleted file mode 100644
index 583d7274379a..000000000000
--- a/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-thumbnails.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-Originally from https://github.com/mate-desktop/mate-desktop/commit/fcede97471263b7f145ceeb988f569d4aa9129b8
-Ported to gnome-desktop by Matthew Turnbull <sparky@bluefang-logic.com>
-
-Fixes nautilus-2 thumbnailing with >=glib-2.34
-
-https://bugs.gentoo.org/show_bug.cgi?id=450930
-
-diff -rupN a/libgnome-desktop/gnome-desktop-thumbnail.c b/libgnome-desktop/gnome-desktop-thumbnail.c
---- a/libgnome-desktop/gnome-desktop-thumbnail.c
-+++ b/libgnome-desktop/gnome-desktop-thumbnail.c
-@@ -526,8 +526,13 @@ gnome_desktop_thumbnail_factory_lookup (
- 
-   file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL);
-   
-+#if GLIB_CHECK_VERSION (2, 34, 0)
-+  path = g_build_filename (g_get_user_cache_dir (),
-+			   "thumbnails",
-+#else
-   path = g_build_filename (g_get_home_dir (),
- 			   ".thumbnails",
-+#endif
- 			   (priv->size == GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL)?"normal":"large",
- 			   file,
- 			   NULL);
-@@ -587,8 +592,13 @@ gnome_desktop_thumbnail_factory_has_vali
- 
-   file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL);
- 
-+#if GLIB_CHECK_VERSION (2, 34, 0)
-+  path = g_build_filename (g_get_user_cache_dir (),
-+			   "thumbnails/fail",
-+#else
-   path = g_build_filename (g_get_home_dir (),
- 			   ".thumbnails/fail",
-+#endif
- 			   appname,
- 			   file,
- 			   NULL);
-@@ -917,12 +927,17 @@ make_thumbnail_dirs (GnomeDesktopThumbna
- 
-   res = FALSE;
- 
-+#if GLIB_CHECK_VERSION (2, 34, 0)
-+  thumbnail_dir = g_build_filename (g_get_user_cache_dir (),
-+				    "thumbnails",
-+#else
-   thumbnail_dir = g_build_filename (g_get_home_dir (),
- 				    ".thumbnails",
-+#endif
- 				    NULL);
-   if (!g_file_test (thumbnail_dir, G_FILE_TEST_IS_DIR))
-     {
--      g_mkdir (thumbnail_dir, 0700);
-+      g_mkdir_with_parents (thumbnail_dir, 0700);
-       res = TRUE;
-     }
- 
-@@ -951,12 +966,17 @@ make_thumbnail_fail_dirs (GnomeDesktopTh
- 
-   res = FALSE;
- 
-+#if GLIB_CHECK_VERSION (2, 34, 0)
-+  thumbnail_dir = g_build_filename (g_get_user_cache_dir (),
-+				    "thumbnails",
-+#else
-   thumbnail_dir = g_build_filename (g_get_home_dir (),
- 				    ".thumbnails",
-+#endif
- 				    NULL);
-   if (!g_file_test (thumbnail_dir, G_FILE_TEST_IS_DIR))
-     {
--      g_mkdir (thumbnail_dir, 0700);
-+      g_mkdir_with_parents (thumbnail_dir, 0700);
-       res = TRUE;
-     }
- 
-@@ -1025,8 +1045,13 @@ gnome_desktop_thumbnail_factory_save_thu
- 
-   file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL);
- 
-+#if GLIB_CHECK_VERSION (2, 34, 0)
-+  path = g_build_filename (g_get_user_cache_dir (),
-+			   "thumbnails",
-+#else
-   path = g_build_filename (g_get_home_dir (),
- 			   ".thumbnails",
-+#endif
- 			   (priv->size == GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL)?"normal":"large",
- 			   file,
- 			   NULL);
-@@ -1129,8 +1154,13 @@ gnome_desktop_thumbnail_factory_create_f
- 
-   file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL);
- 
-+#if GLIB_CHECK_VERSION (2, 34, 0)
-+  path = g_build_filename (g_get_user_cache_dir (),
-+			   "thumbnails/fail",
-+#else
-   path = g_build_filename (g_get_home_dir (),
- 			   ".thumbnails/fail",
-+#endif
- 			   appname,
- 			   file,
- 			   NULL);
-@@ -1221,8 +1251,13 @@ gnome_desktop_thumbnail_path_for_uri (co
-   file = g_strconcat (md5, ".png", NULL);
-   g_free (md5);
-   
-+#if GLIB_CHECK_VERSION (2, 34, 0)
-+  path = g_build_filename (g_get_user_cache_dir (),
-+			   "thumbnails",
-+#else
-   path = g_build_filename (g_get_home_dir (),
- 			   ".thumbnails",
-+#endif
- 			   (size == GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL)?"normal":"large",
- 			   file,
- 			   NULL);
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild
deleted file mode 100644
index c0b20f78db31..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
-HOMEPAGE="https://www.gnome.org/"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="license-docs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Note: gnome-desktop:2 and :3 install identical files in /usr/share/gnome/help
-# and /usr/share/omf when --enable-desktop-docs is passed to configure. To avoid
-# file conflict and pointless duplication, gnome-desktop:2[doc] will simply use
-# the files that are installed by :3[doc]
-# Note: depend on glib-2.34 to make sure users upgrade glib before gnome-desktop
-# to get a fix for bug #450930
-RDEPEND=">=x11-libs/gtk+-2.18:2
-	>=dev-libs/glib-2.34:2
-	>=x11-libs/libXrandr-1.2
-	>=gnome-base/gconf-2:2
-	>=x11-libs/startup-notification-0.5
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	>=app-text/gnome-doc-utils-0.3.2
-	~app-text/docbook-xml-dtd-4.1.2
-	x11-base/xorg-proto
-"
-PDEPEND=">=dev-python/pygtk-2.8:2[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-2.14:2[${PYTHON_USEDEP}]
-	license-docs? ( gnome-base/gnome-desktop:3[doc(+)] )
-"
-
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
-# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
-# eventually libXrandr shouldn't RDEPEND on randrproto)
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gold.patch
-	epatch "${FILESDIR}"/${P}-thumbnails.patch #450930
-	gnome2_src_prepare
-}
-
-src_configure() {
-	python_setup
-	gnome2_src_configure \
-		--with-gnome-distributor=Gentoo \
-		--disable-scrollkeeper \
-		--disable-static \
-		--disable-deprecations \
-		--disable-desktop-docs
-	# desktop-docs will be built by gnome-desktop:3
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	gnome2_src_install
-	# python-r1.eclass doesn't like versioned python shebangs
-	sed -e 's@#!\(.*python.*\)@#!/usr/bin/env python@' -i gnome-about/gnome-about
-	python_doscript gnome-about/gnome-about
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.34.5.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.34.5.ebuild
index 5018ba92f323..9c2f4df89f9d 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.34.5.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.34.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
 SLOT="3/18" # 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 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 # cairo[X] needed for gnome-bg
 COMMON_DEPEND="
diff --git a/gnome-base/gnome-desktop/metadata.xml b/gnome-base/gnome-desktop/metadata.xml
index 65b08cd27572..996e7cacd217 100644
--- a/gnome-base/gnome-desktop/metadata.xml
+++ b/gnome-base/gnome-desktop/metadata.xml
@@ -5,8 +5,4 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="license-docs">Install help files documenting GNOME's
-			licenses</flag>
-	</use>
 </pkgmetadata>