[gentoo-commits] proj/gnome:master commit in: x11-themes/adwaita-icon-theme/

["Ole Reifschneider" <tranquility@gentoo.org>]

commit:     76e4f1e9fd9acdea562857ea118e8b2dba14a9e3
Author:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 18:26:23 2016 +0000
Commit:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 00:55:46 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=76e4f1e9

x11-themes/adwaita-icon-theme: Bump version to 3.20

Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0xE9E568677E8B4D42

 ....18.0.ebuild => adwaita-icon-theme-3.20.ebuild} | 38 ++++++----------------
 1 file changed, 10 insertions(+), 28 deletions(-)

diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.18.0.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.20.ebuild
similarity index 55%
rename from x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.18.0.ebuild
rename to x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.20.ebuild
index 9fd0d6a..da7f269 100644
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.18.0.ebuild
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -8,13 +8,15 @@ GCONF_DEBUG="no"
 inherit gnome2 versionator
 
 DESCRIPTION="GNOME default icon theme"
-HOMEPAGE="https://www.gnome.org/ http://people.freedesktop.org/~jimmac/icons/#git"
+HOMEPAGE="https://git.gnome.org/browse/adwaita-icon-theme/"
 
 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 )"
+	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"
@@ -43,7 +45,7 @@ src_prepare() {
 		done
 	fi
 
-	# Install cursors in the right place
+	# Install cursors in the right place used in Gentoo
 	sed -e 's:^\(cursordir.*\)icons\(.*\):\1cursors/xorg-x11\2:' \
 		-i "${S}"/Makefile.am \
 		-i "${S}"/Makefile.in || die
@@ -52,25 +54,5 @@ src_prepare() {
 }
 
 src_configure() {
-	gnome2_src_configure \
-		--disable-w32-cursors \
-		--disable-l-xl-variants \
-		GTK_UPDATE_ICON_CACHE=$(type -P true)
-}
-
-src_install() {
-	gnome2_src_install
-	# Buggy directory due to drop of intltool usage
-	rm -rf "${D}"/usr/locale
-}
-
-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."
+	gnome2_src_configure GTK_UPDATE_ICON_CACHE=$(type -P true)
 }