commit:     643fd3a04d6bc7ef4f9e737f176516eb258f3d90
Author:     Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za>
AuthorDate: Mon Mar  8 22:14:01 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar  9 09:44:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=643fd3a0

net-misc/asterisk: 16.16.2 (sec bump).

This drops patches applies upstream already, and does a rename because
16 isn't currently marked stable.

Bug: https://bugs.gentoo.org/771318
Closes: https://github.com/gentoo/gentoo/pull/19836
Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/asterisk/Manifest                                    |  2 +-
 .../{asterisk-16.15.1-r2.ebuild => asterisk-16.16.2.ebuild}   |  4 +---
 .../asterisk/files/asterisk-16.16.2-no-var-run-install.patch  | 11 +++++++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 6b50904bf38..bbff3dcaebf 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,3 +1,3 @@
 DIST asterisk-13.38.1.tar.gz 33705256 BLAKE2B 
c783ee40880455cee5a60b111f69d95fdc42bd42a598834236e9999d0f2f401548229560e937fa8d842c5d24715d3891e7860f098d35d5630522e7a659123242
 SHA512 
270b7c8374104b3c2e9999503fa5cab5b465e37ddfa6759c1019fb99b6bb5877fe4505501ac3306a708ce911aeda36d04796f51156312c04fec013dbaa56a57f
 DIST asterisk-13.38.2.tar.gz 33708267 BLAKE2B 
f8c188f6500a01e807982518486972c18f8f903285910e64b4d8e2a4f553d42534f910696a02ab13e371dbd83dfd932c5cb7a6cea08817862ecaddcc7afd99d2
 SHA512 
bd9755503048cd8dcf8e39947dd5cfb617c20c4b1ad5033ae297499a4967c06ba11b6e43233c1ae0d33f8f11a81dbb9b4487f16a1f4786007172028caf1ee051
-DIST asterisk-16.15.1.tar.gz 27796648 BLAKE2B 
4daa0b121a789d0384d81c3b56951bfd7c919cae3de1d7eaa0ba50f01f428c1d56555838f9ce2b3fe24309b131310c59622ed114cd4f76ac7b06896ceb3da6fc
 SHA512 
5ce6e1301825b142859087ba237b2c1b3e0687cac3fac28f35b043727cac26583697534b2726a65510e50ef27cf373b0c4cef60042f789aa6b875448a5f08914
+DIST asterisk-16.16.2.tar.gz 27808852 BLAKE2B 
dc05fe7c797f9b848c918121ffe7e7648bca75fccb70412fcd39f37beb3fd33e7d64cd198919cb6ae2867cd685651497ae15a30fb280988a9c7184e80de235ae
 SHA512 
9e47ea2906a2c0d1a2f527d106ef6200a8d0cce76a31a6cfb3ca720a2ef7b5f723ae5c6266c74b0bdfd5718346e8d01a30fc346981463fa4ee7a4b7c99a67928

diff --git a/net-misc/asterisk/asterisk-16.15.1-r2.ebuild 
b/net-misc/asterisk/asterisk-16.16.2.ebuild
similarity index 98%
rename from net-misc/asterisk/asterisk-16.15.1-r2.ebuild
rename to net-misc/asterisk/asterisk-16.16.2.ebuild
index 206d2a33b37..6a7ee37f080 100644
--- a/net-misc/asterisk/asterisk-16.15.1-r2.ebuild
+++ b/net-misc/asterisk/asterisk-16.16.2.ebuild
@@ -28,9 +28,7 @@ REQUIRED_USE="gtalk? ( xmpp )
 "
 
 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-16.16.2-no-var-run-install.patch"
        "${FILESDIR}/asterisk-16.15.1-r2-autoconf-2.70.patch"
 )
 

diff --git a/net-misc/asterisk/files/asterisk-16.16.2-no-var-run-install.patch 
b/net-misc/asterisk/files/asterisk-16.16.2-no-var-run-install.patch
new file mode 100644
index 00000000000..63b2896bb09
--- /dev/null
+++ b/net-misc/asterisk/files/asterisk-16.16.2-no-var-run-install.patch
@@ -0,0 +1,11 @@
+--- asterisk-16.16.2/Makefile.o        2021-03-09 00:03:19.794028722 +0200
++++ asterisk-16.16.2/Makefile  2021-03-09 00:03:32.434013494 +0200
+@@ -556,7 +556,7 @@
+ 
+ NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h))
+ OLDHEADERS=$(filter-out $(NEWHEADERS) $(notdir 
$(DESTDIR)$(ASTHEADERDIR)),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
+-INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDIR)" "$(ASTCACHEDIR)" 
"$(ASTETCDIR)" "$(ASTVARRUNDIR)" \
++INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDIR)" "$(ASTCACHEDIR)" 
"$(ASTETCDIR)" \
+       "$(ASTSPOOLDIR)" "$(ASTSPOOLDIR)/dictate" "$(ASTSPOOLDIR)/meetme" \
+       "$(ASTSPOOLDIR)/monitor" "$(ASTSPOOLDIR)/system" "$(ASTSPOOLDIR)/tmp" \
+       "$(ASTSPOOLDIR)/voicemail" "$(ASTSPOOLDIR)/recording" \

Reply via email to