upgrade to mysql-python-1.2.5
mysql-python-1.2.5 was pulled from upstream portage, using
--unstable-ok. This fixes a bug which was disabling SSL for mysql-python.
The ebuild has been modified and uprevved to -r1 to include the prior
src_configure workarounds.
BUG=chromium:383531
TEST=new package emerges correctly, and allows SSL mysql connections.
stumpy_moblab trybot.
Change-Id: I397ece7fcbee89fa2ebd98c64ffbd1cd047cc6ca
Reviewed-on: https://chromium-review.googlesource.com/203514
Reviewed-by: Aviv Keshet <akeshet@chromium.org>
Commit-Queue: Aviv Keshet <akeshet@chromium.org>
Tested-by: Aviv Keshet <akeshet@chromium.org>
diff --git a/dev-python/mysql-python/Manifest b/dev-python/mysql-python/Manifest
index 1330a7a..d958f7a 100644
--- a/dev-python/mysql-python/Manifest
+++ b/dev-python/mysql-python/Manifest
@@ -1 +1 @@
-DIST MySQL-python-1.2.3.tar.gz 70305 SHA256 7de66fbbf923634e7c965aeaefa74642ba75ae20ee1cefcefc3009595b7a7e6e SHA512 8c1c88ccf833744ac1f78673cb306cafe7f9bfc85ab2ce6dee1024b86571c17f006e3ab8452dba3527976f39aca64757b2d961c30ef4ac61c9a27e60a5f1abf5 WHIRLPOOL 31e294d658d80b876e54d9825252b0fcffd369a8c80926c78b5830401125761ecfc2d0faa49669d8a404228fc6395ef2bcf7c614d47c13e6a2438e66af36dcd6
+DIST MySQL-python-1.2.5.zip 108935 SHA256 811040b647e5d5686f84db415efd697e6250008b112b6909ba77ac059e140c74 SHA512 37521c6fd855c4cde495cc8ec085aca79c2d441a6e3710759385bf2e2c17f43d3311cf1166663892829d2e3999c419443c358c7031cdda225ac44611ced188d0 WHIRLPOOL 4dba5b960b6fda6e7096bbeeb38b35b6c645b2126dc82a3d24eb0f14feec7532a474bded66393ad7ee10ed4a6ed1e927fe994ddfaafda2534ba1e93bb1a7c0f6
diff --git a/dev-python/mysql-python/metadata.xml b/dev-python/mysql-python/metadata.xml
index de483c5..ee7e8b2 100644
--- a/dev-python/mysql-python/metadata.xml
+++ b/dev-python/mysql-python/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>python</herd>
+ <herd>python</herd>
</pkgmetadata>
diff --git a/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild b/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild
similarity index 61%
rename from dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild
rename to dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild
index ae5c3dd..64d5b68 100644
--- a/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild
+++ b/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild
@@ -1,39 +1,40 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild,v 1.12 2014/02/06 09:27:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mysql-python/mysql-python-1.2.5.ebuild,v 1.4 2014/03/18 15:26:44 idella4 Exp $
EAPI=5
+
PYTHON_COMPAT=( python{2_6,2_7} )
inherit distutils-r1 flag-o-matic
-MY_P="MySQL-python-${PV}"
+MY_PN="MySQL-python"
+MY_P="${MY_PN}-${PV}"
DESCRIPTION="Python interface to MySQL"
HOMEPAGE="http://sourceforge.net/projects/mysql-python/ http://pypi.python.org/pypi/MySQL-python"
-SRC_URI="mirror://sourceforge/mysql-python/${MY_P}.tar.gz"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="*"
-IUSE=""
+IUSE="doc"
-# RDEPEND on sys-devel/binutils to ensure libbfd is available.
-RDEPEND="virtual/mysql
- sys-devel/binutils
-"
+RDEPEND="virtual/mysql"
DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]"
+ app-arch/unzip
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
S="${WORKDIR}/${MY_P}"
-DOCS=( HISTORY README doc/{FAQ,MySQLdb}.txt )
+DOCS=( HISTORY README.md doc/{FAQ,MySQLdb}.rst )
src_configure() {
# Append the SYSROOT Library Path in order for the linker to find
- # libbfd when cross-compiling.
+ # libbfd when cross-compiling.
append-ldflags "-L${SYSROOT}/usr/${CHOST}/lib"
-
+
# Update the site configuration options to search for mysql_config in the SYSROOT.
sed -i -r \
-e "s:#mysql_config = /usr/local/bin:mysql_config = ${SYSROOT}/usr/bin:" \
@@ -44,3 +45,12 @@
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
+}