From 25a5bf5a20f8d3f4323eef363cdd270325497c0a Mon Sep 17 00:00:00 2001
From: Matthew Thode <prometheanfire@gentoo.org>
Date: Fri, 9 Mar 2018 11:22:41 -0600
Subject: app-backup/attic: allow use of renamed msgpack

Package-Manager: Portage-2.3.19, Repoman-2.3.6
---
 app-backup/attic/attic-0.16-r1.ebuild | 40 +++++++++++++++++++++++++++++++++++
 app-backup/attic/attic-0.16.ebuild    | 34 -----------------------------
 app-backup/attic/attic-9999.ebuild    |  8 ++++++-
 3 files changed, 47 insertions(+), 35 deletions(-)
 create mode 100644 app-backup/attic/attic-0.16-r1.ebuild
 delete mode 100644 app-backup/attic/attic-0.16.ebuild

diff --git a/app-backup/attic/attic-0.16-r1.ebuild b/app-backup/attic/attic-0.16-r1.ebuild
new file mode 100644
index 000000000000..3959eafcf9d1
--- /dev/null
+++ b/app-backup/attic/attic-0.16-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python3_{4,5} )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/jborg/attic.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/jborg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Attic is a deduplicating backup program written in Python."
+HOMEPAGE="https://attic-backup.org/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="libressl"
+
+RDEPEND="
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	dev-python/llfuse[${PYTHON_USEDEP}]"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	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/attic/attic-0.16.ebuild b/app-backup/attic/attic-0.16.ebuild
deleted file mode 100644
index faaffb46778a..000000000000
--- a/app-backup/attic/attic-0.16.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python3_{4,5} )
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/jborg/attic.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/jborg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Attic is a deduplicating backup program written in Python."
-HOMEPAGE="https://attic-backup.org/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="libressl"
-
-RDEPEND="
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	dev-python/llfuse[${PYTHON_USEDEP}]"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	${RDEPEND}"
diff --git a/app-backup/attic/attic-9999.ebuild b/app-backup/attic/attic-9999.ebuild
index faaffb46778a..3959eafcf9d1 100644
--- a/app-backup/attic/attic-9999.ebuild
+++ b/app-backup/attic/attic-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -32,3 +32,9 @@ DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	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
+}
-- 
cgit v1.2.3-18-g5258