From 6be966567cce366a0cc092b082b771edc814dfa7 Mon Sep 17 00:00:00 2001
From: Matthew Thode <prometheanfire@gentoo.org>
Date: Fri, 9 Mar 2018 11:25:40 -0600
Subject: [PATCH] app-backup/borgbackup: allow the use of the msgpack rename w/
 fast stable

Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --force
---
 ...borgbackup-1.1.3.ebuild => borgbackup-1.1.3-r1.ebuild} | 8 +++++++-
 ...borgbackup-1.1.4.ebuild => borgbackup-1.1.4-r1.ebuild} | 8 +++++++-
 app-backup/borgbackup/borgbackup-9999.ebuild              | 8 +++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)
 rename app-backup/borgbackup/{borgbackup-1.1.3.ebuild => borgbackup-1.1.3-r1.ebuild} (83%)
 rename app-backup/borgbackup/{borgbackup-1.1.4.ebuild => borgbackup-1.1.4-r1.ebuild} (83%)

diff --git a/app-backup/borgbackup/borgbackup-1.1.3.ebuild b/app-backup/borgbackup/borgbackup-1.1.3-r1.ebuild
similarity index 83%
rename from app-backup/borgbackup/borgbackup-1.1.3.ebuild
rename to app-backup/borgbackup/borgbackup-1.1.3-r1.ebuild
index f0eea83acae88..bb6bf0f8a5ee3 100644
--- a/app-backup/borgbackup/borgbackup-1.1.3.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -38,3 +38,9 @@ DEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 	${RDEPEND}
 "
+
+python_prepare_all() {
+	# allow use of new (renamed) msgpack
+	sed -i '/msgpack/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/app-backup/borgbackup/borgbackup-1.1.4.ebuild b/app-backup/borgbackup/borgbackup-1.1.4-r1.ebuild
similarity index 83%
rename from app-backup/borgbackup/borgbackup-1.1.4.ebuild
rename to app-backup/borgbackup/borgbackup-1.1.4-r1.ebuild
index 664c1f81223c3..e04ac14d4248d 100644
--- a/app-backup/borgbackup/borgbackup-1.1.4.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -38,3 +38,9 @@ DEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 	${RDEPEND}
 "
+
+python_prepare_all() {
+	# allow use of new (renamed) msgpack
+	sed -i '/msgpack/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/app-backup/borgbackup/borgbackup-9999.ebuild b/app-backup/borgbackup/borgbackup-9999.ebuild
index 664c1f81223c3..e04ac14d4248d 100644
--- a/app-backup/borgbackup/borgbackup-9999.ebuild
+++ b/app-backup/borgbackup/borgbackup-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -38,3 +38,9 @@ DEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 	${RDEPEND}
 "
+
+python_prepare_all() {
+	# allow use of new (renamed) msgpack
+	sed -i '/msgpack/d' setup.py || die
+	distutils-r1_python_prepare_all
+}