A bunch of cleanups... fixed quoting issues, removed old builds,

unfortunately, amd64 doesn't have a recent copy stable, need to file a
bug about that.  Add the latest release as well. Hopefully we can get
this stable in ~30 days.  This should fix bug #170127, as well as bug
Package-Manager: portage-2.1.4

17 files changed, 65 insertions, 552 deletions

diff --git a/app-text/crm114/ChangeLog b/app-text/crm114/ChangeLog
index 9c4cb6b788bf..b1ccaf8dc401 100644
--- a/app-text/crm114/ChangeLog
+++ b/app-text/crm114/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for app-text/crm114
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/crm114/ChangeLog,v 1.31 2007/05/06 04:55:41 dertobi123 Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/crm114/ChangeLog,v 1.32 2008/01/23 03:26:03 steev Exp $
+
+*crm114-20070810 (23 Jan 2008)
+
+  23 Jan 2008; Steev Klimaszewski <steev@gentoo.org>
+  -files/crm114-20040601-mailfilter.patch,
+  -files/crm114-20060118-fataltraptest.patch, -crm114-20040601.ebuild,
+  -crm114-20041110.ebuild, crm114-20041231.ebuild, -crm114-20050415.ebuild,
+  -crm114-20050518.ebuild, -crm114-20060118.ebuild, crm114-20060704a.ebuild,
+  +crm114-20070810.ebuild:
+  A bunch of cleanups... fixed quoting issues, removed old builds, 
+  unfortunately, amd64 doesn't have a recent copy stable, need to file a 
+  bug about that.  Add the latest release as well.  Hopefully we can get 
+  this stable in ~30 days.  This should fix bug #170127, as well as bug 
+  #190240
 
   06 May 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   crm114-20060704a.ebuild:
diff --git a/app-text/crm114/Manifest b/app-text/crm114/Manifest
index 82c2ed52df98..5094c7e7223a 100644
--- a/app-text/crm114/Manifest
+++ b/app-text/crm114/Manifest
@@ -1,76 +1,36 @@
-AUX crm114-20040601-mailfilter.patch 455 RMD160 26f0d32af8f4cfc8ccdc3c655459b1f6871112dd SHA1 eb792a6a1cac8cca7d88b93902d0bb5f50ee304a SHA256 0193a0425a8b94f56c776d4f86494adc74d56b57e11beb9a1f889a01a9e7bd92
-MD5 4abb78bb7c3987fa2a351ee89da2e1a6 files/crm114-20040601-mailfilter.patch 455
-RMD160 26f0d32af8f4cfc8ccdc3c655459b1f6871112dd files/crm114-20040601-mailfilter.patch 455
-SHA256 0193a0425a8b94f56c776d4f86494adc74d56b57e11beb9a1f889a01a9e7bd92 files/crm114-20040601-mailfilter.patch 455
-AUX crm114-20060118-fataltraptest.patch 1244 RMD160 ba85bd456316dd6740d60153a4b07e578962c644 SHA1 e9cd71af6ec3f6d18bf81fe75e2ca8f017fa12e0 SHA256 c289589cccf6ab488f894d1169886a568172020c7cb0d10bf3ade9b52e931563
-MD5 be0a8efac7023e9388d086605111f656 files/crm114-20060118-fataltraptest.patch 1244
-RMD160 ba85bd456316dd6740d60153a4b07e578962c644 files/crm114-20060118-fataltraptest.patch 1244
-SHA256 c289589cccf6ab488f894d1169886a568172020c7cb0d10bf3ade9b52e931563 files/crm114-20060118-fataltraptest.patch 1244
 AUX crm114-20060704a-fataltraptest.patch 1244 RMD160 ba85bd456316dd6740d60153a4b07e578962c644 SHA1 e9cd71af6ec3f6d18bf81fe75e2ca8f017fa12e0 SHA256 c289589cccf6ab488f894d1169886a568172020c7cb0d10bf3ade9b52e931563
 MD5 be0a8efac7023e9388d086605111f656 files/crm114-20060704a-fataltraptest.patch 1244
 RMD160 ba85bd456316dd6740d60153a4b07e578962c644 files/crm114-20060704a-fataltraptest.patch 1244
 SHA256 c289589cccf6ab488f894d1169886a568172020c7cb0d10bf3ade9b52e931563 files/crm114-20060704a-fataltraptest.patch 1244
