gentoo resync : 31.05.2021

4 files changed, 80 insertions, 9 deletions

diff --git a/net-misc/asterisk-g729/Manifest b/net-misc/asterisk-g729/Manifest
index ee945b4f87d4..e2a9fb124c7b 100644
--- a/net-misc/asterisk-g729/Manifest
+++ b/net-misc/asterisk-g729/Manifest
@@ -6,6 +6,9 @@ DIST codec_g729a-13.0_3.1.9-x86_32.tar.gz 411156 BLAKE2B 179c77d32d1f8ac3314813a
 DIST codec_g729a-13.0_3.1.9-x86_64.tar.gz 478364 BLAKE2B 49136479e1bd139fcb22130868575d5be7d6784081307679cfeee16951f6a303b5328a62c23a0ade506f2df0527b275bd198560dacd59ba5b9ba237095622778 SHA512 5fa2dca977ca1dcbf3019fc86c3edc91fd561c814bfa9a5202680b7a581f03faa1705a4392a70409f9cd30a4379691b609f0f572030972cbe432cad435314951
 DIST codec_g729a-16.0_3.1.9-x86_32.tar.gz 476772 BLAKE2B e1a7b8baefc551f16618fded2663acfb825a7eabcccc7ca844792e6179bac5b9ac2e0f4c387e3b2861347c6deb5db13f41ecd265c2261dbb65756890d976f4f7 SHA512 cddf46f369b0922a5569961688fcd4fb840bcce3a5573549d8a3a3e6150e20cd7c18e32ea07edc10150dd409763504ab50fad5d884fb33a49d624e4ebe0afd10
 DIST codec_g729a-16.0_3.1.9-x86_64.tar.gz 475819 BLAKE2B d738dccb1e94ae5458b72de7f52d3bb9964f3be993efe44f615bc06b0c17638ac743dd0465a68c172f339d888ceac35b54babadd217c13b028575c3b1e5aa94b SHA512 f6c60c66fce03ea5ce02301dc9c8b5a93fefbc60089980401cd1fee58357b2c03ab2b12eb50df82d2f3a25613e37c1bb370a319cf0a36c92983ef98aa137429d
-EBUILD asterisk-g729-13.0.3.1.9.ebuild 1877 BLAKE2B 8260fcfcf662c57229a95306689c8a243911df527f36e309500168bccb05d7cb86ed598cebd86ab9ec0687ff80c0dafd0bd39b7d37cd317dc9b59b2e8ee3b534 SHA512 0b6c3122741cff44b4d3494c6bbf09b25b2657ef74f1886ecd8cda34c63041d295a68be2f7631ac154ca3ffe5c06d949ff32803e7160b1546ff7e5086e0db9a4
-EBUILD asterisk-g729-16.0.3.1.9.ebuild 1822 BLAKE2B 2b4b37e2bb698709c0584b4473e3b47426c6e84e92e5f76c33aadde4fd1545a7f37c167e9e393f9e9732d30608c7e6a6f711c31d3ec77b1f94057e943833a8c6 SHA512 47de616999a25657435abb2ac96fb438344903fba37f98c99ecbcb191c78675060574c56c5c0318e92ae1b8e0ca4ddec829c0cf65cb2b553a46354029cab7b69
+DIST codec_g729a-18.0_3.1.9-x86_32.tar.gz 476626 BLAKE2B 7a8a0a763fcae579ac4be2891c691e7e540881cfd723a2c25af0c0f67499fde24a3d786d9ec9dddb6ee70e77973d71af6538d52963ff33b41d1940c8b506266d SHA512 bb223c03185d33107dc3cfa9393fe07950ae3a5825e1a347e26d06e9ffb8bfbc7ba350cb1e072dd52eaa6ded5a98e53dec9be8d8c55d89f0c816058a2f6bb247
+DIST codec_g729a-18.0_3.1.9-x86_64.tar.gz 475817 BLAKE2B ef45f1edab67b1fdb57d11340d2b3885c72d9f09f00fdccfdaa8674d61cf95ddf8ace223f29049e1e700f0bdcabd824ffbfa5382e492a1e0d0a47e1ab030d606 SHA512 12bbd2bcef0b7138d0ef261b6b1265f803526ce3c4ec371be830267e01e0e674150f17169742fe72737291b162136ea5224b320b655112cbc10fa207733c7f54
+EBUILD asterisk-g729-13.0.3.1.9-r1.ebuild 1854 BLAKE2B 65f08ff0e67608db2f87e73f50cf70f2bbe97a75a81ed31429eec21f1dd7662edd6fc885ff312c7977ac97c241fd84a3a0869c849f283a315ee7a37a708c8ec3 SHA512 3757a93547c26705667d2d5e24ece9775335b961c3634990ba109111abbf8aa6585a9385e0b3ce93841e8a622c3c86394286f9d4d4ccad7dbf6189576933b009
+EBUILD asterisk-g729-16.0.3.1.9-r1.ebuild 1854 BLAKE2B 65f08ff0e67608db2f87e73f50cf70f2bbe97a75a81ed31429eec21f1dd7662edd6fc885ff312c7977ac97c241fd84a3a0869c849f283a315ee7a37a708c8ec3 SHA512 3757a93547c26705667d2d5e24ece9775335b961c3634990ba109111abbf8aa6585a9385e0b3ce93841e8a622c3c86394286f9d4d4ccad7dbf6189576933b009
+EBUILD asterisk-g729-18.0.3.1.9.ebuild 1854 BLAKE2B 65f08ff0e67608db2f87e73f50cf70f2bbe97a75a81ed31429eec21f1dd7662edd6fc885ff312c7977ac97c241fd84a3a0869c849f283a315ee7a37a708c8ec3 SHA512 3757a93547c26705667d2d5e24ece9775335b961c3634990ba109111abbf8aa6585a9385e0b3ce93841e8a622c3c86394286f9d4d4ccad7dbf6189576933b009
 MISC metadata.xml 387 BLAKE2B 68c4ddb99ffd1a19a850584a5e9affdcebf13cbdc2699dacd7462abebfa50183b1ab34a15e2763a4b64fd677e0339aff4a73d0d928d01269b6d818b54020df89 SHA512 7aff04737fac9b89f82c737ac35fc5edd128f405d3d1fb637b612452b8106e9ba5ef9fa112359c586799685905c07a61e0472a0a899a6fcde07c9e11e2eadfa6
