commit: 67e647180c1791bd77fb312df96cfa7e7e8004a9 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Sun Mar 29 15:25:15 2020 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Sun Mar 29 15:25:35 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67e64718
app-backup/borgbackup: fall back on bundled msgpack, bug #713820 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> .../{borgbackup-9999.ebuild => borgbackup-1.1.11-r2.ebuild} | 11 +---------- app-backup/borgbackup/borgbackup-9999.ebuild | 11 +---------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/app-backup/borgbackup/borgbackup-9999.ebuild b/app-backup/borgbackup/borgbackup-1.1.11-r2.ebuild similarity index 79% copy from app-backup/borgbackup/borgbackup-9999.ebuild copy to app-backup/borgbackup/borgbackup-1.1.11-r2.ebuild index b326c5264e4..3b9d5248820 100644 --- a/app-backup/borgbackup/borgbackup-9999.ebuild +++ b/app-backup/borgbackup/borgbackup-1.1.11-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{6,7} ) inherit distutils-r1 @@ -28,7 +28,6 @@ RDEPEND=" app-arch/lz4 virtual/acl dev-python/llfuse[${PYTHON_USEDEP}] - dev-python/msgpack[${PYTHON_USEDEP}] dev-python/pyzmq[${PYTHON_USEDEP}] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) @@ -40,14 +39,6 @@ DEPEND=" ${RDEPEND} " -BDEPEND="dev-python/pkgconfig" - -python_prepare_all() { - # allow use of new (renamed) msgpack - sed -i "s|'msgpack-python.*',||g" setup.py || die - distutils-r1_python_prepare_all -} - src_install() { distutils-r1_src_install doman docs/man/* diff --git a/app-backup/borgbackup/borgbackup-9999.ebuild b/app-backup/borgbackup/borgbackup-9999.ebuild index b326c5264e4..3b9d5248820 100644 --- a/app-backup/borgbackup/borgbackup-9999.ebuild +++ b/app-backup/borgbackup/borgbackup-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{6,7} ) inherit distutils-r1 @@ -28,7 +28,6 @@ RDEPEND=" app-arch/lz4 virtual/acl dev-python/llfuse[${PYTHON_USEDEP}] - dev-python/msgpack[${PYTHON_USEDEP}] dev-python/pyzmq[${PYTHON_USEDEP}] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) @@ -40,14 +39,6 @@ DEPEND=" ${RDEPEND} " -BDEPEND="dev-python/pkgconfig" - -python_prepare_all() { - # allow use of new (renamed) msgpack - sed -i "s|'msgpack-python.*',||g" setup.py || die - distutils-r1_python_prepare_all -} - src_install() { distutils-r1_src_install doman docs/man/*