Fixed repoman errors

3 files changed, 167 insertions, 159 deletions

diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
new file mode 100644
index 000000000..682626892
--- /dev/null
+++ b/mail-filter/spamassassin/Manifest
@@ -0,0 +1,10 @@
+AUX 3.0.0-spamd.conf 1527 RMD160 8075268aecdf6f41f5cdacb683fe92567d860dae SHA1 01623333cecb1ef38b25a130d3b5afe016e70f1c SHA256 ea61041e8b6b1616ec096cc42245ab8442b962f72c318695f5acff1fd794ee34
+AUX 3.0.0-spamd.init 891 RMD160 d8f80c02238e22704cd588f0fee5d198f787df38 SHA1 2ed966512c79a016f8bf2242c76879434367942c SHA256 09bcdf5287b2464e754f78647c939b0de86c135433eaa3ca45d89ab2b68a79ac
+AUX 3.1.8-archive-iterator.patch 501 RMD160 6eb7ef7c73d8f207d04e5cffe59e8d924d13c06e SHA1 0b3fbbeb778daffa72094a68d91a48073438ef0a SHA256 244fa7e6af21998f7ba1d7632c618b50924401effb84db79070b9c7c24e41215
+AUX 3.2.2-upstream-5574-fix.patch 1271 RMD160 4b8a47313b220701f2fb74d4c2c8f552f90a9c82 SHA1 6a1a42770f30eeef76d29fa38e5f19817b68b827 SHA256 ac262a3950e0d6c00619488d14be34859e774ff3b7b3bd6cf97ce556c36f660d
+AUX 3.2.2-upstream-5574-testcase.patch 1611 RMD160 e94baa4f60c825777744ffcd58fdcda2951721f6 SHA1 1a4e7947bb46d2e475d9db33e682136295075c91 SHA256 9d5439c465418c89c10bd10b0802c80f73332fc47d5ce7df3e506696f6cb559e
+AUX secrets.cf 664 RMD160 afb1212a464bd7053c1301c1a1e670b73216528a SHA1 a742beddf850e55bc4454a7548dc43c36f8e9760 SHA256 9f134c7b857b21689f612fc6d131f719e5a65e2ba341b282e7aa57402c854139
+AUX spamassassin-3.2.5-DESTDIR.patch 8856 RMD160 c7aa95f1ddc21e7668266fe3eb00342ba5569c8c SHA1 045a446362b8b0491164a53cff18391c49fe6786 SHA256 f73e3d63b7fd79c364799cd1e3525369ac483019e55c079f33529b6ce81c9264
+DIST Mail-SpamAssassin-3.2.5.tar.bz2 1011883 RMD160 444baab6d966d4366834b82cde34c81e3e521144 SHA1 32b701ffc68f7975eded107c456b902bc710d8b2 SHA256 baaab5e4da7d3b0e04c0db579bdb44bbd6be916d29540682346eccead23f6c8a
+EBUILD spamassassin-3.2.5-r1.ebuild 5201 RMD160 5f6eb856d9bef3212f8b0d741272ab5c661fc216 SHA1 6ccf60e11abcf5bbd7e2d414837d7e9518c44fce SHA256 048c61563bb9ec125f22953260d26e4a30ce0502dbcd5b90a06b08bbdbe0d4d4
+MISC metadata.xml 397 RMD160 57fce2ddbc573f348530f856bc0735ba1aae08b9 SHA1 ffab343d82e13c81c74ecb9d0724634a4df755d8 SHA256 6b960f56b7be9f2ecb4b7023b54e20fc6d5583d8ff9ea0b1a4a987c6d86b0a0a
diff --git a/mail-filter/spamassassin/metadata.xml b/mail-filter/spamassassin/metadata.xml
new file mode 100644
index 000000000..916faf121
--- /dev/null
+++ b/mail-filter/spamassassin/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>perl</herd>
+<maintainer>
+	<email>perl@gentoo.org</email>
+	<description>Primary Maintainer</description>
+</maintainer>
+<use>
+	<flag name='qmail'>Build qmail functionality and docs</flag>
+	<flag name='tools'>Enables tools for spamassassin</flag>
+</use>
+</pkgmetadata>
+
diff --git a/mail-filter/spamassassin/spamassassin-3.2.5-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.2.5-r1.ebuild
index 2badd1fd6..7a91665f7 100644
--- a/mail-filter/spamassassin/spamassassin-3.2.5-r1.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.2.5-r1.ebuild
@@ -20,182 +20,166 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="berkdb qmail ssl doc ldap mysql postgres sqlite tools ipv6"
 
 DEPEND=">=dev-lang/perl-5.8.2-r1
