Version bump, bug #89658.

(Portage version: 2.0.51.19)

5 files changed, 101 insertions, 8 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 5077c8cf1bfd..cdd57cd9dec4 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.101 2005/04/09 11:13:18 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.102 2005/04/19 17:31:04 beu Exp $
+
+*phpmyadmin-2.6.2 (19 Apr 2005)
+
+  19 Apr 2005; Elfyn McBratney <beu@gentoo.org> files/postinstall-en.txt,
+  +phpmyadmin-2.6.2.ebuild:
+  Version bump, bug #89658.
 
   09 Apr 2005; Simon Stelling <blubb@gentoo.org>
   phpmyadmin-2.6.2_rc1.ebuild:
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 7450a1062361..35dcf30f7447 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,11 +1,13 @@
-MD5 5d8471c56e70073ff540a780cc91d9d1 ChangeLog 14242
 MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
+MD5 5d8471c56e70073ff540a780cc91d9d1 ChangeLog 14242
 MD5 be80e52ff2f5bf4da91c8eb07716f050 phpmyadmin-2.6.1_p2-r1.ebuild 2475
 MD5 0101bf56e2017374f01c58dec71fca8f phpmyadmin-2.6.2_rc1.ebuild 2390
-MD5 4c95d31af8becb428be471fcedf664a4 files/2.6.1_p2-no-wildcard-privs-for-you.patch 3731
+MD5 9f2bfdf054b51b0e01f6d067f2e1a364 phpmyadmin-2.6.2.ebuild 2345
+MD5 182411f504d40f317a802da58ec5e176 files/digest-phpmyadmin-2.6.2 70
+MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857
+MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231
+MD5 56dcb2efb84915a521c18a004f96d37c files/postinstall-en.txt 506
 MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525
 MD5 278c189dfbc22e4f95fcb1f2c8a7622a files/digest-phpmyadmin-2.6.2_rc1 74
+MD5 4c95d31af8becb428be471fcedf664a4 files/2.6.1_p2-no-wildcard-privs-for-you.patch 3731
 MD5 22a63a92c01eef5a268311e15594367b files/digest-phpmyadmin-2.6.1_p2-r1 74
-MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231
-MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857
-MD5 56dcb2efb84915a521c18a004f96d37c files/postinstall-en.txt 506
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.2 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.2
new file mode 100644
index 000000000000..148c15bd4d2d
--- /dev/null
+++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.2
@@ -0,0 +1 @@
+MD5 7fc8cf4e7f9a84d725b159176e0621e1 phpMyAdmin-2.6.2.tar.bz2 1645396
diff --git a/dev-db/phpmyadmin/files/postinstall-en.txt b/dev-db/phpmyadmin/files/postinstall-en.txt
index 4bd19f01b20d..1e48e7659320 100644
--- a/dev-db/phpmyadmin/files/postinstall-en.txt
+++ b/dev-db/phpmyadmin/files/postinstall-en.txt
@@ -2,8 +2,6 @@ To complete installation, you must
 
 1. Update MySQL's grant tables and the pmadb database:
      mysql -u root -p < ${MY_SQLSCRIPTSDIR}/mysql/${PVR}_create.sql
-2. Reload MySQL:
-     /etc/init.d/mysql restart
 
 If you are upgrading from an earlier version and are using phpMyAdmin's
 features for master/foreign tables be sure to read
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.6.2.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.6.2.ebuild
new file mode 100644
index 000000000000..eb7e1609a369
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-2.6.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.6.2.ebuild,v 1.1 2005/04/19 17:31:04 beu Exp $
+
+inherit eutils webapp
+
+MY_P=phpMyAdmin-${PV}
+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 ~ppc ~hppa ~sparc ~x86 ~amd64 ~mips"
+IUSE=""
+DEPEND=">=dev-db/mysql-3.23.32 <dev-db/mysql-5.1
+	virtual/httpd-php
+	sys-apps/findutils
+	!<=dev-db/phpmyadmin-2.5.6"
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/config.inc.php-2.5.6.patch
+
+	# Remove .cvs* files and CVS directories
+	find ${S} -name .cvs\* -or \( -type d -name CVS -prune \) | xargs rm -rf
+
+	sed -e "s:\${MY_SQLSCRIPTSDIR}:${MY_SQLSCRIPTSDIR}:" \
+		-e "s:\${PVR}:${PVR}:" \
+		${FILESDIR}/postinstall-en.txt > ${WORKDIR}/postinstall-en.txt
+}
+
+src_compile() {
+	einfo "Setting random user/password details for the controluser"
+
+	local pmapass="${RANDOM}${RANDOM}${RANDOM}${RANDOM}"
+	mv config.inc.php ${T}/config.inc.php
+	sed -e "s/@pmapass@/${pmapass}/g" \
+		${T}/config.inc.php > config.inc.php
+	sed -e "s/@pmapass@/${pmapass}/g" \
+		${FILESDIR}/mysql-setup.sql.in-2.5.6 > ${T}/mysql-setup.sql
+}
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="ANNOUNCE.txt CREDITS Documentation.txt RELEASE-DATE-${PV} TODO ChangeLog LICENSE README"
+
+	# install the SQL scripts available to us
+	#
+	# unfortunately, we do not have scripts to upgrade from older versions
+	# these are things we need to add at a later date
+
+	webapp_sqlscript mysql ${T}/mysql-setup.sql
+
+	# handle documentation files
+	#
+	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
+	# get installed per vhost!
+
+	dodoc ${docs}
+	for doc in ${docs} INSTALL; do
+		rm -f ${doc}
+	done
+
+	# Copy the app's main files
+
+	einfo "Installing main files"
+	cp -r . ${D}${MY_HTDOCSDIR}
+
+	# Identify the configuration files that this app uses
+
+	webapp_configfile ${MY_HTDOCSDIR}/config.inc.php
+
+	# there are no files which need to be owned by the web server
+
+	# add the post-installation instructions
+
+	webapp_postinst_txt en ${WORKDIR}/postinstall-en.txt
+
+	# all done
+	#
+	# now we let the eclass strut its stuff ;-)
+
+	webapp_src_install
+}