gentoo resync : 28.07.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-07-28 10:27:13 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-07-28 10:27:13 +0100
commit: f4fc10428424904caf2035cffc442195cb088b2c (patch)
tree: 72f320d5963e55586cfdeed2b14c72b8191b6327 /net-misc/asterisk
parent: fbd9734cedfe790955100b8e4ab3613457d77b1a (diff)
10 files changed, 0 insertions, 2901 deletions
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index e7b38b8833d9..676d90623a93 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,12 +1,10 @@
 AUX 1.6.2/asterisk.logrotate4 848 BLAKE2B b169368ad6893e2fc2680b788569cf8b74657531b9484664aae2869f6dfef3ff71cf64a3fa91e90c4fdbb275a8038751fff4087129e67f63b11b81a436e459b7 SHA512 8d661424838fd9500512290785a56af4364717df87d3423ab8dc3039affd1a26fa7aae6afe2ca4fe1ce668a0172b07a96f4cc9a73eced95f25d5848f3a3f2624
 AUX asterisk-13.18.1-r2-autoconf-2.70.patch 535 BLAKE2B 06f880515f27166a75738bde6e81be1cac961a2ec2eec049cddbbb39b58d350f37a4feb49e86157d6dd5e80abaf251cf6b122ec094e0109c1f20f3e9b0f65c29 SHA512 77d1bb1be97fe5b8df78a8b21173c0d12a91f9a543404d73e4f4af2080a0b4edb87b3ccd36b1935f4fbd2a0bb44e971d303eba774e648c48c2a453c8e42838a7
 AUX asterisk-13.38.1-r1-autoconf-lua-version.patch 2320 BLAKE2B 5f9a4b4063286f964da0756698134ce9127a3ae854e19ccec098fb554f4835cbb1698da6ac76293dcb1af3dfd8ea741e9450d58b61c7da440ff3077c848dae68 SHA512 dae3daad5a6755a8a932b40c5d209c348a72266c139a2e05420ea4b8f292062832cf791bc8d41de4bf8c1e0516e8699efdb80724a5afb2d017ab707073d7fca8
-AUX asterisk-13.38.1-r1-func_lock-fix-races.patch 9580 BLAKE2B 174aa69b0738c87f02692c2eec978171216b2117218a54b9785a836d0b72b779ed1aa48a3c3b624deb9e16e3485d60a8390b60019c90524f6248665d1ae0ff44 SHA512 bff6f20a677eef837a6727859c1c90309e6f012621743b7e8b6b92ad17cf44c9b94aa75a0b64550ae39a6260210a944725d9e9603fbe0ca7bcbd4fd61d991748
 AUX asterisk-13.38.2-r1-menuselect-exitcodes.patch 1736 BLAKE2B 32f18fe623c6a9ba4db24001bc6669a2bc0838f2b757a2bcacde6eeb6b63f31881af877ce25cf7f38f6b7c010d92b5a1065d22b3f7526bcdc22799a09b22a975 SHA512 c4888e24051f0913c7dd13dbadbc38e7638bdedfee36b6f6cee047f6113d39cd09d79d9ecbfbb38f72ae6c9092e1423a0eff885118cfa44d4995f11d95c4a1d3
 AUX asterisk-13.38.2-r2-func_odbc_minargs-ARGC.patch 7091 BLAKE2B bd00ce7a49b946cd6f2f170edf777a3b7f61bc02882096536dd4e05f2d9c279d1ff5c4501f65eb1c64edbca8b9f283ac7cf542722478dca2c2fcc1e9d9decf83 SHA512 a5a160f5a93e64f6780e56c4af248aa33739bdacc80cfb0f224060c7bbe57633d84368ddac291306f6ec41989cfe619771f55d1c415fc80db3f0597b6058e553
 AUX asterisk-13.38.2-r3-func_lock-fix-races.patch 13721 BLAKE2B ad0ec83d10cd41aaf7fdd9a3b72c59e64c110a3b694e3ef5bd383efbf3fb7403f3f7b42cf61d9470c097cfb69a5445764134f00e590c022b8f9e7ce20ccf851e SHA512 0d13c50bf14351ed85305f737372c825ee950a760ad523b5f4976afd98c9d2907e6c0161621278598ab5ea507720146eaddebede59725e80f4632a7f9d77aa04
 AUX asterisk-16.16.2-no-var-run-install.patch 728 BLAKE2B 25fc61c4aa68d9e3243d1161e68e0b61b14b5505eadd00fdf46e1c3977e7fb536afd42dc6c9a07f400a686c19afd04fd8f00fc1cb916978783a9e54ecfe81dd4 SHA512 ab1e7ac700711125162396c4ebe590eb000f4ad6c4cbe8845794f5d06353a4a52167fcc83ee97860f38540089cad6d45f2e8589c1f30098e85479a2b4c722f75
-AUX asterisk-16.18.0-r1-func_lock-fix-races.patch 6085 BLAKE2B e53b5debccbd54505a51a38cc63f64fec10603abc47fbb86b171268ea3a90b6e041984eb8802efafae8df4bb2aa6098c78c0b6473cd0a0aac61cd233cbd322df SHA512 aa3cd2d1ddec0c0ca57bc6b7131b09c0aa691fd01cffa17b7797cc023627dba8b3a329cbdd6b72e51d73689a82682814e954906ea9fdd9716f1f7cb26d606224
 AUX asterisk-historic-no-var-run-install.patch 790 BLAKE2B 6fb753a3dc1b557b4cca8df1dc93eba3de70114f0bb206692461a3faf4068ffbf641740fa51e5010cabf0cbb64d8856dd9a830eba802b1988208b8a185a1fc57 SHA512 9c941d49a1ea10f702b7ce2c9c4a120c0e8ea297f13ecaa9d2a9b059cf4452a981aa0e0eabd5c4711c222311e3f9a52ee1135c59433ba878a9bd3a979be852fd
 AUX asterisk.service 456 BLAKE2B 4a5da9f0e45aa3b1eff29d59317d09e061e0a0e3c0e38cd39732e7880e96b7f34a68b44001d2608a7636b1259803f567b94bdb85ef15428727427fa1081ee385 SHA512 d443c3821d50e78a76b7cad8906f560ab0f4b58007f6c9322256626bc4a502bdbd844f1ee48cdaf86d499bf78f50cebb0cfc88a0cab0c4876f4e853bc2e76aa8
 AUX asterisk.service.conf 324 BLAKE2B b802f69897f050f661412631da7ddc6e3207ff0d776ad2c2cfb13677049b8e3fce8c565103057745a48a4245f8c660f805088844fdea7fb042facd32b5ec13b7 SHA512 94be3b27f9d862d357b62d14b9d59ca47487bfd4987ce3b0ea2bb862c6d03e1d3c8b536590f20295fd085166da3efdff869c4cfc37542a31933d22b6d9b73da3
@@ -16,22 +14,10 @@ AUX confd-13.32.0 3895 BLAKE2B eada6c9ef6bb6754645679e6f2f5f2d299d89a3df3830f32a
 AUX confd-16.16.2-r1 4078 BLAKE2B 9d49eb95660f5cb92d62d34a262d77909ab9acd68afa353dcff2d8c239cb203da289a7af91c083f4b89350d64bc2e87b1d7422266207605997badfab00ea24fc SHA512 4b4402ce62527084d0f82c5ad975d6b85276bb9c1e97d6f405737c6eee3c15f45e1b48f149d508c4f5cd70dd23a5e9be3ebd673047f80f4dfcda4913c9b6b287
 AUX initd-13.32.0-r1 9945 BLAKE2B 231bb632b6634fbe1455ba9e6312562c00a14552a2a38fe88dce5655e36628644e38f07984e305c706b167ec3674eec63933fb889586b78a9386c16bb3765766 SHA512 6c31c7627e30b15a35540d9eabad310841b5f740f8f361fc01630fd6ab389bae02f0d1092ee35e6375b5ae93a7d8d71d03cb06201045d084882177a2ce49a4da
 AUX initd-16.16.2-r1 9986 BLAKE2B 4b1c9537ef85c9de1d0064a851472163576480f08b573839db7860fd10828f444aef0f08d189a4e129a5545538424c1698e7d9d980cdbb44da2e68ff73dd0c75 SHA512 81747f6e6b4142b341797a8b2e9b212a48870d8db661669759020cc4c3ab0b66996a37dbd35afaa842dc00cd43aa834d3146021420b3f29b0d2f8b6e11d3fca7
-DIST asterisk-13.38.2.tar.gz 33708267 BLAKE2B f8c188f6500a01e807982518486972c18f8f903285910e64b4d8e2a4f553d42534f910696a02ab13e371dbd83dfd932c5cb7a6cea08817862ecaddcc7afd99d2 SHA512 bd9755503048cd8dcf8e39947dd5cfb617c20c4b1ad5033ae297499a4967c06ba11b6e43233c1ae0d33f8f11a81dbb9b4487f16a1f4786007172028caf1ee051
 DIST asterisk-13.38.3.tar.gz 33711458 BLAKE2B a1f37c210e7e95962665310b542d9a3b682ecc5e90188e8272a0cd6e22ebfa963ed5af46f0f85c2074bc0bbe34d72473343ff3437d80b58e5383eb80385d0b89 SHA512 dd67f73704f1c68639313852ba1508165c7b525f0f4156c776258e27ee19a0ee87293ae7805178b0f37188fca91b861c52b5206cbba754a6181492d0efb7e895
