svnmailer python 2.5 support

Package-Manager: portage-2.1.5_rc2

4 files changed, 111 insertions, 3 deletions

diff --git a/dev-util/svnmailer/ChangeLog b/dev-util/svnmailer/ChangeLog
index e0acc4934cc8..2fc92d5f10ad 100644
--- a/dev-util/svnmailer/ChangeLog
+++ b/dev-util/svnmailer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/svnmailer
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/svnmailer/ChangeLog,v 1.4 2007/01/27 00:00:29 aross Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/svnmailer/ChangeLog,v 1.5 2008/04/06 13:41:20 hanno Exp $
+
+*svnmailer-1.0.8-r2 (06 Apr 2008)
+
+  06 Apr 2008; Hanno Boeck <hanno@gentoo.org>
+  +files/svnmailer-1.0.8-python2.5.diff, +svnmailer-1.0.8-r2.ebuild:
+  Patch for Python 2.5.
 
 *svnmailer-1.0.8-r1 (26 Jan 2007)
 
diff --git a/dev-util/svnmailer/Manifest b/dev-util/svnmailer/Manifest
index 9d28d83b2849..aa09c08d507c 100644
--- a/dev-util/svnmailer/Manifest
+++ b/dev-util/svnmailer/Manifest
@@ -1,5 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX svnmailer-1.0.8-python2.5.diff 1604 RMD160 931d416333f6eebaf78e6d4da920b683a3c5b8a8 SHA1 af722338c04e1c5fd790ac4f6b7b91f81edd5201 SHA256 2e773c5ff4aab414ede7e367fd66abf0cec3d94135fa7ef674268803979af119
 DIST svnmailer-1.0.8.tar.bz2 253483 RMD160 551e716e55f48c69b9f7dd6703fdedbc51c2a452 SHA1 792acbb340055fbf232d5fcd6c35fe932e0f6d46 SHA256 21e214e8b9d649ed5f24921d2034a01bb39cf0109e989c3803fe71c6e8fd3081
 EBUILD svnmailer-1.0.8-r1.ebuild 1125 RMD160 666e74dc44b335ba423ba6eadcd0e96adf2e3e51 SHA1 238085bf7d147de26d34826c9a704c229c0dfd02 SHA256 1fed22099a8c6dfa89b7df351869a1ce71d454bd9cb88af1812bfa0955c49a0c
+EBUILD svnmailer-1.0.8-r2.ebuild 1209 RMD160 2384cf7d8ee8ce253fb1c21688a30cc05f9378fe SHA1 b1e1d22234f8efb913b2eae20bc5b812406e1c26 SHA256 f0bdee5e928ba3dc8ccfadd33220aae59811cd731c775ba8d945ea39fa4f2722
 EBUILD svnmailer-1.0.8.ebuild 697 RMD160 717fef81c50555a70903bbc2c1a9b2ea169cd93f SHA1 2611275e6f2bb3798d8b93f3ef96e3c89ea74aa7 SHA256 63cb5e90d322eb5f672c343d789f694a558ace5f747df1e6426983aa367e165d
-MISC ChangeLog 940 RMD160 d9e65baf7a32632715e714dcbb0d01d91353bc52 SHA1 f58f885ae6e11da47e2675bef40d490c4e745b79 SHA256 bdb385279fc4ac9223dd1bad0d90ed5f233607e9182efe39fc8e14249f6aa3f3
+MISC ChangeLog 1115 RMD160 d924a580f57231cbf967f2afa94bddb0b2ad1760 SHA1 7a3f8c1f9d4d439154fb08fca2a9838b05a0a591 SHA256 2db1e58feb8c0b4133be44f76b620335f932fb898b2f0132084a97425c2c8575
 MISC metadata.xml 224 RMD160 1c42b6ae01d2b437f69790768a8b0771be59f463 SHA1 8c60a30a6e5072220fd3c2fa26ddf18a6e0f5bce SHA256 43742b5a93d69175c1ce110c8e88e88e21f6aa5dce7226bfe22eba8fafb25b2b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkf40yUACgkQr2QksT29OyCk9wCgkXja5sHGfqYwl/61WHQMVhXI
