gentoo resync : 24.12.2018

3 files changed, 37 insertions, 30 deletions

diff --git a/net-ftp/atftp/Manifest b/net-ftp/atftp/Manifest
index 476afe9494ab..f1d4117287ff 100644
--- a/net-ftp/atftp/Manifest
+++ b/net-ftp/atftp/Manifest
@@ -10,8 +10,9 @@ AUX atftp.confd 105 BLAKE2B 6672479bce2240d4c34c70853227a769fa45c06e4b5c04f7d5ae
 AUX atftp.init 438 BLAKE2B 1783431801dbf04353bde6c3766c7d0acdd06b8ec853c8fba5cf1bbfe6c7020b55305f44992e3921a63654f290a28c28373dd94f925188c72105c8a3dd047dca SHA512 b64f78658d2da17a4fe4237835c0a6a0cc59d0b7278e8f6f49673ffd8a97a9473e4773b43bcc70d312043ee4324d8105c50f0cfcf6055c0755ce598c9d7e5a23
 AUX atftp.service 233 BLAKE2B 4c9a1a8041ffc4cdf71a24800494f340121beb9bde9760fa090b9e515ef0b2aa7dd73173543c75fde465dbf9cc229b04acc9e72c296fa27cace2063128de06c6 SHA512 533372c4863e39d6139ddc491c2b2b2051f1094a90d9854879f28bae7975c8dc997696318794cd1136f9cc542a8f418ad8361b87dd6b3455445d8528d2cc993a
 AUX atftp.service.conf 45 BLAKE2B dd52bd3ef0d72f28d2e317282026d354b6023f8b51634d0374623c782afacae1284f5385967dfa91026553845f9283be59b4c7d96031da85261067b7be6544f7 SHA512 661befb6873eee6c0ed25fd5cb156e3d7c4ef801d2f58cda8df0f0c5fd851c7eb28089a9399529164c61505963e9d10143df2195d57ff66f85ad0e2750fbbd57
+DIST atftp-0.7.dfsg.tar.gz 187992 BLAKE2B 8196c333ea8042879196ca9f9c656b4d60a332ed1d64a5738870e1d4fd5f108716da6769bf52759626ad3efce11946b5d6285ac9fbe46cb63e6e2d051fc7aeb3 SHA512 40d231c0bc0478fedb3eff9b4c540c62dd9bd6c40d9738e2db1813797a5d48e201720d43a48970ce250f1bb5b15460bb9b3d631c06f96c1a74775ecfb6d13f82
 DIST atftp-0.7.tar.gz 202234 BLAKE2B 65ff486b6ef2b42b2a4737f121c2c36e8ff73838f3c10592c11020acdf2afdf0883fda8b39613e1cc35b47141fd29543a7ef2c3e2ead857033ad4f7181c91d04 SHA512 81c51b613a640f7db4d26da0fb891bda345d11d3f39e0af37f393d2abf619094c1de83f92f04ac75367f546cc70e37d7d47c1535c241c941036fd4df7863a440
 DIST atftp_0.7-11.diff.gz 26055 BLAKE2B c9be58836b5a7e3943dd28dd4661abab5e86b1941c9a2b58786eebe702ab515cf1bc08bf44c8ab4157584a437e861e24eb0c833c1fa1bc774f7f8a2134b6cd27 SHA512 28747f8f3ef2fc3b122361f682fe26ba93acf09b190f61efb3cfcbb6bdeef78cfe1348aeaf1699003a7e02586579be670d85b65baad1b1165a4bec9a9279adb5
-EBUILD atftp-0.7-r3.ebuild 1850 BLAKE2B 532cf664672143ffb7ba4a6ead87201ee4d3061afb5a4fc9a15eb1763cf8988a38f5bb7df18a626a1f1418187a6494181c3925684c6c2927179ee33e7ea51065 SHA512 794f4787698f65a5801cff0fd7f18504376064d0c8397f855f837c5eefe9e8f24b14fe42a8afd06802cdddd989f5d5f313ec2724c069566a3bd63b937bb94464
-EBUILD atftp-0.7-r5.ebuild 1768 BLAKE2B 052c826507b9b79edea36b2817e2e6e066e1cc8c2d196f232855fdaac1b05e5628b77cd70c33aa06a290a7d84a8e4b202967cb920fa1be14d29b468f53d49de2 SHA512 7c82f1c78379147739054075ea0402b702a2f8b5574131e52cbbba1243feba8646aa70d41667b1be369d759c343c6d364142ca7f0f7507abfc70faf3b34db466
+EBUILD atftp-0.7-r5.ebuild 1765 BLAKE2B e16085096afbc2172f6974978ff4dfe0120b16a81b66e3a86c3f5bdea5d76f28c6ae6233379294c07dbd1371d438335d11a7401a771e1a4e310ca811ddcf3b03 SHA512 064e9c15c2d8c298f33c505b12ef32f986da77404aa63663c19aac884c2176e1e4f372ffdf7d2bbf13f6b0c048685dc795a4fd3e97a2e925206f7c829c538037
+EBUILD atftp-0.7-r6.ebuild 1831 BLAKE2B 076b4853e8a1066d359b8ebac48eb9551e9b9b8083833752b4ba050e67b05e971b9979b95878e7e6176e193a243768544a16c9acf48e18b88a3167f4fdd45003 SHA512 e0f2cfe21ac0d293620850cba2994d2436fc33812e6e04b42cb719458c5c2aa5ec1075f70cc388ae7ecb328666aad87d88c8a48c562e009da5a0d71ec2da800c
 MISC metadata.xml 215 BLAKE2B 8f7aa1a33da6c92db40f6122e500209464b76f7520190c109e697a9aa6f9a4447581098bd3eeb775c306855401f6b419b501c69dd0b37c9d55d083d3df316487 SHA512 dfbc3b8198f877d6f858c9228f92e82926664db8f0f19cd6ba97ce06b52d93a998e78c44fd502f20bf249cd70d612f1c0bdc01c9d66ea8495c54dab399b62116
