gentoo resync : 16.02.1018

3 files changed, 4 insertions, 129 deletions

diff --git a/dev-db/pgadmin4/Manifest b/dev-db/pgadmin4/Manifest
index 171bdb825bac..592d2beeaa41 100644
--- a/dev-db/pgadmin4/Manifest
+++ b/dev-db/pgadmin4/Manifest
@@ -1,7 +1,5 @@
 DIST pgadmin4-3.0.tar.gz 28915010 BLAKE2B 7e6dccd91f082f7b5514f5d3abdf4653a9961b4efc706e10ce58d817785d514508233e25068762fe0e4bca4c1a3cf10a2515afa38e6f9ba3c99b4af3fa32f3d2 SHA512 5921340176e6748ef13112d906061f195d4bb2f73917d762371bbaeb44ef66cf8e0edcd1cd241eb78dae46ed0b3af014c749468a930fb0c0983b38b2c54dfc3a
-DIST pgadmin4-3.4.tar.gz 30743447 BLAKE2B 4476989dc9bd672810ced56f4c3e6b87f27ec28d693ab6a909b1cdd4ddc0ae51552fe7ac5a3db4382ccded433b1dab239de01697c0709474381c117460a45163 SHA512 57160827a7577b89029a3a621653f2fec9f3b5379a554ea8bcaf80225f32f1ed93e4560ce5d5b499aff2091589e641bdfe82987be46b6155bca3fb072cf2c5e2
-DIST pgadmin4-3.5.tar.gz 31501977 BLAKE2B fbb1ab4ffde62f6a62ff74088d32cfbdb147c5599d713eae46b3ff50972aab7c6aa48ef108d360001dcca8d999cdd0526c6db5f8bfe260bda52dfa4b41678a87 SHA512 6971c003a39fdd2f279fa7a652a32e1554d17d1794fa0b84c4aa3394ab128efbb44299890bd69b07a0ca926d918668fba124f99f3d7271c60ee70616eedd6d1c
+DIST pgadmin4-4.2.tar.gz 32382384 BLAKE2B c96806302e7c298e9fcdee3ada8fc519431eb3de778c55445de648e2867dc32168c5ad38209da63ac2d181612b2edfdd532f11ccd6020ab187c6fe23ef6272a6 SHA512 d3d242904c65f0af871890954c24005b4849b88599cde9a7cb82e077ff5db5a8c5f015c4af0b135d68f02daad42492af71373831c2212a36672af8d7621c3b2a
 EBUILD pgadmin4-3.0.ebuild 3481 BLAKE2B 697a5b6250d747aff9b4216603077a977a84c44bd344f935315eb0ca9a41b85527b32df819738d42626759fb8244392c15edd4909c9b8f03cdb82debf24f5172 SHA512 5f14d65bc3dac207fd3ced4105be3115cd0821a6a5054ce9d150d31d19ca5de44c66b3971444e200d79bfc6b11949cd437a0cbec388f26beef94ccdacb1c3b19
-EBUILD pgadmin4-3.4-r1.ebuild 3497 BLAKE2B eaf731dddc9a70f754b9c224dc5ccd69aa11ed05cbaac23b7be38d3c995a8bad81a678ebe823f5747c49e8b13b1b200ed285f082c9e5ac764d4f28cb764af164 SHA512 079991dff7bdb07fb21b8b0e6f9c0749d9d09021afb24265ab907141b80a5d728d6d8d0d5a6f752ceb3cbb7fd340d6bf6ebc65022e1a8b980817e0b17aa9f2d4
-EBUILD pgadmin4-3.5.ebuild 3543 BLAKE2B bd2ef22bb2bea45eabda3f209ea6ba21969cd98535aa9116088b304f7b4fb5c1ade821dc8f195816d1a2b012174653ca3ca7a4594046816ba597018b175fa627 SHA512 53246c0be50d50d171d664bd6235d1df11ae697c04af76f889530e1a1f3858493265617a3763c1c43f68325cebae3f8fa8fbb70946b8e2278319f744e7758e84
+EBUILD pgadmin4-4.2-r1.ebuild 3550 BLAKE2B 33cb384fe3f047cb6be2631a60094e50f103925fae6fc12d4258a4d5127129f664c3eb1ab86b04b739a2308af5fee9811be579ec9a7302459c4406934e39159c SHA512 f27da6b6bc91041bfbcb96e3066baf1467855de8a9862493b5916aecec83125a6e6bbf5d982aea678149b6f7f90b24cc0411690c8af3bd345d2c044168a44137
 MISC metadata.xml 266 BLAKE2B 9d5988ab45f9939f9be5ee7f4b7a9950a3d62252aa0d3e6c953265467428c59fb8c05b2bb72085431b7aa9fc18d31f2b3273e8fdb33443d786b2237db697b7e2 SHA512 9f85990c7ce6a1de5c1067e4781af18bede2d3bd02963a7b2927766b70dbe98d3fb63bb01e19b1cf6e2b77038d9788bf38155b3cc33f9e5ff8430b10a4006325