-    virtual/perl-MIME-Base64
-    >=virtual/perl-PodParser-1.32
-    virtual/perl-Storable
-    virtual/perl-Time-HiRes
-    >=dev-perl/HTML-Parser-3.43
-    >=dev-perl/Net-DNS-0.53
-    dev-perl/Digest-SHA1
-    dev-perl/libwww-perl
-    >=virtual/perl-Archive-Tar-1.26
-    app-crypt/gnupg
-    >=virtual/perl-IO-Zlib-1.04
-    >=dev-util/re2c-0.12.0
-    ssl? (
-        dev-perl/IO-Socket-SSL
-        dev-libs/openssl
-    )
-    berkdb? (
-        virtual/perl-DB_File
-    )
-    ldap? ( dev-perl/perl-ldap )
-    mysql? (
-        dev-perl/DBI
-        dev-perl/DBD-mysql
-    )
-    postgres? (
-        dev-perl/DBI
-        dev-perl/DBD-Pg
-    )
-    sqlite? (
-        dev-perl/DBI
-        dev-perl/DBD-SQLite
-    )
-
-    ipv6? (
-        dev-perl/IO-Socket-INET6
-    )"
+	virtual/perl-MIME-Base64
+	>=virtual/perl-PodParser-1.32
+	virtual/perl-Storable
+	virtual/perl-Time-HiRes
+	>=dev-perl/HTML-Parser-3.43
+	>=dev-perl/Net-DNS-0.53
+	dev-perl/Digest-SHA1
+	dev-perl/libwww-perl
+	>=virtual/perl-Archive-Tar-1.26
+	app-crypt/gnupg
+	>=virtual/perl-IO-Zlib-1.04
+	>=dev-util/re2c-0.12.0
+	ssl? (
+		dev-perl/IO-Socket-SSL
+		dev-libs/openssl
+	)
+	berkdb? (
+		virtual/perl-DB_File
+	)
+	ldap? ( dev-perl/perl-ldap )
+	mysql? (
+		dev-perl/DBI
+		dev-perl/DBD-mysql
+	)
+	postgres? (
+		dev-perl/DBI
+		dev-perl/DBD-Pg
+	)
+	sqlite? (
+		dev-perl/DBI
+		dev-perl/DBD-SQLite
+	)
+	ipv6? (
+		dev-perl/IO-Socket-INET6
+	)"
 RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}/${PN}-3.2.5-DESTDIR.patch" )
 
 src_configure() {
-    # - Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
-    #   (just to be sure, nobody knows how it could happen in the first place).
-    myconf="SYSCONFDIR=/etc DATADIR=/usr/share/spamassassin"
-
-    # If ssl is enabled, spamc can be built with ssl support
-    if use ssl; then
-        myconf="${myconf} ENABLE_SSL=yes"
-    else
-        myconf="${myconf} ENABLE_SSL=no"
-    fi
-
-    # Set the path to the Perl executable explictly.  This will be used to
-    # create the initial sharpbang line in the scripts and might cause
-    # a versioned app name end in there, see
-    # <http://bugs.gentoo.org/show_bug.cgi?id=62276>
-    myconf="${myconf} PERL_BIN=/usr/bin/perl"
-
-    # If you are going to enable taint mode, make sure that the bug where
-    # spamd doesn't start when the PATH contains . is addressed, and make
-    # sure you deal with versions of razor <2.36-r1 not being taint-safe.
-    # <http://bugzilla.spamassassin.org/show_bug.cgi?id=2511> and
-    # <http://spamassassin.org/released/Razor2.patch>.
-    myconf="${myconf} PERL_TAINT=no"
-
-    # No settings needed for 'make all'.
-    mymake=""
-
-    # Neither for 'make install'.
-    myinst=""
-
-    # Add Gentoo tag to make it easier for the upstream devs to spot
-    # possible modifications or patches.
-    version_tag="g${PV:6}${PR}"
-    version_str="${PV//_/-}-${version_tag}"
-
-    # Create the Gentoo config file before Makefile.PL is called so it
-    # is copied later on.
-    echo "version_tag ${version_tag}" > rules/11_gentoo.cf
-
-    # Setting the following env var ensures that no questions are asked.
-    export PERL_MM_USE_DEFAULT=1
-    perl-module_src_prep
+	# - Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
+	#	(just to be sure, nobody knows how it could happen in the first place).
+	myconf="SYSCONFDIR=/etc DATADIR=/usr/share/spamassassin"
+
+	# If ssl is enabled, spamc can be built with ssl support
+	if use ssl; then
+		myconf="${myconf} ENABLE_SSL=yes"
+	else
+		myconf="${myconf} ENABLE_SSL=no"
+	fi
+
+	# Set the path to the Perl executable explictly.  This will be used to
+	# create the initial sharpbang line in the scripts and might cause
+	# a versioned app name end in there, see
+	# <http://bugs.gentoo.org/show_bug.cgi?id=62276>
+	myconf="${myconf} PERL_BIN=/usr/bin/perl"
+
+	# If you are going to enable taint mode, make sure that the bug where
+	# spamd doesn't start when the PATH contains . is addressed, and make
+	# sure you deal with versions of razor <2.36-r1 not being taint-safe.
+	# <http://bugzilla.spamassassin.org/show_bug.cgi?id=2511> and
+	# <http://spamassassin.org/released/Razor2.patch>.
+	myconf="${myconf} PERL_TAINT=no"
+
+	# Add Gentoo tag to make it easier for the upstream devs to spot
+	# possible modifications or patches.
+	version_tag="g${PV:6}${PR}"
+	version_str="${PV//_/-}-${version_tag}"
+
+	# Create the Gentoo config file before Makefile.PL is called so it
+	# is copied later on.
+	echo "version_tag ${version_tag}" > rules/11_gentoo.cf
+
+	# Setting the following env var ensures that no questions are asked.
+	perl-module_src_configure
 }
 
 src_compile() {
-    # Run the autoconf stuff now, just to make the build sequence look more
-    # familiar to the user :)  Plus feeding the VERSION_STRING skips some
-    # calls to Perl.
-    make spamc/Makefile VERSION_STRING="${version_str}"
-
-    # Now compile all the stuff selected.
-    perl-module_src_compile
-    
-    if use qmail; then
-        make spamc/qmail-spamc || die "building qmail-spamc failed"
-    fi
-
-    # Remove the MANIFEST files as they aren't docu files
-    rm -f MANIFEST*
-
-    if use doc; then 
-        make text_html_doc || die
-    fi
-}
+	# Run the autoconf stuff now, just to make the build sequence look more
+	# familiar to the user :)  Plus feeding the VERSION_STRING skips some
+	# calls to Perl.
+	make spamc/Makefile VERSION_STRING="${version_str}"
+
+	# Now compile all the stuff selected.
+	perl-module_src_compile
 
