gentoo resync : 24.06.2021

3 files changed, 47 insertions, 19 deletions

diff --git a/dev-python/leather/Manifest b/dev-python/leather/Manifest
index 3a24f3e4b504..d927473c3ea9 100644
--- a/dev-python/leather/Manifest
+++ b/dev-python/leather/Manifest
@@ -1,3 +1,3 @@
-DIST leather-0.3.3.tar.gz 18391 BLAKE2B 0a81343251fcdea85873fea023e1d709a385b268c2900642764c1a0ae6abfa84d9dece0ef67ae152b716c93c1bdaf9671f8c5df8cf5605694af48e8f3552437a SHA512 3387353d4da129fa3601799efe8742aea08f94579caab7a5a05175ff7ad50a815fc7ca4aee5d1c390027bda3a9bf1ecd1ed5167575386a7a58f56625f5165350
-EBUILD leather-0.3.3.ebuild 481 BLAKE2B d62b2027f83da349d6d03e46b1f7e0e75f7b235559b02924157d9f9ad9785abb4ac1bbc89ab26f404a79c5947aa866dcb94857c8af2e9f6a9bc6febecfded409 SHA512 fd13d98cb43968aa2583770010ce86ae5c2938cb434cf6da27c9d033bc3b452650f91120828ef939ea2b1907842ea5549b3902c4a6b3de50047d5e22f982bf96
+DIST leather-0.3.3-src.tar.gz 40522 BLAKE2B 3c7e6a48615751b310b7f066f2a78a2494e00256cae2ebfb4633c9389cca2477c2265fcf8c68f37733568ef729db1a5daf02ddc640bf2a60f2b39127c9a38d91 SHA512 30ea50ac6f97c55ee695b0e175a27e1e64fd17da7b0686ca8595fe0e5067932e19e59368fe6441f8f291ec52be3e597a80f8e04a3fcc0eeae33b3a5b3030e1d6
+EBUILD leather-0.3.3-r2.ebuild 1208 BLAKE2B eb9fa86edff5d7fe5ccc36e5176a385348ea16e95ac9ae42bb6e9632a18052d9d82f0d983f76baaacc804336cbb49baf5b84755f8119f44623a67f0a470e03de SHA512 6ba0a36855f4dc039bfa90be8279e55bf1ac57ae27e8b8c129e953cfd2986ef18b697a6c7231c5aef94362b8509bae2413e1f48097564124b089c78a96ebe856
 MISC metadata.xml 493 BLAKE2B f8962c3c95f53a3b1f019a9f0b175700e2954f53cd79e8422a23bb7bd49bc93f402e1dc23a02466bda8a112e1e78e6a843379077e88937dd89efc47d433dd6f7 SHA512 62620c4b79244ca31054b496eff69208bf94aad7df682ed14436a254fb0f604442cd3242a29ab1e828ad902b8ee9348d7830c73a00985017d2a03acde4a757c5
diff --git a/dev-python/leather/leather-0.3.3-r2.ebuild b/dev-python/leather/leather-0.3.3-r2.ebuild
new file mode 100644
index 000000000000..c792bf43f78a
--- /dev/null
+++ b/dev-python/leather/leather-0.3.3-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Python charting for 80% of humans."
+HOMEPAGE="https://github.com/wireservice/leather https://pypi.org/project/leather/"
+SRC_URI="https://github.com/wireservice/leather/archive/refs/tags/${PV}.tar.gz -> ${P}-src.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test +xml"
+RESTRICT="!test? ( test )"
+
+# Other packages have BDEPEND="test? ( dev-python/leather[xml] )"
+TEST_AGAINST_RDEPEND="xml? ( dev-python/lxml[${PYTHON_USEDEP}] )"
+RDEPEND="
+	${TEST_AGAINST_RDEPEND}
+	>=dev-python/cssselect-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	local requirements_files sed_args
+
+	sed_args=(
+		-e '/coverage/d'
+		-e '/lxml/d' # lxml is required only when leather is used as a test dependency
+		-e '/nose/d'
+		-e '/tox/d'
+		-e '/Sphinx/d'
+		-e '/sphinx_rtd_theme/d'
+		-e '/unittest2/d'
+	)
+
+	requirements_files+=(requirements*.txt)
+	sed "${sed_args[@]}" -i "${requirements_files[@]}" || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/leather/leather-0.3.3.ebuild b/dev-python/leather/leather-0.3.3.ebuild
deleted file mode 100644
index 64dd2f6e2824..000000000000
--- a/dev-python/leather/leather-0.3.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Python charting for 80% of humans."
-HOMEPAGE="https://github.com/wireservice/leather https://pypi.org/project/leather/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RDEPEND=">=dev-python/six-1.6.1[${PYTHON_USEDEP}]"