7 files changed, 6 insertions, 67 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 9bd0f6a9a179..606bf74dd0cf 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 7f4bc7ab28c9..e7b38b8833d9 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -27,10 +27,10 @@ DIST asterisk-18.5.1.tar.gz 27953748 BLAKE2B 543f2bfbe1527f3a168dc73d3d9f20e80e9
 EBUILD asterisk-13.38.2-r1.ebuild 9682 BLAKE2B 59116ae296d6506307e01059a3925f6a3c5e5faab53ea264817a006b2abea0ba7579377b3c55a254d402a05676e11957715c1c64c160d1aa13a8b4a1d34f3998 SHA512 1c1662f449aa828ac2b9215fffb37e499f818ef94ce4927fa16eb2d5181a60d3489db025641118e94943844ceee646138e95526988a90e87dff7eb5882730410
 EBUILD asterisk-13.38.2-r4.ebuild 10809 BLAKE2B 8e47dca23cbd7496fb96f02b7a5378d30c91843bd0e6742f6bd86e6e358b351a9f8b2b2c20cbca93b341a8b6d53d5c62fa6fd3b8545439ad237337c7d20fcb86 SHA512 2d37bf064823b4e5f9607ef52cd0494829442ef9d765d7fca586555a521030b1ba59dd4f9ae680bfdb33cb386a3308f66243375cc75ad3a4537a3273acba68c9
 EBUILD asterisk-13.38.2-r5.ebuild 10809 BLAKE2B 2a6b5c1c0cfacf96196b1f3d076554277377e1745ebb7cb7d0d801dbbd364e52a23464a78e4fc324895de7efaef495a38ca1db25f257b74f95e4c53fd591363b SHA512 24e91b215398d4d4c7e032b0b7de4aecd87e3764dda842a092a6d31f68dd3bb55df84c32c0bbb95f13aaccb42f700640a336a4fa8df02cc58dae80ef51f92ab3
-EBUILD asterisk-13.38.3.ebuild 10811 BLAKE2B db87d4b4a0103d66951ab699ddabed115b16143c5f841f6b6e1e42bccaafc4ccae72c17ba2b90fef21940f7ee2ae9d1b7090a26be88f851183fdfb4b925ff817 SHA512 0a2efd82cf5dd7d03fee02c0d2813981a366eaca95a8d7de654608809af62bd1700875eab247642ffe68d1d07ce40d82268ce02769610c640b0d6854b89da1f6
+EBUILD asterisk-13.38.3.ebuild 10809 BLAKE2B 2a6b5c1c0cfacf96196b1f3d076554277377e1745ebb7cb7d0d801dbbd364e52a23464a78e4fc324895de7efaef495a38ca1db25f257b74f95e4c53fd591363b SHA512 24e91b215398d4d4c7e032b0b7de4aecd87e3764dda842a092a6d31f68dd3bb55df84c32c0bbb95f13aaccb42f700640a336a4fa8df02cc58dae80ef51f92ab3
 EBUILD asterisk-16.18.0-r2.ebuild 9871 BLAKE2B 51969cf5594b9d613d9059d5a4af13f12d9d98f346403a9a388ff330c3eaaa865ffb27adc642e16e6dcf8299c6080f62f0b9e8e47c30a8eacfe0ace39d4ce5f7 SHA512 002af728e030d3cf06eef8f021f7584e522bf3b5eff9f64b50f848b39d6f9eaf74e6e55ee42578c981bfa14841511de8744389906ef4bd23e2cc09e78100b83e
 EBUILD asterisk-16.19.0-r1.ebuild 11217 BLAKE2B 6053903a9a4f68d75f46ce622cc72ebaa752e7518ee0bffc49dadb19d53c4dc83b11888321277ad625f1455e9d1a53e0a435b2bb39f1ec28e0612f7af26efb4a SHA512 6328832a8f58950859ff47a4e374dd4803ea54442531ea6dc5153e0a8e02726cb6e7751025d0ebaafd7ba1160e1ab498eff76d2054e76aa6d2024c74b3244f65
