Sync with tree and drop old versions.

5 files changed, 59 insertions, 13 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 403d344..c72c992 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,52 @@
 # ChangeLog for dev-db/phpmyadmin
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.489 2013/04/26 09:20:22 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.501 2014/01/14 01:45:34 jmbsvicetto Exp $
+
+  14 Jan 2014; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  files/postinstall-en-3.1.txt:
+  Really add the missing "/" on the URL (postinstall file).
+
+*phpmyadmin-4.1.4 (14 Jan 2014)
+
+  14 Jan 2014; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +phpmyadmin-4.1.4.ebuild:
+  Bump to 4.1.4 release - fixes bug 492284. Add missing "/" on URL of
+  postinstall file.
+
+  28 Oct 2013; Alex Legler <a3li@gentoo.org> -phpmyadmin-3.5.3.ebuild,
+  -phpmyadmin-3.5.8.ebuild:
+  Removing vulnerable versions
+
+*phpmyadmin-4.0.6 (13 Sep 2013)
+
+  13 Sep 2013; Patrick Lauer <patrick@gentoo.org> +phpmyadmin-4.0.6.ebuild:
+  Bump
+
+  24 Aug 2013; Agostino Sarubbo <ago@gentoo.org> phpmyadmin-4.0.5.ebuild:
+  Stable for ppc64, wrt bug #479870
+
+  20 Aug 2013; Jeroen Roovers <jer@gentoo.org> phpmyadmin-4.0.5.ebuild:
+  Stable for HPPA (bug #479870).
+
+  19 Aug 2013; Agostino Sarubbo <ago@gentoo.org> phpmyadmin-4.0.5.ebuild:
+  Stable for ppc, wrt bug #479870
+
+  18 Aug 2013; Agostino Sarubbo <ago@gentoo.org> phpmyadmin-4.0.5.ebuild:
+  Stable for x86, wrt bug #479870
+
+  18 Aug 2013; Agostino Sarubbo <ago@gentoo.org> phpmyadmin-4.0.5.ebuild:
+  Stable for sparc, wrt bug #479870
+
+  18 Aug 2013; Agostino Sarubbo <ago@gentoo.org> phpmyadmin-4.0.5.ebuild:
+  Stable for alpha, wrt bug #479870
+
+  18 Aug 2013; Agostino Sarubbo <ago@gentoo.org> phpmyadmin-4.0.5.ebuild:
+  Stable for amd64, wrt bug #479870
+
+*phpmyadmin-4.0.5 (17 Aug 2013)
+
+  17 Aug 2013; Alex Legler <a3li@gentoo.org> +phpmyadmin-4.0.5.ebuild:
+  Version bump
 
   26 Apr 2013; Agostino Sarubbo <ago@gentoo.org> phpmyadmin-3.5.8.ebuild:
   Stable for sparc, wrt bug #465420
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 0525c43..1c71904 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,2 +1,2 @@
-DIST phpMyAdmin-3.5.8.2-all-languages.tar.xz 3743436 SHA256 fe9d4a6d25a953f291db171441314c31d3976f7d85296ceec26b1bb5ee84afe2 SHA512 bd8127597a282792f4857554261b44c0952769433e14cc40a199d55e7bd8fbc667c006565775a131b2c67f9971af82e432d19a85c1237b48c1693c73f5f81b96 WHIRLPOOL 3c1ccce4e0fba3dfdb0e953da743a8dd22aac631d11daef323dcabc5655924184c9e8584d9f9346a96c1c5decb12d797f76ef1226b8b62ec13d017505c00ac2c
-DIST phpMyAdmin-4.0.5-all-languages.tar.xz 4572884 SHA256 f4df1190441ce5e094183cfadf8aec4af3a4f131339599e6380a1c6ac0a11fe4 SHA512 fea613e28b5124ac8a53e5158f19bed66e576a7f021671ff85ab7522e73974d99b51fc3a84345d99ce81cb7aaa5751ff473b7e609def1edd46df26c78866da6d WHIRLPOOL 41749912e2f9ff81bbb839308bca87a4a4f373241cd40638644e7a9390bbf48512efb6b57bfae36c1ddfb73e1f447681a4e7d39530b1f9cb9ba36cc1e8691ab8
+DIST phpMyAdmin-4.0.6-all-languages.tar.xz 4753244 SHA256 0ced3883edc540ea525419727b4a5cc54c73ef67f48c0d721ade5cda5e820ba7 SHA512 9c1b3868a73137da20df79314e48f41d990287863d68ef18201048dec5ea816e2580c38781c61571742100b7201ae3d9d12b5a2d6ef2b0756cf2f92e52cf8695 WHIRLPOOL 8d9d1ee4d2b582788f921cd4ad4ab3c1c830734d324ae544cd80517dd51736316027ae692ac8d4c511a6a72edb4cbd72285efa18717448ce3bd2a7e32a9bad57
+DIST phpMyAdmin-4.1.4-all-languages.tar.xz 4901576 SHA256 4bd23cda85b3ac4e44a1e472a461638230020af78bd03d7178f60d55b8bb1331 SHA512 c600fc16a44cd395cda5fb16e8ab6ec1d5399651ce8b6c083e030fd3216d58fa8eac682cc7ba4e9c86b3aa1c91c483024fff6a10c11375c4914a523caf3e13e3 WHIRLPOOL d1547f0e7a484c308d91ded0cce47a258c7bbf191b7f592b1f54482ab736d4e244dc0181c5e8052ba47ae0a41da466bdcbf83946a37ba137c87da05770c5ebed
diff --git a/dev-db/phpmyadmin/files/postinstall-en-3.1.txt b/dev-db/phpmyadmin/files/postinstall-en-3.1.txt
index 21fa8b3..4e72581 100644
--- a/dev-db/phpmyadmin/files/postinstall-en-3.1.txt
+++ b/dev-db/phpmyadmin/files/postinstall-en-3.1.txt
@@ -8,7 +8,7 @@ a) Create config.inc.php. You can use the web-based installer
    mkdir ${MY_INSTALLDIR}/config
    chown ${VHOST_SERVER_UID}:${VHOST_SERVER_UID} ${MY_INSTALLDIR}/config
 
