gentoo auto-resync : 15:10:2022 - 01:47:28

17 files changed, 51 insertions, 719 deletions

diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 2a9e38f6fa53..8bfa36c32dae 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1,17 +1,14 @@
-AUX dhcp-3.0-fix-perms.patch 417 BLAKE2B 2001859a901ce59c7ff8d5741349ccec44f50e808464290490795fca4c19cb069cd7c4befdab39d9a3878066d377f69f95ca05c51aa7e388b4b5e1ab0d40c27d SHA512 7b5b607f62dae3075c9126ce0055b649a9c1fc5c0d591f40208d0c951c2a921ced63c7a4c7b78e82e463c57cffc90734b23ef51b69fe70ecb8ad366ddca97cc7
-AUX dhcp-4.2.2-dhclient-stdin-conf.patch 3017 BLAKE2B 59e2107764d49f7d9099e53d4a178876e0d71243da3c01f487a595e1e309fed5ddacdac6ee4832eaf8f26d785815ea2c571dccd0eb33bb88578dd70928ba96c3 SHA512 1adfa938e5531040008981dd4dcba37219bce0794524d3c3530eff527528ef7b22aa6fd540f9ac175339372e98347c0a91b86b4bb5f2aa93f04217b9902c3388
-AUX dhcp-4.2.5-bindtodevice-inet6.patch 826 BLAKE2B 30feafe2b8238743d08c80ea8f376d60dd89b7693a1f7d33dae78cd26635508fbe337e002cbe00228f1ad76979379655e8278374ba1839c541caff285652a0a4 SHA512 74d9d30b4803d10a63843d474dda92f019e4b7b9d7a9f4e32a49a1c261c1bb7238cd13f9b91c2bf8cf7f3ce5a5c665ef1d32998b06ca1439b30785d33827fe67
-AUX dhcp-4.3.3-ldap-ipv6-client-id.patch 2095 BLAKE2B 6f35bfb4ee123d6c0c5ecc56d882404753cc5d8ea6a342cc47bfa795a91712e83cdeee2899a63619f48566ced2edce6e24ae382e2954950cd3be534abb75dad6 SHA512 c8e48bc405d75281790c44c48d89c27b9ec7dd7273c41cacdc0e5e3b08648ae0eda1bd9b308a19667f11703b4bb25fc94911036bcca11f1197f87ec265b0c35a
-AUX dhcp-4.3.6-dhclient-ntp.patch 6810 BLAKE2B 9cf5ea5d55277e1821f2c97dc807e63a67b7712770f621e95272f58f3ac9cc12e586511114dc3c046a18624fc08caada1dd6bf4c36724219751f330a306071ff SHA512 13e4215c4fe02ea8d17a1559b2653de1bb72675eb72ae7b17707c2cf138fd620406f1d57eea3812f491df475f942e2f44b9b784d5ad5a2f352d455bef3df771e
-AUX dhcp-4.3.6-dhclient-resolvconf.patch 15340 BLAKE2B 57bd2576fa861d866b568e8814f591614167801bd3ef30270f81fd4b25637b255dd455ea8824d291b91a3a084f3aa0e55e1285fced0f8a5c684633f6ebe47a90 SHA512 264a2e073a80109c9dced6a3f7834f958990a15e578dd1435128e7ef9335b0b9751020166fbb0e1b01193c19eb28322648226fc5a1b07dc0b9452b702903cc8d
-AUX dhcp-4.3.6-iproute2-path.patch 451 BLAKE2B dcb948428326f7ca198061b1956f25981441c80d7bb8275a09f7b97c50644ba500966edf9b6483c43b96d88abba348976a0fb23b29032682da58014a9d559415 SHA512 91f20102e41cef81253617c80ba4d8193f35f51419606ab62e01f07153f1f616c70e0c43838c3d83913402f8d02ff333e4e36e08efd50aa8f8fe83939f91ae3e
-AUX dhcp-4.3.6-nogateway.patch 1904 BLAKE2B 9cb4c4a491e590958ed0654f0b1d7006e310ff5e40b3872bdcb17de45f7fb023d3d08b2433b25a362f13da89c0b818d88bb5f2d9737b3a00528c581a297f65f5 SHA512 571320f652ba5b24813ce9707f333f1d44d09c046c6371c86d011bd9d1c3c1288918851df336a881a62c6c095b6ac3bd9699f022e6f30dbb2542157b10ec20f7
-AUX dhcp-4.3.6-quieter-ping.patch 2622 BLAKE2B fc9c49f60419d39f81d097c70ee61db879578225c4d6c90eb9828852bd1c3fb5daf8de5651b0d75a020767bb7e8b7917355d7e68cc7f8fc3052e010e96115be1 SHA512 4338ca0fd733676ed6ecc790cd5305b9eca468a9be206f0a1d195d024974aabdb7def81d2181261d3b6033fd4e9b5461c07adfb3b16d1df1dc2e5f819c90ba47
-AUX dhcp-4.4.0-always-accept-4.patch 889 BLAKE2B ce7ddd45c924f31c37294eb091476ec1aae4a658beadfd1481e2b0a2044f2d1a5be6798eac3c8f677c223eadf9be043ff3e38bfaec14305a0ad823ec3b2930b8 SHA512 2801de50402443196c412d2c578c74cc040869b7dd59f6e7ae9e66e69edb1fd567de7acbc2b2612b46b5cddca08f984401fefc4f81c26ea630b193f0e0f1884e
-AUX dhcp-4.4.0-bind-disable.patch 774 BLAKE2B 32f09258aeaa3aa299de1f53008cfb4d4e6d994ee2034904bd7ab80d85189a2179e05acdcf43746349b9906df67c1a967c6371f49a07f1f01c892706c0db5160 SHA512 dee1b6dd62528c8c761fea4a61ddf0057a2f594746bf698b2cc31c5de211614c5b8cb5bab69190f0bdad4d1ec781946e91889fb5fa85ca7370d4357cb9d92dd5
-AUX dhcp-4.4.2-fno-common.patch 876 BLAKE2B 004abacf9f6167440b762fd69bcd821df6531cc1d74514841cbc88abdef5f21a51d1907cbb1424eb787fc37d8d869344f9f43dbe908e3fa28d8836d898b6efff SHA512 1a0e0c57bc08e9746e372733fff3a726d99064cde800fc921cbaab0eb19d32bf8cd813d197fd0d64b6d8f4e18c4557d0ef2e81334077d363b995012301bbe176
-AUX dhcp-4.4.2-variable-name.patch 699 BLAKE2B fd0ba7636ccd09e171bfbd6efd061335f56ea6f670c1ac3b87bd73d81938862ca065358777c05f3e5a23a8fff3d0257709fce113904afb12009da43e2908f6e2 SHA512 fccc8ab1f48756dfebec0a90ac414731cdb7f2c08e6356c5ad8b7d04f2459d94dc80692d49b304efba17beb6e2585d4250d53b3a3aee6826a934a111ee391c0a
+AUX dhcp-4.4.3-always-accept-4.patch 889 BLAKE2B ce7ddd45c924f31c37294eb091476ec1aae4a658beadfd1481e2b0a2044f2d1a5be6798eac3c8f677c223eadf9be043ff3e38bfaec14305a0ad823ec3b2930b8 SHA512 2801de50402443196c412d2c578c74cc040869b7dd59f6e7ae9e66e69edb1fd567de7acbc2b2612b46b5cddca08f984401fefc4f81c26ea630b193f0e0f1884e
 AUX dhcp-4.4.3-bind-disable.patch 974 BLAKE2B 4a833ddbd8f67d44681044ab5393e94929ac64a694b5ebfec7344634ca1dbd71bd5becc9668c89b58c6d2efc5a7ca28fba84e0dc4e3f64be942f183710a4252c SHA512 315261ffdfd349872d2c70f9f7d2ca4a6f6bf3e6b7841ae9513c13a7856b4abc95ec56153730ff0f12826d29e7898a9fa5a053ddb63ae3e0128fcce4f5702a8c
