Bump version. Remove older versions

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

3 files changed, 20 insertions, 77 deletions

diff --git a/app-backup/obnam/ChangeLog b/app-backup/obnam/ChangeLog
index 00cc5ee88d4e..2c69d90a587e 100644
--- a/app-backup/obnam/ChangeLog
+++ b/app-backup/obnam/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-backup/obnam
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/obnam/ChangeLog,v 1.12 2013/04/01 07:47:02 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/obnam/ChangeLog,v 1.13 2013/08/09 15:40:34 mschiff Exp $
+
+*obnam-1.5 (09 Aug 2013)
+
+  09 Aug 2013; Marc Schiffbauer <mschiff@gentoo.org> +obnam-1.5.ebuild,
+  -obnam-1.2-r1.ebuild, -obnam-1.3.ebuild:
+  Bump version. Remove older versions
 
   01 Apr 2013; Patrick Lauer <patrick@gentoo.org> obnam-1.4.ebuild:
   Add python[threads] to dep to avoid build failure
diff --git a/app-backup/obnam/obnam-1.2-r1.ebuild b/app-backup/obnam/obnam-1.2-r1.ebuild
deleted file mode 100644
index 713740f70d33..000000000000
--- a/app-backup/obnam/obnam-1.2-r1.ebuild
+++ /dev/null
@@ -1,58 +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.2-r1.ebuild,v 1.3 2012/11/15 15:28:14 mschiff Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.6:2.7"
-PYTHON_MODNAME="${PN}lib"
-MY_P="${PN}_${PV}.orig"
-
-inherit eutils 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}"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	distutils_src_prepare
-	epatch "${FILESDIR}/${P}_diff_fix.patch"
-	epatch "${FILESDIR}/${P}_man_diff_fix.patch"
-}
-
-src_install() {
-	distutils_src_install
-	rm "${D}"/usr/bin/obnam-{benchmark,viewprof}
-	rm "${D}"/usr/share/man/man1/obnam-benchmark*
-	insinto /etc
-	doins "${FILESDIR}"/obnam.conf
-	keepdir /var/log/obnam
-}
-
-pkg_postinst() {
-	if [[ $REPLACING_VERSIONS < "1.2" ]]; then
-		elog "You will need to setup a config file before running obnam for the first time."
-		elog "For details, please see the obnam(1) manual page."
-		elog "An example file has been installed as /etc/obnam.conf for your convenience."
-	fi
-}
diff --git a/app-backup/obnam/obnam-1.3.ebuild b/app-backup/obnam/obnam-1.5.ebuild
index 465f6f70561c..0b36f4522d51 100644
--- a/app-backup/obnam/obnam-1.3.ebuild
+++ b/app-backup/obnam/obnam-1.5.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/obnam/obnam-1.3.ebuild,v 1.2 2013/02/28 23:55:37 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/obnam/obnam-1.5.ebuild,v 1.1 2013/08/09 15:40:34 mschiff Exp $
 
-EAPI=4
+EAPI=5
 
-PYTHON_DEPEND="2:2.6:2.7"
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="threads"
 PYTHON_MODNAME="${PN}lib"
 MY_P="${PN}_${PV}.orig"
 
-inherit eutils distutils python
+inherit eutils distutils-r1
 
 DESCRIPTION="A backup program that supports encryption and deduplication"
 HOMEPAGE="http://liw.fi/obnam/"
@@ -19,29 +20,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="dev-python/cliapp
-	dev-python/larch
+DEPEND="${PYTHON_DEPS}
+	dev-python/cliapp
+	>=dev-python/larch-1.20130808
 	dev-python/paramiko
 	dev-python/tracing
 	dev-python/ttystatus
 	"
 RDEPEND="${DEPEND}"
 
-# S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	addpredict /proc/self/comm
-	distutils_src_prepare
+src_compile() {
+	addwrite /proc/self/comm
+	distutils-r1_src_compile
 }
 
 src_install() {
-	distutils_src_install
-	rm "${D}"/usr/bin/obnam-{benchmark,viewprof}
+	distutils-r1_src_install
+	rm "${D}"/usr/bin/obnam-{benchmark,viewprof}*
 	rm "${D}"/usr/share/man/man1/obnam-{benchmark,viewprof}*
 	insinto /etc
 	doins "${FILESDIR}"/obnam.conf