gentoo resync : 05.02.2020

4 files changed, 71 insertions, 4 deletions

diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index dc0b297d9c5d..dc43815dadbe 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -4,8 +4,10 @@ DIST psycopg2-2.7.4.tar.gz 425331 BLAKE2B 9d256ea340e4bace53981596d9d42863ddc9c8
 DIST psycopg2-2.7.5.tar.gz 426358 BLAKE2B 301bd4c6ecbc29b1b02e477ffd3576c4bbb00142998a85f5a79678a96b521098a8d0bf75779ab7ecb082c6d374cbf41cc845dcba0e1413b98621f67f9b139135 SHA512 5bf85b6760871f904b6b570ea454f99b72cf97acf9cce10b63dc7b6b0b18913b50ad4f24c469d101c54de6ad6100f1cac3c58225076b5e584a677f5ab4170a93
 DIST psycopg2-2.7.7.tar.gz 427474 BLAKE2B bc721b721693bc5f560a4829e84715d15e8c14523ada00109c7d7ba916c91928082fff286bd3c2ff5987c0436443128d1408ac9de073ad538b1e356fc73aaf8f SHA512 032344957c00bf659ca5e46f54f827a6d79809e370d661cd349e2ce935873359bcc4f440b74c6f14658bf1cd9598b6d884abae507fd33db9e07b01fc87967fb0
 DIST psycopg2-2.8.3.tar.gz 377333 BLAKE2B a4f22fb4dfc5492147bee198c587c5c5e43e197e5abb60cc7d5d7a006d91ffd22e35fbfeba35b8d36322f3802073fc105cb8270d436a3ad4d52b1c3c41ba39b1 SHA512 74268f6d05922c968d46ad62a49b4af54dc30463daa67cc0f32d5930c366596f9a1b2f368f2b38c8a9d45bfdcffb13be469a5cbf3911c62d163bea5c7a3ad928
-EBUILD psycopg-2.7.4.ebuild 1541 BLAKE2B e14373df863af19681a2e657b38d3a797175d7b2dabf4ed15d3c7c67f100991e39f9826f2eaedef06bbe13bb6e4e697c45bc3ad6ff34c3f43bcaee54778d377e SHA512 72fd880c7900b6ea5dc86528302c5247ed70b748277ab2c1011e29bf242b8bd45f79ac759145fc7ef8c09b8c46ff83db1f419ae8bfbf5d9e2b54c228e762c5f2
+DIST psycopg2-2.8.4.tar.gz 377883 BLAKE2B 6d25a96d6fb45cc450b20fb570741538c2870e0ab205b9aab1018d4ef716bfba129235a422f2a0dfd182162bff948db8a2e4d23cd57dc01971f2e6f734ebf90e SHA512 d4590c6e4e310d280b6b341cb23427b56b04c1ef08e877f0d99a79c6b00b959307bb18defaf1d9cea58482fb974a78760c5f26a3ece8c1f34ae1840570a71a28
+EBUILD psycopg-2.7.4.ebuild 1542 BLAKE2B 206728c91160ebd99c484929bca930a27ac9d679a2e844df64ece975453104131fef4fcb00864a932bf53570531509806dd2fc58430bb150aef76929fa1ee32e SHA512 642065445ee9bd7f2cdbc23e221e922595ad356a071da2c09d3fb37044f90773e890a6e774945b3e4424584b15cc828487b54e5a0bf242b398533db6a0478c3f
 EBUILD psycopg-2.7.5.ebuild 1554 BLAKE2B b482fc43480ba87569d1b28d0db4ca47be79466de3f0156eb35fac78bb4807c9316e62389d1f7a744faf01e23368d3e55ea7cc8f20d1bf78832b89903354ab8c SHA512 bf10ede2d5004715f3a028ef7f6fc108f4c3b9368ed1690e60bcddf00627014f3483d7d241b01a10ea3a6317748bef8ec40e7909ed584fa730713f1aa6699faf
