Version bump

(Portage version: 2.1)

4 files changed, 52 insertions, 17 deletions

diff --git a/mail-filter/popfile/ChangeLog b/mail-filter/popfile/ChangeLog
index c2b9bd03877f..d37d9e7a29e7 100644
--- a/mail-filter/popfile/ChangeLog
+++ b/mail-filter/popfile/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-filter/popfile
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/popfile/ChangeLog,v 1.11 2006/06/04 02:53:02 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/popfile/ChangeLog,v 1.12 2006/06/10 23:20:34 stuart Exp $
+
+  10 Jun 2006; Stuart Herbert <stuart@gentoo.org> +files/popfile,
+  popfile-0.22.4.ebuild:
+  Dropped ppc keyword; DEPs are not keyworded for ppc
+
+  10 Jun 2006; Stuart Herbert <stuart@gentoo.org> ChangeLog:
+  Added /usr/bin/popfile wrapper script; thanks to Mark Loeser for the 
+  suggestion.
 
   04 Jun 2006; Mark Loeser <halcy0n@gentoo.org> popfile-0.20.1.ebuild:
   Pull x86 keyword
diff --git a/mail-filter/popfile/files/digest-popfile-0.22.4 b/mail-filter/popfile/files/digest-popfile-0.22.4
index e5a94b6122bf..a08f44327846 100644
--- a/mail-filter/popfile/files/digest-popfile-0.22.4
+++ b/mail-filter/popfile/files/digest-popfile-0.22.4
@@ -1 +1,3 @@
 MD5 3261686efd19835e131ac9fe0b63346d popfile-0.22.4.zip 1644941
+RMD160 0a4f2caf7127bc60d63c6c7f85a7960b6c1aacfb popfile-0.22.4.zip 1644941
+SHA256 22bde2f4271eccce4c572436f15b13caa6547f442fd512ce04d89c43c783a906 popfile-0.22.4.zip 1644941
diff --git a/mail-filter/popfile/files/popfile b/mail-filter/popfile/files/popfile
new file mode 100644
index 000000000000..1c424bc1317f
--- /dev/null
+++ b/mail-filter/popfile/files/popfile
@@ -0,0 +1,33 @@
+#!/bin/bash
+#
+# /usr/bin/popfile
+#		Shell script wrapper around the popfile perl script
+#
+# Author	Stuart Herbert
+#		(stuart@gentoo.org)
+#
+# Copyright	Released into the public domain
+#
+# ------------------------------------------------------------------------
+
+POPFILE_DIR=/usr/share/popfile
+POPFILE_PL=popfile.pl
+
+if [[ `id -u` != 0 ]] ; then
+	echo "*** error: You must be root to run popfile" >&2
+	exit 1
+fi
+
+if [[ ! -d $POPFILE_DIR ]] ; then
+	echo "*** error: Directory $POPFILE_DIR does not exist" >&2
+	echo "***        Is popfile installed?"
+	exit 1
+fi
+
+if [[ ! -e $POPFILE_DIR/$POPFILE_PL ]] ; then
+	echo "*** error: popfile.pl is missing or not executable" > &2
+	exit 1
+fi
+
+cd $POPFILE_DIR
+exec ./$POPFILE_PL
diff --git a/mail-filter/popfile/popfile-0.22.4.ebuild b/mail-filter/popfile/popfile-0.22.4.ebuild
index c7d3de734a1e..1d9dba0b1bd0 100644
--- a/mail-filter/popfile/popfile-0.22.4.ebuild
+++ b/mail-filter/popfile/popfile-0.22.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/popfile/popfile-0.22.4.ebuild,v 1.1 2006/05/31 07:12:37 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/popfile/popfile-0.22.4.ebuild,v 1.2 2006/06/10 23:20:34 stuart Exp $
 
 IUSE="cjk ipv6 mysql ssl xmlrpc"
 
@@ -11,15 +11,12 @@ SRC_URI="mirror://sourceforge/popfile/${P}.zip"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86"
 
 DEPEND=">=dev-lang/perl-5.7.3
 	virtual/perl-Digest-MD5
 	virtual/perl-MIME-Base64
-	|| (
-		<=dev-perl/DBD-SQLite-0.31
-		dev-perl/DBD-SQLite2
-		)
+	dev-perl/DBD-SQLite2
 	dev-perl/HTML-Tagset
 	dev-perl/HTML-Template
 	dev-perl/TimeDate
@@ -54,25 +51,20 @@ src_compile() {
 
 src_install() {
 	dodir /usr/share/popfile
-	dodir /var/lib/popfile
-	dodir /var/log/popfile
 
-	dodoc license v*.change
+	dodoc v*.change
 	tar -cf - manual | ( cd ${D}/usr/share/doc/${P} && tar -xf - )
 
 	find . -type f -print | xargs chmod 600
 	find . -type d -print | xargs chmod 700
 	tar -cf - * | ( cd ${D}/usr/share/popfile && tar -xf - )
 
-	insinto /var/lib/popfile
-	doins stopwords
-
 	fperms 0755 /usr/share/popfile/{popfile,bayes,insert,pipe}.pl
+
+	dosbin ${FILESDIR}/popfile
+	fperms 0755 /usr/sbin/popfile
 }
 
 pkg_postinst () {
-	einfo "To start popfile, run /usr/share/popfile/popfile.pl"
-	einfo
-	einfo "A /etc/init.d script will be added once popfile can support"
-	einfo "multiple users"
+	einfo "To start popfile, run /usr/sbin/popfile"
 }