Version bump, bugfix release

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

3 files changed, 76 insertions, 15 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 802a496a0448..69f2995186c0 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.457 2011/10/22 16:59:02 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.458 2011/11/02 18:56:06 a3li Exp $
+
+*phpmyadmin-3.4.7 (02 Nov 2011)
+
+  02 Nov 2011; Alex Legler <a3li@gentoo.org> +phpmyadmin-3.4.7.ebuild:
+  Version bump, bugfix release
 
   22 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org> phpmyadmin-3.4.6.ebuild:
   ppc/ppc64 stable wrt #387413
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index e5bbf1cf809a..8e4a14ec2a67 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -4,24 +4,16 @@ Hash: SHA256
 AUX postinstall-en-3.1.txt 1159 RMD160 5a7f64946c4ded92de62b1381940fb36b400d38a SHA1 7b2060c29c85a7a8c3180a2ba19d11d971830414 SHA256 cd7b5fdb108f10112e45bd50113c1425ef71908e958d752e0e990cd98f6e436f
 DIST phpMyAdmin-3.4.5-all-languages.tar.bz2 4592593 RMD160 e3edec81945b886217a8c16a50c4364ebdbe39dc SHA1 abf66d2eb3cac8ac98622663fc11100b0fd479d3 SHA256 27917cf2d833c0c8700704c62b28a210f30682dd112e6a0b6fd2db3e6d061051
 DIST phpMyAdmin-3.4.6-all-languages.tar.bz2 4602509 RMD160 6155eda46145dc7bfdc39be490abc5bf1de56fbc SHA1 28659a49b30fd010396a952b57046beb2d65e5a2 SHA256 c5eb78779d6f4f29c0c4ee91d658f15965f2681683e8c704b76779047ba753b9
+DIST phpMyAdmin-3.4.7-all-languages.tar.bz2 4604198 RMD160 c095a357409b8c9b7dfaf2307dedd94cfb5d66dd SHA1 7fc8b9a8ae2a3fcaf7f46862b716f673d3ce2d21 SHA256 83439c01d10c93efadfc75ded9227b27ffe9f91bb017c54b91f33d87aeac0102
 EBUILD phpmyadmin-3.4.5.ebuild 1622 RMD160 ed3bc4a8bbbd565246b04ed868cb5193172168eb SHA1 4292a9d6c9eeb7262bfe93a362466592a472e9d7 SHA256 ccc670fbad1f3118e5387d71def6cd4d43b04c5e8716f1f6030189f0304dce53
 EBUILD phpmyadmin-3.4.6.ebuild 1624 RMD160 90b39e8206fa6b191dfa73462fc29eeffe5f59b1 SHA1 d66621361ccf7c88c68f774fd30678bdce028ef6 SHA256 ba3eab54a265dd2eab26ad6d3e6a1aed81242b12d492614ec71c6d104b2413d5
-MISC ChangeLog 61970 RMD160 850f0eab11f9b9e4caf3ed6cd3657fdc5103a445 SHA1 342c16dac7b9624122749bef62ebc5c93fd8776e SHA256 4efa9378b5b52b1e67af27f798ebeb35c96a6c06ee0cf3adab04d7f80bc99672
+EBUILD phpmyadmin-3.4.7.ebuild 1623 RMD160 0f1155c5b9210b7ba2aa2e83737f70eb7bde78f0 SHA1 25db5a430c0d7d3b845dea117dd943091d0989e3 SHA256 b85fee669a42e0e3dede7230a75b4c537cb76ea866ef1383de50db41b40c4c1f
+MISC ChangeLog 62100 RMD160 dba7ca382744bc7efafb16ef844760d8699a2c67 SHA1 f4bcc1679088302fb0abe4687103a313146dcb6a SHA256 e82586cbfabac0e82e003e42d94ca9cef33cb8312cf038d572a6ea9a5c9a85fb
 MISC metadata.xml 497 RMD160 eaba4b5566af47342cdcd58d660191afe16fd30a SHA1 ded49266c2f95c2b3367e6c56379fffc04410a70 SHA256 273736b7bcd027c8c569f9d8bfb3ee9e05fdfdb043e679133dea0fd13e39d06a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOovZcAAoJEF0huFKJUZL5QHwQAIUzNsdqxiskjiRiesSpRCVw
