From 9f322d80b846d0000268f94422b74c28979e4adf Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sat, 3 Jun 2023 09:30:56 +0100
Subject: gentoo auto-resync : 03:06:2023 - 09:30:55

---
 net-misc/Manifest.gz                           | Bin 53954 -> 53955 bytes
 net-misc/dhcpcd/Manifest                       |   6 +-
 net-misc/dhcpcd/dhcpcd-10.0.0.ebuild           | 154 -------------------------
 net-misc/dhcpcd/dhcpcd-9.5.0.ebuild            | 154 -------------------------
 net-misc/dhcpcd/dhcpcd-9.5.1.ebuild            | 153 ++++++++++++++++++++++++
 net-misc/endlessh/Manifest                     |   1 -
 net-misc/endlessh/endlessh-9999.ebuild         |  56 ---------
 net-misc/netkit-rsh/Manifest                   |   2 +-
 net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild |   4 +-
 9 files changed, 158 insertions(+), 372 deletions(-)
 delete mode 100644 net-misc/dhcpcd/dhcpcd-10.0.0.ebuild
 delete mode 100644 net-misc/dhcpcd/dhcpcd-9.5.0.ebuild
 create mode 100644 net-misc/dhcpcd/dhcpcd-9.5.1.ebuild
 delete mode 100644 net-misc/endlessh/endlessh-9999.ebuild

(limited to 'net-misc')

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 957278428fba..78a867012744 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index b329a6f7eaf2..b5b68bb126e1 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,12 +1,10 @@
 AUX dhcpcd.initd-r1 339 BLAKE2B f5c8574545d211918cba49b0e0caf22b6dd0630d3e8627e8fc4c40dc4415fd70c83889b631606085ecf87f925a7a199cd5712178a2c90186c6b8ac4f792b0789 SHA512 cd186e4c0733fcd9c333bf7c813a879c38c962bcf6a3288577f6b1632312b10f69ac68ca413c32106559d9e53fa05de78410cba677247b52bcbcf3b35024974f
 AUX dhcpcd.service-r1 308 BLAKE2B 558789adc2b67ee9d13b8213c9729f23dc691d3da8e96d93283c6c1fcf3733b17036df2a736166414a4a4738ca2a41f11b498326f18dace02e3b77945f7d8f23 SHA512 992b6f3c69b982f1dc01098dbecdee1ee2dc12e59646d13648f378a2e628cc612b65ee15a1373e3cacf7e712c6a6708c6824a9396b53e8ed8b0b3179f5267041
-DIST dhcpcd-10.0.0.tar.gz 356168 BLAKE2B a471f44f547754af8975af13d0645b90938a1b93a09d5b45b302e82aa9d70dca2bff4e39b6fc67918967526ff25a8bb6cf32140939c60a4fc5d18dec7404bf99 SHA512 3b7096a2b3fac070443b6b08dffd38a5fd388a0f2c2581598452fa20445574d7ab3d1239601d3c9ed03fcfff6c8b740c88c337be94a5397a6b292ab9a474be7f
 DIST dhcpcd-10.0.1.tar.xz 263564 BLAKE2B f1e93285d040b98bede86bb2e87e372afc0d1d124e7a6580c23d8d228a34ee17001fc3c2d9091b16fb082fe2f2ad7ba50c0dd7b0db2b2237ab1cff9ca152100a SHA512 31b0ac780b8592d3d40437837fd759a357b0200dbdc7fd8c62287a4fedc052f324fb8006daff84455906c82d5a4cb6a04916b94a0ad9b17899532f83daf51d3d
 DIST dhcpcd-9.4.1.tar.xz 257092 BLAKE2B 847c7451918ac89fe384e180ec52ee4624c0f2dc73354ecb4c63b02d8d9cf0a6d164b33e5d083a05d4868079dcf6208a820b4263c80337a12be40a27517ecf87 SHA512 530e6a5bddab4f91bd66f8d47ccd8d6cac4bc2998ddd36da7e257c83270b558016e9e1fc2f815fb99c0d86ed4bbc2a3a1b78788e69fe151fddaf94428a47fa45
