gentoo resync : 16.09.2020

15 files changed, 144 insertions, 688 deletions

diff --git a/net-misc/netifrc/Manifest b/net-misc/netifrc/Manifest
index d2cd1f38a3ce..44e777d7a0a5 100644
--- a/net-misc/netifrc/Manifest
+++ b/net-misc/netifrc/Manifest
@@ -1,26 +1,9 @@
-AUX netifrc-0.4.0-interface-types.patch 902 BLAKE2B a0c46f3f55944c1390434906f7d526b2531dca133c5965ea2a34fce1759ebb6db386242c99c20492f8556341722e39a4e549fc5fed80749d3490405f7f7af2ec SHA512 ffc5e805e2130cee1f423bc0e10efc1c63e91ca6e7ac0329c38e9a2ea7e5197873c20a13d9f48c48f7c5927767a5817574d1b43acc2e443e7cdd92867d6b11e5
-DIST netifrc-0.2.2.tar.bz2 61115 BLAKE2B e968fd8c5e86e38a2de1ca18608a87cc1a69d5d333595f5efc0afe6a79b19f90cf725b3f56defd4762e2451df06eb49a2ec75feda5f5f60874984c659d5df578 SHA512 c31b5f5ccd5e76a568ba5acf143eea5413c5911fa7a14a00a983a71cbe737fc40e814686f4916377ac5404b35805503463c2cb371943a76a27124247fd9f9fe3
-DIST netifrc-0.2.3.tar.bz2 61427 BLAKE2B 2531c2a54f2b0ccc84368f4c489f13db09913bdedbb042009bcd60f87284a786de8e942915053076745f2940078b0ebdfba3e2fd3861b0c9e8ecfc033535f46e SHA512 fb3c555956e83831ae6bb0e73c8e1e0a6f3d9c806d148aa2f3e9dc92edc48a19bc65743eea1dc8ada924081eb2cedc5e02b14d8614145f08b1728e973cfd412d
-DIST netifrc-0.2.4.tar.bz2 61828 BLAKE2B 77efc7fc187a301d82f3ecc36f152e929de64c2792b3b884bb260afc12664eaf4b8a88fbde4d7fd33c5443f0c85b9473777411957916303d077cd99a8b984bca SHA512 a8dd7d1d79e91eb37c938a7b06c835d667d5b39ad5e7bdbd6a1b18d17ac6f828935a83ca119d49b9903e9fe7ca48f0c003b28a6c52252f9f0217b96ec2c2df41
-DIST netifrc-0.3.0.tar.bz2 68461 BLAKE2B c304f04bac2df3091ca407d834f5121f31687aa73b70cf426a5c639c8f3057493b027c3d444450c1627ad4520cb68b44df427586e48066cff84bffdb918589f4 SHA512 e28c00e5318c17e46bbdbcd471252729b73a4a0af930a4bf6213d30441650390b6bb83678cfd1fbeddd8102f947016a18976538dcf316cfab08461adf301686c
-DIST netifrc-0.3.1.tar.bz2 69213 BLAKE2B c327117df6e10cc8485d8e67a6d01ad3030a0624ecef9e8352628c784747dd0e2d6b7ab81f198816802c0320aaaf8ed1d0d109ac6e889d248d9130f34055ae03 SHA512 de7d9291c3303e077c86e1fd42c6d9319308f0b51f28a034f9ed830aa504d2830ce96816a391811bcfadd07500e9c439acd4c4365555d7a3e47e58178b53465b
-DIST netifrc-0.4.0.tar.bz2 75517 BLAKE2B 2ae5169b040268d299ed6a043c169b132378ccb8a60b01142942ed8a5b8f51ef10b5ff9f674f626dabc53198712766b53ddbf8ee41dd87af8b5512e041143cb7 SHA512 a6b525a8f084a3cc9e4afa452617c001a225475689ed5ecb86703178eb252b70eb2dfc294789e29c6001098087a7ca2238ff9c8763accf3a66d39cff86614e85
-DIST netifrc-0.5.0.tar.bz2 78738 BLAKE2B b0627aaf0ee0526cfbb6af3c8cb82476ee910d19d16ee4a3ebf736fce0e91c2a7a44bf2400b0854bbfc2cc0f3f0bc84ef917760326c2a73a59a60314c5a8f7d8 SHA512 2348c0df590d6060de3756a5111ac2916047e21ce56d43fc0b8d99946f93ca02ce300abcd9243e1e4cbcd5ab89ea6ed0869785cdb5297a669aeb6812788933b0
+AUX netifrc-0.7.1-dhcpcd_args_tempfile.patch 2079 BLAKE2B 443a4a9e68b63cb85060ade03f916b827ae9708714bb6ba6beac19568b3dcab66bebfca450381c394478168c3e857ffc91b566b792a9d9b4c84d620ca94ed0b4 SHA512 04cbe1c525f0a81883c0058625a629929f1904ba97e41629f0c3ef4d1a3998daeff65b98fa37e03443159c9d9392a848f1c754499c1b2033d8f4789a2c9d14e4
+AUX netifrc-0.7.1-dhcpcd_pidfile_location.patch 1580 BLAKE2B c1fa6aeedf5964b41a0629985633085c8aef6812b6f5ce09dc9901f1687a05de5962ab14cd7ed53d0d9e200dd4f20cdf31439921185f314c27f61bada2294658 SHA512 b1134c2dc7d3b99d200d3314905446482af8dcd8cf53775978665c8ea930d04b10f36804f4d5ef1d3e020db450114800494fdbfb076ce98e76759e78d53bdb26
 DIST netifrc-0.5.1.tar.bz2 78749 BLAKE2B cecbf4b64cc8e93483326ef0646d2abfdb837c0351cc210ea0134e654cd44f90cba0390014412f6b45ff4d337d3aaeb5e739553231305846351452aebac870e1 SHA512 277d10f58f694c734c9dec52896f847a58e40b61567573dd634d0a0604c27550d4baec461df46dac4e535753f6594afd30344696229f4f4cf4f5e04dba659710
