Bump

Package-Manager: portage-2.2.3/cvs/Linux x86_64

3 files changed, 70 insertions, 22 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index f13021baed86..c4fa19016d4b 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,11 @@
 # 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.497 2013/08/24 12:35:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.498 2013/09/13 06:44:58 patrick Exp $
+
+*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
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 262dbe4f7fec..80f903b0a8b5 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,29 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX postinstall-en-3.1.txt 1159 SHA256 cd7b5fdb108f10112e45bd50113c1425ef71908e958d752e0e990cd98f6e436f SHA512 4b9ae0a99f5e57f8c6f42e17d339ac1aac98fe8d5eea8682a223b2b17bf0e66dfacc1addd0dbca4390d6d10e9503872c821a029b1a18ee52dfc2b61b3d4d6f20 WHIRLPOOL 3902bdfc3fb5f95b940e5647fd7b4ae693306185f9a373748cf46353be73ef884d7a23f6552fb69af0d42d454c4f4da6cfd47912ebd338c080e2e317f1a45ccd
 DIST phpMyAdmin-3.5.3-all-languages.tar.xz 3663564 SHA256 4d2573d2cad3abc67997361ee3d5bf05cf2c3c6b8fb1b2c611030d32ec0db826 SHA512 a64fffebf4bd2e95a5c6fe2cc305e7e5352a2a6f87eeb0de64c8e1fb1c9146ec0c81960dc7d7b024d79b39144fd9289650773cad5f1639a9741fa58b5deed63f WHIRLPOOL d53d0582b1615690ec0a9dd0d29dac638d194e1cf0aa7c083ae9677881fba36da25a635021ad0a6347c4db79b28049b3c37edbe261b258a360c275c78e5c378f
 DIST phpMyAdmin-3.5.8-all-languages.tar.xz 3744780 SHA256 0766acb45d862ca802b5d3018f240bdd0a14749e21f40ebabe51bf25d6088409 SHA512 8f35eeb56b5ece95fd51cb58e93b212ea7390cd096f131d716a7e554dd3f38d6210dea4c218b5f6607a38184b978806e64ff040006a870bc8c6156db6a4b7e9b WHIRLPOOL 266fee6200009891029e07b232bcb257d523c7626969abf53096435d0e36198dd32771ca54679922ca3dafc6aca420182781c21551bd153421f3b1949d51fd98
 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
 EBUILD phpmyadmin-3.5.3.ebuild 1665 SHA256 adddd61efcef8d9d016ff3ddf1b29b9f6b8a5106bf9099e9efdf92f5dff2957f SHA512 3b338c0c2e8c03f2aefcf84efd79798643ef9bb9238696ea640f758b41779bed9e6f3d38424f79b31a61e8b269487999124449eb96150b7c24b920f7905087f1 WHIRLPOOL 2762606b4615d493ad4579a22f358b3c18880a5c1a23d366800b780681f7a8061ce83aa738d53cd8a9ac3b46318c75b84c89e7c0f0a7d168e6b411da3a6d3516
 EBUILD phpmyadmin-3.5.8.ebuild 1661 SHA256 75093bda3cafb8ef65dc7e34590a0c4a2133b7e81ab27ba1d38c30797b67a46c SHA512 cb7f22d2b25f33d20abd0a5d244cec0ce91acab77989dcc79f3f65f64a2414f15abd4fc76aedfef880f0e99bf929910e3429ad64d6fb23618f13945dd6d5a66a WHIRLPOOL 712b1a402c3e7cc753a9c7aebc362b94ee8eb9b569dab04b8b121ca0581db14d24fd6cc0b7756dfab137219af5466039b1b5813c23fe3c8010a2923837e402a2
 EBUILD phpmyadmin-4.0.5.ebuild 1643 SHA256 fa7d75e068cf68250781c3c57f3af5af86ffd4c155d84b684bb6361f469f8186 SHA512 8fdc23925f59d5f97e722e798c2505358e032829a1756068560fd76e24a062a7534476f7c6d821858a1de6dcbdedbcea2ef84a4e08500482c741214369e9db21 WHIRLPOOL fda1b4b0d498771d87a5b6a008935347ecd1198cface39527c37bcc38ade871ab5af7a9aebe26555aca00fd41940a0bfb1e1545a9966eb58e14fdf1456ea58f4
