gentoo resync : 25.11.2020

4 files changed, 3 insertions, 125 deletions

diff --git a/dev-python/pymysql/Manifest b/dev-python/pymysql/Manifest
index 34d66c58de0e..c75e2131781e 100644
--- a/dev-python/pymysql/Manifest
+++ b/dev-python/pymysql/Manifest
@@ -1,7 +1,4 @@
-AUX pymysql-0.10.0-add-missing-import.patch 536 BLAKE2B 664c1c93cef8d2cfe810a5afa517f1f755b854ecc2997000aace64bc890fbee1b877a81efb877aa668f99dec67ad8cb453f428639828ade322d51ecfeca7c07d SHA512 1b08d846495879eb17fdf5274b47cbb39beac2416a0120b81fc01f0ec908e92c2898d30ad1225f950d0c22341807bc45347384d5faed6ae52bc31954a38e1771
 AUX pymysql-0.10.0-fix-tests.patch 1471 BLAKE2B 058afeda49c45bbb2421301d2ad270a9de111e3d24322c268d2dcba2867d3dd169117e9af9d7d63bc8d3b59f6ef0e570febc0d3d2232531c91942c3d13dc119c SHA512 312e37ae1943bd1db3b44a28832a55dade62c38b8ff042b4ce4d7beb8bc2c74d87e61d7b1e44dc583072450a3951dc05c504cab15a0d9b9f0fa562efa276ae36
-DIST pymysql-0.10.0.tar.gz 86137 BLAKE2B bcd4746d3e3947c2598b875d46678984beedfa0d9161a1aefb1f7f4b5314e084f5292206435b0a2621fb100744194fd1e2963228e37b41c289c5c4021f475371 SHA512 7d322c526634380cf4d3216f666a7d1f38e120390aab525cb8806bcea3f2fd7eab82e744a0be7270eae47ab1f79be5b5f7409e7e5dc9aaabf1e3c0c8853f578f
-DIST pymysql-0.9.3.tar.gz 86715 BLAKE2B 0ed09f7f5c47bd1fae52dd9d0ff0790367962d8e4b89d3933704b8b8d838e1f48b68455a9a3916318bf3c1c1f102fa11b4e1e3401d021f8a2d6137612a4affb9 SHA512 d906b7a6612d91db7d4f7f2d85a9375477e6655c568e0d1e7281ad0263d4a78f0ac4e80263605723f99e12db04c80f51c5c8ed79ed6f209a7afeb4b45bf40648
-EBUILD pymysql-0.10.0.ebuild 3630 BLAKE2B 2964ad45547b3a7416d182cc3acc75d7ea4a0499969c94cf7781bae7a938e34988552baf1c05bba5a677b7fcadcf7b8f0aad066d69b966f166ed6f282cfdbe47 SHA512 7aae18dc645baa1e241f64d05318a157c9c9110090651a1a6e1be0d2d4628f54c1a344ca8e3b10ac18bcbd4e57c2f0b28114ed6a63d99e74579615dc874a379b
-EBUILD pymysql-0.9.3.ebuild 2141 BLAKE2B 53cd7fa1adf3224e595e841339296441f31df2261fce0fbd1955bc903444eb218b89a2b8845ebaff4d9cd75bcd2fd29733d20cd16f68aed710e097c26922787b SHA512 3b854cd5af1502d81e6157f20044311152da0d2cd7fa471d88e68bdd284a380caad920f89594eb085f52da07d3e03d11a3a78fa7888d54e54263fbc8fdec7443
+DIST pymysql-0.10.1.tar.gz 86441 BLAKE2B 8e33fbba0544dad68c3eeb5bd538c4bce121222b4660ad06c3c0224b5db6a6c9f45d6697a98d5f0ba20429afa204d46c9ce57a4d9696dbc2a35649c6253a645b SHA512 edc702c54a33350f75648765c60d4cf455449e88818948b018585d557bea280e626d23b1279a410765f2de8e35b3c22ea5c8e0ef3dc72588b674c93a2124a224
+EBUILD pymysql-0.10.1.ebuild 3575 BLAKE2B 67ef1a309f7f85b3236763c26f177d03db95c1c9fbe00efb83a4afa9bb91942ab75fdad70ae462e35d9c27f98950f8dba873e99bb613abd47bba3a8dbd0a2699 SHA512 8ba4d4dd61735e605eb7a37b0e85a1b526a8c52c94eef59ed474ce4055938afbafc7136cfdd78a30b146af3271481d19cc7536729b3097e05fd40e7713ff2c7e
 MISC metadata.xml 465 BLAKE2B ee6efa9aac32699c9746ecfe59dcb9421ed350712358e6daba43cd881fbca8cea649974509069a62555af49d7e9f771b8610e805d79f0857ded1926de3386f08 SHA512 c30ff59a0b772428c9c64b6f70871132251deb94d3a074a2a688b90f627bf1d953d6a3d3fd6c6216072f8ca5bfe53bd8707f7c6a125d41a2267cbbb4ca262c65
