Version bump, ready for MySQL conference.

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

3 files changed, 74 insertions, 12 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 7361649c56c5..46a4e115f51e 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,11 @@
 # 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.465 2012/01/01 15:15:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.466 2012/04/09 23:50:00 robbat2 Exp $
+
+*phpmyadmin-3.5.0 (09 Apr 2012)
+
+  09 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> +phpmyadmin-3.5.0.ebuild:
+  Version bump, ready for MySQL conference.
 
   01 Jan 2012; Raúl Porcel <armin76@gentoo.org> phpmyadmin-3.4.9.ebuild:
   alpha/sparc/x86 stable wrt #395715
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 91bc4850ea5e..8c6d00d1e65b 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
 EBUILD phpmyadmin-3.4.9.ebuild 1702 RMD160 1b7d0357cf1a2fdded3efda6d50aae9cfdd91e12 SHA1 2cd959ef3cc2b256f8b18ceb6701bfa3bdb68797 SHA256 1d5a7e455f359ecb92255662e43a2e4421cbb8cb5d10427f10e66e62c4bc5a8a
-MISC ChangeLog 62961 RMD160 d2245fa5bc1cfa65d3b86a7d6af96ac99cb98be7 SHA1 feff93ed7879c2f69c160d505fac909ccf757523 SHA256 e1909221cd032f8fd292bd28f40a7b7b5c7dd1d97b1483d45bc3da591de5796c
+EBUILD phpmyadmin-3.5.0.ebuild 1667 RMD160 cfc1ecb12b3e1c89473cb70ad8729fdb70912910 SHA1 168983ae67e9d80583630b433a5d37abd1e58775 SHA256 913d03490a64c6f1ae0a39912054249fe866ec4b81de7f8059427ea9c804849b
+MISC ChangeLog 63118 RMD160 abd44e3a8c59f5da031795087402eb5934304c9c SHA1 adf5d89ce0b971c3a11326caaaadbecc0b5c87b8 SHA256 530508822befb74d9591eb865fbe2f37cd35e82fc28ce7b3d850ffc76eb08280
 MISC metadata.xml 497 RMD160 eaba4b5566af47342cdcd58d660191afe16fd30a SHA1 ded49266c2f95c2b3367e6c56379fffc04410a70 SHA256 273736b7bcd027c8c569f9d8bfb3ee9e05fdfdb043e679133dea0fd13e39d06a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk8AeIgACgkQuQc30/atMkBqqgCcCXQJcYI6Y/OnWt7hRp7GdkZ8
-Im8AoIGbwARbqkhZ2uFGtHIbYzqaXT4/
-=DnyX
------END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/phpmyadmin-3.5.0.ebuild b/dev-db/phpmyadmin/phpmyadmin-3.5.0.ebuild
new file mode 100644
index 000000000000..e928f3fc3f43
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-3.5.0.ebuild
@@ -0,0 +1,65 @@
+# 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.5.0.ebuild,v 1.1 2012/04/09 23:50:00 robbat2 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 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 "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}"
+	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
+}