Actually install the newest init script with Jaco Kroon's restart fixes; as pointed out by Erik Wallin (reopened) bug #345307.

Package-Manager: portage-2.1.10.4/cvs/Linux x86_64

4 files changed, 27 insertions, 8 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 3dde1cb15e18..9fa9cc6ee5c5 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.329 2011/06/29 20:23:17 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.330 2011/07/04 14:59:44 chainsaw Exp $
+
+*asterisk-1.8.4.4-r1 (04 Jul 2011)
+*asterisk-1.6.2.19-r1 (04 Jul 2011)
+
+  04 Jul 2011; Tony Vroon <chainsaw@gentoo.org> -asterisk-1.6.2.19.ebuild,
+  +asterisk-1.6.2.19-r1.ebuild, -asterisk-1.8.4.4.ebuild,
+  +asterisk-1.8.4.4-r1.ebuild:
+  Actually install the newest init script with Jaco Kroon's restart fixes; as
+  pointed out by Erik Wallin (reopened) bug #345307.
 
 *asterisk-1.6.2.19 (29 Jun 2011)
 
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index d74ffcc34393..f59098669fe5 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.6.0/asterisk.confd 2204 RMD160 31bceebfa535e97cb2634e313678cc42186d4750 SHA1 748c623cea238cd9b322672d5ebcfe214a4f0463 SHA256 daec84c58e0ef6cbd71a6fc62cb83129b1bcffdfdd619ebbd62a642f0cd1eee7
 AUX 1.6.2/asterisk.initd2 6658 RMD160 b694da109e746e9a9e642ffa7f1d278f03543cea SHA1 63443d3066d4c47228fe1d852420d571ae6f8800 SHA256 f6fd2c229e61c12360b1d289a631f6a0a6f8638e7c6f6add6040ad988170bf70
 AUX 1.6.2/asterisk.initd3 6658 RMD160 adabbacaff55cc49077a919fb23eb6f8e3a2c076 SHA1 a256b7af478a4d83c19a89b23d79a4f832f1fb5a SHA256 ba737b5eadd4a5ff8653e30b54959c1d25a8a68699b8ce9adc9afe09da8b4110
@@ -13,7 +16,14 @@ DIST gentoo-asterisk-patchset-0.1.tar.bz2 5394 RMD160 bfd546101c77f6e6989c406bfb
 DIST gentoo-asterisk-patchset-0.5.tar.bz2 6790 RMD160 ce738a36248b974d707ef748314e160acccd6ddb SHA1 4b6ae9e6e1529237fe4fe5d313440be741921d8e SHA256 258cbc3b81019b99bfe4b12888ed181ab142ca6d21ad61eae3d032c3617a7a79
 DIST gentoo-asterisk-patchset-0.6.tar.bz2 5115 RMD160 becb32155e126933d3e04aa1ffe6e822f7aed152 SHA1 0d7aa220afa66d88dc54da95de41e221afce4d9a SHA256 8367b43024725b257c9abfe518f09bc9c531727dff73782a5f839c369c54fb92
 EBUILD asterisk-1.6.2.18.2.ebuild 5823 RMD160 b7e7cf1d93d72661ca507cf0dae717ef348302d5 SHA1 85c8c98fc1da48d2d1437b5b83e87b31474fbfca SHA256 0b7af62d8a7056926e39733a78e391566f21c28c63a59e26f0459d386dde106b
