gentoo resync : 22.10.2018

3 files changed, 3 insertions, 65 deletions

diff --git a/net-dialup/lrzsz/Manifest b/net-dialup/lrzsz/Manifest
index 2d7aa729e5c6..88467f4a3115 100644
--- a/net-dialup/lrzsz/Manifest
+++ b/net-dialup/lrzsz/Manifest
@@ -3,6 +3,5 @@ AUX lrzsz-0.12.20-automake-1.13.patch 454 BLAKE2B 19627ec86b92c5e1dfcd4404408b9a
 AUX lrzsz-autotools.patch 8725 BLAKE2B 8f499974f0184784d1e800a43e8fdd09b389bb2a2c48ae335708ca25eb2b7130b5554fcbb8217aa3833ffdf2d0756fe091df615351b4c23214e7889dbf2399aa SHA512 4ba98fb4a72d8fcc654741d57992598d56eded61e7b89c54d44edd7a609149e15d9948d777d70bf41137daa0b860c67e1212a3f38519434cb5d44546bfb94909
 AUX lrzsz-implicit-decl.patch 428 BLAKE2B c08a244d292be32bb49fff6186cbe847c106dee67b3ea463860d1e6387e159af1b106e5f78ea5bce31c347cb7207c95116243fa515e4daafb23d2cc309776480 SHA512 7dd642aa6701671986e6ab1635935c7a8088ad5ee74131b7c486e2e87d748fc835798d1a8a291e85a80ba3f88328ce4f293a8dafb1ebd9924f1f31fb2bd3a7d7
 DIST lrzsz-0.12.20.tar.gz 280938 BLAKE2B 86511ab112da849f5894f18c045f2c8a9dd4c4e97426c1d98c5b91aade6c39e26f4a7e5674e057c9596a240dfd3ef32053fcdc8ee58b33654cf15eec64779b1e SHA512 9bce64036f1f1c65f5910f19802aecaf3dc5ffeab0feeca10fa8d2fe1b83e212391cce23056d22fd0eda52df89e12ede68eb5d22ffcf22f935910d2af7399f12
-EBUILD lrzsz-0.12.20-r3.ebuild 1586 BLAKE2B e0b54505e4ec5bde6039340fab0b5f3191f0feb1b60de82ab49a477c6b7e8f7726526c47b853bc2c7da9f2b50421070c45f6eb5098bd2fee8d743690eb76b7fa SHA512 5330b4ba5e07e0e3c61512c757cc46d33590e5aa9e9bb81289a8811a162e1b57ce048c3226724fb92184bc3a1b45ff9552fc6f259a679a107276630ba44ca58a
-EBUILD lrzsz-0.12.20-r4.ebuild 1541 BLAKE2B 77d884836156c108db551ce947a15bd5bd79513f3172d8b29ca049df2ce778089fea45f8b145a026b580e05a1bf2c0eafe4167498d9827b4bbaed173c9e770ac SHA512 cb7ef34ac19d7d095c23ca1515a4bb65bab2d6a4cb24e36e9fff13be04e55d2323a5bb7743b66a686bb06bc3412c7ad442e2eb007d3e26d4eb98196ecb8f889a
+EBUILD lrzsz-0.12.20-r4.ebuild 1526 BLAKE2B 3e78ffb152f06a7f77f312d9918cc2ad83d4f9655867e9f7def2797cb1c978da3c68f88e3488a346bf18ad5a95fa39c5338fd003dc733a0a415cf37eab2bb797 SHA512 3b6f34b961047010d5b22b00bf78b729c2ae4f463c58364b7e8afcc691ce4fafed3fe5c3ace0e6a44cb80dabbaf62b6ce35bf3ea13ab3c3c7250cb127a3423b9
 MISC metadata.xml 359 BLAKE2B 842a9354b4b11a8894d58eda8cee0a31b60bb74981333e3e8ee383cb8caa1f0ee0577060880b123c3d73fb7cb5562a542c346f04bba3e60c5e40d9ef83a26c26 SHA512 5e033194af9899fd66ee44372089c3e63a2839a486f845ba139786a862f1b0534902465e776d901155ddffb794e7419f338b4c5ed43d6a8301c98ae8dc24db70
diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild
deleted file mode 100644
index 8449f89be7ab..000000000000
--- a/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit autotools flag-o-matic eutils toolchain-funcs
-
-DESCRIPTION="Communication package providing the X, Y, and ZMODEM file transfer protocols"
-HOMEPAGE="https://www.ohse.de/uwe/software/lrzsz.html"
-SRC_URI="https://www.ohse.de/uwe/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="nls"
-
-DEPEND="nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-autotools.patch
-	epatch "${FILESDIR}"/${PN}-implicit-decl.patch
-	epatch "${FILESDIR}"/${P}-automake-1.12.patch
-	epatch "${FILESDIR}"/${P}-automake-1.13.patch
-
-	# automake is unhappy if this is missing
-	>> config.rpath
-	# This is too old.  Remove it so automake puts in a newer copy.
-	rm -f missing
-	# Autoheader does not like seeing this file.
-	rm -f acconfig.h
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	append-flags -Wstrict-prototypes
-	econf $(use_enable nls) || die "econf failed"
-}
-
-src_test() {
-	#Don't use check target.
-	#See bug #120748 before changing this function.
-	make vcheck || die "tests failed"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		install || die "make install failed"
-
-	local x
-	for x in {r,s}{b,x,z} ; do
-		dosym l${x} /usr/bin/${x}
-		dosym l${x:0:1}z.1 /usr/share/man/man1/${x}.1
-		[ "${x:1:1}" = "z" ] || dosym l${x:0:1}z.1 /usr/share/man/man1/l${x}.1
-	done
-
-	dodoc AUTHORS COMPATABILITY ChangeLog NEWS README* THANKS TODO
-}
diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
index 0b999da1b239..cb2d74b42e8e 100644
--- a/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
+++ b/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.ohse.de/uwe/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 DEPEND="nls? ( virtual/libintl )"