gentoo (valentine's day) resync : 14.02.2021

4 files changed, 2 insertions, 94 deletions

diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index addbeb50dbf1..a932a2d048fb 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,6 +1,3 @@
-AUX psycopg-2.8.3-avoid-mxdatetime.patch 954 BLAKE2B 073eca8e49dd4d7fd2ec920dfe52e255d3fbb0e9975cd0378574d7c6f6f097c4b0bae0f4eba74e939b15c19ccab1dbe84d28f434830d38db6b59e18246c3f2c2 SHA512 9e0ac41a70002bdac03628ac15b84edd3e67e589f8ca145242018aab03fc42b8befc1c0330f0111d01b239dc00b6ffc29965ba3c18ce0965cbe9e7b31d1fef4d
-DIST psycopg2-2.8.5.tar.gz 380874 BLAKE2B 843321175499bf00b080d3e58ce0d586e674585af4be5a08866b5dbb68256ff9232d3c25e2603a3a0920a6c91927eb9fbb5942acd429be5dab9177c65da0c32e SHA512 d4cf9b94573b90fe56555ea5cf841aa0c4c806770f92f35a7ef2531999bb50f98eb1276e56f1540b5f2695e443bac7e9cb8bbfbd24ed82164f99663259d2da3e
 DIST psycopg2-2.8.6.tar.gz 383797 BLAKE2B da0e3f1e143c51c940ba1f51d3e457b492d880ab71267dacd4747444bc767711ccd6c2f54d9e10ce5ad8fae0c3206fb4b6199f267e9bbaf12eb654227f59c2b0 SHA512 1e1d5d8755c6d1a153d84210bf29902afafe853659d709e13abc6bc5772def13779d2394690af1c544384c9c607edc0fe5cf2763244fb346febf9a9e0032b45f
-EBUILD psycopg-2.8.5-r1.ebuild 1504 BLAKE2B d6b9a72d95778c7b8b9d9dca9c509580ac8199514667e7e94fdd2448bf343eacfd1da4203878d912ce7d9d328e24de28190008cc6abbbb13a3e9640f4790ff16 SHA512 df20438c877782752733f22e4c80ec3293f4f0dc8fdbdcda29b151f8ad8f73938b1cccc7d641ab6fe5e88b4108b731338427f50b5780b141f0f960169515ba34
-EBUILD psycopg-2.8.6-r1.ebuild 1600 BLAKE2B bfb73b61a4dda3e556b9151b3327fa6e079b2c54459f2e8f865a46edaff479a2c0150f48248416b3e2281b9d6a229a7ca11f44b45b13ca976a16f6ed5f209bcd SHA512 2dfa9179b27c251001e1e9a82da9a9083021aa976f4a1da49791650bb1e8c513af274a4957bbfaa9a4332b53914510aea14181dcd449989139b297c5d6cbab9e
+EBUILD psycopg-2.8.6-r1.ebuild 1599 BLAKE2B 04c28d5e535478f31851bf83fbfb30d8533f58708ce7ff497e3688276612176cb1319b04d172925a4d03fac74e09c74fdbcc0e13dc89c1b162b896a84c4f7a4d SHA512 0525aca01faa7d976ea0ed9b4088daa188a1c367fd9dbf4dcbf2a9dee8be19940dc13ed882ce3da4e0814db5eb104aff796dff767636ca60fd960a68d7b82123
 MISC metadata.xml 321 BLAKE2B aff48bec04e34b92668aa18214d86ddbedef2376eeced4815118d35eebfb8e6af87234a9470828f465626f7d9ed56fe0fcb8f078c23945371248136533651ad3 SHA512 358b751b3a65f64ab5468bcf4022315f7069a2fb60709c2bb12ac02577866a3ff24ab2dd69577052070cf010a51428cb3ec385ca7cfe48640f4dd25ae478a966
diff --git a/dev-python/psycopg/files/psycopg-2.8.3-avoid-mxdatetime.patch b/dev-python/psycopg/files/psycopg-2.8.3-avoid-mxdatetime.patch
deleted file mode 100644
index 3475bf31795e..000000000000
--- a/dev-python/psycopg/files/psycopg-2.8.3-avoid-mxdatetime.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/setup.py b/setup.py
-index c1f319a..c44fc69 100644
---- a/setup.py
-+++ b/setup.py
-@@ -525,19 +525,6 @@ parser.read('setup.cfg')
- 
- # check for mx package
- have_mxdatetime = False
--mxincludedir = ''
--if parser.has_option('build_ext', 'mx_include_dir'):
--    mxincludedir = parser.get('build_ext', 'mx_include_dir')
--if not mxincludedir:
--    mxincludedir = os.path.join(get_python_inc(plat_specific=1), "mx")
--if mxincludedir.strip() and os.path.exists(mxincludedir):
--    # Build the support for mx: we will check at runtime if it can be imported
--    include_dirs.append(mxincludedir)
--    define_macros.append(('HAVE_MXDATETIME', '1'))
--    sources.append('adapter_mxdatetime.c')
--    depends.extend(['adapter_mxdatetime.h', 'typecast_mxdatetime.c'])
--    have_mxdatetime = True
--    version_flags.append('mx')
- 
- # generate a nice version string to avoid confusion when users report bugs
- version_flags.append('pq3')     # no more a choice
diff --git a/dev-python/psycopg/psycopg-2.8.5-r1.ebuild b/dev-python/psycopg/psycopg-2.8.5-r1.ebuild
deleted file mode 100644
index 1336c8ae6608..000000000000
--- a/dev-python/psycopg/psycopg-2.8.5-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN="${PN}2"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="PostgreSQL database adapter for Python"
-HOMEPAGE="https://www.psycopg.org https://pypi.org/project/psycopg2/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-3+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="debug"
-
-RDEPEND=">=dev-db/postgresql-8.1:*"
-DEPEND="${RDEPEND}"
-
-# Avoid using mxdatetime: https://bugs.gentoo.org/452028
-PATCHES=(
-	"${FILESDIR}"/psycopg-2.8.3-avoid-mxdatetime.patch
-)
-
-python_compile() {
-	local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-
-	! python_is_python3 && append-flags -fno-strict-aliasing
-
-	distutils-r1_python_compile
-}
-
-python_prepare_all() {
-	if use debug; then
-		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	initdb -D "${T}"/pgsql || die
-	# TODO: random port
-	pg_ctl -w -D "${T}"/pgsql start \
-		-o "-h '' -k '${T}'" || die
-	createdb -h "${T}" psycopg2_test || die
-
-	local -x PSYCOPG2_TESTDB_HOST="${T}"
-	distutils-r1_src_test
-
-	pg_ctl -w -D "${T}"/pgsql stop || die
-}
-
-python_test() {
-	"${EPYTHON}" -c "
-import tests
-tests.unittest.main(defaultTest='tests.test_suite')
-" --verbose || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/psycopg/psycopg-2.8.6-r1.ebuild b/dev-python/psycopg/psycopg-2.8.6-r1.ebuild
index 1a34ce04906b..913bf81712b3 100644
--- a/dev-python/psycopg/psycopg-2.8.6-r1.ebuild
+++ b/dev-python/psycopg/psycopg-2.8.6-r1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="debug test"
 RESTRICT="!test? ( test )"