ejabberd: change SMPOPT to be auto instead of enable

Package-Manager: portage-2.2_rc27/cvs/Linux x86_64

5 files changed, 19 insertions, 15 deletions

diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog
index 11f0a1f8a903..7e8bdc9006f8 100644
--- a/net-im/ejabberd/ChangeLog
+++ b/net-im/ejabberd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/ejabberd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.52 2009/03/23 21:25:17 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.53 2009/03/27 19:40:57 hanno Exp $
+
+  27 Mar 2009; Hanno Boeck <hanno@gentoo.org> files/ejabberd-2.0.1.initd,
+  files/ejabberd-2.0.2.initd, files/ejabberd-2.0.4.initd:
+  Fix SMPOPT to be auto for smp-enabled systems.
 
   23 Mar 2009; Markus Meier <maekke@gentoo.org> ejabberd-2.0.4.ebuild:
   amd64/x86 stable, bug #262696
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index a91c71ad7463..32b30de7588b 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -11,11 +11,11 @@ AUX ejabberd-1.1.4-erlang-12.patch 3746 RMD160 17e6dc9ded6f598c27cf2cda098d2804e
 AUX ejabberd-1.1.4.confd 736 RMD160 100b2b7957766380b0267d6fc91b3fe8a0f827fc SHA1 7c7283615eddafe24f7d331b76b598ad3f10699c SHA256 8c3f96ebaa0bf200ef145dbc6ebea82451cfaceec9ff7802fdc0ef48bf507715
 AUX ejabberd-1.1.4.initd 1437 RMD160 96d9d35de36585a9e735f124b7be1618949541aa SHA1 623713cfb28a247f16a14f6b2ca6a8555609bd35 SHA256 59f983e32f7b530b66b5242ac6f06405b7440a112b2f980abe602508459d923e
 AUX ejabberd-2.0.1.confd 840 RMD160 c013ebfe1e471916561ba23a0ac83618501ce8cc SHA1 1bf74fa62acfd3edf60633fcdf11aeb2882a150a SHA256 8df6a561feeb84c5117837ef6924fec4aed392accd20fd1b0135a3dc789f1372
-AUX ejabberd-2.0.1.initd 1134 RMD160 21d775aeb8671996ee9dcfb371d1122cad81a063 SHA1 143b0f9d4c8eba20164d9915aa48a736add828be SHA256 9f65bbd0e3e7e0fc8df379a0cac6d03414ab793ce83abcbc55468c16e529ad82
+AUX ejabberd-2.0.1.initd 1132 RMD160 54f96d792816f214d689e01f0ea571681ad6a9b0 SHA1 154d6494c18eb8f97b9d2bf4420562ebe64bbd32 SHA256 c493257640d0195552c87f38d803fc8c15d3d36caced476e021d57960fa92acb
 AUX ejabberd-2.0.2.confd 840 RMD160 5227a3fbb0d0c8bffd8a5537003f965f1fb73582 SHA1 d3a51fa0923a571d30f3f0840834c651726ad206 SHA256 d6b0c44a450c4191e450b8e3ab281dc2e3bc668a97ddd1652d2e6c555675a2c6
-AUX ejabberd-2.0.2.initd 1134 RMD160 b5d3a5a50069be713511ebd37f9eab07dab33371 SHA1 0cd2c3bd44c1923014c1cdd84edfb56ddb11bdc2 SHA256 8b2c50bc80b5b0700195c79a4eaa6f68549fd63310b584c2e86d951c116e14de
+AUX ejabberd-2.0.2.initd 1132 RMD160 dd527410a24368940ad23075f4ff57f4ee9828a2 SHA1 9fa7859b48248e27b39e13775699921d8e6b024a SHA256 1b14f49ae4ebca31bf3aab6a7d9887752174c032a176e1da9a43120c1e350b22
 AUX ejabberd-2.0.4.confd 840 RMD160 0d6761c629964febf390249304d9b2a4e10f85b4 SHA1 0afedf459a4a8bf6c24798800c1f83149003f44f SHA256 5f86c82752f5cbdc77556a134d3d0d07e682f7255a25d91873677f9e2f43cda0
-AUX ejabberd-2.0.4.initd 1134 RMD160 bea74f99c56b7205213ef5d967bbf51c9d27b2e5 SHA1 00b6f7c6797cb644dc914e7794b332d304f29917 SHA256 06b02be1757fdeabc5386b4c524585bda1f6869b6bf90cf92ffbf83632b23945
+AUX ejabberd-2.0.4.initd 1132 RMD160 c055617a8f5cc1a095742dbfeabd96edf2cdcbb6 SHA1 1b4a5b5ff8b4af5fea1341befe808f3b39d67edb SHA256 5b3b7a59b17979bf4bc7baba39f3ae5801f5176b061fc52e6ca77effab59fdec
 AUX ejabberd-wrapper-2.0.1.template 1243 RMD160 989700850578dd86fe6cefeb465a1c84ba49df48 SHA1 115d10f04dd92ca090e853013dde3e5ffa3d6904 SHA256 1d3abfbb1b4dd79ba9fed74a5c86c97af70dc11927d8fa109a1486999d5f7a96
 AUX ejabberd-wrapper-2.0.2.template 1243 RMD160 989700850578dd86fe6cefeb465a1c84ba49df48 SHA1 115d10f04dd92ca090e853013dde3e5ffa3d6904 SHA256 1d3abfbb1b4dd79ba9fed74a5c86c97af70dc11927d8fa109a1486999d5f7a96
 AUX ejabberd-wrapper-2.0.4.template 1243 RMD160 989700850578dd86fe6cefeb465a1c84ba49df48 SHA1 115d10f04dd92ca090e853013dde3e5ffa3d6904 SHA256 1d3abfbb1b4dd79ba9fed74a5c86c97af70dc11927d8fa109a1486999d5f7a96
