summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Schiffbauer <mschiff@gentoo.org>2014-05-15 21:44:35 +0000
committerMarc Schiffbauer <mschiff@gentoo.org>2014-05-15 21:44:35 +0000
commitc828c1d38387e33745c69962e3e43d16dd235ebb (patch)
tree29602795260a27f1dfc1c510bb82757f46ff4126 /app-backup
parentSymlink native certtool for reuse in tests, bug #510420. (diff)
downloadgentoo-2-c828c1d38387e33745c69962e3e43d16dd235ebb.tar.gz
gentoo-2-c828c1d38387e33745c69962e3e43d16dd235ebb.tar.bz2
gentoo-2-c828c1d38387e33745c69962e3e43d16dd235ebb.zip
Bump version. Drop old version.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x296C6CCA35A64134)
Diffstat (limited to 'app-backup')
-rw-r--r--app-backup/obnam/ChangeLog8
-rw-r--r--app-backup/obnam/files/obnam-gnupg-ownertrust.patch15
-rw-r--r--app-backup/obnam/obnam-1.8.ebuild (renamed from app-backup/obnam/obnam-1.6.1-r1.ebuild)14
3 files changed, 14 insertions, 23 deletions
diff --git a/app-backup/obnam/ChangeLog b/app-backup/obnam/ChangeLog
index e541a545a644..355d9a276e9e 100644
--- a/app-backup/obnam/ChangeLog
+++ b/app-backup/obnam/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-backup/obnam
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/obnam/ChangeLog,v 1.21 2014/05/02 16:49:19 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/obnam/ChangeLog,v 1.22 2014/05/15 21:44:35 mschiff Exp $
+
+*obnam-1.8 (15 May 2014)
+
+ 15 May 2014; Marc Schiffbauer <mschiff@gentoo.org> -obnam-1.6.1-r1.ebuild,
+ +obnam-1.8.ebuild, -files/obnam-gnupg-ownertrust.patch:
+ Bump version. Drop old version.
02 May 2014; Marc Schiffbauer <mschiff@gentoo.org> obnam-1.7.4.ebuild:
Added missing dependency. Fixes bug #507746. Thanks to 'Small_Penguin'
diff --git a/app-backup/obnam/files/obnam-gnupg-ownertrust.patch b/app-backup/obnam/files/obnam-gnupg-ownertrust.patch
deleted file mode 100644
index c1c32d810503..000000000000
--- a/app-backup/obnam/files/obnam-gnupg-ownertrust.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/obnamlib/encryption.py b/obnamlib/encryption.py
-index 9fa849a..1d7643b 100644
---- a/obnamlib/encryption.py
-+++ b/obnamlib/encryption.py
-@@ -168,6 +168,10 @@ class Keyring(object):
- f = open(self._keyring, 'wb')
- f.write(self._encoded)
- f.close()
-+ _gpg(['--import-ownertrust'], stdin='''\
-+# List of assigned trustvalues, created Sun 01 Dec 2013 19:13:26 GMT
-+# (Use "gpg --import-ownertrust" to restore them)
-+''', gpghome=self._gpghome)
-
- def _cleanup(self):
- shutil.rmtree(self._gpghome)
diff --git a/app-backup/obnam/obnam-1.6.1-r1.ebuild b/app-backup/obnam/obnam-1.8.ebuild
index ee6e2e1cf065..2c23cc1a6ed3 100644
--- a/app-backup/obnam/obnam-1.6.1-r1.ebuild
+++ b/app-backup/obnam/obnam-1.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/obnam/obnam-1.6.1-r1.ebuild,v 1.1 2013/12/04 14:34:52 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/obnam/obnam-1.8.ebuild,v 1.1 2014/05/15 21:44:35 mschiff Exp $
EAPI=5
@@ -12,7 +12,7 @@ MY_P="${PN}_${PV}.orig"
inherit eutils distutils-r1
DESCRIPTION="A backup program that supports encryption and deduplication"
-HOMEPAGE="http://liw.fi/obnam/"
+HOMEPAGE="http://obnam.org/"
SRC_URI="http://code.liw.fi/debian/pool/main/o/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-3"
@@ -22,14 +22,15 @@ IUSE=""
DEPEND="${PYTHON_DEPS}
dev-python/cliapp
+ dev-python/fuse-python
dev-python/larch
- dev-python/paramiko
+ !=dev-python/paramiko-1.13.0
dev-python/tracing
dev-python/ttystatus
"
RDEPEND="${DEPEND}"
-PATCHES=( ${FILESDIR}/${PN}-gnupg-ownertrust.patch )
+PATCHES=( )
src_compile() {
addwrite /proc/self/comm
@@ -38,8 +39,7 @@ src_compile() {
src_install() {
distutils-r1_src_install
- rm "${D}"/usr/bin/obnam-{benchmark,viewprof}*
- rm "${D}"/usr/share/man/man1/obnam-{benchmark,viewprof}*
+ find "${D}" -name "obnam-viewprof*" -delete
insinto /etc
doins "${FILESDIR}"/obnam.conf
keepdir /var/log/obnam