gentoo Easter resync : 12.04.2020

5 files changed, 20 insertions, 78 deletions

diff --git a/dev-python/mysql-python/Manifest b/dev-python/mysql-python/Manifest
index 1add476876f5..ba5ae8682224 100644
--- a/dev-python/mysql-python/Manifest
+++ b/dev-python/mysql-python/Manifest
@@ -1,6 +1,4 @@
-DIST MySQL-python-1.2.3.tar.gz 70305 BLAKE2B 8a365732556646c535bd9cfac69c759e561f1e15f4b25ef863ed60b64f8953af0e3633dfe00085d9a69025cdbc755afab62fc3af5d785d1dc0f67795d5748f75 SHA512 8c1c88ccf833744ac1f78673cb306cafe7f9bfc85ab2ce6dee1024b86571c17f006e3ab8452dba3527976f39aca64757b2d961c30ef4ac61c9a27e60a5f1abf5
+AUX mysql-python-1.2.5-drop-my_config.h-include.patch 327 BLAKE2B 6d237c5da1dddc2fef8300fe85a99e1f904122802d70675c78e8e3c7f22764054f17005eb797743bccbdf97ff056ce17686ca31b4e81ddc8c3a5598edfe74291 SHA512 cb02a5aaef662f225071a597e3f6e424df1fdff41e7d830cc31ed67a4ed92ee7ba1e1387c5e0f9433af507d405c00a5ddd8f88d2270b1975a1490f9ad62a39d5
 DIST MySQL-python-1.2.5.zip 108935 BLAKE2B c4d5d4bc814c05604c4acf673ba4f4040dac2653e65173f672a42de4f2877583c79553533040c5502f99b57b71868031daeea7b637a4bea189fb20eea6a6ecc2 SHA512 37521c6fd855c4cde495cc8ec085aca79c2d441a6e3710759385bf2e2c17f43d3311cf1166663892829d2e3999c419443c358c7031cdda225ac44611ced188d0
-EBUILD mysql-python-1.2.3-r1.ebuild 835 BLAKE2B ef76f61ea46b1aca49b088cdbec022ca432bd118fc08e8a09690360f3e1eca9eff77e441d47bd12512e86fdee933be608dfbbed9691cf86c78e8ea98c4135ddf SHA512 378f9f869e6d4e356f63ae5e270f5ae4707e94b41f96a8a626b5734e7097eacf8514f6b7b650d1424db5f3eb1fc1a367d79ea696cbe18771da615d1436fedaef
-EBUILD mysql-python-1.2.5-r1.ebuild 1105 BLAKE2B 94d55457d0d019b562517995d1ad8947874cc8f4906ac929420c1da413876c8604fedc8a05758af84667d8a93dccce668f73c614091645c109a42fbf2ad99a1f SHA512 37e5ddcd74d30faaadfc827dde3a4fc615649fd908adf3b8ab507cb42c63d70cebe188965dd207d60065f4254f5e92cb7d8de2ccd5d7cedf7a114d80427cf92e
-EBUILD mysql-python-1.2.5-r2.ebuild 1147 BLAKE2B 9bdbfa08bbefa0c30130e98974b38825e448ec091feaf014bc64fc686119bc971ceb9d13980b786a38f5e417e502d072c2ba9783428838fca4fc9c138f40b7f8 SHA512 bedd508e9a74418b195d15655d8dc713bcfccaaf10157c80ba3d52e54128360c6382c3c3b53a213726e72dcbe42899c393c56865e202de97962cf2026c9aeefc
+EBUILD mysql-python-1.2.5-r3.ebuild 1204 BLAKE2B 694b4de34934d059cca537accb3bcc93336ff31dedc3909e2c78f37f54543ca2ed5b0536833b2a9fdca91736a7e09e71fb74781cb85f1009568a52b238d5e2ac SHA512 74f22588bd5f899c8b40447574ecbdd8cd2fb909e638a074108cf720d6f466f94df134f27a0a3f7cb015bcfccbb4131660edb43e616b25be6e9ca564f546f94f
 MISC metadata.xml 384 BLAKE2B 3cfa19a657e3c9f4ffe875d44e01b6ddb72913d6d189a40cb9b3fb7ae6e076deb7f667ba24911ff4627125059dbec21b4fdc6deac20b71dd72de0b500689804a SHA512 df7d59db502cd6ed66cd936708f82efc5e22633508ee367c331d1f66298f806eb3d9a17dc8919c450afe3bebe30fa38e356d3feea2e87c82eea03db54c6e7ee9
diff --git a/dev-python/mysql-python/files/mysql-python-1.2.5-drop-my_config.h-include.patch b/dev-python/mysql-python/files/mysql-python-1.2.5-drop-my_config.h-include.patch
new file mode 100644
index 000000000000..15a22f737a4e
--- /dev/null
+++ b/dev-python/mysql-python/files/mysql-python-1.2.5-drop-my_config.h-include.patch
@@ -0,0 +1,15 @@
+We don't use anything from my_config.h.
+
+Bug: https://bugs.gentoo.org/632578
+
+--- a/_mysql.c
++++ b/_mysql.c
+@@ -40,8 +40,6 @@ PERFORMANCE OF THIS SOFTWARE.
+ #include "structmember.h"

+ #if defined(MS_WINDOWS)

+ #include <config-win.h>

+-#else

+-#include "my_config.h"

+ #endif

+ #include "mysql.h"

+ #include "mysqld_error.h"

diff --git a/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild b/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild
deleted file mode 100644
index e6a1d5418cc4..000000000000
--- a/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 flag-o-matic
-
-MY_P="MySQL-python-${PV}"
-
-DESCRIPTION="Python interface to MySQL"
-HOMEPAGE="https://sourceforge.net/projects/mysql-python/ https://pypi.org/project/MySQL-python/"
-SRC_URI="mirror://sourceforge/mysql-python/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="virtual/mysql"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( HISTORY README doc/{FAQ,MySQLdb}.txt )
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-}
diff --git a/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild b/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild
deleted file mode 100644
index b9a306b810ff..000000000000
--- a/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN="MySQL-python"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python interface to MySQL"
-HOMEPAGE="https://sourceforge.net/projects/mysql-python/ https://pypi.org/project/MySQL-python/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="virtual/mysql"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( HISTORY README.md doc/{FAQ,MySQLdb}.rst )
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-}
-
-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/mysql-python/mysql-python-1.2.5-r2.ebuild b/dev-python/mysql-python/mysql-python-1.2.5-r3.ebuild
index 7ff354aa59ed..fdf403bf9555 100644
--- a/dev-python/mysql-python/mysql-python-1.2.5-r2.ebuild
+++ b/dev-python/mysql-python/mysql-python-1.2.5-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="dev-db/mysql-connector-c"
@@ -28,6 +28,8 @@ BDEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}"/${PN}-1.2.5-drop-my_config.h-include.patch )
+
 DOCS=( HISTORY README.md doc/{FAQ,MySQLdb}.rst )
 
 python_configure_all() {