[gentoo-commits] repo/gentoo:master commit in: net-ftp/tftp-hpa/

[Mike Gilbert]

commit:     3c6b2db93a64564c572eceed7ca627b062c2aa5d
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 17:49:37 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 17:49:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c6b2db9

net-ftp/tftp-hpa: several fixes

Fix dependencies.
Add blocker on net-misc/iputils[tftpd].
Apply patches correctly.
Use an array in src_configure.
Prevent automagic dep on libbsd for bsd_signal().
Install man page.

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild b/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
index 239a1184ef6..3381ec42a76 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
@@ -14,33 +14,35 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos"
 IUSE="ipv6 readline selinux tcpd +client +server"
 
-CDEPEND="
+DEPEND="
 	readline? ( sys-libs/readline:0= )
 	tcpd? ( sys-apps/tcp-wrappers )
-	"
+"
 
-DEPEND="${CDEPEND}
-	app-arch/xz-utils
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-tftp )
 	!net-ftp/atftp
-	!net-ftp/uftpd"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-tftp )"
+	!net-ftp/uftpd
+	server? ( !net-misc/iputils[tftpd(+)] )
+"
 
 PATCHES=(
 	"${FILESDIR}"/tftp-hpa-5.2-gcc-10.patch
 )
 
 src_prepare() {
-	eapply_user
+	default
 	sed -i "/^AR/s:ar:$(tc-getAR):" MCONFIG.in || die
 }
 
 src_configure() {
-	econf \
-		$(use_with ipv6) \
-		$(use_with tcpd tcpwrappers) \
+	local myconf=(
+		ac_cv_search_bsd_signal=no
+		$(use_with ipv6)
+		$(use_with tcpd tcpwrappers)
 		$(use_with readline)
+	)
+	econf "${myconf[@]}"
 }
 
 src_compile() {
@@ -64,8 +66,6 @@ src_install() {
 	if use server; then
 		emake INSTALLROOT="${D}" -C tftpd install
 
-		rm "${ED}"/usr/share/man/man8/tftpd.8 || die
-
 		newconfd "${FILESDIR}"/in.tftpd.confd-0.44 in.tftpd
 		newinitd "${FILESDIR}"/in.tftpd.rc6 in.tftpd