-EBUILD psycopg-2.7.7.ebuild 1545 BLAKE2B 0bb3f08adee8735ad27c2fb02f7e4f67ebdb562371b756820acd0d1f0eb1fe1f27b1a2658122d99355d4eaf51bbc0e3278f519a7d5893988e2f900b54c4add4b SHA512 41bd841de48561b5f4bead978a5bbf06f61c26cf65acbef4d3616b3cf45a362d4c201f7669f2cc232bad57f41826a450cf2c41b00e9f6007cc7792327367905c
+EBUILD psycopg-2.7.7.ebuild 1546 BLAKE2B bd5488aa67cec8449dbc3d6626db57c4c0b07c0e9e6f69568b8cb7833f71bedf85259e8a70d0aebfb15a1316aa07d52d333df0733cfe9135b9ca0c8d1bb4e5d9 SHA512 ee8968f4a03c2c26ad167c7c4541b0d6a7621565ab30c52dca93fc332c81270991c6555dbd3b5be11b7dce21a337b914b607f823486222fee7d6a5047a65d885
 EBUILD psycopg-2.8.3.ebuild 1428 BLAKE2B ea3a99eddb5622d11279617be9bf1a9963779bbea7a3bcc24eaa7c1b9dfc018bf2a8ed730ed0dfad10b3c33eba3d54f13f74ac98103015415405a5f120700091 SHA512 51d62aeacf11d5e84c8cc0b5e3169f24a614942213bac17953eeba5315fdbfa9355fb1c0dc7a4c5073fa78c1ee6c858e7d3c476563a097e635ca1b515b7ccf07
+EBUILD psycopg-2.8.4.ebuild 1428 BLAKE2B ea3a99eddb5622d11279617be9bf1a9963779bbea7a3bcc24eaa7c1b9dfc018bf2a8ed730ed0dfad10b3c33eba3d54f13f74ac98103015415405a5f120700091 SHA512 51d62aeacf11d5e84c8cc0b5e3169f24a614942213bac17953eeba5315fdbfa9355fb1c0dc7a4c5073fa78c1ee6c858e7d3c476563a097e635ca1b515b7ccf07
 MISC metadata.xml 321 BLAKE2B aff48bec04e34b92668aa18214d86ddbedef2376eeced4815118d35eebfb8e6af87234a9470828f465626f7d9ed56fe0fcb8f078c23945371248136533651ad3 SHA512 358b751b3a65f64ab5468bcf4022315f7069a2fb60709c2bb12ac02577866a3ff24ab2dd69577052070cf010a51428cb3ec385ca7cfe48640f4dd25ae478a966
diff --git a/dev-python/psycopg/psycopg-2.7.4.ebuild b/dev-python/psycopg/psycopg-2.7.4.ebuild
index 0e1353104865..3e7fbe852468 100644
--- a/dev-python/psycopg/psycopg-2.7.4.ebuild
+++ b/dev-python/psycopg/psycopg-2.7.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="debug doc examples"
 
 RDEPEND=">=dev-db/postgresql-8.1:*"
diff --git a/dev-python/psycopg/psycopg-2.7.7.ebuild b/dev-python/psycopg/psycopg-2.7.7.ebuild
index f7ed9d0b3a9d..0c8eca0bb150 100644
--- a/dev-python/psycopg/psycopg-2.7.7.ebuild
+++ b/dev-python/psycopg/psycopg-2.7.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="debug doc examples"
 
 RDEPEND=">=dev-db/postgresql-8.1:*"
diff --git a/dev-python/psycopg/psycopg-2.8.4.ebuild b/dev-python/psycopg/psycopg-2.8.4.ebuild
new file mode 100644
index 000000000000..4f7153baf26c
--- /dev/null
+++ b/dev-python/psycopg/psycopg-2.8.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="${PN}2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PostgreSQL database adapter for Python"
+HOMEPAGE="http://initd.org/psycopg/ https://pypi.org/project/psycopg2/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="2"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc"
+
+RDEPEND=">=dev-db/postgresql-8.1:*"
+DEPEND="${RDEPEND}
+	doc? (
+		>=dev-python/pygments-2.2[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6
+	)"
+
+RESTRICT="test"
+
+# Avoid using mxdatetime: https://bugs.gentoo.org/452028
+PATCHES=(
+	"${FILESDIR}"/psycopg-2.8.3-avoid-mxdatetime.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+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
+}
+
+python_compile_all() {
+	use doc && emake -C doc/src -j1 html text
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc -r doc/src/_build/html
+		dodoc doc/src/_build/text/*
+	fi
+
+	distutils-r1_python_install_all
+}