Version bump.

(Portage version: 2.1_pre7-r5)

5 files changed, 189 insertions, 18 deletions

diff --git a/app-text/crm114/ChangeLog b/app-text/crm114/ChangeLog
index 82dad3b70c5a..da3b9c34f797 100644
--- a/app-text/crm114/ChangeLog
+++ b/app-text/crm114/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/crm114
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/crm114/ChangeLog,v 1.22 2005/05/21 16:43:48 slarti Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/crm114/ChangeLog,v 1.23 2006/04/17 12:41:24 slarti Exp $
+
+*crm114-20060118 (17 Apr 2006)
+
+  17 Apr 2006; Tom Martin <slarti@gentoo.org>
+  +files/crm114-20060118-fataltraptest.patch, +crm114-20060118.ebuild:
+  Version bump. Include a src_test this time; ${P}-fataltraptest.patch is
+  there to fix sandbox violations and a misleading diff at the end of the
+  test.
 
 *crm114-20050518 (21 May 2005)
 
diff --git a/app-text/crm114/Manifest b/app-text/crm114/Manifest
index 4fae3dd6b84c..c703e60adf35 100644
--- a/app-text/crm114/Manifest
+++ b/app-text/crm114/Manifest
@@ -1,23 +1,45 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 f3e74bf95970038bfe7ea653acc47c58 ChangeLog 4071
-MD5 5c5b73f6187646119489ebfa06c76835 crm114-20050415.ebuild 2430
-MD5 de7d910b7f5588fb0b704917a16fea8e crm114-20041231.ebuild 2492
+RMD160 31eee15ba2a89fa12384c9081f35846761be6c18 ChangeLog 4071
+SHA256 68730f5916127953851e05346408fe079425c5fd8bb23f60527d436a5ffe89d2 ChangeLog 4071
 MD5 47b9600c7ef17076f615712a31c89b73 crm114-20040601.ebuild 1819
-MD5 30da451a6874a2d4bddc6390f02146e3 metadata.xml 546
+RMD160 adc3161bec359b49ec9935d59e0090d91a52ca32 crm114-20040601.ebuild 1819
+SHA256 154428f13c59b18ccb1b20c8533b6569f5190acc58298589ded146efd0feace4 crm114-20040601.ebuild 1819
 MD5 c55ff52b53930cd85a94e0f63f5481e0 crm114-20041110.ebuild 2419
+RMD160 b9907c6166dccbf0797464ca55bad0cc32a31fa3 crm114-20041110.ebuild 2419
+SHA256 8a3f35a4c89f691d7cdeb51110217c6b8c0662462adbc64e6d5ac6d23678d4f2 crm114-20041110.ebuild 2419
+MD5 de7d910b7f5588fb0b704917a16fea8e crm114-20041231.ebuild 2492
+RMD160 0b210af065aac6c34243d63b96d7512272229cf6 crm114-20041231.ebuild 2492
+SHA256 51b803401c0793a54885b40f6bf81c629d4c8e8dfbd9555799a542f07ad8472b crm114-20041231.ebuild 2492
+MD5 5c5b73f6187646119489ebfa06c76835 crm114-20050415.ebuild 2430
+RMD160 207ca3e9320e4178696a991bb488f91a663c4a42 crm114-20050415.ebuild 2430
+SHA256 e923fac611e9c7cde66820c9d4259077369fa354c5f152ed01264d0113f30ece crm114-20050415.ebuild 2430
 MD5 d67470db7873ff63af5deab9ded42db6 crm114-20050518.ebuild 2439
-MD5 8221f0a0a593bf433b942d63fb796d02 files/digest-crm114-20050518 84
-MD5 63802d0ff3295e087314dd29ec29481a files/digest-crm114-20050415 83
+RMD160 30ac89aa2e5b112770b14a0b8b6fa8195c46f458 crm114-20050518.ebuild 2439
+SHA256 27ca15aebeceab6b2267a81a17f257ade5ac708ac22dc1c122d0bafd6e2732c4 crm114-20050518.ebuild 2439
+MD5 7a262b0cd4a2b4efc0b780b7a58c6f1d crm114-20060118.ebuild 2442
+RMD160 8cf0ced2074495a05df06e2b90f063b61116b0ac crm114-20060118.ebuild 2442
+SHA256 41c1f93582f679e9ef1c0d5f5e568f98f4c939040b041c426137865859d02ef2 crm114-20060118.ebuild 2442
 MD5 4abb78bb7c3987fa2a351ee89da2e1a6 files/crm114-20040601-mailfilter.patch 455
