Version bump, #70899.

4 files changed, 110 insertions, 12 deletions

diff --git a/app-text/crm114/ChangeLog b/app-text/crm114/ChangeLog
index ec955a54ee45..ed5e180f08d5 100644
--- a/app-text/crm114/ChangeLog
+++ b/app-text/crm114/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/crm114
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/crm114/ChangeLog,v 1.14 2004/10/30 18:44:27 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/crm114/ChangeLog,v 1.15 2004/11/20 11:37:15 slarti Exp $
+
+*crm114-20041110 (20 Nov 2004)
+
+  20 Nov 2004; Tom Martin <slarti@gentoo.org> +crm114-20041110.ebuild:
+  Version bump, resolves bug 70899. Thanks to John Hampton
+  <pacopablo@pacopablo.com> for the revised ebuild.
 
 *crm114-20040924 (30 Oct 2004)
 
diff --git a/app-text/crm114/Manifest b/app-text/crm114/Manifest
index eddd3f2dc175..2a5255558f88 100644
--- a/app-text/crm114/Manifest
+++ b/app-text/crm114/Manifest
@@ -1,13 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ab0b0a2b8a28588f1cede21c339b20e7 crm114-20040924.ebuild 2261
 MD5 db1b1c8dce8a7f77b610a50c83787f3f crm114-20040627.ebuild 1835
 MD5 01d11d0d2cf242f7095b9c8392adbd0c crm114-20040601.ebuild 1821
 MD5 67beb8988829b28db016fca94b8397e1 crm114-20040820.ebuild 1940
 MD5 14789848940165b33f2759f04c027637 crm114-20040627-r1.ebuild 1886
-MD5 3d4f03527b0c2a31aee7b8025c977694 ChangeLog 2715
+MD5 bbefa70fdc42462664ec256d6b90a733 ChangeLog 2930
 MD5 30da451a6874a2d4bddc6390f02146e3 metadata.xml 546
+MD5 1796d7921849a1745b2587fbf6320e0c crm114-20041110.ebuild 2420
 MD5 4abb78bb7c3987fa2a351ee89da2e1a6 files/crm114-20040601-mailfilter.patch 455
 MD5 1a7caa636b940f27ee5cb832bcfdbdf8 files/crm114-20040627-loopfix.patch 604
 MD5 f99ce07e865639c39ccc81d817470035 files/digest-crm114-20040627-r1 84
@@ -15,10 +13,4 @@ MD5 0fc29953d2967ddbdf87912a44176a3f files/digest-crm114-20040601 82
 MD5 f99ce07e865639c39ccc81d817470035 files/digest-crm114-20040627 84
 MD5 b60ec2ffdc2282169af84338cd194420 files/digest-crm114-20040820 92
 MD5 065e158a2a5962aec93322b621d27b1c files/digest-crm114-20040924 91
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBg+EhCHk4+ZoBpvsRAg/0AJ9JvmjGJRtHo4S+LUESE6HaugUy8gCfVbNj
-BmcC8YpL/0bV01s+5qwEPF8=
-=MeZc
------END PGP SIGNATURE-----
+MD5 ceddac5321febaa45361fc0023780212 files/digest-crm114-20041110 89
diff --git a/app-text/crm114/crm114-20041110.ebuild b/app-text/crm114/crm114-20041110.ebuild
new file mode 100644
index 000000000000..d54db5782129
--- /dev/null
+++ b/app-text/crm114/crm114-20041110.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/crm114/crm114-20041110.ebuild,v 1.1 2004/11/20 11:37:15 slarti Exp $
+
+inherit eutils
+
+IUSE="nls static normalizemime mew mimencode"
+
+MY_P="${P}.BlameFidelisMore.src"
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="A powerful text processing tools, mainly used for spam filtering"
+HOMEPAGE="http://crm114.sourceforge.net/"
+SRC_URI="http://crm114.sourceforge.net/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~amd64"
+
+TREVERS="0.7.0"
+
+DEPEND=">=sys-apps/sed-4
+	virtual/libc
+	mail-filter/procmail
+	normalizemime? ( mail-filter/normalizemime )
+	mew? ( app-emacs/mew )
+	mimencode? ( net-mail/metamail )
+	!static? ( >=dev-libs/tre-${TREVERS} )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	sed -i "s#^CFLAGS.*#CFLAGS+=${CFLAGS} -I.#" Makefile
+
+	if use static ; then
+		sed -i "s#-ltre#-L${S}/${TREVERS}/lib/.libs/ -ltre#g" Makefile
+	else
+		sed -i "s#-static##g"  Makefile
+	fi
+	sed -i "s#ln -f -s crm114_tre crm114##" Makefile
+
+	if use mimencode ; then
+		einfo "Using mimencode -- adjusting mailfilter.cf"
+		sed -i 's%#:mime_decoder: /mimencode -u/%:mime_decoder: /mimencode -u/%' \
+			mailfilter.cf
+		sed -i 's%:mime_decoder: /mewdecode/%#:mime_decoder: /mewdecode/%' \
+			mailfilter.cf
+	elif use normalizemime ; then
+		einfo "Using normalizemime -- adjusting mailfilter.cf"
+		sed -i 's%#:mime_decoder: /normalizemime/%:mime_decoder: /normalizemime/%' mailfilter.cf
+
+		sed -i 's%:mime_decoder: /mewdecode/%#:mime_decoder: /mewdecode/%' \
+			mailfilter.cf
+	fi
+
+	cd ${S}/tre-${TREVERS}
+	chmod +x configure
+}
+
+src_compile() {
+	# Build TRE library.
+	if use static ; then
+		cd ${S}/tre-${TREVERS}
+		econf \
+			$(use_enable nls) \
+			$(use_enable static) \
+			--enable-system-abi \
+			--disable-profile \
+			--disable-agrep \
+			--disable-debug || die
+		emake || die
+	fi
+
+	# Build crm114
+	cd ${S}
+	emake || die
+}
+
+src_install() {
+	cd ${S}
+	dobin crm114_tre cssutil cssdiff cssmerge
+	dosym crm114_tre /usr/bin/crm114
+	dosym crm114_tre /usr/bin/crm
+
+	dodoc COLOPHON.txt CRM114_Mailfilter_HOWTO.txt FAQ.txt INTRO.txt
+	dodoc QUICKREF.txt classify_details.txt inoc_passwd.txt
+	dodoc knownbugs.txt things_to_do.txt README
+
+	insinto /usr/share/${PN}
+	doins *.crm
+	doins *.cf
+	doins *.mfp
+}
+
+pkg_postinst() {
+	echo
+	einfo "The spam-filter CRM files are installed in /usr/share/${PN}."
+	echo
+}
diff --git a/app-text/crm114/files/digest-crm114-20041110 b/app-text/crm114/files/digest-crm114-20041110
new file mode 100644
index 000000000000..4f7d429b6c60
--- /dev/null
+++ b/app-text/crm114/files/digest-crm114-20041110
@@ -0,0 +1 @@
+MD5 fcf91a0345a18f5265373b7b211549b9 crm114-20041110.BlameFidelisMore.src.tar.gz 1136016