bug 177224

Package-Manager: portage-2.1.2.9

4 files changed, 218 insertions, 5 deletions

diff --git a/mail-filter/spamassassin-fuzzyocr/ChangeLog b/mail-filter/spamassassin-fuzzyocr/ChangeLog
index e08020cb7540..77b6ebf6a28a 100644
--- a/mail-filter/spamassassin-fuzzyocr/ChangeLog
+++ b/mail-filter/spamassassin-fuzzyocr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/spamassassin-fuzzyocr
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin-fuzzyocr/ChangeLog,v 1.11 2007/06/03 16:25:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin-fuzzyocr/ChangeLog,v 1.12 2007/06/18 22:59:02 mcummings Exp $
+
+*spamassassin-fuzzyocr-3.5.1-r1 (18 Jun 2007)
+
+  18 Jun 2007; Michael Cummings <mcummings@gentoo.org>
+  +spamassassin-fuzzyocr-3.5.1-r1.ebuild:
+  bug 177224
 
   03 Jun 2007; Raúl Porcel <armin76@gentoo.org>
   spamassassin-fuzzyocr-3.5.1.ebuild:
diff --git a/mail-filter/spamassassin-fuzzyocr/Manifest b/mail-filter/spamassassin-fuzzyocr/Manifest
index a2a4df05013b..e75f67e7989e 100644
--- a/mail-filter/spamassassin-fuzzyocr/Manifest
+++ b/mail-filter/spamassassin-fuzzyocr/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX disablegocr.patch 574 RMD160 78e1fb95a5758f7b4c0a9c9d40f4d4d9e1a04dbb SHA1 c6ffbdaaa1e794e3e94118501704978d1876b743 SHA256 71914e653efba7688f2edeb396c5ff99d98e42d3541190095041d17549f5812b
 MD5 65f6cb9656c80bf86c2a53d74d1b77b9 files/disablegocr.patch 574
 RMD160 78e1fb95a5758f7b4c0a9c9d40f4d4d9e1a04dbb files/disablegocr.patch 574
@@ -20,14 +23,18 @@ EBUILD spamassassin-fuzzyocr-2.3b.ebuild 1964 RMD160 b24c00815f5e17e0213eb00bedd
 MD5 abb9ad5d188954d662a580766959e61d spamassassin-fuzzyocr-2.3b.ebuild 1964
 RMD160 b24c00815f5e17e0213eb00bedd211c60491a04c spamassassin-fuzzyocr-2.3b.ebuild 1964
 SHA256 5dee0bb04e117ca7b43b8ff48ba8ef7974849430198f61e20f343b688965c8ee spamassassin-fuzzyocr-2.3b.ebuild 1964
+EBUILD spamassassin-fuzzyocr-3.5.1-r1.ebuild 5389 RMD160 f1f645702c1b1ac0c1f5fc4ed02291357b70293a SHA1 256d41fde4ea3f9941d4b0ce4d088db2c2f33314 SHA256 fa0b8cb659d1325ab0891d0b5aa989e1f8ae5efce09261836856c0824ca38a0a
+MD5 b565f2cb22ed32adc7ef270ac335db93 spamassassin-fuzzyocr-3.5.1-r1.ebuild 5389
+RMD160 f1f645702c1b1ac0c1f5fc4ed02291357b70293a spamassassin-fuzzyocr-3.5.1-r1.ebuild 5389
+SHA256 fa0b8cb659d1325ab0891d0b5aa989e1f8ae5efce09261836856c0824ca38a0a spamassassin-fuzzyocr-3.5.1-r1.ebuild 5389
 EBUILD spamassassin-fuzzyocr-3.5.1.ebuild 5332 RMD160 66f565b07292e6dd5fd5ae81c4c078aecf403915 SHA1 8259b5b1db5e92c5eab114fe3c9bba71bd0dc817 SHA256 3d8388c21a86ddfcce0490634b82a53ae771be4b157749fe12688a5301a18a07
 MD5 58500cc87f10f70e0776effcfc09c4aa spamassassin-fuzzyocr-3.5.1.ebuild 5332
 RMD160 66f565b07292e6dd5fd5ae81c4c078aecf403915 spamassassin-fuzzyocr-3.5.1.ebuild 5332
 SHA256 3d8388c21a86ddfcce0490634b82a53ae771be4b157749fe12688a5301a18a07 spamassassin-fuzzyocr-3.5.1.ebuild 5332