@@ -37,12 +37,12 @@ EBUILD ejabberd-2.0.1_p2-r1.ebuild 4888 RMD160 d3155ae40d18d431f047e4dc7d29dbc7a
 EBUILD ejabberd-2.0.2-r1.ebuild 4817 RMD160 f5a48c390ad0ea3760b2667c623374c1bc2a5ca4 SHA1 cc56db2924b713b7edff88ad304bd11c0c2377d2 SHA256 19b2b7dcfa1930068bbe1d2a79ab1d845823fce0ce962d1f8f42ee32a6d9fe30
 EBUILD ejabberd-2.0.2.ebuild 4814 RMD160 78fdc1c569c0961efda5aa9c53be5c363d5a4b13 SHA1 e6590f5fa39628aad821c0aaa75a93bfc1610998 SHA256 785f47b09ba14a32673a5a231d57b549aa61cb341f86e624f2630b941b4a302b
 EBUILD ejabberd-2.0.4.ebuild 4831 RMD160 a107945058ff565b5a6ba60d27359f2f75761f09 SHA1 4857680dff8d02417c917f7bdf7b3cf6aa0a7f64 SHA256 3bd1fe637198b29ded4aeaac3771869e08541c51ace2531bde925d9dc745ee14
-MISC ChangeLog 10799 RMD160 8a494157cf4fc5b8c3db22fdd9d9fed07a29bcca SHA1 38df6af5f05a82084635604f1d72b471d58743ef SHA256 c040211bb7c9bcbaf2299cab6f216a648bb61eccd1a56ee1c7e60f8daa0538ae
+MISC ChangeLog 10980 RMD160 96023f7a81985a1cd3eb5a95ef06d12cdfa2a8ca SHA1 a24169cc0d16863ff0090d199879c9b51b9421d6 SHA256 aec66c4a5b04a558de96e27bfa9ab4c91c37107dee7bd1bc8e182fc9dbe1039d
 MISC metadata.xml 619 RMD160 ca6e7f018d370ce36a3b93eb960254537260949c SHA1 404f3d0d31036ed1cfeb8aeee2264559c1d1c8d9 SHA256 843e1bbd5fdc082763e71322094170cde5b90d0f5d9320011c4b9872cd6589f4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknH/k8ACgkQkKaRLQcq0GLP+QCfb0SPJ8o0TT/wlcQS3F6bKnpU
-8k4AoIZaL3zjQsPBqi1QErUBacK5xxm0
-=1qKN
+iEYEARECAAYFAknNK80ACgkQr2QksT29OyCXVQCeO5beJEwJHGv+7oCM1Lg1wKA2
+q6MAn0+9Lb455h0iBO2OdHg3rEEIRCOj
+=ESEc
 -----END PGP SIGNATURE-----
diff --git a/net-im/ejabberd/files/ejabberd-2.0.1.initd b/net-im/ejabberd/files/ejabberd-2.0.1.initd
index 11d5d9f3b84a..3a1905ae2056 100644
--- a/net-im/ejabberd/files/ejabberd-2.0.1.initd
+++ b/net-im/ejabberd/files/ejabberd-2.0.1.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-2.0.1.initd,v 1.2 2008/05/22 12:26:06 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-2.0.1.initd,v 1.3 2009/03/27 19:40:57 hanno Exp $
 
 opts="${opts} reload"
 
@@ -26,7 +26,7 @@ start() {
 	case "$HAVE_SMP" in
 		"1"|"true"|"yes")
 			BEAMNAME="beam.smp"
-			SMPOPT="enable"
+			SMPOPT="auto"
 		;;
 		*)
 			BEAMNAME="beam"
diff --git a/net-im/ejabberd/files/ejabberd-2.0.2.initd b/net-im/ejabberd/files/ejabberd-2.0.2.initd
index 329001a95a1e..38c5e575712b 100644
--- a/net-im/ejabberd/files/ejabberd-2.0.2.initd
+++ b/net-im/ejabberd/files/ejabberd-2.0.2.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-2.0.2.initd,v 1.1 2008/08/03 16:19:05 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-2.0.2.initd,v 1.2 2009/03/27 19:40:57 hanno Exp $
 
 opts="${opts} reload"
 
@@ -26,7 +26,7 @@ start() {
 	case "$HAVE_SMP" in
 		"1"|"true"|"yes")
 			BEAMNAME="beam.smp"
-			SMPOPT="enable"
+			SMPOPT="auto"
 		;;
 		*)
 			BEAMNAME="beam"
diff --git a/net-im/ejabberd/files/ejabberd-2.0.4.initd b/net-im/ejabberd/files/ejabberd-2.0.4.initd
index c6fe9febf18a..2ca2820c0664 100644
--- a/net-im/ejabberd/files/ejabberd-2.0.4.initd
+++ b/net-im/ejabberd/files/ejabberd-2.0.4.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-2.0.4.initd,v 1.1 2009/03/21 12:29:53 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-2.0.4.initd,v 1.2 2009/03/27 19:40:57 hanno Exp $
 
 opts="${opts} reload"
 
@@ -26,7 +26,7 @@ start() {
 	case "$HAVE_SMP" in
 		"1"|"true"|"yes")
 			BEAMNAME="beam.smp"
-			SMPOPT="enable"
+			SMPOPT="auto"
 		;;
 		*)
 			BEAMNAME="beam"