-src_test() {
-    perl-module_src_test
+	if use qmail; then
+		make spamc/qmail-spamc || die "building qmail-spamc failed"
+	fi
+
+	if use doc; then
+		make text_html_doc || die
+	fi
 }
 
 src_install () {
-    perl-module_src_install
-
-    # Create the stub dir used by sa-update and friends
-    dodir /var/lib/spamassassin
-
-    # Move spamd to sbin where it belongs.
-    dodir /usr/sbin
-    mv "${D}"/usr/bin/spamd "${D}"/usr/sbin/spamd  || die
-
-    if use qmail; then
-        dobin spamc/qmail-spamc
-    fi
-    
-    dosym /etc/mail/spamassassin /etc/spamassassin
-
-    # Disable plugin by default
-    sed -i -e 's/^loadplugin/\#loadplugin/g' "${D}"/etc/mail/spamassassin/init.pre
-
-    # Add the init and config scripts.
-    newinitd "${FILESDIR}"/3.0.0-spamd.init spamd || die
-    newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd || die
-
-    if use doc; then
-        dodoc NOTICE TRADEMARK CREDITS INSTALL.VMS UPGRADE USAGE \
-        sql/README.bayes sql/README.awl procmailrc.example sample-nonspam.txt \
-        sample-spam.txt spamassassin.spec spamd/PROTOCOL spamd/README.vpopmail \
-        spamd-apache2/README.apache || die 
-        
-
-        # Rename some docu files so they don't clash with others
-        newdoc spamd/README README.spamd || die
-        newdoc sql/README README.sql || die
-        newdoc ldap/README README.ldap || die 
-
-        dohtml doc/*.html || die 
-        docinto sql
-        dodoc sql/*.sql || die 
-        
-        if use qmail; then 
-            dodoc spamc/README.qmail || die 
-        fi
-    fi
-
-    # Install provided tools. See bug 108168
-    if use tools; then
-        docinto tools
-        dodoc tools/* || die "dodoc failed"
-    fi
-
-    cp "${FILESDIR}"/secrets.cf "${D}"/etc/mail/spamassassin/secrets.cf.example || die
-    fperms 0400 /etc/mail/spamassassin/secrets.cf.example
-
-    cat <<-EOF > "${T}/local.cf.example"
+	perl-module_src_install
+
+	# Create the stub dir used by sa-update and friends
+	dodir /var/lib/spamassassin
+
+	# Move spamd to sbin where it belongs.
+	dodir /usr/sbin
+	mv "${D}"/usr/bin/spamd "${D}"/usr/sbin/spamd  || die
+
+	if use qmail; then
+		dobin spamc/qmail-spamc
+	fi
+
+	dosym /etc/mail/spamassassin /etc/spamassassin
+
+	# Disable plugin by default
+	sed -i -e 's/^loadplugin/\#loadplugin/g' "${D}"/etc/mail/spamassassin/init.pre
+
+	# Add the init and config scripts.
+	newinitd "${FILESDIR}"/3.0.0-spamd.init spamd || die
+	newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd || die
+
+	if use doc; then
+		dodoc NOTICE TRADEMARK CREDITS INSTALL.VMS UPGRADE USAGE \
+		sql/README.bayes sql/README.awl procmailrc.example sample-nonspam.txt \
+		sample-spam.txt spamassassin.spec spamd/PROTOCOL spamd/README.vpopmail \
+		spamd-apache2/README.apache || die
+
+		# Rename some docu files so they don't clash with others
+		newdoc spamd/README README.spamd || die
+		newdoc sql/README README.sql || die
+		newdoc ldap/README README.ldap || die
+
+		dohtml doc/*.html || die
+		docinto sql
+		dodoc sql/*.sql || die
+
+		if use qmail; then
+			dodoc spamc/README.qmail || die
+		fi
+	fi
+
+	# Install provided tools. See bug 108168
+	if use tools; then
+		docinto tools
+		dodoc tools/* || die "dodoc failed"
+	fi
+
+	cp "${FILESDIR}"/secrets.cf "${D}"/etc/mail/spamassassin/secrets.cf.example || die
+	fperms 0400 /etc/mail/spamassassin/secrets.cf.example
+
+	cat <<EOF > "${T}/local.cf.example"
 # Sensitive data, such as database connection info, should be stored in
 # /etc/mail/spamassassin/secrets.cf with appropriate permissions
 EOF
 
-    insinto /etc/mail/spamassassin/
-    doins "${T}/local.cf.example" || die
+	insinto /etc/mail/spamassassin/
+	doins "${T}/local.cf.example" || die
 }
 
 pkg_postinst() {
-    perl-module_pkg_postinst
-    elog "If you plan on using the -u flag to spamd, please read the notes"
-    elog "in /etc/conf.d/spamd regarding the location of the pid file."
-    elog "If you build ${PN} with optional dependancy support,"
-    elog "you can enable them in /etc/mail/spamassassin/init.pre"
+	perl-module_pkg_postinst
+	elog "If you plan on using the -u flag to spamd, please read the notes"
+	elog "in /etc/conf.d/spamd regarding the location of the pid file."
+	elog "If you build ${PN} with optional dependancy support,"
+	elog "you can enable them in /etc/mail/spamassassin/init.pre"
 }