Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-backup/borgbackup/
Date: Sun, 29 Mar 2020 15:25:44
Message-Id: 1585495535.67e647180c1791bd77fb312df96cfa7e7e8004a9.blueness@gentoo
1 commit: 67e647180c1791bd77fb312df96cfa7e7e8004a9
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 29 15:25:15 2020 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 29 15:25:35 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67e64718
7
8 app-backup/borgbackup: fall back on bundled msgpack, bug #713820
9
10 Package-Manager: Portage-2.3.89, Repoman-2.3.20
11 Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
12
13 .../{borgbackup-9999.ebuild => borgbackup-1.1.11-r2.ebuild} | 11 +----------
14 app-backup/borgbackup/borgbackup-9999.ebuild | 11 +----------
15 2 files changed, 2 insertions(+), 20 deletions(-)
16
17 diff --git a/app-backup/borgbackup/borgbackup-9999.ebuild b/app-backup/borgbackup/borgbackup-1.1.11-r2.ebuild
18 similarity index 79%
19 copy from app-backup/borgbackup/borgbackup-9999.ebuild
20 copy to app-backup/borgbackup/borgbackup-1.1.11-r2.ebuild
21 index b326c5264e4..3b9d5248820 100644
22 --- a/app-backup/borgbackup/borgbackup-9999.ebuild
23 +++ b/app-backup/borgbackup/borgbackup-1.1.11-r2.ebuild
24 @@ -3,7 +3,7 @@
25
26 EAPI=7
27
28 -PYTHON_COMPAT=( python3_6 )
29 +PYTHON_COMPAT=( python3_{6,7} )
30
31 inherit distutils-r1
32
33 @@ -28,7 +28,6 @@ RDEPEND="
34 app-arch/lz4
35 virtual/acl
36 dev-python/llfuse[${PYTHON_USEDEP}]
37 - dev-python/msgpack[${PYTHON_USEDEP}]
38 dev-python/pyzmq[${PYTHON_USEDEP}]
39 !libressl? ( dev-libs/openssl:0= )
40 libressl? ( dev-libs/libressl:0= )
41 @@ -40,14 +39,6 @@ DEPEND="
42 ${RDEPEND}
43 "
44
45 -BDEPEND="dev-python/pkgconfig"
46 -
47 -python_prepare_all() {
48 - # allow use of new (renamed) msgpack
49 - sed -i "s|'msgpack-python.*',||g" setup.py || die
50 - distutils-r1_python_prepare_all
51 -}
52 -
53 src_install() {
54 distutils-r1_src_install
55 doman docs/man/*
56
57 diff --git a/app-backup/borgbackup/borgbackup-9999.ebuild b/app-backup/borgbackup/borgbackup-9999.ebuild
58 index b326c5264e4..3b9d5248820 100644
59 --- a/app-backup/borgbackup/borgbackup-9999.ebuild
60 +++ b/app-backup/borgbackup/borgbackup-9999.ebuild
61 @@ -3,7 +3,7 @@
62
63 EAPI=7
64
65 -PYTHON_COMPAT=( python3_6 )
66 +PYTHON_COMPAT=( python3_{6,7} )
67
68 inherit distutils-r1
69
70 @@ -28,7 +28,6 @@ RDEPEND="
71 app-arch/lz4
72 virtual/acl
73 dev-python/llfuse[${PYTHON_USEDEP}]
74 - dev-python/msgpack[${PYTHON_USEDEP}]
75 dev-python/pyzmq[${PYTHON_USEDEP}]
76 !libressl? ( dev-libs/openssl:0= )
77 libressl? ( dev-libs/libressl:0= )
78 @@ -40,14 +39,6 @@ DEPEND="
79 ${RDEPEND}
80 "
81
82 -BDEPEND="dev-python/pkgconfig"
83 -
84 -python_prepare_all() {
85 - # allow use of new (renamed) msgpack
86 - sed -i "s|'msgpack-python.*',||g" setup.py || die
87 - distutils-r1_python_prepare_all
88 -}
89 -
90 src_install() {
91 distutils-r1_src_install
92 doman docs/man/*