-DIST netifrc-0.6.0.tar.bz2 83349 BLAKE2B d9be118aa2aa13891091f7b5060d06ce0bc1eb9740c5adec04b985785e7bd7afe77bc03751d178b8e09c967b04581b12cfbf50aa49b7226ab580081e420f22bc SHA512 de47d146619bd716a0eda8149063691d9d71a895579ac50d3fea60bf0e48c516d6b37aed81c33083dc6e7d4bb74841bb6b143c23972669de9d76b8f7df7a5d23
-DIST netifrc-0.6.1.tar.gz 79791 BLAKE2B e38236d189ce0e40eaa5ba7b94e2e74e444bbd185fbacf515c65ca1f0ff441525cdc44696e12ff33e4ae1f80f2766a91866cfef8f9b737d34e1c59290248f49b SHA512 798a882f87f153c31b415d77a06a2beca94a958ea982aca20bbc2cf6a7d800aedbd99a577734ea41d6a75807b13d640dd7fa5a51aa5a27055e9c552634ac7bdb
 DIST netifrc-0.7.1.tar.gz 82393 BLAKE2B a1d147db2a4e4ff7d360bf5140ccf060283dbcbfde7100f1d193c783f1da540574e1342b4d7f3f9ee011628f9f113fc751416805f35678a1093e0cc0014f5eb9 SHA512 407071f8f58b7788703a62193677673ddd18114b69142894674337410473e620cf3895bb014cff133f719ac1a7191ac3bedfd969c9a11bf2f1c4b04d39683057
-EBUILD netifrc-0.2.2.ebuild 1727 BLAKE2B 287f5e1e8b102a5b4441fa26cc8addb8e564da41a7f58f9704de2cce239563ad7a3a421d960e25289f41d06c6bba1a356c2bf164d72753a7bf3c277ef635104e SHA512 dea410761c2cd95258628c15e6cc935ae9ccaba275f70869ee1ddb7104c6ff8fed8c0cf824284f504db2eff4095f08666fa8144fc078a33b371c024c7614affb
-EBUILD netifrc-0.2.3.ebuild 1736 BLAKE2B 8254d8d6ad1556cb2ede16ccc02c30c9fd3f23ec80dd8847f7a692a93f323a436d798f3322b82fb7f74e1d18526ee004a1bc25c783f07a73d851b234a25bc3cf SHA512 e7ecd34f99f1e9b935cd7430ae1541dd204286685196d9d0989a726cb5397b054018f9020e70a79cf20af7b852bbcbe59ec218d2bf18b17bcbdaa84548253a4d
-EBUILD netifrc-0.2.4.ebuild 1746 BLAKE2B 16eed1c70419ef978d1e44d90058a941e7629eea19ae92a25ccd28b54d0377f4cc7207c2d49a2db6e149c28a0ccf3255ed8a368decf37e3a6ac76fe75a826be9 SHA512 44d2f887fb4b193e2b27ba848a76937d873afb69a46b14c7f38b0195fceb75655d2e087b0918335c5b79efaf97719416ddec488b1e5e95e434e7de384cb041c3
-EBUILD netifrc-0.3.0.ebuild 2033 BLAKE2B 51b308529343a408c5ad021545b736518c1637acf495cece0f11679b3b736468f0ec25a33cab18991a6c2e0654fdacf1c7ac2a1dab3145e26bbe81cc0a6b1748 SHA512 1ae2345f33360a84b629633b3a364ee2f650e82d4582ef8c10df005ee829935b454d94f1c2549b78836e843f4f15a7646d1b8d3bec61f92916cea8164ea42f12
-EBUILD netifrc-0.3.1.ebuild 2073 BLAKE2B eebb8de22d87dd16ecda5b266f927822b0a350433315ad1e8cf2674b53ded995d4185640f795180590275126aa0ae5609608ab97a2fe2b3a932527d0d86320af SHA512 61c4fe4eb645ab0d839fb45251119a74bb469183275535dd08ab7d4704c1fc0013d16f8e3912ea4a40b1e43b22091ad63f4d57ad883c46b669fba7a66ffa4069
-EBUILD netifrc-0.4.0-r1.ebuild 2160 BLAKE2B 58a4797e0c9c275422adbfecd1129cbc3ad782ddd4ff9b63fff85816083a9c95e036856eb875a0edfb142418e2a675ac49da610ab78def618d37650b9f8c4400 SHA512 e2dde7da1b20191bf75c245f867f95e6e16541817b7bd5486ab108c5e239f9dde70af7e38c727fbb1d521e67b1728a73bab4417e78545a2a2971b3691b361f90
-EBUILD netifrc-0.4.0.ebuild 2073 BLAKE2B eebb8de22d87dd16ecda5b266f927822b0a350433315ad1e8cf2674b53ded995d4185640f795180590275126aa0ae5609608ab97a2fe2b3a932527d0d86320af SHA512 61c4fe4eb645ab0d839fb45251119a74bb469183275535dd08ab7d4704c1fc0013d16f8e3912ea4a40b1e43b22091ad63f4d57ad883c46b669fba7a66ffa4069
-EBUILD netifrc-0.5.0.ebuild 2103 BLAKE2B c87544a899e967ce56be77e677664a588a9c6222de1d08e2838b1ccc04229b1c1fb3a9efda6bf047f762a0d1550fe4f61b3071773437fd5ab102980e8e042a49 SHA512 97a9e16495d9ef221d8e14379a287c05dfd96b3d8cb47ed3823b32a99569524df5e663c7bf2a5e50e3659aec0db0dcedc8124dba784654005c8f643d6b0cc734
 EBUILD netifrc-0.5.1.ebuild 2101 BLAKE2B fa748e43c948521df151189006cb9a45db49e1904074dcf71941aeb98aa878155dc5a0a341800c6bb27155caf4342b3fefe9a18edecd9b397244e7b293a5842a SHA512 bf1e0d20256138853b3508f2c88c67c33c14301325492542c3c7497d343c02b2a8ae0095bb0d0e4c0e33199b350429147349f231bdc2d1f1a3ad106e5fbf6a7e
