net-misc/asterisk move enew{user,group} to the appropriate function wrt bug 352139.

Package-Manager: portage-2.2.0_alpha4/cvs/Linux i686

7 files changed, 35 insertions, 50 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index f903beed2240..a7338a570675 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,13 @@
 # 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.285 2011/01/19 13:55:24 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.286 2011/01/19 17:25:39 c1pher Exp $
+
+  19 Jan 2011; Dane Smith <c1pher@gentoo.org> asterisk-1.2.37.ebuild,
+  asterisk-1.2.40.ebuild, asterisk-1.4.39.1.ebuild,
+  asterisk-1.6.2.16.1.ebuild, asterisk-1.8.2.1.ebuild:
+  Move enew{user,group} to the appropriate place wtr bug 352139. Thanks
+  Agostino
+  for reporting.
 
 *asterisk-1.4.39.1 (19 Jan 2011)
 
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index c645dfa5756f..1c053fc1cef7 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.0.0/asterisk-1.0.5-uclibc-dns.diff 304 RMD160 6d58a0fdad04f5105c1b8f8bb3e2058b4f97f12f SHA1 5f7819a1e5f5b8f035146d5506bab83f4ecb6ae0 SHA256 e4de36e528b7d1a7941689d530d93f1ffd41a2f863a856e612e3637f78ea4890
 AUX 1.2.0/asterisk-1.2.1-uclibc-getloadavg.diff 317 RMD160 f598d94a52cec83fefdafdce0694049c657e09e0 SHA1 fc0f4d990e386d39d43bac073f353421063186c9 SHA256 61daa70727418dbaf232fc5d1eaddd20a8505b943b8fb724a1b63170edfe88cc
 AUX 1.2.0/asterisk-1.2.21.1-h323-dumb-makefile.diff 1098 RMD160 c39cee5a6f420e6e63e30ac5e83aa9b78c1b12c8 SHA1 93087ecdcde11bd983d25acaac3723450abbc111 SHA256 86d0c8cd754754916c45d77d9c745d1688b3b7b54181ecb1d42a1934bdea7deb
@@ -40,17 +37,10 @@ DIST asterisk-1.8.2.1.tar.gz 26309719 RMD160 d6bcbbbc61b0727174ae99ffb67a220fb2d
 DIST gentoo-ast14-patchset-0.1.tar.bz2 2468 RMD160 a466a098627edb18603dee199a3c1e858fdc2f77 SHA1 9518d527e56d48c40f520b677e160b6566887910 SHA256 e1385e91f33c3f3441c7405b00e0932cba92f9f561bc4e768bf8094372912184
 DIST gentoo-asterisk-patchset-0.1.tar.bz2 5394 RMD160 bfd546101c77f6e6989c406bfb202e592f9d16fd SHA1 e49b7784f987e027d833fbe8e0773acb1ef78521 SHA256 07c1bc6a29bda4fa98e7d1eb436d2e6eafc13263b774a0ff41698e523fa59a97
 DIST gentoo-asterisk-patchset-0.2.tar.bz2 7398 RMD160 65b282fa621b3e65d293cd7e1d2f0af1e7837643 SHA1 71958e5108f225dda4e22a97a26a793e51f39283 SHA256 cff992cef307d73d336bf64ed56c32382a264e1b0eb468921a51d09c7f9d5861
