gentoo auto-resync : 15:07:2022 - 07:41:50

3 files changed, 12 insertions, 8 deletions

diff --git a/net-misc/dahdi-tools/Manifest b/net-misc/dahdi-tools/Manifest
index 0b18ebf6f5d2..5b5d19337c3e 100644
--- a/net-misc/dahdi-tools/Manifest
+++ b/net-misc/dahdi-tools/Manifest
@@ -1,5 +1,5 @@
 AUX dahdi-autoconf.conf2 1067 BLAKE2B f6c64135e4b47ce3eafd4b79b4e02ea8bc4d46ab36e30203cf061a5541fc2bdc9bdb2bf6050bc36c8d1e1b5f2ba07f72e83037eccd86ead45fdc97e8a4a3d767 SHA512 7de2ad496a48da487b0f54b0d3c98681e72ebb86107bdf091c74f410d0e2598fe21e1b876eea81d72ef5250570a67a2ece19de6d003b9bbc3def5fae9173189a
-AUX dahdi-autoconf.init-3.1.0-r3 6674 BLAKE2B 08e9309034faea3f97ce9c82fbc79b88cafc6ca07fcf9c5f555e815fd13191c6287b0b85896cc7fe3e10fc4e5de29dfa2737313ebdc51b1e1dd9e98bff409fcb SHA512 d2990903350b1275777bcbd0e1c5e38630aca7627d73b2741aaec7ddc055c96ff7d7adc4c55f578cc0fd8f693f6927b4d77f7db7f273f89ba99a9326cf41b1a0
+AUX dahdi-autoconf.init-3.1.0-r4 6709 BLAKE2B 53dd72c1390b8be78117df9fb8829ba8c9e0c53800bde17f3dcd9384750bbbc9e883888b53a453da3f222843e09f56a095bcc9a27c0c44a3a232faf2da3a0dc8 SHA512 9ec20697a7b6a3a6a9bbd03687477a9a0b59365996e5018f04bd4798623f83dd69d3bd34f48c104a00a621aa8d12f9254ddc1effc0743ec67b30e6a405e2dacf
 AUX dahdi-autoconf.init2 5817 BLAKE2B c8186a6ff1188ed1d91b86db2b6e861297b5927c7a2cc95a95eb656d4149f2d01c2d8b91412e440f76e9fcb3ff530aef00dae04c38763bd84575cadecdfe2692 SHA512 0201e4555a8c3ccaceb4cfe1fe004dada847608ad6d8ad031f788f72b056e0d0ef0bdad653eb2f492ae08444c2094dc00ac73180a4107eaabc5f5258a91fa50d
 AUX dahdi-nondigium-blacklist.patch 507 BLAKE2B 5cd8264cfb6792db5fdb92b32dad33a224defb876807d260fbef9f72b943f56f8415a7f082752e261c03982c6b016fe1ce8034d98c6a1aac4cfee7c9d50b3ddb SHA512 4fdb4933e05e07812d1a94efb9bda9038aaadb8a1830cb9ba99d62346f2d007e827771f8de144ef09d6ee5adb1a571ca5ef8ae646c7f62bde8232af30468c2ac
 AUX dahdi-tools-3.1.0-cplusplusexternc.patch 695 BLAKE2B 8b3cbe872786017759d11bf5d23e6eb41de29003e047ab7244188e0603df6ea669b870216e15cdf4c77a41f7b4f5d10169853aaf839b6dc4d491c0a23121924b SHA512 eecfdb73558b8f4ea8b5ffb55ced8f863960cb1ee92196995ca69e30df4a55f07f59a0b429cfad40271b71b585130438b11861d3459fab87f02ced7032f57ded
@@ -9,5 +9,5 @@ AUX dahdi-tools-3.1.0-parallel-make-no-config.patch 681 BLAKE2B c72cc644d88514c8
 AUX dahdi.init2 582 BLAKE2B 2e273c929772428586f6800601cc0249a33f61c6aad474c19dd45d9d78a187a9fdd34d1ca26e0eed605fc9630c04b0b0ffd29214a5116749db94bf7609bb078a SHA512 684e8dea54a4f082345100f4d05ca286a085b99c46f0b3fa7300ca5d9a666657afb5405c1f14ac3ba4aba02ce39872e74b9c1cfe6321fd631fa6c39ae38e5ebb
 DIST dahdi-tools-3.1.0.tar.gz 607449 BLAKE2B aa8ef197cbdecf5c892386aa1c25c940ed3f7c24884f588dcca975d34ee7b4c41722d2529fa305d7568d03302e10e6eb4d5df36a899315e05bf243163500b22d SHA512 e0e5bf24e4834ca39ef7dc1af1bb7ef26bd258a8b2cb2406a7e1ffed25b4b1d44a5fce41d97c5ad7fc6ebb66f965759d2b49ffa6d89845786f43eadb89ff4694
 EBUILD dahdi-tools-3.1.0-r2.ebuild 2152 BLAKE2B 2c84f625ba1d41d43a69841c8d4dcbe898e1f5c54c54b0a554b3e382c0861fa97b4d027fb63b1b4e4ae2fa7b32dd81389554af2cab3cedfad0c68c2288748537 SHA512 b4e76d483b67390b1a889d868118093d2d5db443d80ded95c0a3424b478a16da934b3911fa451ae7fca380f3a76fad6b821f2ca9ba91f87b27869f15d14b486c
