gentoo resync : 18.12.2017

3 files changed, 2 insertions, 41 deletions

diff --git a/app-misc/color/Manifest b/app-misc/color/Manifest
index b2f08c46eb0e..09671a68b029 100644
--- a/app-misc/color/Manifest
+++ b/app-misc/color/Manifest
@@ -1,5 +1,4 @@
 AUX 1.2-ldflags.patch 404 BLAKE2B e07b9c473e8b673d11c3837c6759c5beacc58fcf81ed1b9f0804d614fedc524983c237eb83be33182a384997f666842af554a950d26d8e7106f109ab5beee6b1 SHA512 44c774102cf9800b38d0831be640758a802cb2fdc2949036617ee23a47565944d514ecbee6532d2f426c766aef48814f362f7e0cb27ce8b280295af106426380
 DIST color-1.2.tar.gz 10040 BLAKE2B 1359f77e88c1c20d3643d6b00cad43fe5fbdb26d406d338132a5541668482c1a14e452ff502c10164f2d32d5c79b390328ffdad85012093d69fd767255f08fda SHA512 58f7d379bca3352b2e39eab83d2fa5891df86c45722541eb810becce813c8e866f28b856ed244a75b173f0dab5dbdc84ceb91d96175dcd2484e29abb98ba87ac
-EBUILD color-1.2-r1.ebuild 928 BLAKE2B 0eea3419323e7fd5ce411d681d385d9f45e1b73363b5620b31cc9a0ee63014ce68e998dcd61546c28f9e0cf25b01c8905b487de65c2690af1ed0f9e7100778b2 SHA512 7f0243170bcc20ee29f9cde198a2e8c77fb46b2a1b22f0e32bdfc0f1046671773ca8ebb87927f5ba1bce8688bee879e490a69de2dfeb58fa4586a630e688b403
-EBUILD color-1.2-r2.ebuild 901 BLAKE2B 9c0eb4975f57c6e97e8acab664f13a1f59a7163a57b94f56c68ef9526ac1046b469963c5ec4670f565dd374efc7d9d9f45f07b19222bd3b271f6cd1359208012 SHA512 d4a970dfe571ee1765d7b61c89e5eca6464af362df225553250ec482f789353fbc67ad15fc14036d76fb3b968a7351f2ab45b08b6ad93e04e3e008b42c391ccb
+EBUILD color-1.2-r2.ebuild 900 BLAKE2B 6957a36ac51ab4e082e7738ecce00a8e760da19dd04048b9ab0822eb0931114d5839e6f0ce195550bceefc69279c4259715ea350f34f8558fa18129720c86ac6 SHA512 d033d6fde544788f6867636f7ef0222c8edec1f5ccf5d5327caa843a48f0a30ec610732f08fa536e033793b707049e6ea05810206cc47e028761984a869ed92c
 MISC metadata.xml 588 BLAKE2B a751663c366701d7dccc560ea5e3961c5a2c428d98c341b8b74267c5bb1369c200fcf8c8f5c9d88fcd17ef072c3d98994501be12ff35445cb2c9397a44ec901f SHA512 eb169977c0c6512fc4a6bdd31083a0175bc2c5688f6eafc36807dd82494e2bea9dd263f3c2982ac059f50589cbcfbaf03b1e49eff20f7fc99c1f1b76c5f0fae6
diff --git a/app-misc/color/color-1.2-r1.ebuild b/app-misc/color/color-1.2-r1.ebuild
deleted file mode 100644
index 5a0666ada122..000000000000
--- a/app-misc/color/color-1.2-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Easily add ANSI colouring to shell scripts"
-HOMEPAGE="http://www.runslinux.net/?page_id=10"
-SRC_URI="http://runslinux.net/projects/color/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-ldflags.patch
-	tc-export CC
-}
-
-src_install() {
-	dobin color || die "dobin failed"
-	dodoc CHANGELOG README || die
-
-	# symlink for british users.
-	dosym color /usr/bin/colour || die
-}
-
-pkg_postinst() {
-	elog "For information on using colour in your shell scripts,"
-	elog "run \`color\` without any arguments."
-	elog
-	elog "To see all the colours available, use this command"
-	elog "	$ color --list"
-	elog
-	elog "More examples are available in ${EPREFIX}/usr/share/doc/${PF}."
-}
diff --git a/app-misc/color/color-1.2-r2.ebuild b/app-misc/color/color-1.2-r2.ebuild
index 417e2f29c155..198bbcc3a821 100644
--- a/app-misc/color/color-1.2-r2.ebuild
+++ b/app-misc/color/color-1.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://runslinux.net/projects/color/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 src_prepare() {