Version bump, resolves both bug 89851 and bug 69358 in the process. Clean out old ebuilds and stabilise 20041231 on amd64.'

Package-Manager: portage-2.0.51.19

13 files changed, 47 insertions, 308 deletions

diff --git a/app-text/crm114/ChangeLog b/app-text/crm114/ChangeLog
index 85fa30724050..1689fd4c5e0c 100644
--- a/app-text/crm114/ChangeLog
+++ b/app-text/crm114/ChangeLog
@@ -1,6 +1,16 @@
 # 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.19 2005/01/12 16:52:18 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/crm114/ChangeLog,v 1.20 2005/04/21 18:48:40 slarti Exp $
+
+*crm114-20050415 (21 Apr 2005)
+
+  21 Apr 2005; Tom Martin <slarti@gentoo.org>
+  -files/crm114-20040627-loopfix.patch, -crm114-20040627.ebuild,
+  -crm114-20040627-r1.ebuild, -crm114-20040820.ebuild,
+  -crm114-20040924.ebuild, crm114-20041231.ebuild, +crm114-20050415.ebuild:
+  Version bump, resolves bug 89851 (no more procmail dependency now, so this
+  also resolves bug 69358). Mark 20041231 stable on amd64, and purge a few old
+  ebuilds.
 
   12 Jan 2005; Tom Martin <slarti@gentoo.org> crm114-20041110.ebuild:
   Stabilising on amd64.
diff --git a/app-text/crm114/Manifest b/app-text/crm114/Manifest
index ebfed8a89da9..66a9c52b782e 100644
--- a/app-text/crm114/Manifest
+++ b/app-text/crm114/Manifest
@@ -1,18 +1,21 @@
-MD5 4e0cdcc61917811259c62b47a3ac9a74 ChangeLog 3411
-MD5 30da451a6874a2d4bddc6390f02146e3 metadata.xml 546
-MD5 c6e96cc657fbcec8f0dd4f5d4cfba591 crm114-20041231.ebuild 2494
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e8175334973dfcea2323316d940b7f45 ChangeLog 3853
 MD5 c55ff52b53930cd85a94e0f63f5481e0 crm114-20041110.ebuild 2419
-MD5 edc2832ea7d0671bc1ad6f0fa82f3bbf crm114-20040924.ebuild 2261
-MD5 c27118663c626ed191f2c1a1c42995f2 crm114-20040820.ebuild 1940
-MD5 d5225e7e14f7a7f5e6e5c8a1df1424f1 crm114-20040627-r1.ebuild 1885
-MD5 f5459a2228577e106e47917a3cfff67a crm114-20040627.ebuild 1833
 MD5 d388cd38aa4a65a5f8f1b50d76877a85 crm114-20040601.ebuild 1821
+MD5 de7d910b7f5588fb0b704917a16fea8e crm114-20041231.ebuild 2492
+MD5 30da451a6874a2d4bddc6390f02146e3 metadata.xml 546
+MD5 5c5b73f6187646119489ebfa06c76835 crm114-20050415.ebuild 2430
 MD5 4abb78bb7c3987fa2a351ee89da2e1a6 files/crm114-20040601-mailfilter.patch 455
-MD5 1a7caa636b940f27ee5cb832bcfdbdf8 files/crm114-20040627-loopfix.patch 604
 MD5 0fc29953d2967ddbdf87912a44176a3f files/digest-crm114-20040601 82