-DIST asterisk-16.18.0.tar.gz 27843069 BLAKE2B 643c371b4747111e233c0758efb529e7f54f1deeff10e65fb05f3a1a58c4ba5c139bdb583d2a2552e29aacac5d0f3980fd9aeb19fda2513843fbe0c849dec217 SHA512 025a30a1eed1d2cd14eb1345e1e0edfcc23b4c517e0d33da7d06d97b3ffa3c9ce9c2fe9449109eefade6d62b6205b598fecb69245adb04f03bd53f8482fbd7ad
-DIST asterisk-16.19.0.tar.gz 27872364 BLAKE2B 3510f300c2cd0d67232e5d36752f60a2e67dde988de1ca41b5709dc29aa462f268b49b6c48cf669a7b5fdc0aec038dbfb1d56f7ebe6e9a7285d2cee34b3fc789 SHA512 e50b7c42591ff7fedba3e591a4e696ace62731d81b4d054757a91d8997ee454e949c56a4cf19e37c160407b23ec8c654c1b8af18712d09078e6149b5b22c5040
 DIST asterisk-16.19.1.tar.gz 27870922 BLAKE2B e7b2ceac60f9db19802acc6c69b233556834815e1a9a3d17b2fd331d2577beb356f31a531a6d8fde70f78e9362bd8b6dbc796f906557c82bcd4847a612c788a3 SHA512 7b74fedce91ac597f3cc7a03b401ae7506bc6479faf008f3ea9c0f4783d85c5ce06d71bf73333d4bc1609a2cb96511d931d79f3bc8613906f370f9b4015b30b9
-DIST asterisk-18.4.0.tar.gz 27926601 BLAKE2B 1a4089ee274732462a8e480d449e4043f7393a6df0b78dd3ea341d3996b9e433066e6d7c53b3ab334db5946a4b847ac02abb4afc5747b6f541cad81a6d58d468 SHA512 024d0a5c75d55fe614ba6219aece62778e9522a0f8365d57192aa5aa22be94d45a3bed69ac14659738e97dd98967533c13096a855366083e6df2b7800e684602
-DIST asterisk-18.5.0.tar.gz 27956264 BLAKE2B 1b2cc477dd37be81b7c1611f1334db8e5095a2d76b1cfa0148072f7c3e9247e3d43da8b0bf502e18c2f553a893b1cc0a1aa9f2ca0942b012d0261c6171536370 SHA512 f31ac2ccd4b9af3ee4ad1c1368519e889d2e3e5b6b22e6f1b6dc020ffbdc8caccf0c03ba620f4a8b6346403abffde23d93fa8c06a6d7d993074edfaa0cf256df
 DIST asterisk-18.5.1.tar.gz 27953748 BLAKE2B 543f2bfbe1527f3a168dc73d3d9f20e80e95be9de9532a97ff6a5c70a548d525c39ce5251b80dbcd1c0e31c066fc48520e6c373b1404bf24a00b0a48ad134bcd SHA512 95f30c14602587827c7d7bc4652639163f4fe6338fade35d533525aa8825d7a5082c9d6fa4671a5f4f89bd90a0d657ce7e51fd4216558bd367abcb10b25aeb23
-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 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 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
 MISC metadata.xml 1482 BLAKE2B 71a7d51199cb53116efd36963d5881264faa13f8beb375ab68074c3ab560443c3ea9cb021c5c03c9c55fdfa9fc27425c90b4313d3a3bd680079add6ebf5763d1 SHA512 df1f06ccc232488d08202b9f6bfc62e17769ef740a2c1da9ee8a2c48d40d7a293f522b6c9c899c7ae202ba7c6b207fc25e69730d2983bb307921f82c070a09ee