-DIST crm114-20040601-BlameKyoto.src.tar.gz 760489 RMD160 c034cb2fbb52109c2c936a978729b303d193531a SHA1 6b4318c11c139c82b7cab1b08c2a243c149ce806 SHA256 a90d11977b9b4d42ad4c69055dece2a9cd696a27964392c0c484e0f9f5313ee8
-DIST crm114-20041110.BlameFidelisMore.src.tar.gz 1136016 RMD160 d2d38db7f6e399b03d09d914fe1b147058467fa4 SHA1 62da92300287203ced0ba768636521f5bfdda251 SHA256 11d06092ce9a95c9fda2bb4adc915ba6fc0bcd0b475855ed103079d94ac90bad
 DIST crm114-20041231.BlameSanAndreas.src.tar.gz 856318 RMD160 865bc9e13f1b4321e600d1464c64811ef6ce3a2f SHA1 0148c0e3d873f286167221c239c3b0eb6be66b3f SHA256 8b54a8c1a3375bf1ebc0c3dc7de0398384824cd18c6e29dacbb9276930bb905b
-DIST crm114-20050415.BlameTheIRS.src.tar.gz 904449 RMD160 89ad0f1e1280e51dd8f29639eccb62b19c213faa SHA1 8f08af5d98aab55ab307185016efa613d1ef2d5d SHA256 a9422519dd2668b875289b175b934ad22ac2ca4b3d44205d9ddf0fd11424247f
-DIST crm114-20050518.BlameMercury.src.tar.gz 909636 RMD160 40277b1aaa8e55b8677e9401d8b50f32edc50ea0 SHA1 a512dc8d4caf66132c6bb39b4068bde9ba7ed36b SHA256 3e2cf7f3eb670e278b5d67bcc4c9c3fdf0934d2068b7fb43ec849f0d831aa75c
-DIST crm114-20060118-BlameTheReavers.src.tar.gz 935769 RMD160 6665fa1088093be9b534fe7ff79b0cda065aa414 SHA1 10d8f53d4aacef4a6ec8f39239af38fd09788500 SHA256 f5e4d3b8887d825a12102b39833332a13002498f3c3dd2bb83446fff11cdd0cb
 DIST crm114-20060704a-BlameRobert.src.tar.gz 1023938 RMD160 d949331fc8b65b36b09747c3a25b4e2b2f826d3a SHA1 76b0d2017c2e115cfcafd3fd03a9ec16d49209b5 SHA256 82e7474d218e479de984f3257b478c72b9ef2d7e78e4096eb481cf261bca816d
