gentoo resync : 27.01.2018

3 files changed, 38 insertions, 26 deletions

diff --git a/x11-themes/silver-xcursors/Manifest b/x11-themes/silver-xcursors/Manifest
index e6096d131770..f2b1d39d90de 100644
--- a/x11-themes/silver-xcursors/Manifest
+++ b/x11-themes/silver-xcursors/Manifest
@@ -1,5 +1,5 @@
 AUX README.gentoo 576 BLAKE2B 18c54a2b3ef37f8c5fcf0ad3ef652d7e48d026b425c9e1f6e979f97f353e4860ad7c922173aae9dc2ad70d3554d7f5082a78d582553c6cbdb2c782815763cfaa SHA512 6fb30188e9a1c6041b70ad43e94adb3ffb6cba401fb4b03c8669c46ce16ade806226215f47ada2bb39e2970bafa887fe7436962991cc5f1b4eab009c33f2732c
 DIST 5533-Silver-XCursors-3D-0.4.tar.bz2 756159 BLAKE2B 7d90a44a022512e685b592e6285786e5b4898df723cba9deb52100e66c76865b5d2ed07968901656fc5c1ef565c54f281138e9e6f323e94bcb6c1b7884c792c5 SHA512 b5b44a796d5d9341a0e92f8f4351b84eb3974d1908eb2fdb012c0490e4374404e3d33b35873f49c1f7ccd56bdced4fff14338319edabab7d11ddf31cb46fd245
-EBUILD silver-xcursors-0.4-r1.ebuild 666 BLAKE2B 74ef2cfd0c0faa61787a1b4f5ca116ae66b75d05959666526d6ed2e6d46881c447a7275dcfc2f82a140625564b61deb98ab275ef2a67293344ca3d158c732bce SHA512 202531e152ab29c30eb252cba835549d231461ae7b35fc234c7ab2d447077a06009a989aa7b8c8ef769bc397e9c1b6d5d9925c2e47921e870bbe0587949091b1
-EBUILD silver-xcursors-0.4.ebuild 1460 BLAKE2B 79d65cdc2fc9658e399cf0176a9410184a66c55d350b97bec5f0e8b1bffd7e50a375f62b40d9bbb0c3f39d9f86b0a9181dd31810ffb15f6b7d29bd151479ff43 SHA512 a86d4db245e11710d9b23ca11d6dc88d1273c90d3d6c1749a834a4527e0299d232fad1e07a5e12c7ac6adc7f8c0b579085d6bbcf17a983e60174d5daad936f46
+EBUILD silver-xcursors-0.4-r1.ebuild 668 BLAKE2B b1426c0e4f222f0d4cb9ad289ad468a32cc1be5bc9e1c63571a0e6eeccc33045ff05504c12e90fe0c2d24584a3d45461fd340316bb8095ba3643c9f30a40b0b7 SHA512 fe9db9dfb47e21512e9329b1063f7c37d82a2cc434b05c002aca3a5d5960c9ba8c590b27269d849519f4a11bdc958accb633940b6150906ffc791e799d312120
+EBUILD silver-xcursors-0.4.ebuild 1388 BLAKE2B 8018c943b3f0e98001123dbfe1ca802ba36b40cc9f903c3a1d11f5d10f4a7dfd93ab0b109d12bbdf05b6a3adc891288e8d5ddd8f76aa616fe32d582a0be6c9a8 SHA512 5f8ede783f9db1faa5e385c4434b48c16926c4f6e534513036e375e438a0a7fc954330bea1d0c40b7a509c652e59719f0202938a7be48ef89e3a37338ce67ff8
 MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-themes/silver-xcursors/silver-xcursors-0.4-r1.ebuild b/x11-themes/silver-xcursors/silver-xcursors-0.4-r1.ebuild
index 2ccc6d42f3ca..992984f80adc 100644
--- a/x11-themes/silver-xcursors/silver-xcursors-0.4-r1.ebuild
+++ b/x11-themes/silver-xcursors/silver-xcursors-0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
 
-S=${WORKDIR}/${MY_P:5}
+S="${WORKDIR}/${MY_P:5}"
 
 src_install() {
 	dodir /usr/share/cursors/xorg-x11/Silver/cursors/
diff --git a/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild b/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild
index 05b59f73bb3d..b01150131ce7 100644
--- a/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild
+++ b/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild
@@ -1,6 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
+inherit readme.gentoo-r1
+
 MY_P="5533-Silver-XCursors-3D-${PV}"
 DESCRIPTION="A high quality set of Xfree 4.3.0 animated mouse cursors"
 HOMEPAGE="http://www.kde-look.org/content/show.php?content=5533"
@@ -14,31 +18,39 @@ IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}"
 
+S="${WORKDIR}/${MY_P:5}"
+
+DOC_CONTENTS="To use this set of cursors, edit or create the file ~/.Xdefaults
+and add the following line:
+Xcursor.theme: Silver
+
+You can change the size by adding a line like:
+Xcursor.size: 48
+
+Also, to globally use this set of mouse cursors edit the file:
+	  /usr/share/cursors/xorg-x11/default/index.theme
+and change the line:
+	Inherits=[current setting]
+to
+	Inherits=Silver
+
+Note this will be overruled by a user's ~/.Xdefaults file."
+
 src_install() {
-	dodir /usr/share/cursors/xorg-x11/Silver/cursors/
-	cp -R  "${WORKDIR}"/${MY_P:5}/Silver/cursors "${D}"/usr/share/cursors/xorg-x11/Silver/ || die
-	dodoc "${WORKDIR}"/${MY_P:5}/README
+	insinto /usr/share/cursors/xorg-x11/Silver
+	doins -r Silver/cursors
+	einstalldocs
+
+	DISABLE_AUTOFORMATTING="yes"
+	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
-	einfo "To use this set of cursors, edit or create the file ~/.Xdefaults"
-	einfo "and add the following line:"
-	einfo "Xcursor.theme: Silver"
-	einfo ""
-	einfo "You can change the size by adding a line like:"
-	einfo "Xcursor.size: 48"
-	einfo ""
-	einfo "Also, to globally use this set of mouse cursors edit the file:"
-	einfo "   /usr/share/cursors/xorg-x11/default/index.theme"
-	einfo "and change the line:"
-	einfo "    Inherits=[current setting]"
-	einfo "to"
-	einfo "    Inherits=Silver"
-	einfo ""
-	einfo "Note this will be overruled by a user's ~/.Xdefaults file."
-	einfo ""
+	DISABLE_AUTOFORMATTING="yes"
+	readme.gentoo_print_elog
+
 	ewarn "If you experience flickering, try setting the following line in"
-	ewarn ""
 	ewarn "the Device section of your xorg.conf file:"
-	ewarn "    Option  \"HWCursor\"  \"false\""
+	ewarn "    Option \"HWCursor\" \"false\""
+
 }