From f6d0ed6e6f6b16f6b7fd3d4ceb10fc58ed8f456b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Sat, 18 Feb 2017 18:03:17 +0100
Subject: [PATCH] dev-vcs/git-bzr-ng: python-single-r1, EAPI=6

---
 ...ild => git-bzr-ng-0_pre20120822-r1.ebuild} | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)
 rename dev-vcs/git-bzr-ng/{git-bzr-ng-0_pre20120822.ebuild => git-bzr-ng-0_pre20120822-r1.ebuild} (67%)

diff --git a/dev-vcs/git-bzr-ng/git-bzr-ng-0_pre20120822.ebuild b/dev-vcs/git-bzr-ng/git-bzr-ng-0_pre20120822-r1.ebuild
similarity index 67%
rename from dev-vcs/git-bzr-ng/git-bzr-ng-0_pre20120822.ebuild
rename to dev-vcs/git-bzr-ng/git-bzr-ng-0_pre20120822-r1.ebuild
index 8d6457a39722..328aad8ad6e3 100644
--- a/dev-vcs/git-bzr-ng/git-bzr-ng-0_pre20120822.ebuild
+++ b/dev-vcs/git-bzr-ng/git-bzr-ng-0_pre20120822-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
-PYTHON_DEPEND="2"
+PYTHON_COMPAT=( python2_7 )
 
-inherit python
+inherit python-single-r1
 
 DESCRIPTION="Git subcommand providing a bidirectional bridge to Bazaar repositories"
 HOMEPAGE="https://github.com/termie/git-bzr-ng"
@@ -19,17 +19,12 @@ IUSE=""
 
 RDEPEND=">=dev-vcs/bzr-2.2
 	dev-vcs/git
-	>=dev-vcs/bzr-fastimport-0.10
-	dev-python/python-fastimport"
+	>=dev-vcs/bzr-fastimport-0.10"
 DEPEND="app-arch/xz-utils"
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
 src_prepare() {
-	python_convert_shebangs 2 git-bzr
+	eapply_user
+	python_fix_shebang git-bzr
 }
 
 src_install() {
-- 
2.26.2