-EBUILD crm114-20040601.ebuild 1820 RMD160 72be0482954552541b3cf8d798f0bf33c1f9b751 SHA1 218846941de3e8a425d38d09a308347a0ee4aaaa SHA256 20c45c6470a7aa0a26d2e8fe072d0402ed5b327e24b09b0d87638c71f4f2ecfe
-MD5 62f41a57fe8ed40a3f1a6fb640011076 crm114-20040601.ebuild 1820
-RMD160 72be0482954552541b3cf8d798f0bf33c1f9b751 crm114-20040601.ebuild 1820
-SHA256 20c45c6470a7aa0a26d2e8fe072d0402ed5b327e24b09b0d87638c71f4f2ecfe crm114-20040601.ebuild 1820
-EBUILD crm114-20041110.ebuild 2415 RMD160 bfa985b64f993d17bc3ed970f4671ddfc298ce93 SHA1 c101ef68d57a05d406d2f2583d13b2990e1efe0e SHA256 986175e24f98a0beddb1068371f0e48f60de6584b40b7d065083a871aa268b16
-MD5 1d04dfcf4728cf5c0b54744b9c1662ff crm114-20041110.ebuild 2415
-RMD160 bfa985b64f993d17bc3ed970f4671ddfc298ce93 crm114-20041110.ebuild 2415
-SHA256 986175e24f98a0beddb1068371f0e48f60de6584b40b7d065083a871aa268b16 crm114-20041110.ebuild 2415
-EBUILD crm114-20041231.ebuild 2490 RMD160 247e4ecbd31754997aa716558347673c9c6f0fd1 SHA1 35312f5996dfe8e508bbff9e114ad07e0ed1b4a7 SHA256 cb39ae48d8cd08e7ee775de8a2805ea3f5994162c61907fe8c06a1d17ac247b7
-MD5 05c7d688d0352d4094a0616c59b1a52b crm114-20041231.ebuild 2490
-RMD160 247e4ecbd31754997aa716558347673c9c6f0fd1 crm114-20041231.ebuild 2490
-SHA256 cb39ae48d8cd08e7ee775de8a2805ea3f5994162c61907fe8c06a1d17ac247b7 crm114-20041231.ebuild 2490
-EBUILD crm114-20050415.ebuild 2429 RMD160 72afa26d9ce651060a8664eb26177e0e46d7d624 SHA1 1eaa96604ec9763962a37c6b78adf5c77dc374e1 SHA256 30b59b5a6b3a2989c7c377e5ffe7ab7a9dc936c983afd1ba0d1466471de750cf
-MD5 9406351e4b77766e62ab1c2680fa078d crm114-20050415.ebuild 2429
-RMD160 72afa26d9ce651060a8664eb26177e0e46d7d624 crm114-20050415.ebuild 2429
-SHA256 30b59b5a6b3a2989c7c377e5ffe7ab7a9dc936c983afd1ba0d1466471de750cf crm114-20050415.ebuild 2429
-EBUILD crm114-20050518.ebuild 2436 RMD160 c807781858503765f7a2034ca5e0e2cc42b89a1d SHA1 1074941476676edde112768936dc46f9713e64ae SHA256 62162d2b98c73b6eeefe54d1eae6eb7d56b48e9c8df44ddde68764cd1bffecfd
-MD5 009ac2fd3a98615ccfc0f8b37d0bc571 crm114-20050518.ebuild 2436
-RMD160 c807781858503765f7a2034ca5e0e2cc42b89a1d crm114-20050518.ebuild 2436
-SHA256 62162d2b98c73b6eeefe54d1eae6eb7d56b48e9c8df44ddde68764cd1bffecfd crm114-20050518.ebuild 2436
-EBUILD crm114-20060118.ebuild 2551 RMD160 4fdfb0cbc1f894e1af85cdf65ee886efe7fb2018 SHA1 ba8cf57ef05d83bc4ea8b6983dabc4f288bfd764 SHA256 0702433ca312b3e71f211c531cb8e6288bc73cab5187f560336cb8118638494e
-MD5 ab58b2752c479266ad5167df7d4e0a1a crm114-20060118.ebuild 2551
-RMD160 4fdfb0cbc1f894e1af85cdf65ee886efe7fb2018 crm114-20060118.ebuild 2551
-SHA256 0702433ca312b3e71f211c531cb8e6288bc73cab5187f560336cb8118638494e crm114-20060118.ebuild 2551
-EBUILD crm114-20060704a.ebuild 2630 RMD160 92eac05f654e28c5324eca2d3e900737689b5c24 SHA1 06061fd9f57abb471b6c7c3e9842e959701bd1d4 SHA256 e4a66c1741a5013e63ae907be08f0984833b6519c982ee0ac41905a75725264a
-MD5 8ba16f1104e15048fc22c0e7b2803ae4 crm114-20060704a.ebuild 2630
-RMD160 92eac05f654e28c5324eca2d3e900737689b5c24 crm114-20060704a.ebuild 2630
-SHA256 e4a66c1741a5013e63ae907be08f0984833b6519c982ee0ac41905a75725264a crm114-20060704a.ebuild 2630
-MISC ChangeLog 5624 RMD160 c8332766cd221b229eac6b55709ddcfc884d8a70 SHA1 cecb26368094857b56666e572d47f6121eaceb2d SHA256 9f06bda286a2abe236997dc6e6b0f81bb5d79b09defac53de4a8fe7e74307acd
-MD5 7c2c763e6ab3f2850095f6b775b2d904 ChangeLog 5624
-RMD160 c8332766cd221b229eac6b55709ddcfc884d8a70 ChangeLog 5624
-SHA256 9f06bda286a2abe236997dc6e6b0f81bb5d79b09defac53de4a8fe7e74307acd ChangeLog 5624
+DIST crm114-20070810-BlameTheSegfault.src.tar.gz 562532 RMD160 f855ae7e63715d961d58fd84e3fa3d313c2befd8 SHA1 51fb06c8524d3581860aea27d071ee9353daffe3 SHA256 9137644e2a534131d5a215098a32b7b9c60f35b08151337d90b9894ff6642bac
+EBUILD crm114-20041231.ebuild 2488 RMD160 978389f419d35f29a5291774d5bccf830012bf5b SHA1 50d0047a9a90f0425cb86b4e3d6e663dd6346233 SHA256 0cb0a4adc2a645561b5f53db03a86d6b95725b9b5c1d5d4525b498e147b031ff
+MD5 3d815e07b15cb7de1349a898f1f0f74b crm114-20041231.ebuild 2488
+RMD160 978389f419d35f29a5291774d5bccf830012bf5b crm114-20041231.ebuild 2488
+SHA256 0cb0a4adc2a645561b5f53db03a86d6b95725b9b5c1d5d4525b498e147b031ff crm114-20041231.ebuild 2488
+EBUILD crm114-20060704a.ebuild 2633 RMD160 049de9aa924c9dc19603ab272ade1566552b84e2 SHA1 86e705f942577739c809f949201f13c20e15f9ca SHA256 254e16e1d2c247d537e3cd0a1f1d04d7495e3e3bc4325a4c5c4b05e3db152083
+MD5 0a89ccfceed2a6117f5b1ca0901d6359 crm114-20060704a.ebuild 2633
+RMD160 049de9aa924c9dc19603ab272ade1566552b84e2 crm114-20060704a.ebuild 2633
+SHA256 254e16e1d2c247d537e3cd0a1f1d04d7495e3e3bc4325a4c5c4b05e3db152083 crm114-20060704a.ebuild 2633
+EBUILD crm114-20070810.ebuild 2228 RMD160 7899976c6fada97d16c93534e7a4dda5b1e6c786 SHA1 d73504c76fd0a363846940aa410a4bf68ea54bd8 SHA256 0f6b5d37ba0cdd8d381b6ecc94886ac80d458311e812dce68cf3fd98095e44ae
+MD5 abdfaf4f56907630e315a8370107ce36 crm114-20070810.ebuild 2228
+RMD160 7899976c6fada97d16c93534e7a4dda5b1e6c786 crm114-20070810.ebuild 2228
+SHA256 0f6b5d37ba0cdd8d381b6ecc94886ac80d458311e812dce68cf3fd98095e44ae crm114-20070810.ebuild 2228
+MISC ChangeLog 6298 RMD160 b664f65ff5e5343c9a44cb3a9c56023cf4adc428 SHA1 bfa898eaa3fe9a2d6679938ea9966842c08f9123 SHA256 c8219126b39805d0536444e11e44ecd9f13981682d66ccd1988ec65d1da0ed04
+MD5 11f8c5c47170f8be7abf07781580e52b ChangeLog 6298
+RMD160 b664f65ff5e5343c9a44cb3a9c56023cf4adc428 ChangeLog 6298
+SHA256 c8219126b39805d0536444e11e44ecd9f13981682d66ccd1988ec65d1da0ed04 ChangeLog 6298
 MISC metadata.xml 537 RMD160 860d42c48db185823abf203789a70e535372ade8 SHA1 0692ba2cc8b6bc85db5ca288fa9ac0f13854ada3 SHA256 f62459b1a400afef2be2dc450b190e5853cb372b0d2cf2de1445b9035f93e683
 MD5 5d40cc3404cebff24a5d65e8fe86b787 metadata.xml 537
 RMD160 860d42c48db185823abf203789a70e535372ade8 metadata.xml 537
 SHA256 f62459b1a400afef2be2dc450b190e5853cb372b0d2cf2de1445b9035f93e683 metadata.xml 537
