1 |
commit: 1ca4d35c7ee61cfe99af117f3a99c0c862e8ec4c |
2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 1 20:19:11 2015 +0000 |
4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 1 20:19:11 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ca4d35c |
7 |
|
8 |
Drop old versions, add new 4.4.14 release and first 4.5 beta. |
9 |
|
10 |
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org> |
11 |
|
12 |
dev-db/phpmyadmin/Manifest | 4 ++-- |
13 |
dev-db/phpmyadmin/metadata.xml | 3 --- |
14 |
.../{phpmyadmin-4.0.10.10.ebuild => phpmyadmin-4.0.10.10-r1.ebuild} | 4 ++-- |
15 |
.../{phpmyadmin-4.2.13.3.ebuild => phpmyadmin-4.2.13.3-r1.ebuild} | 4 ++-- |
16 |
.../{phpmyadmin-4.0.10.10.ebuild => phpmyadmin-4.3.13.1-r1.ebuild} | 4 ++-- |
17 |
.../{phpmyadmin-4.4.13.1.ebuild => phpmyadmin-4.4.14.ebuild} | 0 |
18 |
.../{phpmyadmin-4.4.12.ebuild => phpmyadmin-4.5.0_beta1.ebuild} | 2 +- |
19 |
7 files changed, 9 insertions(+), 12 deletions(-) |
20 |
|
21 |
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest |
22 |
index 8a6ff11..5f0e403 100644 |
23 |
--- a/dev-db/phpmyadmin/Manifest |
24 |
+++ b/dev-db/phpmyadmin/Manifest |
25 |
@@ -1,6 +1,6 @@ |
26 |
DIST phpMyAdmin-4.0.10.10-all-languages.tar.xz 4775140 SHA256 5f4522227ad9ffce9193b1c25c2fc17f5b014b9da32137cc122f011dcd190b15 SHA512 3f4f06c574f941586d7e48fba45023a5d3126fe8ed29527ddf4de3401f0076c678342b9e493ed99290d5b748df90360c0e2f0612766a993f5f7147685ed144d5 WHIRLPOOL bd0ba9cd5f3de88a33b8e8a87568b3f54d923a0d99bc1b75b772baf42b47e76e4059921300a9b03847f3c8f93c5bc4a1c651ca79d550af21f2fd74b1aa96fa9b |
27 |
DIST phpMyAdmin-4.2.13.3-all-languages.tar.xz 5205440 SHA256 2d78bd91dc90d95d9f21c7e41294f2995a36dbbe1e4d1209e972b1d855c4877e SHA512 77ad296931666896613b7363c35c5546da66bddcda37fb31609ca5fb78f4b12241f6c976d1916a6491fbbc33d5f837163bcd0c0e0f227458d055076a971b640f WHIRLPOOL c4bb8f0689b0aa2ae7a67793f9c26b761e1a1e28e4e684f495815caf89ef527f4fced30aa53986c10d41ec000f3e295677739d5e73cbfc336466591c9fcf6a3e |
28 |
DIST phpMyAdmin-4.3.13.1-all-languages.tar.xz 5446988 SHA256 d7484e2449453eae52613aae59e5f3a9342014aba7db88598ad6a90504ebfbd3 SHA512 b08a41721876a4c7c8fcc162f0f1f43bbd67b4f87fc1c0668672addb8eb6f56695755401a2de2c75fc944b074f5187c6df942bec0ff03c16ad34c27b505b87a0 WHIRLPOOL a72b7e4247bb7de68820d5583967b04b8dfd0917383f88d707b48235d119e0ad4fd45a04352dda0f43b11b2ba4def5a4648eca01e2f7ceabd3f788e429dc83ca |
29 |
-DIST phpMyAdmin-4.4.12-all-languages.zip 9982178 SHA256 168c5ec097ae819f3491615e824cb7bfe1886b40f85db2f0f5722dc24a89a81f SHA512 b737ac5e804af38e5331e54a1edb040a98057e3abd06c1d93f3b6fbc4895041145ace5e8e7872f25448b2142aa06ae0f8eefc0cb8b098a6bbb3fd9c3ce1b048a WHIRLPOOL 5bf0abb0f470c0763a0c7e4a97f8c68c768d7e8d3361de9c6c569204fb385c49775a08827aa92037b7f3efa26f89eedb665e79a657d38dc1b6c589b27c6140ff |
30 |
-DIST phpMyAdmin-4.4.13.1-all-languages.zip 10039255 SHA256 4504ad9a9b2c93649a673cf83c4d8a3d6936cf4e63e14021ac2dac9ff42a8d49 SHA512 ecc774c35599f4d8cb4553140014d757e8b66be8b699f0b813fcfec5b54b4d588a0773ef5e07789ded201255ea7373834831dbb050419f8331fe97e9070c5bc7 WHIRLPOOL 4956bbbd56639f3fee4f19e3dde2b15d0ceca1721ec1cb1a43155f251f19d081592ea5ac88a7e8da0f0e028006f1fa0f57e0df38a49a6f7db722dc9d1bacf376 |
31 |
+DIST phpMyAdmin-4.4.14-all-languages.zip 10049779 SHA256 4e57593e22a90cd31dbc1f0b03c4c5740dde50a113acb55ed817f7dbd558f348 SHA512 ec56210f106c0076b68ca4ec91288e5b020e02b22369667a65cd27a152696c78b6575bc110aec43f189079601b3c2b1dfae8b3ec2f66411ec46e0db997f4f892 WHIRLPOOL 6cb18df2c393fb9ed00c798277472bc7a080d1177749370b236fe34271b14bbe73a51d3f241cd74425f8d2081749244a91b07f0ac5512688ca899e34ffad88f7 |
32 |
DIST phpMyAdmin-4.4.6.1-all-languages.tar.xz 5635832 SHA256 d423a81868f01b4ce77f90113d83df96590446acdbe8f00a46aeb670c4a9ac5c SHA512 d25c63f9d354ae3f488d1837c710cfc5bacde3d6421d71eb96ff5868971132ea570aad9875f35d862d22d0318b5e16b208a2d6a7d542424ee2a04e329a619978 WHIRLPOOL 8c5f5e9349e801e328ddafe89322e457b89bfa4c5dbe593be9990ac3168a5d0cfada260ef275388b95f2c806952a682445baff23d6092dd5a66766681759172b |
33 |
+DIST phpMyAdmin-4.5.0-beta1-all-languages.zip 10325210 SHA256 9f30442eada57d6bb183b437440e5b6e38b5c7304ae00ba1f0cf94d75e0cba4a SHA512 e851ad09d4cd89875b74f7fdc6d1c30ca9480f6e6de4b2529bd4126ad96bc47dfe1f0423b081cbf998d18d08c3995aa79fd930cccb366557bcf3b48cd52ad4c2 WHIRLPOOL 8f4e46440ea6bf75b831f6f2cad9df3c4fdb6d618149f1c31808db2607e385797cb5373c43bfa5504926bd4b89d60cc0d7d951620333c264f401bcc14e40b226 |
34 |
|
35 |
diff --git a/dev-db/phpmyadmin/metadata.xml b/dev-db/phpmyadmin/metadata.xml |
36 |
index 7bb697a..7a5f294 100644 |
37 |
--- a/dev-db/phpmyadmin/metadata.xml |
38 |
+++ b/dev-db/phpmyadmin/metadata.xml |
39 |
@@ -14,7 +14,4 @@ |
40 |
exploits in the past. |
41 |
</flag> |
42 |
</use> |
43 |
- <upstream> |
44 |
- <remote-id type="sourceforge">phpmyadmin</remote-id> |
45 |
- </upstream> |
46 |
</pkgmetadata> |
47 |
|
48 |
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.0.10.10.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.0.10.10-r1.ebuild |
49 |
similarity index 96% |
50 |
copy from dev-db/phpmyadmin/phpmyadmin-4.0.10.10.ebuild |
51 |
copy to dev-db/phpmyadmin/phpmyadmin-4.0.10.10-r1.ebuild |
52 |
index 41f2d33..fdba1e2 100644 |
53 |
--- a/dev-db/phpmyadmin/phpmyadmin-4.0.10.10.ebuild |
54 |
+++ b/dev-db/phpmyadmin/phpmyadmin-4.0.10.10-r1.ebuild |
55 |
@@ -4,7 +4,7 @@ |
56 |
|
57 |
EAPI="5" |
58 |
|
59 |
-inherit eutils webapp depend.php |
60 |
+inherit eutils webapp |
61 |
|
62 |
MY_PV=${PV/_/-} |
63 |
MY_P="phpMyAdmin-${MY_PV}-all-languages" |
64 |
@@ -23,10 +23,10 @@ RDEPEND=" |
65 |
dev-lang/php[mysqli] |
66 |
dev-lang/php[mysql] |
67 |
) |
68 |
+ virtual/httpd-php:* |
69 |
" |
70 |
|
71 |
need_httpd_cgi |
72 |
-need_php_httpd |
73 |
|
74 |
S="${WORKDIR}"/${MY_P} |
75 |
|
76 |
|
77 |
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.2.13.3.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.2.13.3-r1.ebuild |
78 |
similarity index 96% |
79 |
rename from dev-db/phpmyadmin/phpmyadmin-4.2.13.3.ebuild |
80 |
rename to dev-db/phpmyadmin/phpmyadmin-4.2.13.3-r1.ebuild |
81 |
index 41f2d33..fdba1e2 100644 |
82 |
--- a/dev-db/phpmyadmin/phpmyadmin-4.2.13.3.ebuild |
83 |
+++ b/dev-db/phpmyadmin/phpmyadmin-4.2.13.3-r1.ebuild |
84 |
@@ -4,7 +4,7 @@ |
85 |
|
86 |
EAPI="5" |
87 |
|
88 |
-inherit eutils webapp depend.php |
89 |
+inherit eutils webapp |
90 |
|
91 |
MY_PV=${PV/_/-} |
92 |
MY_P="phpMyAdmin-${MY_PV}-all-languages" |
93 |
@@ -23,10 +23,10 @@ RDEPEND=" |
94 |
dev-lang/php[mysqli] |
95 |
dev-lang/php[mysql] |
96 |
) |
97 |
+ virtual/httpd-php:* |
98 |
" |
99 |
|
100 |
need_httpd_cgi |
101 |
-need_php_httpd |
102 |
|
103 |
S="${WORKDIR}"/${MY_P} |
104 |
|
105 |
|
106 |
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.0.10.10.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.3.13.1-r1.ebuild |
107 |
similarity index 96% |
108 |
rename from dev-db/phpmyadmin/phpmyadmin-4.0.10.10.ebuild |
109 |
rename to dev-db/phpmyadmin/phpmyadmin-4.3.13.1-r1.ebuild |
110 |
index 41f2d33..fdba1e2 100644 |
111 |
--- a/dev-db/phpmyadmin/phpmyadmin-4.0.10.10.ebuild |
112 |
+++ b/dev-db/phpmyadmin/phpmyadmin-4.3.13.1-r1.ebuild |
113 |
@@ -4,7 +4,7 @@ |
114 |
|
115 |
EAPI="5" |
116 |
|
117 |
-inherit eutils webapp depend.php |
118 |
+inherit eutils webapp |
119 |
|
120 |
MY_PV=${PV/_/-} |
121 |
MY_P="phpMyAdmin-${MY_PV}-all-languages" |
122 |
@@ -23,10 +23,10 @@ RDEPEND=" |
123 |
dev-lang/php[mysqli] |
124 |
dev-lang/php[mysql] |
125 |
) |
126 |
+ virtual/httpd-php:* |
127 |
" |
128 |
|
129 |
need_httpd_cgi |
130 |
-need_php_httpd |
131 |
|
132 |
S="${WORKDIR}"/${MY_P} |
133 |
|
134 |
|
135 |
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.4.13.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.4.14.ebuild |
136 |
similarity index 100% |
137 |
rename from dev-db/phpmyadmin/phpmyadmin-4.4.13.1.ebuild |
138 |
rename to dev-db/phpmyadmin/phpmyadmin-4.4.14.ebuild |
139 |
|
140 |
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.4.12.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.5.0_beta1.ebuild |
141 |
similarity index 93% |
142 |
rename from dev-db/phpmyadmin/phpmyadmin-4.4.12.ebuild |
143 |
rename to dev-db/phpmyadmin/phpmyadmin-4.5.0_beta1.ebuild |
144 |
index d923c97..b3c46d6 100644 |
145 |
--- a/dev-db/phpmyadmin/phpmyadmin-4.4.12.ebuild |
146 |
+++ b/dev-db/phpmyadmin/phpmyadmin-4.5.0_beta1.ebuild |
147 |
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.phpmyadmin.net/" |
148 |
SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.zip" |
149 |
|
150 |
LICENSE="GPL-2" |
151 |
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos" |
152 |
+KEYWORDS="" |
153 |
IUSE="setup" |
154 |
|
155 |
RDEPEND=" |