-EBUILD asterisk-1.2.37.ebuild 10738 RMD160 0f409319cb82c2c92cde0ab6436e44dd214c0cf3 SHA1 6cce3c94e5ace2f1f9fa7e6a621b358e3921cbec SHA256 fc6ed3447de3400e74fcffeee457adc59a4433047655f4190b55a9dfbec8c18b
-EBUILD asterisk-1.2.40.ebuild 10743 RMD160 f3db358e4776aef3dfb196f5e182f6f588030f60 SHA1 ae80355f7aa6e84c413f83c20028209e2908e3f9 SHA256 f67e2a7c507315feffdeb5950f9225c9edb038bb915f5402102dbd4da693c35d
-EBUILD asterisk-1.4.39.1.ebuild 8041 RMD160 18aa745804a3b736bf95e73822d4cbe25028a5cc SHA1 f65ec90d875e1a2088fc3b796d1c26744df50f1e SHA256 c948a57d15038a9462e2e9e4ec0964c47ae92af79196e398da75eae18b14dd61
-EBUILD asterisk-1.6.2.16.1.ebuild 6452 RMD160 54aeeb3aa110a860917ed18fd67b9d5599fb1853 SHA1 dabe19391f9381b0297b1a661c1f21615834a5cf SHA256 225359d8236d1708f9b10759d9020527d9fe1791e7ed58505660e73d69605413
-EBUILD asterisk-1.8.2.1.ebuild 14420 RMD160 d632601c093912f75155efd273de7e0dfdaab7ba SHA1 bc862c03fd1096f23d7ee47683c60bc7a7c07310 SHA256 1f808f424bc70caf9087c7d5cd4cf0362ef5465d494aa4bbc2cf1b915892a4f6
-MISC ChangeLog 70285 RMD160 9c6f09e3516f61b0dc3cfcf97cb2634e76efd295 SHA1 acd22184943c23e94fff40f2c9f00c4694b6b059 SHA256 a66c9aa576d067d0f0f6645feb21cf42a7e8162a2029473a000d96ce0930e79c
+EBUILD asterisk-1.2.37.ebuild 10717 RMD160 6ec81f6a616cc2cefa862c1a53bc339bc2dcb5de SHA1 0d6260ee62d165581e5223524424f41f48aba084 SHA256 32f27ef174d02947c09b2266bf1f763fa594144f24f7c3bec4523818b168e32f
+EBUILD asterisk-1.2.40.ebuild 10723 RMD160 9f68c515464b7d1ea2252f03b2ca52e1d255def0 SHA1 8559fe6901c3e1840c1cf9a492a6794a1de306ca SHA256 77b89353fd402c9c114eb592a4ca6d68b2210f2e3d66379103e4eb2884e4db6f
+EBUILD asterisk-1.4.39.1.ebuild 8021 RMD160 74b0c7d38eeb6ec7e2271451985214e8a1b57b80 SHA1 ea74e1ec00eb8c70710531a3826c9dabc403f8ec SHA256 c9ba36e76889a80a7a0a37939f30b479a4f10bfc40e1319ec5e46ff6302c5508
+EBUILD asterisk-1.6.2.16.1.ebuild 6432 RMD160 b991fe82242376ce9eb329a2cf61157636fea56e SHA1 26b1942e60b8ee65879b8bf5df270b22f54d2950 SHA256 f423382255347a192bf0e491b9284f0a19d955388b2307a634d38917eabd1954
+EBUILD asterisk-1.8.2.1.ebuild 14400 RMD160 2b4f0d3ae98ac5f5e47b6bf2280eeebc1f455f37 SHA1 b1609d5a8ed0bde64f998a297465d2c39c31e1a9 SHA256 7fd4d4c5220ce90d3c72644a1855f9486c2407c37d3554e4ba74fe42347fd579
+MISC ChangeLog 70561 RMD160 9a9d8346ec13ede098b612dc157a0b341c072411 SHA1 26d3f65b0b546b19bbf46471a71e2888f260a1e6 SHA256 82db4404eb5e6d042ed9e0c9b44864b36963188a04571cda393ff5f879f684fd
 MISC metadata.xml 1681 RMD160 fa822016d351dcf52f4b52226adcfa03a4b4e726 SHA1 3436530fb26d46b1d4ff9adba8d684b1e054de20 SHA256 d4199859f1f0eea8a81a895d98270344a0967a76592004b6fdf5ff77a053e824
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk027VMACgkQp5vW4rUFj5oFmwCfaxHWVotWIKsP8kHiNzLyZkcn
-Eq8Anj2l+wgLljljas2Aeu/MWgJqJhnN
-=Tt3C
------END PGP SIGNATURE-----
diff --git a/net-misc/asterisk/asterisk-1.2.37.ebuild b/net-misc/asterisk/asterisk-1.2.37.ebuild
index b9abb2f5a266..88d3b52078ed 100644
--- a/net-misc/asterisk/asterisk-1.2.37.ebuild
+++ b/net-misc/asterisk/asterisk-1.2.37.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.2.37.ebuild,v 1.7 2010/08/20 23:12:54 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.2.37.ebuild,v 1.8 2011/01/19 17:25:39 c1pher Exp $
 
 EAPI=2
 inherit eutils multilib toolchain-funcs
