From 80887ee1cefb9b128a62ddc9b46c1d3547fae98f Mon Sep 17 00:00:00 2001
From: Christian Ruppert <idl0r@gentoo.org>
Date: Fri, 24 Aug 2012 18:25:20 +0000
Subject: Redirect stdout instead of stderr. Whitespace.

(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
---
 mail-filter/amavisd-new/ChangeLog           |  6 +++++-
 mail-filter/amavisd-new/files/amavisd.initd | 14 +++-----------
 mail-filter/amavisd-new/metadata.xml        | 18 +++++++++---------
 3 files changed, 17 insertions(+), 21 deletions(-)

(limited to 'mail-filter')

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/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>
-- 
cgit v1.2.3-65-gdbad