-DIST dhcpcd-9.5.0.tar.gz 348645 BLAKE2B bb04391b669dd88cab448a0f98a75ecdc2e865549c75afc6732d3c70272898cdf603c97b79b38e276badcc4254703bb6b0a27f35fbb7da83aeaf2d53341c1593 SHA512 02943769ce24c1073f2634a1e2e0db74f5f95322f7690d40df49589b131ce46aeddc9b8505b8d185070b95bbd3d34284c19998bbb89e059b0ad67cd07fe98932
-EBUILD dhcpcd-10.0.0.ebuild 4644 BLAKE2B a4992ef62133d7e8e971c118a3c0ac957d9e57d8d11c9f43a0472a57a074ffc44bc5065bf290451802cefca99445ad18137ce835369104f69b90077ccd4861ae SHA512 7f673a9109286f5b0c64d2c33ea2f618ac9999778970e3e9fc640e0e8fe326f6d9cf5c052fee92f73d242b3a35e506a954cfa7637578e455abccc50f8f8396dd
+DIST dhcpcd-9.5.1.tar.xz 258280 BLAKE2B 355a98d415253608e8f586809d41e7654c1973d956cb3951218e1ff8c928ee414aa1b9854180c78e975898d9eb0f4cb9cc0fe64eefd5690b371989093e1bcb5a SHA512 979c180743d3e01d1996033d42c5606792e3acaef4e600f0ea51c362643a5b2743c6dc2792314c3b66edfa99c3b98d17f46cf3421e2088b37804e6e2167037ee
 EBUILD dhcpcd-10.0.1.ebuild 4645 BLAKE2B d91647c2848635deb660d61d6d37058a35ec2f12fb9914a6f753207d31f3284d86ba9281363b618a5e3bea509f9ac899769591ae738bc94923169b8cdc11a334 SHA512 99a22505227de7210250e7265d3099c2bae62b667a78f8a7f14cd54faaf122f3971afc07cdf0be3977e72e4004a702d7bff59c144b5f962262b18f8d7b857304
 EBUILD dhcpcd-9.4.1.ebuild 4646 BLAKE2B 9f2447bc68012dfd41188f10d62729958b1abb3804e44abb5f65cfd2ee3086fb28cd9530b420e4a0597ec9ab4af4aab7784dcbe935adfc2b017e34b3dfb8025e SHA512 63f8ce073f061a76f8c9e41b3601d4ecd13ab3471443d6cfe73149333c3bc0452f02d6bd96cfbfac664bf6b5f315eb664ec45e673ec71086d23c9e7e4e26ca46
-EBUILD dhcpcd-9.5.0.ebuild 4644 BLAKE2B a4992ef62133d7e8e971c118a3c0ac957d9e57d8d11c9f43a0472a57a074ffc44bc5065bf290451802cefca99445ad18137ce835369104f69b90077ccd4861ae SHA512 7f673a9109286f5b0c64d2c33ea2f618ac9999778970e3e9fc640e0e8fe326f6d9cf5c052fee92f73d242b3a35e506a954cfa7637578e455abccc50f8f8396dd
+EBUILD dhcpcd-9.5.1.ebuild 4613 BLAKE2B a332db91ce4c5248ccbfc8c351f81d3450d9edff579bb1eaefc47510d1ee7b493a1b040b080e6627c6ab51422afa1fa0f44b071bda0350d73ae4de7a61425374 SHA512 1c8fa3d0108734e8c3a11a0bb97a5cccfdf778050bdfcf319ec9eb62e52199c8f02e1a8742e286231ddd74a12b7f131af4d4470e69447b7cc29e6ea4e983b4a3
 EBUILD dhcpcd-9999.ebuild 4645 BLAKE2B d91647c2848635deb660d61d6d37058a35ec2f12fb9914a6f753207d31f3284d86ba9281363b618a5e3bea509f9ac899769591ae738bc94923169b8cdc11a334 SHA512 99a22505227de7210250e7265d3099c2bae62b667a78f8a7f14cd54faaf122f3971afc07cdf0be3977e72e4004a702d7bff59c144b5f962262b18f8d7b857304
 MISC metadata.xml 714 BLAKE2B 2ee7c968d6c9285404d5cd22afdf2d62db42af2d3d35f7784dffe80d448ea96dec7dcaa2d4784aa35ab7002de5784b191a71cb854eeede645fb3bf018c19f37b SHA512 44cb0105baac58bc24a7ff3d868ab2eb01d7f1447ca5f6ab830c60d8dc46212bb064bdb67d48bb86908aa9803b5dc887fd51733fccda8338828317f10895ea45
