From e562bd244efdcfeb23ebb02017d342a0faf4f820 Mon Sep 17 00:00:00 2001
From: Manuel Lausch <mail@manuellausch.de>
Date: Mon, 21 Apr 2014 23:16:09 -0400
Subject: app-backup/bup: make sure bup uses python2

Also, update to EAPI=5.
---
 app-backup/bup/bup-0.25-r1.ebuild | 58 ----------------------------------
 app-backup/bup/bup-0.25-r2.ebuild | 65 +++++++++++++++++++++++++++++++++++++++
 app-backup/bup/bup-9999.ebuild    | 10 ++++--
 3 files changed, 73 insertions(+), 60 deletions(-)
 delete mode 100644 app-backup/bup/bup-0.25-r1.ebuild
 create mode 100644 app-backup/bup/bup-0.25-r2.ebuild

diff --git a/app-backup/bup/bup-0.25-r1.ebuild b/app-backup/bup/bup-0.25-r1.ebuild
deleted file mode 100644
index 1cb2cdc..0000000
--- a/app-backup/bup/bup-0.25-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit eutils
-
-DOC_COMMIT="bc21345a527cc446084369861655126f6b0ecd8a"
-
-DESCRIPTION="It backs things up based on the git packfile format"
-HOMEPAGE="http://github.com/bup/bup"
-SRC_URI="http://github.com/bup/bup/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz
-	http://github.com/bup/bup/archive/${DOC_COMMIT}.tar.gz -> ${P}-man.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="|| (
-			dev-lang/python:2.4
-			dev-lang/python:2.5
-			dev-lang/python:2.6
-			dev-lang/python:2.7
-		)
-		dev-vcs/git
-		app-arch/par2cmdline
-		dev-python/fuse-python
-		dev-python/pyxattr
-		dev-python/pylibacl"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	mv "../bup-${DOC_COMMIT}" bup-man || die
-}
-
-src_configure() {
-	echo "Nothing to configure..."
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	doman "${S}"/bup-man/*
-
-	dodoc "${D}/usr/share/doc/${PN}"/*
-	rm -r "${D}/usr/share/doc/${PN}/" || die
-
-	dodoc README README.md DESIGN
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-backup/bup/bup-0.25-r2.ebuild b/app-backup/bup/bup-0.25-r2.ebuild
new file mode 100644
index 0000000..39cf21b
--- /dev/null
+++ b/app-backup/bup/bup-0.25-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils python
+
+DOC_COMMIT="bc21345a527cc446084369861655126f6b0ecd8a"
+
+DESCRIPTION="It backs things up based on the git packfile format"
+HOMEPAGE="http://github.com/bup/bup"
+SRC_URI="http://github.com/bup/bup/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz
+	http://github.com/bup/bup/archive/${DOC_COMMIT}.tar.gz -> ${P}-man.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="|| (
+			dev-lang/python:2.4
+			dev-lang/python:2.5
+			dev-lang/python:2.6
+			dev-lang/python:2.7
+		)
+		dev-vcs/git
+		app-arch/par2cmdline
+		dev-python/fuse-python
+		dev-python/pyxattr
+		dev-python/pylibacl"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+    python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	mv "../bup-${DOC_COMMIT}" bup-man || die
+	python_convert_shebangs -r 2 .
+}
+
+src_configure() {
+	echo "Nothing to configure..."
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+
+	doman "${S}"/bup-man/*
+
+	dodoc "${D}/usr/share/doc/${PN}"/*
+	rm -r "${D}/usr/share/doc/${PN}/" || die
+
+	dodoc README README.md DESIGN
+}
+
+src_test() {
+	emake test
+}
diff --git a/app-backup/bup/bup-9999.ebuild b/app-backup/bup/bup-9999.ebuild
index f3b7fa6..ac8e3f1 100644
--- a/app-backup/bup/bup-9999.ebuild
+++ b/app-backup/bup/bup-9999.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 EGIT_REPO_URI="git://github.com/bup/${PN}.git
 	http://github.com/bup/${PN}.git"
-inherit git-2 eutils
+inherit git-2 eutils python
 
 DESCRIPTION="It backs things up based on the git packfile format"
 HOMEPAGE="http://github.com/bup/bup"
@@ -30,8 +30,14 @@ DEPEND="|| (
 		doc? ( app-text/pandoc )"
 RDEPEND="${DEPEND}"
 
+pkg_setup() {
+    python_set_active_version 2
+	python_pkg_setup
+}
+
 src_prepare() {
 	epatch_user
+	python_convert_shebangs -r 2 .
 }
 
 src_configure() {
-- 
cgit v1.2.3-65-gdbad