-MD5 ac22afc28bc9bd592651427886baaf36 files/digest-crm114-20040601 292
-RMD160 eeb46a07bb64e742d4acc12beb2f35b5ec1ddc69 files/digest-crm114-20040601 292
-SHA256 809a99bcf2fef0ddaf33fc1eebcb8df5f5340d003ece0ddaade8b21f0122da24 files/digest-crm114-20040601 292
-MD5 95d2eedc522d097cfd90d445e5aa3eb9 files/digest-crm114-20041110 313
-RMD160 ea9916fe4b54f5f398a99b056eb9b8bbf3057e20 files/digest-crm114-20041110 313
-SHA256 1aff33a98d3b01ff1c0084ee4a0abb72a3689084dddffcdf1910fdfb3439c530 files/digest-crm114-20041110 313
 MD5 1c233101c6ff99c67adb9f7eacf6ae92 files/digest-crm114-20041231 307
 RMD160 5b38d900b896a6ee2eeaaf4cab36467c324578c9 files/digest-crm114-20041231 307
 SHA256 7220fd14d279c66ffd9812adc4ffca1d10d0084e39eaa09150b28e2c863867eb files/digest-crm114-20041231 307
-MD5 bafa4d7ece40bf8ffc5161d675d22a5b files/digest-crm114-20050415 295
-RMD160 6678c1a131b7eebd8bfb2183dcedb9d58d558ecb files/digest-crm114-20050415 295
-SHA256 d690dbafcd6d40962c72e8e2b94c3c018e1349929b74f32f9fc11a6eb5043308 files/digest-crm114-20050415 295
-MD5 93ee42c7438f65346bc5769b674f486d files/digest-crm114-20050518 298
-RMD160 96f4fa4e11e65dc725c73a99f0da161ea428a44d files/digest-crm114-20050518 298
-SHA256 c48587df3463ab5548296f991d7e597fb2fa8b2d1bc4853049e663c5e3bb9b75 files/digest-crm114-20050518 298
-MD5 b6a77d791b611d918cff536268dfc3f5 files/digest-crm114-20060118 307
-RMD160 d620d85655c0f452fe43e42899c005a3a4f10835 files/digest-crm114-20060118 307
-SHA256 f3a05f467815f3090c296cbe772649b7f7172d946ff1039a81a44488ab836ff2 files/digest-crm114-20060118 307
 MD5 4abddc41a0ed1de782ec4c2607a821a3 files/digest-crm114-20060704a 301
 RMD160 2468d1027c217f1bc615d6369a543b0a14705c30 files/digest-crm114-20060704a 301
 SHA256 d8933790885e56e4e40318c774ea0ec74d4a7f516ec652b722232085e3ccec93 files/digest-crm114-20060704a 301
