[gentoo-commits] repo/gentoo:master commit in: dev-db/barman/

[Sam James]

commit:     fbb012afe342f42a9b18fa51c8cca071596affbc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  9 08:22:43 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb  9 08:22:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbb012af

dev-db/barman: add tests, fixup deps

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-db/barman/Manifest           |  2 +-
 dev-db/barman/barman-2.12.ebuild | 22 ++++++++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/dev-db/barman/Manifest b/dev-db/barman/Manifest
index 078e77af4e6..3ee4f4ef1ad 100644
--- a/dev-db/barman/Manifest
+++ b/dev-db/barman/Manifest
@@ -1,2 +1,2 @@
 DIST barman-2.10.tar.gz 1247335 BLAKE2B 79bfa4ff6ee587464a18c48b9db110fe100b9f5b1439c21b522e7f5a14a520d247023ca893e2920278cb2170e9daa165f4447b4adff3e09d83cf53c2a9d32bc6 SHA512 64e9386603158bfe19723ec273f8fb3e6856d76315a3e3c31ef489fcb8caaa44a019fff6087dd3d8810661ca8c613552680e5a10e9d673ef96962340dd12dd6a
-DIST barman-2.12.tar.gz 1262415 BLAKE2B 5bca88f39ea3d7ca95fec9895d9766ebbac8f14894d81d5e5e79ab3bc4ebeb84a23a0e94ba53dd3fe05b41b067e31f2931c9184a557a329450ffe3b0ab97c0ce SHA512 8f41d15b62134e403e467b0eb9f7045b7a77e3e6d6caf4846309af71720e3a29b0c959f18a64e9c77f6f3434811f1004c4fe7e566f9f7037195d564d64bb383d
+DIST barman-2.12.tar.gz 1370978 BLAKE2B 2b44e153addab3fca7dbf572b03b2e22fe18f0960d98048aa145c64552a0de4cea977c423c268bfb9b822e44aaead3572ee350053049ab5459cc022d976eb4d0 SHA512 b4b479a03e5b770ba783af1d5645f6be2a19e2427cb58c6d9dfc6389240d4eeeec85401caa59c0d837a70f1cf67c0edbdb1539ecbd2f3de86285a122fc184320

diff --git a/dev-db/barman/barman-2.12.ebuild b/dev-db/barman/barman-2.12.ebuild
index c9ea0dc9066..59e903216ec 100644
--- a/dev-db/barman/barman-2.12.ebuild
+++ b/dev-db/barman/barman-2.12.ebuild
@@ -9,19 +9,29 @@ inherit distutils-r1
 
 DESCRIPTION="Administration tool for disaster recovery of PostgreSQL servers"
 HOMEPAGE="https://www.pgbarman.org https://sourceforge.net/projects/pgbarman/"
-SRC_URI="https://downloads.sourceforge.net/project/pgbarman/${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/2ndquadrant-it/barman/archive/release/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-release-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE=""
-
-RDEPEND="dev-python/boto[${PYTHON_USEDEP}]
+RDEPEND="
+	dev-python/boto3[${PYTHON_USEDEP}]
 	dev-python/argh[${PYTHON_USEDEP}]
 	>=dev-python/psycopg-2[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/argcomplete[${PYTHON_USEDEP}]
 	net-misc/rsync
-	dev-db/postgresql[server]"
-DEPEND=""
+	dev-db/postgresql[server]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+
+	sed -i -e \
+		"s/^    def test_xlog_segment_mask(.*:/    @pytest.mark.xfail(reason='Test fails on Gentoo')\n\0/" \
+		tests/test_xlog.py || die
+}