-EBUILD asterisk-16.19.1.ebuild 11217 BLAKE2B 6053903a9a4f68d75f46ce622cc72ebaa752e7518ee0bffc49dadb19d53c4dc83b11888321277ad625f1455e9d1a53e0a435b2bb39f1ec28e0612f7af26efb4a SHA512 6328832a8f58950859ff47a4e374dd4803ea54442531ea6dc5153e0a8e02726cb6e7751025d0ebaafd7ba1160e1ab498eff76d2054e76aa6d2024c74b3244f65
+EBUILD asterisk-16.19.1.ebuild 11215 BLAKE2B 2589b6e945255a57c13f4d862d4d778787cd5cb05cf41ce15a1b8e389aff068ed2deb271c2eca62ab5b70e5d9dfa9a446a5f04a3dceebc68149ffb64007fe96e SHA512 7258715db285cecd25d4242c41a7fe01323f540e0923726783276eb83b199fda84fa6fd60a5f6b9200e86ee6f398af7c6fbb154808e913c842a6a1e0bd60644d
 EBUILD asterisk-18.4.0-r2.ebuild 11234 BLAKE2B 26543c5d82e172047b5fdc3129defa36f2508b791f8a2cd132fb7f78494d12cb406c52ad2cb544589bc959754e35ca7e1edf3117a36857c95a3edda816c1841d SHA512 f2e84a8c058440b529fbaaebbbd13f7a8d85d4bf8af573f4318532ca53e650b153d8610180ffe9bfdf32594387f83b56219332849a404f2626cea8ccfe88ee2e
 EBUILD asterisk-18.5.0-r1.ebuild 11190 BLAKE2B 85fcf0ea3ba693936835c47971d85b962def77113c77fd5d3c878e8f15ae7f8a5cf23d899d6779034f27ae78e7710a3ca27fa5302975d272f67ab11e086b2553 SHA512 2039c5d624abc31fd43840e7fbd57c483f0c8a543d79dce32c690800f88f49f1ee52dd63ee9ea2791afd876b934d87202316852d35833c93e28ba8c4c2b6fff6
 EBUILD asterisk-18.5.1.ebuild 11190 BLAKE2B 85fcf0ea3ba693936835c47971d85b962def77113c77fd5d3c878e8f15ae7f8a5cf23d899d6779034f27ae78e7710a3ca27fa5302975d272f67ab11e086b2553 SHA512 2039c5d624abc31fd43840e7fbd57c483f0c8a543d79dce32c690800f88f49f1ee52dd63ee9ea2791afd876b934d87202316852d35833c93e28ba8c4c2b6fff6