-EBUILD asterisk-1.6.2.19.ebuild 5825 RMD160 7ab4a4c5aa61b7efa615b7d460544b785180f15b SHA1 a68ec0b2c1a8dc6923b0fda52534513c9fb24094 SHA256 6633abdf88c642dc9c0f19971655aaf4d0e7b8c8a111da37a4fa75783d5ad601
-EBUILD asterisk-1.8.4.4.ebuild 14629 RMD160 4ed73419287f570ecd761c27c61bd3f51a65ece2 SHA1 05593230f3999d7b13e533dd6df76ec51bbfd8ad SHA256 bac46f48c31a41ad50e4e243e0817b4ecbab2dd1e7e6d4c7e7eef8455fdafbcc
-MISC ChangeLog 83066 RMD160 5da8b1625f71d238474ac561cb6fa93035473ae4 SHA1 e98eb002b03495870fd54721acf8656cf5953307 SHA256 83d70cf46b5bc714990a80ba11d9a1eb1599a7feaa982e345ac799509240cbf6
+EBUILD asterisk-1.6.2.19-r1.ebuild 5828 RMD160 d3b67c872da7f9ae149f8cd9d8966c165a079e3d SHA1 4c1b7c925c72c40788ebf666f730898910580ab4 SHA256 483e0247f51aff216ad12f1bb8c556b053012cc241ec30f29c7c8ab5f9f7bba4
+EBUILD asterisk-1.8.4.4-r1.ebuild 14632 RMD160 0492acdd869b59f3c6f1a0efb7e9168d24b2231e SHA1 8c68dec416669bc0d5f9675288743294d30538cd SHA256 99c30aec8a536d63e192d5949828e77050ad3a8a7c2777e77a3106c887e476a3
+MISC ChangeLog 83434 RMD160 362fa789983364663a077affa49bff4d10d32ad3 SHA1 067372cb4690927c6b23ce63f2aa43d5969c4680 SHA256 a05ce97307e4f80b15f008584279affce1bc308dc203bfabd62a49bd82e2b1dc
 MISC metadata.xml 1104 RMD160 5b90405c685bc1c0ee173b3024afab5bc849bf40 SHA1 bf76dd265acf32efba9e4e8189ae154a4b9ebd40 SHA256 17e96f326cd60399fb217025567ae4c80f1b9b12418f1bf5b41c8fa4c49598ec
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4R1VkACgkQp5vW4rUFj5pD6wCgltB6RAaVjC1OUN4499NaCXZj
+ZXUAn3cbvvaohz+Vjitl6YQORoeag2ym
+=RFhk
+-----END PGP SIGNATURE-----
diff --git a/net-misc/asterisk/asterisk-1.6.2.19.ebuild b/net-misc/asterisk/asterisk-1.6.2.19-r1.ebuild
index d70bb46411ed..a784cc08678b 100644
--- a/net-misc/asterisk/asterisk-1.6.2.19.ebuild
+++ b/net-misc/asterisk/asterisk-1.6.2.19-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.6.2.19.ebuild,v 1.1 2011/06/29 20:23:17 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.6.2.19-r1.ebuild,v 1.1 2011/07/04 14:59:44 chainsaw Exp $
 
 EAPI=3
 inherit autotools base eutils linux-info multilib
@@ -146,7 +146,7 @@ src_install() {
 	diropts -m 0750 -o asterisk -g asterisk
 	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
 
-	newinitd "${FILESDIR}"/1.6.2/asterisk.initd2 asterisk
+	newinitd "${FILESDIR}"/1.6.2/asterisk.initd3 asterisk
 	newconfd "${FILESDIR}"/1.6.0/asterisk.confd asterisk
 
 	# install the upgrade documentation
diff --git a/net-misc/asterisk/asterisk-1.8.4.4.ebuild b/net-misc/asterisk/asterisk-1.8.4.4-r1.ebuild
index 8be7c8737619..ec53987c28c2 100644
--- a/net-misc/asterisk/asterisk-1.8.4.4.ebuild
+++ b/net-misc/asterisk/asterisk-1.8.4.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.4.4.ebuild,v 1.1 2011/06/28 21:38:10 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.4.4-r1.ebuild,v 1.1 2011/07/04 14:59:44 chainsaw Exp $
 
 EAPI=3
 inherit autotools base eutils linux-info multilib
@@ -361,7 +361,7 @@ src_install() {
 	diropts -m 0750 -o asterisk -g asterisk
 	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
 
-	newinitd "${FILESDIR}"/1.6.2/asterisk.initd2 asterisk
+	newinitd "${FILESDIR}"/1.6.2/asterisk.initd3 asterisk
 	newconfd "${FILESDIR}"/1.6.0/asterisk.confd asterisk
 
 	# install the upgrade documentation