gentoo resync : 20.10.2021

3 files changed, 29 insertions, 62 deletions

diff --git a/dev-python/agate-dbf/Manifest b/dev-python/agate-dbf/Manifest
index 1d7c8dec0b01..2351dc99d209 100644
--- a/dev-python/agate-dbf/Manifest
+++ b/dev-python/agate-dbf/Manifest
@@ -1,6 +1,3 @@
-DIST agate-dbf-0.2.2.tar.gz 2863 BLAKE2B 112b03e1a02b70e63f77195a999a60a59b4e02af55da2b9d94e9d535f557c4193129dcb8ce3f91d93cbc6e19196705009574e3b9e5073f9934d00636bb4b2abd SHA512 3e99404dfcd521010bc3eb5899871dfc63581e03604f80b0a42d4db48f486137fd48685024decd380d346ac5c2089a0d19dd9229893e8d5337b9bd9d7b4eb3b6
-DIST agate-dbf-0.2.2_examples%2Ftest.dbf 1314 BLAKE2B 81d5507b88fe7f7c3866d8666feff12bf3b14451affd653d76239f8785037c908509de248ac4bc8dbebeba4b1a84d69a48bf97b83716fe489ceb39f8ccf0e935 SHA512 460f9a624a6fed58d1fe0484ff6f7fa081d595d8f1a04f4f449ef6de037e334abb9da0403622e5af8c7914e02cda2fa38c4058ef1bb650e59e50584b9ae73b2e
-DIST agate-dbf-0.2.2_examples%2Ftestdbf_converted.csv 896 BLAKE2B fe535d9b784088118fcd61b5378d49d92bac801be61e7900200625f267c8f9c454729376b292d809d3e6a6ee2a093e2a813524ff9199223cbc89a9a461feed40 SHA512 ddba24038d4500b97ff8b11b03a5260927a299f1732aa0a6bcb4746c52e04825f2f3d5d211141576736008ff7f56d0970b21c06f4afad53a4e4e0a873815516b
-DIST agate-dbf-0.2.2_tests%2Ftest_table.py 574 BLAKE2B 22a744ae20491632795a0b654d8ab1e8adc090d43d0a18352b83cfc1687c57d33f1159d96cb379743d293203412dbbbaae8c33be195ae9d868584671ff0ea74d SHA512 131d8a553bc9c7538959e1ae29b62c47cea3e14365afca4e92e4f36cc8dab7e4b00efa462db5e9ca0f51b5e3eda892cf91881d65bd1302fa80bd5b0f66fa4076
-EBUILD agate-dbf-0.2.2.ebuild 1519 BLAKE2B 9f5635ba118e86976f9498053c21bc0fafa64e465bf8f108836647db425adfa5a8c04cc5e7e61e6ba4cfcbdff8ca2fbcaed40318c7bb3673b83c65a1d5e81610 SHA512 1be17ff2968e9fdfc0e2c72d65dc2355f2ca6944dd55774c918ca4f11e66604aecf69826fca131c153132a15d3972bb104edc74024b2da389ee2b65e886aa358
+DIST agate-dbf-0.2.2.gh.tar.gz 8727 BLAKE2B 1397e87ebecff43380d17628867317e9b66584f4281609717b86c30cfa286e6d9ab32d8250c99c698c887aceae28ad4af311e0f777525283b30b65c15582895d SHA512 a92c19db922cc3f896fbe21f33afacd757a7fa3d6a26545033a898665a87765ddf4af964e4cba315cee0c70da926c965aaf68b64af86cf2aabbb9a68a65a38fe
+EBUILD agate-dbf-0.2.2-r1.ebuild 634 BLAKE2B 9cbded3e40b1c938889b72b1cd6e5e8579902e0f4f76fd881b9202f9b743c1973ea1d9028a63c07455ce803a67c17863b42ff6bf81edd6fd89ec50171dd90dbc SHA512 19e17555971809de87935292ba343735065ecd28bd93f5beb11d6abc6f9e20ae7a4b045b8c2c59e63659c3d8aa35e3bc42da40c943a1ec70f1ba333ea065ea0d
 MISC metadata.xml 537 BLAKE2B e0faf286fb6844ce52469275311bb9c14deac0c0a123d35b3a11600324dd1e49b81214d41603f8533a7ceb73266ca73bd6377d901bea6372acda6358008d1d31 SHA512 82ec0b7d3163deaf88451e468a296174d99e74409ddbe3837c3e0fa5872bf6303e7154fc900a482c1b417943adf981137e460e7bc7d2f1b32967254220e02c04
diff --git a/dev-python/agate-dbf/agate-dbf-0.2.2-r1.ebuild b/dev-python/agate-dbf/agate-dbf-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..387fc82a375f
--- /dev/null
+++ b/dev-python/agate-dbf/agate-dbf-0.2.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Adds read support for DBF files to agate."
+HOMEPAGE="https://github.com/wireservice/agate-dbf https://pypi.org/project/agate-dbf/"
+SRC_URI="
+	https://github.com/wireservice/agate-dbf/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/agate-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/dbfread-2.0.5[${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-python/lxml[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/agate-dbf/agate-dbf-0.2.2.ebuild b/dev-python/agate-dbf/agate-dbf-0.2.2.ebuild
deleted file mode 100644
index 04248032f373..000000000000
--- a/dev-python/agate-dbf/agate-dbf-0.2.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Adds read support for DBF files to agate."
-HOMEPAGE="https://github.com/wireservice/agate-dbf https://pypi.org/project/agate-dbf/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+xml"
-
-# Other packages have BDEPEND="test? ( dev-python/agate-dbf[xml] )"
-AGATE_VERSION_DEP=">=dev-python/agate-1.5.0"
-TEST_AGAINST_RDEPEND="xml? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
-RDEPEND="
-	${AGATE_VERSION_DEP}[${PYTHON_USEDEP}]
-	>=dev-python/dbfread-2.0.5[${PYTHON_USEDEP}]
-
-	${TEST_AGAINST_RDEPEND}
-"
-BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-AGATE_DBF_TEST_FILES=(
-	examples/test.dbf
-	examples/testdbf_converted.csv
-	tests/test_table.py
-)
-SRC_URI+=" test? ( "
-for extra_file in "${AGATE_DBF_TEST_FILES[@]}"; do
-	SRC_URI+=" https://raw.githubusercontent.com/wireservice/agate-dbf/${PV}/${extra_file} -> ${P}_${extra_file//\//%2F}"
-done
-SRC_URI+=" )"
-
-agate-dbf_src_prepare() {
-	local extra_file
-	if use test; then
-		for extra_file in "${AGATE_DBF_TEST_FILES[@]}"; do
-			mkdir -p "${extra_file%/*}" || die
-			cp "${DISTDIR}/${P}_${extra_file//\//%2F}" "${extra_file}" || die
-			[[${extra_file} == *.py ]] && { true >> "${extra_file%/*}/__init__.py" || die; }
-		done
-	fi
-}
-
-src_prepare() {
-	agate-dbf_src_prepare
-	distutils-r1_src_prepare
-}