Version bump for bug 414859, removing old version.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 38 insertions, 11 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 46a4e115f51e..58b8dabd2d63 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.466 2012/04/09 23:50:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.467 2012/05/07 14:36:20 a3li Exp $
+
+*phpmyadmin-3.5.1 (07 May 2012)
+
+  07 May 2012; Alex Legler <a3li@gentoo.org> -phpmyadmin-3.4.6.ebuild,
+  +phpmyadmin-3.5.1.ebuild:
+  Version bump for bug 414859, removing old version.
 
 *phpmyadmin-3.5.0 (09 Apr 2012)
 
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 8c6d00d1e65b..2ae9441f935a 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,9 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX postinstall-en-3.1.txt 1159 RMD160 5a7f64946c4ded92de62b1381940fb36b400d38a SHA1 7b2060c29c85a7a8c3180a2ba19d11d971830414 SHA256 cd7b5fdb108f10112e45bd50113c1425ef71908e958d752e0e990cd98f6e436f
-DIST phpMyAdmin-3.4.6-all-languages.tar.bz2 4602509 RMD160 6155eda46145dc7bfdc39be490abc5bf1de56fbc SHA1 28659a49b30fd010396a952b57046beb2d65e5a2 SHA256 c5eb78779d6f4f29c0c4ee91d658f15965f2681683e8c704b76779047ba753b9
 DIST phpMyAdmin-3.4.9-all-languages.tar.bz2 4666051 RMD160 2bec1bd147af6ff00cdb999a35800b95f986a518 SHA1 4ac4f15fb305ef243b88b17e405e9d451bd56de9 SHA256 5251dc5c5c691c02dd4683692f282c72e8360f453dbb3edfa5f53d9461299f86
 DIST phpMyAdmin-3.5.0-all-languages.tar.bz2 4711973 RMD160 b7c02d5fbc6b082faba8dba3557efb89da38b040 SHA1 b8de74c723761276bc48c2c328290275dd113d9a SHA256 30ec9ca34926912a459e121539a56609e984de4df610674578c1bcfa51eb9ee5
-EBUILD phpmyadmin-3.4.6.ebuild 1619 RMD160 879131a2754eea6496f2c9130d7aecfc5f6f44ff SHA1 6d56f4d31608235564a8119bb5e14b27b976324e SHA256 03ffbb871b4acb79725416c05c08a205a8f59c5667f754d32fcba97c44e1ea06
+DIST phpMyAdmin-3.5.1-all-languages.tar.bz2 4724343 RMD160 4f61be7fe60368efde7b48ff07e0267d48c00737 SHA1 c2c01f3098bc5a87e05a9a79f9c196a82ada9aa1 SHA256 c4938855ad43c41a2c94b2f74c75a24819e01f55d800a347c8373557988b2da3
 EBUILD phpmyadmin-3.4.9.ebuild 1702 RMD160 1b7d0357cf1a2fdded3efda6d50aae9cfdd91e12 SHA1 2cd959ef3cc2b256f8b18ceb6701bfa3bdb68797 SHA256 1d5a7e455f359ecb92255662e43a2e4421cbb8cb5d10427f10e66e62c4bc5a8a
 EBUILD phpmyadmin-3.5.0.ebuild 1667 RMD160 cfc1ecb12b3e1c89473cb70ad8729fdb70912910 SHA1 168983ae67e9d80583630b433a5d37abd1e58775 SHA256 913d03490a64c6f1ae0a39912054249fe866ec4b81de7f8059427ea9c804849b
