gentoo auto-resync : 03:10:2022 - 13:14:45

3 files changed, 2 insertions, 77 deletions

diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 0a6756a2ea89..88add02954a6 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,11 +1,9 @@
-DIST psycopg-3.0.16.gh.tar.gz 386693 BLAKE2B c6c0bd9832e65180e7de76b04ef7c81f4c2d0981894d090b933ce0efaaafdf6b62d1d71a4c70c7c9b848b67e576a71953116925f9e991a4ed99b53067e24cbba SHA512 655e01bb00972dacae590f2e8ce5948226acb827b55099e7f362fdee9210f07b755f4da10d2fadd468aa95eaa3f72e7658a1ab26870d4ac159ee266ce1f8140c
 DIST psycopg-3.1.1.gh.tar.gz 464501 BLAKE2B 1796ae830051ee0719e4723036ca672ac005793beb88da21b9775cdc96dd4f58b3d008eb3f3a87c3f7293ea097480bbe72a8591b68371d1f7c7261c37927e40f SHA512 a243626c5e0ee0ef414c193b9168f58ec6fa3bfc5652c25c3c1f355f4cea29bcc993ba631a125c0a0335155c15fc068f6cfa5e8974de0cd32e007ae6d3db23dc
 DIST psycopg-3.1.2.gh.tar.gz 467017 BLAKE2B 5e13156ff05a356bb59ebae77e8ad3d3e35ab669a43102fa7751927e0ecfbebd1b30db7d62bd0865f426c2e6362a98a6d9cad19c9001abf29b6d030b4dd0204b SHA512 3e412ec91a337012086b1260527b2179883f6b44a26c5e8437c92351ca39594c4430f251abdfbc52e4b2c69d5e91ba09883578b177e836691cd295b6e8464fdf
 DIST psycopg-3.1.gh.tar.gz 463892 BLAKE2B 94100bed4807771f6c4d0469737b160955f3f6bfcff84240c9e15dd9b7b88765583952b712642740c97f6ec42223edcf74fb2c5390a185f44ca0eb8858e76100 SHA512 057a14d614ccb9f36a7db7a82c3d48953658a1c6af2a2265a93a3f6c1db421275e51e1be4d59e2ea98b638f3da8c24c9d2a4d9aabf6190c47691dd632c9339f9
 DIST psycopg2-2.9.3.tar.gz 380611 BLAKE2B 78099da7378dcfa8b7f28aae4d533a7e890cdb7ae4c0cc718a9411e630fd07b56f074760fc29de8fe08fe727328cca39414a5f297fb92ed2f7471a24e633d18d SHA512 048184d1d162a371fc0fba711448a6fa8a6aac193421f4484c7f7b91c39065d5b632fa34fc15a901eca055d597302b1f9e38330b248ed0e4653dcdc544b0d660
 EBUILD psycopg-2.9.3.ebuild 1306 BLAKE2B 166f519f6e4694fb2725e0f4e736a9ab907dc398c4fadee579da96e37f29faf6f6fe735e56dc9156eefa74302bc516915499d827b3762655863bda1162716e19 SHA512 ecb1f931618b74393cace6f850b35c7512fe5902bdf97eadf0cc1f54e60797c863fe558cda3117ca8a5cd025bd6a761545d6fc1d837aed8ec095c48e98cd7c1b
-EBUILD psycopg-3.0.16.ebuild 1653 BLAKE2B 91a5f64268d5304b46e14d3969bfb3a8df2fd1ebf6ca8d9adc365ce7200628efbe8d7c8bcf4e964881eeec743fb3c736ddf49f897df546161f053ed955284e58 SHA512 647f24602344c4016e440c4dc2d2c8247b5e6f549049140d9fcb03854d926bea1c1f494f836ab1f9f5be3f0239c680dd6cdc44fa14166981b149a2a1db707ed7
 EBUILD psycopg-3.1.1.ebuild 1732 BLAKE2B 346e6e31a3be765833c4a1d75009d3c8e7347aea9a4a38d35d0cc5c7da722d23abfc41c5b4943331a008b19238a7544c0b181eec83a23a68ae1bc68e5748757f SHA512 f808046857d7400d55ebd1e10ab5f090c26f78b181ded703798acd5a9531bff61bbb450350f904533e265f0fcd2c5032db53a9c1503ced826dc26002cc2a844e
 EBUILD psycopg-3.1.2.ebuild 1732 BLAKE2B 346e6e31a3be765833c4a1d75009d3c8e7347aea9a4a38d35d0cc5c7da722d23abfc41c5b4943331a008b19238a7544c0b181eec83a23a68ae1bc68e5748757f SHA512 f808046857d7400d55ebd1e10ab5f090c26f78b181ded703798acd5a9531bff61bbb450350f904533e265f0fcd2c5032db53a9c1503ced826dc26002cc2a844e
