Do not touch existing razor files. Should fix bug #144789 by Cédric Krier <cedk at...

Package-Manager: portage-2.1.2_rc3-r7

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index fef96b85010462fb4c379d626d9671ca9128e0b1..52fa965080a09385c1813c27bfc3eab8bc34cc5d 100644 (file)
--- a/mail-filter/amavisd-new/ChangeLog
+++ b/mail-filter/amavisd-new/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/amavisd-new
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.98 2006/12/18 17:00:35 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.99 2006/12/24 21:16:34 ticho Exp $
+
+  24 Dec 2006; Andrej Kacian <ticho@gentoo.org> amavisd-new-2.4.4.ebuild:
+  Do not touch existing razor files. Should fix bug #144789 by Cédric Krier
+  <cedk at gentoo.org>.
 
 *amavisd-new-2.4.4 (18 Dec 2006)
 

diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 9d4fb02e55211c2cab870d4acd74410d733d8b7f..24404ef255723134639b0fbdf9ac241ceb9399e7 100644 (file)
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -58,14 +58,14 @@ EBUILD amavisd-new-2.4.3.ebuild 5133 RMD160 79ba46a33ad8b5cd0d240950b72b84f1d1d6
 MD5 2485dfbe653652d133eb1cf0e3fd4cf9 amavisd-new-2.4.3.ebuild 5133
 RMD160 79ba46a33ad8b5cd0d240950b72b84f1d1d6feed amavisd-new-2.4.3.ebuild 5133
 SHA256 3be17677141e51e919b988fcf300d844f188909f644621ae228a46f01920878d amavisd-new-2.4.3.ebuild 5133
-EBUILD amavisd-new-2.4.4.ebuild 5126 RMD160 001f518a9449b6b2f8e3addb24c46828238116ae SHA1 6bb4731ced24a095790e32fc50411d589f91e0b6 SHA256 1839e3dad069f58fa7925418473d263a145ab41f8a55a7fec80b89104678101a
-MD5 a2a55b81870ce0107cf65048fadfe6b1 amavisd-new-2.4.4.ebuild 5126
-RMD160 001f518a9449b6b2f8e3addb24c46828238116ae amavisd-new-2.4.4.ebuild 5126
-SHA256 1839e3dad069f58fa7925418473d263a145ab41f8a55a7fec80b89104678101a amavisd-new-2.4.4.ebuild 5126
-MISC ChangeLog 20527 RMD160 e4b1aabd328ee1262baa462b7d7ad5483d3a3ab1 SHA1 a604560415fb8b51e0a41f9a71c85b6cfbbc93ae SHA256 07847746053a1c666e0328780a4bf737109b4b88558c1a66d4555107a91e2881
-MD5 e450a386f3da9301ae6dbd1113f17417 ChangeLog 20527
-RMD160 e4b1aabd328ee1262baa462b7d7ad5483d3a3ab1 ChangeLog 20527
-SHA256 07847746053a1c666e0328780a4bf737109b4b88558c1a66d4555107a91e2881 ChangeLog 20527
+EBUILD amavisd-new-2.4.4.ebuild 4975 RMD160 d41b797b55c2d7ed502da4f33a5f77a209a85b3e SHA1 772e8c2e2b17ab0e9c7ca1e90676000c063f147d SHA256 6b651c31f8f8112c1fdb252aa8289d9f63454ac579e9fbf7621a51ac6a6bc459
+MD5 d590a31a2e349d18d117ec02035fd3d5 amavisd-new-2.4.4.ebuild 4975
+RMD160 d41b797b55c2d7ed502da4f33a5f77a209a85b3e amavisd-new-2.4.4.ebuild 4975
+SHA256 6b651c31f8f8112c1fdb252aa8289d9f63454ac579e9fbf7621a51ac6a6bc459 amavisd-new-2.4.4.ebuild 4975
+MISC ChangeLog 20703 RMD160 4957cb6c54dd004c800db88d586aa1ddeaeb7127 SHA1 00c39a29147028510abf832ece10da31e25dc9a9 SHA256 a3ff53bea7b42032494f279ea2d4a0257083e49b72f2246c78f05b8f305c1783
+MD5 d8408df7926f532985fe0f4d7a0c9ffb ChangeLog 20703
+RMD160 4957cb6c54dd004c800db88d586aa1ddeaeb7127 ChangeLog 20703
+SHA256 a3ff53bea7b42032494f279ea2d4a0257083e49b72f2246c78f05b8f305c1783 ChangeLog 20703
 MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 metadata.xml 184
@@ -89,9 +89,9 @@ MD5 83635931b292ec0088abfc75e7e2b8e1 files/digest-amavisd-new-2.4.4 253
 RMD160 baf26470a8658bfbe0780197dd2e93a378ef1827 files/digest-amavisd-new-2.4.4 253
 SHA256 3efe36b42ef294cc88b43fd99e066f1599af37a38b5764681067bb76b601a091 files/digest-amavisd-new-2.4.4 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFhslLQlM6RnzZP+IRAsAoAJ91ZgwtEI0kxobDBb+ciiiuLJzfEgCeMg8z
-ZRyf3645Iw+vbyI7HT4ghLQ=
-=qC++
+iD8DBQFFju48QlM6RnzZP+IRAt/FAJ94yAfiaOHO8lbxWxsPpECOevsLYwCgscQK
+jXlz04nx7Wx7EaqYxssoo1o=
+=/3Ju
 -----END PGP SIGNATURE-----

diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild
index d8327434fa71c57a7ff2433bd98473c0ff5c21ed..0911ebe978ab5bf650094b826f4c223f235ad9a7 100644 (file)
--- a/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild,v 1.1 2006/12/18 17:00:35 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild,v 1.2 2006/12/24 21:16:34 ticho Exp $
 
 inherit eutils
 
@@ -145,16 +145,12 @@ src_install() {
        done
 
        if $(has_version mail-filter/razor) ; then
-               if [ ! -f ${AMAVIS_ROOT}/.razor/razor-agent.conf ] ; then
+               if [ ! -d ${AMAVIS_ROOT}/.razor ] ; then
                        einfo "Setting up initial razor config files..."
 
                        razor-admin -create -home=${D}/${AMAVIS_ROOT}/.razor
                        sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
                                ${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf
-               else
-                       einfo "Copying existing razor config files..."
-                       insinto ${AMAVIS_ROOT}/.razor
-                       doins ${AMAVIS_ROOT}/.razor/*.{conf,lst}
                fi
        fi