commit: f997bdc5009d9b7b78b57ddf1494867268eaca13 Author: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org> AuthorDate: Fri Dec 25 03:16:08 2020 +0000 Commit: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org> CommitDate: Fri Dec 25 03:16:08 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f997bdc5
dev-db/pgadmin4: Cleanup Closes: https://bugs.gentoo.org/735014 Closes: https://bugs.gentoo.org/744151 Signed-off-by: Aaron W. Swenson <titanofold <AT> gentoo.org> dev-db/pgadmin4/Manifest | 3 - .../pgadmin4/files/pgadmin4-4.17-python-3.8.patch | 12 -- dev-db/pgadmin4/pgadmin4-4.17-r1.ebuild | 120 ------------------- dev-db/pgadmin4/pgadmin4-4.25.ebuild | 124 -------------------- dev-db/pgadmin4/pgadmin4-4.28.ebuild | 130 --------------------- 5 files changed, 389 deletions(-) diff --git a/dev-db/pgadmin4/Manifest b/dev-db/pgadmin4/Manifest index 515fa48e511..8ff0d2d9f13 100644 --- a/dev-db/pgadmin4/Manifest +++ b/dev-db/pgadmin4/Manifest @@ -1,5 +1,2 @@ -DIST pgadmin4-4.17.tar.gz 28007097 BLAKE2B d296f2b9372c23067db899fa82e1b8e732837b01a6172dd2d70520f815aafde161715eea9d9d53e7507a6a715dbfdaabf001a10d143c1aa0505237b2b138e334 SHA512 f9e292ba7ff1e5edaa8738188eb01744d69d0eb134700feb0623806425c998e7f298f74cd498a09f2d9a073a9a349c82f7a3f617e1da3c8dd757cc982d941c9f -DIST pgadmin4-4.25.tar.gz 33167393 BLAKE2B 5a40e45c53f79ea66c6f685d1605ddce7b1758540bf3a6863d4b092cc4dab5b00daff15832cd6feee28aa348c7a5376e25a93508fd348d8ffd4d29031e2b6c68 SHA512 a1944f9c65b8aa7ec5bd83ef75702293d869ae341ea73f81fb4358bfbc7f91a6981237eb9f1b20055c5f3fa182428afe19dc170963265789c34d73f2e240c268 DIST pgadmin4-4.26.tar.gz 33525278 BLAKE2B 2a4061f59299bc48b029a4a93f410538170b6c3d97597074d2b3b6eed1de0f9a1ac88bc187614d9e46d8fe872941f173ba0f0a02def590451dad09e6a3b78e5a SHA512 952a4771f80541c54234fcaa9c870283fdf4887246d0d9751a77c28340b7e39ba871141f230086efda9a274d5e6bd567305047cdc7edf766ccd41112281fdf94 -DIST pgadmin4-4.28.tar.gz 35386627 BLAKE2B 6cbee6ccadf3b35e1b0aece2e8fc4b9e35dd04ed70436a3b74d69c09e887499c3a2ab8710d16df3327cd848c3c5ee1fac2cde06facbdc5605673b04a4a4fc434 SHA512 b9e8946e8133b382b9d69126c1ec6fc07a4b2051316c2151c339f15652900fa2bdf0a07811e052548c3f8699e382d8c16d187e89409b194e491148123558522e DIST pgadmin4-4.29.tar.gz 35389494 BLAKE2B faaa84c0eee9c92ba483f4adffaf9e39e0c5f8ea21630a9ee8fad62aa833c88aa913df50c760be740afa0696aa1fbf1b6902a8b5bfd322822472f7d2dcb295e1 SHA512 2c7d20d10c96712f41621c2862a6a6222f6d6dad4a0b3e1aaf04744e65744460dcae4220f61b27785e02c82a624fa0793df2ea9d8e83ac0a6de048455929e615 diff --git a/dev-db/pgadmin4/files/pgadmin4-4.17-python-3.8.patch b/dev-db/pgadmin4/files/pgadmin4-4.17-python-3.8.patch deleted file mode 100644 index fbf2f7be4a9..00000000000 --- a/dev-db/pgadmin4/files/pgadmin4-4.17-python-3.8.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uprb pgadmin4-4.13.orig/runtime/pgAdmin4.pro pgadmin4-4.13/runtime/pgAdmin4.pro ---- a/runtime/pgAdmin4.pro 2019-10-16 10:07:59.000000000 +0300 -+++ b/runtime/pgAdmin4.pro 2019-11-05 18:33:18.524516120 +0200 -@@ -75,7 +75,7 @@ else { - - QMAKE_CXXFLAGS += $$system($$PYTHON_CONFIG --includes) - QMAKE_LFLAGS += $$system($$PYTHON_CONFIG --ldflags) -- LIBS += $$system($$PYTHON_CONFIG --libs) -+ LIBS += $$system(PYTHON_LIBS=`$$PYTHON_CONFIG --libs --embed` || PYTHON_LIBS=`$$PYTHON_CONFIG --libs`; echo $PYTHON_LIBS) - - contains( LIBS, -lpython2.* ) { - DEFINES += PYTHON2 diff --git a/dev-db/pgadmin4/pgadmin4-4.17-r1.ebuild b/dev-db/pgadmin4/pgadmin4-4.17-r1.ebuild deleted file mode 100644 index 7a651a4aa6b..00000000000 --- a/dev-db/pgadmin4/pgadmin4-4.17-r1.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) -PYTHON_REQ_USE="sqlite" -inherit desktop python-single-r1 qmake-utils xdg - -DESCRIPTION="GUI administration and development platform for PostgreSQL" -HOMEPAGE="https://www.pgadmin.org/"; -SRC_URI="https://ftp.postgresql.org/pub/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"; - -LICENSE="POSTGRESQL" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RESTRICT="test" - -# libsodium dep added because of 689678 -COMMON_DEPEND="${PYTHON_DEPS} - dev-libs/libsodium[-minimal] - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtwidgets:5 -" -DEPEND="${COMMON_DEPEND} - doc? ( - $(python_gen_cond_dep ' - dev-python/sphinx[${PYTHON_MULTI_USEDEP}] - ') - ) - virtual/imagemagick-tools[png] -" -RDEPEND="${COMMON_DEPEND} - $(python_gen_cond_dep ' - >=app-text/htmlmin-0.1.12[${PYTHON_MULTI_USEDEP}] - >=dev-python/blinker-1.4[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-1.0.2[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-gravatar-0.5.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-htmlmin-1.5.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-login-0.4.1[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-mail-0.9.1[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-migrate-2.4.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-paranoid-0.2.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-principal-0.4.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-security-3.0.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-sqlalchemy-2.3.2[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-wtf-0.14.2[${PYTHON_MULTI_USEDEP}] - >=dev-python/passlib-1.7.1[${PYTHON_MULTI_USEDEP}] - >=dev-python/psutil-5.5.1[${PYTHON_MULTI_USEDEP}] - >=dev-python/psycopg-2.8[${PYTHON_MULTI_USEDEP}] - >=dev-python/python-dateutil-2.8.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/pytz-2018.9[${PYTHON_MULTI_USEDEP}] - >=dev-python/simplejson-3.16.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/six-1.12.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/speaklater-1.3[${PYTHON_MULTI_USEDEP}] - >=dev-python/sqlalchemy-1.2.18[${PYTHON_MULTI_USEDEP}] - >=dev-python/sqlparse-0.2.4[${PYTHON_MULTI_USEDEP}] - >=dev-python/sshtunnel-0.1.4[${PYTHON_MULTI_USEDEP}] - >=dev-python/wtforms-2.2.1[${PYTHON_MULTI_USEDEP}] - ') -" - -PATCHES=( "${FILESDIR}"/${P}-python-3.8.patch ) - -S="${WORKDIR}"/${P}/runtime - -src_prepare() { - cd "${WORKDIR}"/${P} || die - default -} - -src_configure() { - eqmake5 -} - -src_compile() { - default - use doc && emake -C "${WORKDIR}"/${P} docs -} - -src_install() { - dobin pgAdmin4 - - cd "${WORKDIR}"/${P} || die - - local APP_DIR=/usr/share/${PN}/web - insinto "${APP_DIR}" - doins -r web/. - newins - config_local.py <<-EOF - SERVER_MODE = False - UPGRADE_CHECK_ENABLED = False - EOF - python_optimize "${D}${APP_DIR}" - - insinto /etc/xdg/pgadmin - newins - 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 - - local s - for s in 16 32 48 64 72 96 128 192 256; do - convert runtime/pgAdmin4.png -resize ${s}x${s} ${PN}_${s}.png || die - newicon -s ${s} ${PN}_${s}.png ${PN}.png - done - domenu "${FILESDIR}"/${PN}.desktop -} diff --git a/dev-db/pgadmin4/pgadmin4-4.25.ebuild b/dev-db/pgadmin4/pgadmin4-4.25.ebuild deleted file mode 100644 index b5bffaede3b..00000000000 --- a/dev-db/pgadmin4/pgadmin4-4.25.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) -PYTHON_REQ_USE="sqlite" -inherit desktop python-single-r1 qmake-utils xdg - -DESCRIPTION="GUI administration and development platform for PostgreSQL" -HOMEPAGE="https://www.pgadmin.org/"; -SRC_URI="https://ftp.postgresql.org/pub/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"; - -LICENSE="POSTGRESQL" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RESTRICT="test" - -# libsodium dep added because of 689678 -COMMON_DEPEND="${PYTHON_DEPS} - dev-libs/libsodium[-minimal] - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtwidgets:5 -" -DEPEND="${COMMON_DEPEND} - doc? ( - $(python_gen_cond_dep ' - dev-python/sphinx[${PYTHON_MULTI_USEDEP}] - ') - ) - virtual/imagemagick-tools[png] -" - -# In 4.25's requirement.txt, bcrypt is listed as <=3.17, but upstream's -# git history shows this is just for compatibility with <python-3.6. -RDEPEND="${COMMON_DEPEND} - $(python_gen_cond_dep ' - >=dev-python/blinker-1.4[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-1.0.2[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-compress-1.4.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-gravatar-0.5.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-login-0.4.1[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-mail-0.9.1[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-migrate-2.4.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-paranoid-0.2.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-principal-0.4.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-security-3.0.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-sqlalchemy-2.3.2[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-wtf-0.14.2[${PYTHON_MULTI_USEDEP}] - >=dev-python/ldap3-2.5.1[${PYTHON_MULTI_USEDEP}] - >=dev-python/passlib-1.7.2[${PYTHON_MULTI_USEDEP}] - >=dev-python/psutil-5.7.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/psycopg-2.8[${PYTHON_MULTI_USEDEP}] - >=dev-python/python-dateutil-2.8.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/pytz-2018.9[${PYTHON_MULTI_USEDEP}] - >=dev-python/simplejson-3.16.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/six-1.12.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/speaklater-1.3[${PYTHON_MULTI_USEDEP}] - >=dev-python/sqlalchemy-1.3.13[${PYTHON_MULTI_USEDEP}] - >=dev-python/sqlparse-0.2.4[${PYTHON_MULTI_USEDEP}] - >=dev-python/sshtunnel-0.1.5[${PYTHON_MULTI_USEDEP}] - >=dev-python/werkzeug-0.15.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/wtforms-2.2.1[${PYTHON_MULTI_USEDEP}] - dev-python/bcrypt[${PYTHON_MULTI_USEDEP}] - ') -" - -S="${WORKDIR}"/${P}/runtime - -src_prepare() { - cd "${WORKDIR}"/${P} || die - default -} - -src_configure() { - export PGADMIN_PYTHON_DIR="${EPREFIX}/usr" - eqmake5 -} - -src_compile() { - default - use doc && emake -C "${WORKDIR}"/${P} docs -} - -src_install() { - dobin pgAdmin4 - - cd "${WORKDIR}"/${P} || die - - local APP_DIR=/usr/share/${PN}/web - insinto "${APP_DIR}" - doins -r web/. - newins - config_local.py <<-EOF - SERVER_MODE = False - UPGRADE_CHECK_ENABLED = False - EOF - python_optimize "${D}${APP_DIR}" - - insinto /etc/xdg/pgadmin - newins - 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 - - local s - for s in 16 32 48 64 72 96 128 192 256; do - convert runtime/pgAdmin4.png -resize ${s}x${s} ${PN}_${s}.png || die - newicon -s ${s} ${PN}_${s}.png ${PN}.png - done - domenu "${FILESDIR}"/${PN}.desktop -} diff --git a/dev-db/pgadmin4/pgadmin4-4.28.ebuild b/dev-db/pgadmin4/pgadmin4-4.28.ebuild deleted file mode 100644 index f795a75bfb2..00000000000 --- a/dev-db/pgadmin4/pgadmin4-4.28.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) -PYTHON_REQ_USE="sqlite" -inherit desktop python-single-r1 qmake-utils xdg - -DESCRIPTION="GUI administration and development platform for PostgreSQL" -HOMEPAGE="https://www.pgadmin.org/"; -SRC_URI="https://ftp.postgresql.org/pub/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"; - -LICENSE="POSTGRESQL" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RESTRICT="test" - -# libsodium dep added because of 689678 -COMMON_DEPEND="${PYTHON_DEPS} - dev-libs/libsodium[-minimal] - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtwidgets:5 -" -DEPEND="${COMMON_DEPEND} - doc? ( - $(python_gen_cond_dep ' - dev-python/sphinx[${PYTHON_MULTI_USEDEP}] - ') - ) - virtual/imagemagick-tools[png] -" - -# In 4.25's requirement.txt, bcrypt is listed as <=3.17, but upstream's -# git history shows this is just for compatibility with <python-3.6. -# In 4.26's requirement.txt, cryptography is listed as <=3.0, but upstream's -# git history shows this is just for compatibility with Windows. -# 4.28; requirement.txt: Flask-Security was renamed to -# Flask-Security-Too. This is still the same dev-python/flask-security. -RDEPEND="${COMMON_DEPEND} - $(python_gen_cond_dep ' - >=dev-python/blinker-1.4[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-1.0.2[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-compress-1.4.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-gravatar-0.5.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-login-0.4.1[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-mail-0.9.1[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-migrate-2.4.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-paranoid-0.2.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-principal-0.4.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-security-3.0.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-sqlalchemy-2.4.1[${PYTHON_MULTI_USEDEP}] - >=dev-python/flask-wtf-0.14.3[${PYTHON_MULTI_USEDEP}] - >=dev-python/ldap3-2.5.1[${PYTHON_MULTI_USEDEP}] - >=dev-python/passlib-1.7.2[${PYTHON_MULTI_USEDEP}] - >=dev-python/psutil-5.7.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/psycopg-2.8[${PYTHON_MULTI_USEDEP}] - >=dev-python/python-dateutil-2.8.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/pytz-2020.1[${PYTHON_MULTI_USEDEP}] - >=dev-python/simplejson-3.16.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/six-1.12.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/speaklater-1.3[${PYTHON_MULTI_USEDEP}] - >=dev-python/sqlalchemy-1.3.13[${PYTHON_MULTI_USEDEP}] - >=dev-python/sqlparse-0.3.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/sshtunnel-0.1.5[${PYTHON_MULTI_USEDEP}] - >=dev-python/werkzeug-0.15.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/wtforms-2.2.1[${PYTHON_MULTI_USEDEP}] - dev-python/bcrypt[${PYTHON_MULTI_USEDEP}] - dev-python/cryptography[${PYTHON_MULTI_USEDEP}] - dev-python/python-email-validator[${PYTHON_MULTI_USEDEP}] - ') -" - -S="${WORKDIR}"/${P}/runtime - -src_prepare() { - cd "${WORKDIR}"/${P} || die - default -} - -src_configure() { - export PGADMIN_PYTHON_DIR="${EPREFIX}/usr" - eqmake5 -} - -src_compile() { - default - use doc && emake -C "${WORKDIR}"/${P} docs -} - -src_install() { - dobin pgAdmin4 - - cd "${WORKDIR}"/${P} || die - - local APP_DIR=/usr/share/${PN}/web - insinto "${APP_DIR}" - doins -r web/. - newins - config_local.py <<-EOF - SERVER_MODE = False - UPGRADE_CHECK_ENABLED = False - EOF - python_optimize "${D}${APP_DIR}" - - insinto /etc/xdg/pgadmin - newins - 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 - - local s - for s in 16 32 48 64 72 96 128 192 256; do - convert runtime/pgAdmin4.png -resize ${s}x${s} ${PN}_${s}.png || die - newicon -s ${s} ${PN}_${s}.png ${PN}.png - done - domenu "${FILESDIR}"/${PN}.desktop -}
