Redirect stdout instead of stderr. Whitespace.

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

4 files changed, 27 insertions, 31 deletions

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index 9c48007ad382..6f903fa9bcad 100644
--- a/mail-filter/amavisd-new/ChangeLog
+++ b/mail-filter/amavisd-new/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/amavisd-new
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.189 2012/08/11 19:45:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.190 2012/08/24 18:25:20 idl0r Exp $
+
+  24 Aug 2012; Christian Ruppert <idl0r@gentoo.org> files/amavisd.initd,
+  metadata.xml:
+  Redirect stdout instead of stderr. Whitespace.
 
   11 Aug 2012; Agostino Sarubbo <ago@gentoo.org> amavisd-new-2.7.2.ebuild:
   Stable for amd64, wrt bug #429106
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 67fb80e8b3c4..59995bed3507 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -5,7 +5,7 @@ AUX amavisd-new-2.6.3-amavisd.conf-gentoo.patch 4882 SHA256 f928336035c432e1358f
 AUX amavisd-new-2.6.3-dkimconf.patch 735 SHA256 1d0489bfd14d794617c12ec797404373a632b2c26e381d9e09c364cbfa2ae248 SHA512 111630148607d59bb1112dab829f87f4f53eb75c83030ebb2b80bdcce61329e417aa18c36180f354423f1fe11714094b658da4ef505019d770ced875df41185c WHIRLPOOL 8f2e06b4e42c81ead59f108413065a9c470bae27b6e85c16307f70ac93ce56ddc5294a19df260f2cc610087f26f412bb51ca0f8a841c39ce5b443bd4a8fd2168
 AUX amavisd-new-2.6.3-startup.patch 522 SHA256 ebc531320945ab009da3b59d829d7f6dd938647063ec495ed85d96833eee0647 SHA512 d18fd29eca8b827567963cd5c75a53b267ab9443a854e6d0ecd433b2418829404900b17d22200a55d59ce003720ae7836362edaf5b8c8791bd0dfc3dc13e5a69 WHIRLPOOL 8e21a602b916ed19507833c5be8322787622a9b9eca8029a3bf4daf9b59512590e4d9bcab9e3c81c57df548ddd51d2d855afb88a350502c68fa0e7afc3eba56d
 AUX amavisd-new-dkimconf.patch 735 SHA256 033f6758dc3f62d19f8a269c8ba1e3960f8b55a48aaccbb6d1d0078cd92352a8 SHA512 bc02a2aff5eed7e3bf2ebff89fafd49a2b67a85722963662cc7c60d38a5915d149bc2adf9a5936d23fcf32dc82bee4f63473ca79f66fadde718d7df7892ee928 WHIRLPOOL 644c26e237cc9bd1b9b62441d61202d56ff43d3625c7f80496a7a237e653f5de1da8fc604ab9f7231189ece3b47d6390798ea7d7888981c54462180916249afb
-AUX amavisd.initd 918 SHA256 6843671c58cca1fb1df954b85f40c587838519d4b359a054f0619cad5592877d SHA512 0bdc842bf6c5613ef049dee90579e5635338989ae20683ee5aff183a183fa795eb9636fc5d5671b1f6c155ad7f68e5aac0749520f8ba477103ae9dd50da7cb57 WHIRLPOOL 65e56a9d4f752dd3e993b5adce96e1872103c251fd77a7243267e3242a359a3dc4452f6c90cc3a191d1a43f7dd0030ceda1d7b1d15aa9cf061921ba55fe5dcae
+AUX amavisd.initd 832 SHA256 b1d40ea4a25cf6f03ccd1b5f02adbfd2203944944077e2906b978e48ff6fd80b SHA512 f6aeb51fff579f233a387b43f2bb1f9396ba7d2d3bb058d74cca5aa22b5b8914e30bd1f95a674bafdc81c191bbff5077d7a6682894e6f9f57c99d81006920138 WHIRLPOOL 8f4e863fe2eb4f5c44b202f2c500713273de6d43ec410d953e18f45b12956c2b67775daf79a0c6830405ab857feaa652722c63783e0b5a3a0adc9b67fd1b2578
 AUX amavisd.rc6 371 SHA256 f2010650d3ef408359f41e3a84173c2b27300e9d6d2e4f7558ef39858e01da9d SHA512 4d709775bbe4fd0671da21ee43d69d88332716140eeed5f5000ccaf6d08170feeb252b1ae7d6587771ee766be0fc77dff823c2f79a544998df97971978c15fce WHIRLPOOL 6ceaaf289fd7cc8c16fbc0c8314ed5d794a76a8fe81218e87469cc874fba18a96910ccf1d92b9b5f8298fd092e222b528953781030f87258e1a9b21b3af9aa54
 DIST amavisd-new-2.6.3.tar.gz 918888 SHA256 47e774579fdab1e1c10ef2295d49cb511b13e05431a7955c73f07e98025d788e SHA512 5c71cb53c198ab59a3e242d43b77a5889713ba6934a784b5256ab5bebd8afda75d833b5a20afeff6daf052f30f30eb650b3c3e4175102992e8e2c6ba4efb17ff WHIRLPOOL e3b11e9a9dd079939bcbc02abc2eee1ea1be30d359c58f4ecbe1f9275f8076e2eff4a4d4b2366f18f752aa6bc536e13264336f4165b00bbbdf687cb2447a1f72
 DIST amavisd-new-2.7.0.tar.gz 941811 SHA256 534b3d91c31e0e87a73602c84dfeb4b30b4ea64dee99fcceabd59b1bc0082b0b SHA512 04fac5f3829d1ea7b26bb058e07ca323ffd92b644da8d83ea8d8f400236ae5b603b272e9c690f01c2a80d06a32f7326001d7109e5a00125b1112f54c67f8e199 WHIRLPOOL ecc49a638b6f196638e11f5f8e53d80f87e654674bbe7abfd880422fdc8efdd7ef92c2bb10090d644acb7f88ff31bc5df1e2ea46f488ab4793f0e9428fda1058
