From 2972a2b66915199499af721bda00ada75642cb60 Mon Sep 17 00:00:00 2001 From: blshkv Date: Sun, 16 Feb 2020 11:09:44 +0800 Subject: [PATCH] mysql-python: unfork --- dev-python/mysql-python/Manifest | 1 - dev-python/mysql-python/files/include.patch | 12 ----- dev-python/mysql-python/files/mariadb.patch | 16 ------ dev-python/mysql-python/metadata.xml | 12 ----- .../mysql-python/mysql-python-1.2.5-r3.ebuild | 50 ------------------- 5 files changed, 91 deletions(-) delete mode 100644 dev-python/mysql-python/Manifest delete mode 100644 dev-python/mysql-python/files/include.patch delete mode 100644 dev-python/mysql-python/files/mariadb.patch delete mode 100644 dev-python/mysql-python/metadata.xml delete mode 100644 dev-python/mysql-python/mysql-python-1.2.5-r3.ebuild diff --git a/dev-python/mysql-python/Manifest b/dev-python/mysql-python/Manifest deleted file mode 100644 index 08df25791..000000000 --- a/dev-python/mysql-python/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST MySQL-python-1.2.5.zip 108935 BLAKE2B c4d5d4bc814c05604c4acf673ba4f4040dac2653e65173f672a42de4f2877583c79553533040c5502f99b57b71868031daeea7b637a4bea189fb20eea6a6ecc2 SHA512 37521c6fd855c4cde495cc8ec085aca79c2d441a6e3710759385bf2e2c17f43d3311cf1166663892829d2e3999c419443c358c7031cdda225ac44611ced188d0 diff --git a/dev-python/mysql-python/files/include.patch b/dev-python/mysql-python/files/include.patch deleted file mode 100644 index b1b7d46e2..000000000 --- a/dev-python/mysql-python/files/include.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urNp MySQL-python-1.2.5-orig/_mysql.c MySQL-python-1.2.5-dwok/_mysql.c ---- MySQL-python-1.2.5-orig/_mysql.c 2019-08-21 16:38:34.888225875 +0200 -+++ MySQL-python-1.2.5-dwok/_mysql.c 2019-08-21 16:39:35.394098745 +0200 -@@ -40,8 +40,6 @@ PERFORMANCE OF THIS SOFTWARE. - #include "structmember.h" - #if defined(MS_WINDOWS) - #include --#else --#include "my_config.h" - #endif - #include "mysql.h" - #include "mysqld_error.h" diff --git a/dev-python/mysql-python/files/mariadb.patch b/dev-python/mysql-python/files/mariadb.patch deleted file mode 100644 index f332b84bb..000000000 --- a/dev-python/mysql-python/files/mariadb.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ur MySQL-python-1.2.5.orig/setup_posix.py MySQL-python-1.2.5/setup_posix.py ---- MySQL-python-1.2.5.orig/setup_posix.py 2014-01-02 13:52:50.000000000 +0100 -+++ MySQL-python-1.2.5/setup_posix.py 2017-09-18 01:50:28.137820576 +0200 -@@ -69,6 +69,12 @@ - include_dirs = [ dequote(i[2:]) - for i in mysql_config('cflags') - if i.startswith(compiler_flag('I')) ] -+ # fix for mariadb-10.2.8 -+ extra_include_dirs = [] -+ for d in include_dirs: -+ if not d.endswith('..'): -+ extra_include_dirs.append(d + '/server') -+ include_dirs += extra_include_dirs - - if static: - extra_objects.append(os.path.join(library_dirs[0],'lib%s.a' % client)) diff --git a/dev-python/mysql-python/metadata.xml b/dev-python/mysql-python/metadata.xml deleted file mode 100644 index 3dd0d159f..000000000 --- a/dev-python/mysql-python/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - python@gentoo.org - Python - - - mysql-python - mysql-python - - diff --git a/dev-python/mysql-python/mysql-python-1.2.5-r3.ebuild b/dev-python/mysql-python/mysql-python-1.2.5-r3.ebuild deleted file mode 100644 index 9c674b86b..000000000 --- a/dev-python/mysql-python/mysql-python-1.2.5-r3.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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="dev-db/mysql-connector-c" -DEPEND="${RDEPEND}" -BDEPEND="${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 ) - -#https://bugs.gentoo.org/632578 -PATCHES=( - "${FILESDIR}"/mariadb.patch - "${FILESDIR}"/include.patch -) - -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 -}