version bump and move to stable

5 files changed, 106 insertions, 15 deletions

diff --git a/app-text/crm114/ChangeLog b/app-text/crm114/ChangeLog
index 61bd0bb2f6ce..2f9d36cdb626 100644
--- a/app-text/crm114/ChangeLog
+++ b/app-text/crm114/ChangeLog
@@ -1,6 +1,17 @@
 # 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.10 2004/07/17 17:34:26 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/crm114/ChangeLog,v 1.11 2004/09/01 01:59:57 seemant Exp $
+
+*crm114-20040820 (31 Aug 2004)
+
+  31 Aug 2004; Seemant Kulleen <seemant@gentoo.org> crm114-20040601.ebuild,
+  +crm114-20040820.ebuild:
+  move 20040601 to stable
+
+*crm114-20040820 (31 Aug 2004)
+
+  31 Aug 2004; Seemant Kulleen <seemant@gentoo.org> +crm114-20040820.ebuild:
+  version bump, thanks to: John Hampton <pacopablo@pacopablo.com> in bug #62452
 
 *crm114-20040627-r1 (17 Jul 2004)
 
diff --git a/app-text/crm114/Manifest b/app-text/crm114/Manifest
index 6de2c635a781..7796dcecdcf6 100644
--- a/app-text/crm114/Manifest
+++ b/app-text/crm114/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 db1b1c8dce8a7f77b610a50c83787f3f crm114-20040627.ebuild 1835
-MD5 cf9a417463f367569ac737e9e9d39cb4 crm114-20040601.ebuild 1823
+MD5 01d11d0d2cf242f7095b9c8392adbd0c crm114-20040601.ebuild 1821
+MD5 1269ad23d5ea036a16eeaf34d488d54d crm114-20040820.ebuild 1934
 MD5 14789848940165b33f2759f04c027637 crm114-20040627-r1.ebuild 1886
-MD5 92671e50f7976ab56ced508f91287414 ChangeLog 1851
+MD5 0a9b5709b1c85e6239775450097d62f2 ChangeLog 2203
 MD5 7ac2597dc19a6e74bca4bef3951e3ac0 metadata.xml 542
 MD5 4abb78bb7c3987fa2a351ee89da2e1a6 files/crm114-20040601-mailfilter.patch 455
 MD5 1a7caa636b940f27ee5cb832bcfdbdf8 files/crm114-20040627-loopfix.patch 604
 MD5 f99ce07e865639c39ccc81d817470035 files/digest-crm114-20040627-r1 84
 MD5 0fc29953d2967ddbdf87912a44176a3f files/digest-crm114-20040601 82
 MD5 f99ce07e865639c39ccc81d817470035 files/digest-crm114-20040627 84
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFA+WMm7aJl2DRYeA4RAhjbAKDKgYM+LhnVvUODWIZ2kCQYSc5EjQCeLziO
-WM1ZXdg4Tm3RZIhtRyRsRHs=
-=MsUb
------END PGP SIGNATURE-----
+MD5 b60ec2ffdc2282169af84338cd194420 files/digest-crm114-20040820 92
diff --git a/app-text/crm114/crm114-20040601.ebuild b/app-text/crm114/crm114-20040601.ebuild
index 34213ad0f7d9..03da57cf291a 100644
--- a/app-text/crm114/crm114-20040601.ebuild
+++ b/app-text/crm114/crm114-20040601.ebuild
@@ -1,6 +1,6 @@
 # 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-20040601.ebuild,v 1.7 2004/07/13 20:44:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/crm114/crm114-20040601.ebuild,v 1.8 2004/09/01 01:59:57 seemant 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"
+KEYWORDS="x86 ~ppc"
 
 TREVERS="0.6.8"
 
diff --git a/app-text/crm114/crm114-20040820.ebuild b/app-text/crm114/crm114-20040820.ebuild
new file mode 100644
index 000000000000..5bac1ed160bd
--- /dev/null
+++ b/app-text/crm114/crm114-20040820.ebuild
@@ -0,0 +1,87 @@
+# 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-20040820.ebuild,v 1.1 2004/09/01 01:59:57 seemant Exp $
+
+inherit eutils
+
+IUSE="emacs nls static"
+
+MY_P=${P}.BlameClockworkOrange.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
+	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/files/digest-crm114-20040820 b/app-text/crm114/files/digest-crm114-20040820
new file mode 100644
index 000000000000..b300f4e3df81
--- /dev/null
+++ b/app-text/crm114/files/digest-crm114-20040820
@@ -0,0 +1 @@
+MD5 7dd6e6d351914fb6842065b9ae18c5e8 crm114-20040820.BlameClockworkOrange.src.tar.gz 790636