@@ -15,16 +15,16 @@ EBUILD amavisd-new-2.6.3-r2.ebuild 5484 SHA256 7521feff6769511f2d19e3b041dab59fd
 EBUILD amavisd-new-2.7.0.ebuild 4292 SHA256 21385f792e9088f227fda38ff8d4f51b23b6f277aab4a03d94f933f978e2c075 SHA512 20b1caa972d9f1946aad4bc7621c3a3c1c2a078dbc2fc25f2a03aa212b492e552e4cc0b32230a79a023cc63eb8822d0a11bb422e8b57c5d542fdef41a64f4d9c WHIRLPOOL 1744bb4b6a4521b2c513c9fec6d230acecf09428fb84dc50a1da0d47fc5f349c902bc2ed28186ebbbbf9c099344a7ce7faf72a508d5a5b554c7466063fb1adeb
 EBUILD amavisd-new-2.7.1.ebuild 4292 SHA256 a7290d473ad9faacd66161add119bba96e673b92f33822607c5bf33f969b1f38 SHA512 659e4935b711d6b3f1e491d30c7980e086f5c76378cf7c212708d005adccfc8998d50d5f8340b2e1e018e39d6226e6c0cc3bcdfc027ad469c107e4e88db21e30 WHIRLPOOL 71e2e30ca19cd1c41a87c273604d22cc747e6ca72527a2c66e936df540c2ab2b93cb69d215053d2ee5576575cb99892646193cbe9e42c8bf4425ac2fa1ea513f
 EBUILD amavisd-new-2.7.2.ebuild 4290 SHA256 fec7084d8baafb7ce73b164482e11b9d179d50462c51c96088efe9df413936dc SHA512 96734eab5a8ac2c36989ed50facd42879792ab0ebf1dcc80a57efb97904f26573d4204c6f34bbf870025a65e7bc650aba44fe99d348159cb73ced50742e7ec55 WHIRLPOOL bdb9a63b13c18dc9e429d2e959049a5efc24cc9212d99e16833624a83213d01b21b9c6cadc2f997250efa1f3d5e1262a87fbb69d70fb043ddcb414faefe4025c
