gentoo resync : 05.03.2021

4 files changed, 2 insertions, 65 deletions

diff --git a/dev-python/pymssql/Manifest b/dev-python/pymssql/Manifest
index e751e89d5918..408f2c7b4ed4 100644
--- a/dev-python/pymssql/Manifest
+++ b/dev-python/pymssql/Manifest
@@ -1,7 +1,4 @@
-AUX pymssql-2.1.3-DBVERSION_80.patch 451 BLAKE2B e9ab70a24db87e2f69eb502c491746ed3b83d5b50c8e87330c5e209c4f0b89d889fbba980721958db0fea2c2e0d944d7fd1692f018089946c8dd7c0d6f46ff58 SHA512 e596231f5d2ba6354b8e942d270079bb6ff65ff362640f99e631407107ec11e1f8c20097f9fb614066fde83dcd89d5c64181dddb9bf8c52f12b355e68f248f28
 AUX pymssql-2.1.3-remove-setuptools_git.patch 243 BLAKE2B 51f598a199867a6278518a0d204a3bfffcba662e22377d0b927e404a420a32a771a56ab23c99b8fa819b216e95efd8efdb8f61955da1ed79e64c84cb6b6634d1 SHA512 e8a24dfd4e4c6320ef854592d890a8e34870884ac05e0e60a52bd4e05f5eb7fbac86311da98d1ba8be2a55233788e070f7dfc529570c1cefe25471abbd22fa20
-DIST pymssql-2.1.3.tar.gz 897987 BLAKE2B e105dd8d5dbbad5de566b9179f799ad66eb420f60464e8061470b1abb6ecf38f35ad7992ded40f2cd62c76a8e04255eb647e30df5c9bc4059334a1d5d4677e73 SHA512 a659cb8f077ddbe5e8de0b9b118d8bcc0c87128c0be4ff14343983e7029594e63ba6fb8a88992dc1f058df3c1ebbbd69cf371bf95a0918954cd0cec14c1cb5cb
 DIST pymssql-2.1.5.tar.gz 167928 BLAKE2B c94fc29fa9d83627dbee05095a7c0d6e4e2d42ac34b0e6801bbc757d89728aee409c98519d6e8bfe8d5009f06f88bd23a3e62c050f2c964cb7139bdd3185a0b5 SHA512 7cc7336d4c2fcb7c3958fb3127801e3505fd93259d1aaef40a67941ef5aa519e285cdb04fd378c9712f29b0f8a25ce1747a4a8dc21ec57b004c9f0ceb8f5afab
-EBUILD pymssql-2.1.3.ebuild 1075 BLAKE2B 3cb7d762753963a6b66903e36fe11e5d89ae2a61ef294390ec35b281290f0f505bb2159c6262cc9c82dbaa0b09a19fb3a39a0a044c728042515936a1c302f34a SHA512 4aa9677d5e99150e340038b960456a87e897f9ce0f00de235c95540724af58062edc9a0feb77220cb8bcef9ef4d32787d91ec63cf450aacac5963368c7398e16
-EBUILD pymssql-2.1.5.ebuild 840 BLAKE2B 293cb1e599ea56e9d8ad58ddc3d2b2f29aaee701ddc062f2440d58af8e465a3e2f139992be5939586630003010e7636f509fe5f38c9f34b3d427784f0848b788 SHA512 a81171ab86accc58beda2d0ee4c53a197bd3c415875015c87553360239827a775ad181929dc68853be8ba8009fc8ad4590065bbe85ac8575b0cd7255f00015a4
+EBUILD pymssql-2.1.5.ebuild 837 BLAKE2B 56faa9add8ed0774bc3498ff797f3fedf82b64172eadd67db4dce99838f8c9ee82d4ccfbc524583fc34353a47de8a6fd160137b6d6dc329e2950d68eb2b5a9c0 SHA512 7a328313cbc1f703d89d0647a8d1b6091f419e22b7f47217f874e6d7dd48a223668b423d5b799d1ed6b2635f523a5b12287a87081d54ea496c15c6f4671d9f4d
 MISC metadata.xml 362 BLAKE2B 34809feb3df73137c8fdd77f5fcc54520593c3d8f82316981c34971ff0df5774a32e1544fe4dc89acfbbacd7b360881a89f8e18000c91648be1fc471c5ae05f2 SHA512 6d33889c3389c738a35383c7924768ce3439bbd951015cc7799f2153585d4ae44065e91e8ec23194be680e20f1caf82e27b4d5650680334baba109f8a19128e8
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 9d72a9817358..000000000000
--- 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 0e1da52fced0..000000000000
--- 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}"
-}
diff --git a/dev-python/pymssql/pymssql-2.1.5.ebuild b/dev-python/pymssql/pymssql-2.1.5.ebuild
index 309b34a4b20a..0c605034ed92 100644
--- a/dev-python/pymssql/pymssql-2.1.5.ebuild
+++ b/dev-python/pymssql/pymssql-2.1.5.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 
 # tests need a running instance of freetds