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

Gentoo Archives: gentoo-commits

From: "Jorge Manuel B. S. Vicetto" <jmbsvicetto@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/jmbsvicetto:master commit in: dev-db/phpmyadmin/
Date: Tue, 02 Jun 2015 20:49:37
Message-Id: 1433278150.a440f33e8afc01e1348b3578076681d476741c89.jmbsvicetto@gentoo
1 commit: a440f33e8afc01e1348b3578076681d476741c89
2 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jun 2 20:48:10 2015 +0000
4 Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 2 20:49:10 2015 +0000
6 URL: https://gitweb.gentoo.org/dev/jmbsvicetto.git/commit/?id=a440f33e
7
8 Stop using depend.php eclass and add virtual/httpd-php dep directly. Silence repoman warnings.
9 Bump to 4.4.8 release.
10
11 Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
12
13 dev-db/phpmyadmin/Manifest | 2 +-
14 ....13.1.ebuild => phpmyadmin-4.0.10.10-r1.ebuild} | 4 +-
15 ....10.10.ebuild => phpmyadmin-4.1.14.8-r1.ebuild} | 4 +-
16 ...1.14.8.ebuild => phpmyadmin-4.2.13.3-r1.ebuild} | 4 +-
17 ...2.13.3.ebuild => phpmyadmin-4.3.13.1-r1.ebuild} | 4 +-
18 dev-db/phpmyadmin/phpmyadmin-4.4.6.1.ebuild | 61 ----------------------
19 ...min-4.3.13.1.ebuild => phpmyadmin-4.4.8.ebuild} | 4 +-
20 7 files changed, 11 insertions(+), 72 deletions(-)
21
22 diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
23 index 61bbf01..af4f8ae 100644
24 --- a/dev-db/phpmyadmin/Manifest
25 +++ b/dev-db/phpmyadmin/Manifest
26 @@ -2,4 +2,4 @@ DIST phpMyAdmin-4.0.10.10-all-languages.tar.xz 4775140 SHA256 5f4522227ad9ffce91
27 DIST phpMyAdmin-4.1.14.8-all-languages.tar.xz 4881004 SHA256 e2a2fee1658e3108048907a257b8f291fcfbd5840690e8f4711f9ea28233dce8 SHA512 34d28f04d6a808565ecc3d7187b2719d1e25e55d6248e3ea516e5914bd5a70aab0d9c4df3525cb8e77b37949a78671235af46e22871fe26ba999aa01b01c44d2 WHIRLPOOL a2e236a47154117c1bee3b9a51d4c3da9d1bd5834e3167174cbd80e562b5c14424b7e75de814f85d1ade1f6501b665a2af21cedd1c87be2ea6a9e151c0d8a2cf
28 DIST phpMyAdmin-4.2.13.3-all-languages.tar.xz 5205440 SHA256 2d78bd91dc90d95d9f21c7e41294f2995a36dbbe1e4d1209e972b1d855c4877e SHA512 77ad296931666896613b7363c35c5546da66bddcda37fb31609ca5fb78f4b12241f6c976d1916a6491fbbc33d5f837163bcd0c0e0f227458d055076a971b640f WHIRLPOOL c4bb8f0689b0aa2ae7a67793f9c26b761e1a1e28e4e684f495815caf89ef527f4fced30aa53986c10d41ec000f3e295677739d5e73cbfc336466591c9fcf6a3e
29 DIST phpMyAdmin-4.3.13.1-all-languages.tar.xz 5446988 SHA256 d7484e2449453eae52613aae59e5f3a9342014aba7db88598ad6a90504ebfbd3 SHA512 b08a41721876a4c7c8fcc162f0f1f43bbd67b4f87fc1c0668672addb8eb6f56695755401a2de2c75fc944b074f5187c6df942bec0ff03c16ad34c27b505b87a0 WHIRLPOOL a72b7e4247bb7de68820d5583967b04b8dfd0917383f88d707b48235d119e0ad4fd45a04352dda0f43b11b2ba4def5a4648eca01e2f7ceabd3f788e429dc83ca
30 -DIST phpMyAdmin-4.4.6.1-all-languages.tar.xz 5635832 SHA256 d423a81868f01b4ce77f90113d83df96590446acdbe8f00a46aeb670c4a9ac5c SHA512 d25c63f9d354ae3f488d1837c710cfc5bacde3d6421d71eb96ff5868971132ea570aad9875f35d862d22d0318b5e16b208a2d6a7d542424ee2a04e329a619978 WHIRLPOOL 8c5f5e9349e801e328ddafe89322e457b89bfa4c5dbe593be9990ac3168a5d0cfada260ef275388b95f2c806952a682445baff23d6092dd5a66766681759172b
31 +DIST phpMyAdmin-4.4.8-all-languages.tar.xz 5651996 SHA256 17637f61849a8f42c60775195a83dd13bb5e69c496d912e27dad0f9baddab1eb SHA512 87ebbb6df38c61825460a210d9ddfd796a12c7a5bcc3496d31f52d479f801d0ab5c83220a89522688209438972eff2e9917a47dd44b3885348f7f3d98aeeffd9 WHIRLPOOL 894574745ae0f02c41028d0e601e09d3a7ce6c71307151c78549cb9430d3acbea634897be45cd28e4a37bbfc1afe49f47d320c74e878f7e00eb9ed2c01b333ad
32
33 diff --git a/dev-db/phpmyadmin/phpmyadmin-4.3.13.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.0.10.10-r1.ebuild
34 similarity index 96%
35 copy from dev-db/phpmyadmin/phpmyadmin-4.3.13.1.ebuild
36 copy to dev-db/phpmyadmin/phpmyadmin-4.0.10.10-r1.ebuild
37 index 9367135..f5b3a1c 100644
38 --- a/dev-db/phpmyadmin/phpmyadmin-4.3.13.1.ebuild
39 +++ b/dev-db/phpmyadmin/phpmyadmin-4.0.10.10-r1.ebuild
40 @@ -4,7 +4,7 @@
41
42 EAPI="5"
43
44 -inherit eutils webapp depend.php
45 +inherit eutils webapp
46
47 MY_PV=${PV/_/-}
48 MY_P="phpMyAdmin-${MY_PV}-all-languages"
49 @@ -23,10 +23,10 @@ RDEPEND="
50 dev-lang/php[mysqli]
51 dev-lang/php[mysql]
52 )
53 + virtual/httpd-php:*
54 "
55
56 need_httpd_cgi
57 -need_php_httpd
58
59 S="${WORKDIR}"/${MY_P}
60
61
62 diff --git a/dev-db/phpmyadmin/phpmyadmin-4.0.10.10.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.1.14.8-r1.ebuild
63 similarity index 96%
64 rename from dev-db/phpmyadmin/phpmyadmin-4.0.10.10.ebuild
65 rename to dev-db/phpmyadmin/phpmyadmin-4.1.14.8-r1.ebuild
66 index 9367135..f5b3a1c 100644
67 --- a/dev-db/phpmyadmin/phpmyadmin-4.0.10.10.ebuild
68 +++ b/dev-db/phpmyadmin/phpmyadmin-4.1.14.8-r1.ebuild
69 @@ -4,7 +4,7 @@
70
71 EAPI="5"
72
73 -inherit eutils webapp depend.php
74 +inherit eutils webapp
75
76 MY_PV=${PV/_/-}
77 MY_P="phpMyAdmin-${MY_PV}-all-languages"
78 @@ -23,10 +23,10 @@ RDEPEND="
79 dev-lang/php[mysqli]
80 dev-lang/php[mysql]
81 )
82 + virtual/httpd-php:*
83 "
84
85 need_httpd_cgi
86 -need_php_httpd
87
88 S="${WORKDIR}"/${MY_P}
89
90
91 diff --git a/dev-db/phpmyadmin/phpmyadmin-4.1.14.8.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.2.13.3-r1.ebuild
92 similarity index 96%
93 rename from dev-db/phpmyadmin/phpmyadmin-4.1.14.8.ebuild
94 rename to dev-db/phpmyadmin/phpmyadmin-4.2.13.3-r1.ebuild
95 index 9367135..f5b3a1c 100644
96 --- a/dev-db/phpmyadmin/phpmyadmin-4.1.14.8.ebuild
97 +++ b/dev-db/phpmyadmin/phpmyadmin-4.2.13.3-r1.ebuild
98 @@ -4,7 +4,7 @@
99
100 EAPI="5"
101
102 -inherit eutils webapp depend.php
103 +inherit eutils webapp
104
105 MY_PV=${PV/_/-}
106 MY_P="phpMyAdmin-${MY_PV}-all-languages"
107 @@ -23,10 +23,10 @@ RDEPEND="
108 dev-lang/php[mysqli]
109 dev-lang/php[mysql]
110 )
111 + virtual/httpd-php:*
112 "
113
114 need_httpd_cgi
115 -need_php_httpd
116
117 S="${WORKDIR}"/${MY_P}
118
119
120 diff --git a/dev-db/phpmyadmin/phpmyadmin-4.2.13.3.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.3.13.1-r1.ebuild
121 similarity index 96%
122 rename from dev-db/phpmyadmin/phpmyadmin-4.2.13.3.ebuild
123 rename to dev-db/phpmyadmin/phpmyadmin-4.3.13.1-r1.ebuild
124 index 9367135..f5b3a1c 100644
125 --- a/dev-db/phpmyadmin/phpmyadmin-4.2.13.3.ebuild
126 +++ b/dev-db/phpmyadmin/phpmyadmin-4.3.13.1-r1.ebuild
127 @@ -4,7 +4,7 @@
128
129 EAPI="5"
130
131 -inherit eutils webapp depend.php
132 +inherit eutils webapp
133
134 MY_PV=${PV/_/-}
135 MY_P="phpMyAdmin-${MY_PV}-all-languages"
136 @@ -23,10 +23,10 @@ RDEPEND="
137 dev-lang/php[mysqli]
138 dev-lang/php[mysql]
139 )
140 + virtual/httpd-php:*
141 "
142
143 need_httpd_cgi
144 -need_php_httpd
145
146 S="${WORKDIR}"/${MY_P}
147
148
149 diff --git a/dev-db/phpmyadmin/phpmyadmin-4.4.6.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.4.6.1.ebuild
150 deleted file mode 100644
151 index 9367135..0000000
152 --- a/dev-db/phpmyadmin/phpmyadmin-4.4.6.1.ebuild
153 +++ /dev/null
154 @@ -1,61 +0,0 @@
155 -# Copyright 1999-2015 Gentoo Foundation
156 -# Distributed under the terms of the GNU General Public License v2
157 -# $Header: $
158 -
159 -EAPI="5"
160 -
161 -inherit eutils webapp depend.php
162 -
163 -MY_PV=${PV/_/-}
164 -MY_P="phpMyAdmin-${MY_PV}-all-languages"
165 -
166 -DESCRIPTION="Web-based administration for MySQL database in PHP"
167 -HOMEPAGE="http://www.phpmyadmin.net/"
168 -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
169 -
170 -LICENSE="GPL-2"
171 -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
172 -IUSE="setup"
173 -
174 -RDEPEND="
175 - dev-lang/php[crypt,ctype,filter,json,session,unicode]
176 - || (
177 - dev-lang/php[mysqli]
178 - dev-lang/php[mysql]
179 - )
180 -"
181 -
182 -need_httpd_cgi
183 -need_php_httpd
184 -
185 -S="${WORKDIR}"/${MY_P}
186 -
187 -pkg_setup() {
188 - webapp_pkg_setup
189 -}
190 -
191 -src_install() {
192 - webapp_src_preinst
193 -
194 - dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
195 - rm -f LICENSE README* RELEASE-DATE-${MY_PV}
196 -
197 - if ! use setup; then
198 - rm -rf setup || die "Cannot remove setup utility"
199 - elog "The phpMyAdmin setup utility has been removed."
200 - elog "It is a regular target of various exploits. If you need it, set USE=setup."
201 - else
202 - elog "You should consider disabling the setup USE flag"
203 - elog "to exclude the setup utility if you don't use it."
204 - elog "It regularly is the target of various exploits."
205 - fi
206 -
207 - insinto "${MY_HTDOCSDIR#${EPREFIX}}"
208 - doins -r .
209 -
210 - webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
211 - webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
212 -
213 - webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
214 - webapp_src_install
215 -}
216
217 diff --git a/dev-db/phpmyadmin/phpmyadmin-4.3.13.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.4.8.ebuild
218 similarity index 96%
219 rename from dev-db/phpmyadmin/phpmyadmin-4.3.13.1.ebuild
220 rename to dev-db/phpmyadmin/phpmyadmin-4.4.8.ebuild
221 index 9367135..f5b3a1c 100644
222 --- a/dev-db/phpmyadmin/phpmyadmin-4.3.13.1.ebuild
223 +++ b/dev-db/phpmyadmin/phpmyadmin-4.4.8.ebuild
224 @@ -4,7 +4,7 @@
225
226 EAPI="5"
227
228 -inherit eutils webapp depend.php
229 +inherit eutils webapp
230
231 MY_PV=${PV/_/-}
232 MY_P="phpMyAdmin-${MY_PV}-all-languages"
233 @@ -23,10 +23,10 @@ RDEPEND="
234 dev-lang/php[mysqli]
235 dev-lang/php[mysql]
236 )
237 + virtual/httpd-php:*
238 "
239
240 need_httpd_cgi
241 -need_php_httpd
242
243 S="${WORKDIR}"/${MY_P}
Report Message
Find on MARC Find on Google Groups