+RMD160 26f0d32af8f4cfc8ccdc3c655459b1f6871112dd files/crm114-20040601-mailfilter.patch 455
+SHA256 0193a0425a8b94f56c776d4f86494adc74d56b57e11beb9a1f889a01a9e7bd92 files/crm114-20040601-mailfilter.patch 455
+MD5 0fc29953d2967ddbdf87912a44176a3f files/digest-crm114-20040601 82
+RMD160 1e43d6573a5453e44f004ff6bf88ea77d77cbaf3 files/digest-crm114-20040601 82
+SHA256 18f260017553e325ae81c2cbab5ddac7c966c0164cad673589a1748af72574af files/digest-crm114-20040601 82
 MD5 ceddac5321febaa45361fc0023780212 files/digest-crm114-20041110 89
+RMD160 6bd4f9c76ff0c0af1b25ca32ed1e589edf82838a files/digest-crm114-20041110 89
+SHA256 f57c794ef96de0954f6bca0e27c4106ab3571b6baf30731fdcd998e588fd60a8 files/digest-crm114-20041110 89
 MD5 1072e0ff99ef1c84163d04ea38f2b083 files/digest-crm114-20041231 87
-MD5 0fc29953d2967ddbdf87912a44176a3f files/digest-crm114-20040601 82
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCj2VaCHk4+ZoBpvsRAuYUAJ4/RJTxyQ//v8PWQMixV9bcsFMU4gCdHFK6
-PqVX3ZBQPlw/fKgKw9PM/Gc=
-=ZEZ5
------END PGP SIGNATURE-----
+RMD160 b93158072ed9e8d04754a1c6b044a1b0f538ae9f files/digest-crm114-20041231 87
+SHA256 f8dbfdbee8e35237b0e9ab680e7554258dd45819d462bd327360caad97b7b3a4 files/digest-crm114-20041231 87
+MD5 63802d0ff3295e087314dd29ec29481a files/digest-crm114-20050415 83
+RMD160 74e03d6723dc1f40effa7016c6421ef573de3e24 files/digest-crm114-20050415 83
+SHA256 a59fe404a7f85669f502c2cd3842bf6d7b2f3789caf135a6d5ac4515a1a1110d files/digest-crm114-20050415 83
+MD5 8221f0a0a593bf433b942d63fb796d02 files/digest-crm114-20050518 84
+RMD160 c6582dd10cf5871bb4ecffeb630dbac0eff47c42 files/digest-crm114-20050518 84
+SHA256 8433c2511e3adab44cec60ae3cec0d202914ee33e74546e313fb5acdc9e5fe6e files/digest-crm114-20050518 84
+MD5 b6a77d791b611d918cff536268dfc3f5 files/digest-crm114-20060118 307
+RMD160 d620d85655c0f452fe43e42899c005a3a4f10835 files/digest-crm114-20060118 307
+SHA256 f3a05f467815f3090c296cbe772649b7f7172d946ff1039a81a44488ab836ff2 files/digest-crm114-20060118 307
+MD5 30da451a6874a2d4bddc6390f02146e3 metadata.xml 546
+RMD160 a4873ff93429b377125cac8761171db6422b4957 metadata.xml 546
+SHA256 3101b358b2175ad609d862e05be67fe29cff5e84f283357a60b3b2fe0850bff3 metadata.xml 546
diff --git a/app-text/crm114/crm114-20060118.ebuild b/app-text/crm114/crm114-20060118.ebuild
new file mode 100644
index 000000000000..7b3537ec6e1a
--- /dev/null
+++ b/app-text/crm114/crm114-20060118.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/crm114/crm114-20060118.ebuild,v 1.1 2006/04/17 12:41:25 slarti Exp $
+
+inherit eutils
+
+IUSE="nls static normalizemime mew mimencode test"
+
+MY_P="${P}-BlameTheReavers.src"
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="A powerful text processing tool, 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.2"
+
+DEPEND=">=sys-apps/sed-4
+	virtual/libc
+	normalizemime? ( mail-filter/normalizemime )
+	mew? ( app-emacs/mew )
+	mimencode? ( net-mail/metamail )
+	!static? ( >=dev-libs/tre-${TREVERS} )
+	test? ( sys-apps/miscfiles )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-fataltraptest.patch
+
+	sed -i "s#^CFLAGS.*#CFLAGS+=${CFLAGS}#" Makefile
+
+	if use static ; then
+		sed -i "s#-ltre#-L${S}/tre-${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
+	emake -j1 || die
+}
+
+src_install() {
+	dobin crm114_tre cssutil cssdiff cssmerge
+	dobin osbf-util
+	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
+	docinto examples
+	dodoc *.example
+
+	insinto /usr/share/${PN}
+	doins *.crm
+	doins *.cf
+	doins *.mfp
+}
+
+src_test() {
+	make megatest
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "The spam-filter CRM files are installed in /usr/share/${PN}."
+	einfo ""
+}
diff --git a/app-text/crm114/files/crm114-20060118-fataltraptest.patch b/app-text/crm114/files/crm114-20060118-fataltraptest.patch
new file mode 100644
index 000000000000..3297c2c9785c
--- /dev/null
+++ b/app-text/crm114/files/crm114-20060118-fataltraptest.patch
@@ -0,0 +1,32 @@
+--- megatest_knowngood.log.orig	2006-01-18 22:34:42.000000000 +0000
++++ megatest_knowngood.log	2006-04-17 14:30:35.000000000 +0100
+@@ -23,12 +23,6 @@
+  For some reason, I was unable to read-open the file named  zoob.zipulrlfjf
+  Sorry, but this program is very sick and probably should be killed off.
+ This happened at line 19 of file fataltraptest.crm
+-  --- and again, the next thing you see SHOULD be an error "unable to write-open"--- 
+- Caught the error  - fault text was 
+-crm: *ERROR* 
+- For some reason, I was unable to write-open the file named /No/Such/Directory/frotz.mumble
+- Sorry, but this program is very sick and probably should be killed off.
+-This happened at line 29 of file fataltraptest.crm
+  
+ 
+ Start of insert processor testing 
+--- fataltraptest.crm.orig	2006-01-18 22:34:42.000000000 +0000
++++ fataltraptest.crm	2006-04-17 14:35:22.000000000 +0100
+@@ -23,14 +23,4 @@
+ 		output / Caught the error  - fault text was :*:my_fault: / 
+ 	}
+ }
+-output / --- and again, the next thing you see SHOULD be an error "unable to write-open"--- :*:_nl:/
+-{
+-	{
+-		output [/No/Such/Directory/frotz.mumble] (:hi:)
+-	}
+-	trap (:my_fault:) /.*/
+-	{
+-		output / Caught the error  - fault text was :*:my_fault: / 
+-	}
+-}
+ output /:*:_nl:/
diff --git a/app-text/crm114/files/digest-crm114-20060118 b/app-text/crm114/files/digest-crm114-20060118
new file mode 100644
index 000000000000..ced82f3f7c06
--- /dev/null
+++ b/app-text/crm114/files/digest-crm114-20060118
@@ -0,0 +1,3 @@
+MD5 aeff75ba0dc9bd7d9464005240eb86e8 crm114-20060118-BlameTheReavers.src.tar.gz 935769
+RMD160 6665fa1088093be9b534fe7ff79b0cda065aa414 crm114-20060118-BlameTheReavers.src.tar.gz 935769
+SHA256 f5e4d3b8887d825a12102b39833332a13002498f3c3dd2bb83446fff11cdd0cb crm114-20060118-BlameTheReavers.src.tar.gz 935769