Respect $(AR), update to EAPI=4, and make sure readline/tcp-wrappers are in RDEPEND...

Package-Manager: portage-2.2.0_alpha75/cvs/Linux x86_64

diff --git a/net-ftp/tftp-hpa/ChangeLog b/net-ftp/tftp-hpa/ChangeLog
index bbfac2b08dc29ec04c0c3098d859b0c8eeb57fa6..d85de85321e516769cd0e9f83868faf06af74113 100644 (file)
--- a/net-ftp/tftp-hpa/ChangeLog
+++ b/net-ftp/tftp-hpa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/tftp-hpa
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/ChangeLog,v 1.55 2011/07/10 11:13:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/ChangeLog,v 1.56 2011/11/30 04:03:53 vapier Exp $
+
+  30 Nov 2011; Mike Frysinger <vapier@gentoo.org> tftp-hpa-5.1.ebuild:
+  Respect $(AR), update to EAPI=4, and make sure readline/tcp-wrappers are in
+  RDEPEND since they're used at runtime.
 
   10 Jul 2011; Raúl Porcel <armin76@gentoo.org> tftp-hpa-5.1.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #374001

diff --git a/net-ftp/tftp-hpa/Manifest b/net-ftp/tftp-hpa/Manifest
index de75c2a16b7b285a30a328f1451687051342cfd2..a62377a6e345f91301a4a2618c41cd8e5efb1ed7 100644 (file)
--- a/net-ftp/tftp-hpa/Manifest
+++ b/net-ftp/tftp-hpa/Manifest
@@ -1,21 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX in.tftpd.confd-0.44 576 RMD160 718a437e2d44c1594ef359784fde89d0367c2a47 SHA1 e4a051f435f56007b9efb4173e2d272b12442436 SHA256 55e67f871f070db2b7fa1428dabf55777ca87fecdbba7fa3b03e63c63734f977
 AUX in.tftpd.rc6 443 RMD160 e4a8d822b24cb9cf73b6e9601fcc58d40a203cb9 SHA1 7929ceb89811558576c7a9a4a4bb6d11bbd3c833 SHA256 3bceb3446bbebfae60d5276a2481c4311270d2e33c46e73a8bea66e330244ae0
 AUX tftp.xinetd 219 RMD160 7927ad10668599d03bbbefe55700c9a018033858 SHA1 658125a31f5348d225367441f8f528afa10f2007 SHA256 044c1c262cbeddbcddf449a694c5c472cc236aba87ea89b5a4dc7a76a1bf90a5
 DIST tftp-hpa-0.49.tar.bz2 91829 RMD160 d3a9a18f4b41dfd006c90b94b64a6473f577a7ed SHA1 28349027d7b672855414d5b8a6d45c8936e7c54d SHA256 9055064ea0aea223e82e99cbdead970dc46fa9456c91a7b3d6c0b37b62b6dd8c
 DIST tftp-hpa-5.0.tar.bz2 93039 RMD160 fbafc398b40098343b9e9e82badcfe6bd0eb3932 SHA1 7f541f085a4af5a87bf86a249421b13a30150597 SHA256 96309871519efcab829fdfcc1cca546d772ed6a0e214c9e99e77ca7aea29f734
-DIST tftp-hpa-5.1.tar.bz2 93919 RMD160 85591436968e176e1b92d2f7fe547bad34855a97 SHA1 4ccebeea0669c27a707cd38b7087d3713c485526 SHA256 fd3f92064f26367051af91ea44b2553566e3d96cd73b4ccdf28e547e18d0e24c
+DIST tftp-hpa-5.1.tar.xz 89288 RMD160 44dcf64d083aa7a988a4f377954c31bb24da2009 SHA1 ade09d8aba5cb1155d0309c42ac427358cd41853 SHA256 f736417a4d436512168ec34fe0ed13845388a3f01b862baa50b7b427e7ab5e42
 EBUILD tftp-hpa-0.49-r1.ebuild 1260 RMD160 2605a43661a2efe9d56e9696071368d30a6c5d03 SHA1 13a671ea6be4932067a324252a829584d562c53b SHA256 dc5a55d672c971814462cdf9dfbcaa889d07a054d2a2718282123cfd62f2c573
 EBUILD tftp-hpa-5.0.ebuild 1171 RMD160 61bc0cf8b8523b7d2364189201769a97010edf6e SHA1 95e830de04dfb1088ef2aa3a332088b60131cc8d SHA256 83cb495c90de7d89b856c8094dac14f5ba14e1cff6fe69e5befa750d688a868c