-MD5 f99ce07e865639c39ccc81d817470035 files/digest-crm114-20040627 84
-MD5 f99ce07e865639c39ccc81d817470035 files/digest-crm114-20040627-r1 84
-MD5 b60ec2ffdc2282169af84338cd194420 files/digest-crm114-20040820 92
-MD5 065e158a2a5962aec93322b621d27b1c files/digest-crm114-20040924 91
+MD5 63802d0ff3295e087314dd29ec29481a files/digest-crm114-20050415 83
 MD5 ceddac5321febaa45361fc0023780212 files/digest-crm114-20041110 89
 MD5 1072e0ff99ef1c84163d04ea38f2b083 files/digest-crm114-20041231 87
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCZ/WgCHk4+ZoBpvsRAgpmAJ9DaPd6Nuf1XUmvM+WWQ8B02XWm1gCdFI3A
+gNrR5B6SFjxPgDXs2leC4P0=
+=3HB1
+-----END PGP SIGNATURE-----
diff --git a/app-text/crm114/crm114-20040627-r1.ebuild b/app-text/crm114/crm114-20040627-r1.ebuild
deleted file mode 100644
index b5f5e34bfe94..000000000000
--- a/app-text/crm114/crm114-20040627-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/crm114/crm114-20040627-r1.ebuild,v 1.3 2005/03/14 12:14:53 seemant Exp $
-
-inherit eutils
-
-IUSE="emacs nls static"
-
-MY_P=${P}-BlameSeifkes.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}/${PN}-20040601-mailfilter.patch
-	epatch ${FILESDIR}/${PN}-20040627-loopfix.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
-	einfo "The spam-filter CRM files are installed in /usr/share/${PN}."
-	echo
-}
diff --git a/app-text/crm114/crm114-20040627.ebuild b/app-text/crm114/crm114-20040627.ebuild
deleted file mode 100644
index 451660999c59..000000000000
--- a/app-text/crm114/crm114-20040627.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/crm114/crm114-20040627.ebuild,v 1.4 2005/03/14 12:14:53 seemant Exp $
-
-inherit eutils
-
-IUSE="emacs nls static"
-
-MY_P=${P}-BlameSeifkes.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}/${PN}-20040601-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
-	einfo "The spam-filter CRM files are installed in /usr/share/${PN}."
-	echo
-}
diff --git a/app-text/crm114/crm114-20040820.ebuild b/app-text/crm114/crm114-20040820.ebuild
deleted file mode 100644
index 08fa93e7a550..000000000000
--- a/app-text/crm114/crm114-20040820.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/crm114/crm114-20040820.ebuild,v 1.4 2005/03/14 12:14:53 seemant Exp $
-
-inherit eutils
-
-IUSE="emacs nls static"
-
-MY_P=${P}.BlameClockworkOrange.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.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
-	sed -i "s#ln -f -s crm114_tre crm114##" Makefile
-
-	epatch ${FILESDIR}/${PN}-20040601-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_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
-
-	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
-	einfo "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 d585ea9a33e9..ecc22786a885 100644
--- a/app-text/crm114/crm114-20041231.ebuild
+++ b/app-text/crm114/crm114-20041231.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.3 2005/03/14 12:14:53 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/crm114/crm114-20041231.ebuild,v 1.4 2005/04/21 18:48:40 slarti Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ SRC_URI="http://crm114.sourceforge.net/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~x86 ~ppc amd64"
 
 TREVERS="0.7.2"
 
diff --git a/app-text/crm114/crm114-20040924.ebuild b/app-text/crm114/crm114-20050415.ebuild
index d13cae1f44a5..048f884ac0a0 100644
--- a/app-text/crm114/crm114-20040924.ebuild
+++ b/app-text/crm114/crm114-20050415.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/crm114/crm114-20040924.ebuild,v 1.3 2005/03/14 12:14:53 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/crm114/crm114-20050415.ebuild,v 1.1 2005/04/21 18:48:40 slarti Exp $
 
 inherit eutils
 
 IUSE="nls static normalizemime mew mimencode"
 
-MY_P="${P}.BlameResidentWeasel.src"
+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/"
@@ -16,11 +16,10 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~amd64"
 
-TREVERS="0.7.0"
+TREVERS="0.7.2"
 
 DEPEND=">=sys-apps/sed-4
 	virtual/libc
-	mail-filter/procmail
 	normalizemime? ( mail-filter/normalizemime )
 	mew? ( app-emacs/mew )
 	mimencode? ( net-mail/metamail )
@@ -30,20 +29,26 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	sed -i "s#^CFLAGS.*#CFLAGS+=${CFLAGS} -I.#" Makefile
+	sed -i "s#^CFLAGS.*#CFLAGS+=${CFLAGS}#" Makefile
 
 	if use static ; then
