version bump thanks to: Peter Simons <simons@cryp.to> and John Hampton <pacopablo@pacopablo.com> in bug #55221

8 files changed, 99 insertions, 126 deletions

diff --git a/app-text/crm114/ChangeLog b/app-text/crm114/ChangeLog
index 25dc3b3b6043..3997eba1f20a 100644
--- a/app-text/crm114/ChangeLog
+++ b/app-text/crm114/ChangeLog
@@ -1,6 +1,13 @@
 # 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.8 2004/07/01 19:28:48 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/crm114/ChangeLog,v 1.9 2004/07/13 05:04:37 seemant Exp $
+
+*crm114-20040627 (12 Jul 2004)
+
+  12 Jul 2004; Seemant Kulleen <seemant@gentoo.org> -crm114-20030920.ebuild,
+  -crm114-20040212.ebuild, +crm114-20040627.ebuild:
+  version bump thanks to: Peter Simons <simons@cryp.to> and John Hampton
+  <pacopablo@pacopablo.com> in bug #55221
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   crm114-20030920.ebuild, crm114-20040212.ebuild, crm114-20040601.ebuild:
diff --git a/app-text/crm114/Manifest b/app-text/crm114/Manifest
index 2315e098b9bf..1b4cf694cb3a 100644
--- a/app-text/crm114/Manifest
+++ b/app-text/crm114/Manifest
@@ -1,9 +1,11 @@
-MD5 17b8b80d766627c5cbcf0ae693e0c203 ChangeLog 1311
-MD5 86f43f8f984cb32a471b2bfbc2363024 crm114-20030920.ebuild 1257
-MD5 a2bf7d823351cc3d62671522e0d958dd crm114-20040212.ebuild 1469
+MD5 f7a2848b4fe47f3e0b9ffa3d6278ff81 crm114-20040627.ebuild 1831
 MD5 699e242fe37712043264eb4322a0e367 crm114-20040601.ebuild 1819
+MD5 a2bf7d823351cc3d62671522e0d958dd crm114-20040212.ebuild 1469
+MD5 86f43f8f984cb32a471b2bfbc2363024 crm114-20030920.ebuild 1257
+MD5 17b8b80d766627c5cbcf0ae693e0c203 ChangeLog 1311
 MD5 7ac2597dc19a6e74bca4bef3951e3ac0 metadata.xml 542
 MD5 4abb78bb7c3987fa2a351ee89da2e1a6 files/crm114-20040601-mailfilter.patch 455
 MD5 c5cef02a365e58428d4105209f11e91e files/digest-crm114-20030920 78
 MD5 5fad30dc44cc5f8d740f897017592956 files/digest-crm114-20040212 83
 MD5 0fc29953d2967ddbdf87912a44176a3f files/digest-crm114-20040601 82