-EBUILD netifrc-0.6.0.ebuild 2110 BLAKE2B 1cc7cf7c26c984109a6c39dde54971f88b0e434bf130ecc6c740ba957521c1f91de21304bc24177eb5fccf62b6ea0e8708aff923062fe9eb1cf04fa9207b8229 SHA512 0af435ff1c2e5ba82f9409b2d99bbfe383c28af573f136e2a4ac8c9b23140eb6f7a26632ac7a8fc15ff476a4ac74c0194bf6478e742d8bef8fcd8beb8f060fb6
-EBUILD netifrc-0.6.1.ebuild 2107 BLAKE2B df9887c875af7324b522afdfaf8ee0651d0b1164d3b98dfe327def8e55723166a545dda9488d31f305201155bb6ce5c56869cd87066a5e9066681872288cff0a SHA512 05e08326565c87263228f4f854336fdfaedfa0ff762c8fd8e36a5ebd82c9d81ead2817ba7ffb858c2ee3259dd6484a433e0af0d9fab8d27789b23fb1c7dd71fe
+EBUILD netifrc-0.7.1-r1.ebuild 2171 BLAKE2B f9e1e3df03d9da5bf679d647104f6afc926b988aef95d5a74cd1a9cc6715919da52ff12e25e120724faf19529d880e95c31957b1633532a3cdc6929c70344e97 SHA512 f8919e3fcc6c36c401ad90088dc9b8d8e9995766a1b2aca2afc5f3f3304820eff5d6e2bf63a5e96a300aa82a8b574fe744a7c8ad4c8d6cc2d29547c5b3a73fc6
 EBUILD netifrc-0.7.1.ebuild 2099 BLAKE2B a8469f41f1feb23313425d4f4224fe4c93a73d226667bfb2965940491b71bb9d7272a0feaf76eaf820a56b4e69c2d2975833d55aa715e5f8e9365e38c641d4d0 SHA512 4d344118f4d6878a3e6b2461ce013457b211103248b8d8945e76559300e29544012c28d087a0f2f855a8f6bff960b9cc1b99fd0216d945e228770c2c7b6196ba
-EBUILD netifrc-9999.ebuild 2107 BLAKE2B df9887c875af7324b522afdfaf8ee0651d0b1164d3b98dfe327def8e55723166a545dda9488d31f305201155bb6ce5c56869cd87066a5e9066681872288cff0a SHA512 05e08326565c87263228f4f854336fdfaedfa0ff762c8fd8e36a5ebd82c9d81ead2817ba7ffb858c2ee3259dd6484a433e0af0d9fab8d27789b23fb1c7dd71fe
+EBUILD netifrc-9999.ebuild 2047 BLAKE2B decbe78b5ac86f957ee27f203b0af14d8e4e022bc326891b5f990849c5817e9fec3a07ad0409fd3619b07a3a3683fbf6c9aef8f0c39f378a7e7276a7a5c6e80a SHA512 0b3d9ea722a45d91a9edc38616ee239910df1c8bf8c5ada1e75f78842c07e89756da519e46132cabd18b705b51c52a3dabfa3ed8ef196e156e34364ec8733a23
 MISC metadata.xml 377 BLAKE2B 2940bdfd1253901092fff2f0d4d162011372a9b6bbfa26d3ad07d5a7b19038624517e593f7884bf98e00018f1346d2f06e7f407c4a2419b9fba6b3d53d646aae SHA512 711a957e6bfa852039b3588a4636f0e4e747c685cbfcbb537bcd6eb12c6bd19a9ed8b49608be38f855d70df03d09ec0632a9be9db4c4cc64783b5b0311f0cdc5