-MISC ChangeLog 63118 RMD160 abd44e3a8c59f5da031795087402eb5934304c9c SHA1 adf5d89ce0b971c3a11326caaaadbecc0b5c87b8 SHA256 530508822befb74d9591eb865fbe2f37cd35e82fc28ce7b3d850ffc76eb08280
+EBUILD phpmyadmin-3.5.1.ebuild 1664 RMD160 65377352cc93699db29b59840f67e21c6caeed69 SHA1 cdc007be3f542fe70b790d375588d7c02d8540f7 SHA256 698cbffe58b8d3dbb85e4c547ac1e2f8914893aaeed62e798739e88ec39ec1a7
+MISC ChangeLog 63301 RMD160 777fbaaa9972ee14db2a3946e7c2c426d5868a6f SHA1 5686d3d3ae703f0eccc0b22dc50aa82de04f01f2 SHA256 3389dddb069c58a1c40ee611f3a1e25a552a9856f7078960247ded14390cbdbc
 MISC metadata.xml 497 RMD160 eaba4b5566af47342cdcd58d660191afe16fd30a SHA1 ded49266c2f95c2b3367e6c56379fffc04410a70 SHA256 273736b7bcd027c8c569f9d8bfb3ee9e05fdfdb043e679133dea0fd13e39d06a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBCAAGBQJPp93rAAoJEIce3keOdAI4RxkP/1eOP502xLFnQLJfv0o+WUkp
+OaQJ64NGDkJzc5RE0CipicoYiKXwx19/nO/m6zEiaFrWE0xoDkHVvOyjRCvHJjRV
+R9ouFQLzC/gVnHHIsm6lNJJfNREbNWAlzXrBW8N+QuWFaccLFAUoG1JQyAoE9Kv/
+py6l3+lCfCMCxaBEex2FQdDQvs7cEYK8YO3AI7WPOvrVphUykScoG8aHvAdn2/Qj
+xp/VVocaKXD2UDIir1RHcaDox9IuIp/v0kEcSaqlcZDVZm9QZvk87r0ZwStd47fX
+k00PpTUYCKelrws7OsIYfKdlDhGNliTuIX5kdwDXeXt4gbD42eTAc5fmG1lYr1Tg
+0HzLsn8UOVPyhPMJokWHWMhA/OMsITiwg5QcE13Z7wmFTqKITkgjMk27rWRNfl75
+COCc+Jr6W0IYKN7EE31caKQa5hDinEvTrm/18z3KdTlT2zQ80k8NWibnInUYxtE/
+GZ6OGqXha2jVJqERQ9w3aBFVAo9heyk6tWzxtmzzoOoVxM1dZ+kJLrlGPV8CNrCW
+B2aXrOIA4xXDTVFmWc1St4H6opARbKqqBqaaKXqJmqFh/kDlXci7kKjtmBUA4+4/
+ix8h8qlRzP1W8w+Msue9Xlda8MWc9k0hbmlP8Xz6lnWzbgW6fO85cq9LGJ3E9bRP
+CqS4+ezH1X40Zqyg5KvC
+=FA1z
+-----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/phpmyadmin-3.4.6.ebuild b/dev-db/phpmyadmin/phpmyadmin-3.5.1.ebuild
index b82c3b7dde38..1a8e1ee3dfa6 100644
--- a/dev-db/phpmyadmin/phpmyadmin-3.4.6.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-3.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.4.6.ebuild,v 1.6 2011/11/05 19:26:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.5.1.ebuild,v 1.1 2012/05/07 14:36:20 a3li Exp $
 
 EAPI="2"
 
@@ -14,8 +14,8 @@ HOMEPAGE="http://www.phpmyadmin.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="+setup"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="setup"
 
 RDEPEND="
 	dev-lang/php[crypt,ctype,filter,json,session,unicode]
@@ -41,12 +41,13 @@ pkg_setup() {
 src_install() {
 	webapp_src_preinst
 
-	dodoc CREDITS Documentation.txt INSTALL README RELEASE-DATE-${MY_PV} TODO ChangeLog || die
-	rm -f LICENSE CREDITS INSTALL README* RELEASE-DATE-${MY_PV} TODO
+	dodoc Documentation.txt README RELEASE-DATE-${MY_PV} ChangeLog || die
+	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
 
 	if ! use setup; then
 		rm -rf setup || die "Cannot remove setup utility"
-		elog "The phpmyadmin setup utility has been removed."
+		elog "The phpMyAdmin setup utility has been removed."
+		elog "It is a regular target of various exploits. If you need it, set USE=setup."
 	else
 		elog "You should consider disabling the setup USE flag"
 		elog "to exclude the setup utility if you don't use it."