diff --git a/net-misc/asterisk/asterisk-13.38.2-r1.ebuild b/net-misc/asterisk/asterisk-13.38.2-r1.ebuild
deleted file mode 100644
index b6fc143048fd..000000000000
--- a/net-misc/asterisk/asterisk-13.38.2-r1.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-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"
-
-IUSE_VOICEMAIL_STORAGE=(
-	+voicemail_storage_file
-	voicemail_storage_odbc
-	voicemail_storage_imap
-)
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp"
-REQUIRED_USE="gtalk? ( xmpp )
-	lua? ( ${LUA_REQUIRED_USE} )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-PATCHES=(
-	"${FILESDIR}/asterisk-historic-no-var-run-install.patch"
-	"${FILESDIR}/asterisk-13.38.1-r1-autoconf-lua-version.patch"
-	"${FILESDIR}/asterisk-13.38.1-r1-func_lock-fix-races.patch"
-	"${FILESDIR}/asterisk-13.18.1-r2-autoconf-2.70.patch"
-)
-
-DEPEND="acct-user/asterisk
-	acct-group/asterisk
-	dev-db/sqlite:3
-	dev-libs/popt
-	dev-libs/jansson
-	dev-libs/libedit
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	virtual/libcrypt:=
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez:= )
-	calendar? (
-		net-libs/neon:=
-		dev-libs/libical:=
-		dev-libs/iksemel
-	)
-	caps? ( sys-libs/libcap )
-	blocks? ( sys-libs/blocksruntime )
-	cluster? ( sys-cluster/corosync )
-	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( media-libs/libilbc )
-	ldap? ( net-nds/openldap )
-	lua? ( ${LUA_DEPS} )
-	mysql? ( dev-db/mysql-connector-c:= )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	pjproject? ( net-libs/pjproject )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp:= )
-	span? ( media-libs/spandsp )
-	speex? (
-		media-libs/libogg
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	srtp? ( net-libs/libsrtp:0 )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${DEPEND}
-	net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-BDEPEND="dev-libs/libxml2:2
-	virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-pkg_pretend() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	[[ "${MERGE_TYPE}" == binary ]] && return
-
-	if tc-is-clang; then
-		use blocks || die "CC=clang requires USE=blocks"
-	else
-		use blocks && die "USE=blocks can only be used with CC=clang"
-	fi
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
-}
-
-src_configure() {
-	local vmst
-
-	econf \
-		LUA_VERSION="${ELUA#lua}" \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		--with-libedit \
-		$(use_with caps cap) \
-		$(use_with lua lua) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl)
-
-	_menuselect() {
-		menuselect/menuselect "$@" || die "menuselect $* failed."
-	}
-
-	_use_select() {
-		local state=$(usex "$1" enable disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			_menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake NOISE_BUILD=yes menuselect.makeopts
-
-	# Disable BUILD_NATIVE (bug #667498)
-	_menuselect --disable build_native menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	_menuselect --disable chan_misdn menuselect.makeopts
-	_menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	_menuselect --enable smsq menuselect.makeopts
-	_menuselect --enable streamplayer menuselect.makeopts
-	_menuselect --enable aelparse menuselect.makeopts
-	_menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	_menuselect --enable chan_mgcp menuselect.makeopts
-	_menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	_menuselect --enable pbx_dundi menuselect.makeopts
-	_menuselect --enable func_aes menuselect.makeopts
-	_menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	_use_select alsa         chan_alsa
-	_use_select bluetooth    chan_mobile
-	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	_use_select cluster      res_corosync
-	_use_select curl         func_curl res_config_curl res_curl
-	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	_use_select freetds      {cdr,cel}_tds
-	_use_select gtalk        chan_motif
-	_use_select http         res_http_post
-	_use_select iconv        func_iconv
-	_use_select ilbc         codec_ilbc format_ilbc
-	_use_select ldap         res_config_ldap
-	_use_select lua          pbx_lua
-	_use_select mysql        app_mysql cdr_mysql res_config_mysql
-	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	_use_select oss          chan_oss
-	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
-	_use_select radius       {cdr,cel}_radius
-	_use_select snmp         res_snmp
-	_use_select span         res_fax_spandsp
-	_use_select speex        {codec,func}_speex
-	_use_select speex        format_ogg_speex
-	_use_select srtp         res_srtp
-	_use_select statsd       res_statsd res_{endpoint,chan}_stats
-	_use_select syslog       cdr_syslog
-	_use_select vorbis       format_ogg_vorbis
-	_use_select xmpp         res_xmpp
-
-	# Voicemail storage ...
-	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
-		if use "${vmst#+}"; then
-			_menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
-			_menuselect --enable $o menuselect.makeopts
-		done
-	fi
-}
-
-src_compile() {
-	emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes
-}
-
-src_install() {
-	local d
-
-	dodir "/usr/$(get_libdir)/pkgconfig"
-	emake DESTDIR="${D}" NOISY_BUILD=yes install
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-	diropts -m 0750 -o root -g asterisk
-	keepdir	/etc/asterisk
-	emake NOISY_BUILD=yes DESTDIR="${D}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs
-	chown root:root "${ED}/etc/asterisk/"* || die "chown root:root of config files failed"
-	chmod 644 "${ED}/etc/asterisk/"* || die "chmod 644 of config files failed"
-
-	# keep directories
-	diropts -m 0750 -o asterisk -g root
-	keepdir /var/lib/asterisk
-	keepdir /var/spool/asterisk
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk
-	newconfd "${FILESDIR}"/confd-13.32.0 asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles2.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# Reset diropts else dodoc uses it for doc installations.
-	diropts -m0755
-
-	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	use doc && dodoc doc/*.{txt,pdf}
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-
-	# Asterisk installs a few folders that's empty by design,
-	# but still required.  This finds them, and marks them for
-	# portage.
-	while read d < <(find "${ED}"/var -type d -empty || die "Find failed."); do
-		keepdir "${d#${ED}}"
-	done
-}
-
-pkg_postinst() {
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-13.38.2-r4.ebuild b/net-misc/asterisk/asterisk-13.38.2-r4.ebuild
deleted file mode 100644
index 555ccbc9e75b..000000000000
--- a/net-misc/asterisk/asterisk-13.38.2-r4.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-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"
-
-IUSE_VOICEMAIL_STORAGE=(
-	+voicemail_storage_file
-	voicemail_storage_odbc
-	voicemail_storage_imap
-)
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd vorbis xmpp"
-REQUIRED_USE="gtalk? ( xmpp )
-	lua? ( ${LUA_REQUIRED_USE} )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-historic-no-var-run-install.patch"
-	"${FILESDIR}/${PN}-13.38.1-r1-autoconf-lua-version.patch"
-	"${FILESDIR}/${PN}-13.38.1-r1-func_lock-fix-races.patch"
-	"${FILESDIR}/${PN}-13.18.1-r2-autoconf-2.70.patch"
-	"${FILESDIR}/${PN}-13.38.2-r1-menuselect-exitcodes.patch"
-	"${FILESDIR}/${PN}-13.38.2-r2-func_odbc_minargs-ARGC.patch"
-)
-
-DEPEND="acct-user/asterisk
-	acct-group/asterisk
-	dev-db/sqlite:3
-	dev-libs/popt
-	dev-libs/jansson
-	dev-libs/libedit
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	virtual/libcrypt:=
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez:= )
-	calendar? (
-		net-libs/neon:=
-		dev-libs/libical:=
-		dev-libs/iksemel
-	)
-	caps? ( sys-libs/libcap )
-	blocks? ( sys-libs/blocksruntime )
-	cluster? ( sys-cluster/corosync )
-	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( media-libs/libilbc )
-	ldap? ( net-nds/openldap )
-	lua? ( ${LUA_DEPS} )
-	mysql? ( dev-db/mysql-connector-c:= )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	pjproject? ( net-libs/pjproject:= )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp:= )
-	span? ( media-libs/spandsp )
-	speex? (
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	srtp? ( net-libs/libsrtp:0 )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-	!systemd? ( !sys-apps/systemd )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${DEPEND}
-	net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-BDEPEND="dev-libs/libxml2:2
-	virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-_make_args=(
-	"NOISY_BUILD=yes"
-	"ASTDBDIR=\$(ASTDATADIR)/astdb"
-	"OPTIMIZE="
-	"DEBUG="
-	"DESTDIR=${D}"
-	"CONFIG_SRC=configs/samples"
-	"CONFIG_EXTEN=.sample"
-)
-
-pkg_pretend() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	[[ "${MERGE_TYPE}" == binary ]] && return
-
-	if tc-is-clang; then
-		use blocks || die "CC=clang requires USE=blocks"
-	else
-		use blocks && die "USE=blocks can only be used with CC=clang"
-	fi
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
-}
-
-src_configure() {
-	local vmst
-	local copt cstate
-
-	econf \
-		LUA_VERSION="${ELUA#lua}" \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		--with-libedit \
-		$(use_with caps cap) \
-		$(use_with lua lua) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl)
-
-	_menuselect() {
-		menuselect/menuselect "$@" || die "menuselect $* failed."
-	}
-
-	_use_select() {
-		local state=$(usex "$1" enable disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			_menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake "${_make_args[@]}" menuselect.makeopts
-
-	# Disable BUILD_NATIVE (bug #667498)
-	_menuselect --disable build_native menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	_menuselect --disable chan_misdn menuselect.makeopts
-	_menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	_menuselect --enable smsq menuselect.makeopts
-	_menuselect --enable streamplayer menuselect.makeopts
-	_menuselect --enable aelparse menuselect.makeopts
-	_menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	_menuselect --enable chan_mgcp menuselect.makeopts
-	_menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	_menuselect --enable pbx_dundi menuselect.makeopts
-	_menuselect --enable func_aes menuselect.makeopts
-	_menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	_use_select alsa         chan_alsa
-	_use_select bluetooth    chan_mobile
-	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	_use_select cluster      res_corosync
-	_use_select curl         func_curl res_config_curl res_curl
-	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	_use_select freetds      {cdr,cel}_tds
-	_use_select gtalk        chan_motif
-	_use_select http         res_http_post
-	_use_select iconv        func_iconv
-	_use_select ilbc         codec_ilbc format_ilbc
-	_use_select ldap         res_config_ldap
-	_use_select lua          pbx_lua
-	_use_select mysql        app_mysql cdr_mysql res_config_mysql
-	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	_use_select oss          chan_oss
-	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
-	_use_select radius       {cdr,cel}_radius
-	_use_select snmp         res_snmp
-	_use_select span         res_fax_spandsp
-	_use_select speex        {codec,func}_speex
-	_use_select srtp         res_srtp
-	_use_select statsd       res_statsd res_{endpoint,chan}_stats
-	_use_select syslog       cdr_syslog
-	_use_select vorbis       format_ogg_vorbis
-	_use_select xmpp         res_xmpp
-
-	# Voicemail storage ...
-	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
-		if use "${vmst#+}"; then
-			_menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
-			_menuselect --enable $o menuselect.makeopts
-		done
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
-			cstate=--enable
-			[[ "${copt}" == -* ]] && cstate=--disable
-			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
-			_menuselect ${cstate} "${copt#[-+]}"
-			eend $?
-		done
-	fi
-}
-
-src_compile() {
-	emake "${_make_args[@]}"
-}
-
-src_install() {
-	local d
-
-	dodir "/usr/$(get_libdir)/pkgconfig"
-	diropts -m 0750 -o root -g asterisk
-	dodir	/etc/asterisk
-
-	emake "${_make_args[@]}" install install-configs
-
-	fowners asterisk: /var/lib/asterisk/astdb
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-
-	# keep directories
-	diropts -m 0750 -o asterisk -g root
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk
-	newconfd "${FILESDIR}"/confd-13.32.0 asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles2.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# Reset diropts else dodoc uses it for doc installations.
-	diropts -m0755
-
-	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	use doc && dodoc doc/*.{txt,pdf}
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-
-	# Asterisk installs a few folders that's empty by design,
-	# but still required.  This finds them, and marks them for
-	# portage.
-	while read d < <(find "${ED}"/var -type d -empty || die "Find failed."); do
-		keepdir "${d#${ED}}"
-	done
-}
-
-pkg_postinst() {
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
-		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
-	fi
-
-	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
-		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
-		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
-		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
-		ewarn "steps to migrate:"
-		ewarn "1.  /etc/init.d/asterisk stop"
-		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
-		ewarn "3.  /etc/init.d/asterisk start"
-		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-13.38.2-r5.ebuild b/net-misc/asterisk/asterisk-13.38.2-r5.ebuild
deleted file mode 100644
index 400218a388d5..000000000000
--- a/net-misc/asterisk/asterisk-13.38.2-r5.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-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"
-
-IUSE_VOICEMAIL_STORAGE=(
-	+voicemail_storage_file
-	voicemail_storage_odbc
-	voicemail_storage_imap
-)
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd vorbis xmpp"
-REQUIRED_USE="gtalk? ( xmpp )
-	lua? ( ${LUA_REQUIRED_USE} )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-historic-no-var-run-install.patch"
-	"${FILESDIR}/${PN}-13.38.1-r1-autoconf-lua-version.patch"
-	"${FILESDIR}/${PN}-13.38.2-r3-func_lock-fix-races.patch"
-	"${FILESDIR}/${PN}-13.18.1-r2-autoconf-2.70.patch"
-	"${FILESDIR}/${PN}-13.38.2-r1-menuselect-exitcodes.patch"
-	"${FILESDIR}/${PN}-13.38.2-r2-func_odbc_minargs-ARGC.patch"
-)
-
-DEPEND="acct-user/asterisk
-	acct-group/asterisk
-	dev-db/sqlite:3
-	dev-libs/popt
-	dev-libs/jansson
-	dev-libs/libedit
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	virtual/libcrypt:=
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez:= )
-	calendar? (
-		net-libs/neon:=
-		dev-libs/libical:=
-		dev-libs/iksemel
-	)
-	caps? ( sys-libs/libcap )
-	blocks? ( sys-libs/blocksruntime )
-	cluster? ( sys-cluster/corosync )
-	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( media-libs/libilbc )
-	ldap? ( net-nds/openldap )
-	lua? ( ${LUA_DEPS} )
-	mysql? ( dev-db/mysql-connector-c:= )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	pjproject? ( net-libs/pjproject:= )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp:= )
-	span? ( media-libs/spandsp )
-	speex? (
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	srtp? ( net-libs/libsrtp:0 )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-	!systemd? ( !sys-apps/systemd )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${DEPEND}
-	net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-BDEPEND="dev-libs/libxml2:2
-	virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-_make_args=(
-	"NOISY_BUILD=yes"
-	"ASTDBDIR=\$(ASTDATADIR)/astdb"
-	"OPTIMIZE="
-	"DEBUG="
-	"DESTDIR=${D}"
-	"CONFIG_SRC=configs/samples"
-	"CONFIG_EXTEN=.sample"
-)
-
-pkg_pretend() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	[[ "${MERGE_TYPE}" == binary ]] && return
-
-	if tc-is-clang; then
-		use blocks || die "CC=clang requires USE=blocks"
-	else
-		use blocks && die "USE=blocks can only be used with CC=clang"
-	fi
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
-}
-
-src_configure() {
-	local vmst
-	local copt cstate
-
-	econf \
-		LUA_VERSION="${ELUA#lua}" \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		--with-libedit \
-		$(use_with caps cap) \
-		$(use_with lua lua) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl)
-
-	_menuselect() {
-		menuselect/menuselect "$@" || die "menuselect $* failed."
-	}
-
-	_use_select() {
-		local state=$(usex "$1" enable disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			_menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake "${_make_args[@]}" menuselect.makeopts
-
-	# Disable BUILD_NATIVE (bug #667498)
-	_menuselect --disable build_native menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	_menuselect --disable chan_misdn menuselect.makeopts
-	_menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	_menuselect --enable smsq menuselect.makeopts
-	_menuselect --enable streamplayer menuselect.makeopts
-	_menuselect --enable aelparse menuselect.makeopts
-	_menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	_menuselect --enable chan_mgcp menuselect.makeopts
-	_menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	_menuselect --enable pbx_dundi menuselect.makeopts
-	_menuselect --enable func_aes menuselect.makeopts
-	_menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	_use_select alsa         chan_alsa
-	_use_select bluetooth    chan_mobile
-	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	_use_select cluster      res_corosync
-	_use_select curl         func_curl res_config_curl res_curl
-	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	_use_select freetds      {cdr,cel}_tds
-	_use_select gtalk        chan_motif
-	_use_select http         res_http_post
-	_use_select iconv        func_iconv
-	_use_select ilbc         codec_ilbc format_ilbc
-	_use_select ldap         res_config_ldap
-	_use_select lua          pbx_lua
-	_use_select mysql        app_mysql cdr_mysql res_config_mysql
-	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	_use_select oss          chan_oss
-	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
-	_use_select radius       {cdr,cel}_radius
-	_use_select snmp         res_snmp
-	_use_select span         res_fax_spandsp
-	_use_select speex        {codec,func}_speex
-	_use_select srtp         res_srtp
-	_use_select statsd       res_statsd res_{endpoint,chan}_stats
-	_use_select syslog       cdr_syslog
-	_use_select vorbis       format_ogg_vorbis
-	_use_select xmpp         res_xmpp
-
-	# Voicemail storage ...
-	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
-		if use "${vmst#+}"; then
-			_menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
-			_menuselect --enable $o menuselect.makeopts
-		done
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
-			cstate=--enable
-			[[ "${copt}" == -* ]] && cstate=--disable
-			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
-			_menuselect ${cstate} "${copt#[-+]}"
-			eend $?
-		done
-	fi
-}
-
-src_compile() {
-	emake "${_make_args[@]}"
-}
-
-src_install() {
-	local d
-
-	dodir "/usr/$(get_libdir)/pkgconfig"
-	diropts -m 0750 -o root -g asterisk
-	dodir	/etc/asterisk
-
-	emake "${_make_args[@]}" install install-configs
-
-	fowners asterisk: /var/lib/asterisk/astdb
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-
-	# keep directories
-	diropts -m 0750 -o asterisk -g root
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk
-	newconfd "${FILESDIR}"/confd-13.32.0 asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles2.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# Reset diropts else dodoc uses it for doc installations.
-	diropts -m0755
-
-	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	use doc && dodoc doc/*.{txt,pdf}
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-
-	# Asterisk installs a few folders that's empty by design,
-	# but still required.  This finds them, and marks them for
-	# portage.
-	while read d < <(find "${ED}"/var -type d -empty || die "Find failed."); do
-		keepdir "${d#${ED}}"
-	done
-}
-
-pkg_postinst() {
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
-		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
-	fi
-
-	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
-		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
-		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
-		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
-		ewarn "steps to migrate:"
-		ewarn "1.  /etc/init.d/asterisk stop"
-		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
-		ewarn "3.  /etc/init.d/asterisk start"
-		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-16.18.0-r2.ebuild b/net-misc/asterisk/asterisk-16.18.0-r2.ebuild
deleted file mode 100644
index 5e2d0afa12bc..000000000000
--- a/net-misc/asterisk/asterisk-16.18.0-r2.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-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"
-
-IUSE_VOICEMAIL_STORAGE=(
-	+voicemail_storage_file
-	voicemail_storage_odbc
-	voicemail_storage_imap
-)
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog unbound vorbis xmpp"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	lua? ( ${LUA_REQUIRED_USE} )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch"
-	"${FILESDIR}/${PN}-16.18.0-r1-func_lock-fix-races.patch"
-)
-
-DEPEND="acct-user/asterisk
-	acct-group/asterisk
-	dev-db/sqlite:3
-	dev-libs/popt
-	>=dev-libs/jansson-2.11
-	dev-libs/libedit
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	virtual/libcrypt:=
-	sys-apps/util-linux
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez:= )
-	calendar? (
-		net-libs/neon:=
-		dev-libs/libical:=
-		dev-libs/iksemel
-	)
-	caps? ( sys-libs/libcap )
-	blocks? ( sys-libs/blocksruntime )
-	cluster? ( sys-cluster/corosync )
-	codec2? ( media-libs/codec2:= )
-	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( media-libs/libilbc )
-	ldap? ( net-nds/openldap )
-	lua? ( ${LUA_DEPS} )
-	mysql? ( dev-db/mysql-connector-c:= )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	pjproject? ( >=net-libs/pjproject-2.9 )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp:= )
-	span? ( media-libs/spandsp )
-	speex? (
-		media-libs/libogg
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	srtp? ( net-libs/libsrtp:0 )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	unbound? ( net-dns/unbound )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${DEPEND}
-	net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-BDEPEND="dev-libs/libxml2:2
-	virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-pkg_pretend() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	[[ "${MERGE_TYPE}" == binary ]] && return
-
-	if tc-is-clang; then
-		use blocks || die "CC=clang requires USE=blocks"
-	else
-		use blocks && die "USE=blocks can only be used with CC=clang"
-	fi
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
-}
-
-src_configure() {
-	local vmst
-
-	econf \
-		LUA_VERSION="${ELUA#lua}" \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		--with-libedit \
-		--without-jansson-bundled \
-		--without-pjproject-bundled \
-		$(use_with caps cap) \
-		$(use_with codec2) \
-		$(use_with lua lua) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl) \
-		$(use_with unbound)
-
-	_menuselect() {
-		menuselect/menuselect "$@" || die "menuselect $* failed."
-	}
-
-	_use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			_menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake NOISY_BUILD=yes menuselect.makeopts
-
-	# Disable BUILD_NATIVE (bug #667498)
-	_menuselect --disable build_native menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	_menuselect --disable chan_misdn menuselect.makeopts
-	_menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	_menuselect --enable smsq menuselect.makeopts
-	_menuselect --enable streamplayer menuselect.makeopts
-	_menuselect --enable aelparse menuselect.makeopts
-	_menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	_menuselect --enable chan_mgcp menuselect.makeopts
-	_menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	_menuselect --enable pbx_dundi menuselect.makeopts
-	_menuselect --enable func_aes menuselect.makeopts
-	_menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	_use_select alsa         chan_alsa
-	_use_select bluetooth    chan_mobile
-	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	_use_select cluster      res_corosync
-	_use_select codec2       codec_codec2
-	_use_select curl         func_curl res_config_curl res_curl
-	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	_use_select freetds      {cdr,cel}_tds
-	_use_select gtalk        chan_motif
-	_use_select http         res_http_post
-	_use_select iconv        func_iconv
-	_use_select ilbc         codec_ilbc format_ilbc
-	_use_select ldap         res_config_ldap
-	_use_select lua          pbx_lua
-	_use_select mysql        app_mysql cdr_mysql res_config_mysql
-	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	_use_select oss          chan_oss
-	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
-	_use_select radius       {cdr,cel}_radius
-	_use_select snmp         res_snmp
-	_use_select span         res_fax_spandsp
-	_use_select speex        {codec,func}_speex
-	_use_select speex        format_ogg_speex
-	_use_select srtp         res_srtp
-	_use_select statsd       res_statsd res_{endpoint,chan}_stats
-	_use_select syslog       cdr_syslog
-	_use_select vorbis       format_ogg_vorbis
-	_use_select xmpp         res_xmpp
-
-	# Voicemail storage ...
-	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
-		if use "${vmst#+}"; then
-			_menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
-			_menuselect --enable "${o}" menuselect.makeopts
-		done
-	fi
-}
-
-src_compile() {
-	emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes
-}
-
-src_install() {
-	local d
-
-	dodir "/usr/$(get_libdir)/pkgconfig"
-	emake DESTDIR="${D}" NOISY_BUILD=yes install
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-	diropts -m 0750 -o root -g asterisk
-	keepdir	/etc/asterisk
-	emake NOISY_BUILD=yes DESTDIR="${D}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs
-	chown root:root "${ED}/etc/asterisk/"* || die "chown root:root of config files failed."
-	chmod 644 "${ED}/etc/asterisk/"* || die "chmod 644 of config files failed."
-
-	# keep directories
-	diropts -m 0750 -o asterisk -g root
-	keepdir /var/lib/asterisk
-	keepdir /var/spool/asterisk
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk
-	newconfd "${FILESDIR}"/confd-13.32.0 asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles2.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# Reset diropts else dodoc uses it for doc installations.
-	diropts -m0755
-
-	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	use doc && dodoc doc/*.{txt,pdf}
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-
-	# Asterisk installs a few folders that's empty by design,
-	# but still required.  This finds them, and marks them for
-	# portage.
-	while read d < <(find "${ED}"/var -type d -empty || die "Find failed."); do
-		keepdir "${d#${ED}}"
-	done
-}
-
-pkg_postinst() {
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-16.19.0-r1.ebuild b/net-misc/asterisk/asterisk-16.19.0-r1.ebuild
deleted file mode 100644
index 9548b400631a..000000000000
--- a/net-misc/asterisk/asterisk-16.19.0-r1.ebuild
+++ /dev/null
@@ -1,363 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-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"
-
-IUSE_VOICEMAIL_STORAGE=(
-	+voicemail_storage_file
-	voicemail_storage_odbc
-	voicemail_storage_imap
-)
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	lua? ( ${LUA_REQUIRED_USE} )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch"
-)
-
-DEPEND="acct-user/asterisk
-	acct-group/asterisk
-	dev-db/sqlite:3
-	dev-libs/popt
-	>=dev-libs/jansson-2.11
-	dev-libs/libedit
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libcrypt:=
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez:= )
-	calendar? (
-		net-libs/neon:=
-		dev-libs/libical:=
-		dev-libs/iksemel
-	)
-	caps? ( sys-libs/libcap )
-	blocks? ( sys-libs/blocksruntime )
-	cluster? ( sys-cluster/corosync )
-	codec2? ( media-libs/codec2:= )
-	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( media-libs/libilbc )
-	ldap? ( net-nds/openldap )
-	lua? ( ${LUA_DEPS} )
-	mysql? ( dev-db/mysql-connector-c:= )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	pjproject? ( >=net-libs/pjproject-2.9:= )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp:= )
-	span? ( media-libs/spandsp )
-	speex? (
-		media-libs/libogg
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	srtp? ( net-libs/libsrtp:0 )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-	!systemd? ( !sys-apps/systemd )
-	unbound? ( net-dns/unbound )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${DEPEND}
-	net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-BDEPEND="dev-libs/libxml2:2
-	virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-_make_args=(
-	"NOISY_BUILD=yes"
-	"ASTDBDIR=\$(ASTDATADIR)/astdb"
-	"ASTCACHEDIR=/var/cache/asterisk"
-	"OPTIMIZE="
-	"DEBUG="
-	"DESTDIR=${D}"
-	"CONFIG_SRC=configs/samples"
-	"CONFIG_EXTEN=.sample"
-)
-
-pkg_pretend() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	[[ "${MERGE_TYPE}" == binary ]] && return
-
-	if tc-is-clang; then
-		use blocks || die "CC=clang requires USE=blocks"
-	else
-		use blocks && die "USE=blocks can only be used with CC=clang"
-	fi
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
-}
-
-src_configure() {
-	local vmst
-	local copt cstate
-
-	econf \
-		LUA_VERSION="${ELUA#lua}" \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		--with-libedit \
-		--without-jansson-bundled \
-		--without-pjproject-bundled \
-		$(use_with caps cap) \
-		$(use_with codec2) \
-		$(use_with lua lua) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl) \
-		$(use_with unbound)
-
-	_menuselect() {
-		menuselect/menuselect "$@" || die "menuselect $* failed."
-	}
-
-	_use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			_menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake "${_make_args[@]}" menuselect.makeopts
-
-	# Disable BUILD_NATIVE (bug #667498)
-	_menuselect --disable build_native menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	_menuselect --disable chan_misdn menuselect.makeopts
-	_menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	_menuselect --enable smsq menuselect.makeopts
-	_menuselect --enable streamplayer menuselect.makeopts
-	_menuselect --enable aelparse menuselect.makeopts
-	_menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	_menuselect --enable chan_mgcp menuselect.makeopts
-	_menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	_menuselect --enable pbx_dundi menuselect.makeopts
-	_menuselect --enable func_aes menuselect.makeopts
-	_menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	_use_select alsa         chan_alsa
-	_use_select bluetooth    chan_mobile
-	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	_use_select cluster      res_corosync
-	_use_select codec2       codec_codec2
-	_use_select curl         func_curl res_config_curl res_curl
-	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	_use_select deprecated   app_macro
-	_use_select freetds      {cdr,cel}_tds
-	_use_select gtalk        chan_motif
-	_use_select http         res_http_post
-	_use_select iconv        func_iconv
-	_use_select ilbc         codec_ilbc format_ilbc
-	_use_select ldap         res_config_ldap
-	_use_select lua          pbx_lua
-	_use_select mysql        app_mysql cdr_mysql res_config_mysql
-	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	_use_select oss          chan_oss
-	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
-	_use_select radius       {cdr,cel}_radius
-	_use_select snmp         res_snmp
-	_use_select span         res_fax_spandsp
-	_use_select speex        {codec,func}_speex
-	_use_select speex        format_ogg_speex
-	_use_select srtp         res_srtp
-	_use_select statsd       res_statsd res_{endpoint,chan}_stats
-	_use_select syslog       cdr_syslog
-	_use_select vorbis       format_ogg_vorbis
-	_use_select xmpp         res_xmpp
-
-	# Voicemail storage ...
-	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
-		if use "${vmst#+}"; then
-			_menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
-			_menuselect --enable "${o}" menuselect.makeopts
-		done
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
-			cstate=--enable
-			[[ "${copt}" == -* ]] && cstate=--disable
-			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
-			_menuselect ${cstate} "${copt#[-+]}"
-			eend $?
-		done
-	fi
-}
-
-src_compile() {
-	emake "${_make_args[@]}"
-}
-
-src_install() {
-	local d
-
-	dodir "/usr/$(get_libdir)/pkgconfig"
-
-	diropts -m 0750 -o root -g asterisk
-	dodir /etc/asterisk
-
-	emake "${_make_args[@]}" install install-configs
-
-	fowners asterisk: /var/lib/asterisk/astdb
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-
-	# keep directories
-	diropts -m 0750 -o asterisk -g root
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk
-	newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# Reset diropts else dodoc uses it for doc installations.
-	diropts -m0755
-
-	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	use doc && dodoc doc/*.{txt,pdf}
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-
-	# Asterisk installs a few folders that's empty by design,
-	# but still required.  This finds them, and marks them for
-	# portage.
-	while read d <&3; do
-		keepdir "${d#${ED}}"
-	done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
-}
-
-pkg_postinst() {
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	fi
-
-	if use deprecated; then
-		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
-		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
-		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
-	fi
-
-	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
-		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
-		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
-		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
-		ewarn "steps to migrate:"
-		ewarn "1.  /etc/init.d/asterisk stop"
-		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
-		ewarn "3.  /etc/init.d/asterisk start"
-		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-18.4.0-r2.ebuild b/net-misc/asterisk/asterisk-18.4.0-r2.ebuild
deleted file mode 100644
index d17925736937..000000000000
--- a/net-misc/asterisk/asterisk-18.4.0-r2.ebuild
+++ /dev/null
@@ -1,363 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-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"
-
-IUSE_VOICEMAIL_STORAGE=(
-	voicemail_storage_odbc
-	voicemail_storage_imap
-)
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	lua? ( ${LUA_REQUIRED_USE} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch"
-	"${FILESDIR}/${PN}-16.18.0-r1-func_lock-fix-races.patch"
-)
-
-DEPEND="acct-user/asterisk
-	acct-group/asterisk
-	dev-db/sqlite:3
-	dev-libs/popt
-	>=dev-libs/jansson-2.11
-	dev-libs/libedit
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	virtual/libcrypt:=
-	sys-apps/util-linux
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez:= )
-	calendar? (
-		net-libs/neon:=
-		dev-libs/libical:=
-		dev-libs/iksemel
-	)
-	caps? ( sys-libs/libcap )
-	blocks? ( sys-libs/blocksruntime )
-	cluster? ( sys-cluster/corosync )
-	codec2? ( media-libs/codec2:= )
-	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( media-libs/libilbc )
-	ldap? ( net-nds/openldap )
-	lua? ( ${LUA_DEPS} )
-	mysql? ( dev-db/mysql-connector-c:= )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	pjproject? ( >=net-libs/pjproject-2.9:= )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp:= )
-	span? ( media-libs/spandsp )
-	speex? (
-		media-libs/libogg
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	srtp? ( net-libs/libsrtp:0 )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-	!systemd? ( !sys-apps/systemd )
-	unbound? ( net-dns/unbound )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${DEPEND}
-	net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-BDEPEND="dev-libs/libxml2:2
-	virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-_make_args=(
-	"NOISY_BUILD=yes"
-	"ASTDBDIR=\$(ASTDATADIR)/astdb"
-	"ASTCACHEDIR=/var/cache/asterisk"
-	"OPTIMIZE="
-	"DEBUG="
-	"DESTDIR=${D}"
-	"CONFIG_SRC=configs/samples"
-	"CONFIG_EXTEN=.sample"
-)
-
-pkg_pretend() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	[[ "${MERGE_TYPE}" == binary ]] && return
-
-	if tc-is-clang; then
-		use blocks || die "CC=clang requires USE=blocks"
-	else
-		use blocks && die "USE=blocks can only be used with CC=clang"
-	fi
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
-}
-
-src_configure() {
-	local vmst
-	local copt cstate
-
-	econf \
-		LUA_VERSION="${ELUA#lua}" \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		--with-libedit \
-		--without-jansson-bundled \
-		--without-pjproject-bundled \
-		$(use_with caps cap) \
-		$(use_with codec2) \
-		$(use_with lua lua) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl) \
-		$(use_with unbound)
-
-	_menuselect() {
-		menuselect/menuselect "$@" || die "menuselect $* failed."
-	}
-
-	_use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			_menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake "${_make_args[@]}" menuselect.makeopts
-
-	# Disable BUILD_NATIVE (bug #667498)
-	_menuselect --disable build_native menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	_menuselect --disable chan_misdn menuselect.makeopts
-	_menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	_menuselect --enable smsq menuselect.makeopts
-	_menuselect --enable streamplayer menuselect.makeopts
-	_menuselect --enable aelparse menuselect.makeopts
-	_menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	_menuselect --enable chan_mgcp menuselect.makeopts
-	_menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	_menuselect --enable pbx_dundi menuselect.makeopts
-	_menuselect --enable func_aes menuselect.makeopts
-	_menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	_use_select alsa         chan_alsa
-	_use_select bluetooth    chan_mobile
-	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	_use_select cluster      res_corosync
-	_use_select codec2       codec_codec2
-	_use_select curl         func_curl res_config_curl res_curl
-	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	_use_select deprecated   app_macro
-	_use_select freetds      {cdr,cel}_tds
-	_use_select gtalk        chan_motif
-	_use_select http         res_http_post
-	_use_select iconv        func_iconv
-	_use_select ilbc         codec_ilbc format_ilbc
-	_use_select ldap         res_config_ldap
-	_use_select lua          pbx_lua
-	_use_select mysql        app_mysql cdr_mysql res_config_mysql
-	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	_use_select oss          chan_oss
-	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
-	_use_select radius       {cdr,cel}_radius
-	_use_select snmp         res_snmp
-	_use_select span         res_fax_spandsp
-	_use_select speex        {codec,func}_speex
-	_use_select speex        format_ogg_speex
-	_use_select srtp         res_srtp
-	_use_select statsd       res_statsd res_{endpoint,chan}_stats
-	_use_select syslog       cdr_syslog
-	_use_select vorbis       format_ogg_vorbis
-	_use_select xmpp         res_xmpp
-
-	# Voicemail storage ...
-	_menuselect --enable app_voicemail menuselect.makeopts
-	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
-		if use "${vmst#+}"; then
-			_menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
-			_menuselect --enable "${o}" menuselect.makeopts
-		done
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
-			cstate=--enable
-			[[ "${copt}" == -* ]] && cstate=--disable
-			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
-			_menuselect ${cstate} "${copt#[-+]}"
-			eend $?
-		done
-	fi
-}
-
-src_compile() {
-	emake "${_make_args[@]}"
-}
-
-src_install() {
-	local d
-
-	dodir "/usr/$(get_libdir)/pkgconfig"
-
-	diropts -m 0750 -o root -g asterisk
-	dodir /etc/asterisk
-
-	emake "${_make_args[@]}" install install-headers install-configs
-
-	fowners asterisk: /var/lib/asterisk/astdb
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-
-	# keep directories
-	diropts -m 0750 -o asterisk -g root
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk
-	newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# Reset diropts else dodoc uses it for doc installations.
-	diropts -m0755
-
-	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	use doc && dodoc doc/*.{txt,pdf}
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-
-	# Asterisk installs a few folders that's empty by design,
-	# but still required.  This finds them, and marks them for
-	# portage.
-	while read d < <(find "${ED}"/var -type d -empty || die "Find failed."); do
-		keepdir "${d#${ED}}"
-	done
-}
-
-pkg_postinst() {
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	fi
-
-	if use deprecated; then
-		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
-		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
-		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
-	fi
-
-	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
-		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
-		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
-		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
-		ewarn "steps to migrate:"
-		ewarn "1.  /etc/init.d/asterisk stop"
-		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
-		ewarn "3.  /etc/init.d/asterisk start"
-		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-18.5.0-r1.ebuild b/net-misc/asterisk/asterisk-18.5.0-r1.ebuild
deleted file mode 100644
index 1334c613ae61..000000000000
--- a/net-misc/asterisk/asterisk-18.5.0-r1.ebuild
+++ /dev/null
@@ -1,362 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-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"
-
-IUSE_VOICEMAIL_STORAGE=(
-	voicemail_storage_odbc
-	voicemail_storage_imap
-)
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	lua? ( ${LUA_REQUIRED_USE} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch"
-)
-
-DEPEND="acct-user/asterisk
-	acct-group/asterisk
-	dev-db/sqlite:3
-	dev-libs/popt
-	>=dev-libs/jansson-2.11
-	dev-libs/libedit
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libcrypt:=
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez:= )
-	calendar? (
-		net-libs/neon:=
-		dev-libs/libical:=
-		dev-libs/iksemel
-	)
-	caps? ( sys-libs/libcap )
-	blocks? ( sys-libs/blocksruntime )
-	cluster? ( sys-cluster/corosync )
-	codec2? ( media-libs/codec2:= )
-	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( media-libs/libilbc )
-	ldap? ( net-nds/openldap )
-	lua? ( ${LUA_DEPS} )
-	mysql? ( dev-db/mysql-connector-c:= )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	pjproject? ( >=net-libs/pjproject-2.9:= )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp:= )
-	span? ( media-libs/spandsp )
-	speex? (
-		media-libs/libogg
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	srtp? ( net-libs/libsrtp:0 )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-	!systemd? ( !sys-apps/systemd )
-	unbound? ( net-dns/unbound )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${DEPEND}
-	net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-BDEPEND="dev-libs/libxml2:2
-	virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-_make_args=(
-	"NOISY_BUILD=yes"
-	"ASTDBDIR=\$(ASTDATADIR)/astdb"
-	"ASTCACHEDIR=/var/cache/asterisk"
-	"OPTIMIZE="
-	"DEBUG="
-	"DESTDIR=${D}"
-	"CONFIG_SRC=configs/samples"
-	"CONFIG_EXTEN=.sample"
-)
-
-pkg_pretend() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	[[ "${MERGE_TYPE}" == binary ]] && return
-
-	if tc-is-clang; then
-		use blocks || die "CC=clang requires USE=blocks"
-	else
-		use blocks && die "USE=blocks can only be used with CC=clang"
-	fi
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
-}
-
-src_configure() {
-	local vmst
-	local copt cstate
-
-	econf \
-		LUA_VERSION="${ELUA#lua}" \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		--with-libedit \
-		--without-jansson-bundled \
-		--without-pjproject-bundled \
-		$(use_with caps cap) \
-		$(use_with codec2) \
-		$(use_with lua lua) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl) \
-		$(use_with unbound)
-
-	_menuselect() {
-		menuselect/menuselect "$@" || die "menuselect $* failed."
-	}
-
-	_use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			_menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake "${_make_args[@]}" menuselect.makeopts
-
-	# Disable BUILD_NATIVE (bug #667498)
-	_menuselect --disable build_native menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	_menuselect --disable chan_misdn menuselect.makeopts
-	_menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	_menuselect --enable smsq menuselect.makeopts
-	_menuselect --enable streamplayer menuselect.makeopts
-	_menuselect --enable aelparse menuselect.makeopts
-	_menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	_menuselect --enable chan_mgcp menuselect.makeopts
-	_menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	_menuselect --enable pbx_dundi menuselect.makeopts
-	_menuselect --enable func_aes menuselect.makeopts
-	_menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	_use_select alsa         chan_alsa
-	_use_select bluetooth    chan_mobile
-	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	_use_select cluster      res_corosync
-	_use_select codec2       codec_codec2
-	_use_select curl         func_curl res_config_curl res_curl
-	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	_use_select deprecated   app_macro
-	_use_select freetds      {cdr,cel}_tds
-	_use_select gtalk        chan_motif
-	_use_select http         res_http_post
-	_use_select iconv        func_iconv
-	_use_select ilbc         codec_ilbc format_ilbc
-	_use_select ldap         res_config_ldap
-	_use_select lua          pbx_lua
-	_use_select mysql        app_mysql cdr_mysql res_config_mysql
-	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	_use_select oss          chan_oss
-	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
-	_use_select radius       {cdr,cel}_radius
-	_use_select snmp         res_snmp
-	_use_select span         res_fax_spandsp
-	_use_select speex        {codec,func}_speex
-	_use_select speex        format_ogg_speex
-	_use_select srtp         res_srtp
-	_use_select statsd       res_statsd res_{endpoint,chan}_stats
-	_use_select syslog       cdr_syslog
-	_use_select vorbis       format_ogg_vorbis
-	_use_select xmpp         res_xmpp
-
-	# Voicemail storage ...
-	_menuselect --enable app_voicemail menuselect.makeopts
-	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
-		if use "${vmst#+}"; then
-			_menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
-			_menuselect --enable "${o}" menuselect.makeopts
-		done
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
-			cstate=--enable
-			[[ "${copt}" == -* ]] && cstate=--disable
-			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
-			_menuselect ${cstate} "${copt#[-+]}"
-			eend $?
-		done
-	fi
-}
-
-src_compile() {
-	emake "${_make_args[@]}"
-}
-
-src_install() {
-	local d
-
-	dodir "/usr/$(get_libdir)/pkgconfig"
-
-	diropts -m 0750 -o root -g asterisk
-	dodir /etc/asterisk
-
-	emake "${_make_args[@]}" install install-headers install-configs
-
-	fowners asterisk: /var/lib/asterisk/astdb
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-
-	# keep directories
-	diropts -m 0750 -o asterisk -g root
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk
-	newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# Reset diropts else dodoc uses it for doc installations.
-	diropts -m0755
-
-	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	use doc && dodoc doc/*.{txt,pdf}
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-
-	# Asterisk installs a few folders that's empty by design,
-	# but still required.  This finds them, and marks them for
-	# portage.
-	while read d <&3; do
-		keepdir "${d#${ED}}"
-	done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
-}
-
-pkg_postinst() {
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	fi
-
-	if use deprecated; then
-		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
-		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
-		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
-	fi
-
-	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
-		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
-		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
-		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
-		ewarn "steps to migrate:"
-		ewarn "1.  /etc/init.d/asterisk stop"
-		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
-		ewarn "3.  /etc/init.d/asterisk start"
-		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
-	fi
-}
diff --git a/net-misc/asterisk/files/asterisk-13.38.1-r1-func_lock-fix-races.patch b/net-misc/asterisk/files/asterisk-13.38.1-r1-func_lock-fix-races.patch
deleted file mode 100644
index b8b98e4929b2..000000000000
--- a/net-misc/asterisk/files/asterisk-13.38.1-r1-func_lock-fix-races.patch
+++ /dev/null
@@ -1,291 +0,0 @@
-From 8ec686ebb4fa68512ca2dfe40b117523074aed0f Mon Sep 17 00:00:00 2001
-From: Jaco Kroon <jaco@uls.co.za>
-Date: Fri, 18 Dec 2020 21:06:20 +0200
-Subject: [PATCH] func_lock: fix multiple-channel-grant problems.
-
-Under contention it becomes possible that multiple channels will be told
-they successfully obtained the lock, which is a bug.  Please refer
-
-ASTERISK-29217
-
-This introduces a couple of changes.
-
-1.  Replaces requesters ao2 container with simple counter (we don't
-    really care who is waiting for the lock, only how many).  This is
-    updated undex ->mutex to prevent memory access races.
-2.  Correct semantics for ast_cond_timedwait() as described in
-    pthread_cond_broadcast(3P) is used (multiple threads can be released
-    on a single _signal()).
-3.  Module unload races are taken care of and memory properly cleaned
-    up.
-
-Change-Id: I6f68b5ec82ff25b2909daf6e4d19ca864a463e29
-Signed-off-by: Jaco Kroon <jaco@uls.co.za>
----
- funcs/func_lock.c | 163 ++++++++++++++++------------------------------
- 1 file changed, 56 insertions(+), 107 deletions(-)
-
-diff --git a/funcs/func_lock.c b/funcs/func_lock.c
-index acb5fc935c..072640751e 100644
---- a/funcs/func_lock.c
-+++ b/funcs/func_lock.c
-@@ -110,7 +110,6 @@ static AST_LIST_HEAD_STATIC(locklist, lock_frame);
- static void lock_free(void *data);
- static void lock_fixup(void *data, struct ast_channel *oldchan, struct ast_channel *newchan);
- static int unloading = 0;
--static pthread_t broker_tid = AST_PTHREADT_NULL;
- 
- static const struct ast_datastore_info lock_info = {
- 	.type = "MUTEX",
-@@ -124,8 +123,8 @@ struct lock_frame {
- 	ast_cond_t cond;
- 	/*! count is needed so if a recursive mutex exits early, we know how many times to unlock it. */
- 	unsigned int count;
--	/*! Container of requesters for the named lock */
--	struct ao2_container *requesters;
-+	/*! Count of waiting of requesters for the named lock */
-+	unsigned int requesters;
- 	/*! who owns us */
- 	struct ast_channel *owner;
- 	/*! name of the lock */
-@@ -147,8 +146,11 @@ static void lock_free(void *data)
- 	while ((clframe = AST_LIST_REMOVE_HEAD(oldlist, list))) {
- 		/* Only unlock if we own the lock */
- 		if (clframe->channel == clframe->lock_frame->owner) {
-+			ast_mutex_lock(&clframe->lock_frame->mutex);
- 			clframe->lock_frame->count = 0;
- 			clframe->lock_frame->owner = NULL;
-+			ast_cond_signal(&clframe->lock_frame->cond);
-+			ast_mutex_unlock(&clframe->lock_frame->mutex);
- 		}
- 		ast_free(clframe);
- 	}
-@@ -173,54 +175,11 @@ static void lock_fixup(void *data, struct ast_channel *oldchan, struct ast_chann
- 		if (clframe->lock_frame->owner == oldchan) {
- 			clframe->lock_frame->owner = newchan;
- 		}
--		/* We don't move requesters, because the thread stack is different */
- 		clframe->channel = newchan;
- 	}
- 	AST_LIST_UNLOCK(list);
- }
- 
--static void *lock_broker(void *unused)
--{
--	struct lock_frame *frame;
--	struct timespec forever = { 1000000, 0 };
--	for (;;) {
--		int found_requester = 0;
--
--		/* Test for cancel outside of the lock */
--		pthread_testcancel();
--		AST_LIST_LOCK(&locklist);
--
--		AST_LIST_TRAVERSE(&locklist, frame, entries) {
--			if (ao2_container_count(frame->requesters)) {
--				found_requester++;
--				ast_mutex_lock(&frame->mutex);
--				if (!frame->owner) {
--					ast_cond_signal(&frame->cond);
--				}
--				ast_mutex_unlock(&frame->mutex);
--			}
--		}
--
--		AST_LIST_UNLOCK(&locklist);
--		pthread_testcancel();
--
--		/* If there are no requesters, then wait for a signal */
--		if (!found_requester) {
--			nanosleep(&forever, NULL);
--		} else {
--			sched_yield();
--		}
--	}
--	/* Not reached */
--	return NULL;
--}
--
--static int ast_channel_cmp_cb(void *obj, void *arg, int flags)
--{
--	struct ast_channel *chan = obj, *cmp_args = arg;
--	return strcasecmp(ast_channel_name(chan), ast_channel_name(cmp_args)) ? 0 : CMP_MATCH;
--}
--
- static int get_lock(struct ast_channel *chan, char *lockname, int trylock)
- {
- 	struct ast_datastore *lock_store = ast_channel_datastore_find(chan, &lock_info, NULL);
-@@ -290,17 +249,13 @@ static int get_lock(struct ast_channel *chan, char *lockname, int trylock)
- 			AST_LIST_UNLOCK(&locklist);
- 			return -1;
- 		}
--		current->requesters = ao2_container_alloc_list(AO2_ALLOC_OPT_LOCK_MUTEX, 0,
--			NULL, ast_channel_cmp_cb);
--		if (!current->requesters) {
--			ast_mutex_destroy(&current->mutex);
--			ast_cond_destroy(&current->cond);
--			ast_free(current);
--			AST_LIST_UNLOCK(&locklist);
--			return -1;
--		}
-+		current->requesters = 0;
- 		AST_LIST_INSERT_TAIL(&locklist, current, entries);
- 	}
-+	/* Add to requester list */
-+	ast_mutex_lock(&current->mutex);
-+	current->requesters++;
-+	ast_mutex_unlock(&current->mutex);
- 	AST_LIST_UNLOCK(&locklist);
- 
- 	/* Found lock or created one - now find or create the corresponding link in the channel */
-@@ -337,44 +292,42 @@ static int get_lock(struct ast_channel *chan, char *lockname, int trylock)
- 	 * the same amount, before we'll release this one.
- 	 */
- 	if (current->owner == chan) {
-+		/* We're not a requester, we already have it */
-+		ast_mutex_lock(&current->mutex);
-+		current->requesters--;
-+		ast_mutex_unlock(&current->mutex);
- 		current->count++;
- 		return 0;
- 	}
- 
--	/* Okay, we have both frames, so now we need to try to lock.
--	 *
--	 * Locking order: always lock locklist first.  We need the
--	 * locklist lock because the broker thread counts whether
--	 * there are requesters with the locklist lock held, and we
--	 * need to hold it, so that when we send our signal, below,
--	 * to wake up the broker thread, it definitely will see that
--	 * a requester exists at that point in time.  Otherwise, we
--	 * could add to the requesters after it has already seen that
--	 * that lock is unoccupied and wait forever for another signal.
--	 */
--	AST_LIST_LOCK(&locklist);
--	ast_mutex_lock(&current->mutex);
--	/* Add to requester list */
--	ao2_link(current->requesters, chan);
--	pthread_kill(broker_tid, SIGURG);
--	AST_LIST_UNLOCK(&locklist);
--
- 	/* Wait up to three seconds from now for LOCK. */
- 	now = ast_tvnow();
- 	timeout.tv_sec = now.tv_sec + 3;
- 	timeout.tv_nsec = now.tv_usec * 1000;
- 
--	if (!current->owner
--		|| (!trylock
--			&& !(res = ast_cond_timedwait(&current->cond, &current->mutex, &timeout)))) {
--		res = 0;
-+	ast_mutex_lock(&current->mutex);
-+
-+	res = 0;
-+	while (!trylock && !res && current->owner) {
-+		res = ast_cond_timedwait(&current->cond, &current->mutex, &timeout);
-+	}
-+	if (current->owner) {
-+		/* timeout;
-+		 * trylock; or
-+		 * cond_timedwait failed.
-+		 *
-+		 * either way, we fail to obtain the lock.
-+		 */
-+		res = -1;
-+	} else {
- 		current->owner = chan;
- 		current->count++;
--	} else {
--		res = -1;
-+		res = 0;
- 	}
- 	/* Remove from requester list */
--	ao2_unlink(current->requesters, chan);
-+	current->requesters--;
-+	if (res && unloading)
-+		ast_cond_signal(&current->cond);
- 	ast_mutex_unlock(&current->mutex);
- 
- 	return res;
-@@ -422,7 +375,10 @@ static int unlock_read(struct ast_channel *chan, const char *cmd, char *data, ch
- 	}
- 
- 	if (--clframe->lock_frame->count == 0) {
-+		ast_mutex_lock(&clframe->lock_frame->mutex);
- 		clframe->lock_frame->owner = NULL;
-+		ast_cond_signal(&clframe->lock_frame->cond);
-+		ast_mutex_unlock(&clframe->lock_frame->mutex);
- 	}
- 
- 	ast_copy_string(buf, "1", len);
-@@ -478,34 +434,34 @@ static int unload_module(void)
- 	/* Module flag */
- 	unloading = 1;
- 
-+	/* Make it impossible for new requesters to be added
-+	 * NOTE:  channels could already be in get_lock() */
-+	ast_custom_function_unregister(&lock_function);
-+	ast_custom_function_unregister(&trylock_function);
-+
- 	AST_LIST_LOCK(&locklist);
--	while ((current = AST_LIST_REMOVE_HEAD(&locklist, entries))) {
--		/* If any locks are currently in use, then we cannot unload this module */
--		if (current->owner || ao2_container_count(current->requesters)) {
--			/* Put it back */
--			AST_LIST_INSERT_HEAD(&locklist, current, entries);
--			AST_LIST_UNLOCK(&locklist);
--			unloading = 0;
--			return -1;
-+	AST_LIST_TRAVERSE(&locklist, current, entries) {
-+		ast_mutex_lock(&current->mutex);
-+		while (current->owner || current->requesters) {
-+			/* either the mutex is locked, or other parties are currently in get_lock,
-+			 * we need to wait for all of those to clear first */
-+			ast_cond_wait(&current->cond, &current->mutex);
- 		}
-+		ast_mutex_unlock(&current->mutex);
-+		/* At this point we know:
-+		 * 1. the lock has been released,
-+		 * 2. there are no requesters (nor should any be able to sneak in).
-+		 */
- 		ast_mutex_destroy(&current->mutex);
--		ao2_ref(current->requesters, -1);
-+		ast_cond_destroy(&current->cond);
- 		ast_free(current);
- 	}
-+	AST_LIST_UNLOCK(&locklist);
-+	AST_LIST_HEAD_DESTROY(&locklist);
- 
--	/* No locks left, unregister functions */
--	ast_custom_function_unregister(&lock_function);
--	ast_custom_function_unregister(&trylock_function);
-+	/* At this point we can safely stop access to UNLOCK */
- 	ast_custom_function_unregister(&unlock_function);
- 
--	if (broker_tid != AST_PTHREADT_NULL) {
--		pthread_cancel(broker_tid);
--		pthread_kill(broker_tid, SIGURG);
--		pthread_join(broker_tid, NULL);
--	}
--
--	AST_LIST_UNLOCK(&locklist);
--
- 	return 0;
- }
- 
-@@ -515,13 +471,6 @@ static int load_module(void)
- 	res |= ast_custom_function_register_escalating(&trylock_function, AST_CFE_READ);
- 	res |= ast_custom_function_register_escalating(&unlock_function, AST_CFE_READ);
- 
--	if (ast_pthread_create_background(&broker_tid, NULL, lock_broker, NULL)) {
--		ast_log(LOG_ERROR, "Failed to start lock broker thread. Unloading func_lock module.\n");
--		broker_tid = AST_PTHREADT_NULL;
--		unload_module();
--		return AST_MODULE_LOAD_DECLINE;
--	}
--
- 	return res;
- }
- 
--- 
-2.26.2
-
diff --git a/net-misc/asterisk/files/asterisk-16.18.0-r1-func_lock-fix-races.patch b/net-misc/asterisk/files/asterisk-16.18.0-r1-func_lock-fix-races.patch
deleted file mode 100644
index a18ef34d499c..000000000000
--- a/net-misc/asterisk/files/asterisk-16.18.0-r1-func_lock-fix-races.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-Combined patch from upstream (All authored by myself):
-
-https://gerrit.asterisk.org/c/asterisk/+/15942 (CLI: locks show)
-https://gerrit.asterisk.org/c/asterisk/+/15943 (unload memory corruption)
-https://gerrit.asterisk.org/c/asterisk/+/15944 (error path ref counting)
-https://gerrit.asterisk.org/c/asterisk/+/15945 (ast_module_ref usage)
-
-The cause of my nightmares was the unload memory corruption, however,
-the other two whilst much less likely to occur are just as serious.
-
-Fixes on all has been well tested.  The individual patches are quite small.
-
-Signed-off-by: Jaco Kroon <jaco@uls.co.za>
----
-diff --git a/funcs/func_lock.c b/funcs/func_lock.c
-index 072640751e..31a7fcda29 100644
---- a/funcs/func_lock.c
-+++ b/funcs/func_lock.c
-@@ -42,6 +42,7 @@
- #include "asterisk/linkedlists.h"
- #include "asterisk/astobj2.h"
- #include "asterisk/utils.h"
-+#include "asterisk/cli.h"
- 
- /*** DOCUMENTATION
- 	<function name="LOCK" language="en_US">
-@@ -157,6 +158,8 @@ static void lock_free(void *data)
- 	AST_LIST_UNLOCK(oldlist);
- 	AST_LIST_HEAD_DESTROY(oldlist);
- 	ast_free(oldlist);
-+
-+	ast_module_unref(ast_module_info->self);
- }
- 
- static void lock_fixup(void *data, struct ast_channel *oldchan, struct ast_channel *newchan)
-@@ -191,7 +194,12 @@ static int get_lock(struct ast_channel *chan, char *lockname, int trylock)
- 	struct timeval now;
- 
- 	if (!lock_store) {
--		ast_debug(1, "Channel %s has no lock datastore, so we're allocating one.\n", ast_channel_name(chan));
-+		if (unloading) {
-+			ast_log(LOG_ERROR, "%sLOCK has no datastore and func_lock is unloading, failing.\n",
-+					trylock ? "TRY" : "");
-+			return -1;
-+		}
-+
- 		lock_store = ast_datastore_alloc(&lock_info, NULL);
- 		if (!lock_store) {
- 			ast_log(LOG_ERROR, "Unable to allocate new datastore.  No locks will be obtained.\n");
-@@ -210,6 +218,9 @@ static int get_lock(struct ast_channel *chan, char *lockname, int trylock)
- 		lock_store->data = list;
- 		AST_LIST_HEAD_INIT(list);
- 		ast_channel_datastore_add(chan, lock_store);
-+
-+		/* We cannot unload until this channel has released the lock_store */
-+		ast_module_ref(ast_module_info->self);
- 	} else
- 		list = lock_store->data;
- 
-@@ -223,6 +234,9 @@ static int get_lock(struct ast_channel *chan, char *lockname, int trylock)
- 
- 	if (!current) {
- 		if (unloading) {
-+			ast_log(LOG_ERROR,
-+				"Lock doesn't exist whilst unloading.  %sLOCK will fail.\n",
-+				trylock ? "TRY" : "");
- 			/* Don't bother */
- 			AST_LIST_UNLOCK(&locklist);
- 			return -1;
-@@ -249,7 +263,6 @@ static int get_lock(struct ast_channel *chan, char *lockname, int trylock)
- 			AST_LIST_UNLOCK(&locklist);
- 			return -1;
- 		}
--		current->requesters = 0;
- 		AST_LIST_INSERT_TAIL(&locklist, current, entries);
- 	}
- 	/* Add to requester list */
-@@ -268,7 +281,13 @@ static int get_lock(struct ast_channel *chan, char *lockname, int trylock)
- 
- 	if (!clframe) {
- 		if (unloading) {
-+			ast_log(LOG_ERROR,
-+				"Busy unloading.  %sLOCK will fail.\n",
-+				trylock ? "TRY" : "");
- 			/* Don't bother */
-+			ast_mutex_lock(&current->mutex);
-+			current->requesters--;
-+			ast_mutex_unlock(&current->mutex);
- 			AST_LIST_UNLOCK(list);
- 			return -1;
- 		}
-@@ -277,6 +296,9 @@ static int get_lock(struct ast_channel *chan, char *lockname, int trylock)
- 			ast_log(LOG_ERROR,
- 				"Unable to allocate channel lock frame.  %sLOCK will fail.\n",
- 				trylock ? "TRY" : "");
-+			ast_mutex_lock(&current->mutex);
-+			current->requesters--;
-+			ast_mutex_unlock(&current->mutex);
- 			AST_LIST_UNLOCK(list);
- 			return -1;
- 		}
-@@ -409,6 +431,37 @@ static int trylock_read(struct ast_channel *chan, const char *cmd, char *data, c
- 	return 0;
- }
- 
-+static char *handle_cli_locks_show(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-+{
-+	int c = 0;
-+	struct lock_frame* current;
-+	switch (cmd) {
-+	case CLI_INIT:
-+		e->command = "locks show";
-+		e->usage =
-+			"Usage: locks show\n"
-+			"       List all locks known to func_lock, along with their current status.\n";
-+		return NULL;
-+	case CLI_GENERATE:
-+		return NULL;
-+	}
-+
-+	ast_cli(a->fd, "func_lock locks:\n");
-+	ast_cli(a->fd, "%-40s Requesters Owner\n", "Name");
-+	AST_LIST_LOCK(&locklist);
-+	AST_LIST_TRAVERSE(&locklist, current, entries) {
-+		ast_mutex_lock(&current->mutex);
-+		ast_cli(a->fd, "%-40s %-10d %s\n", current->name, current->requesters,
-+				current->owner ? ast_channel_name(current->owner) : "(unlocked)");
-+		ast_mutex_unlock(&current->mutex);
-+		c++;
-+	}
-+	AST_LIST_UNLOCK(&locklist);
-+	ast_cli(a->fd, "%d total locks listed.\n", c);
-+
-+	return 0;
-+}
-+
- static struct ast_custom_function lock_function = {
- 	.name = "LOCK",
- 	.read = lock_read,
-@@ -427,6 +480,8 @@ static struct ast_custom_function unlock_function = {
- 	.read_max = 2,
- };
- 
-+static struct ast_cli_entry cli_locks_show = AST_CLI_DEFINE(handle_cli_locks_show, "List func_lock locks.");
-+
- static int unload_module(void)
- {
- 	struct lock_frame *current;
-@@ -439,10 +494,19 @@ static int unload_module(void)
- 	ast_custom_function_unregister(&lock_function);
- 	ast_custom_function_unregister(&trylock_function);
- 
-+	ast_cli_unregister(&cli_locks_show);
-+
- 	AST_LIST_LOCK(&locklist);
--	AST_LIST_TRAVERSE(&locklist, current, entries) {
-+	while ((current = AST_LIST_REMOVE_HEAD(&locklist, entries))) {
-+		int warned = 0;
- 		ast_mutex_lock(&current->mutex);
- 		while (current->owner || current->requesters) {
-+			if (!warned) {
-+				ast_log(LOG_WARNING, "Waiting for %d requesters for %s lock %s.\n",
-+						current->requesters, current->owner ? "locked" : "unlocked",
-+						current->name);
-+				warned = 1;
-+			}
- 			/* either the mutex is locked, or other parties are currently in get_lock,
- 			 * we need to wait for all of those to clear first */
- 			ast_cond_wait(&current->cond, &current->mutex);
-@@ -470,6 +534,7 @@ static int load_module(void)
- 	int res = ast_custom_function_register_escalating(&lock_function, AST_CFE_READ);
- 	res |= ast_custom_function_register_escalating(&trylock_function, AST_CFE_READ);
- 	res |= ast_custom_function_register_escalating(&unlock_function, AST_CFE_READ);
-+	res |= ast_cli_register(&cli_locks_show);
- 
- 	return res;
- }
author	V3n3RiX <venerix@redcorelinux.org>	2021-07-28 10:27:13 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-07-28 10:27:13 +0100
commit	f4fc10428424904caf2035cffc442195cb088b2c (patch)
tree	72f320d5963e55586cfdeed2b14c72b8191b6327 /net-misc/asterisk
parent	fbd9734cedfe790955100b8e4ab3613457d77b1a (diff)