-EBUILD dahdi-tools-3.1.0-r3.ebuild 2162 BLAKE2B dfc90c8ccdaf62e2456717aec490bf5248955149a7af8e7f7523349337ec9f8b2dedfa6ff4d7a830ac8180f2e53b0e056565972d170cd779872853639d9c29de SHA512 664ef6000fa11a95f7dfcad22cb7570603a46691e5a7ad7b7e869114f149fe93f73f39b84f97fa83ac260719aa2da342aa02720ab9457dbadb6425d554f8cbdb
+EBUILD dahdi-tools-3.1.0-r4.ebuild 2193 BLAKE2B 35da5b37f60762dd1205f03b17b3c8da70b1564fb4d3fa8e93e63db5134c67a279751177dcee790b6c7ca6bce9d4bae883ac64a1cf69e894e172ef10dfbf27de SHA512 8b231fd5c0bc78b6521843dae2ee87b8ba8c573703f6a245c7a219c7920cf60e86988236c34e0395346d68521b4a6d2c9408efab8f9587a3e4595588560948d5
 MISC metadata.xml 474 BLAKE2B 05062875e00c015c39cce4432a8197606dcbe1d40efb3058843c05defedd04304581a449b7a1abeb37ac96c5e6c9559ef9b36f7cbe1123783cc1822a25c5ee78 SHA512 bd60b375dd7863a16f525eb82c7c97d2a93032a93963ab764523fb774692b2ad107cb69eab4eacc695d67316307b91bac8e299a9c3d2689894d9dc174516c2a7
diff --git a/net-misc/dahdi-tools/dahdi-tools-3.1.0-r3.ebuild b/net-misc/dahdi-tools/dahdi-tools-3.1.0-r4.ebuild
index 4cdea940512c..4ccf762c64d7 100644
--- a/net-misc/dahdi-tools/dahdi-tools-3.1.0-r3.ebuild
+++ b/net-misc/dahdi-tools/dahdi-tools-3.1.0-r4.ebuild
@@ -54,7 +54,7 @@ src_install() {
 
 	# install init scripts
 	newinitd "${FILESDIR}"/dahdi.init2 dahdi
-	newinitd "${FILESDIR}"/dahdi-autoconf.init-3.1.0-r3 dahdi-autoconf
+	newinitd "${FILESDIR}"/dahdi-autoconf.init-3.1.0-r4 dahdi-autoconf
 	newconfd "${FILESDIR}"/dahdi-autoconf.conf2 dahdi-autoconf
 
 	bashcomp_alias dahdi $(sed -nre 's/^complete -F .* //p' "${ED}${bashcompdir}/dahdi" ||
@@ -68,3 +68,7 @@ src_install() {
 pkg_postinst() {
 	udev_reload
 }
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/net-misc/dahdi-tools/files/dahdi-autoconf.init-3.1.0-r3 b/net-misc/dahdi-tools/files/dahdi-autoconf.init-3.1.0-r4
index 3841aca8d18a..73ab07b8904f 100644
--- a/net-misc/dahdi-tools/files/dahdi-autoconf.init-3.1.0-r3
+++ b/net-misc/dahdi-tools/files/dahdi-autoconf.init-3.1.0-r4
@@ -150,20 +150,20 @@ dahdi_conf_span() {
 
 	case "${type}" in
 		digital-TE)
-			cfunc+="bri_te"
+			cfunc="${cfunc}bri_te"
 		;;
 		digital-NT)
-			cfunc+="bri_nt"
+			cfunc="${cfunc}bri_nt"
 		;;
 		digital-[TE]1)
-			cfunc+="$(echo "${type##*-}" | tr 'TE' 'te')"
+			cfunc="${cfunc}$(echo "${type##*-}" | tr 'TE' 'te')"
 			# Use CPE by default.  Unfortunately there is no easy
 			# way to detect CPE vs NET as far as I know and specifying
 			# in a config that you want NET mode seems the sanest way.
 			if yesno "${vname}"; then
-				cfunc+="_net"
+				cfunc="${cfunc}_net"
 			else
-				cfunc+="_cpe"
+				cfunc="${cfunc}_cpe"
 			fi
 		;;
 		*)