-pWUWinqN5y+euxfr/a7kOAOgn9qX4dWA20nDGG9EVt3yVfsYZ1OEb3dX/NxHRCG3
-FwNE414zctpcxH20g+0v+GaOQvShVPBbajl1zaoSJ2MtCE97Gb56MZNkz0H4aNdQ
-zuABHTV6dZh0etbwkiPJIwRFkMmwfbgizZ5Hts2XJ/VIreeUJYdPX7tbH6gS9BCW
-Ay4QmB1ORvex4ZfkDk4Ba8jfBeR8u0oaMv1f4P4ilneumdHNaYdyIaH0xhdfE9Wb
-bngH5dmfEhoA3l0M2T4h5jwSBTbeAeAeNKrnLTqG1gofd5fSfuCNsATDMlxxcPZT
-31D+EjbB11WIlEe2cvGy1fvXkknqoD1OonXUjJErSrrnSwLr+JKIimmqbN8h3RUP
-di5KB/VK4KOgjBWQoDvZOlhk+AJ+SRJrjTcwGr82yvx0K78h4Avt0OnGS1lEJtCp
-xg4jgY8rvdL02vhemnVibJrSkNcOzUsmhzP8kmDkEzihIsUf0r15YOlwF0Uu/o6e
-uErRKhphZBY/+VgZ76U2nUxGbOMlJ8etj3GQm3b7B9zd1O+tL1eB69YqyVzs03gp
-ckp3UnpNcUge8TLzyKDTso2LiB03V4eB35fQqNqar/nhGJ70e/MeQxZ49v8OyXre
-Lywq2bXbzrL2XzwwDEdC
-=GEqG
+iF4EAREIAAYFAk6xkk4ACgkQ3Ca6Xy8+rvT58AD/e5XYKn1+8VO6Dr0U2rq8izNK
+hLk6cJsOXt8SfdQaLrYA/R6Zqpm4Dj/uCmyE0x/xUUKU2Z2Mi8QXSHFpUOd49LaD
+=q4kG
 -----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/phpmyadmin-3.4.7.ebuild b/dev-db/phpmyadmin/phpmyadmin-3.4.7.ebuild
new file mode 100644
index 000000000000..b71838472eb5
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-3.4.7.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.4.7.ebuild,v 1.1 2011/11/02 18:56:06 a3li Exp $
+
+EAPI="2"
+
+inherit eutils webapp depend.php
+
+MY_PV=${PV/_/-}
+MY_P="phpMyAdmin-${MY_PV}-all-languages"
+
+DESCRIPTION="Web-based administration for MySQL database in PHP"
+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"
+
+RDEPEND="
+	dev-lang/php[crypt,ctype,filter,json,session,unicode]
+	|| (
+		<dev-lang/php-5.3[spl,pcre]
+		>=dev-lang/php-5.3
+	)
+	|| (
+		dev-lang/php[mysqli]
+		dev-lang/php[mysql]
+	)
+"
+
+need_httpd_cgi
+need_php_httpd
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+	webapp_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
+
+	if ! use setup; then
+		rm -rf setup || die "Cannot remove setup utility"
+		elog "The phpmyadmin setup utility has been removed."
+	else
+		elog "You should consider disabling the setup USE flag"
+		elog "to exclude the setup utility if you don't use it."
+		elog "It regularly is the target of various exploits."
+	fi
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR}"/libraries/config.default.php
+	webapp_serverowned "${MY_HTDOCSDIR}"/libraries/config.default.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
+	webapp_src_install
+}