[gentoo-commits] repo/gentoo:master commit in: net-ftp/atftp/files/, net-ftp/atftp/

["David Seifert" <soap@gentoo.org>]

commit:     6ffa68b51d52e48b2913c94e2eefbc535ec4b61f
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 14 18:30:43 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 18:31:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ffa68b5

net-ftp/atftp: Add missing die, format patch for -p1, EAPI=6

Package-Manager: portage-2.2.26

 .../{atftp-0.7-r4.ebuild => atftp-0.7-r5.ebuild}   | 44 +++++++++++-----------
 net-ftp/atftp/files/atftp-0.7-CFLAGS.patch         | 32 ++++++++++++++++
 net-ftp/atftp/files/atftp-0.7-illreply.patch       |  4 +-
 3 files changed, 55 insertions(+), 25 deletions(-)

diff --git a/net-ftp/atftp/atftp-0.7-r4.ebuild b/net-ftp/atftp/atftp-0.7-r5.ebuild
similarity index 62%
rename from net-ftp/atftp/atftp-0.7-r4.ebuild
rename to net-ftp/atftp/atftp-0.7-r5.ebuild
index 44e2e25..3e5bb46 100644
--- a/net-ftp/atftp/atftp-0.7-r4.ebuild
+++ b/net-ftp/atftp/atftp-0.7-r5.ebuild
@@ -2,16 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-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}"
+	mirror://debian/pool/main/a/${PN}/${DEBIAN_A}.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -26,26 +26,28 @@ RDEPEND="${DEPEND}
 	!net-ftp/tftp-hpa
 	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_prepare() {
+	append-cppflags -D_REENTRANT -DRATE_CONTROL
 	# fix #561720 by restoring pre-GCC5 inline semantics
 	append-cflags -std=gnu89
 
-	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 || die
+	default
+	eautoreconf
 }
 
 src_configure() {
-	append-flags -D_REENTRANT -DRATE_CONTROL
 	econf \
 		$(use_enable tcpd libwrap) \
 		$(use_enable readline libreadline) \
@@ -53,12 +55,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
@@ -70,6 +68,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
 }

diff --git a/net-ftp/atftp/files/atftp-0.7-CFLAGS.patch b/net-ftp/atftp/files/atftp-0.7-CFLAGS.patch
new file mode 100644
index 0000000..566c179
--- /dev/null
+++ b/net-ftp/atftp/files/atftp-0.7-CFLAGS.patch
@@ -0,0 +1,32 @@
+--- atftp-0.7/configure.ac
++++ atftp-0.7/configure.ac
+@@ -66,29 +66,6 @@
+ dnl Check for AIX
+ AC_AIX
+ 
+-CFLAGS="-g -Wall -D_REENTRANT"
+-
+-if test x$debug = xtrue; then
+-   CFLAGS="$CFLAGS -O0 -DDEBUG"
+-else
+-  if test -n "$auto_cflags"; then
+-    if test -n "$GCC"; then
+-      CFLAGS="$CFLAGS -g -O2 -Wall -Wno-implicit"
+-    else
+-      case "$host_os" in
+-        *hpux*)  CFLAGS="$CFLAGS +O3"
+-	  ;;
+-        *ultrix* | *osf*) CFLAGS="$CFLAGS -O -Olimit 2000"
+-	  ;;
+-        *)       CFLAGS="$CFLAGS -O2"
+-	  ;;
+-      esac
+-    fi
+-  else
+-    CFLAGS="$CFLAGS -O2"
+-  fi
+-fi
+-
+ AC_PROG_MAKE_SET
+ AC_PROG_INSTALL
+ 

diff --git a/net-ftp/atftp/files/atftp-0.7-illreply.patch b/net-ftp/atftp/files/atftp-0.7-illreply.patch
index e18bbd9..0f1cacd 100644
--- a/net-ftp/atftp/files/atftp-0.7-illreply.patch
+++ b/net-ftp/atftp/files/atftp-0.7-illreply.patch
@@ -1,5 +1,5 @@
-*** tftp_def.old.c      2009-02-28 17:56:12.000000000 +0100
---- tftp_def.c  2009-02-28 17:57:02.000000000 +0100
+*** atftp-0.7/tftp_def.old.c      2009-02-28 17:56:12.000000000 +0100
+--- atftp-0.7/tftp_def.c  2009-02-28 17:57:02.000000000 +0100
 ***************
 *** 141,146 ****
 --- 141,147 ----