diff --git a/net-misc/asterisk-g729/asterisk-g729-13.0.3.1.9.ebuild b/net-misc/asterisk-g729/asterisk-g729-13.0.3.1.9-r1.ebuild
index 1a226c0eb772..01114a23c866 100644
--- a/net-misc/asterisk-g729/asterisk-g729-13.0.3.1.9.ebuild
+++ b/net-misc/asterisk-g729/asterisk-g729-13.0.3.1.9-r1.ebuild
@@ -21,7 +21,7 @@ amd64? (
 )"
 
 LICENSE="Digium"
-SLOT="0"
+SLOT="0/${AST_PV}"
 KEYWORDS="-* ~amd64 ~x86"
 
 RDEPEND="=net-misc/asterisk-$(ver_cut 1)*"
@@ -32,7 +32,8 @@ S="${WORKDIR}"
 
 pkg_setup() {
 	QA_FLAGS_IGNORED="/usr/$(get_libdir)/asterisk/modules/codec_g729a.so"
-	QA_PREBUILT="/usr/sbin/asthostid
+	QA_PREBUILT="${QA_FLAGS_IGNORED}
+		/usr/sbin/asthostid
 		/usr/sbin/astregister"
 }
 
@@ -52,8 +53,6 @@ src_install() {
 		binsuffix=x86_32
 	elif use amd64; then
 		binsuffix=x86_64
-	else
-		die "Ebuild only functions for x86 and amd64."
 	fi
 
 	newsbin astregister-${binsuffix} astregister
diff --git a/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.9.ebuild b/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.9-r1.ebuild
index 317b54926409..01114a23c866 100644
--- a/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.9.ebuild
+++ b/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -21,7 +21,7 @@ amd64? (
 )"
 
 LICENSE="Digium"
-SLOT="0"
+SLOT="0/${AST_PV}"
 KEYWORDS="-* ~amd64 ~x86"
 
 RDEPEND="=net-misc/asterisk-$(ver_cut 1)*"
@@ -32,7 +32,8 @@ S="${WORKDIR}"
 
 pkg_setup() {
 	QA_FLAGS_IGNORED="/usr/$(get_libdir)/asterisk/modules/codec_g729a.so"
-	QA_PREBUILT="/usr/sbin/asthostid
+	QA_PREBUILT="${QA_FLAGS_IGNORED}
+		/usr/sbin/asthostid
 		/usr/sbin/astregister"
 }
 
diff --git a/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.9.ebuild b/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.9.ebuild
new file mode 100644
index 000000000000..01114a23c866
--- /dev/null
+++ b/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.9.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="G.729 codec and supporting files for asterisk"
+HOMEPAGE="https://www.sangoma.com/asterisk/software/g729-codec/"
+
+AST_PV="$(ver_cut 1-2)"
+MY_PV="$(ver_rs 2 _)"
+
+SRC_URI="x86? (
+	https://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-x86_32.tar.gz
+	https://downloads.digium.com/pub/register/x86-32/register -> astregister-x86_32
+	https://downloads.digium.com/pub/register/x86-32/asthostid -> asthostid-x86_32
+)
+amd64? (
+	https://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-64/codec_g729a-${MY_PV}-x86_64.tar.gz
+	https://downloads.digium.com/pub/register/x86-64/register -> astregister-x86_64
+	https://downloads.digium.com/pub/register/x86-64/asthostid -> asthostid-x86_64
+)"
+
+LICENSE="Digium"
+SLOT="0/${AST_PV}"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="=net-misc/asterisk-$(ver_cut 1)*"
+
+RESTRICT="mirror strip"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	QA_FLAGS_IGNORED="/usr/$(get_libdir)/asterisk/modules/codec_g729a.so"
+	QA_PREBUILT="${QA_FLAGS_IGNORED}
+		/usr/sbin/asthostid
+		/usr/sbin/astregister"
+}
+
+src_unpack() {
+	local dfile
+
+	for dfile in ${A}; do
+		[[ "${dfile}" = *.tar.gz ]] && unpack "${dfile}"
+		cp "${DISTDIR}/${dfile}" "${WORKDIR}/" || die "Error copying ${dfile} to ${WORKDIR}"
+	done
+}
+
+src_install() {
+	local binsuffix
+
+	if use x86; then
+		binsuffix=x86_32
+	elif use amd64; then
+		binsuffix=x86_64
+	fi
+
+	newsbin astregister-${binsuffix} astregister
+	newsbin asthostid-${binsuffix} asthostid
+
+	dodoc codec_g729a-${MY_PV}-${binsuffix}/README
+	insinto usr/$(get_libdir)/asterisk/modules/
+	doins "codec_g729a-${MY_PV}-${binsuffix}/codec_g729a.so"
+}
+
+pkg_postinst() {
+	einfo "Please note that Digium's register utility has been installed as astregister"
+}