diff --git a/net-misc/dhcpcd/dhcpcd-10.0.0.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.0.ebuild
deleted file mode 100644
index a04b080f5bbd..000000000000
--- a/net-misc/dhcpcd/dhcpcd-10.0.0.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/NetworkConfiguration/dhcpcd.git"
-else
-	MY_P="${P/_alpha/-alpha}"
-	MY_P="${MY_P/_beta/-beta}"
-	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/archive/refs/tags/${MY_P}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_P}"
-
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/ https://roy.marples.name/projects/dhcpcd/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="debug +embedded ipv6 privsep +udev"
-
-DEPEND="udev? ( virtual/udev )"
-RDEPEND="
-	${DEPEND}
-	privsep? (
-		acct-group/dhcpcd
-		acct-user/dhcpcd
-	)
-"
-
-src_configure() {
-	local myeconfargs=(
-		--dbdir="${EPREFIX}/var/lib/dhcpcd"
-		--libexecdir="${EPREFIX}/lib/dhcpcd"
-		--localstatedir="${EPREFIX}/var"
-		--prefix="${EPREFIX}"
-		--with-hook=ntp.conf
-		$(use_enable debug)
-		$(use_enable embedded)
-		$(use_enable ipv6)
-		$(use_enable privsep)
-		$(usex elibc_glibc '--with-hook=yp.conf' '')
-		--rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd")
-		$(usex privsep '--privsepuser=dhcpcd' '')
-		$(usex udev '' '--without-dev --without-udev')
-		CC="$(tc-getCC)"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/dhcpcd
-	newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd
-	systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service
-}
-
-pkg_postinst() {
-	local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
-
-	local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
-	local old_duid="${EROOT}"/etc/dhcpcd.duid
-	local new_duid="${dbdir}"/duid
-	if [[ -e "${old_old_duid}" ]] ; then
-		# Upgrade the duid file to the new format if needed
-		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
-			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
-		fi
-
-		# Move the duid to /etc, a more sensible location
-		if [[ ! -e "${old_duid}" ]] ; then
-			cp -p "${old_old_duid}" "${new_duid}"
-		fi
-		old_files+=( "${old_old_duid}" )
-	fi
-
-	# dhcpcd-7 moves the files out of /etc
-	if [[ -e "${old_duid}" ]] ; then
-		if [[ ! -e "${new_duid}" ]] ; then
-			cp -p "${old_duid}" "${new_duid}"
-		fi
-		old_files+=( "${old_duid}" )
-	fi
-	local old_secret="${EROOT}"/etc/dhcpcd.secret
-	local new_secret="${dbdir}"/secret
-	if [[ -e "${old_secret}" ]] ; then
-		if [[ ! -e "${new_secret}" ]] ; then
-			cp -p "${old_secret}" "${new_secret}"
-		fi
-		old_files+=( "${old_secret}" )
-	fi
-
-	# dhcpcd-7 renames some files in /var/lib/dhcpcd
-	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
-	local new_rdm="${dbdir}"/rdm_monotonic
-	if [[ -e "${old_rdm}" ]] ; then
-		if [[ ! -e "${new_rdm}" ]] ; then
-			cp -p "${old_rdm}" "${new_rdm}"
-		fi
-		old_files+=( "${old_rdm}" )
-	fi
-	local lease=
-	for lease in "${dbdir}"/dhcpcd-*.lease*; do
-		[[ -f "${lease}" ]] || continue
-		old_files+=( "${lease}" )
-		local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
-		[[ -e "${dbdir}/${new_lease}" ]] && continue
-		cp "${lease}" "${dbdir}/${new_lease}"
-	done
-
-	# Warn about removing stale files
-	if [[ -n "${old_files[@]}" ]] ; then
-		elog
-		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
-		elog "${EROOT}/etc to ${dbdir}"
-		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
-		elog "prefix dropped."
-		elog
-		elog "You should remove these files if you don't plan on reverting"
-		elog "to an older version:"
-		local old_file=
-		for old_file in ${old_files[@]}; do
-			elog "	${old_file}"
-		done
-	fi
-
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog
-		elog "dhcpcd has zeroconf support active by default."
-		elog "This means it will always obtain an IP address even if no"
-		elog "DHCP server can be contacted, which will break any existing"
-		elog "failover support you may have configured in your net configuration."
-		elog "This behaviour can be controlled with the noipv4ll configuration"
-		elog "file option or the -L command line switch."
-		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
-
-		elog
-		elog "Dhcpcd has duid enabled by default, and this may cause issues"
-		elog "with some dhcp servers. For more information, see"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
-	fi
-
-	if ! has_version net-dns/bind-tools; then
-		elog
-		elog "If you activate the lookup-hostname hook to look up your hostname"
-		elog "using the dns, you need to install net-dns/bind-tools."
-	fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-9.5.0.ebuild b/net-misc/dhcpcd/dhcpcd-9.5.0.ebuild
deleted file mode 100644
index a04b080f5bbd..000000000000
--- a/net-misc/dhcpcd/dhcpcd-9.5.0.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/NetworkConfiguration/dhcpcd.git"
-else
-	MY_P="${P/_alpha/-alpha}"
-	MY_P="${MY_P/_beta/-beta}"
-	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/archive/refs/tags/${MY_P}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_P}"
-
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/ https://roy.marples.name/projects/dhcpcd/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="debug +embedded ipv6 privsep +udev"
-
-DEPEND="udev? ( virtual/udev )"
-RDEPEND="
-	${DEPEND}
-	privsep? (
-		acct-group/dhcpcd
-		acct-user/dhcpcd
-	)
-"
-
-src_configure() {
-	local myeconfargs=(
-		--dbdir="${EPREFIX}/var/lib/dhcpcd"
-		--libexecdir="${EPREFIX}/lib/dhcpcd"
-		--localstatedir="${EPREFIX}/var"
-		--prefix="${EPREFIX}"
-		--with-hook=ntp.conf
-		$(use_enable debug)
-		$(use_enable embedded)
-		$(use_enable ipv6)
-		$(use_enable privsep)
-		$(usex elibc_glibc '--with-hook=yp.conf' '')
-		--rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd")
-		$(usex privsep '--privsepuser=dhcpcd' '')
-		$(usex udev '' '--without-dev --without-udev')
-		CC="$(tc-getCC)"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/dhcpcd
-	newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd
-	systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service
-}
-
-pkg_postinst() {
-	local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
-
-	local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
-	local old_duid="${EROOT}"/etc/dhcpcd.duid
-	local new_duid="${dbdir}"/duid
-	if [[ -e "${old_old_duid}" ]] ; then
-		# Upgrade the duid file to the new format if needed
-		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
-			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
-		fi
-
-		# Move the duid to /etc, a more sensible location
-		if [[ ! -e "${old_duid}" ]] ; then
-			cp -p "${old_old_duid}" "${new_duid}"
-		fi
-		old_files+=( "${old_old_duid}" )
-	fi
-
-	# dhcpcd-7 moves the files out of /etc
-	if [[ -e "${old_duid}" ]] ; then
-		if [[ ! -e "${new_duid}" ]] ; then
-			cp -p "${old_duid}" "${new_duid}"
-		fi
-		old_files+=( "${old_duid}" )
-	fi
-	local old_secret="${EROOT}"/etc/dhcpcd.secret
-	local new_secret="${dbdir}"/secret
-	if [[ -e "${old_secret}" ]] ; then
-		if [[ ! -e "${new_secret}" ]] ; then
-			cp -p "${old_secret}" "${new_secret}"
-		fi
-		old_files+=( "${old_secret}" )
-	fi
-
-	# dhcpcd-7 renames some files in /var/lib/dhcpcd
-	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
-	local new_rdm="${dbdir}"/rdm_monotonic
-	if [[ -e "${old_rdm}" ]] ; then
-		if [[ ! -e "${new_rdm}" ]] ; then
-			cp -p "${old_rdm}" "${new_rdm}"
-		fi
-		old_files+=( "${old_rdm}" )
-	fi
-	local lease=
-	for lease in "${dbdir}"/dhcpcd-*.lease*; do
-		[[ -f "${lease}" ]] || continue
-		old_files+=( "${lease}" )
-		local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
-		[[ -e "${dbdir}/${new_lease}" ]] && continue
-		cp "${lease}" "${dbdir}/${new_lease}"
-	done
-
-	# Warn about removing stale files
-	if [[ -n "${old_files[@]}" ]] ; then
-		elog
-		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
-		elog "${EROOT}/etc to ${dbdir}"
-		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
-		elog "prefix dropped."
-		elog
-		elog "You should remove these files if you don't plan on reverting"
-		elog "to an older version:"
-		local old_file=
-		for old_file in ${old_files[@]}; do
-			elog "	${old_file}"
-		done
-	fi
-
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog
-		elog "dhcpcd has zeroconf support active by default."
-		elog "This means it will always obtain an IP address even if no"
-		elog "DHCP server can be contacted, which will break any existing"
-		elog "failover support you may have configured in your net configuration."
-		elog "This behaviour can be controlled with the noipv4ll configuration"
-		elog "file option or the -L command line switch."
-		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
-
-		elog
-		elog "Dhcpcd has duid enabled by default, and this may cause issues"
-		elog "with some dhcp servers. For more information, see"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
-	fi
-
-	if ! has_version net-dns/bind-tools; then
-		elog
-		elog "If you activate the lookup-hostname hook to look up your hostname"
-		elog "using the dns, you need to install net-dns/bind-tools."
-	fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-9.5.1.ebuild b/net-misc/dhcpcd/dhcpcd-9.5.1.ebuild
new file mode 100644
index 000000000000..a068cf5ff33a
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-9.5.1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/NetworkConfiguration/dhcpcd.git"
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${P}.tar.xz"
+
+	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/ https://roy.marples.name/projects/dhcpcd/"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="debug +embedded ipv6 privsep +udev"
+
+DEPEND="udev? ( virtual/udev )"
+RDEPEND="
+	${DEPEND}
+	privsep? (
+		acct-group/dhcpcd
+		acct-user/dhcpcd
+	)
+"
+
+src_configure() {
+	local myeconfargs=(
+		--dbdir="${EPREFIX}/var/lib/dhcpcd"
+		--libexecdir="${EPREFIX}/lib/dhcpcd"
+		--localstatedir="${EPREFIX}/var"
+		--prefix="${EPREFIX}"
+		--with-hook=ntp.conf
+		$(use_enable debug)
+		$(use_enable embedded)
+		$(use_enable ipv6)
+		$(use_enable privsep)
+		$(usex elibc_glibc '--with-hook=yp.conf' '')
+		--rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd")
+		$(usex privsep '--privsepuser=dhcpcd' '')
+		$(usex udev '' '--without-dev --without-udev')
+		CC="$(tc-getCC)"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	keepdir /var/lib/dhcpcd
+	newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd
+	systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service
+}
+
+pkg_postinst() {
+	local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
+
+	local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
+	local old_duid="${EROOT}"/etc/dhcpcd.duid
+	local new_duid="${dbdir}"/duid
+	if [[ -e "${old_old_duid}" ]] ; then
+		# Upgrade the duid file to the new format if needed
+		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
+			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
+		fi
+
+		# Move the duid to /etc, a more sensible location
+		if [[ ! -e "${old_duid}" ]] ; then
+			cp -p "${old_old_duid}" "${new_duid}"
+		fi
+		old_files+=( "${old_old_duid}" )
+	fi
+
+	# dhcpcd-7 moves the files out of /etc
+	if [[ -e "${old_duid}" ]] ; then
+		if [[ ! -e "${new_duid}" ]] ; then
+			cp -p "${old_duid}" "${new_duid}"
+		fi
+		old_files+=( "${old_duid}" )
+	fi
+	local old_secret="${EROOT}"/etc/dhcpcd.secret
+	local new_secret="${dbdir}"/secret
+	if [[ -e "${old_secret}" ]] ; then
+		if [[ ! -e "${new_secret}" ]] ; then
+			cp -p "${old_secret}" "${new_secret}"
+		fi
+		old_files+=( "${old_secret}" )
+	fi
+
+	# dhcpcd-7 renames some files in /var/lib/dhcpcd
+	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
+	local new_rdm="${dbdir}"/rdm_monotonic
+	if [[ -e "${old_rdm}" ]] ; then
+		if [[ ! -e "${new_rdm}" ]] ; then
+			cp -p "${old_rdm}" "${new_rdm}"
+		fi
+		old_files+=( "${old_rdm}" )
+	fi
+	local lease=
+	for lease in "${dbdir}"/dhcpcd-*.lease*; do
+		[[ -f "${lease}" ]] || continue
+		old_files+=( "${lease}" )
+		local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
+		[[ -e "${dbdir}/${new_lease}" ]] && continue
+		cp "${lease}" "${dbdir}/${new_lease}"
+	done
+
+	# Warn about removing stale files
+	if [[ -n "${old_files[@]}" ]] ; then
+		elog
+		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
+		elog "${EROOT}/etc to ${dbdir}"
+		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
+		elog "prefix dropped."
+		elog
+		elog "You should remove these files if you don't plan on reverting"
+		elog "to an older version:"
+		local old_file=
+		for old_file in ${old_files[@]}; do
+			elog "	${old_file}"
+		done
+	fi
+
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog
+		elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	if ! has_version net-dns/bind-tools; then
+		elog
+		elog "If you activate the lookup-hostname hook to look up your hostname"
+		elog "using the dns, you need to install net-dns/bind-tools."
+	fi
+}
diff --git a/net-misc/endlessh/Manifest b/net-misc/endlessh/Manifest
index 9f493fb3019d..94bb3161aa64 100644
--- a/net-misc/endlessh/Manifest
+++ b/net-misc/endlessh/Manifest
@@ -3,5 +3,4 @@ AUX endlessh.confd 1076 BLAKE2B c25a41bfb71eeaa7b6bdfb4651a1e0d8af91fb1fff6aa1c8
 AUX endlessh.initd 767 BLAKE2B fdc7a57dbf9812880ee2b95f3d23350375ae960431929c5823647d052eb38fd6d3bfb87e9a3d33356018d117a73ba1a78a855972d7e4e11d35cf3a8910b2473f SHA512 2deb46cfcdf002408933f8e20287c1be3a0deddf41d97229ec30408e769b0c9a5c8575cb3e43939e385a3187def4451b7f20acf1641da403f335d435ebabf322
 DIST endlessh-1.1.tar.gz 12844 BLAKE2B 8828739844cb03f67067bb020c3da5b5c6610a195202776da1ae184c0ab02c9f2acef32cc6536bbb80a46242251e3425eed2c70b0d1a90b0e73696ac14babc94 SHA512 7df2463425ad1417a2e328eacfb840aed14727168b83b5adf80cf6c5c98a6fc05f96bba9257b543ef60202a74383e4978e92c4a1b959e35d4ab94e0e5bda14fd
 EBUILD endlessh-1.1-r2.ebuild 1311 BLAKE2B c66bf1b86a849fd366335f435f9fb3629e54f694adc07c223fbbbbf261c4d69c1dc09ce8d66452f4240bb00d881a378c89a08a8404dcc001c9ba1a592249652b SHA512 bfcdf4b6ee299f6e416656b952ee453b29ccfedc594aed14c4a2b1513cc4cb258a06ad3bcda3433e8363492f32828dd1965dc7e6efe31c6aaa852db296891d96
-EBUILD endlessh-9999.ebuild 1257 BLAKE2B 99d9d7a62bc7701561cdefd98765e17d2c500e8f329463cbc538667944f4c174f4d82cd9fbef12e4f8b246fa8aa53cd8d71c47dae8afa5cf3e28e06ca05e1ff9 SHA512 0ec3e058fbf4d640c34aa6ecee0883993a1a73dadf4fc0d8ba44a1cf9091a2833260f07df986ddfd0c760a0173feb3e87a110de4e92b7f78ef73597625847c3d
 MISC metadata.xml 920 BLAKE2B 7bb3d657806fd50b29ecf5b29822a590f11f544c5c4b0a802088e37745509439b31bfaabd857eda648ad70653dca3a9076c4c2991f6595e8e203c305bff3cd0d SHA512 e11788e452c1230d43022a6ff11d9e05c2ae5f7ddd8c053be6fc495f63526cf1b6a49b7dc68e1701b9a3d0ac52fba3a965de144b5d63ef9ac03f86abf4428994
diff --git a/net-misc/endlessh/endlessh-9999.ebuild b/net-misc/endlessh/endlessh-9999.ebuild
deleted file mode 100644
index 60a4cd2633ee..000000000000
--- a/net-misc/endlessh/endlessh-9999.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="SSH tarpit that slowly sends and endless banner"
-HOMEPAGE="https://github.com/skeeto/endlessh"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/skeeto/${PN}.git"
-else
-	SRC_URI="https://github.com/skeeto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-fi
-
-LICENSE="Unlicense"
-SLOT="0"
-
-src_prepare() {
-	default
-
-	tc-export CC
-
-	sed -i \
-		-e 's/^CC/CC?/' \
-		-e 's/^CFLAGS   =/CFLAGS   +=/' \
-		-e 's/ -Os//' \
-		-e 's/^LDFLAGS/LDFLAGS?/' \
-		-e 's/^PREFIX/PREFIX?/' \
-		Makefile || die
-
-	sed -i -e "/^ExecStart=/ s:=/usr/local:=${EPREFIX}/usr:" \
-		-e /InaccessiblePaths/d util/endlessh.service || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-
-	einstalldocs
-
-	newinitd "${FILESDIR}"/endlessh.initd endlessh
-	newconfd "${FILESDIR}"/endlessh.confd endlessh
-
-	systemd_dounit util/endlessh.service
-
-	insinto /usr/share/${PN}
-	doins util/{pivot.py,schema.sql}
-}
-
-pkg_postinst() {
-	elog "Log parsing script installed to ${EPREFIX}/usr/share/${PN}"
-	elog "Install dev-python/pyrfc3339 if you are going to use it"
-}
diff --git a/net-misc/netkit-rsh/Manifest b/net-misc/netkit-rsh/Manifest
index 88a9b5078763..e34cfa1523d5 100644
--- a/net-misc/netkit-rsh/Manifest
+++ b/net-misc/netkit-rsh/Manifest
@@ -30,5 +30,5 @@ AUX rsh.pamd-pambase 365 BLAKE2B bb469c2d31e70a8b448b0ed282b0d66e23f68daae5958ea
 AUX rsh.xinetd 279 BLAKE2B db403023417d537fb944c677553f71e782d80dfe08dc5f938815617350c91ee50dda082c632577ec1c37ca8b40de6441a5d5fe07d3799ef1cd1f4cdf0a8d9982 SHA512 3c6b29e51adf5766ba417ef85763d5c85384be653109e02df307ed61047eb4d4706980da56b121f3bcc63b74b842c5e8ecaaf2629d18e5d2723b3aac08e0282d
 DIST netkit-rsh-0.17.tar.gz 58268 BLAKE2B 7790a91f95c51f4aa538ad614e65ecba5a565e4761c7d8167f4d175bb8bcc27cb48b569f93064285dad983e602f03bcb816da58b02b54290adcd9cabe73cd88e SHA512 0d8da4a779da137f7b3f158ad010b71f2357c86a2160dbd19331cbf45f86a46110cdfdfd3c4ba2d19ddf3634917bf981eb91bfde02c3cdbc946df8695db75218
 DIST rexec-1.5.tar.gz 18469 BLAKE2B cbb694520332a0768b8337e854baf232271a30ac328dcf4b8b16d28dc3710ad58173e135cb9eb9726b07709bcd78ef627cea550c98e00dc86bea7c64e52aa3d1 SHA512 7ed455a921ad71749154bd8e586ac2a624f357b56be17db73b9ed7c1ca1bc19cfb9aee748f79cc649184dfb535ffe5e887643b73a25c3fb6520d4e19fae7333a
-EBUILD netkit-rsh-0.17-r14.ebuild 1748 BLAKE2B 31cd4788842bfec797578b72ddea46438e3d7af3a0f7051426124fd6259bbfe9a710de0e6e67e147d502d220831a7ce1e49c2a51cd1f3d554372b3196c8418f7 SHA512 df223bf545165e5f955a5260e3f972b56707bcc187ad9fbed843a6e35bfd152c657ab093951b8bd3c832721c4858e5b43e2fe1eb8bddd5f0ed2b6a9fbc2f705f
+EBUILD netkit-rsh-0.17-r14.ebuild 1755 BLAKE2B 9254d0ff1abb692bf2711927e69d31e91bc469176a7d78d596e2a49f3e603b2541e07a290165bcb4a6f8e2255f809527a2075579e4c11ef81c283f6dc9522a1a SHA512 b6a4b8b01d0d7e220ed0d2b089cbaa5d94bb89bf7b5c2501b752ddb611b8506789df3d84827bca51b4b6ecbd2d7ec9612227f930a1653b83d5bfa42f975e6720
 MISC metadata.xml 397 BLAKE2B 17d84472dbc6d22eb4b046ddf6c8ed979d715c4d9172011d9251ddb76569dd4cfdfedce8cf07653783334f1423a915d35e48a3505a482f1fa27ff315ac10fd24 SHA512 c84f7eab56dc660367691638f3d75a11ac89d0cf5e68e36de635deb1e862ce0817849195379c9358783a38d7bf8f155276c80c6bc562d9944e46ae69eac81d98
diff --git a/net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild
index c115df77f660..b418b6da1309 100644
--- a/net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild
+++ b/net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="http://ftp.linux.org.uk/pub/linux/Networking/netkit/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="pam"
 
 RDEPEND="
-- 
cgit v1.2.3