gentoo resync : 14.07.2018

6 files changed, 286 insertions, 0 deletions

diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
new file mode 100644
index 000000000000..6d8bf2de2f9f
--- /dev/null
+++ b/gnome-base/gnome-desktop/Manifest
@@ -0,0 +1,7 @@
+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.24.2.tar.xz 1064808 BLAKE2B 8574d26f2c2adedd7a287651fb34170e75d1744ad14e6caab8ede87af63b93197bcf4cde60dd9f6352dae8ae7bf8d598d0b24588d3a06cc2192c651b58577562 SHA512 691817fda97fc1c560c72213668eb4c2a8d03cc2433470a78149b3f785e95d9b4b681bceb733a67e1bfda649a6aed7ca4569b4891ee89f824a28d7a95f2782c2
+EBUILD gnome-desktop-2.32.1-r2.ebuild 2296 BLAKE2B fbd9347c8215cc512b0a510da35b4e12425f7c33a40a6081f714ba3cf4d71eabf66c27c230eb08147d9c56c1d15ac9586c7ecaa894baffc6721fbba35bcda062 SHA512 427f8dca28ce505920a02e0f540b3c311baff2fc03dcac908d07d4d4e463f70dbb3b642ae53129ff7c4a2892efc34ca84683316cb15f493c89968ed390e4b74e
+EBUILD gnome-desktop-3.24.2.ebuild 1602 BLAKE2B da62b47e959d77b54a023ff873e3f1ddc3192b8c035e92be21b3346acd8c9feb0d92abab59e25a958894a01baadf8eb537d3d40f0f32b43856c74c79a17b9876 SHA512 67fec7204f36afb1e32f7dbfa9023cbf4621811d6a5b82f48d5e65e2d8e5e5d648285544eeecc28be4099fe0f5b5ab41bde449730b8dd6214218c3a36e87fec8
+MISC metadata.xml 354 BLAKE2B f3504e89fa723ab0e4856f88e088fe1a3eff2bfee9635ffaae7404eff28b0090a636a9d9441e27dea8a3a62e980537636cf696097c946908554730ba12f1c358 SHA512 bfd7555f171ffd08174b134d34475d1dd40e6d325d188dd0a631d82d85836d92900a3ac641c6b200654ecdcd76371d7bbb4c3e34c4ee8b8410e8c6d8503a5bea
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
new file mode 100644
index 000000000000..2e845da46e5b
--- /dev/null
+++ b/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-gold.patch
@@ -0,0 +1,16 @@
+ 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
new file mode 100644
index 000000000000..583d7274379a
--- /dev/null
+++ b/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-thumbnails.patch
@@ -0,0 +1,118 @@
+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
new file mode 100644
index 000000000000..dbcd5ea476d1
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 ~sh sparc x86 ~x86-fbsd ~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_export_best
+	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.24.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.24.2.ebuild
new file mode 100644
index 000000000000..23ef79b6f8aa
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.24.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 virtualx
+
+DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
+HOMEPAGE="https://git.gnome.org/browse/gnome-desktop"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="3/12" # subslot = libgnome-desktop-3 soname version
+IUSE="debug +introspection udev"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
+
+# cairo[X] needed for gnome-bg
+COMMON_DEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.44.0:2[dbus]
+	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
+	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
+	x11-libs/cairo:=[X]
+	x11-libs/libX11
+	x11-misc/xkeyboard-config
+	>=gnome-base/gsettings-desktop-schemas-3.5.91
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+	udev? (
+		sys-apps/hwids
+		virtual/libudev:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.40.6
+	dev-util/itstool
+	sys-devel/gettext
+	x11-base/xorg-proto
+	virtual/pkgconfig
+"
+
+# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--with-gnome-distributor=Gentoo \
+		--enable-desktop-docs \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable debug debug-tools) \
+		$(use_enable introspection) \
+		$(use_enable udev)
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/gnome-base/gnome-desktop/metadata.xml b/gnome-base/gnome-desktop/metadata.xml
new file mode 100644
index 000000000000..65b08cd27572
--- /dev/null
+++ b/gnome-base/gnome-desktop/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<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>