gentoo resync : 12.05.2022

5 files changed, 7 insertions, 131 deletions

diff --git a/dev-python/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
index ca2a88825a89..24b9dfb652fc 100644
--- a/dev-python/mysqlclient/Manifest
+++ b/dev-python/mysqlclient/Manifest
@@ -1,7 +1,3 @@
-DIST mysqlclient-1.4.6.tar.gz 85517 BLAKE2B f5e604094b06b919b92ecadc8b3f0249dd038149d1182ba882fe6b0ecd34f0bcceeed21b310318ca3291d9483fd3d1ac385c29415e07a8fbabb6cd65ccee8a2d SHA512 11ecb8a0a6f78edb193cd07472579aec1626994a80a584ff74de18774e7db8896de595f3e4d280b78e8636f53323ebcce8aa294ec7b2a54a839742d9699650ab
-DIST mysqlclient-2.0.3.tar.gz 88886 BLAKE2B 2673f2ab46ddff241260b036b14bad84947a37d002cbacd7aa53127fa3dd4fad7a37c9e2f8704d43cab6a2e0289f2542cb36ccb3f1bd66c64d2440f79d26948e SHA512 49c234bc982b373a74d65361a697dfa4f87f06d193d86d7cc40a732f48c9b2494cea21ee3f95d4d6d2a55b3f7476a92eda0c2e294766cb0ff592e1c54353b9cb
 DIST mysqlclient-2.1.0.tar.gz 87635 BLAKE2B b92e138f6128873912e951087bc4f12b3c00a400521c7ee64da177c6f5a2dfb3a649d92f7a12f45c8716fd8b6b9682a0eff6d9bc111cffac38a27676f67d396a SHA512 a0b2645af225fd6f1f551cfd34c09309a859410e66287c32637901e15beb88632f9a3e87cf2b08a94867a9b2d4a048c56d63d55f523eafc82f1b1b93ce1c843c
