1 |
commit: 4e7b1a622d3418956eabb6af8b6663e6667c1cc8 |
2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 9 15:02:12 2014 +0000 |
4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 9 15:02:12 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=4e7b1a62 |
7 |
|
8 |
Sync with tree and drop old versions. |
9 |
|
10 |
--- |
11 |
dev-db/phpmyadmin/ChangeLog | 50 +++++++++++++++++++++- |
12 |
dev-db/phpmyadmin/Manifest | 4 +- |
13 |
dev-db/phpmyadmin/files/postinstall-en-3.1.txt | 2 +- |
14 |
...yadmin-4.0.5.ebuild => phpmyadmin-4.0.6.ebuild} | 6 +-- |
15 |
...dmin-3.5.8.2.ebuild => phpmyadmin-4.1.4.ebuild} | 10 ++--- |
16 |
5 files changed, 59 insertions(+), 13 deletions(-) |
17 |
|
18 |
diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog |
19 |
index 403d344..c72c992 100644 |
20 |
--- a/dev-db/phpmyadmin/ChangeLog |
21 |
+++ b/dev-db/phpmyadmin/ChangeLog |
22 |
@@ -1,6 +1,52 @@ |
23 |
# ChangeLog for dev-db/phpmyadmin |
24 |
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.489 2013/04/26 09:20:22 ago Exp $ |
26 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.501 2014/01/14 01:45:34 jmbsvicetto Exp $ |
28 |
+ |
29 |
+ 14 Jan 2014; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o> |
30 |
+ files/postinstall-en-3.1.txt: |
31 |
+ Really add the missing "/" on the URL (postinstall file). |
32 |
+ |
33 |
+*phpmyadmin-4.1.4 (14 Jan 2014) |
34 |
+ |
35 |
+ 14 Jan 2014; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o> |
36 |
+ +phpmyadmin-4.1.4.ebuild: |
37 |
+ Bump to 4.1.4 release - fixes bug 492284. Add missing "/" on URL of |
38 |
+ postinstall file. |
39 |
+ |
40 |
+ 28 Oct 2013; Alex Legler <a3li@g.o> -phpmyadmin-3.5.3.ebuild, |
41 |
+ -phpmyadmin-3.5.8.ebuild: |
42 |
+ Removing vulnerable versions |
43 |
+ |
44 |
+*phpmyadmin-4.0.6 (13 Sep 2013) |
45 |
+ |
46 |
+ 13 Sep 2013; Patrick Lauer <patrick@g.o> +phpmyadmin-4.0.6.ebuild: |
47 |
+ Bump |
48 |
+ |
49 |
+ 24 Aug 2013; Agostino Sarubbo <ago@g.o> phpmyadmin-4.0.5.ebuild: |
50 |
+ Stable for ppc64, wrt bug #479870 |
51 |
+ |
52 |
+ 20 Aug 2013; Jeroen Roovers <jer@g.o> phpmyadmin-4.0.5.ebuild: |
53 |
+ Stable for HPPA (bug #479870). |
54 |
+ |
55 |
+ 19 Aug 2013; Agostino Sarubbo <ago@g.o> phpmyadmin-4.0.5.ebuild: |
56 |
+ Stable for ppc, wrt bug #479870 |
57 |
+ |
58 |
+ 18 Aug 2013; Agostino Sarubbo <ago@g.o> phpmyadmin-4.0.5.ebuild: |
59 |
+ Stable for x86, wrt bug #479870 |
60 |
+ |
61 |
+ 18 Aug 2013; Agostino Sarubbo <ago@g.o> phpmyadmin-4.0.5.ebuild: |
62 |
+ Stable for sparc, wrt bug #479870 |
63 |
+ |
64 |
+ 18 Aug 2013; Agostino Sarubbo <ago@g.o> phpmyadmin-4.0.5.ebuild: |
65 |
+ Stable for alpha, wrt bug #479870 |
66 |
+ |
67 |
+ 18 Aug 2013; Agostino Sarubbo <ago@g.o> phpmyadmin-4.0.5.ebuild: |
68 |
+ Stable for amd64, wrt bug #479870 |
69 |
+ |
70 |
+*phpmyadmin-4.0.5 (17 Aug 2013) |
71 |
+ |
72 |
+ 17 Aug 2013; Alex Legler <a3li@g.o> +phpmyadmin-4.0.5.ebuild: |
73 |
+ Version bump |
74 |
|
75 |
26 Apr 2013; Agostino Sarubbo <ago@g.o> phpmyadmin-3.5.8.ebuild: |
76 |
Stable for sparc, wrt bug #465420 |
77 |
|
78 |
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest |
79 |
index 0525c43..1c71904 100644 |
80 |
--- a/dev-db/phpmyadmin/Manifest |
81 |
+++ b/dev-db/phpmyadmin/Manifest |
82 |
@@ -1,2 +1,2 @@ |
83 |
-DIST phpMyAdmin-3.5.8.2-all-languages.tar.xz 3743436 SHA256 fe9d4a6d25a953f291db171441314c31d3976f7d85296ceec26b1bb5ee84afe2 SHA512 bd8127597a282792f4857554261b44c0952769433e14cc40a199d55e7bd8fbc667c006565775a131b2c67f9971af82e432d19a85c1237b48c1693c73f5f81b96 WHIRLPOOL 3c1ccce4e0fba3dfdb0e953da743a8dd22aac631d11daef323dcabc5655924184c9e8584d9f9346a96c1c5decb12d797f76ef1226b8b62ec13d017505c00ac2c |
84 |
-DIST phpMyAdmin-4.0.5-all-languages.tar.xz 4572884 SHA256 f4df1190441ce5e094183cfadf8aec4af3a4f131339599e6380a1c6ac0a11fe4 SHA512 fea613e28b5124ac8a53e5158f19bed66e576a7f021671ff85ab7522e73974d99b51fc3a84345d99ce81cb7aaa5751ff473b7e609def1edd46df26c78866da6d WHIRLPOOL 41749912e2f9ff81bbb839308bca87a4a4f373241cd40638644e7a9390bbf48512efb6b57bfae36c1ddfb73e1f447681a4e7d39530b1f9cb9ba36cc1e8691ab8 |
85 |
+DIST phpMyAdmin-4.0.6-all-languages.tar.xz 4753244 SHA256 0ced3883edc540ea525419727b4a5cc54c73ef67f48c0d721ade5cda5e820ba7 SHA512 9c1b3868a73137da20df79314e48f41d990287863d68ef18201048dec5ea816e2580c38781c61571742100b7201ae3d9d12b5a2d6ef2b0756cf2f92e52cf8695 WHIRLPOOL 8d9d1ee4d2b582788f921cd4ad4ab3c1c830734d324ae544cd80517dd51736316027ae692ac8d4c511a6a72edb4cbd72285efa18717448ce3bd2a7e32a9bad57 |
86 |
+DIST phpMyAdmin-4.1.4-all-languages.tar.xz 4901576 SHA256 4bd23cda85b3ac4e44a1e472a461638230020af78bd03d7178f60d55b8bb1331 SHA512 c600fc16a44cd395cda5fb16e8ab6ec1d5399651ce8b6c083e030fd3216d58fa8eac682cc7ba4e9c86b3aa1c91c483024fff6a10c11375c4914a523caf3e13e3 WHIRLPOOL d1547f0e7a484c308d91ded0cce47a258c7bbf191b7f592b1f54482ab736d4e244dc0181c5e8052ba47ae0a41da466bdcbf83946a37ba137c87da05770c5ebed |
87 |
|
88 |
diff --git a/dev-db/phpmyadmin/files/postinstall-en-3.1.txt b/dev-db/phpmyadmin/files/postinstall-en-3.1.txt |
89 |
index 21fa8b3..4e72581 100644 |
90 |
--- a/dev-db/phpmyadmin/files/postinstall-en-3.1.txt |
91 |
+++ b/dev-db/phpmyadmin/files/postinstall-en-3.1.txt |
92 |
@@ -8,7 +8,7 @@ a) Create config.inc.php. You can use the web-based installer |
93 |
mkdir ${MY_INSTALLDIR}/config |
94 |
chown ${VHOST_SERVER_UID}:${VHOST_SERVER_UID} ${MY_INSTALLDIR}/config |
95 |
|
96 |
- then go to http://${VHOST_HOSTNAME}${VHOST_APPDIR}/setup/ |
97 |
+ then go to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/setup/ |
98 |
|
99 |
once you've saved the configuration: |
100 |
|
101 |
|
102 |
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.0.5.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.0.6.ebuild |
103 |
similarity index 84% |
104 |
rename from dev-db/phpmyadmin/phpmyadmin-4.0.5.ebuild |
105 |
rename to dev-db/phpmyadmin/phpmyadmin-4.0.6.ebuild |
106 |
index 3537a5b..964b8df 100644 |
107 |
--- a/dev-db/phpmyadmin/phpmyadmin-4.0.5.ebuild |
108 |
+++ b/dev-db/phpmyadmin/phpmyadmin-4.0.6.ebuild |
109 |
@@ -1,10 +1,10 @@ |
110 |
# Copyright 1999-2013 Gentoo Foundation |
111 |
# Distributed under the terms of the GNU General Public License v2 |
112 |
-# $Header: $ |
113 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.0.6.ebuild,v 1.1 2013/09/13 06:44:58 patrick Exp $ |
114 |
|
115 |
EAPI="4" |
116 |
|
117 |
-inherit depend.php eutils webapp |
118 |
+inherit eutils webapp depend.php |
119 |
|
120 |
MY_PV=${PV/_/-} |
121 |
MY_P="phpMyAdmin-${MY_PV}-all-languages" |
122 |
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.phpmyadmin.net/" |
123 |
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz" |
124 |
|
125 |
LICENSE="GPL-2" |
126 |
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos" |
127 |
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos" |
128 |
IUSE="setup" |
129 |
|
130 |
RDEPEND=" |
131 |
|
132 |
diff --git a/dev-db/phpmyadmin/phpmyadmin-3.5.8.2.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.1.4.ebuild |
133 |
similarity index 78% |
134 |
rename from dev-db/phpmyadmin/phpmyadmin-3.5.8.2.ebuild |
135 |
rename to dev-db/phpmyadmin/phpmyadmin-4.1.4.ebuild |
136 |
index 0ccce9a..6d4107e 100644 |
137 |
--- a/dev-db/phpmyadmin/phpmyadmin-3.5.8.2.ebuild |
138 |
+++ b/dev-db/phpmyadmin/phpmyadmin-4.1.4.ebuild |
139 |
@@ -1,10 +1,10 @@ |
140 |
-# Copyright 1999-2013 Gentoo Foundation |
141 |
+# Copyright 1999-2014 Gentoo Foundation |
142 |
# Distributed under the terms of the GNU General Public License v2 |
143 |
-# $Header: $ |
144 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.1.4.ebuild,v 1.1 2014/01/14 01:41:12 jmbsvicetto Exp $ |
145 |
|
146 |
EAPI="4" |
147 |
|
148 |
-inherit depend.php eutils webapp |
149 |
+inherit eutils webapp depend.php |
150 |
|
151 |
MY_PV=${PV/_/-} |
152 |
MY_P="phpMyAdmin-${MY_PV}-all-languages" |
153 |
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.phpmyadmin.net/" |
154 |
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz" |
155 |
|
156 |
LICENSE="GPL-2" |
157 |
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos" |
158 |
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos" |
159 |
IUSE="setup" |
160 |
|
161 |
RDEPEND=" |
162 |
@@ -37,7 +37,7 @@ pkg_setup() { |
163 |
src_install() { |
164 |
webapp_src_preinst |
165 |
|
166 |
- dodoc Documentation.txt README RELEASE-DATE-${MY_PV} ChangeLog || die |
167 |
+ dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die |
168 |
rm -f LICENSE README* RELEASE-DATE-${MY_PV} |
169 |
|
170 |
if ! use setup; then |