[gentoo-commits] repo/gentoo:master commit in: dev-python/pymssql/files/, dev-python/pymssql/

[gentoo-commits] repo/gentoo:master commit in: dev-python/pymssql/files/, dev-python/pymssql/

[Michał Górny]

commit:     442a419463a8fcc22e794d3a24544e044e16df0a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  3 14:13:57 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Mar  3 14:13:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=442a4194

dev-python/pymssql: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pymssql/Manifest                        |  1 -
 .../pymssql/files/pymssql-2.1.3-DBVERSION_80.patch | 13 ------
 dev-python/pymssql/pymssql-2.1.3.ebuild            | 47 ----------------------
 3 files changed, 61 deletions(-)

diff --git a/dev-python/pymssql/Manifest b/dev-python/pymssql/Manifest
index 1178559ead7..22e69da2c45 100644
--- a/dev-python/pymssql/Manifest
+++ b/dev-python/pymssql/Manifest
@@ -1,2 +1 @@
-DIST pymssql-2.1.3.tar.gz 897987 BLAKE2B e105dd8d5dbbad5de566b9179f799ad66eb420f60464e8061470b1abb6ecf38f35ad7992ded40f2cd62c76a8e04255eb647e30df5c9bc4059334a1d5d4677e73 SHA512 a659cb8f077ddbe5e8de0b9b118d8bcc0c87128c0be4ff14343983e7029594e63ba6fb8a88992dc1f058df3c1ebbbd69cf371bf95a0918954cd0cec14c1cb5cb
 DIST pymssql-2.1.5.tar.gz 167928 BLAKE2B c94fc29fa9d83627dbee05095a7c0d6e4e2d42ac34b0e6801bbc757d89728aee409c98519d6e8bfe8d5009f06f88bd23a3e62c050f2c964cb7139bdd3185a0b5 SHA512 7cc7336d4c2fcb7c3958fb3127801e3505fd93259d1aaef40a67941ef5aa519e285cdb04fd378c9712f29b0f8a25ce1747a4a8dc21ec57b004c9f0ceb8f5afab

diff --git a/dev-python/pymssql/files/pymssql-2.1.3-DBVERSION_80.patch b/dev-python/pymssql/files/pymssql-2.1.3-DBVERSION_80.patch
deleted file mode 100644
index 9d72a981735..00000000000
--- a/dev-python/pymssql/files/pymssql-2.1.3-DBVERSION_80.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/_mssql.pyx
-+++ b/_mssql.pyx
-@@ -34,6 +34,10 @@ DEF EXCOMM = 9
- # Provide constants missing in FreeTDS 0.82 so that we can build against it
- DEF DBVERSION_71 = 5
- DEF DBVERSION_72 = 6
-+# See /usr/include/sybdb.h - DBVERSION_80 is not defined in FreeTDS 1.00.13
-+# (cf. http://www.freetds.org/userguide/choosingtdsprotocol.htm)
-+# 8.0 was actually 7.1 so set it to the same value
-+DEF DBVERSION_80 = 5
- 
- ROW_FORMAT_TUPLE = 1
- ROW_FORMAT_DICT = 2

diff --git a/dev-python/pymssql/pymssql-2.1.3.ebuild b/dev-python/pymssql/pymssql-2.1.3.ebuild
deleted file mode 100644
index 0e1da52fced..00000000000
--- a/dev-python/pymssql/pymssql-2.1.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple MSSQL python extension module"
-HOMEPAGE="https://www.pymssql.org/ https://pypi.org/project/pymssql/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="test"
-
-# tests need a running instance of freetds
-RESTRICT="test"
-
-RDEPEND=">=dev-db/freetds-0.63[mssql]"
-DEPEND="
-	${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.3-DBVERSION_80.patch
-	"${FILESDIR}"/${PN}-2.1.3-remove-setuptools_git.patch
-)
-
-python_prepare_all() {
-	# delete stale cython .c file
-	# this can cause issues with the patches
-	rm {_mssql,pymssql}.c || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}

[gentoo-commits] repo/gentoo:master commit in: dev-python/pymssql/files/, dev-python/pymssql/

[Michał Górny]

commit:     21aaae1679b4d4d58dcb0b6710a9a1c6d3027004
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 17 11:38:09 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Apr 17 11:49:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21aaae16

dev-python/pymssql: Skip problematic configure check

Closes: https://bugs.gentoo.org/783396
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../files/pymssql-2.2.1-clock_gettime.patch        | 27 ++++++++++++++++++++++
 dev-python/pymssql/pymssql-2.2.1.ebuild            |  8 +++++++
 2 files changed, 35 insertions(+)

diff --git a/dev-python/pymssql/files/pymssql-2.2.1-clock_gettime.patch b/dev-python/pymssql/files/pymssql-2.2.1-clock_gettime.patch
new file mode 100644
index 00000000000..76d07e27db2
--- /dev/null
+++ b/dev-python/pymssql/files/pymssql-2.2.1-clock_gettime.patch
@@ -0,0 +1,27 @@
+From d130cacf5be53b4c15bb64787d82b1225b1485e7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 17 Apr 2021 13:10:34 +0200
+Subject: [PATCH] Check for clock_gettime() only when linking statically
+
+The extension module does not use clock_gettime() directly, so I presume
+it is only necessary when linking statically to FreeTDS.
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 3ac434e..0295d01 100644
+--- a/setup.py
++++ b/setup.py
+@@ -95,7 +95,7 @@ if not WINDOWS:
+ print("setup.py: include_dirs =>", include_dirs)
+ print("setup.py: library_dirs =>", library_dirs)
+ 
+-if not WINDOWS:
++if LINK_FREETDS_STATICALLY and not WINDOWS:
+     # check for clock_gettime, link with librt for glibc<2.17
+     from dev import ccompiler
+     compiler = ccompiler.new_compiler()
+-- 
+2.31.1
+

diff --git a/dev-python/pymssql/pymssql-2.2.1.ebuild b/dev-python/pymssql/pymssql-2.2.1.ebuild
index 274a4396969..c272cd2b2d6 100644
--- a/dev-python/pymssql/pymssql-2.2.1.ebuild
+++ b/dev-python/pymssql/pymssql-2.2.1.ebuild
@@ -27,4 +27,12 @@ BDEPEND="
 		dev-python/sqlalchemy[${PYTHON_USEDEP}]
 	)"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-clock_gettime.patch
+)
+
 distutils_enable_tests pytest
+
+src_configure() {
+	export LINK_FREETDS_STATICALLY=no
+}