Fix from upstream, Python 2.5 support.

(Portage version: 2.1.3.6)

4 files changed, 86 insertions, 1 deletions

diff --git a/app-backup/duplicity/ChangeLog b/app-backup/duplicity/ChangeLog
index c361690adab0..05033c67f728 100644
--- a/app-backup/duplicity/ChangeLog
+++ b/app-backup/duplicity/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-backup/duplicity
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/duplicity/ChangeLog,v 1.11 2007/04/17 11:01:46 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/duplicity/ChangeLog,v 1.12 2007/08/18 19:22:49 drac Exp $
+
+*duplicity-0.4.2-r2 (18 Aug 2007)
+
+  18 Aug 2007; Samuli Suominen <drac@gentoo.org>
+  +files/duplicity-0.4.2-python-2.5.patch, +duplicity-0.4.2-r2.ebuild:
+  Fix from upstream, Python 2.5 support.
 
   17 Apr 2007; Christian Faulhammer <opfer@gentoo.org>
   duplicity-0.4.2-r1.ebuild:
diff --git a/app-backup/duplicity/duplicity-0.4.2-r2.ebuild b/app-backup/duplicity/duplicity-0.4.2-r2.ebuild
new file mode 100644
index 000000000000..be02c79673f1
--- /dev/null
+++ b/app-backup/duplicity/duplicity-0.4.2-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/duplicity/duplicity-0.4.2-r2.ebuild,v 1.1 2007/08/18 19:22:49 drac Exp $
+
+inherit distutils eutils
+
+DESCRIPTION="duplicity is a secure backup system using gnupg to encrypt data"
+HOMEPAGE="http://www.nongnu.org/duplicity/"
+SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="virtual/libc
+	>=dev-lang/python-2.3
+	>=net-libs/librsync-0.9.6"
+RDEPEND="${DEPEND}
+	app-crypt/gnupg"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Fix crash on FTP timeout, bug #147054.
+	epatch "${FILESDIR}"/${PV}-ftp-retry.patch
+
+	# Fix from upstream, Python 2.5 support.
+	epatch "${FILESDIR}"/${P}-python-2.5.patch
+
+	# Fix behavior for scp:// URL when /bin/sh is bash, bug #151938.
+	sed -i -e "s:echo -e:printf:" src/backends.py
+}
+
+src_compile() {
+	distutils_src_compile
+}
+
+src_install() {
+	python setup.py install --prefix=${D}/usr
+}
+
+pkg_postinst() {
+	python_version
+	python_mod_optimize /usr/lib/python${PYVER}/site-packages/duplicity
+}
+
+pkg_postrm() {
+	python_version
+	python_mod_cleanup
+}
diff --git a/app-backup/duplicity/files/digest-duplicity-0.4.2-r2 b/app-backup/duplicity/files/digest-duplicity-0.4.2-r2
new file mode 100644
index 000000000000..36319b479175
--- /dev/null
+++ b/app-backup/duplicity/files/digest-duplicity-0.4.2-r2
@@ -0,0 +1,3 @@
+MD5 a9fd4094f23bb36c82cc1dc2816a5b7d duplicity-0.4.2.tar.gz 103183
+RMD160 c6c86f397e43b7d5f63965d69f3328daa601d00b duplicity-0.4.2.tar.gz 103183
+SHA256 5fdf8aeb32bb4c09e3c9d5c4150245a71d757d31d9bb341524de75e06421e176 duplicity-0.4.2.tar.gz 103183
diff --git a/app-backup/duplicity/files/duplicity-0.4.2-python-2.5.patch b/app-backup/duplicity/files/duplicity-0.4.2-python-2.5.patch
new file mode 100644
index 000000000000..f97ff1f1345b
--- /dev/null
+++ b/app-backup/duplicity/files/duplicity-0.4.2-python-2.5.patch
@@ -0,0 +1,24 @@
+diff -ur duplicity-0.4.2.orig/src/tarfile.py duplicity-0.4.2/src/tarfile.py
+--- duplicity-0.4.2.orig/src/tarfile.py	2006-02-03 05:44:31.000000000 +0200
++++ duplicity-0.4.2/src/tarfile.py	2007-08-18 22:12:53.000000000 +0300
+@@ -1062,12 +1062,14 @@
+         """
+         tarinfo = TarInfo()
+         tarinfo.name = nts(buf[0:100])
+-        tarinfo.mode = int(buf[100:108], 8)
+-        tarinfo.uid = int(buf[108:116],8)
+-        tarinfo.gid = int(buf[116:124],8)
+-        tarinfo.size = long(buf[124:136], 8)
+-        tarinfo.mtime = long(buf[136:148], 8)
+-        tarinfo.chksum = int(buf[148:156], 8)
++        tarinfo.mode = int(buf[100:107], 8)
++        tarinfo.uid = int(buf[108:115],8)
++        tarinfo.gid = int(buf[116:123],8)
++        tarinfo.size = long(buf[124:135], 8)
++        tarinfo.mtime = long(buf[136:147], 8)
++		# chksum stored as a six digit octal number with
++		# leading zeroes followed by a nul and then a space
++        tarinfo.chksum = int(buf[148:154], 8)
+         tarinfo.type = buf[156:157]
+         tarinfo.linkname = nts(buf[157:257])
+         tarinfo.uname = nts(buf[265:297])