[gentoo-commits] repo/gentoo:master commit in: dev-db/pgadmin4/, dev-db/pgadmin4/files/, profiles/
commit: 8b0fa104cddcbb9dd7bca9351c2de58703939fcf Author: Jakov Smolić gentoo org> AuthorDate: Sun Jun 19 08:51:37 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Sun Jun 19 08:51:53 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b0fa104 dev-db/pgadmin4: treeclean Closes: https://bugs.gentoo.org/794460 Closes: https://bugs.gentoo.org/836282 Closes: https://bugs.gentoo.org/774348 Closes: https://bugs.gentoo.org/766378 Closes: https://bugs.gentoo.org/817350 Signed-off-by: Jakov Smolić gentoo.org> dev-db/pgadmin4/Manifest| 2 - dev-db/pgadmin4/files/pgadmin4.desktop | 11 --- dev-db/pgadmin4/metadata.xml| 8 -- dev-db/pgadmin4/pgadmin4-4.29-r3.ebuild | 130 --- dev-db/pgadmin4/pgadmin4-4.30-r3.ebuild | 132 profiles/package.mask | 6 -- 6 files changed, 289 deletions(-) diff --git a/dev-db/pgadmin4/Manifest b/dev-db/pgadmin4/Manifest deleted file mode 100644 index 57c96d5daaff.. --- a/dev-db/pgadmin4/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST pgadmin4-4.29.tar.gz 35389494 BLAKE2B faaa84c0eee9c92ba483f4adffaf9e39e0c5f8ea21630a9ee8fad62aa833c88aa913df50c760be740afa0696aa1fbf1b6902a8b5bfd322822472f7d2dcb295e1 SHA512 2c7d20d10c96712f41621c2862a6a6222f6d6dad4a0b3e1aaf04744e65744460dcae4220f61b27785e02c82a624fa0793df2ea9d8e83ac0a6de048455929e615 -DIST pgadmin4-4.30.tar.gz 36490656 BLAKE2B 3e8e998b29b13ced40b38106a468d047dea92a0cc930150d153c473e78045278840f78b3bcbd41f20a5017e68c1980c05ccf734bf63d8f107e0e02c2df54162e SHA512 7ce12f65ce9dbfe4af9e92dd7f9327a05be8b8436ef495a0634043158417f3af5f457b88ee5422ede59f517c197668094454c6d7b7c33e255068479ce6ec13d9 diff --git a/dev-db/pgadmin4/files/pgadmin4.desktop b/dev-db/pgadmin4/files/pgadmin4.desktop deleted file mode 100644 index e1697a620d5f.. --- a/dev-db/pgadmin4/files/pgadmin4.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=pgAdmin 4 -Exec=/usr/bin/pgAdmin4 -Icon=pgadmin4 -Type=Application -Categories=Development;Database; -MimeType=text/html -DocPath=/usr/share/pgadmin4/docs/en_US/_build/html/index.html -Comment=PostgreSQL Tools -Keywords=database;db;sql;query;administration;development; diff --git a/dev-db/pgadmin4/metadata.xml b/dev-db/pgadmin4/metadata.xml deleted file mode 100644 index 028048e538df.. --- a/dev-db/pgadmin4/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - -https://www.gentoo.org/dtd/metadata.dtd;> - - -pgsql-b...@gentoo.org -PostgreSQL - - diff --git a/dev-db/pgadmin4/pgadmin4-4.29-r3.ebuild b/dev-db/pgadmin4/pgadmin4-4.29-r3.ebuild deleted file mode 100644 index a6bd089b32fb.. --- a/dev-db/pgadmin4/pgadmin4-4.29-r3.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9} ) -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_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 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_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 (2022-05-07) -# The current version is severely outdated and blocks upgrade -# of dependencies. Packaging a new release poses serious problems. -# Removal on 2022-06-06. Bug #836282. -dev-db/pgadmin4 - # Matt Turner (2022-04-30) # Masked
[gentoo-commits] repo/gentoo:master commit in: dev-db/pgadmin4/, dev-db/pgadmin4/files/
commit: f997bdc5009d9b7b78b57ddf1494867268eaca13 Author: Aaron W. Swenson gentoo org> AuthorDate: Fri Dec 25 03:16:08 2020 + Commit: Aaron W. Swenson gentoo org> CommitDate: Fri Dec 25 03:16:08 2020 + 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 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..000 --- 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.0 +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..000 --- 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}] -
[gentoo-commits] repo/gentoo:master commit in: dev-db/pgadmin4/, dev-db/pgadmin4/files/
commit: 85bcfc5f606a51b55ce6844e42feb69ba24273bb Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Nov 30 12:25:44 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Feb 5 21:27:41 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85bcfc5f dev-db/pgadmin4: 4.17 version bump, python3_8 Patch taken from Arch, thanks. Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-db/pgadmin4/Manifest | 1 + .../pgadmin4/files/pgadmin4-4.17-python-3.8.patch | 12 +++ dev-db/pgadmin4/pgadmin4-4.17.ebuild | 106 + 3 files changed, 119 insertions(+) diff --git a/dev-db/pgadmin4/Manifest b/dev-db/pgadmin4/Manifest index d8c0c3afb41..6a07a9896d2 100644 --- a/dev-db/pgadmin4/Manifest +++ b/dev-db/pgadmin4/Manifest @@ -1 +1,2 @@ DIST pgadmin4-4.13.tar.gz 25077107 BLAKE2B afbf0b6fba2f4cbbc1f47ac6c7867b7f131e5698de265a9dda53b79968f237ac591c5ff4da94dde0b74479cac1158ec825f42b14fc01aee13982043822c04443 SHA512 7eca41047e41f7bdce2dfe992260e8c2ab40f985dd232eb240ea9c0024f551f011653717aa0d5e4ccdccd4ef4936102cde1f97a32852d8382dcc222fadce7707 +DIST pgadmin4-4.17.tar.gz 28007097 BLAKE2B d296f2b9372c23067db899fa82e1b8e732837b01a6172dd2d70520f815aafde161715eea9d9d53e7507a6a715dbfdaabf001a10d143c1aa0505237b2b138e334 SHA512 f9e292ba7ff1e5edaa8738188eb01744d69d0eb134700feb0623806425c998e7f298f74cd498a09f2d9a073a9a349c82f7a3f617e1da3c8dd757cc982d941c9f 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 new file mode 100644 index 000..fbf2f7be4a9 --- /dev/null +++ b/dev-db/pgadmin4/files/pgadmin4-4.17-python-3.8.patch @@ -0,0 +1,12 @@ +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.0 +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.ebuild b/dev-db/pgadmin4/pgadmin4-4.17.ebuild new file mode 100644 index 000..626795b4964 --- /dev/null +++ b/dev-db/pgadmin4/pgadmin4-4.17.ebuild @@ -0,0 +1,106 @@ +# 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 python-single-r1 qmake-utils + +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? ( dev-python/sphinx[${PYTHON_USEDEP}] ) +" +RDEPEND="${COMMON_DEPEND} + >=app-text/htmlmin-0.1.12[${PYTHON_USEDEP}] + >=dev-python/blinker-1.4[${PYTHON_USEDEP}] + >=dev-python/flask-1.0.2[${PYTHON_USEDEP}] + >=dev-python/flask-gravatar-0.5.0[${PYTHON_USEDEP}] + >=dev-python/flask-htmlmin-1.5.0[${PYTHON_USEDEP}] + >=dev-python/flask-login-0.4.1[${PYTHON_USEDEP}] + >=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}] + >=dev-python/flask-migrate-2.4.0[${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/passlib-1.7.1[${PYTHON_USEDEP}] + >=dev-python/psutil-5.5.1[${PYTHON_USEDEP}] + >=dev-python/psycopg-2.8[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}] + >=dev-python/python-sqlparse-0.2.4[${PYTHON_USEDEP}] + >=dev-python/pytz-2018.9[${PYTHON_USEDEP}] + >=dev-python/simplejson-3.16.0[${PYTHON_USEDEP}] + >=dev-python/six-1.12.0[${PYTHON_USEDEP}] + >=dev-python/speaklater-1.3[${PYTHON_USEDEP}] + >=dev-python/sqlalchemy-1.2.18[${PYTHON_USEDEP}] + >=dev-python/sshtunnel-0.1.4[${PYTHON_USEDEP}] + >=dev-python/wtforms-2.2.1[${PYTHON_USEDEP}] +" + +PATCHES=( "${FILESDIR}"/${P}-python-3.8.patch ) + +S="${WORKDIR}"/${P}/runtime + +src_prepare()
[gentoo-commits] repo/gentoo:master commit in: dev-db/pgadmin4/, dev-db/pgadmin4/files/
commit: 93ceeb886d25b210422a410523105255e2198c25 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Feb 4 23:14:22 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Feb 5 21:27:41 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93ceeb88 dev-db/pgadmin4: Install desktop file Closes: https://bugs.gentoo.org/689706 Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-db/pgadmin4/files/pgadmin4.desktop | 11 +++ dev-db/pgadmin4/pgadmin4-4.17.ebuild | 10 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dev-db/pgadmin4/files/pgadmin4.desktop b/dev-db/pgadmin4/files/pgadmin4.desktop new file mode 100644 index 000..e1697a620d5 --- /dev/null +++ b/dev-db/pgadmin4/files/pgadmin4.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=pgAdmin 4 +Exec=/usr/bin/pgAdmin4 +Icon=pgadmin4 +Type=Application +Categories=Development;Database; +MimeType=text/html +DocPath=/usr/share/pgadmin4/docs/en_US/_build/html/index.html +Comment=PostgreSQL Tools +Keywords=database;db;sql;query;administration;development; diff --git a/dev-db/pgadmin4/pgadmin4-4.17.ebuild b/dev-db/pgadmin4/pgadmin4-4.17.ebuild index 626795b4964..5fbbd435ceb 100644 --- a/dev-db/pgadmin4/pgadmin4-4.17.ebuild +++ b/dev-db/pgadmin4/pgadmin4-4.17.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8} ) PYTHON_REQ_USE="sqlite" -inherit python-single-r1 qmake-utils +inherit desktop python-single-r1 qmake-utils xdg DESCRIPTION="GUI administration and development platform for PostgreSQL" HOMEPAGE="https://www.pgadmin.org/; @@ -30,6 +30,7 @@ COMMON_DEPEND="${PYTHON_DEPS} " DEPEND="${COMMON_DEPEND} doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + virtual/imagemagick-tools[png] " RDEPEND="${COMMON_DEPEND} >=app-text/htmlmin-0.1.12[${PYTHON_USEDEP}] @@ -103,4 +104,11 @@ src_install() { 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 }