gentoo resync : 22.12.2021

3 files changed, 2 insertions, 59 deletions

diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index bb8ab35af960..089fdd15ef20 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,7 +1,5 @@
 DIST psycopg2-2.8.6.tar.gz 383797 BLAKE2B da0e3f1e143c51c940ba1f51d3e457b492d880ab71267dacd4747444bc767711ccd6c2f54d9e10ce5ad8fae0c3206fb4b6199f267e9bbaf12eb654227f59c2b0 SHA512 1e1d5d8755c6d1a153d84210bf29902afafe853659d709e13abc6bc5772def13779d2394690af1c544384c9c607edc0fe5cf2763244fb346febf9a9e0032b45f
-DIST psycopg2-2.9.1.tar.gz 379972 BLAKE2B 89a05f0f3e2f426848641bdf07bee1846a5512dd248d7e4eb4723dbc4f7775b00d142217a5cc59e126eeae8e672173b63de3b1152e3bf14dfaccf5fe7149c88d SHA512 478eaeaad98e4521424a0a48d5f0fdba934bb3b682ba111cc37b833cd3c953ad5fbe2a2071d3a9b95c6a447e95de88887ceda5143b63a08703c388f96dd9b4ad
 DIST psycopg2-2.9.2.tar.gz 380253 BLAKE2B f3b649986f8bec56df33858373e510ea69623fc38416f6344c7b63e4c82b412d24edd1b0cadcbf391e8920626ac86e81388e916711ab4d5c6dfc3f88070f5d8f SHA512 96b15db1a8c597dc7b6a725aa67952bcbac8e0e3d4f1cea97c7ffa14b272d21b4c16fd567edbbb4a01aa2c4b01c0bba562cdeea1f678aebf2139aa171dacd0a8
 EBUILD psycopg-2.8.6-r1.ebuild 1313 BLAKE2B dbdf3b3a72aa22bdc1d55c9a6b8f67e706a9d13d9e43c0c09bae8a735eb999b19f262d104aaa9196c6189ed5ecebcafbce49f6499e9632d7f56b4d73c48453f3 SHA512 db57102c60158abf196eef91391c3a37a02a92fc6ffb79c57aaeaafa1b771938a1a3b1d048fe6130e9fab326b9a7d46de605090fdca09025baae051bcbd8f7cd
-EBUILD psycopg-2.9.1.ebuild 1320 BLAKE2B 25bfda21f9dd592cf935b8ff393be523195b2693346ef7c836745c33a3bfc59a20f660f48c77e7f791ecbcb021a936437cbdf984f5030d1075d7436a55cacf85 SHA512 0116362bb7e25fab93831f900e5f0647ef40525448c62a63db8742e00b348ee97dcf80ae4d6f5c398f32c17f3361540bdbf0b3eaa36f2ddb9330b60bca79c2af
-EBUILD psycopg-2.9.2.ebuild 1313 BLAKE2B 5f1b92f1ae3caec90187611e1a2a4e403a0a3b8a39b8c86d3991f02bffad6f5f71bed1ee9cf8f5b1ba2154d34d20edc6c50a94ba4a7d36a0d8d01cd4209baa00 SHA512 7e6fb95c45aeabae36114e210ccf099924f174e5b2414e759d1a38f18c464e4f7ea8bde92e657d00ba8f3818af678107b53bc76622ed4aaf067a09acc8da8ccc
+EBUILD psycopg-2.9.2.ebuild 1306 BLAKE2B 1321dcc989d4b26cd7aa7717a0620aa8f0149b808ae80289dcd4888290202db43ed061c2d887321f7db6425e01502d243a794a8bda79a037d5704eda44d61ed5 SHA512 b579bfec8510acae8b911c214cf06b5e9e671d617550fce0359afc6a8441f6542866d71360cdb5d721c2fb664c15a490c79a529e8f56209db66204079a8bd89c
 MISC metadata.xml 322 BLAKE2B 2656ba386b42acf8e45737cf0f2428d80f91a05de732bd7db0e76bef480c6de927c0bba1c0dccb3d3404054d78354f698e75f03b44940fea6a7683c0c160a71e SHA512 01a60ea486677ccd335e348e90608ee50ac1ff6351d83a2ef4df76675a580f47b72e79ccfa3fdb84f725592bd5c6ef85322fbf40488258c45bc3724b5ff9098c
diff --git a/dev-python/psycopg/psycopg-2.9.1.ebuild b/dev-python/psycopg/psycopg-2.9.1.ebuild
deleted file mode 100644
index 43d37d6349a4..000000000000
--- a/dev-python/psycopg/psycopg-2.9.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-db/postgresql-8.1:*"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? ( >=dev-db/postgresql-8.1[server] )"
-
-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.9.2.ebuild b/dev-python/psycopg/psycopg-2.9.2.ebuild
index 0dac067c45bd..1ecb5a72507c 100644
--- a/dev-python/psycopg/psycopg-2.9.2.ebuild
+++ b/dev-python/psycopg/psycopg-2.9.2.ebuild
@@ -16,7 +16,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 )"