diff --git a/net-misc/netifrc/files/netifrc-0.4.0-interface-types.patch b/net-misc/netifrc/files/netifrc-0.4.0-interface-types.patch
deleted file mode 100644
index 5f00dc1bb101..000000000000
--- a/net-misc/netifrc/files/netifrc-0.4.0-interface-types.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 18dd0598b29d2158529466f1e7097bf894e584dc Mon Sep 17 00:00:00 2001
-From: Andrey Volkov <volkov.am@ekb-info.ru>
-Date: Fri, 15 Jul 2016 13:23:56 +0500
-Subject: Fix missing interface types
-
-(cherry picked from commit c8fe42141c95f5446dabf5c0b1f049151e51c2ad)
----
- net/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/net/Makefile b/net/Makefile
-index a03c171..ce73c1e 100644
---- a/net/Makefile
-+++ b/net/Makefile
-@@ -13,7 +13,7 @@ SRCS-Linux=	iwconfig.sh.in udhcpc.sh.in
- INC-Linux=	adsl.sh apipa.sh arping.sh bonding.sh br2684ctl.sh bridge.sh \
- 		ccwgroup.sh clip.sh ethtool.sh iproute2.sh ifplugd.sh ip6to4.sh \
- 		ipppd.sh iwconfig.sh netplugd.sh pppd.sh pump.sh tuntap.sh udhcpc.sh \
--		vlan.sh macvlan.sh ip6rd.sh firewalld.sh
-+		vlan.sh macvlan.sh ip6rd.sh firewalld.sh dummy.sh hsr.sh l2tp.sh
- 
- SRCS-NetBSD= ifwatchd.sh.in
- INC-NetBSD=	ifwatchd.sh
--- 
-cgit v0.12
-
diff --git a/net-misc/netifrc/files/netifrc-0.7.1-dhcpcd_args_tempfile.patch b/net-misc/netifrc/files/netifrc-0.7.1-dhcpcd_args_tempfile.patch
new file mode 100644
index 000000000000..6ad40c860f96
--- /dev/null
+++ b/net-misc/netifrc/files/netifrc-0.7.1-dhcpcd_args_tempfile.patch
@@ -0,0 +1,65 @@
+From 586579d5c9fad63eb8780c556f34b80d0302e6b9 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Fri, 22 May 2020 10:09:22 +0200
+Subject: [PATCH] net/dhcpcd.sh: Put user args into a temp file
+
+So we still use the correct PID even if the user has changed his
+configuration between start and stop.
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ net/dhcpcd.sh | 20 ++++++++++++++------
+ 1 file changed, 14 insertions(+), 6 deletions(-)
+
+diff --git a/net/dhcpcd.sh b/net/dhcpcd.sh
+index c0639e0..dcc6817 100644
+--- a/net/dhcpcd.sh
++++ b/net/dhcpcd.sh
+@@ -16,11 +16,14 @@ _config_vars="$_config_vars dhcp dhcpcd"
+ 
+ dhcpcd_start()
+ {
+-	# check for pidfile after we gathered the user's opts because they can
++	# check for pidfile after we gathered the user's args because they can
+ 	# alter the pidfile's name (#718114)
+-	local args= opt= pidfile= opts= new=true
++	# Save the args into a file so dhcpcd_stop can later re-use the very
++	# same args later.
++	local args= opt= pidfile= opts= new=true argsfile=/run/netifrc_dhcpcd_${IFACE}_args
+ 	eval args=\$dhcpcd_${IFVAR}
+ 	[ -z "${args}" ] && args=${dhcpcd}
++	echo "${args}" > ${argsfile}
+ 	pidfile="$(dhcpcd -P ${args} ${IFACE})"
+ 
+ 	# Get our options
+@@ -78,12 +81,16 @@ dhcpcd_start()
+ 
+ dhcpcd_stop()
+ {
+-	local args= pidfile= opts= sig=SIGTERM
++	local args= pidfile= opts= sig=SIGTERM argsfile=/run/netifrc_dhcpcd_${IFACE}_args
+ 
+-	# check for pidfile after we gathered the user's opts because they can
++	# check for pidfile after we gathered the user's args because they can
+ 	# alter the pidfile's name (#718114)
+-	eval args=\$dhcpcd_${IFVAR}
+-	[ -z "${args}" ] && args=${dhcpcd}
++	if [ -f "${argsfile}" ] ; then
++		args="$(cat ${argsfile})"
++	else
++		eval args=\$dhcpcd_${IFVAR}
++		[ -z "${args}" ] && args=${dhcpcd}
++	fi
+ 	pidfile="$(dhcpcd -P ${args} ${IFACE})"
+ 	[ ! -f "${pidfile}" ] && return 0
+ 
+@@ -94,5 +101,6 @@ dhcpcd_stop()
+ 		*" release "*) dhcpcd -k "${IFACE}" ;;
+ 		*) dhcpcd -x "${IFACE}" ;;
+ 	esac
++	[ -f "${argsfile}" ] && rm -f "${argsfile}"
+ 	eend $?
+ }
+-- 
+2.27.0.rc0
+
diff --git a/net-misc/netifrc/files/netifrc-0.7.1-dhcpcd_pidfile_location.patch b/net-misc/netifrc/files/netifrc-0.7.1-dhcpcd_pidfile_location.patch
new file mode 100644
index 000000000000..154e7a7696a0
--- /dev/null
+++ b/net-misc/netifrc/files/netifrc-0.7.1-dhcpcd_pidfile_location.patch
@@ -0,0 +1,50 @@
+From c29dffb14e321d927196a9b39b545004e632d3c4 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Thu, 21 May 2020 18:35:32 +0200
+Subject: [PATCH] net/dhcpcd.sh: fetch pidfile location from dhcpcd
+
+There's a -P switch for this but we also need to take into account the
+-4 and -6 switches as they both alter the pidfile's name.
+
+Bug: https://bugs.gentoo.org/718114
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ net/dhcpcd.sh | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/net/dhcpcd.sh b/net/dhcpcd.sh
+index 0a306b8..c0639e0 100644
+--- a/net/dhcpcd.sh
++++ b/net/dhcpcd.sh
+@@ -16,9 +16,12 @@ _config_vars="$_config_vars dhcp dhcpcd"
+ 
+ dhcpcd_start()
+ {
+-	local args= opt= opts= pidfile="/run/dhcpcd-${IFACE}.pid" new=true
++	# check for pidfile after we gathered the user's opts because they can
++	# alter the pidfile's name (#718114)
++	local args= opt= pidfile= opts= new=true
+ 	eval args=\$dhcpcd_${IFVAR}
+ 	[ -z "${args}" ] && args=${dhcpcd}
++	pidfile="$(dhcpcd -P ${args} ${IFACE})"
+ 
+ 	# Get our options
+ 	eval opts=\$dhcp_${IFVAR}
+@@ -75,7 +78,13 @@ dhcpcd_start()
+ 
+ dhcpcd_stop()
+ {
+-	local pidfile="/run/dhcpcd-${IFACE}.pid" opts= sig=SIGTERM
++	local args= pidfile= opts= sig=SIGTERM
++
++	# check for pidfile after we gathered the user's opts because they can
++	# alter the pidfile's name (#718114)
++	eval args=\$dhcpcd_${IFVAR}
++	[ -z "${args}" ] && args=${dhcpcd}
++	pidfile="$(dhcpcd -P ${args} ${IFACE})"
+ 	[ ! -f "${pidfile}" ] && return 0
+ 
+ 	ebegin "Stopping dhcpcd on ${IFACE}"
+-- 
+2.27.0.rc0
+
diff --git a/net-misc/netifrc/netifrc-0.2.2.ebuild b/net-misc/netifrc/netifrc-0.2.2.ebuild
deleted file mode 100644
index 0fc94d7f1c02..000000000000
--- a/net-misc/netifrc/netifrc-0.2.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils udev
-
-DESCRIPTION="Gentoo Network Interface Management Scripts"
-HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
-	inherit git-2
-else
-	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-COMMON_DEPEND="!<sys-fs/udev-init-scripts-26-r1
-	!<sys-fs/udev-172"
-DEPEND="${COMMON_DEPEND}
-	kernel_linux? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/openrc-0.12
-	!<sys-apps/openrc-0.12"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="git-${EGIT_VERSION:0:6}"
-		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
-		einfo "Producing ChangeLog from Git history"
-		GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog
-	fi
-
-	# Allow user patches to be applied without modifying the ebuild
-	epatch_user
-}
-
-src_compile() {
-	MAKE_ARGS="${MAKE_ARGS}
-		LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}
-		UDEVDIR=$(get_udevdir)"
-
-	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-
-	emake ${MAKE_ARGS} all
-}
-
-src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install
-	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO ChangeLog
-}
-
-pkg_postinst() {
-	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z $REPLACING_VERSIONS ]]; then
-		elog "The network configuration scripts will use dhcp by"
-		elog "default to set up your interfaces."
-		elog "If you need to set up something more complete, see"
-		elog "${EROOT}/usr/share/doc/${P}/README"
-	fi
-}
diff --git a/net-misc/netifrc/netifrc-0.2.3.ebuild b/net-misc/netifrc/netifrc-0.2.3.ebuild
deleted file mode 100644
index de75c551b62c..000000000000
--- a/net-misc/netifrc/netifrc-0.2.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils udev
-
-DESCRIPTION="Gentoo Network Interface Management Scripts"
-HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
-	inherit git-2
-else
-	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-COMMON_DEPEND="!<sys-fs/udev-init-scripts-26-r1
-	!<sys-fs/udev-172"
-DEPEND="${COMMON_DEPEND}
-	kernel_linux? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/openrc-0.12
-	!<sys-apps/openrc-0.12"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="git-${EGIT_VERSION:0:6}"
-		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
-		einfo "Producing ChangeLog from Git history"
-		GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog
-	fi
-
-	# Allow user patches to be applied without modifying the ebuild
-	epatch_user
-}
-
-src_compile() {
-	MAKE_ARGS="${MAKE_ARGS}
-		LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}
-		UDEVDIR=$(get_udevdir)"
-
-	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-
-	emake ${MAKE_ARGS} all
-}
-
-src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install
-	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO ChangeLog
-}
-
-pkg_postinst() {
-	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z $REPLACING_VERSIONS ]]; then
-		elog "The network configuration scripts will use dhcp by"
-		elog "default to set up your interfaces."
-		elog "If you need to set up something more complete, see"
-		elog "${EROOT}/usr/share/doc/${P}/README"
-	fi
-}
diff --git a/net-misc/netifrc/netifrc-0.2.4.ebuild b/net-misc/netifrc/netifrc-0.2.4.ebuild
deleted file mode 100644
index 1badea6f8fe3..000000000000
--- a/net-misc/netifrc/netifrc-0.2.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils udev
-
-DESCRIPTION="Gentoo Network Interface Management Scripts"
-HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
-	inherit git-2
-else
-	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-COMMON_DEPEND="!<sys-fs/udev-init-scripts-26-r1
-	!<sys-fs/udev-172"
-DEPEND="${COMMON_DEPEND}
-	kernel_linux? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/openrc-0.12
-	!<sys-apps/openrc-0.12"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="git-${EGIT_VERSION:0:6}"
-		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
-		einfo "Producing ChangeLog from Git history"
-		GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog
-	fi
-
-	# Allow user patches to be applied without modifying the ebuild
-	epatch_user
-}
-
-src_compile() {
-	MAKE_ARGS="${MAKE_ARGS}
-		LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}
-		UDEVDIR=${EPREFIX}$(get_udevdir)"
-
-	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-
-	emake ${MAKE_ARGS} all
-}
-
-src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install
-	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO ChangeLog
-}
-
-pkg_postinst() {
-	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z $REPLACING_VERSIONS ]]; then
-		elog "The network configuration scripts will use dhcp by"
-		elog "default to set up your interfaces."
-		elog "If you need to set up something more complete, see"
-		elog "${EROOT}/usr/share/doc/${P}/README"
-	fi
-}
diff --git a/net-misc/netifrc/netifrc-0.3.0.ebuild b/net-misc/netifrc/netifrc-0.3.0.ebuild
deleted file mode 100644
index 84585ecbe754..000000000000
--- a/net-misc/netifrc/netifrc-0.3.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils systemd
-
-DESCRIPTION="Gentoo Network Interface Management Scripts"
-HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
-	#EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="kernel_linux? ( virtual/pkgconfig )
-	!<sys-fs/udev-172"
-RDEPEND="sys-apps/gentoo-functions
-		>=sys-apps/openrc-0.12"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="git-${EGIT_VERSION:0:6}"
-		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
-		einfo "Producing ChangeLog from Git history"
-		GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog
-	fi
-
-	# Allow user patches to be applied without modifying the ebuild
-	epatch_user
-}
-
-src_compile() {
-	MAKE_ARGS="${MAKE_ARGS}
-		LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}"
-
-	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-
-	emake ${MAKE_ARGS} all
-}
-
-src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install
-	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO ChangeLog
-
-	# Install the service file
-	LIBEXECDIR=${EPREFIX}/lib/${PN}
-	UNIT_DIR="$(systemd_get_unitdir)"
-	sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die
-	systemd_newunit "${T}/net_at.service" 'net@.service'
-	dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@lo.service"
-}
-
-pkg_postinst() {
-	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z $REPLACING_VERSIONS ]]; then
-		elog "The network configuration scripts will use dhcp by"
-		elog "default to set up your interfaces."
-		elog "If you need to set up something more complete, see"
-		elog "${EROOT}/usr/share/doc/${P}/README"
-	fi
-}
diff --git a/net-misc/netifrc/netifrc-0.3.1.ebuild b/net-misc/netifrc/netifrc-0.3.1.ebuild
deleted file mode 100644
index d3bea305aa39..000000000000
--- a/net-misc/netifrc/netifrc-0.3.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils systemd udev
-
-DESCRIPTION="Gentoo Network Interface Management Scripts"
-HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
-	#EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="kernel_linux? ( virtual/pkgconfig )
-	!<sys-fs/udev-172"
-RDEPEND="sys-apps/gentoo-functions
-		>=sys-apps/openrc-0.12"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="git-${EGIT_VERSION:0:6}"
-		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
-		einfo "Producing ChangeLog from Git history"
-		GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog
-	fi
-
-	# Allow user patches to be applied without modifying the ebuild
-	epatch_user
-}
-
-src_compile() {
-	MAKE_ARGS="${MAKE_ARGS}
-		UDEVDIR=${EPREFIX}$(get_udevdir)
-		LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}"
-
-	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-
-	emake ${MAKE_ARGS} all
-}
-
-src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install
-	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO ChangeLog
-
-	# Install the service file
-	LIBEXECDIR=${EPREFIX}/lib/${PN}
-	UNIT_DIR="$(systemd_get_unitdir)"
-	sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die
-	systemd_newunit "${T}/net_at.service" 'net@.service'
-	dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@lo.service"
-}
-
-pkg_postinst() {
-	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z $REPLACING_VERSIONS ]]; then
-		elog "The network configuration scripts will use dhcp by"
-		elog "default to set up your interfaces."
-		elog "If you need to set up something more complete, see"
-		elog "${EROOT}/usr/share/doc/${P}/README"
-	fi
-}
diff --git a/net-misc/netifrc/netifrc-0.4.0-r1.ebuild b/net-misc/netifrc/netifrc-0.4.0-r1.ebuild
deleted file mode 100644
index d7ce7aded1a4..000000000000
--- a/net-misc/netifrc/netifrc-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils systemd udev
-
-DESCRIPTION="Gentoo Network Interface Management Scripts"
-HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
-	#EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="kernel_linux? ( virtual/pkgconfig )
-	!<sys-fs/udev-172"
-RDEPEND="sys-apps/gentoo-functions
-	>=sys-apps/openrc-0.15
-	!<sys-fs/udev-init-scripts-27"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="git-${EGIT_VERSION:0:6}"
-		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
-		einfo "Producing ChangeLog from Git history"
-		GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog
-	fi
-
-	epatch "${FILESDIR}"/${P}-interface-types.patch #588872
-
-	# Allow user patches to be applied without modifying the ebuild
-	epatch_user
-}
-
-src_compile() {
-	MAKE_ARGS="${MAKE_ARGS}
-		UDEVDIR=${EPREFIX}$(get_udevdir)
-		LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}"
-
-	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-
-	emake ${MAKE_ARGS} all
-}
-
-src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install
-	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO ChangeLog
-
-	# Install the service file
-	LIBEXECDIR=${EPREFIX}/lib/${PN}
-	UNIT_DIR="$(systemd_get_unitdir)"
-	sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die
-	systemd_newunit "${T}/net_at.service" 'net@.service'
-	dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@lo.service"
-}
-
-pkg_postinst() {
-	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z $REPLACING_VERSIONS ]]; then
-		elog "The network configuration scripts will use dhcp by"
-		elog "default to set up your interfaces."
-		elog "If you need to set up something more complete, see"
-		elog "${EROOT}/usr/share/doc/${P}/README"
-	fi
-}
diff --git a/net-misc/netifrc/netifrc-0.4.0.ebuild b/net-misc/netifrc/netifrc-0.4.0.ebuild
deleted file mode 100644
index d3bea305aa39..000000000000
--- a/net-misc/netifrc/netifrc-0.4.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils systemd udev
-
-DESCRIPTION="Gentoo Network Interface Management Scripts"
-HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
-	#EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="kernel_linux? ( virtual/pkgconfig )
-	!<sys-fs/udev-172"
-RDEPEND="sys-apps/gentoo-functions
-		>=sys-apps/openrc-0.12"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="git-${EGIT_VERSION:0:6}"
-		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
-		einfo "Producing ChangeLog from Git history"
-		GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog
-	fi
-
-	# Allow user patches to be applied without modifying the ebuild
-	epatch_user
-}
-
-src_compile() {
-	MAKE_ARGS="${MAKE_ARGS}
-		UDEVDIR=${EPREFIX}$(get_udevdir)
-		LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}"
-
-	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-
-	emake ${MAKE_ARGS} all
-}
-
-src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install
-	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO ChangeLog
-
-	# Install the service file
-	LIBEXECDIR=${EPREFIX}/lib/${PN}
-	UNIT_DIR="$(systemd_get_unitdir)"
-	sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die
-	systemd_newunit "${T}/net_at.service" 'net@.service'
-	dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@lo.service"
-}
-
-pkg_postinst() {
-	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z $REPLACING_VERSIONS ]]; then
-		elog "The network configuration scripts will use dhcp by"
-		elog "default to set up your interfaces."
-		elog "If you need to set up something more complete, see"
-		elog "${EROOT}/usr/share/doc/${P}/README"
-	fi
-}
diff --git a/net-misc/netifrc/netifrc-0.5.0.ebuild b/net-misc/netifrc/netifrc-0.5.0.ebuild
deleted file mode 100644
index 2b64f017563b..000000000000
--- a/net-misc/netifrc/netifrc-0.5.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils systemd udev
-
-DESCRIPTION="Gentoo Network Interface Management Scripts"
-HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
-	#EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="kernel_linux? ( virtual/pkgconfig )
-	!<sys-fs/udev-172"
-RDEPEND="sys-apps/gentoo-functions
-	>=sys-apps/openrc-0.15
-	!<sys-fs/udev-init-scripts-27"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="git-${EGIT_VERSION:0:6}"
-		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
-		einfo "Producing ChangeLog from Git history"
-		GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog
-	fi
-
-	# Allow user patches to be applied without modifying the ebuild
-	epatch_user
-}
-
-src_compile() {
-	MAKE_ARGS="${MAKE_ARGS}
-		UDEVDIR=${EPREFIX}$(get_udevdir)
-		LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}"
-
-	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-
-	emake ${MAKE_ARGS} all
-}
-
-src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install
-	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO ChangeLog
-
-	# Install the service file
-	LIBEXECDIR=${EPREFIX}/lib/${PN}
-	UNIT_DIR="$(systemd_get_unitdir)"
-	sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die
-	systemd_newunit "${T}/net_at.service" 'net@.service'
-	dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@lo.service"
-}
-
-pkg_postinst() {
-	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z $REPLACING_VERSIONS ]]; then
-		elog "The network configuration scripts will use dhcp by"
-		elog "default to set up your interfaces."
-		elog "If you need to set up something more complete, see"
-		elog "${EROOT}/usr/share/doc/${P}/README"
-	fi
-}
diff --git a/net-misc/netifrc/netifrc-0.6.0.ebuild b/net-misc/netifrc/netifrc-0.6.0.ebuild
deleted file mode 100644
index bb7be675c2be..000000000000
--- a/net-misc/netifrc/netifrc-0.6.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils systemd udev
-
-DESCRIPTION="Gentoo Network Interface Management Scripts"
-HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
-	#EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="kernel_linux? ( virtual/pkgconfig )
-	!<sys-fs/udev-172"
-RDEPEND="sys-apps/gentoo-functions
-	>=sys-apps/openrc-0.15
-	!<sys-fs/udev-init-scripts-27"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="git-${EGIT_VERSION:0:6}"
-		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
-		einfo "Producing ChangeLog from Git history"
-		GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog
-	fi
-
-	# Allow user patches to be applied without modifying the ebuild
-	epatch_user
-}
-
-src_compile() {
-	MAKE_ARGS="${MAKE_ARGS}
-		UDEVDIR=${EPREFIX}$(get_udevdir)
-		LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}"
-
-	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-
-	emake ${MAKE_ARGS} all
-}
-
-src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install
-	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO ChangeLog
-
-	# Install the service file
-	LIBEXECDIR=${EPREFIX}/lib/${PN}
-	UNIT_DIR="$(systemd_get_unitdir)"
-	sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die
-	systemd_newunit "${T}/net_at.service" 'net@.service'
-	dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@lo.service"
-}
-
-pkg_postinst() {
-	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z $REPLACING_VERSIONS ]]; then
-		elog "The network configuration scripts will use dhcp by"
-		elog "default to set up your interfaces."
-		elog "If you need to set up something more complete, see"
-		elog "${EROOT}/usr/share/doc/${P}/README"
-	fi
-}
diff --git a/net-misc/netifrc/netifrc-0.6.1.ebuild b/net-misc/netifrc/netifrc-0.7.1-r1.ebuild
index fa0a59bb5e63..a5c2b998bd7a 100644
--- a/net-misc/netifrc/netifrc-0.6.1.ebuild
+++ b/net-misc/netifrc/netifrc-0.7.1-r1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils systemd udev
+inherit systemd udev
 
 DESCRIPTION="Gentoo Network Interface Management Scripts"
 HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/netifrc.git"
 	#EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate
 	inherit git-r3
 else