+AUX dhcp-4.4.3-bindtodevice-inet6.patch 611 BLAKE2B 0570b8c7fec82d5894d1b406ceedc3dda84ccaf1b00f5f04d10953fe1196d85d70b7b4aec2f75b68a81a3b4d6d53689cabc33ffd698c2d319d9e91b2a84ad9de SHA512 cfbab5f72c82b1cd49b2ece856b72267118f4e2e50dbffac5b9737c9e13bfcc95e7db8649452f5023b4797d84ddc2c377118fbd0628d26a5191f95ab64b5f525
+AUX dhcp-4.4.3-dhclient-ntp.patch 6810 BLAKE2B 9cf5ea5d55277e1821f2c97dc807e63a67b7712770f621e95272f58f3ac9cc12e586511114dc3c046a18624fc08caada1dd6bf4c36724219751f330a306071ff SHA512 13e4215c4fe02ea8d17a1559b2653de1bb72675eb72ae7b17707c2cf138fd620406f1d57eea3812f491df475f942e2f44b9b784d5ad5a2f352d455bef3df771e
+AUX dhcp-4.4.3-dhclient-resolvconf.patch 15642 BLAKE2B 94492900ce0667daefa20a3a42d3e6798a86c03dc4e6a3d69f501e2d6b99466feef38291acf9ad4fb225422140d09a173161cc1128979ee05049947b4744f911 SHA512 8edb0e059cff6ddeb568307e87c63dbfde0524fe0e9fd9cde1feb2b3309614b773a227d49e951ce5429338630beb909891a97a4b2cd8af00de1fa8181160cfac
+AUX dhcp-4.4.3-dhclient-stdin-conf.patch 3017 BLAKE2B 59e2107764d49f7d9099e53d4a178876e0d71243da3c01f487a595e1e309fed5ddacdac6ee4832eaf8f26d785815ea2c571dccd0eb33bb88578dd70928ba96c3 SHA512 1adfa938e5531040008981dd4dcba37219bce0794524d3c3530eff527528ef7b22aa6fd540f9ac175339372e98347c0a91b86b4bb5f2aa93f04217b9902c3388
+AUX dhcp-4.4.3-fix-perms.patch 443 BLAKE2B 5c3382cf486e1e338bff3d50bce046971466e43d4c18a86ee21d4a05c3955d8ab45810a4de951dd3635502861510ad33e1cc0803a863a3f9d249077726bc7079 SHA512 f557faf3ebeaa668bc01b4cfb5a9adc37f5d786fc8bdb4e1f6ab9f34761b8d9663dc44b55f317a5bba5c3d11ee59fcf3d94c42abc70d566a411a289360529309
+AUX dhcp-4.4.3-iproute2-path.patch 451 BLAKE2B dcb948428326f7ca198061b1956f25981441c80d7bb8275a09f7b97c50644ba500966edf9b6483c43b96d88abba348976a0fb23b29032682da58014a9d559415 SHA512 91f20102e41cef81253617c80ba4d8193f35f51419606ab62e01f07153f1f616c70e0c43838c3d83913402f8d02ff333e4e36e08efd50aa8f8fe83939f91ae3e
+AUX dhcp-4.4.3-ldap-ipv6-client-id.patch 2095 BLAKE2B 6f35bfb4ee123d6c0c5ecc56d882404753cc5d8ea6a342cc47bfa795a91712e83cdeee2899a63619f48566ced2edce6e24ae382e2954950cd3be534abb75dad6 SHA512 c8e48bc405d75281790c44c48d89c27b9ec7dd7273c41cacdc0e5e3b08648ae0eda1bd9b308a19667f11703b4bb25fc94911036bcca11f1197f87ec265b0c35a
+AUX dhcp-4.4.3-nogateway.patch 1904 BLAKE2B 9cb4c4a491e590958ed0654f0b1d7006e310ff5e40b3872bdcb17de45f7fb023d3d08b2433b25a362f13da89c0b818d88bb5f2d9737b3a00528c581a297f65f5 SHA512 571320f652ba5b24813ce9707f333f1d44d09c046c6371c86d011bd9d1c3c1288918851df336a881a62c6c095b6ac3bd9699f022e6f30dbb2542157b10ec20f7
+AUX dhcp-4.4.3-quieter-ping.patch 2622 BLAKE2B fc9c49f60419d39f81d097c70ee61db879578225c4d6c90eb9828852bd1c3fb5daf8de5651b0d75a020767bb7e8b7917355d7e68cc7f8fc3052e010e96115be1 SHA512 4338ca0fd733676ed6ecc790cd5305b9eca468a9be206f0a1d195d024974aabdb7def81d2181261d3b6033fd4e9b5461c07adfb3b16d1df1dc2e5f819c90ba47
 AUX dhcpd.conf2 1068 BLAKE2B abbe4f73517fba252398da00b9aa801d0ea411ac639b219cad4a64700b74cc14322af131e0053af948f1f1b35c5a3556af75092ea5565e01d7c0d1a602ea7c40 SHA512 7b7a77b7826b475a4113ebeee54501ce417cc56e85754301a82a185d88b4713d198f615a366e63e0e2b0aef988c8137dcd1e18c4036d993378257079da17693d
 AUX dhcpd.init5 2882 BLAKE2B 9ce56c4aef62641508b8f4d366672725dd277c18846f9a001de8d244ca03720aba2c52ca7bd34ac63b08db082489d915c23bd1c685c37699034373bde1a7c37f SHA512 0cf238f3e79ee5d1ba059331664fd092d025ecb8fdb3f1d428713d7cd81ad4efe10ad7ad4ef48146aa6c9763293c1641057a257480e58a639fc6cc20e623f4c1
 AUX dhcpd.tmpfiles 75 BLAKE2B 8e4ddbccb162c620df175dbb39621659f9905c54ba2dc46d3863438e030dee3a04bb4b528bb7ee91a1cb47564081e48ac6937a6aee4ea026adcdb1887e643152 SHA512 0c34ab0ef8618e6792ba8bda797877ce2e6c4fa433b4944dbc03cc4fc69efe26ce4b5e4dec661fbb2b7ae4173d908de02f4e86f8539364789a23f36cfd8edacb