-EBUILD mysqlclient-1.4.6-r1.ebuild 883 BLAKE2B c67258ab82a26fd5ea96c1d6013cc04c3bc71d72e1c5c4107ebf7d8f41be9b84663fa788103a2ca0697c9c10540dd0bced6c86d7bfee382932f985a398a988f6 SHA512 2e4d71fa70ee35822702d717b9f417a6691e6bdda1a1e6c2b9732cf95c1095eca95e7dc9eb91ca38e3e1b607b3d9f9044a6f20d158380cf8170ee10e27e85ba7
-EBUILD mysqlclient-2.0.3.ebuild 2095 BLAKE2B 7d16e5b597ee040d6ad3435f3a1c1470c00973a6996596e10b08c930c88707279f27dfc5f460e8d2e921a1fb0e75be0c7dbbc0ae242c4a1be8c9fff12b50d68f SHA512 0e531563bc3c94851c86f14b28d3a9f7e6b49b743a5cdf86e64410130749c90bd298b04f1c46e1f4d16076c28bf96f747aacc9e99aad6e0c4ac2fe7635a88e08
-EBUILD mysqlclient-2.1.0.ebuild 2062 BLAKE2B a254f3950e2b6337464ef80e8613edb255b3104d385795aae2617c7877834aaa4f625cb38600cbfcd3854d7f0b53b09d7522fa59665e2bada280f4a2348c451d SHA512 95578ca73819b067849a2809d8836dda4cf7c06db4de16845cb34ce822f52acfebf7896558c169b8b9056b43ac1e6ebc07e7116443f506a7f64a83d9ce3d3a7a
-MISC metadata.xml 514 BLAKE2B 6c9f1d00d136f60a412e1fc87923ac25e1985843b04d4c5b6ce7cc65521ec23f5070dc4001cb7426cabaeec949e40498e9adeef8bd19cd4bff0761a918d2896c SHA512 01797cf940a6baa96885c2cbc9073e2386f8bbe9c1cec14c2b6b6e5cb12a4da6308a2081d894de3342c69165a4836f6d9e593f9a324712b8dfd30a3874c81223
+EBUILD mysqlclient-2.1.0.ebuild 2060 BLAKE2B 6f01c9b7ac4e37d4ad1670cf7e392f4bf420e2ac0c1688df8c9df099476519f92c18bee9ef1145b9d350f335f39f84907e4d51da50c3e4842348d64b6f9de76d SHA512 c2cb94c40114c5fafe4effaa92ba7b49f9281bdbeb46c6cb502ea48b117b63e0a50c25c03e714d48e0d557d44b6236f227fd911951f14425ee0f95385360c231
+MISC metadata.xml 507 BLAKE2B 3c274117dde5aed93bb78488b1c106ea9b18243725d88867e6b568a09229d97bc35a1116d8a529c5c72cabcb9feb33de8157448cf3d339dbf1861d8a9ff2c1d6 SHA512 4304ae4addf93365b2acfd493a27a0144bfe0dd2d559a3fce73f52d0d1683c84b1597c9d11f36b332b6428523fd8082297ab39ce000d961ccdf39d92833828ac
diff --git a/dev-python/mysqlclient/metadata.xml b/dev-python/mysqlclient/metadata.xml
index 72c52ab7f5b1..e153069c6b9d 100644
--- a/dev-python/mysqlclient/metadata.xml
+++ b/dev-python/mysqlclient/metadata.xml
@@ -11,6 +11,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">mysqlclient</remote-id>
-    <remote-id type="github">PyMySQL/mysqlclient-python</remote-id>
+    <remote-id type="github">PyMySQL/mysqlclient</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild b/dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild
deleted file mode 100644
index b5b006717481..000000000000
--- a/dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Fork of MySQL-python"
-HOMEPAGE="https://pypi.org/project/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
-	!dev-python/mysql-python
-	dev-db/mysql-connector-c:0="
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-DOCS=( README.md doc/{FAQ,MySQLdb}.rst )
-
-python_compile_all() {
-	use doc && sphinx-build -b html doc doc/_build/
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mysqlclient/mysqlclient-2.0.3.ebuild b/dev-python/mysqlclient/mysqlclient-2.0.3.ebuild
deleted file mode 100644
index 4ec7923901d3..000000000000
--- a/dev-python/mysqlclient/mysqlclient-2.0.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Fork of MySQL-python"
-HOMEPAGE="https://pypi.org/project/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-db/mysql-connector-c:0=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		dev-db/mariadb[server]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx doc
-distutils_enable_tests pytest
-
-src_test() {
-	local datadir="${T}/mysql" \
-		install_log="${T}/mysqld_install.log" \
-		pidfile="${T}/mysqld.pid" \
-		socket="${T}/mysqld.sock" \
-		log="${T}/mysqld.log"
-	einfo "Creating test MySQL instance ..."
-	if ! mysql_install_db \
-		--no-defaults \
-		--auth-root-authentication-method=normal \
-		--basedir="${EPREFIX}/usr" \
-		--datadir="${datadir}" >& "${install_log}"
-	then
-		cat "${install_log}"
-		die "Failed to create database"
-	fi
-
-	einfo "Starting test MySQL instance ..."
-	mysqld \
-		--no-defaults \
-		--character-set-server=utf8 \
-		--pid-file="${pidfile}" \
-		--socket="${socket}" \
-		--skip-networking \
-		--datadir="${datadir}" >& "${log}" &
-
-	local i timeout=10
-	einfo "Waiting for MySQL to start for up to ${timeout} seconds ..."
-	for i in seq 1 ${timeout}; do
-		[[ -S "${socket}" ]] && break
-		sleep 1
-	done
-	if [[ ! -S "${socket}" ]]; then
-		cat "${log}"
-		die "MySQL failed to start in ${timeout} seconds"
-	fi
-
-	cat > "${T}/mysql.cnf" <<- EOF
-		[MySQLdb-tests]
-		socket = ${socket}
-		user = root
-		database = test
-	EOF
-
-	distutils-r1_src_test
-
-	einfo "Stopping test MySQL instance ..."
-	pkill -F "${pidfile}" &>/dev/null
-}
-
-python_test() {
-	# The C extension ("_mysql") can't be imported from "${S}/MySQLdb"
-	# so we need to cd somewhere else to make sure "MySQLdb" is imported
-	# from ${BUILD_DIR}/lib (thanks to PYTHONPATH).
-	cd "${T}" || die
-	TESTDB="${T}/mysql.cnf" epytest "${S}"
-}
diff --git a/dev-python/mysqlclient/mysqlclient-2.1.0.ebuild b/dev-python/mysqlclient/mysqlclient-2.1.0.ebuild
index dc9f024957f7..9e962740b881 100644
--- a/dev-python/mysqlclient/mysqlclient-2.1.0.ebuild
+++ b/dev-python/mysqlclient/mysqlclient-2.1.0.ebuild
@@ -7,7 +7,10 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python interface to MySQL"
-HOMEPAGE="https://pypi.org/project/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python"
+HOMEPAGE="
+	https://pypi.org/project/mysqlclient/
+	https://github.com/PyMySQL/mysqlclient/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"