diff --git a/net-misc/asterisk/asterisk-13.38.3.ebuild b/net-misc/asterisk/asterisk-13.38.3.ebuild
index c350ab4c288c..400218a388d5 100644
--- a/net-misc/asterisk/asterisk-13.38.3.ebuild
+++ b/net-misc/asterisk/asterisk-13.38.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.asterisk.org/"
 SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/${PV%%.*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 IUSE_VOICEMAIL_STORAGE=(
 	+voicemail_storage_file
diff --git a/net-misc/asterisk/asterisk-16.19.1.ebuild b/net-misc/asterisk/asterisk-16.19.1.ebuild
index 9548b400631a..10706b53e507 100644
--- a/net-misc/asterisk/asterisk-16.19.1.ebuild
+++ b/net-misc/asterisk/asterisk-16.19.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.asterisk.org/"
 SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/${PV%%.*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 IUSE_VOICEMAIL_STORAGE=(
 	+voicemail_storage_file
diff --git a/net-misc/dahdi-tools/Manifest b/net-misc/dahdi-tools/Manifest
index 5780a3d81fca..c332d6323523 100644
--- a/net-misc/dahdi-tools/Manifest
+++ b/net-misc/dahdi-tools/Manifest
@@ -7,6 +7,5 @@ AUX dahdi-tools-3.1.0-fno-common.patch 1030 BLAKE2B ca9f8ce7116656f66107194c7cce
 AUX dahdi-tools-3.1.0-parallel-make-no-config.patch 681 BLAKE2B c72cc644d88514c836784511abd9d4c06009218a311dc937b32fe3bcd048ae17439a882ed6a5f159e619eea478d664552e59b7a2ff6b4331c9b44e7ed93033c8 SHA512 d368a0fb5b03618d4adb49c01a6ccb518a67b7e48a209b927878b71b68e4a4a1093574e394970f9d6426bd75b5ca737326f27fc8322654ce39f9b2b272813992
 AUX dahdi.init2 582 BLAKE2B 2e273c929772428586f6800601cc0249a33f61c6aad474c19dd45d9d78a187a9fdd34d1ca26e0eed605fc9630c04b0b0ffd29214a5116749db94bf7609bb078a SHA512 684e8dea54a4f082345100f4d05ca286a085b99c46f0b3fa7300ca5d9a666657afb5405c1f14ac3ba4aba02ce39872e74b9c1cfe6321fd631fa6c39ae38e5ebb
 DIST dahdi-tools-3.1.0.tar.gz 607449 BLAKE2B aa8ef197cbdecf5c892386aa1c25c940ed3f7c24884f588dcca975d34ee7b4c41722d2529fa305d7568d03302e10e6eb4d5df36a899315e05bf243163500b22d SHA512 e0e5bf24e4834ca39ef7dc1af1bb7ef26bd258a8b2cb2406a7e1ffed25b4b1d44a5fce41d97c5ad7fc6ebb66f965759d2b49ffa6d89845786f43eadb89ff4694
-EBUILD dahdi-tools-3.1.0-r1.ebuild 2105 BLAKE2B 841b07107b0bd090a5c13df8d71aaa832e77d28832115203363841c00d27174c2736098316c2b967769e6c27d8ddd12a61ecd3dc56233de085b88f4bcdc229f5 SHA512 12fe5c95dda32abbe5d244a1d754df232289da30b1e150a1b02d01878f0618e1ac9c941718010784f1357c1e669641cdf73513aa3ed4b4f3495ccac7c8172580
-EBUILD dahdi-tools-3.1.0.ebuild 1692 BLAKE2B 7ed3148872c5975ad46517a4e687509610ebe57755be7e6ffbf5b1d8617f6a4ae12b7610d30eac5192199190e160d7ea6ee791e62f66deada89c40a39c15005e SHA512 e20f7a9fb034725b1b96a23630a5bfc37d2b90bf702343577328a1c1a078094ed93085e64f5be8a627570168916ab56efdbbe697f4fded5a5f774195b7f4d5f0
+EBUILD dahdi-tools-3.1.0-r2.ebuild 2107 BLAKE2B b948eceb9ffbb90b991a33319e9c607e9e4ab810dee34ce160d7f3e7708df9ec9ae70c9e97b4410a9fd4df29d5ebcefb1f89b26842fa9dcb5af4af0dc322a854 SHA512 a2afb9b44b897ff1905401a51789223d01b86d8a11f7e91fbfbe5395b8f6d11fcb2c10c39be4caba9a64b5eea3c8294b4adc2a0aded5bf794601220b9f3caacd
 MISC metadata.xml 473 BLAKE2B a1dc5e28f6ed28a92131b23462f4f5948643347786c3526c3496fb93f9f3d4d7b15afbcab367e9be32f8c99248e72abba5c9ce130ed1014a522be5aae3f1d241 SHA512 be7ceb43b06eedba076244b078ded1288e3509cfcc7df4513d2c4d9bb8b5feb356e2890e51ed7ff825a8b568e61273499e0d12f080c96f2014ba0a48af77289b
diff --git a/net-misc/dahdi-tools/dahdi-tools-3.1.0-r1.ebuild b/net-misc/dahdi-tools/dahdi-tools-3.1.0-r2.ebuild
index 557e1849f862..33e37114b885 100644
--- a/net-misc/dahdi-tools/dahdi-tools-3.1.0-r1.ebuild
+++ b/net-misc/dahdi-tools/dahdi-tools-3.1.0-r2.ebuild
@@ -25,7 +25,7 @@ DEPEND="dev-libs/newt
 	net-misc/dahdi
 	sys-kernel/linux-headers
 	virtual/libusb:0
-	ppp? ( net-dialup/ppp )"
+	ppp? ( net-dialup/ppp:= )"
 RDEPEND="${DEPEND}
 	dev-lang/perl:=
 	dev-perl/CGI"
diff --git a/net-misc/dahdi-tools/dahdi-tools-3.1.0.ebuild b/net-misc/dahdi-tools/dahdi-tools-3.1.0.ebuild
deleted file mode 100644
index 4aa6660067cc..000000000000
--- a/net-misc/dahdi-tools/dahdi-tools-3.1.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 perl-functions
-
-DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi"
-HOMEPAGE="https://www.asterisk.org"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="ppp"
-PATCHES=(
-	"${FILESDIR}/dahdi-nondigium-blacklist.patch"
-	"${FILESDIR}/dahdi-tools-3.1.0-parallel-make-no-config.patch"
-	"${FILESDIR}/dahdi-tools-3.1.0-fno-common.patch"
-	"${FILESDIR}/dahdi-tools-3.1.0-execinfo.patch"
-	"${FILESDIR}/dahdi-tools-3.1.0-cplusplusexternc.patch"
-)
-
-DEPEND="dev-libs/newt
-	net-misc/dahdi
-	sys-kernel/linux-headers
-	virtual/libusb:0
-	ppp? ( net-dialup/ppp )"
-RDEPEND="${DEPEND}
-	dev-lang/perl:=
-	dev-perl/CGI"
-BDEPEND="dev-lang/perl
-	sys-apps/file"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with ppp) --with-perllib="$(perl_get_vendorlib)"
-}
-
-src_install() {
-	local bashcompdir="$(get_bashcompdir)"
-	local bashcmd bashcmdtarget
-
-	emake DESTDIR="${ED}" bashcompdir="${bashcompdir}" udevrulesdir=/lib/udev/rules.d install
-	emake DESTDIR="${ED}" install-config
-
-	dosbin patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
-
-	# install init scripts
-	newinitd "${FILESDIR}"/dahdi.init2 dahdi
-	newinitd "${FILESDIR}"/dahdi-autoconf.init2 dahdi-autoconf
-	newconfd "${FILESDIR}"/dahdi-autoconf.conf2 dahdi-autoconf
-
-	bashcomp_alias dahdi $(sed -nre 's/^complete -F .* //p' "${ED}${bashcompdir}/dahdi" ||
-		die "Error parsing dahdi bash completion file for commands")
-}