Switch to using the debian tarball and patchset, fixes the native Digest functionality of pyzor.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.26-hardened-r4 x86_64

3 files changed, 93 insertions, 13 deletions

diff --git a/dev-python/pyzor/ChangeLog b/dev-python/pyzor/ChangeLog
index 6efce6456aa4..19db37305a7c 100644
--- a/dev-python/pyzor/ChangeLog
+++ b/dev-python/pyzor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pyzor
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzor/ChangeLog,v 1.40 2008/08/06 19:13:20 neurogeek Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzor/ChangeLog,v 1.41 2009/01/05 07:43:11 robbat2 Exp $
+
+*pyzor-0.4.0-r4 (05 Jan 2009)
+
+  05 Jan 2009; Robin H. Johnson <robbat2@gentoo.org> +pyzor-0.4.0-r4.ebuild:
+  Switch to using the debian tarball and patchset, fixes the native Digest
+  functionality of pyzor.
 
   06 Aug 2008; Jesus Rivero <neurogeek@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/dev-python/pyzor/Manifest b/dev-python/pyzor/Manifest
index 9c68d5a5c6b4..7f8799246cd7 100644
--- a/dev-python/pyzor/Manifest
+++ b/dev-python/pyzor/Manifest
@@ -1,18 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX debian_mbox.patch 11250 RMD160 f26c403936084af9bc37f41c4406f12362f0cf87 SHA1 47382cfaa36204171bdd8dd078c4b50890bef7d9 SHA256 5f6e13b6ee48a057d7d7ff549cce764f1136838ac8f6c30651d0dcb3ac15b8f2
 AUX handle_unknown_encodings.patch 3216 RMD160 94f8a758527669363c1c9f0dfc3315c3ac8410cc SHA1 3f29d4cf59af0d2e37e496d0d6e532d86ac933a7 SHA256 fa5bb2fc15383ee17f6e4c9c90ec78ceac8260b8923887744a6ceedabbab4bd3
 AUX pyzord_getopt.patch 640 RMD160 31e65c868032988cc42c4a6f7ca98efa0a0e6a12 SHA1 61754944886bc6138ba533fe51fdce1191dbaaa9 SHA256 6cc675c7caf935342c3728ef399c2ebdb57029d146903aa36593fa3a34f270a9
 AUX unknown_type.patch 472 RMD160 e70885792a8d8bdd8e1265ae03703c8e7742e3ef SHA1 cc9a43265f87cc41f6bb2df7a35a800d9f30dc68 SHA256 e1d1a9134f0a4fc561e0a14bc657babbf94c5be46856b3273817cf233b30d060
 DIST pyzor-0.4.0.tar.bz2 41764 RMD160 edc03c084695128850f788c57554b967dbcefd8e SHA1 0577d291240a7a66492c2b6cbbf49fd5edaf02fd SHA256 27b57f485ee94a98b36f5d85cf7f2a61bdff35fc4005946fe5367ced035bd430
+DIST pyzor_0.4.0+cvs20030201-8.diff.gz 15523 RMD160 20801f6fe91e241921f3dd6c05523b2d3c506d31 SHA1 0ebc76140f58b399050923230968711388f78e14 SHA256 37177c60868f83faf4224d78004fdf66292e1aeada82b855ab7b4a2ab0bb4cdd
+DIST pyzor_0.4.0+cvs20030201.orig.tar.gz 41827 RMD160 5a47f46c3e0f92270d9ac0bcb2dfc190ff095851 SHA1 d8109c769517efe9234de9b89659aebfb4c98d99 SHA256 7058a5127d63af77d98ea1fb279821d06c7918857751835bb21987f06308a047
 EBUILD pyzor-0.4.0-r3.ebuild 1511 RMD160 ce9de54365f65e54faccc3ae239c1cb7c6ddfe3c SHA1 67175f6f431a163b22331294165c06b97fde0e03 SHA256 a9b460ed4d6a1d398244397eaf452d6813824fc351d479a30ee0faecda694b78
