gentoo resync : 21.09.2018

3 files changed, 2 insertions, 35 deletions

diff --git a/dev-php/PEAR-Archive_Tar/Manifest b/dev-php/PEAR-Archive_Tar/Manifest
index c35a93af155f..133ae673f6aa 100644
--- a/dev-php/PEAR-Archive_Tar/Manifest
+++ b/dev-php/PEAR-Archive_Tar/Manifest
@@ -1,5 +1,3 @@
-DIST Archive_Tar-1.4.2.tgz 20624 BLAKE2B 2276b19a6e5f18947d6f976db28a5869601b9b1d271e5788c74ef4704fce949c39b20811b82bb1e9c7575dd6b5ce6b0561751a560a1aaca6547415badd5188f6 SHA512 dad5872c82fb9fd961dc06d173610f60d0e05b4c05428e3410beb5a6cdf05de27704edf805e7db80c4031409af5d7d59e7abe43cef7aa11fd9d086b1c6e8e761
 DIST Archive_Tar-1.4.3.tgz 20682 BLAKE2B a2e840087178fb55719634198852d191aef24139f819e3c478883fd007f6e72f523700617c7ff2c3d92a3ebe36a237b0eb7544dfe86dec394587ee0b3743520f SHA512 62e60d59266c5d19b131f769f4d71d4cee6bf8964b0c6610c4f1381500ced582865bff26c608479b2678dda1e7407ba39a7ec84b31fed13e3875f1947ce5bd6c
-EBUILD PEAR-Archive_Tar-1.4.2-r2.ebuild 747 BLAKE2B d4d8066881d748bd99a83a4b1b1e15206715733b4d5f16bb34fdff75d407fe4cc75dbc0b58e2d4f6b989b776958c5ca5be0737771e626956589445689929d9c2 SHA512 ecc554928df28adb2ba0b79d9684f74c86a5881f3e41c3291d21dc1b7994dc1cd133296dd0ff64a633609c2517616da9fc43a53d557d274bf14b29b7dc6703f8
-EBUILD PEAR-Archive_Tar-1.4.3.ebuild 756 BLAKE2B 0080b5f5add53722b8e4c5599102460c8862f49e96bfd5072dcc5c649c8e90ac0c36e6d501442b06cc9db324d5e6ff12687ce8ed8b4c9b4d194e3b72a8ff6fb5 SHA512 1010599a7c41d67c5abb0cd365cd1cad5b31fb7120993c6bef1389b2a5ecc78abd4221dedd290d43278627456d44b126f74ee2baeb8eefddf7f937f0dd6382da
+EBUILD PEAR-Archive_Tar-1.4.3.ebuild 748 BLAKE2B 858d771c358ca260ff3c7959c4bc98276cca443fe32be23fd63d05af1ffc28d94acf34dfd66e97a05ef6b2f8b4eb6874053048fefa393af03adbe4e1034d410b SHA512 392afcb0ffb84e99c0993523d4e148cc6f34c23caa72ea3fd18fb296e98ce745fff911c5308ed76b6058707d98202243202421705c15482df3d8793cd49be9aa
 MISC metadata.xml 313 BLAKE2B 96717f88c6747b4b6dc814ffee022a1bfe7965ca71f0d1dff4acae773d37ba43d21b92343993b19c753360651ae63c7e0cea16d51c12d4fee03d6852a50be7ff SHA512 189683deca6b9b76a4ca070938afa484580b57a8c799f49f26e9b123165d545ab6aec31bc2b96400cfc5390f3837477a8d58b461e317ab14bf1152292880ece1
diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.2-r2.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.2-r2.ebuild
deleted file mode 100644
index bb3d5304fa99..000000000000
--- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.2-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/PEAR-/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tar file management class"
-HOMEPAGE="http://pear.php.net/package/${MY_PN}"
-SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-# bzip2 and zlib are needed for compressed tarballs, and there's one
-# call to preg_match to test paths against a pattern of files and
-# directories that will be ignored.
-RDEPEND="dev-lang/php:*[bzip2,pcre(+),zlib]"
-PDEPEND="dev-php/PEAR-PEAR"
-DEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	insinto /usr/share/php
-	doins -r Archive
-
-	dodoc docs/*
-}
diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.3.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.3.ebuild
index 25b31991dcc7..d2b8aa67a2ed 100644
--- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.3.ebuild
+++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://pear.php.net/package/${MY_PN}"
 SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 # bzip2 and zlib are needed for compressed tarballs, and there's one