Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/pgadmin4/
Date: Sun, 09 Feb 2020 16:18:26
Message-Id: 1581265063.80aeca6984467ea4bc9f874021808ed7bd55fa26.mgorny@gentoo
1 commit: 80aeca6984467ea4bc9f874021808ed7bd55fa26
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 7 12:50:09 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 9 16:17:43 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80aeca69
7
8 dev-db/pgadmin4: Switch to PYTHON_MULTI_USEDEP API
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 ...gadmin4-4.13.ebuild => pgadmin4-4.13-r1.ebuild} | 58 ++++++++++++----------
13 ...gadmin4-4.17.ebuild => pgadmin4-4.17-r1.ebuild} | 58 ++++++++++++----------
14 2 files changed, 64 insertions(+), 52 deletions(-)
15
16 diff --git a/dev-db/pgadmin4/pgadmin4-4.13.ebuild b/dev-db/pgadmin4/pgadmin4-4.13-r1.ebuild
17 similarity index 50%
18 rename from dev-db/pgadmin4/pgadmin4-4.13.ebuild
19 rename to dev-db/pgadmin4/pgadmin4-4.13-r1.ebuild
20 index 18587bb501f..f044276c737 100644
21 --- a/dev-db/pgadmin4/pgadmin4-4.13.ebuild
22 +++ b/dev-db/pgadmin4/pgadmin4-4.13-r1.ebuild
23 @@ -29,35 +29,41 @@ COMMON_DEPEND="${PYTHON_DEPS}
24 "
25
26 DEPEND="${COMMON_DEPEND}
27 - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
28 + doc? (
29 + $(python_gen_cond_dep '
30 + dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
31 + ')
32 + )
33 "
34
35 RDEPEND="${COMMON_DEPEND}
36 - >=app-text/htmlmin-0.1.12[${PYTHON_USEDEP}]
37 - >=dev-python/blinker-1.4[${PYTHON_USEDEP}]
38 - >=dev-python/flask-1.0.2[${PYTHON_USEDEP}]
39 - >=dev-python/flask-gravatar-0.5.0[${PYTHON_USEDEP}]
40 - >=dev-python/flask-htmlmin-1.5.0[${PYTHON_USEDEP}]
41 - >=dev-python/flask-login-0.4.1[${PYTHON_USEDEP}]
42 - >=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
43 - >=dev-python/flask-migrate-2.4.0[${PYTHON_USEDEP}]
44 - >=dev-python/flask-paranoid-0.2.0[${PYTHON_USEDEP}]
45 - >=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
46 - >=dev-python/flask-security-3.0.0[${PYTHON_USEDEP}]
47 - >=dev-python/flask-sqlalchemy-2.3.2[${PYTHON_USEDEP}]
48 - >=dev-python/flask-wtf-0.14.2[${PYTHON_USEDEP}]
49 - >=dev-python/passlib-1.7.1[${PYTHON_USEDEP}]
50 - >=dev-python/psutil-5.5.1[${PYTHON_USEDEP}]
51 - >=dev-python/psycopg-2.8[${PYTHON_USEDEP}]
52 - >=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
53 - >=dev-python/python-sqlparse-0.2.4[${PYTHON_USEDEP}]
54 - >=dev-python/pytz-2018.9[${PYTHON_USEDEP}]
55 - >=dev-python/simplejson-3.16.0[${PYTHON_USEDEP}]
56 - >=dev-python/six-1.12.0[${PYTHON_USEDEP}]
57 - >=dev-python/speaklater-1.3[${PYTHON_USEDEP}]
58 - >=dev-python/sqlalchemy-1.2.18[${PYTHON_USEDEP}]
59 - >=dev-python/sshtunnel-0.1.4[${PYTHON_USEDEP}]
60 - >=dev-python/wtforms-2.2.1[${PYTHON_USEDEP}]
61 + $(python_gen_cond_dep '
62 + >=app-text/htmlmin-0.1.12[${PYTHON_MULTI_USEDEP}]
63 + >=dev-python/blinker-1.4[${PYTHON_MULTI_USEDEP}]
64 + >=dev-python/flask-1.0.2[${PYTHON_MULTI_USEDEP}]
65 + >=dev-python/flask-gravatar-0.5.0[${PYTHON_MULTI_USEDEP}]
66 + >=dev-python/flask-htmlmin-1.5.0[${PYTHON_MULTI_USEDEP}]
67 + >=dev-python/flask-login-0.4.1[${PYTHON_MULTI_USEDEP}]
68 + >=dev-python/flask-mail-0.9.1[${PYTHON_MULTI_USEDEP}]
69 + >=dev-python/flask-migrate-2.4.0[${PYTHON_MULTI_USEDEP}]
70 + >=dev-python/flask-paranoid-0.2.0[${PYTHON_MULTI_USEDEP}]
71 + >=dev-python/flask-principal-0.4.0[${PYTHON_MULTI_USEDEP}]
72 + >=dev-python/flask-security-3.0.0[${PYTHON_MULTI_USEDEP}]
73 + >=dev-python/flask-sqlalchemy-2.3.2[${PYTHON_MULTI_USEDEP}]
74 + >=dev-python/flask-wtf-0.14.2[${PYTHON_MULTI_USEDEP}]
75 + >=dev-python/passlib-1.7.1[${PYTHON_MULTI_USEDEP}]
76 + >=dev-python/psutil-5.5.1[${PYTHON_MULTI_USEDEP}]
77 + >=dev-python/psycopg-2.8[${PYTHON_MULTI_USEDEP}]
78 + >=dev-python/python-dateutil-2.8.0[${PYTHON_MULTI_USEDEP}]
79 + >=dev-python/python-sqlparse-0.2.4[${PYTHON_MULTI_USEDEP}]
80 + >=dev-python/pytz-2018.9[${PYTHON_MULTI_USEDEP}]
81 + >=dev-python/simplejson-3.16.0[${PYTHON_MULTI_USEDEP}]
82 + >=dev-python/six-1.12.0[${PYTHON_MULTI_USEDEP}]
83 + >=dev-python/speaklater-1.3[${PYTHON_MULTI_USEDEP}]
84 + >=dev-python/sqlalchemy-1.2.18[${PYTHON_MULTI_USEDEP}]
85 + >=dev-python/sshtunnel-0.1.4[${PYTHON_MULTI_USEDEP}]
86 + >=dev-python/wtforms-2.2.1[${PYTHON_MULTI_USEDEP}]
87 + ')
88 "
89
90 S="${WORKDIR}"/${P}/runtime
91
92 diff --git a/dev-db/pgadmin4/pgadmin4-4.17.ebuild b/dev-db/pgadmin4/pgadmin4-4.17-r1.ebuild
93 similarity index 54%
94 rename from dev-db/pgadmin4/pgadmin4-4.17.ebuild
95 rename to dev-db/pgadmin4/pgadmin4-4.17-r1.ebuild
96 index 5fbbd435ceb..1a5bd03bedb 100644
97 --- a/dev-db/pgadmin4/pgadmin4-4.17.ebuild
98 +++ b/dev-db/pgadmin4/pgadmin4-4.17-r1.ebuild
99 @@ -29,35 +29,41 @@ COMMON_DEPEND="${PYTHON_DEPS}
100 dev-qt/qtwidgets:5
101 "
102 DEPEND="${COMMON_DEPEND}
103 - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
104 + doc? (
105 + $(python_gen_cond_dep '
106 + dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
107 + ')
108 + )
109 virtual/imagemagick-tools[png]
110 "
111 RDEPEND="${COMMON_DEPEND}
112 - >=app-text/htmlmin-0.1.12[${PYTHON_USEDEP}]
113 - >=dev-python/blinker-1.4[${PYTHON_USEDEP}]
114 - >=dev-python/flask-1.0.2[${PYTHON_USEDEP}]
115 - >=dev-python/flask-gravatar-0.5.0[${PYTHON_USEDEP}]
116 - >=dev-python/flask-htmlmin-1.5.0[${PYTHON_USEDEP}]
117 - >=dev-python/flask-login-0.4.1[${PYTHON_USEDEP}]
118 - >=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
119 - >=dev-python/flask-migrate-2.4.0[${PYTHON_USEDEP}]
120 - >=dev-python/flask-paranoid-0.2.0[${PYTHON_USEDEP}]
121 - >=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
122 - >=dev-python/flask-security-3.0.0[${PYTHON_USEDEP}]
123 - >=dev-python/flask-sqlalchemy-2.3.2[${PYTHON_USEDEP}]
124 - >=dev-python/flask-wtf-0.14.2[${PYTHON_USEDEP}]
125 - >=dev-python/passlib-1.7.1[${PYTHON_USEDEP}]
126 - >=dev-python/psutil-5.5.1[${PYTHON_USEDEP}]
127 - >=dev-python/psycopg-2.8[${PYTHON_USEDEP}]
128 - >=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
129 - >=dev-python/python-sqlparse-0.2.4[${PYTHON_USEDEP}]
130 - >=dev-python/pytz-2018.9[${PYTHON_USEDEP}]
131 - >=dev-python/simplejson-3.16.0[${PYTHON_USEDEP}]
132 - >=dev-python/six-1.12.0[${PYTHON_USEDEP}]
133 - >=dev-python/speaklater-1.3[${PYTHON_USEDEP}]
134 - >=dev-python/sqlalchemy-1.2.18[${PYTHON_USEDEP}]
135 - >=dev-python/sshtunnel-0.1.4[${PYTHON_USEDEP}]
136 - >=dev-python/wtforms-2.2.1[${PYTHON_USEDEP}]
137 + $(python_gen_cond_dep '
138 + >=app-text/htmlmin-0.1.12[${PYTHON_MULTI_USEDEP}]
139 + >=dev-python/blinker-1.4[${PYTHON_MULTI_USEDEP}]
140 + >=dev-python/flask-1.0.2[${PYTHON_MULTI_USEDEP}]
141 + >=dev-python/flask-gravatar-0.5.0[${PYTHON_MULTI_USEDEP}]
142 + >=dev-python/flask-htmlmin-1.5.0[${PYTHON_MULTI_USEDEP}]
143 + >=dev-python/flask-login-0.4.1[${PYTHON_MULTI_USEDEP}]
144 + >=dev-python/flask-mail-0.9.1[${PYTHON_MULTI_USEDEP}]
145 + >=dev-python/flask-migrate-2.4.0[${PYTHON_MULTI_USEDEP}]
146 + >=dev-python/flask-paranoid-0.2.0[${PYTHON_MULTI_USEDEP}]
147 + >=dev-python/flask-principal-0.4.0[${PYTHON_MULTI_USEDEP}]
148 + >=dev-python/flask-security-3.0.0[${PYTHON_MULTI_USEDEP}]
149 + >=dev-python/flask-sqlalchemy-2.3.2[${PYTHON_MULTI_USEDEP}]
150 + >=dev-python/flask-wtf-0.14.2[${PYTHON_MULTI_USEDEP}]
151 + >=dev-python/passlib-1.7.1[${PYTHON_MULTI_USEDEP}]
152 + >=dev-python/psutil-5.5.1[${PYTHON_MULTI_USEDEP}]
153 + >=dev-python/psycopg-2.8[${PYTHON_MULTI_USEDEP}]
154 + >=dev-python/python-dateutil-2.8.0[${PYTHON_MULTI_USEDEP}]
155 + >=dev-python/python-sqlparse-0.2.4[${PYTHON_MULTI_USEDEP}]
156 + >=dev-python/pytz-2018.9[${PYTHON_MULTI_USEDEP}]
157 + >=dev-python/simplejson-3.16.0[${PYTHON_MULTI_USEDEP}]
158 + >=dev-python/six-1.12.0[${PYTHON_MULTI_USEDEP}]
159 + >=dev-python/speaklater-1.3[${PYTHON_MULTI_USEDEP}]
160 + >=dev-python/sqlalchemy-1.2.18[${PYTHON_MULTI_USEDEP}]
161 + >=dev-python/sshtunnel-0.1.4[${PYTHON_MULTI_USEDEP}]
162 + >=dev-python/wtforms-2.2.1[${PYTHON_MULTI_USEDEP}]
163 + ')
164 "
165
166 PATCHES=( "${FILESDIR}"/${P}-python-3.8.patch )
Report Message
Find on MARC Find on Google Groups