@@ -21,11 +21,16 @@ LICENSE="BSD-2"
 SLOT="0"
 IUSE=""
 
-DEPEND="kernel_linux? ( virtual/pkgconfig )
-	!<sys-fs/udev-172"
+DEPEND="!<sys-fs/udev-172"
 RDEPEND="sys-apps/gentoo-functions
 	>=sys-apps/openrc-0.15
 	!<sys-fs/udev-init-scripts-27"
+BDEPEND="kernel_linux? ( virtual/pkgconfig )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.7.1-dhcpcd_pidfile_location.patch"
+	"${FILESDIR}/${PN}-0.7.1-dhcpcd_args_tempfile.patch"
+)
 
 src_prepare() {
 	if [[ ${PV} == "9999" ]] ; then
@@ -35,8 +40,7 @@ src_prepare() {
 		GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog
 	fi
 
-	# Allow user patches to be applied without modifying the ebuild
-	epatch_user
+	default
 }
 
 src_compile() {
@@ -44,7 +48,7 @@ src_compile() {
 		UDEVDIR=${EPREFIX}$(get_udevdir)
 		LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}"
 
-	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+	use prefix && MAKE_ARGS+=" MKPREFIX=yes PREFIX=${EPREFIX}"
 
 	emake ${MAKE_ARGS} all
 }
@@ -54,15 +58,15 @@ src_install() {
 	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO
 
 	# Install the service file
-	LIBEXECDIR=${EPREFIX}/lib/${PN}
-	UNIT_DIR="$(systemd_get_unitdir)"
+	LIBEXECDIR="${EPREFIX}/lib/${PN}"
+	UNIT_DIR="$(systemd_get_systemunitdir)"
 	sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die
 	systemd_newunit "${T}/net_at.service" 'net@.service'
 	dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@lo.service"
 }
 
 pkg_postinst() {
-	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z $REPLACING_VERSIONS ]]; then
+	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z ${REPLACING_VERSIONS} ]]; then
 		elog "The network configuration scripts will use dhcp by"
 		elog "default to set up your interfaces."
 		elog "If you need to set up something more complete, see"