-MISC ChangeLog 35643 SHA256 8defd3884984af409b7aca4bca762a1df3a3012ba0acbe28ac9c89c42c6282a5 SHA512 f2fa7fec7f35ab59011d780be9d185ab9dd134b28b41948022b805c8913e4bedfd9bc8df963c57f0e6d49afbfd875e7e38dd18ab2a7c2871307a48798c30273c WHIRLPOOL 938b9c4979e2853cfad5aed26231a221a3b270d75f041585c4f2a403b57cb7a816b4311acebb36d5f5f93783d79ecd83d652bd73cebe8416e5fca72577c130a9
-MISC metadata.xml 492 SHA256 9210f93fc9ec4b70f4fc79c08f43bb50f29e02aa33bad7061c0047ac8781d190 SHA512 ba69b22152269a0e655e556066515a59852cadcf06169be9155a856ae86241c089f2fd475fe182c2272c68eea71e6cd53b44e4e822f897fdf8917ecdb7c7f8a4 WHIRLPOOL 310f048d1ed9363ee890644829c4bf4aed66cc1d44930ff4dc1512b2877f9d996ecb08b05e39f2ba29bcb22b738c62d43e905cbdd11e5ea3059db4e30a088da0
+MISC ChangeLog 35784 SHA256 09f1074cc9b5304562a105a5742596d677bf8acc3c56967c03db8369e98d9f0e SHA512 9b45a9c5ad948cb5904864b75107db8ee137dc4efa8c1264ac28e516aace9bbd59c1b05fc704c2e653727e9352b6017fd1c0e2b2621f6f534e39d1a4fb6614cb WHIRLPOOL 386350c38204b2e4bcde5d2cc7a206ae91a4b20e557984df5708106d91c93b7cd802719ffde050db8973fdc5568fe8b3c7b2faf5805416135a0a791a41b67a77
+MISC metadata.xml 501 SHA256 14170b3945a5234a816acf9195f4d91f81620b221f9dc646efba9d14d95196e2 SHA512 6d8fd3c225a8e04de3575958d7826f3a65cbebe4cef092036f3e5e8fb70de4a1543ec7b14e67a1611d0db93cda72640c3a55f676f189d45a707e7861b44fa024 WHIRLPOOL 5194ba20e69a966781b36dded6843c8bb61ada9b37907ce74e504272f4c50a0203b6c771cb9aa8882767498df6b9facc953f2f018b48da2528e1c1f38f56e7e5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQJrZXAAoJEOTDgjZ80txdAXMIAKEUilNTQOVmeenyI9JqPkSy
-+cOhCxnr181SR2SFwWOE6Jbj5SFsizQUukpr0IYKBgJlz5mLtQBJWvr3Uu0oM5cH
-I3Mq3+SnHAku043O/CTsD+1SC/INNTJ5ufRNB8idg2LlDdZK4anWbvooReIFzozH
-SjT+EOirvev4vhXdOYsYfIESzM44DXeA5+lnpOXOyoByb/EGTizO60mPZpaBwYvR
-FxDDpLqawdr3Aci25KU4iCzofxhATOwPgzm+jsCaesrTJdmViin5MStSCVcwWp1l
-zMzCMOdPJdJUcIpAuKXS+kFx39lWCCW3nG5UIKYcjx0MTNBbVdbLL6EjyO60Xnw=
-=ddkO
+iQEcBAEBCAAGBQJQN8caAAoJEMOx0zmdw4Z1otMH/1kYN0b3mm8UmLrdkE71g+Yu
++1XSLM6OgvG1Kp5cSYMKzVQw5oCVY1gMgxPyWvOc81nqlzL/21S5xgksFiH/Srqd
+M1r+KyfbZH0XL3pwCoFWJja8Prb8x5H5n0I3uZKDJR89UZvGogtRB4JUpDGxAnUH
+/dc1tJN7yXWS1WcgdmEwzir3dSvTsy8agqcNlPy3PBD+y4CP9BIwnSuMY/ULF6eB
+6m/BVVjITkUYPNMpdei7s2ciNIucu1t5xIVrld+RucRz9isFvbC8+oxjQRY8Xhpg
+/7KwEvRAn71noPbKN66ISr9paL2Uco2iGdjP3B6KPiBZce1wswyA8KHOh3beC6I=
+=uJX9
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/amavisd-new/files/amavisd.initd b/mail-filter/amavisd-new/files/amavisd.initd
index ce3a447eb3f9..59189422bdcb 100644
--- a/mail-filter/amavisd-new/files/amavisd.initd
+++ b/mail-filter/amavisd-new/files/amavisd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd,v 1.4 2012/01/10 13:46:47 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd,v 1.5 2012/08/24 18:25:20 idl0r Exp $
 
 extra_started_commands="reload"
 extra_commands="debug debug_sa"
@@ -23,21 +23,13 @@ start() {
 
 stop() {
 	ebegin "Stopping ${progname}"
-	"${prog}" stop 2>/dev/null
+	"${prog}" stop 1>/dev/null
 	eend $?
 }
 
 reload() {
 	ebegin "Reloading ${progname}"
-	"${prog}" reload 2>/dev/null
-	eend $?
-}
-
-restart() {
-	ebegin "Restarting ${progname}"
-	svc_stop
-	sleep 3
-	svc_start
+	"${prog}" reload 1>/dev/null
 	eend $?
 }
 
diff --git a/mail-filter/amavisd-new/metadata.xml b/mail-filter/amavisd-new/metadata.xml
index a9dd5a789692..72688c123820 100644
--- a/mail-filter/amavisd-new/metadata.xml
+++ b/mail-filter/amavisd-new/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
-<herd>antivirus</herd>
-<use>
-	<flag name='courier'>Add courier support</flag>
-	<flag name='dkim'>Add DomainKeys Identified Mail support</flag>
-	<flag name='qmail'>Add qmail support</flag>
-	<flag name='razor'>Add support for mail-filter/razor</flag>
-	<flag name='spamassassin'>Add support for mail-filter/spamassassin</flag>
-</use>
+	<herd>net-mail</herd>
+	<herd>antivirus</herd>
+	<use>
+		<flag name='courier'>Add courier support</flag>
+		<flag name='dkim'>Add DomainKeys Identified Mail support</flag>
+		<flag name='qmail'>Add qmail support</flag>
+		<flag name='razor'>Add support for mail-filter/razor</flag>
+		<flag name='spamassassin'>Add support for mail-filter/spamassassin</flag>
+	</use>
 </pkgmetadata>