-EBUILD psycopg-3.1.ebuild 1731 BLAKE2B 59f0342eb048a3be36a511b3653c5d072608d359ac78cae185ddd545436a3a1b0fda2f4e79afdc582beae54b19248050cbc433df41a29a794a02cd2539cce728 SHA512 a2a3b7427e35dcd735fd819569048ec58b1138752855bc12aba1c2d50c363e258f7baa67ad8fb95f80c965cd37768106507997443c3776d6cc6d384eaf37e441
+EBUILD psycopg-3.1.ebuild 1725 BLAKE2B c78cc5299f68452a34fedef960e3ad1bab4d2ab350e06717813bb6972bc0b71c138d1b7d8da12fbea9c36d6b107d9be137e278d43e3a31e74a9fb0df09cbb404 SHA512 2efabffff8d9ae101f2207e694f60bb47daa54454274c8c7abfd69e7b21189628c088e9f8b2677a8bb2a9dde4a345abb165a538a35be7c7dc436a0f886b88ed0
 MISC metadata.xml 369 BLAKE2B 042788638a82318248d4e4ea1e12bf1631af6ffc435fc0110e13849dad600854e8b57f5ba3397c4d4e5d103e165b342f8aba869e72e9b63efc500382d3423414 SHA512 5b216575e8cae847f71a09ed6b676a73fccf2070f3bea3b35f1bfbde95fb0154b2fbb356948e112cc9f2298fc9868ac3994a139e72939f80d59c084ec58d80bf
diff --git a/dev-python/psycopg/psycopg-3.0.16.ebuild b/dev-python/psycopg/psycopg-3.0.16.ebuild
deleted file mode 100644
index a3964c006ce6..000000000000
--- a/dev-python/psycopg/psycopg-3.0.16.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="PostgreSQL database adapter for Python"
-HOMEPAGE="
-	https://www.psycopg.org/psycopg3/
-	https://github.com/psycopg/psycopg/
-	https://pypi.org/project/psycopg/
-"
-SRC_URI="
-	https://github.com/psycopg/psycopg/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/${P}/psycopg
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-
-DEPEND="
-	>=dev-db/postgresql-8.1:*
-"
-RDEPEND="
-	${DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/backports-zoneinfo-0.2.0[${PYTHON_USEDEP}]
-	' 3.8)
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	test? (
-		>=dev-db/postgresql-8.1[server]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# tests for the psycopg_pool package
-	tests/pool
-	# some broken mypy magic
-	tests/test_module.py::test_version
-	tests/test_module.py::test_version_c
-	tests/test_typing.py
-	# TODO, relying on undefined ordering in Python?
-	tests/test_dns_srv.py::test_srv
-)
-
-src_test() {
-	# tests are lurking in top-level directory
-	cd .. || die
-
-	initdb -D "${T}"/pgsql || die
-	# TODO: random port
-	pg_ctl -w -D "${T}"/pgsql start \
-		-o "-h '' -k '${T}'" || die
-	createdb -h "${T}" test || die
-
-	local -x PSYCOPG_TEST_DSN="host=${T} dbname=test"
-	distutils-r1_src_test
-
-	pg_ctl -w -D "${T}"/pgsql stop || die
-}
diff --git a/dev-python/psycopg/psycopg-3.1.ebuild b/dev-python/psycopg/psycopg-3.1.ebuild
index 9e89268b5558..da15e1f0a432 100644
--- a/dev-python/psycopg/psycopg-3.1.ebuild
+++ b/dev-python/psycopg/psycopg-3.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${P}/psycopg
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 DEPEND="
 	>=dev-db/postgresql-8.1:*