-MISC ChangeLog 4498 RMD160 51f63946c0115af4303749de684f3af1235ee623 SHA1 192683431b273d9683aaf58b77d420cb437db9a5 SHA256 d6d7c1fcf877cae5bda08e210903264aa898fbb414ae19ebfec817424b5e3b3d
+EBUILD pyzor-0.4.0-r4.ebuild 2034 RMD160 bfefbee05ee35e67154260468bddd702153487d1 SHA1 152eae8e2369a5bd724be7ab85a0c9f313794fda SHA256 1d97230762b3863cd18d508ae095fd960fbad9eb5593fe6d35b9cde1a2699b2d
+MISC ChangeLog 4706 RMD160 b6e5e2188281a7695c3dfd1fe7fbcc343c891882 SHA1 2854d889d3541e9a2e8bb92f5f01ff89a50f418e SHA256 07e8323041e6d5acc749d449e6e34aa39348530b29e5c639abc808865a3bb1ab
 MISC metadata.xml 226 RMD160 600a3f5f17f1fc118073824f628ff3b6b9593d9e SHA1 5ec42e8ac4995bfb7e9380daa1b4c53dc6f5566d SHA256 68c2b94a7055bb8f9fa53e636ebe8ae4f3713233181b75335efadaf903e5c400
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFImffVdIssYB9vBoMRAlmwAJ4pnILj8UY3jDIFPpVxysqydUeY6wCfUBII
-j3Oy4I526JkJI4IllJFQKd0=
-=ospL
------END PGP SIGNATURE-----
diff --git a/dev-python/pyzor/pyzor-0.4.0-r4.ebuild b/dev-python/pyzor/pyzor-0.4.0-r4.ebuild
new file mode 100644
index 000000000000..d14b542e51bb
--- /dev/null
+++ b/dev-python/pyzor/pyzor-0.4.0-r4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzor/pyzor-0.4.0-r4.ebuild,v 1.1 2009/01/05 07:43:11 robbat2 Exp $
+
+inherit distutils eutils
+
+DESCRIPTION="A distributed, collaborative spam detection and filtering network"
+HOMEPAGE="http://pyzor.sourceforge.net/"
+
+MY_PV="${PV}+cvs20030201"
+MY_P="${PN}_${MY_PV}"
+DEBIAN_PATCH_VERSION="8"
+DEBIAN_PATCH="${MY_P}-${DEBIAN_PATCH_VERSION}.diff.gz"
+# Original:
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+# Debian CVS snapshot
+SRC_URI="
+	mirror://debian/pool/main/p/${PN}/${MY_P}.orig.tar.gz
+	mirror://debian/pool/main/p/${PN}/${DEBIAN_PATCH}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="pyzord"
+
+DEPEND="dev-lang/python"
+
+S="${WORKDIR}/${MY_P//_/-}"
+
+pkg_setup() {
+	if use pyzord ; then
+		if ! built_with_use 'dev-lang/python' gdbm ; then
+			die "you need to rebuild python with gdbm support"
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${MY_P}.orig.tar.gz
+	epatch "${DISTDIR}"/${DEBIAN_PATCH}
+	cd "${S}"
+	epatch "${S}"/debian/patches/*dpatch
+
+
+	# Same as Debian 08_define_mbox.dpatch
+	#epatch "${FILESDIR}/debian_mbox.patch"
+	# Same as Debian 07_handle_unknown_encodings.dpatch  
+	#epatch "${FILESDIR}/handle_unknown_encodings.patch"
+
+	# Gentoo-unique
+	epatch "${FILESDIR}/pyzord_getopt.patch"
+	epatch "${FILESDIR}/unknown_type.patch"
+
+	# rfc822BodyCleanerTest doesn't work fine
+	# remove it until it's fixed
+	sed -i \
+		-e '/rfc822BodyCleanerTest/,/self\.assertEqual/d' \
+		unittests.py || die "sed in unittest.py failed"
+}
+
+src_install () {
+	DOCS="INSTALL THANKS UPGRADING"
+	distutils_src_install
+	dohtml docs/usage.html
+	rm -rf "${D}/usr/share/doc/pyzor"
+
+	if use pyzord ; then
+		dodir /usr/sbin
+		mv "${D}/usr/bin/pyzord" "${D}/usr/sbin/"
+	fi
+}
+
+pkg_postinst() {
+	if use pyzord ; then
+		ewarn "/usr/bin/pyzord has been moved to /usr/sbin"
+	fi
+}
+
+src_test() {
+	PYTHONPATH=build/lib/ "${python}" unittests.py || die "tests failed"
+}