diff --git a/net-misc/netifrc/netifrc-9999.ebuild b/net-misc/netifrc/netifrc-9999.ebuild
index fa0a59bb5e63..4503bec9c25e 100644
--- a/net-misc/netifrc/netifrc-9999.ebuild
+++ b/net-misc/netifrc/netifrc-9999.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils systemd udev
+inherit systemd udev
 
 DESCRIPTION="Gentoo Network Interface Management Scripts"
 HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/netifrc.git"
 	#EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate
 	inherit git-r3
 else
@@ -21,11 +21,11 @@ LICENSE="BSD-2"
 SLOT="0"
 IUSE=""
 
-DEPEND="kernel_linux? ( virtual/pkgconfig )
-	!<sys-fs/udev-172"
+DEPEND="!<sys-fs/udev-172"
 RDEPEND="sys-apps/gentoo-functions
 	>=sys-apps/openrc-0.15
 	!<sys-fs/udev-init-scripts-27"
+BDEPEND="kernel_linux? ( virtual/pkgconfig )"
 
 src_prepare() {
 	if [[ ${PV} == "9999" ]] ; then
@@ -35,8 +35,7 @@ src_prepare() {
 		GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog
 	fi
 
-	# Allow user patches to be applied without modifying the ebuild
-	epatch_user
+	default
 }
 
 src_compile() {
@@ -44,7 +43,7 @@ src_compile() {
 		UDEVDIR=${EPREFIX}$(get_udevdir)
 		LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}"
 
-	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+	use prefix && MAKE_ARGS+=" MKPREFIX=yes PREFIX=${EPREFIX}"
 
 	emake ${MAKE_ARGS} all
 }
@@ -54,15 +53,15 @@ src_install() {
 	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO
 
 	# Install the service file
-	LIBEXECDIR=${EPREFIX}/lib/${PN}
-	UNIT_DIR="$(systemd_get_unitdir)"
+	LIBEXECDIR="${EPREFIX}/lib/${PN}"
+	UNIT_DIR="$(systemd_get_systemunitdir)"
 	sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die
 	systemd_newunit "${T}/net_at.service" 'net@.service'
 	dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@lo.service"
 }
 
 pkg_postinst() {
-	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z $REPLACING_VERSIONS ]]; then
+	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z ${REPLACING_VERSIONS} ]]; then
 		elog "The network configuration scripts will use dhcp by"
 		elog "default to set up your interfaces."
 		elog "If you need to set up something more complete, see"