gentoo resync : 15.10.2017

3 files changed, 3 insertions, 125 deletions

diff --git a/dev-db/pgadmin4/Manifest b/dev-db/pgadmin4/Manifest
index 7c7c5335e42d..960bc2c05c19 100644
--- a/dev-db/pgadmin4/Manifest
+++ b/dev-db/pgadmin4/Manifest
@@ -1,5 +1,3 @@
-DIST pgadmin4-1.6.tar.gz 24595129 SHA256 514c021994c91eb9adb4a42edcec12974b473175289d48a5824b8c0f4e15e0c8 SHA512 115c2b0f1fd205912ba5fa51426de8c75ce979a075a16434ced3421186794fef756faae58f81c9585359cbe31b7bde24b773cfc886a64d349e656334349f6387 WHIRLPOOL 2697d253cf4a05a57fd06576636ab689c883daea46eae190f57ccb0a88a77e0df5e57bea554aca844beaab4cc9e10ecdf0607a0aee24468ed0602c78073f98c4
 DIST pgadmin4-2.0.tar.gz 24988176 SHA256 a8c8052d9e61f3ae357810bcabc8ffc8b02a0c39730e1f14d9a920ae7cae6ccb SHA512 463e95a341dec74ac0a08a647af1cbe83b514b0595b8469ab9c7b5335e24604e082b906d530aa735fef7b08c58d8a8a6df3edf5dc65402f6521165f1cbb72f67 WHIRLPOOL 5685a6d7c4fbeb1c4629ab30908e75792ede775afe59895462fe1760b45e33a7b67e5942eabb63400eab9c757aeb1f872d0146161839f304cb2d2b8f133a1ff5
-EBUILD pgadmin4-1.6.ebuild 3378 SHA256 bde889c71affa93d6041019cb42590c243a5d612d4ba36679155a9ea8a70b9cb SHA512 4f36248b9538041a6b837986fc53e56c916ad3247aa674130dafc598bdac6286121cc289ac9eb184e9d557f579da38b3412ce2bb80ceb07d92262bd37adbd433 WHIRLPOOL fac15cd3858d12a522fd304896afac277ba231d04295cdcbe205b847c4abe2d400eb701007c458de655b7085de33d54b450792000aab2a6f0f8bf94868ae76af
-EBUILD pgadmin4-2.0.ebuild 3378 SHA256 bde889c71affa93d6041019cb42590c243a5d612d4ba36679155a9ea8a70b9cb SHA512 4f36248b9538041a6b837986fc53e56c916ad3247aa674130dafc598bdac6286121cc289ac9eb184e9d557f579da38b3412ce2bb80ceb07d92262bd37adbd433 WHIRLPOOL fac15cd3858d12a522fd304896afac277ba231d04295cdcbe205b847c4abe2d400eb701007c458de655b7085de33d54b450792000aab2a6f0f8bf94868ae76af
+EBUILD pgadmin4-2.0-r1.ebuild 3430 SHA256 289030224d816cfcbac3d1526e82f386059a5f9965e0385fed46db722d227180 SHA512 10d50efb96498eb3abb76943ab2a678c9b3a39935d628906a6a07b9b9d666ab6648eed4b2c4d6ecd0b4a61664dc4cf25cdeb4abc5fc55c2915a87d40e4f0975a WHIRLPOOL 9755db85507b6806c8f02c7181c383f7821c39882ca6766281dcab5e3d13880372af3fdd8ce55d2f2b2e18ccbf3d4c5084c304524e395b5bebc2a2b52440e94a
 MISC metadata.xml 266 SHA256 eef85725585b45398124c5be76b10938c155120d7fb2af2d50082030a59b2d71 SHA512 9f85990c7ce6a1de5c1067e4781af18bede2d3bd02963a7b2927766b70dbe98d3fb63bb01e19b1cf6e2b77038d9788bf38155b3cc33f9e5ff8430b10a4006325 WHIRLPOOL 9f0cee39655a0947e3f8df38dfd33db69caaaae947e85205ea842236c257f70e6f2e5a196d5bd080a8f670efbbc57eb487bb89ef31a36aa28deaab3e7e36ce8d
diff --git a/dev-db/pgadmin4/pgadmin4-1.6.ebuild b/dev-db/pgadmin4/pgadmin4-2.0-r1.ebuild
index 9357a0e8f27c..932530d0a98c 100644
--- a/dev-db/pgadmin4/pgadmin4-1.6.ebuild
+++ b/dev-db/pgadmin4/pgadmin4-2.0-r1.ebuild
@@ -46,6 +46,7 @@ RDEPEND="${COMMON_DEPEND}
 	>=dev-python/flask-login-0.3.2[${PYTHON_USEDEP}]
 	>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
 	>=dev-python/flask-migrate-2.0.3[${PYTHON_USEDEP}]
+	>=dev-python/flask-paranoid-0.1.0[${PYTHON_USEDEP}]
 	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
 	>=dev-python/flask-security-1.7.5[${PYTHON_USEDEP}]
 	>=dev-python/flask-sqlalchemy-2.1[${PYTHON_USEDEP}]
@@ -80,7 +81,7 @@ src_prepare() {
 }
 
 src_configure() {
-		eqmake5
+	eqmake5
 }
 
 src_compile() {
diff --git a/dev-db/pgadmin4/pgadmin4-2.0.ebuild b/dev-db/pgadmin4/pgadmin4-2.0.ebuild
deleted file mode 100644
index 9357a0e8f27c..000000000000
--- a/dev-db/pgadmin4/pgadmin4-2.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 qmake-utils
-
-DESCRIPTION="GUI administration and development platform for PostgreSQL"
-HOMEPAGE="http://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/qtwidgets:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwebengine:5[widgets]
-"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/htmlmin-0.1.10[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
-	>=dev-python/click-6.6[${PYTHON_USEDEP}]
-	>=dev-python/extras-0.0.3[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.11.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-babel-0.11.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-gravatar-0.4.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-htmlmin-1.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.0.3[${PYTHON_USEDEP}]
-	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-security-1.7.5[${PYTHON_USEDEP}]
-	>=dev-python/flask-sqlalchemy-2.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-wtf-0.12[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-0.9999999[${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.5.1[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.6.2[${PYTHON_USEDEP}]
-	>=dev-python/pbr-1.9.1[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/pyrsistent-0.11.13[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-sqlparse-0.1.19[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2014.10[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.6.5[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/speaklater-1.3[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.0.14[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/wtforms-2.0.2[${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
-}