+MD5 05424f8c0cea63c19243189cf1552641 files/digest-crm114-20070810 310
+RMD160 7404c63eb27d11e503f7832c6a772b66a644492b files/digest-crm114-20070810 310
+SHA256 128e5a1b53c7edc379ff579a5e77eda58c0188cd1bfbe09879b28cd79e5a563a files/digest-crm114-20070810 310
diff --git a/app-text/crm114/crm114-20040601.ebuild b/app-text/crm114/crm114-20040601.ebuild
deleted file mode 100644
index d1c6a1c21292..000000000000
--- a/app-text/crm114/crm114-20040601.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/crm114/crm114-20040601.ebuild,v 1.13 2007/07/12 04:37:47 mr_bones_ Exp $
-
-inherit eutils
-
-IUSE="emacs nls static"
-
-MY_P=${P}-BlameKyoto.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"
-
-TREVERS="0.6.8"
-
-DEPEND=">=sys-apps/sed-4
-	virtual/libc
-	mail-filter/procmail
-	emacs? ( app-emacs/mew )
-	!emacs? ( 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
-
-	epatch ${FILESDIR}/${P}-mailfilter.patch
-
-	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 cssutil cssdiff cssmerge
-	dosym crm114 /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
-
-	mkdir ${D}/usr/share/${PN}
-	cp -a *.crm ${D}/usr/share/${PN}
-	cp -a *.cf ${D}/usr/share/${PN}
-	cp -a *.mfp ${D}/usr/share/${PN}
-}
-
-pkg_postinst() {
-	echo
-	elog "The spam-filter CRM files are installed in /usr/share/${PN}."
-	echo
-}
diff --git a/app-text/crm114/crm114-20041110.ebuild b/app-text/crm114/crm114-20041110.ebuild
deleted file mode 100644
index 1116977ec2fa..000000000000
--- a/app-text/crm114/crm114-20041110.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2007 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.5 2007/03/04 07:32:53 genone Exp $
-
-inherit eutils
-
-IUSE="nls static normalizemime mew mimencode"
-
-MY_P="${P}.BlameFidelisMore.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.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
-		elog "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
-		elog "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
-	elog "The spam-filter CRM files are installed in /usr/share/${PN}."
-	echo
-}
diff --git a/app-text/crm114/crm114-20041231.ebuild b/app-text/crm114/crm114-20041231.ebuild
index b65246f5223d..61d185e40b6d 100644
--- a/app-text/crm114/crm114-20041231.ebuild
+++ b/app-text/crm114/crm114-20041231.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/crm114/crm114-20041231.ebuild,v 1.6 2007/03/04 07:32:53 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/crm114/crm114-20041231.ebuild,v 1.7 2008/01/23 03:26:03 steev Exp $
 
 inherit eutils
 