+pigAn2j8OSCX4ToVPdwV9DG0TzP2SAZ+
+=l+G4
+-----END PGP SIGNATURE-----
diff --git a/dev-util/svnmailer/files/svnmailer-1.0.8-python2.5.diff b/dev-util/svnmailer/files/svnmailer-1.0.8-python2.5.diff
new file mode 100644
index 000000000000..348f26f36a0a
--- /dev/null
+++ b/dev-util/svnmailer/files/svnmailer-1.0.8-python2.5.diff
@@ -0,0 +1,47 @@
+Index: src/lib/svnmailer/notifier/_base.py
+===================================================================
+--- src/lib/svnmailer/notifier/_base.py
++++ src/lib/svnmailer/notifier/_base.py	2007-05-01 00:54:23.000000000 +0200
+@@ -345,7 +345,6 @@
+             @return: The two encodings
+             @rtype: C{tuple} of C{str}
+         """
+-        from encodings import exceptions
+ 
+         enc1 = enc2 = default
+         if not change.wasAdded() or change.wasCopied():
+@@ -353,7 +352,7 @@
+                 enc1 = self._getContentEncoding(
+                     change.getBasePath(), change.getBaseRevision()
+                 )
+-            except exceptions.LookupError:
++            except LookupError:
+                 # fall back
+                 pass
+ 
+@@ -364,7 +363,7 @@
+                 enc2 = self._getContentEncoding(
+                     change.path, change.revision
+                 )
+-            except exceptions.LookupError:
++            except LookupError:
+                 # fall back
+                 pass
+ 
+@@ -389,7 +388,6 @@
+             @exception encodings.exception.LookupError: The specified encoding
+                 is not implemented or no encoding was specified
+         """
+-        from encodings import exceptions
+ 
+         # first try the svn:mime-type
+         enc = self.getEncodingFromMimeType(path, revision)
+@@ -427,7 +425,7 @@
+             codecs.lookup(enc)
+             return enc
+ 
+-        raise exceptions.LookupError("No Encoding configured")
++        raise LookupError("No Encoding configured")
+ 
+ 
+     def getEncodingFromMimeType(self, path, revision):
diff --git a/dev-util/svnmailer/svnmailer-1.0.8-r2.ebuild b/dev-util/svnmailer/svnmailer-1.0.8-r2.ebuild
new file mode 100644
index 000000000000..f6b6cc9d9cb2
--- /dev/null
+++ b/dev-util/svnmailer/svnmailer-1.0.8-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/svnmailer/svnmailer-1.0.8-r2.ebuild,v 1.1 2008/04/06 13:41:20 hanno Exp $
+
+inherit distutils eutils
+
+DESCRIPTION="A subversion commit notifier written in Python"
+SRC_URI="http://storage.perlig.de/svnmailer/${P}.tar.bz2"
+HOMEPAGE="http://opensource.perlig.de/svnmailer/"
+
+IUSE=""
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+LICENSE="Apache-2.0"
+
+DEPEND=">=dev-lang/python-2.3"
+RDEPEND="${DEPEND}
+	dev-util/subversion
+	virtual/mta"
+
+DOCS="CHANGES NOTICE CREDITS"
+
+pkg_setup() {
+	if ! built_with_use dev-util/subversion python ; then
+		eerror "This package requires dev-util/subversion to be built with python support."
+		eerror "Please enable the python USE flag and remerge subversion."
+		elog "USE flags can be enabled globally in /etc/make.conf,"
+		elog "or for specific packages in /etc/portage/package.use."
+		die "dev-utils/subversion was built without python support"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-python2.5.diff"
+}
+
+src_install() {
+	distutils_src_install
+
+	dohtml -r docs/* || die "failed to install HTML documentation"
+}