gentoo resync : 13.06.2020

4 files changed, 41 insertions, 64 deletions

diff --git a/dev-db/pgxnclient/Manifest b/dev-db/pgxnclient/Manifest
index 2792b03e8752..af6cae475154 100644
--- a/dev-db/pgxnclient/Manifest
+++ b/dev-db/pgxnclient/Manifest
@@ -1,5 +1,3 @@
-DIST pgxnclient-1.2.1.tar.gz 87275 BLAKE2B 794ee6201988ba523cdcb4ee5a6287625cb3dd8a30ad750266d7adb739792b7f8e852d5d01f746fb6b05b54c98d677854dceacc57e41b05efba094efabc6a129 SHA512 3fa864b1ebb5dedaf75515b5efe4c453f02acff558f7b82d2648da62e58c93e050049a7688171a69593784d9963bb62f4ad3674d526284554dbeb4f4a4ea1dbf
-DIST pgxnclient-1.2.tar.gz 86436 BLAKE2B 796191d31000ff75360e0990bb20ca88af0fb1b908aac9ca7a6b7309b5420c56d045a67c775e8d5dda166f37ad956314f65bd2032c114cac7414bef9ad1a0d8e SHA512 d677f8d5346caf4de5d7e0d4e4031b8bdd932e343af7fc33e8895ebe51b1e9e6a11d7300d9e98ddc10242854f7d39c0a4196f41938e42f0b0e5158454e386deb
-EBUILD pgxnclient-1.2-r1.ebuild 788 BLAKE2B 6d10568406f8432c8773efc91d1a8b5662309c378d77f05175751cf8360bb59f39f87fbf2395656470384be6cf81621f46c376e3145dd4320642a7e94ed6d292 SHA512 84c19cd6a55d077484bdfa5674fce3da340f9a181987df8b5da99ed80da9f0353dab681bbc32b326e5525356b31e56f5a3384c3c7f4b81125e1e9ebe7c69a29c
-EBUILD pgxnclient-1.2.1.ebuild 788 BLAKE2B 7702c7c55c7fe507a7fa02016a7129a86cc77c23ea7650dee57d3c31b96caaced1c7cf34e344c57f4c2d4a55d3f88b4e5ee5c885997dfa2f8e0ca6ab86e43c8c SHA512 83c988cbecab73a3c2cfa1eeb0ba38ec498c0a06ba0c09c7c465c4443d5daa934aa968c427253d4e40ed245fbd5000da1561bbf3646ab8b51a2b66df4ece7d54
+DIST pgxnclient-1.3.tar.gz 51976 BLAKE2B 84ae5573588e6da0b01d5b05e296adc09f28a0b21ff81e5f2f14f3035a98ad5eb834d6793acf0a48a8b19190b989562e75094341f7c01b371028a0dd6a87b0f4 SHA512 fd9326107334d473db3466f776021186a5add389a93266b000c143131a0214b9773dd4cdd4688575cd720c8357afce1473838dea4aa5ff2564dcbc2c359de2dd
+EBUILD pgxnclient-1.3.ebuild 929 BLAKE2B 4f71c33bd21fc85c0c3ec4f7e9ace002669657f036a0ceeadabf101d5144b35561f91646b6b5336c5b88560d1574ef5eb6e3e10b5d25047ab6f92b36bb59baec SHA512 7ef32558533e7b719e18c08057979bc9754bf17340ce4782aac4ad264b93e15cd9d05c55ba1b00041af9bf2d75094dfd688932c218e1b02e3862dccf4598e9c5
 MISC metadata.xml 477 BLAKE2B 69bcece85da5b9490a5aec5f94264a420d5babb983d602188b4bcad58f35da663216bb52e694009562e518b716a12b05734a2ee81a1219d93641268630a68e3b SHA512 63a1019650d2bfec1f0dab904cabd0de847f5d7cb5ad62dd04ca93a6cf7c25ef2a727a8dc0700a00958b841f7ffaa2c99f608b4cb1872a31a1dc920d0834d22d
diff --git a/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild b/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild
deleted file mode 100644
index 476f29b4530d..000000000000
--- a/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="PostgreSQL Extension Network Client"
-HOMEPAGE="http://pgxnclient.projects.postgresql.org/ https://pypi.org/project/pgxnclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-db/postgresql-9.1[server]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	# suite written onlt for py2
-	pushd ${PN} > /dev/null
-	if ! python_is_python3; then
-		PYTHONPATH=../ "${PYTHON}" -m unittest discover || die "tests failed"
-	fi
-	popd > dev/null
-}
diff --git a/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild b/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild
deleted file mode 100644
index 7a21cde057ad..000000000000
--- a/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="PostgreSQL Extension Network Client"
-HOMEPAGE="http://pgxnclient.projects.postgresql.org/ https://pypi.org/project/pgxnclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-db/postgresql-9.1[server]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	# suite written onlt for py2
-	pushd ${PN} > /dev/null
-	if ! python_is_python3; then
-		PYTHONPATH=../ "${PYTHON}" -m unittest discover || die "tests failed"
-	fi
-	popd > dev/null
-}
diff --git a/dev-db/pgxnclient/pgxnclient-1.3.ebuild b/dev-db/pgxnclient/pgxnclient-1.3.ebuild
new file mode 100644
index 000000000000..586f7287262e
--- /dev/null
+++ b/dev-db/pgxnclient/pgxnclient-1.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="PostgreSQL Extension Network Client"
+HOMEPAGE="http://pgxnclient.projects.postgresql.org/ https://pypi.org/project/pgxnclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+LICENSE="BSD"
+SLOT="0"
+
+IUSE="test"
+
+# Test data isn't included in releases. So, the tests fail.
+# https://github.com/pgxn/pgxnclient/issues/36
+RESTRICT="test
+	!test? ( test )"
+
+distutils_enable_tests pytest
+
+RDEPEND="dev-db/postgresql:*[server]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND+="${RDEPEND}
+	test? (	dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+src_prepare() {
+	sed "s/find_packages()/find_packages(exclude=['tests'])/" -i setup.py || die
+
+	default
+}