@@ -24,10 +21,6 @@ AUX dhcrelay4.service.conf 105 BLAKE2B 52ad8018d2b6fd47b5d752a6e6626a8fa6c1d21fa
 AUX dhcrelay6.conf 325 BLAKE2B be916f3f73eab9813f6b548be254277659f267610efb3ecd53dc30a25aad02f5332f538bc9d6ca65b5d388ff83f0ee30358d56cefa440fe7f5b8a6678521ba6b SHA512 40d3a6bdf8521bf5152cf31b961aea88b2fb0339433d0b6a6360a16c796298620b377bd079c0246e97bc9c0533ddb13bbb58cc5169d0ca598e3a51d1a607a9e9
 AUX dhcrelay6.service 237 BLAKE2B 2b32d453de82873f18ce905c5c336e974d4d5263415b51860f28d93bbf449056809471da1965f6ed5e79449bfe39dba65516fb113eb140771b81e866211e01b4 SHA512 11d17aebef403fce1f3b0514f1c7206cb6520f1712c603b016c11275a83e102b969cc371dbe5a3a9c430a392dedf0c7af33692a49197092c467ea764dfaede9d
 AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9153dd26c4a0e6df687ca284554fa1d2b304af2f2dbdaac9a3cfafafc362befe8864d386f304588fa4c61092 SHA512 2ac54a5ebdf009854700e6f6b70662b36787b71a5b917fc61be35d31762508ede0e81b3874965b91de655a088914dbe43927911d8df1a16c262cb68389c168a9
-DIST dhcp-4.4.2-P1.tar.gz 9898311 BLAKE2B 7cc40dfbe578bee13c7dd7868a25d0d88358bf82b02539e933a4eba06039a43f0d99b3ef6ce811b60ed3a991b222844f4a5bd9e597c11d83b09ff551ba0380a6 SHA512 924e8b44f288361dbe837987869e57b929c73cb5e4af37cb2d7b19bca5ea8594048fb41c0792fede003188185f61b25befbc2ccda42f1f68e6b6bc22ef44b040
 DIST dhcp-4.4.3-P1.tar.gz 10081055 BLAKE2B 6cc16f7472efb1e1f6b7a83cafd9a81a16f10af7361da079c48a5eff0d9e310f475dcc82e984c20936c64867183402d00d26e5366e75bf7463ec2aea4a6f68a4 SHA512 d14dc44d1c015780ae19769816cb01015959927a1ad7a3e84b89e0463253aaf46451af88e3260347196373906d5b438c7c616fee45ec3f128aa82af6702b7154
-DIST dhcp-4.4.3.tar.gz 10078953 BLAKE2B d88570760cc00bd72d1e9c2e76c7a7b9f07cadfbe044220a43ee33fc201c217725c3909a386ae11f28346920dacb0313d78193a9e3d7eac9757384b4fe762597 SHA512 4472d6794af80b482560956cee6895889cc1aca39980f851faf56824627e95731f2983cf7c7454bc3decb0a12c874fcbd29bd6c5a9695412def6bc14c6df17e0
-EBUILD dhcp-4.4.2_p1-r2.ebuild 8410 BLAKE2B bce58f30a590a98a8d5d61076ae43d5783ab2daa6095456e4253b671d94f2012072d4525ec8e7fff2adc641496ba519aa06d438d66ab969c37cbe0a3a4f339cf SHA512 e6fe16ac2fc57f9eaa9bdafc2af75fec1053cb6191a79d1b09064cdf77c0a88e0f7254d5b97e3a1a72477814d2d57d26cc2719eef543b2c538f3d62b802fbacc
-EBUILD dhcp-4.4.3-r1.ebuild 8527 BLAKE2B 0fd7d6dc235f1d7c3e29b5879901a99d442cfd71c90e70f22ae3d57260768c5f8ed272b7f12b10c9ad0ffd83b85811cd41fb981491b1087111c446b829c1bfc1 SHA512 6db12c5cc6c176bc6be89dda65707bb21e1c36c689328c75b73b779cae6b0d97ec5173d3d2b6f1c2a3cb3ffee500f2a9f0771cf3376a36ad23688405d5c99091
-EBUILD dhcp-4.4.3_p1.ebuild 8527 BLAKE2B 0fd7d6dc235f1d7c3e29b5879901a99d442cfd71c90e70f22ae3d57260768c5f8ed272b7f12b10c9ad0ffd83b85811cd41fb981491b1087111c446b829c1bfc1 SHA512 6db12c5cc6c176bc6be89dda65707bb21e1c36c689328c75b73b779cae6b0d97ec5173d3d2b6f1c2a3cb3ffee500f2a9f0771cf3376a36ad23688405d5c99091
+EBUILD dhcp-4.4.3_p1.ebuild 8529 BLAKE2B 5b330f0333889d89456c097851cc57890b1bfb4bff4ca9e44be543a7276c5275522e0fd244252dc67e28c117787a8bd7ae7fa13526deb9b3fab6442f6e867f65 SHA512 0791828092b3cfcda94ed53a6641e27a70db0fed9ac16e411e6e31c4694f7de06d60e42fa8ff18ea5dbca37dae30efc13ec4b2c7cadd100630fd294d8a5601d7
 MISC metadata.xml 477 BLAKE2B 0e786da79e394f5dcc0812f19f81fa11327f2a173e5debb9b67929aab6100695908a2a1d990a9c25547f58b9ec7495483cd9a73e1e28da09ffcf08e77b9deaf6 SHA512 18add50afc3ff6b795a94f8fd00f13c666682beb60cea990b5a7c0d3e19a104b21d3eb29c7b8438e4386129b90b275821174eb5b7f98f4523026b6e5d714007d