diff --git a/net-ftp/atftp/atftp-0.7-r5.ebuild b/net-ftp/atftp/atftp-0.7-r5.ebuild
index 98408a1a5019..c72eba363adf 100644
--- a/net-ftp/atftp/atftp-0.7-r5.ebuild
+++ b/net-ftp/atftp/atftp-0.7-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-ftp/atftp/atftp-0.7-r3.ebuild b/net-ftp/atftp/atftp-0.7-r6.ebuild
index 785ff81f7e82..64badd5fa1e9 100644
--- a/net-ftp/atftp/atftp-0.7-r3.ebuild
+++ b/net-ftp/atftp/atftp-0.7-r6.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils flag-o-matic systemd
+EAPI=6
+inherit autotools flag-o-matic systemd
 
 DEBIAN_PV="11"
-DEBIAN_A="${PN}_${PV}-${DEBIAN_PV}.diff.gz"
+DEBIAN_A="${PN}_${PV}-${DEBIAN_PV}.diff"
 
 DESCRIPTION="Advanced TFTP implementation client/server"
-HOMEPAGE="ftp://ftp.mamalinux.com/pub/atftp/"
-SRC_URI="ftp://ftp.mamalinux.com/pub/atftp/${P}.tar.gz
-	mirror://debian/pool/main/a/${PN}/${DEBIAN_A}"
+HOMEPAGE="https://sourceforge.net/projects/atftp/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.dfsg.tar.gz
+	mirror://debian/pool/main/a/${PN}/${DEBIAN_A}.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,7 +18,7 @@ KEYWORDS="amd64 arm ppc ppc64 ~s390 sparc x86"
 IUSE="selinux tcpd readline pcre"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	readline? ( sys-libs/readline )
+	readline? ( sys-libs/readline:0= )
 	pcre? ( dev-libs/libpcre )"
 RDEPEND="${DEPEND}
 	!net-ftp/netkit-tftp
@@ -26,23 +26,33 @@ RDEPEND="${DEPEND}
 	!net-ftp/uftpd
 	selinux? ( sec-policy/selinux-tftp )"
 
+PATCHES=(
+	"${WORKDIR}/${DEBIAN_A}"
+	"${FILESDIR}/${P}-pcre.patch"
+	"${FILESDIR}/${P}-password.patch"
+	"${FILESDIR}/${P}-tests.patch"
+	"${FILESDIR}/${P}-glibc24.patch"
+	"${FILESDIR}/${P}-blockno.patch"
+	"${FILESDIR}/${P}-spaced_filename.patch"
+	"${FILESDIR}/${P}-illreply.patch"
+	"${FILESDIR}/${P}-CFLAGS.patch"
+)
+
+src_unpack() {
+	default
+	mv atftp-0.7.dfsg atftp-0.7 || die
+}
+
 src_prepare() {
-	epatch "${DISTDIR}"/${DEBIAN_A}
-	epatch "${FILESDIR}"/${P}-pcre.patch
-	epatch "${FILESDIR}"/${P}-password.patch
-	epatch "${FILESDIR}"/${P}-tests.patch
-	epatch "${FILESDIR}"/${P}-glibc24.patch
-	epatch "${FILESDIR}"/${P}-blockno.patch
-	epatch "${FILESDIR}"/${P}-spaced_filename.patch
-	epatch "${FILESDIR}"/${P}-illreply.patch
-	# remove upstream's broken CFLAGS
-	sed -i.orig -e \
-	  '/^CFLAGS="-g -Wall -D_REENTRANT"/s,".*","",g' \
-	  "${S}"/configure
+	append-cppflags -D_REENTRANT -DRATE_CONTROL
+	# fix #561720 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
+
+	default
+	eautoreconf
 }
 
 src_configure() {
-	append-flags -D_REENTRANT -DRATE_CONTROL
 	econf \
 		$(use_enable tcpd libwrap) \
 		$(use_enable readline libreadline) \
@@ -50,12 +60,8 @@ src_configure() {
 		--enable-mtftp
 }
 
-src_compile() {
-	emake CFLAGS="${CFLAGS}"
-}
-
 src_install() {
-	emake install DESTDIR="${D}"
+	default
 
 	newinitd "${FILESDIR}"/atftp.init atftp
 	newconfd "${FILESDIR}"/atftp.confd atftp
@@ -67,6 +73,6 @@ src_install() {
 	dodoc "${S}"/docs/*
 
 	docinto test
-	cd "${S}"/test
+	cd "${S}"/test || die
 	dodoc load.sh mtftp.conf pcre_pattern.txt test.sh test_suite.txt
 }