-EBUILD tftp-hpa-5.1.ebuild 1164 RMD160 06d42b985a9c5edf54e79bd60981d0da4943d60b SHA1 6540ab2ac379d8788ab7238991fb0e13049cc438 SHA256 6cc93aa59f24521c372aebe56b2dab8a07a936eaff5e8a4f18b2022b18226fb9
-MISC ChangeLog 9528 RMD160 fb139c8c88c1627034cdd1d39e1c24ca2e4be270 SHA1 7c6c6b8ad3441bd1f5868a81df815315d4f30a39 SHA256 b76919209ddefe272ea17d12edbd2a028df8ab24c3f4bf959903e97b46b8ae4f
+EBUILD tftp-hpa-5.1.ebuild 1243 RMD160 8a6e2c8459c18d5ec723197f91e0930e3348468c SHA1 49864acb4e7dccfdb5e256f1638641fda334d016 SHA256 10bed5930fd7cef380e2fe6a0d58ebde273f56ca7bf37dc9aa25e3fc876d48e4
+MISC ChangeLog 9718 RMD160 5d42fa659e05943edd499758f03a3e00046c5413 SHA1 f26b11a7c9f13ba0b634f6c552c3a2abc01ac868 SHA256 4c09a0a1335d73af4e1efe62a083be3f1041f10e889d1e89727e054aa24c76a1
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4ZiU4ACgkQuQc30/atMkCOdACfX0XMo5k0gEvrylvjd1tjwNRR
-+h0AoJc4irFYzwCVVFENoZXP6n2aXe7c
-=E2By
+iF4EAREIAAYFAk7VqzEACgkQaC/OocHi7JbrDwD/bKvpxEJNc2+F1oo42hpW91xz
+c5tRdPWV957ZYkEDoFoA/0o1QyVjkA6lcgMSW9IkcMUHqDIEB2ER7zdl1L/daVA6
+=ORyL
 -----END PGP SIGNATURE-----

diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.1.ebuild b/net-ftp/tftp-hpa/tftp-hpa-5.1.ebuild
index ff5e681d4d084b003d7f1625c8fc9e020aef186b..24ce7bc0428d8d00cfde5e829772b3a550af47b1 100644 (file)
--- a/net-ftp/tftp-hpa/tftp-hpa-5.1.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.1.ebuild
@@ -1,10 +1,14 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-5.1.ebuild,v 1.7 2011/07/10 11:13:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-5.1.ebuild,v 1.8 2011/11/30 04:03:53 vapier Exp $
+
+EAPI="4"
+
+inherit toolchain-funcs
 
 DESCRIPTION="port of the OpenBSD TFTP server"
 HOMEPAGE="http://www.kernel.org/pub/software/network/tftp/"
-SRC_URI="mirror://kernel/software/network/tftp/${P}.tar.bz2"
+SRC_URI="mirror://kernel/software/network/tftp/${PN}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -12,23 +16,25 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="ipv6 readline selinux tcpd"
 
 RDEPEND="selinux? ( sec-policy/selinux-tftpd )
+       readline? ( sys-libs/readline )
+       tcpd? ( sys-apps/tcp-wrappers )
        !net-ftp/atftp
        !net-ftp/netkit-tftp"
-DEPEND="${RDEPEND}
-       readline? ( sys-libs/readline )
-       tcpd? ( sys-apps/tcp-wrappers )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+       sed -i "/^AR/s:ar:$(tc-getAR):" MCONFIG.in || die
+}
 
-src_compile() {
+src_configure() {
        econf \
                $(use_with ipv6) \
                $(use_with tcpd tcpwrappers) \
-               $(use_with readline) \
-               || die
-       emake || die
+               $(use_with readline)
 }
 
 src_install() {
-       emake INSTALLROOT="${D}" install || die
+       emake INSTALLROOT="${D}" install
        dodoc README* CHANGES tftpd/sample.rules
 
        # iputils installs this