Version bump, closes #68579. Install contrib/ stuff.

6 files changed, 49 insertions, 20 deletions

diff --git a/mail-filter/spamprobe/ChangeLog b/mail-filter/spamprobe/ChangeLog
index 2e2fa30b1507..460a760c2d0d 100644
--- a/mail-filter/spamprobe/ChangeLog
+++ b/mail-filter/spamprobe/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-filter/spamprobe
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamprobe/ChangeLog,v 1.3 2004/10/18 15:22:34 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamprobe/ChangeLog,v 1.4 2004/10/22 23:51:40 ticho Exp $
+
+*spamprobe-1.0 (23 Oct 2004)
+
+  23 Oct 2004; Andrej Kacian <ticho@gentoo.org> metadata.xml,
+  spamprobe-0.9h.ebuild, +spamprobe-1.0.ebuild:
+  Version bump. Closes #68579, reported by Alexander Schneider
+  <A.Schneider@magicspace.de>. Tidy up the ebuild a bit. Install contrib/
+  stuff from package into /usr/share/spamprobe.
 
   18 Oct 2004; Andrej Kacian <ticho@gentoo.org> spamprobe-0.9h.ebuild:
   Changed SRC_URI of the db4 patch to mirror://gentoo/.
diff --git a/mail-filter/spamprobe/Manifest b/mail-filter/spamprobe/Manifest
index 2a261b1b1d09..f96759e9462e 100644
--- a/mail-filter/spamprobe/Manifest
+++ b/mail-filter/spamprobe/Manifest
@@ -1,14 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 8beb020a5d0fd20c3b4a0b3d12b4e5ea x.diff 342
 MD5 962fcb3db7b3c48da128213ee36ad425 ChangeLog 664
-MD5 3f61d9f697e7b7352880a66d156f26ca metadata.xml 222
+MD5 4e31a4ea26576bc9b6697045097172e9 spamprobe-1.0.ebuild 636
+MD5 7a63986c893466830ff3fb3aad7f89fa metadata.xml 251
 MD5 c27a8a52f6d96ddc9ce4bb4b109620b1 spamprobe-0.9h.ebuild 940
 MD5 22dc99486764b555295bf2a75914f81b files/digest-spamprobe-0.9h 136
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBc9/D10xuJSrg3/sRAq42AJsFAX8g/XU9/OmP/U10A+EbG13BvQCeO0kJ
-yDoz3jwIrbWAgXFIRV6CehI=
-=jS6R
------END PGP SIGNATURE-----
+MD5 bd85f2fc38fcdfeefc4b5a9d6280dd22 files/digest-spamprobe-1.0 65
diff --git a/mail-filter/spamprobe/files/digest-spamprobe-1.0 b/mail-filter/spamprobe/files/digest-spamprobe-1.0
new file mode 100644
index 000000000000..ee846ded1cc7
--- /dev/null
+++ b/mail-filter/spamprobe/files/digest-spamprobe-1.0
@@ -0,0 +1 @@
+MD5 b89ea078e9f46926d2ae7ba2e8dfbfea spamprobe-1.0.tar.gz 166156
diff --git a/mail-filter/spamprobe/metadata.xml b/mail-filter/spamprobe/metadata.xml
index 93df6b622623..3a9a0002fd14 100644
--- a/mail-filter/spamprobe/metadata.xml
+++ b/mail-filter/spamprobe/metadata.xml
@@ -4,5 +4,6 @@
 <herd>net-mail</herd>
 <maintainer>
   <email>ticho@gentoo.org</email>
+  <name>Andrej Kacian</name>
 </maintainer>
 </pkgmetadata>
diff --git a/mail-filter/spamprobe/spamprobe-0.9h.ebuild b/mail-filter/spamprobe/spamprobe-0.9h.ebuild
index b676c5189321..67b324ad34d1 100644
--- a/mail-filter/spamprobe/spamprobe-0.9h.ebuild
+++ b/mail-filter/spamprobe/spamprobe-0.9h.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/spamprobe/spamprobe-0.9h.ebuild,v 1.3 2004/10/18 15:22:34 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamprobe/spamprobe-0.9h.ebuild,v 1.4 2004/10/22 23:51:40 ticho Exp $
 
 inherit eutils
 
@@ -22,16 +22,14 @@ src_compile() {
 	cd ${S}
 
 	# patch for db4 detection and their respective versioned symbols
-	epatch ${WORKDIR}/spamprobe-0.9h-db4.patch
-	autoconf || die
+	epatch ${WORKDIR}/spamprobe-0.9h-db4.patch || die
 
-	econf || die
-
-	emake || die "compile problem"
+	autoconf || die "autoconf failed"
+	econf || die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install() {
 	dodoc README.txt ChangeLog LICENSE.txt
-
-	einstall || die
+	make DESTDIR=${D} install || die "make install failed"
 }
diff --git a/mail-filter/spamprobe/spamprobe-1.0.ebuild b/mail-filter/spamprobe/spamprobe-1.0.ebuild
new file mode 100644
index 000000000000..b7e90cdbb343
--- /dev/null
+++ b/mail-filter/spamprobe/spamprobe-1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamprobe/spamprobe-1.0.ebuild,v 1.1 2004/10/22 23:51:40 ticho Exp $
+
+DESCRIPTION="Fast, intelligent, automatic spam detector using Paul Graham style Bayesian analysis of word counts in spam and non-spam emails."
+HOMEPAGE="http://spamprobe.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="QPL"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+
+IUSE="berkdb"
+DEPEND="berkdb? ( >=sys-libs/db-3.2 )
+	sys-devel/autoconf"
+
+src_compile() {
+	econf || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	dodoc README.txt ChangeLog LICENSE.txt
+	make DESTDIR=${D} install || die
+
+	insinto /usr/share/${PN}/contrib
+	doins contrib/*
+}