Stop installing the /usr/share/cursors/xorg-x11/default symlink, it messes up cursors in some non-GNOME desktop environments (bug #543488). Instead, rely on env variables set by the session; for GNOME, make sure you have >=gnome-session-3.14.0-r2

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

3 files changed, 96 insertions, 6 deletions

diff --git a/x11-themes/adwaita-icon-theme/ChangeLog b/x11-themes/adwaita-icon-theme/ChangeLog
index 2efea504537d..acf88f7584dc 100644
--- a/x11-themes/adwaita-icon-theme/ChangeLog
+++ b/x11-themes/adwaita-icon-theme/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-themes/adwaita-icon-theme
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/adwaita-icon-theme/ChangeLog,v 1.8 2015/03/15 13:34:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/adwaita-icon-theme/ChangeLog,v 1.9 2015/03/22 17:53:27 tetromino Exp $
+
+*adwaita-icon-theme-3.14.1-r1 (22 Mar 2015)
+
+  22 Mar 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +adwaita-icon-theme-3.14.1-r1.ebuild:
+  Stop installing the /usr/share/cursors/xorg-x11/default symlink, it messes up
+  cursors in some non-GNOME desktop environments (bug #543488). Instead, rely
+  on env variables set by the session; for GNOME, make sure you have
+  >=gnome-session-3.14.0-r2
 
   15 Mar 2015; Pacho Ramos <pacho@gentoo.org> adwaita-icon-theme-3.14.1.ebuild:
   x86 stable, bug 534012
diff --git a/x11-themes/adwaita-icon-theme/Manifest b/x11-themes/adwaita-icon-theme/Manifest
index cceb56086826..673e9712a9b4 100644
--- a/x11-themes/adwaita-icon-theme/Manifest
+++ b/x11-themes/adwaita-icon-theme/Manifest
@@ -3,13 +3,26 @@ Hash: SHA256
 
 DIST adwaita-icon-theme-3.14.1.tar.xz 17581976 SHA256 b776a7ad58c97f4c1ede316e44d8d054105429cb4e3a8ec46616a14b11df48ee SHA512 c7831e78eb382faa78706caf53e6b3c5543d7fab266d73c8f1325d81331b75f1244f06da1c908e1d1a4336964e51ea65284f461ec0fdd523bc71569e84287931 WHIRLPOOL c15d849ac2e859bc632b5b47b360ce33a4bb402a39a7b1a369c8adfab47bfa099cb38c80bddbb5c1eae7bc0e6b656fcb422168841e6d1bb767506b6546c21838
 DIST tango-gentoo-v1.1.tar.gz 29322 SHA256 518efa4257c8e689488399db23397a89f4dcd5990ce537ef6215860ad5606eb0 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 WHIRLPOOL 9e1635a505ea48f4fe8bdb3b8b3b43cfb9cf99e3204194c51361b198886e719921cfacbc15f9f6407aa7d0c4af178e24c74b998fc370fa2329040e5be1baf153
+EBUILD adwaita-icon-theme-3.14.1-r1.ebuild 2148 SHA256 8fe9f26eb6c68987e5fdc8bbff3cf840560a865745d72094b0472a0877c30f2d SHA512 afc56f46167f5ee69b4f89c0c1576dabd1eb3324be82916b5c1d042da1e0812a584f82dc7321ee85f3c0d563e8390149c168caa3148c422cf206ab494f530f58 WHIRLPOOL d56ef83e6ba037cb5e6881470a719be047f0a4c5165f42c0e7bc278e7ff9ba3a4ee627524b1c7cda9fb4898ac61fce695eb8afebacae6045260f08742d3f4736
 EBUILD adwaita-icon-theme-3.14.1.ebuild 1802 SHA256 0526d0e6bfe7321471e24b0f60a54b3a3402e6bd45ecee859e12c5b2e6c5c6a3 SHA512 88cb775be486a0fab80c3ef78802b91ca4344b84b2203fd9161c44a20343bc45ae0c090b372a6bbdc90409c2813a9d474ea879c80d02b9a12c3a5dc5a63d1680 WHIRLPOOL 6e5b7ffd7964a87d96a805abca477982ace72fb4589c07912cc12b1aa92f656b148daf1498f850662157502dd3bfc708e92bd1ccf38348ac65cfa6c1957c8e53
-MISC ChangeLog 1314 SHA256 e89cbd5bc2862f28a95b100e3df973a7af7e336dae1f72bb522aa0fa686623ec SHA512 7d3553c146e7948837374e38d5f0e96cbb377bf4b5dd3c58e20c7edf63679124db6c2283445174bd2d66939956d65606aec16e42736d361dc29649e33f3c9bc7 WHIRLPOOL 303927cb7454e11c13a1247c27627c62a2ed41c3ae68e99fb2ab406d2c0b19660c565a345ace85241e5533098d0b8d726aef16439e47e88a2ca23bf6f13809c2
+MISC ChangeLog 1718 SHA256 07b592943de9d0254a889162edd29f0eccda3607f4eda63f9872777fd86d2c27 SHA512 9c3bcd9c04af155aa317a8b55970896f89104b3f813bfa3febe3e77df3079625e6cef49f3d4b763c7e80a8a9c16dad80f45932c012c77da9ba51c7eefc705c8d WHIRLPOOL 4265be9773cb017fed15ffdf57be526af625a1edd02245c454c23c4349424ae71c395096c18943afd30427844acc967a9895f50dc3973d5955239533ea664917
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUFilkACgkQCaWpQKGI+9SfnQCfe7nQ/Ye9RBMcZnqH93Vjau/M
-x/oAmwf1M764ydeArwNUx5HyRyUTHrZ+
-=jl8v
+iQJ8BAEBCABmBQJVDwGYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNZEgP/iL9HFdC2KLQwvn2SqHd/dAZ
+3yZ3HlGqoQ0eEOR1bqpgjAkqvJpasbnxM27BZCnd9N3CgKgpMcz3i16EYBzLGgSv
+GV4ucA0aCxxkEtWN2IBJGC/vtgNGe4x2XNsVRy8bsYB8Zvjxo9PRRHTTRtfSVwqI
+W76uZLgqXA9lx7LQ+t0yOUbjBdtPT/t03Ic3YEGRAPc9JofY0KJ91+M544eXIwNZ
+x/WKQbtbs10B9X12Ffjb1E8ZT4XKCM6mmwJ9oSkT5hqrFuChbcTki+vFgVHdIegE
+/+OELGe731eOJl/rfuPQHcEDNUxuqCEMvstE6YvVFPH5wGwWVKJE9oYLgZXWuBOt
+xgzXC6D5R2/lApjuXhPxt8jXlsQBEh/nnB8QmijdjIkuujMhrRcXvKd6Buz2ermz
+WmyOQFOGkngdDZKt6kVEApMCqnhKcoV55EibBjn+uJMZAI4BILJViFWdqhyIqiZd
+o3JQqD9wR5dESGWaODJslAdNBTAxQS6J8YRNk0MLmb8KsLSqVxNe9hpIDxioF4gF
+08B44ejEQXRIeXx2n/PJBuGbzrWbKgLxvn3NaJffcKpI4l4LfIfG8xDnuS10H/Xb
+2qaXnvNZxg/j8Lt8tw5daREkmXmIAQQ7/DPsCqCXn0CXXxvDtb1M8wnLm0ZlETq8
+IFApAbA4nprCM7ZhhDIC
+=vYcd
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.14.1-r1.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.14.1-r1.ebuild
new file mode 100644
index 000000000000..2612bbcd18ed
--- /dev/null
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.14.1-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.14.1-r1.ebuild,v 1.1 2015/03/22 17:53:27 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2 versionator
+
+DESCRIPTION="GNOME default icon theme"
+HOMEPAGE="http://www.gnome.org/ http://people.freedesktop.org/~jimmac/icons/#git"
+
+SRC_URI="${SRC_URI}
+	branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )"
+
+LICENSE="|| ( LGPL-3 CC-BY-SA-3.0 )
+	branding? ( CC-Sampling-Plus-1.0 )"
+SLOT="0"
+IUSE="branding"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+COMMON_DEPEND="
+	>=x11-themes/hicolor-icon-theme-0.10
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/librsvg:2
+	!<x11-themes/gnome-themes-standard-3.14
+"
+DEPEND="${COMMON_DEPEND}
+	>=x11-misc/icon-naming-utils-0.8.7
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+src_prepare() {
+	if use branding; then
+		for i in 16 22 24 32 48; do
+			cp "${WORKDIR}"/tango-gentoo-v1.1/${i}x${i}/gentoo.png \
+			"${S}"/Adwaita/${i}x${i}/places/start-here.png \
+			|| die "Copying gentoo logos failed"
+		done
+	fi
+
+	# Install cursors in the right place
+	sed -e 's:^\(cursordir.*\)icons\(.*\):\1cursors/xorg-x11\2:' \
+		-i "${S}"/Makefile.am \
+		-i "${S}"/Makefile.in || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure GTK_UPDATE_ICON_CACHE=$(type -P true)
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	elog "$PF no longer installs the"
+	elog "/usr/share/cursors/xorg-x11/default symlink. Instead, desktop"
+	elog "environments are expected to set the cursor theme using the"
+	elog "XCURSOR_THEME environment variable or other means."
+	elog "If you are seeing old-style X11 cursors in GNOME or Cinnamon,"
+	elog "make sure you have >=gnome-base/gnome-session-3.14.0-r2"
+	elog "and then log out and log in again."
+}