-MISC ChangeLog 1784 RMD160 6c85fb7de75023eaf37da0d3a717419751fd7423 SHA1 e35869c86480b2ec935392379944b005d8a6aabf SHA256 60485ef346c23287b48622425644a888539e1a80aa098c20add7ad3c090ea4a4
-MD5 5dd48c55bbc6f9f7333959bd7efe6e3f ChangeLog 1784
-RMD160 6c85fb7de75023eaf37da0d3a717419751fd7423 ChangeLog 1784
-SHA256 60485ef346c23287b48622425644a888539e1a80aa098c20add7ad3c090ea4a4 ChangeLog 1784
+MISC ChangeLog 1944 RMD160 d77ff62a36650c5aba9bdd075e68999a6b834e87 SHA1 72a806b1fe516d8befcc87955e56e99b1b52d4e7 SHA256 2a6393b01027b6ec237312d1aef33e23185e7b8851be7f736d5b8019cc9a12f7
+MD5 5645acf72a06ee6db1f0d1b67a905b42 ChangeLog 1944
+RMD160 d77ff62a36650c5aba9bdd075e68999a6b834e87 ChangeLog 1944
+SHA256 2a6393b01027b6ec237312d1aef33e23185e7b8851be7f736d5b8019cc9a12f7 ChangeLog 1944
 MISC metadata.xml 724 RMD160 ca8bdf48e7e3f1fe34a9df8cf1df070a977d3480 SHA1 b6778bbc7c0d77b4556306d0c1c85b7b91106b22 SHA256 39e916df5be09516aed189bc9a8fcc3f16623699f33c35d364e9a49c71f4c31a
 MD5 46baf638cb6673317723526fbd95c442 metadata.xml 724
 RMD160 ca8bdf48e7e3f1fe34a9df8cf1df070a977d3480 metadata.xml 724
@@ -38,3 +45,13 @@ SHA256 8f570404c99302a9e5db522fd3262907566e2ef0ab6ede71ed582dfa52ec1252 files/di
 MD5 ad103c14f446452ac1f8779370778a9f files/digest-spamassassin-fuzzyocr-3.5.1 262
 RMD160 b4df515c8e22068383dbe6625ddb10cd79ca3351 files/digest-spamassassin-fuzzyocr-3.5.1 262
 SHA256 6b5b30d92173d88f0e20796b8f562f1bbd29c83cab2af93be047174ab96a2a47 files/digest-spamassassin-fuzzyocr-3.5.1 262