diff --git a/net-misc/dhcp/dhcp-4.4.2_p1-r2.ebuild b/net-misc/dhcp/dhcp-4.4.2_p1-r2.ebuild
deleted file mode 100644
index 6b2cf7158832..000000000000
--- a/net-misc/dhcp/dhcp-4.4.2_p1-r2.ebuild
+++ /dev/null
@@ -1,285 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs flag-o-matic tmpfiles
-
-MY_PV="${PV//_alpha/a}"
-MY_PV="${MY_PV//_beta/b}"
-MY_PV="${MY_PV//_rc/rc}"
-MY_PV="${MY_PV//_p/-P}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
-HOMEPAGE="https://www.isc.org/dhcp"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
-	ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
-
-DEPEND="
-	acct-group/dhcp
-	acct-user/dhcp
-	client? (
-		kernel_linux? (
-			ipv6? ( sys-apps/iproute2 )
-			sys-apps/net-tools
-		)
-	)
-	ldap? (
-		net-nds/openldap:=
-		ssl? ( dev-libs/openssl:= )
-	)"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-dhcp )
-	vim-syntax? ( app-vim/dhcpd-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	# handle local bind hell
-	cd "${S}"/bind
-	unpack ./bind.tar.gz
-}
-
-PATCHES=(
-	# Gentoo patches - these will probably never be accepted upstream
-	# Fix some permission issues
-	"${FILESDIR}/${PN}-3.0-fix-perms.patch"
-
-	# Enable dhclient to equery NTP servers
-	"${FILESDIR}/${PN}-4.3.6-dhclient-ntp.patch"
-	"${FILESDIR}/${PN}-4.3.6-dhclient-resolvconf.patch"
-
-	# Enable dhclient to get extra configuration from stdin
-	"${FILESDIR}/${PN}-4.2.2-dhclient-stdin-conf.patch"
-	"${FILESDIR}/${PN}-4.3.6-nogateway.patch" #265531
-	"${FILESDIR}/${PN}-4.3.6-quieter-ping.patch" #296921
-	"${FILESDIR}/${PN}-4.4.0-always-accept-4.patch" #437108
-	"${FILESDIR}/${PN}-4.3.6-iproute2-path.patch" #480636
-	"${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch" #471142
-	"${FILESDIR}/${PN}-4.3.3-ldap-ipv6-client-id.patch" #559832
-
-	# Possible upstream candidates
-	"${FILESDIR}/${PN}-4.4.2-fno-common.patch" #710194
-	"${FILESDIR}/${PN}-4.4.2-variable-name.patch" #752402
-)
-
-src_prepare() {
-	default
-
-	# Brand the version with Gentoo
-	sed -i \
-		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
-		configure || die
-
-	# Change the hook script locations of the scripts
-	sed -i \
-		-e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
-		-e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
-		client/scripts/* || die
-
-	# No need for the linux script to force bash #158540
-	sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
-
-	# Quiet the freebsd logger a little
-	sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
-
-	# Remove these options from the sample config
-	sed -i -r \
-		-e "/(script|host-name|domain-name) /d" \
-		client/dhclient.conf.example || die
-
-	if use client && ! use server ; then
-		sed -i -r \
-			-e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
-			Makefile.in || die
-	elif ! use client && use server ; then
-		sed -i -r \
-			-e '/^SUBDIRS/s:\<client\>::' \
-			Makefile.in || die
-	fi
-
-	# Only install different man pages if we don't have en
-	if [[ " ${LINGUAS} " != *" en "* ]]; then
-		# Install Japanese man pages
-		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
-			einfo "Installing Japanese documention"
-			cp doc/ja_JP.eucJP/dhclient* client || die
-			cp doc/ja_JP.eucJP/dhcp* common || die
-		fi
-	fi
-	# Now remove the non-english docs so there are no errors later
-	rm -r doc/ja_JP.eucJP || die
-
-	# make the bind build work - do NOT make "binddir" local!
-	binddir="${S}/bind"
-	cd "${binddir}" || die
-	cat <<-EOF > bindvar.tmp
-	binddir=${binddir}
-	GMAKE=${MAKE:-gmake}
-	EOF
-	eapply -p2 "${FILESDIR}"/${PN}-4.4.0-bind-disable.patch
-	# Only use the relevant subdirs now that ISC
-	#removed the lib/export structure in bind.
-	sed '/^SUBDIRS/s@=.*$@= isc dns isccfg irs samples@' \
-		-i bind-*/lib/Makefile.in || die
-}
-
-src_configure() {
-	# bind defaults to stupid `/usr/bin/ar`
-	tc-export AR BUILD_CC
-	export ac_cv_path_AR=${AR}
-
-	# this is tested for by the bind build system, and can cause trouble
-	# when cross-building; since dhcp itself doesn't make use of libcap,
-	# simply disable it.
-	export ac_cv_lib_cap_cap_set_proc=no
-
-	# Use FHS sane paths ... some of these have configure options,
-	# but not all, so just do it all here.
-	local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
-	cat <<-EOF >> includes/site.h
-	#define _PATH_DHCPD_CONF     "${e}/dhcpd.conf"
-	#define _PATH_DHCLIENT_CONF  "${e}/dhclient.conf"
-	#define _PATH_DHCPD_DB       "${l}/dhcpd.leases"
-	#define _PATH_DHCPD6_DB      "${l}/dhcpd6.leases"
-	#define _PATH_DHCLIENT_DB    "${l}/dhclient.leases"
-	#define _PATH_DHCLIENT6_DB   "${l}/dhclient6.leases"
-	#define _PATH_DHCPD_PID      "${r}/dhcpd.pid"
-	#define _PATH_DHCPD6_PID     "${r}/dhcpd6.pid"
-	#define _PATH_DHCLIENT_PID   "${r}/dhcpclient.pid"
-	#define _PATH_DHCLIENT6_PID  "${r}/dhcpclient6.pid"
-	#define _PATH_DHCRELAY_PID   "${r}/dhcrelay.pid"
-	#define _PATH_DHCRELAY6_PID  "${r}/dhcrelay6.pid"
-	EOF
-
-	# Breaks with -O3 because of reliance on undefined behaviour
-	# bug #787935
-	append-flags -fno-strict-aliasing
-
-	# bug #720806, bug #801592
-	if use ppc || use arm || use hppa || [[ ${CHOST} == i486* ]] ; then
-		append-libs -latomic
-	fi
-
-	local myeconfargs=(
-		--enable-paranoia
-		--enable-early-chroot
-		--sysconfdir=${e}
-		--with-randomdev=/dev/random
-		$(use_enable ipv6 dhcpv6)
-		$(use_with ldap)
-		$(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
-		LIBS="${LIBS}"
-	)
-	econf "${myeconfargs[@]}"
-
-	# configure local bind cruft.  symtable option requires
-	# perl and we don't want to require that #383837.
-	cd bind/bind-*/ || die
-	local el
-	eval econf \
-		$(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el//\\} ; fi ; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \
-		--with-randomdev=/dev/random \
-		--disable-symtable \
-		--without-make-clean
-}
-
-src_compile() {
-	# build local bind cruft first
-	emake -C bind/bind-*/lib install
-	# then build standard dhcp code
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
-	docinto html
-	dodoc doc/References.html
-
-	if [[ -e client/dhclient ]] ; then
-		# move the client to /
-		dodir /sbin
-		mv "${ED}"/usr/sbin/dhclient "${ED}"/sbin/ || die
-
-		exeinto /sbin
-		if use kernel_linux ; then
-			newexe "${S}"/client/scripts/linux dhclient-script
-		else
-			newexe "${S}"/client/scripts/freebsd dhclient-script
-		fi
-	fi
-
-	if [[ -e server/dhcpd ]] ; then
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins contrib/ldap/dhcp.*
-			dosbin contrib/ldap/dhcpd-conf-to-ldap
-		fi
-
-		newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
-		newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
-		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
-		newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
-		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
-		newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
-
-		newtmpfiles "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
-		systemd_dounit "${FILESDIR}"/dhcpd4.service
-		systemd_dounit "${FILESDIR}"/dhcpd6.service
-		systemd_dounit "${FILESDIR}"/dhcrelay4.service
-		systemd_dounit "${FILESDIR}"/dhcrelay6.service
-		systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
-		systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
-
-		sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
-	fi
-
-	# the default config files aren't terribly useful #384087
-	local f
-	for f in "${ED}"/etc/dhcp/*.conf.example ; do
-		mv "${f}" "${f%.example}" || die
-	done
-	sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
-
-	diropts -m0750 -o dhcp -g dhcp
-	keepdir /var/lib/dhcp
-}
-
-pkg_preinst() {
-	# Keep the user files over the sample ones.  The
-	# hashing is to ignore the crappy defaults #384087.
-	local f h
-	for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
-		h=${f#*:}
-		f="/etc/dhcp/${f%:*}.conf"
-		if [ -e "${EROOT}"${f} ] ; then
-			case $(md5sum "${EROOT}"${f}) in
-				${h}*) ;;
-				*) cp -p "${EROOT}"${f} "${ED}"${f};;
-			esac
-		fi
-	done
-}
-
-pkg_postinst() {
-	if use server ; then
-		tmpfiles_process dhcpd.conf
-	fi
-
-	if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
-		ewarn
-		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
-		ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
-		ewarn "and dhcp should be removed from the default runlevel"
-		ewarn
-	fi
-}
diff --git a/net-misc/dhcp/dhcp-4.4.3-r1.ebuild b/net-misc/dhcp/dhcp-4.4.3-r1.ebuild
deleted file mode 100644
index 9db36ddb42da..000000000000
--- a/net-misc/dhcp/dhcp-4.4.3-r1.ebuild
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs flag-o-matic tmpfiles
-
-MY_PV="${PV//_alpha/a}"
-MY_PV="${MY_PV//_beta/b}"
-MY_PV="${MY_PV//_rc/rc}"
-MY_PV="${MY_PV//_p/-P}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
-HOMEPAGE="https://www.isc.org/dhcp"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
-	ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
-
-DEPEND="
-	acct-group/dhcp
-	acct-user/dhcp
-	client? (
-		kernel_linux? (
-			ipv6? ( sys-apps/iproute2 )
-			sys-apps/net-tools
-		)
-	)
-	ldap? (
-		net-nds/openldap:=
-		ssl? ( dev-libs/openssl:= )
-	)"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-dhcp )
-	vim-syntax? ( app-vim/dhcpd-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	# handle local bind hell
-	cd "${S}"/bind
-	unpack ./bind.tar.gz
-}
-
-PATCHES=(
-	# Gentoo patches - these will probably never be accepted upstream
-	# Fix some permission issues
-	"${FILESDIR}/${PN}-3.0-fix-perms.patch"
-
-	# Enable dhclient to equery NTP servers
-	"${FILESDIR}/${PN}-4.3.6-dhclient-ntp.patch"
-	"${FILESDIR}/${PN}-4.3.6-dhclient-resolvconf.patch"
-
-	# Enable dhclient to get extra configuration from stdin
-	"${FILESDIR}/${PN}-4.2.2-dhclient-stdin-conf.patch"
-	# bug #265531
-	"${FILESDIR}/${PN}-4.3.6-nogateway.patch"
-	# bug #296921
-	"${FILESDIR}/${PN}-4.3.6-quieter-ping.patch"
-	# bug #437108
-	"${FILESDIR}/${PN}-4.4.0-always-accept-4.patch"
-	# bug #480636
-	"${FILESDIR}/${PN}-4.3.6-iproute2-path.patch"
-	# bug #471142
-	"${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch"
-	# bug #559832
-	"${FILESDIR}/${PN}-4.3.3-ldap-ipv6-client-id.patch"
-
-	# Possible upstream candidates
-)
-
-src_prepare() {
-	default
-
-	# Brand the version with Gentoo
-	sed -i \
-		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
-		configure || die
-
-	# Change the hook script locations of the scripts
-	sed -i \
-		-e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
-		-e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
-		client/scripts/* || die
-
-	# No need for the linux script to force bash #158540
-	sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
-
-	# Quiet the freebsd logger a little
-	sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
-
-	# Remove these options from the sample config
-	sed -i -r \
-		-e "/(script|host-name|domain-name) /d" \
-		client/dhclient.conf.example || die
-
-	if use client && ! use server ; then
-		sed -i -r \
-			-e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
-			Makefile.in || die
-	elif ! use client && use server ; then
-		sed -i -r \
-			-e '/^SUBDIRS/s:\<client\>::' \
-			Makefile.in || die
-	fi
-
-	# Only install different man pages if we don't have en
-	if [[ " ${LINGUAS} " != *" en "* ]]; then
-		# Install Japanese man pages
-		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
-			einfo "Installing Japanese documention"
-			cp doc/ja_JP.eucJP/dhclient* client || die
-			cp doc/ja_JP.eucJP/dhcp* common || die
-		fi
-	fi
-	# Now remove the non-english docs so there are no errors later
-	rm -r doc/ja_JP.eucJP || die
-
-	# make the bind build work - do NOT make "binddir" local!
-	binddir="${S}/bind"
-	cd "${binddir}" || die
-	cat <<-EOF > bindvar.tmp
-	binddir=${binddir}
-	GMAKE=${MAKE:-gmake}
-	EOF
-	eapply -p2 "${FILESDIR}"/${PN}-4.4.3-bind-disable.patch
-	# Only use the relevant subdirs now that ISC
-	#removed the lib/export structure in bind.
-	sed '/^SUBDIRS/s@=.*$@= isc dns isccfg irs samples@' \
-		-i bind-*/lib/Makefile.in || die
-}
-
-src_configure() {
-	# bind defaults to stupid `/usr/bin/ar`
-	tc-export AR BUILD_CC
-	export ac_cv_path_AR=${AR}
-
-	# this is tested for by the bind build system, and can cause trouble
-	# when cross-building; since dhcp itself doesn't make use of libcap,
-	# simply disable it.
-	export ac_cv_lib_cap_cap_set_proc=no
-
-	# Use FHS sane paths ... some of these have configure options,
-	# but not all, so just do it all here.
-	local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
-	cat <<-EOF >> includes/site.h
-	#define _PATH_DHCPD_CONF     "${e}/dhcpd.conf"
-	#define _PATH_DHCLIENT_CONF  "${e}/dhclient.conf"
-	#define _PATH_DHCPD_DB       "${l}/dhcpd.leases"
-	#define _PATH_DHCPD6_DB      "${l}/dhcpd6.leases"
-	#define _PATH_DHCLIENT_DB    "${l}/dhclient.leases"
-	#define _PATH_DHCLIENT6_DB   "${l}/dhclient6.leases"
-	#define _PATH_DHCPD_PID      "${r}/dhcpd.pid"
-	#define _PATH_DHCPD6_PID     "${r}/dhcpd6.pid"
-	#define _PATH_DHCLIENT_PID   "${r}/dhcpclient.pid"
-	#define _PATH_DHCLIENT6_PID  "${r}/dhcpclient6.pid"
-	#define _PATH_DHCRELAY_PID   "${r}/dhcrelay.pid"
-	#define _PATH_DHCRELAY6_PID  "${r}/dhcrelay6.pid"
-	EOF
-
-	# Breaks with -O3 because of reliance on undefined behaviour
-	# bug #787935
-	append-flags -fno-strict-aliasing
-
-	# bug #720806, bug #801592
-	if use ppc || use arm || use hppa || [[ ${CHOST} == i486* ]] ; then
-		append-libs -latomic
-	fi
-
-	local myeconfargs=(
-		--enable-paranoia
-		--enable-early-chroot
-		--sysconfdir=${e}
-		--with-randomdev=/dev/random
-		$(use_enable ipv6 dhcpv6)
-		$(use_with ldap)
-		$(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
-		LIBS="${LIBS}"
-	)
-	econf "${myeconfargs[@]}"
-
-	# configure local bind cruft.  symtable option requires
-	# perl and we don't want to require that. bug #383837.
-	cd bind/bind-*/ || die
-	local el
-	eval econf \
-		$(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el//\\} ; fi ; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \
-		--with-randomdev=/dev/random \
-		--disable-symtable \
-		--without-make-clean
-}
-
-src_compile() {
-	# Build local bind cruft first
-	emake -C bind/bind-*/lib install
-	# then build standard dhcp code
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
-	docinto html
-	dodoc doc/References.html
-
-	if [[ -e client/dhclient ]] ; then
-		# Move the client to /
-		dodir /sbin
-		mv "${ED}"/usr/sbin/dhclient "${ED}"/sbin/ || die
-
-		exeinto /sbin
-		if use kernel_linux ; then
-			newexe "${S}"/client/scripts/linux dhclient-script
-		else
-			newexe "${S}"/client/scripts/freebsd dhclient-script
-		fi
-	fi
-
-	if [[ -e server/dhcpd ]] ; then
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins contrib/ldap/dhcp.*
-			dosbin contrib/ldap/dhcpd-conf-to-ldap
-		fi
-
-		newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
-		newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
-		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
-		newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
-		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
-		newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
-
-		newtmpfiles "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
-		systemd_dounit "${FILESDIR}"/dhcpd4.service
-		systemd_dounit "${FILESDIR}"/dhcpd6.service
-		systemd_dounit "${FILESDIR}"/dhcrelay4.service
-		systemd_dounit "${FILESDIR}"/dhcrelay6.service
-		systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
-		systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
-
-		sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
-	fi
-
-	# the default config files aren't terribly useful #384087
-	local f
-	for f in "${ED}"/etc/dhcp/*.conf.example ; do
-		mv "${f}" "${f%.example}" || die
-	done
-	sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
-
-	diropts -m0750 -o dhcp -g dhcp
-	keepdir /var/lib/dhcp
-}
-
-pkg_preinst() {
-	# Keep the user files over the sample ones.  The
-	# hashing is to ignore the crappy defaults #384087.
-	local f h
-	for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
-		h=${f#*:}
-		f="/etc/dhcp/${f%:*}.conf"
-		if [ -e "${EROOT}"${f} ] ; then
-			case $(md5sum "${EROOT}"${f}) in
-				${h}*) ;;
-				*) cp -p "${EROOT}"${f} "${ED}"${f};;
-			esac
-		fi
-	done
-}
-
-pkg_postinst() {
-	if use server ; then
-		tmpfiles_process dhcpd.conf
-	fi
-
-	if use client ; then
-		ewarn "The client and relay functionality will be removed in the next release!"
-		ewarn "Upstream have decided to discontinue this functionality."
-	fi
-
-	if [[ -e "${EROOT}"/etc/init.d/dhcp ]] ; then
-		ewarn
-		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
-		ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
-		ewarn "and dhcp should be removed from the default runlevel"
-		ewarn
-	fi
-}
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
index 9db36ddb42da..e425d52ea36c 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
@@ -50,26 +50,26 @@ src_unpack() {
 PATCHES=(
 	# Gentoo patches - these will probably never be accepted upstream
 	# Fix some permission issues
-	"${FILESDIR}/${PN}-3.0-fix-perms.patch"
+	"${FILESDIR}/${PN}-4.4.3-fix-perms.patch"
 
 	# Enable dhclient to equery NTP servers
-	"${FILESDIR}/${PN}-4.3.6-dhclient-ntp.patch"
-	"${FILESDIR}/${PN}-4.3.6-dhclient-resolvconf.patch"
+	"${FILESDIR}/${PN}-4.4.3-dhclient-ntp.patch"
+	"${FILESDIR}/${PN}-4.4.3-dhclient-resolvconf.patch"
 
 	# Enable dhclient to get extra configuration from stdin
-	"${FILESDIR}/${PN}-4.2.2-dhclient-stdin-conf.patch"
+	"${FILESDIR}/${PN}-4.4.3-dhclient-stdin-conf.patch"
 	# bug #265531
-	"${FILESDIR}/${PN}-4.3.6-nogateway.patch"
+	"${FILESDIR}/${PN}-4.4.3-nogateway.patch"
 	# bug #296921
-	"${FILESDIR}/${PN}-4.3.6-quieter-ping.patch"
+	"${FILESDIR}/${PN}-4.4.3-quieter-ping.patch"
 	# bug #437108
-	"${FILESDIR}/${PN}-4.4.0-always-accept-4.patch"
+	"${FILESDIR}/${PN}-4.4.3-always-accept-4.patch"
 	# bug #480636
-	"${FILESDIR}/${PN}-4.3.6-iproute2-path.patch"
+	"${FILESDIR}/${PN}-4.4.3-iproute2-path.patch"
 	# bug #471142
-	"${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch"
+	"${FILESDIR}/${PN}-4.4.3-bindtodevice-inet6.patch"
 	# bug #559832
-	"${FILESDIR}/${PN}-4.3.3-ldap-ipv6-client-id.patch"
+	"${FILESDIR}/${PN}-4.4.3-ldap-ipv6-client-id.patch"
 
 	# Possible upstream candidates
 )
diff --git a/net-misc/dhcp/files/dhcp-4.4.0-bind-disable.patch b/net-misc/dhcp/files/dhcp-4.4.0-bind-disable.patch
deleted file mode 100644
index b74255ca4e97..000000000000
--- a/net-misc/dhcp/files/dhcp-4.4.0-bind-disable.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- dhcp-4.4.0/bind/Makefile.in
-+++ dhcp-4.4.0/bind/Makefile.in
-@@ -37,6 +37,7 @@
- @BIND_ATF_TRUE@all: bind1 atf bind2
- 
- bind1:
-+disable:
- # Extract the source from the tarball, if it hasn't been already.
- 	@if test -d ${bindsrcdir} ; then                  \
- 		echo ${bindsrcdir} already unpacked... ;  \
-@@ -60,6 +61,7 @@
- 	fi
- 
- atf:
-+disable:
- # Build and copy the ATF support if not yet installed.
- 	@if test -d ./atf ; then                      \
- 		echo ATF support already installed ;  \
---- dhcp-4.4.0/bind/test
-+++ dhcp-4.4.0/bind/test
-@@ -0,0 +1 @@
-+--disable-kqueue --disable-epoll --disable-devpoll --without-openssl --without-libxml2 --enable-exportlib --with-gssapi=no --enable-threads=no @BINDCONFIG@ --includedir=${binddir}/include --libdir=${binddir}/lib
diff --git a/net-misc/dhcp/files/dhcp-4.4.2-fno-common.patch b/net-misc/dhcp/files/dhcp-4.4.2-fno-common.patch
deleted file mode 100644
index 5d0b7bdd5352..000000000000
--- a/net-misc/dhcp/files/dhcp-4.4.2-fno-common.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/client/dhclient.c
-+++ b/client/dhclient.c
-@@ -83,8 +83,6 @@
- static const char url [] = "For info, please visit https://www.isc.org/software/dhcp/";
- #endif /* UNIT_TEST */
- 
--u_int16_t local_port = 0;
--u_int16_t remote_port = 0;
- #if defined(DHCPv6) && defined(DHCP4o6)
- int dhcp4o6_state = -1; /* -1 = stopped, 0 = polling, 1 = started */
- #endif
---- a/relay/dhcrelay.c
-+++ b/relay/dhcrelay.c
-@@ -95,9 +95,6 @@
-        forward_untouched,	/* Forward without changes. */
-        discard } agent_relay_mode = forward_and_replace;
- 
--u_int16_t local_port;
--u_int16_t remote_port;
--
- /* Relay agent server list. */
- struct server_list {
- 	struct server_list *next;
---- a/server/mdb.c
-+++ b/server/mdb.c
-@@ -67,8 +67,6 @@
- 
- int numclasseswritten;
- 
--omapi_object_type_t *dhcp_type_host;
--
- isc_result_t enter_class(cd, dynamicp, commit)
- 	struct class *cd;
- 	int dynamicp;
diff --git a/net-misc/dhcp/files/dhcp-4.4.2-variable-name.patch b/net-misc/dhcp/files/dhcp-4.4.2-variable-name.patch
deleted file mode 100644
index 9f5085dd5e23..000000000000
--- a/net-misc/dhcp/files/dhcp-4.4.2-variable-name.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 261c84d91d1b4581df9f7f0ec031908299de7726 Mon Sep 17 00:00:00 2001
-From: Mark Andrews <marka@isc.org>
-Date: Thu, 19 Dec 2019 09:27:44 +1100
-Subject: [PATCH] fix variable name in conditional block
-
----
- lib/isc/stats.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/isc/stats.c b/lib/isc/stats.c
-index 5bce3c1100..a7ab97ce53 100644
---- a/bind/bind-9.11.14/lib/isc/stats.c
-+++ b/bind/bind-9.11.14/lib/isc/stats.c
-@@ -297,7 +297,7 @@ setcounter(isc_stats_t *stats,
- 	isc_atomic_store((int32_t *)&stats->counters[counter].lo,
- 			 (uint32_t)(value & 0xffffffff));
- # else
--	stats->counters[counter] = val;
-+	stats->counters[counter] = value;
- # endif
- #endif
- }
--- 
-GitLab
-
diff --git a/net-misc/dhcp/files/dhcp-4.4.0-always-accept-4.patch b/net-misc/dhcp/files/dhcp-4.4.3-always-accept-4.patch
index bbb25eb194bd..bbb25eb194bd 100644
--- a/net-misc/dhcp/files/dhcp-4.4.0-always-accept-4.patch
+++ b/net-misc/dhcp/files/dhcp-4.4.3-always-accept-4.patch
diff --git a/net-misc/dhcp/files/dhcp-4.2.5-bindtodevice-inet6.patch b/net-misc/dhcp/files/dhcp-4.4.3-bindtodevice-inet6.patch
index 77254c32e2b0..f6ea0f858c6d 100644
--- a/net-misc/dhcp/files/dhcp-4.2.5-bindtodevice-inet6.patch
+++ b/net-misc/dhcp/files/dhcp-4.4.3-bindtodevice-inet6.patch
@@ -5,15 +5,14 @@ snipped from fedora
 # dhclient -6: bind socket to interface (#1001742)
 # (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #34784])
 
-diff -up dhcp-4.2.5/common/socket.c.bindtodevice_inet6 dhcp-4.2.5/common/socket.c
---- dhcp-4.2.5/common/socket.c.bindtodevice_inet6	2013-09-17 16:47:05.000000000 +0200
-+++ dhcp-4.2.5/common/socket.c	2013-09-17 16:48:18.975997842 +0200
-@@ -245,7 +245,7 @@ if_register_socket(struct interface_info
+--- a/common/socket.c
++++ b/common/socket.c
+@@ -266,7 +266,7 @@
  
  #if defined(SO_BINDTODEVICE)
  	/* Bind this socket to this interface. */
 -	if ((local_family != AF_INET6) && (info->ifp != NULL) &&
 +	if (((do_multicast == 0)||(*do_multicast == 0)) && (info->ifp != NULL) &&
  	    setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE,
- 			(char *)(info -> ifp), sizeof(*(info -> ifp))) < 0) {
- 		log_fatal("setsockopt: SO_BINDTODEVICE: %m");
+ 		       (char *)(info -> ifp), sizeof(*(info -> ifp))) < 0) {
+ 		log_fatal("Can't set SO_BINDTODEVICE on dhcp socket for"
diff --git a/net-misc/dhcp/files/dhcp-4.3.6-dhclient-ntp.patch b/net-misc/dhcp/files/dhcp-4.4.3-dhclient-ntp.patch
index a504840dd5ab..a504840dd5ab 100644
--- a/net-misc/dhcp/files/dhcp-4.3.6-dhclient-ntp.patch
+++ b/net-misc/dhcp/files/dhcp-4.4.3-dhclient-ntp.patch
diff --git a/net-misc/dhcp/files/dhcp-4.3.6-dhclient-resolvconf.patch b/net-misc/dhcp/files/dhcp-4.4.3-dhclient-resolvconf.patch
index ccfdbcf4a206..63a67b7b1151 100644
--- a/net-misc/dhcp/files/dhcp-4.3.6-dhclient-resolvconf.patch
+++ b/net-misc/dhcp/files/dhcp-4.4.3-dhclient-resolvconf.patch
@@ -1,5 +1,5 @@
---- dhcp-4.3.6/client/scripts/bsdos
-+++ dhcp-4.3.6/client/scripts/bsdos
+--- a/client/scripts/bsdos
++++ b/client/scripts/bsdos
 @@ -1,27 +1,25 @@
  #!/bin/sh
  
@@ -55,10 +55,10 @@
 +      chmod 644 /etc/resolv.conf
 +    fi
    fi
- }
- 
---- dhcp-4.3.6/client/scripts/freebsd
-+++ dhcp-4.3.6/client/scripts/freebsd
+   # If we're making confs, may as well make an ntp.conf too
+   make_ntp_conf
+--- a/client/scripts/freebsd
++++ b/client/scripts/freebsd
 @@ -11,54 +11,23 @@
  fi
  
@@ -160,9 +160,9 @@
 +      chmod 644 /etc/resolv.conf
      fi
    fi
- }
---- dhcp-4.3.6/client/scripts/linux
-+++ dhcp-4.3.6/client/scripts/linux
+   # If we're making confs, may as well make an ntp.conf too
+--- a/client/scripts/linux
++++ b/client/scripts/linux
 @@ -35,16 +35,16 @@
  # update /etc/resolv.conf based on received values
  # This updated version mostly follows Debian script by Andrew Pollock et al.
@@ -248,10 +248,10 @@
  	fi
 -        mv -f $new_resolv_conf /etc/resolv.conf
      fi
- }
  
---- dhcp-4.3.6/client/scripts/netbsd
-+++ dhcp-4.3.6/client/scripts/netbsd
+     # If we're making confs, may as well make an ntp.conf too
+--- a/client/scripts/netbsd
++++ b/client/scripts/netbsd
 @@ -1,27 +1,25 @@
  #!/bin/sh
  
@@ -308,10 +308,10 @@
 +      chmod 644 /etc/resolv.conf
 +    fi
    fi
- }
- 
---- dhcp-4.3.6/client/scripts/openbsd
-+++ dhcp-4.3.6/client/scripts/openbsd
+   # If we're making confs, may as well make an ntp.conf too
+   make_ntp_conf
+--- a/client/scripts/openbsd
++++ b/client/scripts/openbsd
 @@ -1,27 +1,25 @@
  #!/bin/sh
  
@@ -369,10 +369,10 @@
 +      chmod 644 /etc/resolv.conf
 +    fi
    fi
- }
- 
---- dhcp-4.3.6/client/scripts/solaris
-+++ dhcp-4.3.6/client/scripts/solaris
+   # If we're making confs, may as well make an ntp.conf too
+   make_ntp_conf
+--- a/client/scripts/solaris
++++ b/client/scripts/solaris
 @@ -1,21 +1,39 @@
  #!/bin/sh  
  
@@ -418,5 +418,5 @@
 +      chmod 644 /etc/resolv.conf
 +    fi
    fi
- }
- 
+   # If we're making confs, may as well make an ntp.conf too
+   make_ntp_conf
diff --git a/net-misc/dhcp/files/dhcp-4.2.2-dhclient-stdin-conf.patch b/net-misc/dhcp/files/dhcp-4.4.3-dhclient-stdin-conf.patch
index bf5a54c32153..bf5a54c32153 100644
--- a/net-misc/dhcp/files/dhcp-4.2.2-dhclient-stdin-conf.patch
+++ b/net-misc/dhcp/files/dhcp-4.4.3-dhclient-stdin-conf.patch
diff --git a/net-misc/dhcp/files/dhcp-3.0-fix-perms.patch b/net-misc/dhcp/files/dhcp-4.4.3-fix-perms.patch
index f4b3fd18e167..5b3a8ab2c20a 100644
--- a/net-misc/dhcp/files/dhcp-3.0-fix-perms.patch
+++ b/net-misc/dhcp/files/dhcp-4.4.3-fix-perms.patch
@@ -1,6 +1,6 @@
 --- a/server/dhcpd.c
 +++ b/server/dhcpd.c
-@@ -602,6 +602,12 @@
+@@ -892,6 +892,12 @@
  	if (lftest)
  		exit (0);
  
@@ -11,5 +11,5 @@
 +#endif /* PARANOIA */
 +
  	/* Discover all the network interfaces and initialize them. */
- 	discover_interfaces (DISCOVER_SERVER);
- 
+ #if defined(DHCPv6) && defined(DHCP4o6)
+ 	if (dhcpv4_over_dhcpv6) {
diff --git a/net-misc/dhcp/files/dhcp-4.3.6-iproute2-path.patch b/net-misc/dhcp/files/dhcp-4.4.3-iproute2-path.patch
index 18b04e620c14..18b04e620c14 100644
--- a/net-misc/dhcp/files/dhcp-4.3.6-iproute2-path.patch
+++ b/net-misc/dhcp/files/dhcp-4.4.3-iproute2-path.patch
diff --git a/net-misc/dhcp/files/dhcp-4.3.3-ldap-ipv6-client-id.patch b/net-misc/dhcp/files/dhcp-4.4.3-ldap-ipv6-client-id.patch
index 2a7f8183d4e0..2a7f8183d4e0 100644
--- a/net-misc/dhcp/files/dhcp-4.3.3-ldap-ipv6-client-id.patch
+++ b/net-misc/dhcp/files/dhcp-4.4.3-ldap-ipv6-client-id.patch
diff --git a/net-misc/dhcp/files/dhcp-4.3.6-nogateway.patch b/net-misc/dhcp/files/dhcp-4.4.3-nogateway.patch
index d299cc503f60..d299cc503f60 100644
--- a/net-misc/dhcp/files/dhcp-4.3.6-nogateway.patch
+++ b/net-misc/dhcp/files/dhcp-4.4.3-nogateway.patch
diff --git a/net-misc/dhcp/files/dhcp-4.3.6-quieter-ping.patch b/net-misc/dhcp/files/dhcp-4.4.3-quieter-ping.patch
index 3efb6459ebf9..3efb6459ebf9 100644
--- a/net-misc/dhcp/files/dhcp-4.3.6-quieter-ping.patch
+++ b/net-misc/dhcp/files/dhcp-4.4.3-quieter-ping.patch