diff --git a/dev-db/pgadmin4/pgadmin4-3.4-r1.ebuild b/dev-db/pgadmin4/pgadmin4-3.4-r1.ebuild
deleted file mode 100644
index 18064c0d8eed..000000000000
--- a/dev-db/pgadmin4/pgadmin4-3.4-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 qmake-utils
-
-DESCRIPTION="GUI administration and development platform for PostgreSQL"
-HOMEPAGE="https://www.pgadmin.org/"
-SRC_URI="mirror://postgresql/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
-
-LICENSE="POSTGRESQL"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="doc"
-
-RESTRICT="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/htmlmin-0.1.12[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
-	>=dev-python/click-6.6[${PYTHON_USEDEP}]
-	>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-1.0.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-babel-0.11.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-babelex-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/flask-gravatar-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-htmlmin-1.3.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-login-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-migrate-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-paranoid-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-security-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-sqlalchemy-2.3.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-wtf-0.14.2[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-0.24[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
-	>=dev-python/linecache2-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-0.23[${PYTHON_USEDEP}]
-	>=dev-python/mimeparse-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.7.4[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/pyrsistent-0.14.2[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.1[${PYTHON_USEDEP}]
-	>=dev-python/python-sqlparse-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2018.3[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.13.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/speaklater-1.3[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.2.5[${PYTHON_USEDEP}]
-	>=dev-python/sshtunnel-0.1.3[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/wtforms-2.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}"/${P}/runtime
-
-src_prepare() {
-	cd "${WORKDIR}"/${P} || die
-	default
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_compile() {
-	default
-	if use doc; then
-		cd "${WORKDIR}"/${P} || die
-		emake docs
-	fi
-}
-
-src_install() {
-	dobin pgAdmin4
-
-	cd "${WORKDIR}"/${P} || die
-
-	local APP_DIR=/usr/share/${PN}/web
-	insinto "${APP_DIR}"
-	doins -r web/*
-	cat > "${D}${APP_DIR}"/config_local.py <<-EOF
-		SERVER_MODE = False
-		UPGRADE_CHECK_ENABLED = False
-	EOF
-	python_optimize "${D}${APP_DIR}"
-
-	local CONFIG_DIR="/etc/xdg/pgadmin"
-	dodir "${CONFIG_DIR}"
-	cat > "${D}${CONFIG_DIR}"/pgadmin4.conf <<-EOF
-		[General]
-		ApplicationPath=${APP_DIR}
-		PythonPath=$(python_get_sitedir)
-	EOF
-
-	if use doc; then
-		rm -r docs/en_US/_build/html/_sources || die
-		insinto /usr/share/${PN}/docs/en_US/_build
-		doins -r docs/en_US/_build/html
-	fi
-}
diff --git a/dev-db/pgadmin4/pgadmin4-3.5.ebuild b/dev-db/pgadmin4/pgadmin4-4.2-r1.ebuild
index f0db6c595531..17dde22510ef 100644
--- a/dev-db/pgadmin4/pgadmin4-3.5.ebuild
+++ b/dev-db/pgadmin4/pgadmin4-4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -36,6 +36,7 @@ RDEPEND="${COMMON_DEPEND}
 	>=dev-python/beautifulsoup-4.4.1[${PYTHON_USEDEP}]
 	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
 	>=dev-python/click-6.6[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.2.2-r1[${PYTHON_USEDEP}]
 	>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/flask-0.12.4[${PYTHON_USEDEP}]
@@ -61,7 +62,6 @@ RDEPEND="${COMMON_DEPEND}
 	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
 	>=dev-python/psutil-5.4.7[${PYTHON_USEDEP}]
 	>=dev-python/psycopg-2.7.4[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
 	>=dev-python/pyrsistent-0.14.2[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.7.1[${PYTHON_USEDEP}]
 	>=dev-python/python-sqlparse-0.2.4[${PYTHON_USEDEP}]