@@ -28,7 +28,7 @@ DEPEND=">=sys-apps/sed-4
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	sed -i "s#^CFLAGS.*#CFLAGS+=${CFLAGS} -I.#" Makefile
 
@@ -53,14 +53,14 @@ src_unpack() {
 			mailfilter.cf
 	fi
 
-	cd ${S}/tre-${TREVERS}
+	cd "${S}"/tre-${TREVERS}
 	chmod +x configure
 }
 
 src_compile() {
 	# Build TRE library.
 	if use static ; then
-		cd ${S}/tre-${TREVERS}
+		cd "${S}"/tre-${TREVERS}
 		econf \
 			$(use_enable nls) \
 			$(use_enable static) \
@@ -72,12 +72,11 @@ src_compile() {
 	fi
 
 	# Build crm114
-	cd ${S}
+	cd "${S}"
 	emake || die
 }
 
 src_install() {
-	cd ${S}
 	dobin crm114_tre cssutil cssdiff cssmerge
 	dobin osbf-util
 	dosym crm114_tre /usr/bin/crm114
diff --git a/app-text/crm114/crm114-20050415.ebuild b/app-text/crm114/crm114-20050415.ebuild
deleted file mode 100644
index 37c5fc8b2660..000000000000
--- a/app-text/crm114/crm114-20050415.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/crm114/crm114-20050415.ebuild,v 1.2 2007/03/04 07:32:53 genone Exp $
-
-inherit eutils
-
-IUSE="nls static normalizemime mew mimencode"
-
-MY_P="${P}.BlameTheIRS.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} )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	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
-}
-
-pkg_postinst() {
-	echo
-	elog "The spam-filter CRM files are installed in /usr/share/${PN}."
-	echo
-}
diff --git a/app-text/crm114/crm114-20050518.ebuild b/app-text/crm114/crm114-20050518.ebuild
deleted file mode 100644
index e5a70e59ce6c..000000000000
--- a/app-text/crm114/crm114-20050518.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/crm114/crm114-20050518.ebuild,v 1.2 2007/03/04 07:32:53 genone Exp $
-
-inherit eutils
-
-IUSE="nls static normalizemime mew mimencode"
-
-MY_P="${P}.BlameMercury.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} )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	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
-}
-
-pkg_postinst() {
-	elog ""
-	elog "The spam-filter CRM files are installed in /usr/share/${PN}."
-	elog ""
-}
diff --git a/app-text/crm114/crm114-20060704a.ebuild b/app-text/crm114/crm114-20060704a.ebuild
index d863ddfb6ca0..062bbb64e9ac 100644
--- a/app-text/crm114/crm114-20060704a.ebuild
+++ b/app-text/crm114/crm114-20060704a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/crm114/crm114-20060704a.ebuild,v 1.4 2007/05/06 04:55:41 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/crm114/crm114-20060704a.ebuild,v 1.5 2008/01/23 03:26:03 steev Exp $
 
 inherit eutils
 #http://crm114.sourceforge.net/crm114-20060704a-BlameRobert.src.tar.gz
