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

["Pacho Ramos" <pacho@gentoo.org>]

commit:     281d8ef94e71d361f986e10731fe0617e4bf1746
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  4 10:13:45 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Oct  4 10:14:37 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=281d8ef9

x11-themes/adwaita-icon-theme: Version bump

Package-Manager: portage-2.2.22

 x11-themes/adwaita-icon-theme/Manifest             |  2 +-
 .../adwaita-icon-theme-3.14.1.ebuild               | 63 ----------------------
 ...2.ebuild => adwaita-icon-theme-3.16.2.2.ebuild} | 28 ++++------
 3 files changed, 11 insertions(+), 82 deletions(-)

diff --git a/x11-themes/adwaita-icon-theme/Manifest b/x11-themes/adwaita-icon-theme/Manifest
index 5aa0cbe..cd270b9 100644
--- a/x11-themes/adwaita-icon-theme/Manifest
+++ b/x11-themes/adwaita-icon-theme/Manifest
@@ -1,4 +1,4 @@
 DIST adwaita-icon-theme-3.14.1.tar.xz 17581976 SHA256 b776a7ad58c97f4c1ede316e44d8d054105429cb4e3a8ec46616a14b11df48ee SHA512 c7831e78eb382faa78706caf53e6b3c5543d7fab266d73c8f1325d81331b75f1244f06da1c908e1d1a4336964e51ea65284f461ec0fdd523bc71569e84287931 WHIRLPOOL c15d849ac2e859bc632b5b47b360ce33a4bb402a39a7b1a369c8adfab47bfa099cb38c80bddbb5c1eae7bc0e6b656fcb422168841e6d1bb767506b6546c21838
 DIST adwaita-icon-theme-3.16.2.1.tar.xz 18860704 SHA256 b4556dfbf555d4fac12d4d5c12f7519de0d43ec42a1b649611439a50bf7acb96 SHA512 a38d59d54e204f8c2ab8c8ef2d6120dad636c5534293578692d1fb9a288e5862596117fa938eddf752137ef27e1d1a86eb0a1a046b87961a84c5673df58a5eec WHIRLPOOL e126870d234438baf6037fd2e66a7a6df185bd2658ac5021b3dcca37cd7e009411a9e0df78bab239cba9db3becfd295d77d684ce9c6aca004ee247896902fc94
-DIST adwaita-icon-theme-3.16.2.tar.xz 18507060 SHA256 9c6662ad739cdb32d0ffe638f54e5033c5ea6f53e7f8c2b412ec64b8e7e1b4c2 SHA512 4f9f8c979e984765941cb659af7e9d1585b4146d71a82af2490c84db2a7f9fc632b85baf9c90b6096b394ae56964628a522b00de6e1cf4ada31bbdddda27cfca WHIRLPOOL 1ba3383bb202dc7ee10b7119a770096b1d89a58607949261d621df272a3455ed2b45607a9fb88763af3a987bedbe54686d3a631a49164d0371d57b35da75cf58
+DIST adwaita-icon-theme-3.16.2.2.tar.xz 18860536 SHA256 3149a815ad165abdd20165891fa72b533b909d7844e3fd41b8d0a0f9d9a99066 SHA512 9984f0aa64a146ca55be77fa3b417eafd2e31e3f213ff93fcc954df22a30bdf42efb3f6967a2d97b302cac2e26e49926eefdfb9b5f70aee79bddc39beef5cd54 WHIRLPOOL 137550131571c3e63442cb102d710efcfffbda60777ae8c55186795b4c0adb1da6db003a75acb0f3a73877e9a8ed6b84285ba77cb6f300b038215c0fc1dc2f0e
 DIST tango-gentoo-v1.1.tar.gz 29322 SHA256 518efa4257c8e689488399db23397a89f4dcd5990ce537ef6215860ad5606eb0 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 WHIRLPOOL 9e1635a505ea48f4fe8bdb3b8b3b43cfb9cf99e3204194c51361b198886e719921cfacbc15f9f6407aa7d0c4af178e24c74b998fc370fa2329040e5be1baf153

diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.14.1.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.14.1.ebuild
deleted file mode 100644
index c2b24bf..0000000
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.14.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="GNOME default icon theme"
-HOMEPAGE="https://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}
-	>=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)
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Make it the default cursor theme
-	dosym Adwaita /usr/share/cursors/xorg-x11/default
-}

diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.16.2.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.16.2.2.ebuild
similarity index 65%
rename from x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.16.2.ebuild
rename to x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.16.2.2.ebuild
index 340084a..8d09d06 100644
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.16.2.ebuild
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.16.2.2.ebuild
@@ -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
@@ -58,16 +60,6 @@ src_configure() {
 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."
+	# https://bugzilla.gnome.org/show_bug.cgi?id=756036
+	rm -rf "${ED}"/usr/locale
 }