Version and dependency bump. Drop old versions.

(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key 0x296C6CCA35A64134)

3 files changed, 21 insertions, 42 deletions

diff --git a/app-backup/obnam/ChangeLog b/app-backup/obnam/ChangeLog
index 12c977f5eb86..2fe274682348 100644
--- a/app-backup/obnam/ChangeLog
+++ b/app-backup/obnam/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-backup/obnam
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/obnam/ChangeLog,v 1.8 2012/11/15 15:28:14 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/obnam/ChangeLog,v 1.9 2012/12/18 15:55:03 mschiff Exp $
+
+*obnam-1.3 (18 Dec 2012)
+
+  18 Dec 2012; Marc Schiffbauer <mschiff@gentoo.org> -obnam-1.1.ebuild,
+  -obnam-1.2.ebuild, +obnam-1.3.ebuild:
+  Version and dependency bump. Drop old versions.
 
   15 Nov 2012; Marc Schiffbauer <mschiff@gentoo.org> obnam-1.2-r1.ebuild:
   Set active python version. Fixes #443272. Thanks to Justin Keogh
diff --git a/app-backup/obnam/obnam-1.1.ebuild b/app-backup/obnam/obnam-1.1.ebuild
deleted file mode 100644
index 3aa8d8a88442..000000000000
--- a/app-backup/obnam/obnam-1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/obnam/obnam-1.1.ebuild,v 1.1 2012/07/09 00:11:45 mschiff Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.6:2.7"
-PYTHON_MODNAME="${PN}lib"
-MY_P="${PN}_${PV}.orig"
-
-inherit distutils python
-
-DESCRIPTION="A backup program that supports encryption and deduplication"
-HOMEPAGE="http://liw.fi/obnam/"
-SRC_URI="http://code.liw.fi/debian/pool/main/o/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-python/cliapp-1.20120630
-	dev-python/larch
-	dev-python/paramiko
-	dev-python/tracing
-	>=dev-python/ttystatus-0.19
-	"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	distutils_src_install
-	rm "${D}"/usr/bin/obnam-{benchmark,viewprof}
-	rm "${D}"/usr/share/man/man1/obnam-benchmark*
-}
diff --git a/app-backup/obnam/obnam-1.2.ebuild b/app-backup/obnam/obnam-1.3.ebuild
index 46eb230a5267..3f0187ba6414 100644
--- a/app-backup/obnam/obnam-1.2.ebuild
+++ b/app-backup/obnam/obnam-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/obnam/obnam-1.2.ebuild,v 1.3 2012/10/11 07:47:12 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/obnam/obnam-1.3.ebuild,v 1.1 2012/12/18 15:55:03 mschiff Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ PYTHON_DEPEND="2:2.6:2.7"
 PYTHON_MODNAME="${PN}lib"
 MY_P="${PN}_${PV}.orig"
 
-inherit distutils python
+inherit eutils distutils python
 
 DESCRIPTION="A backup program that supports encryption and deduplication"
 HOMEPAGE="http://liw.fi/obnam/"
@@ -19,20 +19,29 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=dev-python/cliapp-1.20120630
+DEPEND="dev-python/cliapp
 	dev-python/larch
 	dev-python/paramiko
 	dev-python/tracing
-	>=dev-python/ttystatus-0.19
+	dev-python/ttystatus
 	"
 RDEPEND="${DEPEND}"
 
 # S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	distutils_src_prepare
+}
+
 src_install() {
 	distutils_src_install
 	rm "${D}"/usr/bin/obnam-{benchmark,viewprof}
-	rm "${D}"/usr/share/man/man1/obnam-benchmark*
+	rm "${D}"/usr/share/man/man1/obnam-{benchmark,viewprof}*
 	insinto /etc
 	doins "${FILESDIR}"/obnam.conf
 	keepdir /var/log/obnam