diff --git a/dev-python/pymysql/files/pymysql-0.10.0-add-missing-import.patch b/dev-python/pymysql/files/pymysql-0.10.0-add-missing-import.patch
deleted file mode 100644
index f850c9be7262..000000000000
--- a/dev-python/pymysql/files/pymysql-0.10.0-add-missing-import.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 3e71dd32e8ce868b090c282759eebdeabc960f58 Mon Sep 17 00:00:00 2001
-From: Inada Naoki <songofacandy@gmail.com>
-Date: Tue, 28 Jul 2020 13:06:07 +0900
-Subject: [PATCH] Add missing import (#879)
-
-Fixes #878
----
- pymysql/converters.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/pymysql/converters.py b/pymysql/converters.py
-index b084ed2f..1b582904 100644
---- a/pymysql/converters.py
-+++ b/pymysql/converters.py
-@@ -5,6 +5,7 @@
- import re
- import time
- 
-+from .err import ProgrammingError
- from .constants import FIELD_TYPE
- 
- 
diff --git a/dev-python/pymysql/pymysql-0.10.0.ebuild b/dev-python/pymysql/pymysql-0.10.1.ebuild
index 059a093ed9bd..f01a413b1c13 100644
--- a/dev-python/pymysql/pymysql-0.10.0.ebuild
+++ b/dev-python/pymysql/pymysql-0.10.1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -27,7 +27,6 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.10.0-fix-tests.patch
-	"${FILESDIR}"/${PN}-0.10.0-add-missing-import.patch
 )
 
 src_prepare() {
diff --git a/dev-python/pymysql/pymysql-0.9.3.ebuild b/dev-python/pymysql/pymysql-0.9.3.ebuild
deleted file mode 100644
index 7346a5ab5fb2..000000000000
--- a/dev-python/pymysql/pymysql-0.9.3.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="PyMySQL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Pure-Python MySQL Driver"
-HOMEPAGE="https://github.com/PyMySQL/PyMySQL"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# TODO: support other mysql variants
-BDEPEND="
-	test? ( dev-db/mariadb[server] )"
-
-src_prepare() {
-	find -name '*.py' -exec sed -i -e 's:unittest2:unittest:' {} + || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	mkdir -p "${T}"/mysql || die
-	"${BROOT}"/usr/share/mariadb/scripts/mysql_install_db \
-		--no-defaults \
-		--auth-root-authentication-method=normal \
-		--basedir="${BROOT}/usr" \
-		--datadir="${T}"/mysql || die
-	# TODO: random port
-	mysqld \
-		--no-defaults \
-		--character-set-server=utf8 \
-		--bind-address=127.0.0.1 \
-		--port=43306 \
-		--socket="${T}"/mysqld.sock \
-		--datadir="${T}"/mysql &
-	local pid=${!}
-
-	# wait for it to start
-	local i
-	for (( i = 0; i < 10; i++)); do
-		[[ -S ${T}/mysqld.sock ]] && break
-		sleep 1
-	done
-	[[ -S ${T}/mysqld.sock ]] || die "mysqld failed to start"
-
-	# create test databases
-	mysql -uroot --socket="${T}"/mysqld.sock -e '
-		create database test1 DEFAULT CHARACTER SET utf8mb4;
-		create database test2 DEFAULT CHARACTER SET utf8mb4;
-
-		create user test2 identified by "some password";
-		grant all on test2.* to test2;
-
-		create user test2@localhost identified by "some password";
-		grant all on test2.* to test2@localhost;
-	' || die
-
-	cat > pymysql/tests/databases.json <<-EOF || die
-		[{
-			"host": "localhost",
-			"user": "root",
-			"passwd": "",
-			"db": "test1",
-			"use_unicode": true,
-			"local_infile": true,
-			"unix_socket": "${T}/mysqld.sock"
-		}, {
-			"host": "localhost",
-			"user": "root",
-			"passwd": "",
-			"db": "test2",
-			"unix_socket": "${T}/mysqld.sock"
-		}]
-	EOF
-
-	distutils-r1_src_test
-
-	kill "${pid}"
-	wait "${pid}"
-}
-
-python_test() {
-	${PYTHON} runtests.py || die
-}