+MD5 f99ce07e865639c39ccc81d817470035 files/digest-crm114-20040627 84
diff --git a/app-text/crm114/crm114-20030920.ebuild b/app-text/crm114/crm114-20030920.ebuild
deleted file mode 100644
index 4034ef264bf6..000000000000
--- a/app-text/crm114/crm114-20030920.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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-20030920.ebuild,v 1.5 2004/07/01 11:56:40 eradicator Exp $
-
-IUSE="nls"
-
-MY_P=${PN}-2003-09-20-Beta.src
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="A powerful text processing tools, mainly used for spam filtering"
-HOMEPAGE="http://crm114.sourceforge.net/"
-SRC_URI="mirror://sourceforge/crm114/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-DEPEND=">=sys-apps/sed-4
-	virtual/libc"
-
-src_compile() {
-	# Build TRE library.
-	cd ${S}/tre-0.5.3
-	# FIXME: for some reason, the configure script doesn't use
-	# our CFLAGS!
-	econf `use_enable nls` \
-	    --disable-profile \
-	    --disable-agrep \
-	    --enable-system-abi \
-	    --disable-shared \
-	    --disable-debug \
-	    --enable-static || die
-
-	emake
-
-	# Build crm114
-	cd ${S}
-	sed -i \
-		-e "s#^CFLAGS=.*#CFLAGS=${CFLAGS}#" \
-	    -e "s#-ltre#-Ltre-0.5.3/lib/.libs -ltre#g" \
-	    -e "s#-static##g" \
-	    Makefile
-
-	emake || die
-}
-
-src_install() {
-	cd ${S}
-	dobin crm114 cssutil cssdiff cssmerge
-	dodoc CRM114_Mailfilter_HOWTO.txt classify_details.txt
-	dodoc colophon.txt faq.txt intro.txt knownbugs.txt
-	dodoc quickref.txt things_to_do.txt
-}
diff --git a/app-text/crm114/crm114-20040212.ebuild b/app-text/crm114/crm114-20040212.ebuild
deleted file mode 100644
index 2d794a2efdc4..000000000000
--- a/app-text/crm114/crm114-20040212.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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-20040212.ebuild,v 1.3 2004/07/01 11:56:40 eradicator Exp $
-
-IUSE="nls"
-
-MY_P=${PN}-20040212-BlameJetlag.src
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="A powerful text processing tools, mainly used for spam filtering"
-HOMEPAGE="http://crm114.sourceforge.net/"
-SRC_URI="mirror://sourceforge/crm114/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-DEPEND=">=sys-apps/sed-4
-	virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	ln -s ${S}/tre-0.6.4/lib tre
-	sed -i \
-		-e "s#^CFLAGS.*#CFLAGS+=${CFLAGS} -I.#" \
-		-e "s#-ltre#-Ltre-0.6.4/lib/.libs -ltre#g" \
-		-e "s#-static##g" \
-		Makefile
-
-	cd ${S}/tre-0.6.4
-	chmod +x configure
-}
-
-src_compile() {
-	# Build TRE library.
-	cd ${S}/tre-0.6.4
-	econf `use_enable nls` \
-		--disable-profile \
-		--disable-agrep \
-		--enable-system-abi \
-		--disable-shared \
-		--disable-debug \
-		--enable-static || die
-	emake || die
-
-	# Build crm114
-	cd ${S}
-	emake || die
-}
-
-src_install() {
-	cd ${S}
-	dobin crm114 cssutil cssdiff cssmerge
-
-	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}
-}
-
-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
new file mode 100644
index 000000000000..2816102936d3
--- /dev/null
+++ b/app-text/crm114/crm114-20040627.ebuild
@@ -0,0 +1,85 @@
+# 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-20040627.ebuild,v 1.1 2004/07/13 05:04:37 seemant Exp $
+
+inherit eutils
+
+IUSE="nls static"
+
+MY_P=${P}-BlameSeifkes.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"
+
+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/files/digest-crm114-20030920 b/app-text/crm114/files/digest-crm114-20030920
deleted file mode 100644
index 290368ef7324..000000000000
--- a/app-text/crm114/files/digest-crm114-20030920
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b4a7c4bfec0ec56a48b3798d6c4c0023 crm114-2003-09-20-Beta.src.tar.gz 571762
diff --git a/app-text/crm114/files/digest-crm114-20040212 b/app-text/crm114/files/digest-crm114-20040212
deleted file mode 100644
index bd9b2268b300..000000000000
--- a/app-text/crm114/files/digest-crm114-20040212
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1124fb9c18161bf4306a162e6b9fd974 crm114-20040212-BlameJetlag.src.tar.gz 760719
diff --git a/app-text/crm114/files/digest-crm114-20040627 b/app-text/crm114/files/digest-crm114-20040627
new file mode 100644
index 000000000000..eb286bd81086
--- /dev/null
+++ b/app-text/crm114/files/digest-crm114-20040627
@@ -0,0 +1 @@
+MD5 637471a68c29bab77373f9a24c310984 crm114-20040627-BlameSeifkes.src.tar.gz 777271