-   then go to http://${VHOST_HOSTNAME}${VHOST_APPDIR}/setup/
+   then go to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/setup/
 
    once you've saved the configuration:
 
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.0.5.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.0.6.ebuild
index 3537a5b..964b8df 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.0.5.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.0.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.0.6.ebuild,v 1.1 2013/09/13 06:44:58 patrick Exp $
 
 EAPI="4"
 
-inherit depend.php eutils webapp
+inherit eutils webapp depend.php
 
 MY_PV=${PV/_/-}
 MY_P="phpMyAdmin-${MY_PV}-all-languages"
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.phpmyadmin.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"
 
 RDEPEND="
diff --git a/dev-db/phpmyadmin/phpmyadmin-3.5.8.2.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.1.4.ebuild
index 0ccce9a..6d4107e 100644
--- a/dev-db/phpmyadmin/phpmyadmin-3.5.8.2.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.1.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.1.4.ebuild,v 1.1 2014/01/14 01:41:12 jmbsvicetto Exp $
 
 EAPI="4"
 
-inherit depend.php eutils webapp
+inherit eutils webapp depend.php
 
 MY_PV=${PV/_/-}
 MY_P="phpMyAdmin-${MY_PV}-all-languages"
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.phpmyadmin.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"
 
 RDEPEND="
@@ -37,7 +37,7 @@ pkg_setup() {
 src_install() {
 	webapp_src_preinst
 
-	dodoc Documentation.txt README RELEASE-DATE-${MY_PV} ChangeLog || die
+	dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
 	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
 
 	if ! use setup; then