gentoo resync : 25.04.2020

3 files changed, 71 insertions, 8 deletions

diff --git a/sys-fs/unionfs-fuse/Manifest b/sys-fs/unionfs-fuse/Manifest
index b11c6352e194..ccd09050fc21 100644
--- a/sys-fs/unionfs-fuse/Manifest
+++ b/sys-fs/unionfs-fuse/Manifest
@@ -1,6 +1,8 @@
 DIST unionfs-fuse-1.0.tar.gz 48149 BLAKE2B d1ef74980158f4710f5b545c3e98abd27eb4eb610cbe141fa1befaa2a0efc3cce3cead1a405ecdea7dd0f02fab2d2f030d96a7b1d5068a1cd5de4e2f5bfe3aec SHA512 805151acaeae8526fba430701a1690f6eb0ad8331a9e730095ee538dc2b148d02fe996a63e8a7f6471d1ef622cc5c03d82bd2b2faad1ebe3b614ec343c2f55de
 DIST unionfs-fuse-2.0.tar.gz 46537 BLAKE2B 2f5a0da5adb15c408e7b9d0c3658e389a1aea4a9a5f2f3809fc724af43cf2a4b309e4220e46647e3f3fc9b19d48c8d62692e190cf8536182abfe551bfacfcc24 SHA512 5b60204632f498931fff7671cc9f40b1800d34cb8c0d0de0773626e2653eb0a36647566c92c1d0cf79543e01b934602ef5603a06508407f352e48ef27a7ee758
+DIST unionfs-fuse-2.1.tar.gz 47917 BLAKE2B c76edbcbff98db28092f61facbdf443eda12ea97770126feac3d590e0f85e51df84308d0eeeebd96e5bafd126b472b0ded6a2ead72cac0fab3614e3cc04730dd SHA512 851e378f8c189d8a84d2a0cf47ce8f1e9cdda5e789a8c0c97aac6e0757c2f6480ca4d931a525bb94cec4af11789073ccda44ad01d7ed02de1c29ded72f578aa0
 EBUILD unionfs-fuse-1.0.ebuild 500 BLAKE2B 76060a23c99f96ee5d491dbad82ed1939bd72b364f656fdd58de737ac2c7388f8e177b46176e2ab4d1d0add262130faf492b3cce47ce4f12797e105b453c5477 SHA512 0ab0d5efdde62268f38cc319f972dd058586d312baf992b68ed5b05e4c6c0a63c4da8d0e0efdd5f9c598ecb9f71bca2f418cfe36a6506968597d9ec95b35ff92
 EBUILD unionfs-fuse-2.0.ebuild 500 BLAKE2B 86562c039d231ff38a14252b22eb1126d53ad533adea0c15eb9565e3c55545afa4f1affeddfc6da72b09b838eb4c9af3d37f4e15918888aecbd70a52af34358f SHA512 7a1d69a0f8fc0d96e1abb5e041f9bd9a1f2c8973c64be26b6f7c526c77b82d8ff2eb7ed11635847b7237d8076b8134ce0b08f7ffd3f061a2ae02f3cfd9477818
-EBUILD unionfs-fuse-9999.ebuild 474 BLAKE2B af1254d441f4fe441bfcb76a40ed0a7dca57eb86c20d0367b52ae4460e382daab51b6779d48c8aaf785833ffac14f205d6f02420ddb687123d1aa9d259cd6a04 SHA512 9df4c76eaec9d78ee846da0f7d8d09f3d52f646a5d3fca088d62892a72b337457007ddc55b551353a7dbbd28ca57e4ad13d3611083c75752ddd8a4d08589982d
+EBUILD unionfs-fuse-2.1.ebuild 899 BLAKE2B 2d2ed6e149c62df5262029c24655b1d9773fc90b8c568bfbd0176a2ebd4b99689ee2d89bfe2c9169af28141d2e7804459518f1362d112e4e3dcb7f06c4e53308 SHA512 b79923749a0f75efbb4608921b56eb59e9179cece0c9cdba1b1b4806fbbb0693331c6b9e2e80ddd466382e685d52b300c59c2a755d2dd16cb7ac8cac6101a3c1
+EBUILD unionfs-fuse-9999.ebuild 864 BLAKE2B 17cb5169b70b178f5d6d20526e1efb5fe3cf92708f8984cfb4c5ccf80fc80214ee7258c5ec5158ad1e06fbbdf920ac7f02071a957c8ab569ec0356bbbaaab022 SHA512 4f4a89345c982f27f1e5efa2329f11e28feeb80b834c3695623c4a404c755a288eab8d4726c1c8fe66f05f1938955cd966032f16f4005d1b692041d5e49b2336
 MISC metadata.xml 336 BLAKE2B f9d55c17815e8d3179029c92fd758b0811b455b4d375aa31c44d7643f9d792a70dae915ae25d069e9967fbac2954c197b1ebcd85828b744a9924dc719eeb6f40 SHA512 54597ecd53cfe8d92d717481a533df32cb5fa7272cd64a42a0cd4b4803024b10e3451845569e3d7b199ed63f4070023468dd7528cb438f155539e5e752144197
diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-2.1.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-2.1.ebuild
new file mode 100644
index 000000000000..2c3037f0258e
--- /dev/null
+++ b/sys-fs/unionfs-fuse/unionfs-fuse-2.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit python-any-r1
+
+DESCRIPTION="Self-syncing tree-merging file system based on FUSE"
+HOMEPAGE="https://github.com/rpodgorny/unionfs-fuse"
+SRC_URI="https://github.com/rpodgorny/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-fs/fuse:0"
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+	)
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+python_check_deps() {
+	use test || return 0
+	has_version "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+}
+
+src_test() {
+	addwrite /dev/fuse
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild
index 76d6d822dd89..914a41411a91 100644
--- a/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild
+++ b/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild
@@ -1,23 +1,42 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit git-r3
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit python-any-r1 git-r3
 
 DESCRIPTION="Self-syncing tree-merging file system based on FUSE"
-
 HOMEPAGE="https://github.com/rpodgorny/unionfs-fuse"
 EGIT_REPO_URI="https://github.com/rpodgorny/unionfs-fuse.git"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-fs/fuse:0"
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+	)
+"
 
-DEPEND="sys-fs/fuse:0"
-RDEPEND="${DEPEND}"
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+python_check_deps() {
+	use test || return 0
+	has_version "dev-python/pytest[${PYTHON_USEDEP}]"
+}
 
 src_install() {
 	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
 }
+
+src_test() {
+	addwrite /dev/fuse
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}