@@ -28,9 +28,9 @@ DEPEND=">=sys-apps/sed-4
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	epatch ${FILESDIR}/${P}-fataltraptest.patch
+	epatch "${FILESDIR}"/${P}-fataltraptest.patch
 
 	sed -i "s#^CFLAGS.*#CFLAGS+=${CFLAGS}#" Makefile
 
@@ -55,14 +55,14 @@ src_unpack() {
 			mailfilter.cf
 	fi
 
-	cd ${S}/tre-${TREVERS}
+	cd "${S}"/tre-${TREVERS}
 	chmod +x configure
 }
 
 src_compile() {
 	# Build TRE library.
 	if use static ; then
-		cd ${S}/tre-${TREVERS}
+		cd "${S}"/tre-${TREVERS}
 		econf \
 			$(use_enable nls) \
 			$(use_enable static) \
diff --git a/app-text/crm114/crm114-20060118.ebuild b/app-text/crm114/crm114-20070810.ebuild
index 4f3a0707cc9a..9282340f28b8 100644
--- a/app-text/crm114/crm114-20060118.ebuild
+++ b/app-text/crm114/crm114-20070810.ebuild
@@ -1,39 +1,37 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.2 2007/03/04 07:32:53 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/crm114/crm114-20070810.ebuild,v 1.1 2008/01/23 03:26:03 steev Exp $
 
 inherit eutils
-
 IUSE="nls static normalizemime mew mimencode test"
 
-MY_P="${P}-BlameTheReavers.src"
+MY_P="${P}-BlameTheSegfault.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"
+SRC_URI="http://crm114.sourceforge.net/tarballs/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 
-TREVERS="0.7.2"
+TREVERS="0.7.5"
 
 DEPEND=">=sys-apps/sed-4
 	virtual/libc
 	normalizemime? ( mail-filter/normalizemime )
 	mew? ( app-emacs/mew )
 	mimencode? ( net-mail/metamail )
-	!static? ( >=dev-libs/tre-${TREVERS} )
+	>=dev-libs/tre-${TREVERS}
 	test? ( sys-apps/miscfiles )"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	epatch ${FILESDIR}/${P}-fataltraptest.patch
 
 	sed -i "s#^CFLAGS.*#CFLAGS+=${CFLAGS}#" Makefile
-
+	sed -i "s#^LDFLAGS.*#LDFLAGS+=${LDFLAGS}#" Makefile
 	if use static ; then
 		sed -i "s#-ltre#-L${S}/tre-${TREVERS}/lib/.libs/ -ltre#g" Makefile
 	else
@@ -55,33 +53,16 @@ src_unpack() {
 			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 crm114 cssutil cssdiff cssmerge
+	dobin 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
@@ -100,7 +81,7 @@ src_test() {
 }
 
 pkg_postinst() {
-	elog ""
-	elog "The spam-filter CRM files are installed in /usr/share/${PN}."
-	elog ""
+	einfo ""
+	einfo "The spam-filter CRM files are installed in /usr/share/${PN}."
+	einfo ""
 }
diff --git a/app-text/crm114/files/crm114-20040601-mailfilter.patch b/app-text/crm114/files/crm114-20040601-mailfilter.patch
deleted file mode 100644
index 17eee4d71af2..000000000000
--- a/app-text/crm114/files/crm114-20040601-mailfilter.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- old/mailfilter.crm	2004-06-07 11:56:04.701302534 -0700
-+++ new/mailfilter.crm	2004-06-07 11:57:49.645986881 -0700
-@@ -108,6 +108,13 @@
-         {
-             match [:config:] /.+/
-             input [:*:config:] (:option_txt:)
-+            {
-+                match [:config:] /^\/.+/
-+            }
-+            alius
-+            {
-+                input [:*:fileprefix::*:config:] (:option_txt:)
-+            }
-         }
-         alius
-         {
diff --git a/app-text/crm114/files/crm114-20060118-fataltraptest.patch b/app-text/crm114/files/crm114-20060118-fataltraptest.patch
deleted file mode 100644
index 3297c2c9785c..000000000000
--- a/app-text/crm114/files/crm114-20060118-fataltraptest.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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-20040601 b/app-text/crm114/files/digest-crm114-20040601
deleted file mode 100644
index 1565ea28222f..000000000000
--- a/app-text/crm114/files/digest-crm114-20040601
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3dff1601f8bf2c42e8c767900fca2a56 crm114-20040601-BlameKyoto.src.tar.gz 760489
-RMD160 c034cb2fbb52109c2c936a978729b303d193531a crm114-20040601-BlameKyoto.src.tar.gz 760489
-SHA256 a90d11977b9b4d42ad4c69055dece2a9cd696a27964392c0c484e0f9f5313ee8 crm114-20040601-BlameKyoto.src.tar.gz 760489
diff --git a/app-text/crm114/files/digest-crm114-20041110 b/app-text/crm114/files/digest-crm114-20041110
deleted file mode 100644
index c2f8358ffad6..000000000000
--- a/app-text/crm114/files/digest-crm114-20041110
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fcf91a0345a18f5265373b7b211549b9 crm114-20041110.BlameFidelisMore.src.tar.gz 1136016
-RMD160 d2d38db7f6e399b03d09d914fe1b147058467fa4 crm114-20041110.BlameFidelisMore.src.tar.gz 1136016
-SHA256 11d06092ce9a95c9fda2bb4adc915ba6fc0bcd0b475855ed103079d94ac90bad crm114-20041110.BlameFidelisMore.src.tar.gz 1136016
diff --git a/app-text/crm114/files/digest-crm114-20050415 b/app-text/crm114/files/digest-crm114-20050415
deleted file mode 100644
index 0951e93c20f5..000000000000
--- a/app-text/crm114/files/digest-crm114-20050415
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 af42f9de1d9de55edd48d3e7f57df6fb crm114-20050415.BlameTheIRS.src.tar.gz 904449
-RMD160 89ad0f1e1280e51dd8f29639eccb62b19c213faa crm114-20050415.BlameTheIRS.src.tar.gz 904449
-SHA256 a9422519dd2668b875289b175b934ad22ac2ca4b3d44205d9ddf0fd11424247f crm114-20050415.BlameTheIRS.src.tar.gz 904449
diff --git a/app-text/crm114/files/digest-crm114-20050518 b/app-text/crm114/files/digest-crm114-20050518
deleted file mode 100644
index a3bd91638b18..000000000000
--- a/app-text/crm114/files/digest-crm114-20050518
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e703817e7f6276c6baf5830ce9334405 crm114-20050518.BlameMercury.src.tar.gz 909636
-RMD160 40277b1aaa8e55b8677e9401d8b50f32edc50ea0 crm114-20050518.BlameMercury.src.tar.gz 909636
-SHA256 3e2cf7f3eb670e278b5d67bcc4c9c3fdf0934d2068b7fb43ec849f0d831aa75c crm114-20050518.BlameMercury.src.tar.gz 909636
diff --git a/app-text/crm114/files/digest-crm114-20060118 b/app-text/crm114/files/digest-crm114-20060118
deleted file mode 100644
index ced82f3f7c06..000000000000
--- a/app-text/crm114/files/digest-crm114-20060118
+++ /dev/null
@@ -1,3 +0,0 @@
-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
diff --git a/app-text/crm114/files/digest-crm114-20070810 b/app-text/crm114/files/digest-crm114-20070810
new file mode 100644
index 000000000000..aa40f598eadc
--- /dev/null
+++ b/app-text/crm114/files/digest-crm114-20070810
@@ -0,0 +1,3 @@
+MD5 50419b5d563da414c5c0c0f256236fbc crm114-20070810-BlameTheSegfault.src.tar.gz 562532
+RMD160 f855ae7e63715d961d58fd84e3fa3d313c2befd8 crm114-20070810-BlameTheSegfault.src.tar.gz 562532
+SHA256 9137644e2a534131d5a215098a32b7b9c60f35b08151337d90b9894ff6642bac crm114-20070810-BlameTheSegfault.src.tar.gz 562532