@@ -139,6 +139,8 @@ pkg_setup() {
 	einfo "Running some pre-flight checks..."
 	echo
 
+	enewgroup asterisk
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
 }
 
 src_prepare() {
@@ -313,11 +315,6 @@ src_install() {
 	rm -f "${D}"usr/$(get_libdir)/asterisk/modules/codec_speex.so || die "Unable to remove fatally flawed codec_speex.so"
 }
 
-pkg_preinst() {
-	enewgroup asterisk
-	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
-}
-
 pkg_postinst() {
 	einfo "Fixing permissions"
 	chown -R asterisk:asterisk "${ROOT}"var/log/asterisk
diff --git a/net-misc/asterisk/asterisk-1.2.40.ebuild b/net-misc/asterisk/asterisk-1.2.40.ebuild
index b5e815598d22..6cac2124feb1 100644
--- a/net-misc/asterisk/asterisk-1.2.40.ebuild
+++ b/net-misc/asterisk/asterisk-1.2.40.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.2.40.ebuild,v 1.3 2010/08/20 23:12:54 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.2.40.ebuild,v 1.4 2011/01/19 17:25:39 c1pher Exp $
 
 EAPI=2
 inherit eutils multilib toolchain-funcs
@@ -138,7 +138,9 @@ pkg_setup() {
 	#
 	einfo "Running some pre-flight checks..."
 	echo
-
+	
+	enewgroup asterisk
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
 }
 
 src_prepare() {
@@ -313,11 +315,6 @@ src_install() {
 	rm -f "${D}"usr/$(get_libdir)/asterisk/modules/codec_speex.so || die "Unable to remove fatally flawed codec_speex.so"
 }
 
-pkg_preinst() {
-	enewgroup asterisk
-	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
-}
-
 pkg_postinst() {
 	einfo "Fixing permissions"
 	chown -R asterisk:asterisk "${ROOT}"var/log/asterisk
diff --git a/net-misc/asterisk/asterisk-1.4.39.1.ebuild b/net-misc/asterisk/asterisk-1.4.39.1.ebuild
index 1916e325d9cd..8f406085f74a 100644
--- a/net-misc/asterisk/asterisk-1.4.39.1.ebuild
+++ b/net-misc/asterisk/asterisk-1.4.39.1.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.4.39.1.ebuild,v 1.1 2011/01/19 13:55:24 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.4.39.1.ebuild,v 1.2 2011/01/19 17:25:39 c1pher Exp $
 
 EAPI=3
 inherit autotools base eutils flag-o-matic linux-info multilib
@@ -58,6 +58,9 @@ pkg_setup() {
 	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
+
+	enewgroup asterisk
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
 }
 
 src_prepare() {
@@ -248,11 +251,6 @@ src_install() {
 	newins "${FILESDIR}/1.4.0/asterisk.logrotate" asterisk
 }
 
-pkg_preinst() {
-	enewgroup asterisk
-	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
-}
-
 pkg_postinst() {
 	#
 	# Announcements, warnings, reminders...
diff --git a/net-misc/asterisk/asterisk-1.6.2.16.1.ebuild b/net-misc/asterisk/asterisk-1.6.2.16.1.ebuild
index b88c0e71e61c..edfd7efe045f 100644
--- a/net-misc/asterisk/asterisk-1.6.2.16.1.ebuild
+++ b/net-misc/asterisk/asterisk-1.6.2.16.1.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.16.1.ebuild,v 1.1 2011/01/19 13:19:44 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.6.2.16.1.ebuild,v 1.2 2011/01/19 17:25:39 c1pher Exp $
 
 EAPI=3
 inherit autotools base eutils linux-info multilib
@@ -60,6 +60,9 @@ pkg_setup() {
 	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
+
+	enewgroup asterisk
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
 }
 
 src_prepare() {
@@ -200,11 +203,6 @@ src_install() {
 	newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
 }
 
-pkg_preinst() {
-	enewgroup asterisk
-	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
-}
-
 pkg_postinst() {
 	#
 	# Announcements, warnings, reminders...
diff --git a/net-misc/asterisk/asterisk-1.8.2.1.ebuild b/net-misc/asterisk/asterisk-1.8.2.1.ebuild
index 727ced6d4437..5b0051092485 100644
--- a/net-misc/asterisk/asterisk-1.8.2.1.ebuild
+++ b/net-misc/asterisk/asterisk-1.8.2.1.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.2.1.ebuild,v 1.1 2011/01/19 12:52:32 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.8.2.1.ebuild,v 1.2 2011/01/19 17:25:39 c1pher Exp $
 
 EAPI=3
 inherit autotools base eutils linux-info multilib
@@ -81,6 +81,9 @@ pkg_setup() {
 	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
+
+	enewgroup asterisk
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
 }
 
 src_prepare() {
@@ -381,11 +384,6 @@ src_install() {
 	newins "${FILESDIR}/1.6.2/asterisk.logrotate3" asterisk
 }
 
-pkg_preinst() {
-	enewgroup asterisk
-	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
-}
-
 pkg_postinst() {
 	#
 	# Announcements, warnings, reminders...