Version bump

Package-Manager: portage-2.1

5 files changed, 68 insertions, 39 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/Manifest b/mail-filter/popfile/Manifest
index 23216e53f8e5..be7209412010 100644
--- a/mail-filter/popfile/Manifest
+++ b/mail-filter/popfile/Manifest
@@ -1,9 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX popfile 716 RMD160 fae21408399cfa1d27e46040dcf467d59192eb0b SHA1 041cd696dae0f819fc956f589465d6de3eb987f3 SHA256 5d90bc7b8e5330721256d7438e26a515c0d2bcdf52066d42d60c40bd475fd0e1
+MD5 ee47532b94cbd81d2be1a84b9dd59e9d files/popfile 716
+RMD160 fae21408399cfa1d27e46040dcf467d59192eb0b files/popfile 716
+SHA256 5d90bc7b8e5330721256d7438e26a515c0d2bcdf52066d42d60c40bd475fd0e1 files/popfile 716
 DIST popfile-0.20.1.zip 1912427
 DIST popfile-0.21.1.zip 1504449
-DIST popfile-0.22.4.zip 1644941
+DIST popfile-0.22.4.zip 1644941 RMD160 0a4f2caf7127bc60d63c6c7f85a7960b6c1aacfb SHA1 e2529f676940afc78f6034fbb83fe61d0cfaa5f8 SHA256 22bde2f4271eccce4c572436f15b13caa6547f442fd512ce04d89c43c783a906
 EBUILD popfile-0.20.1.ebuild 1112 RMD160 831d322439ecf1b0a22707cde4198798f9841a48 SHA1 96e74400b7af9f7eda8d958707404f77a0ff70d5 SHA256 d3514376170d6f81d32717ff6b35dfbd2c86198713fe74eb3bb9f7f77b3e6714
 MD5 5f2ed8081f1271c691e42a675bf4f355 popfile-0.20.1.ebuild 1112
 RMD160 831d322439ecf1b0a22707cde4198798f9841a48 popfile-0.20.1.ebuild 1112
@@ -12,14 +13,14 @@ EBUILD popfile-0.21.1.ebuild 1159 RMD160 9e9cd34a09ddea6c87c5c8f7cb2b319681ceab7
 MD5 f546b38b970663de21949885040430eb popfile-0.21.1.ebuild 1159
 RMD160 9e9cd34a09ddea6c87c5c8f7cb2b319681ceab75 popfile-0.21.1.ebuild 1159
 SHA256 28fe710f0a1289dd2443915edc047e654946bd2a04a5684347ea1f783ff7a3e6 popfile-0.21.1.ebuild 1159
-EBUILD popfile-0.22.4.ebuild 1618 RMD160 cd838f98604703a86853f8b16f2143476707dcd1 SHA1 a960f27123eecd47f305574d9a22ab77d9badd35 SHA256 97ad731021cd08a5d9b94ae64839d090d89703a0a7df37ccd25b700e294b4f23
-MD5 c0378daa80827176c376559eb7e159b8 popfile-0.22.4.ebuild 1618
-RMD160 cd838f98604703a86853f8b16f2143476707dcd1 popfile-0.22.4.ebuild 1618
-SHA256 97ad731021cd08a5d9b94ae64839d090d89703a0a7df37ccd25b700e294b4f23 popfile-0.22.4.ebuild 1618
-MISC ChangeLog 2471 RMD160 ee0eb098ab8289886dbc1374ab57503a94b16cc7 SHA1 bef1b25b15f9f586354c0257188622df4bc89714 SHA256 caad7ffab3dbef7bfaadf535e1c386b25c64ea55f8d3049a8343ead346b13829
-MD5 caa023d656800214659f8f9b63e1bd5c ChangeLog 2471
-RMD160 ee0eb098ab8289886dbc1374ab57503a94b16cc7 ChangeLog 2471
-SHA256 caad7ffab3dbef7bfaadf535e1c386b25c64ea55f8d3049a8343ead346b13829 ChangeLog 2471
+EBUILD popfile-0.22.4.ebuild 1420 RMD160 7273c1053be813198f8e1c5d3d0e7f42653c52ff SHA1 c55da743e7a1df13f1c37f156572dddb1be850e2 SHA256 d0986c76c07f313535878622385d13fc7a2340da0d81cb7f44e51cbcb46b1124
+MD5 829a624694292ba17c6e5cc1ffd65f9a popfile-0.22.4.ebuild 1420
+RMD160 7273c1053be813198f8e1c5d3d0e7f42653c52ff popfile-0.22.4.ebuild 1420
+SHA256 d0986c76c07f313535878622385d13fc7a2340da0d81cb7f44e51cbcb46b1124 popfile-0.22.4.ebuild 1420
+MISC ChangeLog 2764 RMD160 cdbb1de82d019817b882d7b3d2abf496f2d7bf16 SHA1 e52e4a36dbf6234cffa066d31df44c97b0e0b834 SHA256 12305a2939160eee511aa03705136d64dc1ffc3bc27d7f2910c8c94a31aa32bf
+MD5 a75eafdccd4ede9575286a706104bd4b ChangeLog 2764
+RMD160 cdbb1de82d019817b882d7b3d2abf496f2d7bf16 ChangeLog 2764
+SHA256 12305a2939160eee511aa03705136d64dc1ffc3bc27d7f2910c8c94a31aa32bf ChangeLog 2764
 MISC metadata.xml 293 RMD160 0457f821419feed48f295a2c0af32577aad3f3d7 SHA1 a038025c1770024522abbc9399143e4be921178c SHA256 5be5d26a5686c9a187b7c1af3b8a4158eb4f69a64529553b0591593a346ee662
 MD5 7ffa9bf1b757cbd93afb8c746fcd24e6 metadata.xml 293
 RMD160 0457f821419feed48f295a2c0af32577aad3f3d7 metadata.xml 293
@@ -30,13 +31,6 @@ SHA256 c351d61da150559e06a0c03a2ff9eb87edc925155db568e85b57d8792815f614 files/di
 MD5 d9d12773e8397a1960eab275e3bcc8c4 files/digest-popfile-0.21.1 64
 RMD160 5f81ebb77188d9fc4a4ec994cba35cb379af90b4 files/digest-popfile-0.21.1 64
 SHA256 710826db0e7b61352b6aa19771d08a980546f4e19475d0db2620ac9739734031 files/digest-popfile-0.21.1 64
-MD5 353bfd0e333f1ccccfeaee7231c0ed03 files/digest-popfile-0.22.4 64
-RMD160 75fbe68979291a51336e9764ca6efeecb55c19cb files/digest-popfile-0.22.4 64
-SHA256 3feb65c669a7fb50f559ef0af719f36e5c26f87a1864c48c59c3aee692568c4d files/digest-popfile-0.22.4 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEgksUCRZPokWLroQRAo5sAJ0bd8N+93MA8m0sqDiYRCmIzVs3fQCgyM/j
-LgGfW7DGn7/7UcpuUAdt0hg=
-=DLiG
------END PGP SIGNATURE-----
+MD5 490a7b15313717238ca6b043f7fc6eaf files/digest-popfile-0.22.4 238
+RMD160 67083ba35992fbd69814508821ee87572e1778dc files/digest-popfile-0.22.4 238
+SHA256 8751df55c36199618b2eff7a20f7b0b7dd09c3024c904ee31a93d20652cd8a08 files/digest-popfile-0.22.4 238
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"
 }