gentoo auto-resync : 25:07:2022 - 20:57:05

3 files changed, 2 insertions, 93 deletions

diff --git a/dev-python/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
index 44bc30c8bbbd..6c4107e9f86a 100644
--- a/dev-python/mysqlclient/Manifest
+++ b/dev-python/mysqlclient/Manifest
@@ -1,5 +1,3 @@
-DIST mysqlclient-2.1.0.tar.gz 87635 BLAKE2B b92e138f6128873912e951087bc4f12b3c00a400521c7ee64da177c6f5a2dfb3a649d92f7a12f45c8716fd8b6b9682a0eff6d9bc111cffac38a27676f67d396a SHA512 a0b2645af225fd6f1f551cfd34c09309a859410e66287c32637901e15beb88632f9a3e87cf2b08a94867a9b2d4a048c56d63d55f523eafc82f1b1b93ce1c843c
 DIST mysqlclient-2.1.1.tar.gz 88138 BLAKE2B fdd044f2703af874dc0ca67b2fe07fcac3ceed5a4543aa15a0daa852ddf5ad6940a43675c0f104d9aa173e96da946e33054e1cc4c1b9812487558af64cc8fd43 SHA512 d8aed044b651aabb8d28d2df085f84e4d824ef0f147216d111425a9c8024f55634236ec131debf46660084c5a8fd67c944db60ffbf89e1d712cdca80c0726a06
-EBUILD mysqlclient-2.1.0.ebuild 2060 BLAKE2B 6f01c9b7ac4e37d4ad1670cf7e392f4bf420e2ac0c1688df8c9df099476519f92c18bee9ef1145b9d350f335f39f84907e4d51da50c3e4842348d64b6f9de76d SHA512 c2cb94c40114c5fafe4effaa92ba7b49f9281bdbeb46c6cb502ea48b117b63e0a50c25c03e714d48e0d557d44b6236f227fd911951f14425ee0f95385360c231
-EBUILD mysqlclient-2.1.1.ebuild 1917 BLAKE2B aec22f5f706dd20b272f511e13d13f437ea9ccb3ee1934c1b1e78c791c2fcd9e647d447c3476e66847a33c8d71b138733039bc9b9fbce551284d2778b2c76099 SHA512 b0af1e3ffa40a397c748c709ff26cb6e969f3423d3467d1641be40ceae939a0c47fefae14dadb632135d5004f53b64cd8127216a0a7e59b2f412007f3d22bc03
+EBUILD mysqlclient-2.1.1.ebuild 1916 BLAKE2B e0c16826061e5309925532260f70523f0aa7dc04cb37d5e40aeb3ed443134bfe7833e9fa35bc6912baa8d293cdbebae44c3c0dd0fcfed64ebb22a762bd20b223 SHA512 fd3dee2b03e61b430af4e466c2b8551813ba1510e8f827307cbd5b467965ef26f0b7d4202c23c69c8b0c148f5b3d03d897c22ddf5ce1e9abbd123a32ea0e28dd
 MISC metadata.xml 507 BLAKE2B 3c274117dde5aed93bb78488b1c106ea9b18243725d88867e6b568a09229d97bc35a1116d8a529c5c72cabcb9feb33de8157448cf3d339dbf1861d8a9ff2c1d6 SHA512 4304ae4addf93365b2acfd493a27a0144bfe0dd2d559a3fce73f52d0d1683c84b1597c9d11f36b332b6428523fd8082297ab39ce000d961ccdf39d92833828ac
diff --git a/dev-python/mysqlclient/mysqlclient-2.1.0.ebuild b/dev-python/mysqlclient/mysqlclient-2.1.0.ebuild
deleted file mode 100644
index 9e962740b881..000000000000
--- a/dev-python/mysqlclient/mysqlclient-2.1.0.ebuild
+++ /dev/null
@@ -1,89 +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="Python interface to MySQL"
-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+"
-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]
-	)
-"
-
-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.1.ebuild b/dev-python/mysqlclient/mysqlclient-2.1.1.ebuild
index acf189196f79..0f08dd07173d 100644
--- a/dev-python/mysqlclient/mysqlclient-2.1.1.ebuild
+++ b/dev-python/mysqlclient/mysqlclient-2.1.1.ebuild
@@ -17,7 +17,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	dev-db/mysql-connector-c:0=