Fix API change with SA3.0.2. Closes #76182. Some QA fixes.

5 files changed, 67 insertions, 3 deletions

diff --git a/mail-filter/disspam/ChangeLog b/mail-filter/disspam/ChangeLog
index 6512715b4232..0945dcd33057 100644
--- a/mail-filter/disspam/ChangeLog
+++ b/mail-filter/disspam/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-filter/disspam
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/disspam/ChangeLog,v 1.3 2004/07/18 15:40:36 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/disspam/ChangeLog,v 1.4 2004/12/31 17:29:06 ticho Exp $
+
+*disspam-0.12-r1 (31 Dec 2004)
+
+  31 Dec 2004; Andrej Kacian <ticho@gentoo.org> +files/0.12-sa302fix.patch,
+  +disspam-0.12-r1.ebuild:
+  Fix API change for spamassassin 3.0.2, if present. Closes #76182, reported
+  by Jeff Mills <hybiepoo@hotmail.com>. Some QA fixes.
 
 *disspam-0.12 (03 Jun 2004)
 
diff --git a/mail-filter/disspam/Manifest b/mail-filter/disspam/Manifest
index 482c658c48db..fbc1081eeb8f 100644
--- a/mail-filter/disspam/Manifest
+++ b/mail-filter/disspam/Manifest
@@ -1,6 +1,10 @@
-MD5 b94881244c34e4837b00ccf23e86a9c2 disspam-0.10.ebuild 643
+MD5 3ea55787eaff75d2b0a81637e99f6b00 ChangeLog 1382
 MD5 6aaeda4dfe6662205687528d15f51e3d disspam-0.12.ebuild 835
-MD5 65f86a313aef0de0fee6e7c853ab7ec5 ChangeLog 1178
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 b94881244c34e4837b00ccf23e86a9c2 disspam-0.10.ebuild 643
+MD5 e9744e2efd7b1e6667f4b792c11b80a0 .disspam-0.12-r1.ebuild.swp 12288
+MD5 abe030eb670055663ed548ec57b560eb disspam-0.12-r1.ebuild 1015
 MD5 ddb8a156da69c67f9ed6054ee673afc4 files/digest-disspam-0.10 62
 MD5 548d657cf971ba884004c6d2a64380fa files/digest-disspam-0.12 63
+MD5 14ac36538e60b579bec0c3c04658ca05 files/0.12-sa302fix.patch 381
+MD5 548d657cf971ba884004c6d2a64380fa files/digest-disspam-0.12-r1 63
diff --git a/mail-filter/disspam/disspam-0.12-r1.ebuild b/mail-filter/disspam/disspam-0.12-r1.ebuild
new file mode 100644
index 000000000000..acd8c1d15a62
--- /dev/null
+++ b/mail-filter/disspam/disspam-0.12-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/disspam/disspam-0.12-r1.ebuild,v 1.1 2004/12/31 17:29:06 ticho Exp $
+
+inherit eutils versionator
+
+S=${WORKDIR}/${PN}
+DESCRIPTION="A Perl script that removes spam from POP3 mailboxes based on RBLs."
+HOMEPAGE="http://www.topfx.com/"
+SRC_URI="http://www.topfx.com/dist/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Artistic"
+KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha ~mips"
+IUSE=""
+
+DEPEND=">=dev-lang/perl-5.6.1
+	>=dev-perl/libnet-1.11
+	>=sys-apps/sed-4
+	>=dev-perl/Net-DNS-0.12"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	SA_VERSION=`echo \`best_version mail-filter/spamassassin\` | cut -d - -f 3`
+	if version_is_at_least 3.0.2 ${SA_VERSION}; then
+		epatch ${FILESDIR}/${PV}-sa302fix.patch || die "epatch failed"
+	fi
+
+	#This doesnt look neat but makes it work
+	sed -i \
+		-e 's/\/usr\/local\/bin\/perl/\/usr\/bin\/perl/' disspam.pl || \
+			die "sed disspam.pl failed"
+}
+	
+src_install() {
+	dobin disspam.pl
+	dodoc changes.txt configuration.txt readme.txt sample.conf
+}
diff --git a/mail-filter/disspam/files/0.12-sa302fix.patch b/mail-filter/disspam/files/0.12-sa302fix.patch
new file mode 100644
index 000000000000..47396530af30
--- /dev/null
+++ b/mail-filter/disspam/files/0.12-sa302fix.patch
@@ -0,0 +1,12 @@
+diff -bur disspam-orig/disspam.pl disspam/disspam.pl
+--- disspam-orig/disspam.pl	2003-05-07 00:46:14.000000000 +0200
++++ disspam/disspam.pl	2004-12-31 17:46:38.353945152 +0100
+@@ -766,7 +766,7 @@
+ 
+ 			#give email SpamAssassin headers
+ 			$status->rewrite_mail();
+-			$$messageref = $status->get_full_message_as_text();
++			$$messageref = $status->get_message();
+ 		}
+ 	}
+ 	else {
diff --git a/mail-filter/disspam/files/digest-disspam-0.12-r1 b/mail-filter/disspam/files/digest-disspam-0.12-r1
new file mode 100644
index 000000000000..6f152b9974ea
--- /dev/null
+++ b/mail-filter/disspam/files/digest-disspam-0.12-r1
@@ -0,0 +1 @@
+MD5 88b250988d204e0d2ae36fa7714646d6 disspam-0.12.tar.gz 13553