From 3d8acecf8a4943b9d1d43aeb8da399a09c716cd7 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Sun, 3 Apr 2022 03:48:30 +0100
Subject: net-ftp/tftp-hpa: adapt to iputils tftpd removal

Signed-off-by: Sam James <sam@gentoo.org>
---
 net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild | 80 ---------------------------------
 net-ftp/tftp-hpa/tftp-hpa-5.2-r3.ebuild | 80 +++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+), 80 deletions(-)
 delete mode 100644 net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
 create mode 100644 net-ftp/tftp-hpa/tftp-hpa-5.2-r3.ebuild

(limited to 'net-ftp/tftp-hpa')

diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild b/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
deleted file mode 100644
index 30a1a4c26456..000000000000
--- a/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="Port of the OpenBSD TFTP server"
-HOMEPAGE="https://www.kernel.org/pub/software/network/tftp/"
-SRC_URI="https://www.kernel.org/pub/software/network/tftp/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-4"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos"
-IUSE="ipv6 readline selinux tcpd +client +server"
-
-DEPEND="
-	readline? ( sys-libs/readline:0= )
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-tftp )
-	!net-ftp/atftp
-	server? (
-		!net-misc/iputils[tftpd(+)]
-		!net-ftp/uftpd
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/tftp-hpa-5.2-gcc-10.patch
-)
-
-src_prepare() {
-	default
-	sed -i "/^AR/s:ar:$(tc-getAR):" MCONFIG.in || die
-}
-
-src_configure() {
-	local myconf=(
-		ac_cv_search_bsd_signal=no
-		$(use_with ipv6)
-		$(use_with tcpd tcpwrappers)
-		$(use_with readline)
-	)
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake version.h
-	emake -C lib
-	emake -C common
-	if use client; then
-		emake -C tftp
-	fi
-	if use server; then
-		emake -C tftpd
-	fi
-}
-
-src_install() {
-	dodoc README* CHANGES tftpd/sample.rules
-
-	if use client; then
-		emake INSTALLROOT="${D}" -C tftp install
-	fi
-	if use server; then
-		emake INSTALLROOT="${D}" -C tftpd install
-
-		newconfd "${FILESDIR}"/in.tftpd.confd-0.44 in.tftpd
-		newinitd "${FILESDIR}"/in.tftpd.rc6 in.tftpd
-
-		systemd_dounit "${FILESDIR}"/tftp.service
-		systemd_dounit "${FILESDIR}"/tftp.socket
-
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/tftp.xinetd tftp
-	fi
-}
diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.2-r3.ebuild b/net-ftp/tftp-hpa/tftp-hpa-5.2-r3.ebuild
new file mode 100644
index 000000000000..54d062e02d68
--- /dev/null
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.2-r3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="Port of the OpenBSD TFTP server"
+HOMEPAGE="https://www.kernel.org/pub/software/network/tftp/"
+SRC_URI="https://www.kernel.org/pub/software/network/tftp/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-4"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos"
+IUSE="ipv6 readline selinux tcpd +client +server"
+
+DEPEND="
+	readline? ( sys-libs/readline:0= )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-tftp )
+	!net-ftp/atftp
+	server? (
+		!net-misc/iputils[tftpd(-)]
+		!net-ftp/uftpd
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/tftp-hpa-5.2-gcc-10.patch
+)
+
+src_prepare() {
+	default
+	sed -i "/^AR/s:ar:$(tc-getAR):" MCONFIG.in || die
+}
+
+src_configure() {
+	local myconf=(
+		ac_cv_search_bsd_signal=no
+		$(use_with ipv6)
+		$(use_with tcpd tcpwrappers)
+		$(use_with readline)
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake version.h
+	emake -C lib
+	emake -C common
+	if use client; then
+		emake -C tftp
+	fi
+	if use server; then
+		emake -C tftpd
+	fi
+}
+
+src_install() {
+	dodoc README* CHANGES tftpd/sample.rules
+
+	if use client; then
+		emake INSTALLROOT="${D}" -C tftp install
+	fi
+	if use server; then
+		emake INSTALLROOT="${D}" -C tftpd install
+
+		newconfd "${FILESDIR}"/in.tftpd.confd-0.44 in.tftpd
+		newinitd "${FILESDIR}"/in.tftpd.rc6 in.tftpd
+
+		systemd_dounit "${FILESDIR}"/tftp.service
+		systemd_dounit "${FILESDIR}"/tftp.socket
+
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/tftp.xinetd tftp
+	fi
+}
-- 
cgit v1.2.3-65-gdbad