Fix thumbnailing failure with glib-2.34 (bug #450930, thanks to Matthew Turnbull and Pacho Ramos for the patch). Update to EAPI5 and python-r1.eclass.

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 214 insertions, 6 deletions

diff --git a/gnome-base/gnome-desktop/ChangeLog b/gnome-base/gnome-desktop/ChangeLog
index 57c859068fa3..54cf2a6f641f 100644
--- a/gnome-base/gnome-desktop/ChangeLog
+++ b/gnome-base/gnome-desktop/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-base/gnome-desktop
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.313 2013/06/09 19:34:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.314 2013/08/15 11:40:05 tetromino Exp $
+
+*gnome-desktop-2.32.1-r2 (15 Aug 2013)
+
+  15 Aug 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gnome-desktop-2.32.1-r2.ebuild,
+  +files/gnome-desktop-2.32.1-thumbnails.patch:
+  Fix thumbnailing failure with glib-2.34 (bug #450930, thanks to Matthew
+  Turnbull and Pacho Ramos for the patch). Update to EAPI5 and
+  python-r1.eclass.
 
 *gnome-desktop-3.8.3 (09 Jun 2013)
 
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 7b63816c6144..9489ce87204b 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -2,21 +2,27 @@
 Hash: SHA256
 
 AUX gnome-desktop-2.32.1-gold.patch 493 SHA256 6c7391376054199bfd57532e642c89b8a18396e12c79417549926e0b7e76bba6 SHA512 1ceb79f150cc271547766044277cb38c45cb8ebaab9edaf5fd7bfc29ed25920c80d4a0331fdc6ed91f5b47cb51d820270714d72d3bec7cd55939f1a1ef7a9c0b WHIRLPOOL 2ade696dfb67f6e12c4db3c1d82d85a22177a56eace8266ffc40d184e3c923c0b6c0d029a2733e783d8d012913cefd1e13feb2fc0a7b5f74dc75794ca84d4408
+AUX gnome-desktop-2.32.1-thumbnails.patch 3530 SHA256 3a2294ff8f8082d3be9d709efbc4757c518cbad57980cdc7f4efeef366a756bb SHA512 8683aae51ba9a97074442b226d24267857d64a911608fc1c8a207fadc69222583c26281d4c16dddfbf7c975eb76fc6d5c08291ff594468dbee6dd92ef0313263 WHIRLPOOL cb09db77b55cc34ed6a74babdeb0a71b7a3c8de0c3897615bf8a6dc3b037d5dfd4a56084a913855e5b97a0c12375c1c7941435d8e5385c0a683a5533983e8030
 DIST gnome-desktop-2.32.1.tar.bz2 1633847 SHA256 55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d SHA512 b8084d08366dab661a7ee369cd03ba62beddbdfa9a36b988b7d13d207b33d6916f7fa8691717fba7b6a70d8276779e35360b1dc385e6ec876f30ea7b8b373c28 WHIRLPOOL 0889e79b1b3956b0ef1330f661676b77bdb40e8110657ea7f4035618ea023fc4b35364629d68741f042c0b971db9fa4c7731065717612486f7546e07fe048a0d
 DIST gnome-desktop-3.6.3.tar.xz 969112 SHA256 4ba7e7db2a65e2cc867e885afa78e29d9a73cfbfc3bed91786198c486a6d1d0e SHA512 801960ab77c58e545cbabd73b3e1727e62c1254d0aa43da621f2a00f173a4ef827f0a846f15f96da209ee88c6a6296f2e827c0c04cf6addffc6b0b159b9e2a66 WHIRLPOOL 2d1a2d538adde84a56ca1edecde47db1160c388fbd3a0319ae169f4ddc854429854e26cf787e6e37ce3d28de380e5f203eed2a7b80df121aff17dd614ac09aaa
 DIST gnome-desktop-3.8.2.tar.xz 1010336 SHA256 af4ec330fa61ee761daf2d5e481e2f9ffbd068d135d5e31a3eaf274524cba33d SHA512 6ea9154692d2a5d5b959a2c172f91c08554b72fb12f8e92a97511978804557a7e28ac743ae6dfd2ae7029f02dc905dfafb21a5177c01cc0051a17290b21aab97 WHIRLPOOL a2caea4ff1c7259dc8a7e7933d15dbac9e23bf79d893533e61c917c7154f02c0a0dc2f94da41d85cde2e4b91e5a0a94efa01af9e3da85d12788f4424af4564f9
 DIST gnome-desktop-3.8.3.tar.xz 1030240 SHA256 c9c8d1888e28cb30e466be46909efe640fb3cb348909cae2664489508790e5a2 SHA512 f6849c1286b3fc86d94be5955bd18246aa4c2102045b3102f44dbb90c7819f71382cdd3f6330db33d5fff01a438987bb0957f743a05df1c61503f4776c192317 WHIRLPOOL 7fe90a46dcc44f99f24c6f4294959e92c547b3f54ce1affed7c99bd1988b0380a4b4e9cb797d0c049723d3dbfddd34ecc7b6d779cc4f339f239e29f95f37a486
 EBUILD gnome-desktop-2.32.1-r1.ebuild 2022 SHA256 162cbc3b81f63fb0725345b28f5800959aa39f62774928705ca324d2e50fff5b SHA512 b54d5a353e8aeb58fb89ac30c6a6868930ddf77071bca15346a7bac983add40fcd2e20a5be86dd2456edd7cd3ee0992d919f28325428f1aade68d2eb88d2e54e WHIRLPOOL b41e55b7cc1d6ee34f2ef2da47c39da192089711186eb65eebca7aa9a116a5c64b3306178f0590bb551dd82fe1adfee6f6d00bef864414a29e83766d3cf12de8
+EBUILD gnome-desktop-2.32.1-r2.ebuild 2442 SHA256 05bccd284fe72d889b0d163e8b1ee3086be8b8c967584bc4f74ad40d9790ed01 SHA512 6feaa80f337a0e594c8abe6223ce94528262a92d46aa54739522f7b3d2afd4988f6ee2a33c1e6357569e4ecda242e6a041351ec817fbe13bcfb8dc5da83d6999 WHIRLPOOL f79c8a8ed01aaef11e20ba2140a474521691277e4ed4fb9f8a9df979304ce20bff38e2bc10bf8cf05845c2ea82fb098b956beeeed83de850bb07ffd2c06397d2
 EBUILD gnome-desktop-2.32.1.ebuild 1678 SHA256 dd140c9a7ebadffbd846cdcf12063a90ab242a64834d34b0a8d3eeb90f531b6f SHA512 4f940e58e2863bdf8d0ad04cfdeb2f9bfbeb1ec79fc060e6e5b51fca0502d646f5fd8adc3647bd2dcc7ff345a2f3becc13613e32d534ed38fc78b0882e9fd7bf WHIRLPOOL 316bc8030374b6f6e6361af286c790b6fca3f42b7f470241ac6ee1614858aa97d3926a057fd764dfec700c347db65207799d29765ab8178a7f1a7f8c480640c6
 EBUILD gnome-desktop-3.6.3.ebuild 1988 SHA256 5cff9ff45e42dfb20bb3e07bd6b45c2248fdc1372fcba6db282a872edb4467d1 SHA512 669c9c656470c02dc0387dbaef238580ae12dba8d8c071b26a967c6c8af244804e6ebbcab0782ab635fc8903485cf2dcf7c7ecc0c4060b6e7675757c7fdab961 WHIRLPOOL 0fdc6c01d797c3c4e67ef5c46cb139b45de7c2c80a7bb5cb10bf9b228c10c3319b26161e4138ae27c483a857db3a15a58fc9c8b4e68af9da8908d1e7538fd32c
 EBUILD gnome-desktop-3.8.2.ebuild 2029 SHA256 5dafd7ac7f0d9b0308182b80a13db0859a2d2972aff18dde5537b6c3969b18ba SHA512 18b3cf5f690cb65092da6c65fac36ab358d2c6762562cd62ec960e81db4b093006e5821539b01a02dc7344a86a6f9cca4fba45cefecf5834573c34ef15aeb0aa WHIRLPOOL ff59bce748d985dd8b4fbc90292073d7f568deb2dbe99d77d53ae576a4e2f9fb97d0e53b2cff0fb7fe4fc6f8c8a1c3f33c0fc0f2046a46a33c67d96a64a02685
 EBUILD gnome-desktop-3.8.3.ebuild 2029 SHA256 5c0fd22639ff480b9af512b690c10a1875620ea35b20b7ba89b84f6544e8f3b8 SHA512 c070e70ebb2b8ec266ce0608b59cdccf2409321b645736bc8eccb160c09feac8f140482aaa398a114cd2c14cbbaf550c02a43c77e79fd66560e1eb05b3730fcf WHIRLPOOL fb8a3a2a87d1941e969f585183d2cb58ee04b7d8427f87c6705c5a84df5d37cb832c279cd5bcb007d950b76a1565c644c5a04c70ba6ba83744b64ac7407d1b71
-MISC ChangeLog 42358 SHA256 f3b385da67b452033d5d30bb554754b83e2e366ffad7a8504ddda8175e84cb4b SHA512 2a07e2238fe3bb58b0000c1c193259ecc0ab382503fc877d9c9c35fad898b09cd9bcb208b7ff1fd7a45c63339109c07f4d5b074007e2bd649af16da9b5e5880f WHIRLPOOL f5639df4805ad1b724d2e16f0f3b15dc99ba886e8e50c235b399696725fa4086bc15878e4a3cea7adc24f0fc82ea77ebbb7a6b5c75ee9ae2fec61d489c4366c2
+MISC ChangeLog 42702 SHA256 5adb6d7de7d92892ce4b5c28ec95ce79bf0e5181dccfd305fb4fc51bfb737b74 SHA512 eda04ef7f2c7af6834c4d7d4cad8dc540b80342bcfd7a6f964b9859ab06ce8285ffc0f724710fd9474c45393db88b1426c2042d7ed7a62d9744260d0c79cc554 WHIRLPOOL ecbaafcff52d67066e3bb34eb6631dc14c048fa968e8c7c0542f6c932bc70ddb091659e9c42d34907c2203d49fef5e4b3d28cf567a91c8a301b8a03f2377f612
 MISC metadata.xml 260 SHA256 963e6a57764d4be649262b46c80463a08be9f9d17442becdc59b6bb93991ba6b SHA512 953029172fb8243080bf818a116de3318527568efde018ef9fcd00ca64664041a110a6a9d083f7537985b97bcc3f0c4cd2638dd829924dcdea2248147e8a8625 WHIRLPOOL 4b49b8d1aeec77e2f6716e2aaa8ba84d88e7d521e415802aad82857d0c46a63fc902467d56ae3dd89cb147c7bfa337c88d76bedf64ed11b832fd6397a1439336
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlG02MkACgkQCaWpQKGI+9SX0wCgiC8fSqOJS/o6ne+dwW6wDPsq
-i+cAmgOBcZ1V1MrWof+X3836rfrHpARZ
-=ZFMg
+iQEcBAEBCAAGBQJSDL4jAAoJEJ0WA1zPCt1hmwYH/1TpJZNzEtc0crB3dMGejExX
+Udl82AzwhHJfIIilVThFqDjW+VwlQ/1tgCS27B20NjSyQwKIVQYeYAGf+iiymwP1
+SyGQMO80bSOXsnFHGjz1yqcM7DRLwEzKoTqxjeyYUxUWDWDpW70+SltfGUlQ1s0E
+/jrtmfowaXIgV5VavwMs5ObN9+hlxudpDWzXmB2wjFsgY6kMiXhEUNnUc+Yl3Ag5
+pFOp65B2C0jxfLN/wTlCrGbRUBBh+c6/bC1tTIZ2AT5WDnF8DFjgqHUEROMJbKi+
+aYC2xd24dlJ1sPpeCOx5VPrTC2WRNrcfsNgITNMY1azio9qkkF4tkuaQo825v7s=
+=W9Os
 -----END PGP SIGNATURE-----
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..dd78b0e429c6
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild,v 1.1 2013/08/15 11:40:05 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit gnome2 python-r1
+
+DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
+HOMEPAGE="http://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 ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="license-docs"
+
+# 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-proto/xproto
+	>=x11-proto/randrproto-1.2
+"
+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
+}