+MD5 ad103c14f446452ac1f8779370778a9f files/digest-spamassassin-fuzzyocr-3.5.1-r1 262
+RMD160 b4df515c8e22068383dbe6625ddb10cd79ca3351 files/digest-spamassassin-fuzzyocr-3.5.1-r1 262
+SHA256 6b5b30d92173d88f0e20796b8f562f1bbd29c83cab2af93be047174ab96a2a47 files/digest-spamassassin-fuzzyocr-3.5.1-r1 262
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGdw47tG5z4I8BtQoRAmq6AJwK1DSIzl6BCEDNYp+9PiyWIX7+mwCfTEgE
+3yceq7s7WctUzlt1rJhexVE=
+=KNvR
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/spamassassin-fuzzyocr/files/digest-spamassassin-fuzzyocr-3.5.1-r1 b/mail-filter/spamassassin-fuzzyocr/files/digest-spamassassin-fuzzyocr-3.5.1-r1
new file mode 100644
index 000000000000..c93290a777c9
--- /dev/null
+++ b/mail-filter/spamassassin-fuzzyocr/files/digest-spamassassin-fuzzyocr-3.5.1-r1
@@ -0,0 +1,3 @@
+MD5 14e04c4768f57a39a4953a837766f772 fuzzyocr-3.5.1-devel.tar.gz 124418
+RMD160 109f3ab8a6ecda5f2e0d737233faf54122f6d036 fuzzyocr-3.5.1-devel.tar.gz 124418
+SHA256 75cf2c40824a0d151c495c687f33d76f09ccc01082407ba8bb7eeee7e7b16059 fuzzyocr-3.5.1-devel.tar.gz 124418
diff --git a/mail-filter/spamassassin-fuzzyocr/spamassassin-fuzzyocr-3.5.1-r1.ebuild b/mail-filter/spamassassin-fuzzyocr/spamassassin-fuzzyocr-3.5.1-r1.ebuild
new file mode 100644
index 000000000000..3cf94cfa0a8b
--- /dev/null
+++ b/mail-filter/spamassassin-fuzzyocr/spamassassin-fuzzyocr-3.5.1-r1.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin-fuzzyocr/spamassassin-fuzzyocr-3.5.1-r1.ebuild,v 1.1 2007/06/18 22:59:02 mcummings Exp $
+
+inherit perl-module eutils
+
+MY_P="${P#spamassassin-}"
+
+DESCRIPTION="SpamAssassin plugin for performing Optical Character Recognition (OCR) on attached images"
+HOMEPAGE="http://fuzzyocr.own-hero.net/"
+SRC_URI="http://users.own-hero.net/~decoder/fuzzyocr/${MY_P}-devel.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+#KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="dbm gocr ocrad tesseract mysql logrotate amavis"
+
+DEPEND="dev-lang/perl
+		dev-perl/Tie-Cache
+		>=mail-filter/spamassassin-3.1.4"
+
+RDEPEND="${DEPEND}
+	gocr? 		( >=app-text/gocr-0.43 )
+	ocrad? 		( >=app-text/ocrad-0.14 )
+	tesseract? 	( app-text/tesseract )
+	mysql? 		( dev-perl/DBD-mysql dev-perl/DBI )
+	logrotate?	( app-admin/logrotate )
+	dbm?		( perl-core/DB_File dev-perl/MLDBM-Sync perl-core/Storable )
+	media-libs/netpbm
+	media-libs/giflib
+	dev-perl/String-Approx
+	perl-core/Time-HiRes
+	media-gfx/gifsicle"
+#	postgres?	( dev-perl/DBD-Pg )
+
+S="${WORKDIR}/${MY_P/fuzzyocr/FuzzyOcr}"
+
+pkg_setup() {
+	if ! use gocr && ! use ocrad && ! use tesseract ; then
+		eerror
+		eerror You did not specify an OCR engine. FuzzyOcr requires at least one
+		eerror OCR engine USE flag to be enabled. It is possible to enable all.
+		eerror
+		eerror The 3 OCR engines are: gocr ocrad tesseract
+		eerror Enable them in /etc/make.conf or /etc/portage/package.use
+		eerror
+		die "Configure failed"
+	fi
+
+	# create fuzzyocr group for logging and hashing
+	if use dbm || use logrotate ; then
+		use amavis || enewgroup fuzzyocr
+	fi
+}
+
+src_unpack() {
+		unpack ${A}
+		cd ${S}
+
+		# If no ocrad USE flag, remove it from Fuzzyocr.scansets / jni
+		use ocrad || epatch "${FILESDIR}"/disableocrad.patch
+
+		# If tesseract USE flag is set, enable it in Fuzzyocr.scansets /jni
+		use tesseract && epatch "${FILESDIR}"/enabletesseract.patch
+
+		# If gocr USE flag is unset, enable disable gocr in Fuzzyocr.scansets /jni
+		use gocr || epatch "${FILESDIR}"/disablegocr.patch
+
+		# Apply PgSQL patchset if USE postgres /juan
+		#use postgres && epatch "${FILESDIR}"/postgresql.patch
+}
+
+src_install() {
+		# called to get ${VENDOR_LIB}
+		perlinfo
+
+		local plugin_dir=${VENDOR_LIB}/Mail/SpamAssassin/Plugin
+
+		insinto ${plugin_dir}
+		doins FuzzyOcr.pm
+
+		# Replace location of .pm file in config
+		sed -ie "s:FuzzyOcr.pm:${plugin_dir}/FuzzyOcr.pm:" FuzzyOcr.cf
+
+		# Enable logfile if logrotate
+		if use logrotate ; then
+			sed -ie "s:^#focr_verbose 3:focr_verbose 3:" FuzzyOcr.cf
+			sed -ie "s:^#focr_logfile /tmp/FuzzyOcr.log:focr_logfile /var/log/FuzzyOcr.log:" FuzzyOcr.cf
+
+			# Create the logfile with correct permissions /jni
+			if [ ! -e /var/log/FuzzyOcr.log ]; then
+				insinto /var/log
+				newins /dev/null FuzzyOcr.log
+				if use amavis ;  then
+					fperms 600 /var/log/FuzzyOcr.log
+					fowners	amavis:amavis /var/log/FuzzyOcr.log
+				else
+					fperms 660 /var/log/FuzzyOcr.log
+					fowners root:fuzzyocr /var/log/FuzzyOcr.log
+				fi
+			fi
+
+			diropts ""
+			dodir /etc/logrotate.d
+			insopts -m0644
+			insinto /etc/logrotate.d
+			newins ${FILESDIR}/fuzzyocr.logrotate FuzzyOcr
+		fi
+
+		# Create needed dir for dbs and change FuzzyOcr.cf /jni
+		if use dbm ; then
+			dodir /var/lib/FuzzyOcr
+			keepdir /var/lib/FuzzyOcr
+			if use amavis ; then
+				fowners amavis:amavis /var/lib/FuzzyOcr
+				fperms 700 /var/lib/FuzzyOcr
+			else
+				fowners root:fuzzyocr /var/lib/FuzzyOcr
+				fperms 770 /var/lib/FuzzyOcr
+			fi
+
+			sed -ie "s:^#focr_digest_db /etc/mail/spamassassin/FuzzyOcr.hashdb:#focr_digest_db /var/lib/FuzzyOcr/FuzzyOcr.hashdb:" FuzzyOcr.cf
+			sed -ie "s:^#focr_db_hash /etc/mail/spamassassin/FuzzyOcr.db:#focr_db_hash /var/lib/FuzzyOcr/FuzzyOcr.db:" FuzzyOcr.cf
+			sed -ie "s:^#focr_db_safe /etc/mail/spamassassin/FuzzyOcr.safe.db:#focr_db_safe /var/lib/FuzzyOcr/FuzzyOcr.safe.db:" FuzzyOcr.cf
+
+			if ! use amavis ; then
+				insinto /var/lib/FuzzyOcr/
+
+				local hash_files="FuzzyOcr.hashdb FuzzyOcr.db FuzzyOcr.safe.db"
+
+				for file in ${hash_files}; do
+					if [ ! -e /var/lib/FuzzyOcr/${file} ]; then
+						newins /dev/null ${file}
+						fperms 660 /var/lib/FuzzyOcr/${file}
+						fowners root:fuzzyocr /var/lib/FuzzyOcr/${file}
+					fi
+				done
+			fi
+		fi
+
+		insinto /etc/mail/spamassassin/
+
+		doins FuzzyOcr.cf
+		doins FuzzyOcr.words
+		doins FuzzyOcr.scansets
+		doins FuzzyOcr.preps
+		insinto ${VENDOR_LIB}/FuzzyOcr
+		doins FuzzyOcr/*
+
+		docinto samples
+		dodoc samples/*
+}
+
+
+pkg_postinst() {
+		elog "You need to restart spamassassin (as root) before this plugin will work:"
+		elog "/etc/init.d/spamd restart"
+		echo
+		if use dbm || use logrotate ; then
+			local files=""
+
+			if use dbm ; then
+				files="/var/lib/FuzzyOcr"
+			fi
+
+			if use logrotate ; then
+				if [ -z ${files} ] ; then
+					files="/var/log/FuzzyOcr.log"
+				else
+					files="${files} /var/log/FuzzyOcr.log"
+				fi
+			fi
+
+			if use amavis ; then
+				elog "All permissions are set for the user amavis!"
+			else
+				elog "Permissions have been set for the fuzzyocr group, to enable"
+				elog "logging or hashing add any required users to this group"
+			fi
+
+			echo
+			ewarn "If you run spamassassin as another user, please make sure to"
+			ewarn "change permissions on" ${files/ / and }
+			echo
+		fi
+}