gentoo auto-resync : 06:11:2022 - 09:19:37

3 files changed, 2 insertions, 79 deletions

diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 8ddc2e0cb4ea..dc26a8578ab7 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,11 +1,9 @@
-DIST psycopg-3.1.2.gh.tar.gz 467017 BLAKE2B 5e13156ff05a356bb59ebae77e8ad3d3e35ab669a43102fa7751927e0ecfbebd1b30db7d62bd0865f426c2e6362a98a6d9cad19c9001abf29b6d030b4dd0204b SHA512 3e412ec91a337012086b1260527b2179883f6b44a26c5e8437c92351ca39594c4430f251abdfbc52e4b2c69d5e91ba09883578b177e836691cd295b6e8464fdf
 DIST psycopg-3.1.3.gh.tar.gz 468400 BLAKE2B 5df0414d1afef4a09a319453e2d9cebd6177af507c30e69aac64dc1d476cf7a0d182c72b81e46d95e3167ee503fa9756ba82ad1092419eea0d6fc3c6e9ba972c SHA512 83ca6dc81cff841c9e22ad8ae86500be0012ee0edbc50b8ab97dcdcbe9d17a8b32feb637275bbaef8333f252aeb961fc5f1f9d2c66dcb1e92b0a1b67223624fb
 DIST psycopg-3.1.4.gh.tar.gz 469317 BLAKE2B a6df49a5adefbeb310602473e950ef77f0c613d8a33d41ee37dbfec544dfd014dba8dae5f78ce2bc89f2d9531ccbdd6ea07665ca638f29a4a7d0d1006bc0d778 SHA512 2bf49d6eb7e20c6f22adf47cef6dce691f38f4b310f2fbf3986f3ad14c7d390d53b9edeb3365bbf096941cc2d2affe2ddd542fe93ef37c41109742c9f9af4ba7
 DIST psycopg2-2.9.3.tar.gz 380611 BLAKE2B 78099da7378dcfa8b7f28aae4d533a7e890cdb7ae4c0cc718a9411e630fd07b56f074760fc29de8fe08fe727328cca39414a5f297fb92ed2f7471a24e633d18d SHA512 048184d1d162a371fc0fba711448a6fa8a6aac193421f4484c7f7b91c39065d5b632fa34fc15a901eca055d597302b1f9e38330b248ed0e4653dcdc544b0d660
 DIST psycopg2-2.9.4.tar.gz 384017 BLAKE2B 4bc0afcc890c8a257c1ccd5c6e4e5301857a80f8b1428aa46c1473c9e18f5d2914a2e592c13336b06106217bb334d9b0321835bdd123f1627cbeb29dedf97bf7 SHA512 259088e42e0ab0d8a1a0ccf04f5e560f32c6179b4a0a0059e91bcf269baa8f4b0f1f949c332c640a2438c927a29b2c144078a861f8e18ba9c764da7c93c73b8d
 EBUILD psycopg-2.9.3.ebuild 1306 BLAKE2B 166f519f6e4694fb2725e0f4e736a9ab907dc398c4fadee579da96e37f29faf6f6fe735e56dc9156eefa74302bc516915499d827b3762655863bda1162716e19 SHA512 ecb1f931618b74393cace6f850b35c7512fe5902bdf97eadf0cc1f54e60797c863fe558cda3117ca8a5cd025bd6a761545d6fc1d837aed8ec095c48e98cd7c1b
-EBUILD psycopg-2.9.4.ebuild 1348 BLAKE2B 15b9a3244a73a769cda7236d9bc85f36eee993498672911b121973196f1462f88a7175e26d24e1f772c4f099f2f43b3cc07c603821e13844a103de73abaf7cc7 SHA512 7e63185760b05025ebe0b1eb53673926a4f68d242f4ec2e28a7e1192e72dd876b1982e85f7418a22efada373486edaa2ccd6bd8ff3bebfd2a77d39c295fc1ee8
-EBUILD psycopg-3.1.2.ebuild 1725 BLAKE2B c78cc5299f68452a34fedef960e3ad1bab4d2ab350e06717813bb6972bc0b71c138d1b7d8da12fbea9c36d6b107d9be137e278d43e3a31e74a9fb0df09cbb404 SHA512 2efabffff8d9ae101f2207e694f60bb47daa54454274c8c7abfd69e7b21189628c088e9f8b2677a8bb2a9dde4a345abb165a538a35be7c7dc436a0f886b88ed0
+EBUILD psycopg-2.9.4.ebuild 1345 BLAKE2B 663e8bf226edb0d96c36f27193c23e262bbd906ffc0a03236612f40262bde08b22522e1b1bcf2bf4d3beb9644250b6113e9260dd561c407e6154cb1a0edd5ba1 SHA512 a8b47ae3ce0aff51841005df14b7487c4b8ab94663108054ff2c56dc6ff31f25e9bf1bae32d3e4f324269b3c6b2250e12040547f68191d4abed0fb0f5cd49c58
 EBUILD psycopg-3.1.3.ebuild 1725 BLAKE2B c78cc5299f68452a34fedef960e3ad1bab4d2ab350e06717813bb6972bc0b71c138d1b7d8da12fbea9c36d6b107d9be137e278d43e3a31e74a9fb0df09cbb404 SHA512 2efabffff8d9ae101f2207e694f60bb47daa54454274c8c7abfd69e7b21189628c088e9f8b2677a8bb2a9dde4a345abb165a538a35be7c7dc436a0f886b88ed0
 EBUILD psycopg-3.1.4.ebuild 1732 BLAKE2B 346e6e31a3be765833c4a1d75009d3c8e7347aea9a4a38d35d0cc5c7da722d23abfc41c5b4943331a008b19238a7544c0b181eec83a23a68ae1bc68e5748757f SHA512 f808046857d7400d55ebd1e10ab5f090c26f78b181ded703798acd5a9531bff61bbb450350f904533e265f0fcd2c5032db53a9c1503ced826dc26002cc2a844e
 MISC metadata.xml 369 BLAKE2B 042788638a82318248d4e4ea1e12bf1631af6ffc435fc0110e13849dad600854e8b57f5ba3397c4d4e5d103e165b342f8aba869e72e9b63efc500382d3423414 SHA512 5b216575e8cae847f71a09ed6b676a73fccf2070f3bea3b35f1bfbde95fb0154b2fbb356948e112cc9f2298fc9868ac3994a139e72939f80d59c084ec58d80bf
diff --git a/dev-python/psycopg/psycopg-2.9.4.ebuild b/dev-python/psycopg/psycopg-2.9.4.ebuild
index c33f29d549ad..5cdbce132412 100644
--- a/dev-python/psycopg/psycopg-2.9.4.ebuild
+++ b/dev-python/psycopg/psycopg-2.9.4.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-3+"
 SLOT="2"
-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"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/psycopg/psycopg-3.1.2.ebuild b/dev-python/psycopg/psycopg-3.1.2.ebuild
deleted file mode 100644
index da15e1f0a432..000000000000
--- a/dev-python/psycopg/psycopg-3.1.2.ebuild
+++ /dev/null
@@ -1,75 +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-4.1[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-"
-BDEPEND="
-	test? (
-		>=dev-db/postgresql-8.1[server]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/dnspython[${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
-	tests/crdb/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
-}