gentoo Easter resync : 12.04.2020

5 files changed, 7 insertions, 29 deletions

diff --git a/sys-process/time/Manifest b/sys-process/time/Manifest
index ee16bc8848af..7ff1b75bee37 100644
--- a/sys-process/time/Manifest
+++ b/sys-process/time/Manifest
@@ -5,8 +5,7 @@ AUX time-1.7.2-incorrect_memory_usage.patch 1012 BLAKE2B 2689342bece589ac1e1aa87
 DIST time-1.7.2.tar.gz 108371 BLAKE2B 17d83faa24974fdd5853d83b0524a9f97780db19c42e9633d14acf39653b581a511856ec3be67661796fb1aee1d7b1bdca9fff3f5e88abd9f22c1736a02a04dc SHA512 dfde8f48a9d52bcc9080596feca6c429556e1e510977503138195d390cb52f27dd171f519d78226b0b48adc404062ec1f9234d92ea9707ec16d1be23ced90afc
 DIST time-1.7.tar.gz 103066 BLAKE2B 900df9031f90fbdab5b778c8ec61b3fe5efb2cb6a21834a31e3eefe845e05977b7c3206579e0bd7959f4dd5a34a909b16cc96f743aaf81cc1edb182a5669c68c SHA512 d759b651e343beddc0b3bd06af85881486b72319c979a2e7f752d5a34edd8b7c1c19391c5c7a2e8f6685746cc7a046bf2c8e082b31458a1dd043ed90a4cebcd1
 DIST time-1.9.tar.gz 596779 BLAKE2B b48c2def2f7aaa79ddb8838ed9e103dd7b1b573b6084d1481838cac86eb7930b3a231469936ad23d5096e576ea728e821defb27fc8b3f9187809e3f5c01b7c57 SHA512 5c6dabbbe71e9103a47b892b86bb914c1704122d4fe7dff1e2cbd28503297163118d295077d8e062b035d673a1f91c36f8a45c7383f374fd766942b32bde4406
-EBUILD time-1.7-r1.ebuild 555 BLAKE2B 587dd668184fc15d68ed0ec85fbe4de2259beb2314b77a1a1f0b2aeafc60a8c7e7e246bcaa4dcb11f6c5afbe0b13270177cdb8d2dc22f3eb8f22734ce83bfb66 SHA512 73bb504832c25e6d325f9ab0f2d6dc23d1fd92e4dcb6485de3718f3b016e098a28d15e19a21d04d344ee5c8740c474d141069bb6677abab212c2490dc5273029
-EBUILD time-1.7-r3.ebuild 641 BLAKE2B 29a361069d58470b46176c36418af62377da88b8bd3b6596b0f87e27d0d72d4971631c90c4882843989768d6043af8a17a4c3eced3b863e5c0f5c93e169451ad SHA512 e81061104d41d8ad4840ddcb11036d09ca38cb8e1b8ebe1736ef4d63567d2dbb0e0e936c32649d67b316c80f9e892b0b0e36e775a714ce4b315193ad67cfbd4c
-EBUILD time-1.7.2.ebuild 677 BLAKE2B 05931f553dc163cd5192ad1c52fb1c28772981252db5cb56886607d9e4b6234be3cbd3dd243d4a5693bb72c04d47879942feee526ac670b6b90be1bfceca9653 SHA512 0de922aaebe7b4344dc70685bfd2989cc8d3e6c868240cfeb6b19189c4dfeb4719cd7ac235ec33d05595aaa7c6e4c1c772400c0628253137cdc0d1cf3f055d69
-EBUILD time-1.9.ebuild 465 BLAKE2B 0a8b7e3865acf374f9f5454d32170472cead5a4d3479ebbde04e4fb87393a459c2c6302336ff9438079813a94361d9a9bd0a5d3675fafee7a14bfa0e2dbc6403 SHA512 663daa18456f3c0a0af4e9d859815969aff4a43ebcc3328f85984252b9f686cf0ec9351b6cea52a51642d136de37d149217abaa5ed296b37b8f22cbb793e647c
+EBUILD time-1.7-r3.ebuild 638 BLAKE2B bf1381babaf464d09fe99c2f1577565b374cca972f31b6b34a98524dc9f76485861f71baadc0eabfa17a15cb46b790af87feceaf91a17829c24afed726e918bd SHA512 dd2cf88943c95bdba7f31fad429066d9e504fba7a316fe0eef65619c86cf1432143959858f7bcd966d216dd2882766ac88d1b92c47cd6744fc04c2542589c399
+EBUILD time-1.7.2.ebuild 674 BLAKE2B 24f454bc3ee5130e678caa72baad791b2a985917e1da0d5905a5ae984f2f338034c9df52b606612d6f551c9c3005c6d618d42c6327e0b35be72655a75aac1e07 SHA512 76c9c4acf06313d0396cdc852da052132602bef8a863b753474145b5df924f32ceba0cf43fedcb8d2fe1e16e0bff8f2612e6657e0817a92c18cedb8a9790a1b0
+EBUILD time-1.9.ebuild 458 BLAKE2B dec8b969e5b2dc35b1725e9c1d6b736ced11d7deeec9d6551bd0fa30e86c7a8715d8b254ae66f2e13000cef573cfa7f1be9806751f992a7fef2a70529a428d78 SHA512 6d020d7daa1e3c74744c0d137cb36fe08b093a9731362802f0b2bdce84b528d39d720ba3b6d7ce226d46389a49ac3263fc311470f62b8bcbb7e379634e4643a0
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-process/time/time-1.7-r1.ebuild b/sys-process/time/time-1.7-r1.ebuild
deleted file mode 100644
index 3cb21fdea613..000000000000
--- a/sys-process/time/time-1.7-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils autotools
-
-DESCRIPTION="displays info about resources used by a program"
-HOMEPAGE="https://www.gnu.org/directory/time.html"
-SRC_URI="mirror://gnu/time/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-	epatch "${FILESDIR}"/${PV}-info-dir-entry.patch
-	eautoreconf
-}
diff --git a/sys-process/time/time-1.7-r3.ebuild b/sys-process/time/time-1.7-r3.ebuild
index 13791b168ad9..1c67130321fb 100644
--- a/sys-process/time/time-1.7-r3.ebuild
+++ b/sys-process/time/time-1.7-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/time/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="sys-apps/texinfo"
diff --git a/sys-process/time/time-1.7.2.ebuild b/sys-process/time/time-1.7.2.ebuild
index e5a59b8d644d..b7585dcbcf3b 100644
--- a/sys-process/time/time-1.7.2.ebuild
+++ b/sys-process/time/time-1.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://git.savannah.gnu.org/cgit/time.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="sys-apps/texinfo"
diff --git a/sys-process/time/time-1.9.ebuild b/sys-process/time/time-1.9.ebuild
index 60bee01e9b3f..d0addb3bab94 100644
--- a/sys-process/time/time-1.9.ebuild
+++ b/sys-process/time/time-1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="sys-apps/texinfo"