-		sed -i "s#-ltre#-L${S}/${TREVERS}/lib/.libs/ -ltre#g" Makefile
+		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 mew ; then
-		sed -i 's%:mime_decoder: /mewdecode/%:mime_decoder: /mewdecode/%' \
+	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
-		sed -i 's%#:mime_decoder /normalizemime/%:mime_decoder: /normalizemime/%' \
+		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
 
@@ -66,24 +71,20 @@ src_compile() {
 	fi
 
 	# Build crm114
-	cd ${S}
-	emake || die
+	emake -j1 || die
 }
 
 src_install() {
-	cd ${S}
 	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
-
-#	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}
+	docinto examples
+	dodoc *.example
 
 	insinto /usr/share/${PN}
 	doins *.crm
diff --git a/app-text/crm114/files/crm114-20040627-loopfix.patch b/app-text/crm114/files/crm114-20040627-loopfix.patch
deleted file mode 100644
index 0b4fbe16a6a0..000000000000
--- a/app-text/crm114/files/crm114-20040627-loopfix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN crm114-old/mailfilter.crm crm114-new/mailfilter.crm
---- crm114-old/mailfilter.crm	2004-06-27 03:45:19.000000000 -0700
-+++ crm114-new/mailfilter.crm	2004-07-16 11:00:01.970824969 -0700
-@@ -807,8 +807,8 @@
- 		#   get rid of any first-column 'From's as they are message breaks!
- 		#   this isn't necessary if we're mailing to someplace else...
- 		{
--			match (:f:) <nomultiline> [:m_text:] /\n\nFrom/
--			alter (:f:) />:*:f:/
-+			match (:f:) <nomultiline> [:m_text:] /^From/
-+			alter (:f:) / :*:f:/
- 			liaf
- 		}
- 	       	alter (:_dw:) /:*:_dw:-=-Extra Stuff-=-\n\n:*:m_text: -0-0-0- :*:_nl:/		
diff --git a/app-text/crm114/files/digest-crm114-20040627 b/app-text/crm114/files/digest-crm114-20040627
deleted file mode 100644
index eb286bd81086..000000000000
--- a/app-text/crm114/files/digest-crm114-20040627
+++ /dev/null
@@ -1 +0,0 @@
-MD5 637471a68c29bab77373f9a24c310984 crm114-20040627-BlameSeifkes.src.tar.gz 777271
diff --git a/app-text/crm114/files/digest-crm114-20040627-r1 b/app-text/crm114/files/digest-crm114-20040627-r1
deleted file mode 100644
index eb286bd81086..000000000000
--- a/app-text/crm114/files/digest-crm114-20040627-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 637471a68c29bab77373f9a24c310984 crm114-20040627-BlameSeifkes.src.tar.gz 777271
diff --git a/app-text/crm114/files/digest-crm114-20040820 b/app-text/crm114/files/digest-crm114-20040820
deleted file mode 100644
index b300f4e3df81..000000000000
--- a/app-text/crm114/files/digest-crm114-20040820
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7dd6e6d351914fb6842065b9ae18c5e8 crm114-20040820.BlameClockworkOrange.src.tar.gz 790636
diff --git a/app-text/crm114/files/digest-crm114-20040924 b/app-text/crm114/files/digest-crm114-20040924
deleted file mode 100644
index dec3cc95480c..000000000000
--- a/app-text/crm114/files/digest-crm114-20040924
+++ /dev/null
@@ -1 +0,0 @@
-MD5 854404a8d043d0282d364d94f623ab48 crm114-20040924.BlameResidentWeasel.src.tar.gz 809042
diff --git a/app-text/crm114/files/digest-crm114-20050415 b/app-text/crm114/files/digest-crm114-20050415
new file mode 100644
index 000000000000..e69d1bb49025
--- /dev/null
+++ b/app-text/crm114/files/digest-crm114-20050415
@@ -0,0 +1 @@
+MD5 af42f9de1d9de55edd48d3e7f57df6fb crm114-20050415.BlameTheIRS.src.tar.gz 904449