From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1157460-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 88E90138239 for <garchives@archives.gentoo.org>; Sun, 29 Mar 2020 15:25:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A25ABE096E; Sun, 29 Mar 2020 15:25:43 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7412FE096E for <gentoo-commits@lists.gentoo.org>; Sun, 29 Mar 2020 15:25:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EE6E334FAAD for <gentoo-commits@lists.gentoo.org>; Sun, 29 Mar 2020 15:25:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7E0E0AF for <gentoo-commits@lists.gentoo.org>; Sun, 29 Mar 2020 15:25:40 +0000 (UTC) From: "Anthony G. Basile" <blueness@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" <blueness@gentoo.org> Message-ID: <1585495535.67e647180c1791bd77fb312df96cfa7e7e8004a9.blueness@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-backup/borgbackup/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-backup/borgbackup/borgbackup-1.1.11-r2.ebuild app-backup/borgbackup/borgbackup-9999.ebuild X-VCS-Directories: app-backup/borgbackup/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 67e647180c1791bd77fb312df96cfa7e7e8004a9 X-VCS-Branch: master Date: Sun, 29 Mar 2020 15:25:40 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4bd9b9e5-8121-4fb1-a2b0-afba2b8d15d6 X-Archives-Hash: 789df88f6d23ce9da4dcc889f7e525f5 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/*