tidying the ebuild

diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 8766f1a923ff15d46e3eca1f48e242919df14828..0c106862c6ee5dc971a3c61a33d586a8790c5ed1 100644 (file)
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -6,21 +6,21 @@ MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 MD5 07be834b0dbedbb5f91170c18dd22c1f spamassassin-2.63-r1.ebuild 2401
 MD5 977dc4b389deafd70daf9fd67c796b06 spamassassin-2.63.ebuild 2293
 MD5 205e042f0bd8a0cac7df1b17ff5b8aa5 spamassassin-2.64.ebuild 2505
-MD5 3d39b0472eceda3ce11c073f0082e3d9 spamassassin-3.0.0-r1.ebuild 5802
 MD5 c607c46288451f185dc1c3a769e10fa8 spamassassin-3.0.0.ebuild 5799
-MD5 4b17c303c2a11eab455003b92cd1851a files/3.0.0-spamd.conf 596
-MD5 33f67831957d640746a374b8774e7d2d files/3.0.0-spamd.init 667
+MD5 2a3d10825088e74b85c07939be66c34b spamassassin-3.0.0-r1.ebuild 5602
 MD5 2bc962fe7cbd5fc24b6ca7703a498e83 files/digest-spamassassin-2.63 75
 MD5 2bc962fe7cbd5fc24b6ca7703a498e83 files/digest-spamassassin-2.63-r1 75
 MD5 6a161feb8320fadb55f440aab192d008 files/digest-spamassassin-2.64 75
-MD5 7d4ce834279c9e36320d114a7118c127 files/digest-spamassassin-3.0.0 76
-MD5 7d4ce834279c9e36320d114a7118c127 files/digest-spamassassin-3.0.0-r1 76
 MD5 1ed9c6ddcb224ed5d2ad37aab7c0cce9 files/spamd.conf 265
 MD5 90925e8f6521add45f8a727ed982e61a files/spamd.init 645
+MD5 4b17c303c2a11eab455003b92cd1851a files/3.0.0-spamd.conf 596
+MD5 33f67831957d640746a374b8774e7d2d files/3.0.0-spamd.init 667
+MD5 7d4ce834279c9e36320d114a7118c127 files/digest-spamassassin-3.0.0 76
+MD5 7d4ce834279c9e36320d114a7118c127 files/digest-spamassassin-3.0.0-r1 76
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBWLiTI1lqEGTUzyQRAhIgAKDN3PjBIa3Gj2a744L18xVHWlTyyACdG3ZQ
-lW/N74Ag0SAF8GUWIJtPjz4=
-=6nix
+iD8DBQFBcSoYtG5z4I8BtQoRApg/AKCLl7Uea41lPDBYx0wQUP0LfWWEMQCfSCH1
+PASEvDpO7T8CbJEaFn+hSxA=
+=EK11
 -----END PGP SIGNATURE-----

diff --git a/mail-filter/spamassassin/spamassassin-3.0.0-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.0.0-r1.ebuild
index f842336f51aabc5657500ff314c0a42d67265939..62cc91425c5696d08c4c2377dcf0303080169bf4 100644 (file)
--- a/mail-filter/spamassassin/spamassassin-3.0.0-r1.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.0.0-r1.ebuild,v 1.1 2004/09/24 16:22:47 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.0.0-r1.ebuild,v 1.2 2004/10/16 14:02:51 mcummings Exp $
 
 inherit perl-module
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.apache.org/dist/spamassassin/${MY_P}.tar.bz2"
 
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~ia64 ~amd64"
-IUSE="berkdb ssl doc"
+IUSE="berkdb qmail ssl doc"
 
 DEPEND=">=dev-lang/perl-5.8.2-r1
        >=dev-perl/PodParser-1.22
@@ -82,8 +82,7 @@ mydoc="NOTICE
        STATISTICS.set2
        STATISTICS.set3"
 
-# Commented out until qmail is a valid keyword - mcummings
-#use qmail && mydoc="${mydoc} README.qmail"
+use qmail && mydoc="${mydoc} README.qmail"
 
 
 src_move_doc() {
@@ -138,10 +137,6 @@ src_compile() {
                make text_html_doc
        fi
 
-       # FIXME: Remove the following block in the final ebuild.
-       if [ "${PV//[^_]/}" == _ ]; then
-               hasq maketest $FEATURES || perl-module_src_test
-       fi
 }
 
 src_install () {