-MISC ChangeLog 66987 SHA256 1fbaa2f35f3a75c6ee26064bd3b6deaa4a7cdbcc8a621a7b037b25ec2f17022a SHA512 41ada60290687bc9669ebaa8dcef5ca3f032bbdab0dda4960032d14f077eb7ff4c32c8ce209545574cb2f1cf4870dcab90a943584b6bc122a40798bdbd8a3bd8 WHIRLPOOL d05e68438ae6ab76c3c6d1b6f1041b8abd350bb1a73dc05e9de1381b171b9ed000067a3d77b29cb394a067103ccefd21ceec8f16f5deddca6a54b5096072a8b2
+EBUILD phpmyadmin-4.0.6.ebuild 1654 SHA256 7d4befd1656f5dc8495bb9d0f98fc38c7161340b130fc3e7017e3eddf10d99b3 SHA512 e726a1284bd3a84128d2ea8e099371547238627218233ecd28f825dde6df858786eb00afe728fac1e7e56b05c545a0008c541a25a77f580b6b4ef13c74d4b0ec WHIRLPOOL 960d6382c1032e1c8fa8bab6f2d4d0cd70bb089bc2538bab4b12d3d513938e73aad0bafb138f6d4f5ba1f7473fad5951767d751c579670323dafba59677816c9
+MISC ChangeLog 67108 SHA256 4bd9825a86c53f5c8d6e81e7352803184086c4a35f1472d357fb0b8124383ce2 SHA512 a2914ecf7ae1a90153a781160492d43336c7c711881b684f7c302af6168f6dce411bccefff18ea6c70ae5ca0c4a208e1e9618a87f19db39660cedba03dd11ef1 WHIRLPOOL d788aff3f52471ba5fa5c9036129c49abdd156ec85dd3708fc873d29c5d56a2566fd17ca517495975bfaa78349ff455a7bf31411b071d857549982046f6c390b
 MISC metadata.xml 497 SHA256 273736b7bcd027c8c569f9d8bfb3ee9e05fdfdb043e679133dea0fd13e39d06a SHA512 2a03834ac7f170aebaaf2fa0e4335b7062fa6e4d4c0fbd728bd9b63c5e948c65a3534b503b0648648fc5b1ff92dcfee505b984ad36f2ce20b9c3d3b249beb117 WHIRLPOOL c32e6a014145a5320b34f8fba3bd1884b62abc0b7f2b4dda18ce5adc71cfa2d42290cd65da4cbef5e1fdbd92716e88fe86832a159c2b1d32140e13050d50e862
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iQIcBAEBCgAGBQJSGKfHAAoJELp701BxlEWfI/4QALBNyepLfcIwEX2kaZln/1zd
-hsud+CNQR5Xt+ICsLqZuWiyp3D4lai+caTKLHT7EMeW6dOwFIpaceM1UOZBYegKM
-R5CFa9yOlq1RUvoqGQpORevPMtovLWdLA0rRFPweWGvHva+YTj44t/i1yGhnhQus
-if0aOcRs1WncRrZJf1zRbaoYp7xU1ofxbQO+WotXeHAuDIi0IX3B0hOH9EaDZYYH
-pRdGQNLI5qfwOllUjJEp9DeHlVyvxgi+kB95ukjLaNjB1/E/9ohxNTIs73aGaRhN
-l087dHxwmEYaLIpUXd0bFN3vzuypNf7fcPjOZJ7qNMxZ0eecmgHMafwKegO69keH
-Q2JDITvZT5K4eAosClN0UTyZAOoDB8zjkQvDzIc2R+yMz7YvJ34oIjCNiiB/adSt
-VmWFR364PmMQbFK+ESvbw3famd9q22bYwiDWlIYIOg7MzHhXaT9cxRMajSDA0ccy
-RbInJzuozCIjllIHv4gNCxVnXnL1E5XNaCfLB+1LPZfUQxhLFOZcnf1g61Bes/te
-XR9SNQ5Hz3QcIC1Ay8eieihXA8yzxTd0x9heKDd3f4JXVs9mk0I4ZSEOn4axD4gY
-Eb8vFR670l8I6fdy8fmFllXsM3SaO5Mse6si4DFQOijR/zFC8AHNETnM0zzBptxK
-6kUu38KxDhXZsilQVr6j
-=np/I
------END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.0.6.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.0.6.ebuild
new file mode 100644
index 000000000000..964b8dfe2dc1
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-4.0.6.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $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 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.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="setup"
+
+RDEPEND="
+	dev-lang/php[crypt,ctype,filter,json,session,unicode]
+	|| (
+		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 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 "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."
+		elog "It regularly is the target of various exploits."
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
+	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
+	webapp_src_install
+}