Version bump (#94059). Update-related clean-up (#83614, #67859).

(Portage version: 2.0.51.22-r1)

7 files changed, 93 insertions, 80 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 14fecceeb05e..f6ecc0c4fccb 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.110 2005/05/03 00:56:46 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.111 2005/07/06 18:31:27 rl03 Exp $
+
+*phpmyadmin-2.6.3_p1 (06 Jul 2005)
+
+  06 Jul 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  +files/reconfig, +phpmyadmin-2.6.3_p1.ebuild:
+  Version bump (#94059). Update-related clean-up (#83614, #67859).
 
 *phpmyadmin-2.6.2-r2 (03 May 2005)
 
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 4a604bd2acd2..9b3bd6777832 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 8ef71f163ff800db7fab9cb7570e87eb phpmyadmin-2.6.3_p1.ebuild 2063
 MD5 0101bf56e2017374f01c58dec71fca8f phpmyadmin-2.6.2_rc1.ebuild 2390
 MD5 48f714785bc74b5b0ef3adb1f39421c0 phpmyadmin-2.6.2-r2.ebuild 2563
-MD5 cbfeaf1f5f7f932a2d239e5a16feb482 ChangeLog 15630
+MD5 8e56ee7b1472f93e3cd51513aa37742e ChangeLog 15854
 MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
 MD5 182411f504d40f317a802da58ec5e176 files/digest-phpmyadmin-2.6.2-r2 70
+MD5 f2b2abcad19bc7efa598ba903d93b9e8 files/digest-phpmyadmin-2.6.3_p1 74
 MD5 278c189dfbc22e4f95fcb1f2c8a7622a files/digest-phpmyadmin-2.6.2_rc1 74
-MD5 f7405589420f250cead2a0d7d3855164 files/postinstall-en.txt 458
+MD5 e4c31663a88574914c487cef87c7f1d7 files/postinstall-en.txt 514
 MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525
 MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857
-MD5 4c95d31af8becb428be471fcedf664a4 files/2.6.1_p2-no-wildcard-privs-for-you.patch 3731
+MD5 3390cfd570ec54f3fc29ccdca0449900 files/reconfig 239
 MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCdsxdEZCkKN40op4RAlS3AJwPPBEr8FHJScR4x8hHNlbfGv3qnQCdEl2n
-CuSGYoFYIMcUHr7V2EJaIxU=
-=kGI9
------END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/files/2.6.1_p2-no-wildcard-privs-for-you.patch b/dev-db/phpmyadmin/files/2.6.1_p2-no-wildcard-privs-for-you.patch
deleted file mode 100644
index fafe170fb488..000000000000
--- a/dev-db/phpmyadmin/files/2.6.1_p2-no-wildcard-privs-for-you.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --exclude='*~' -urN phpMyAdmin-2.6.1-pl2.orig/server_privileges.php phpMyAdmin-2.6.1-pl2/server_privileges.php
---- phpMyAdmin-2.6.1-pl2.orig/server_privileges.php	2005-03-02 12:54:10.528575299 -0500
-+++ phpMyAdmin-2.6.1-pl2/server_privileges.php	2005-03-02 12:55:47.977465714 -0500
-@@ -490,6 +490,22 @@
-        . (empty($thishost) ? '' : 'else if (this.value == \'thishost\') { hostname.value = \'' . addslashes(htmlspecialchars($thishost)) . '\'; } ')
-        . 'else if (this.value == \'hosttable\') { hostname.value = \'\'; } else if (this.value == \'userdefined\') { hostname.focus(); hostname.select(); }">' . "\n";
-     unset($row);
-+
-+    // when we start editing a user, $GLOBALS['pred_hostname'] is not defined
-+    if (!isset($GLOBALS['pred_hostname']) && isset($GLOBALS['hostname'])) {
-+        switch (strtolower($GLOBALS['hostname'])) {
-+            case 'localhost':
-+            case '127.0.0.1':
-+                $GLOBALS['pred_hostname'] = 'localhost';
-+                break;
-+            case '%':
-+                $GLOBALS['pred_hostname'] = 'any';
-+                break;
-+            default:
-+                $GLOBALS['pred_hostname'] = 'userdefined';
-+                break;
-+        }        
-+    }
-     echo $spaces . '            <option value="any"' . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'any') ? ' selected="selected"' : '') . '>' . $GLOBALS['strAnyHost'] . '</option>' . "\n"
-        . $spaces . '            <option value="localhost"' . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'localhost') ? ' selected="selected"' : '') . '>' . $GLOBALS['strLocalhost'] . '</option>' . "\n";
-     if (!empty($thishost)) {
-@@ -713,18 +729,33 @@
-     // escaping a wildcard character in a GRANT is only accepted at the global
-     // or database level, not at table level; this is why I remove
-     // the escaping character
--    // Note: in the Database-specific privileges, we will have for example
-+    // Note: in the phpMyAdmin list of Database-specific privileges,
-+    //  we will have for example
-     //  test\_db  SELECT (this one is for privileges on a db level)
-     //  test_db   USAGE  (this one is for table-specific privileges)
-     //
--    // It looks curious but reflects IMO the way MySQL works
-+    // It looks curious but reflects the way MySQL works
-+
-+    if (empty($dbname)) {
-+        $db_and_table = '*.*';
-+    } else {
-+        if (!empty($tablename)) {
-+            $db_and_table = str_replace('\\','',PMA_backquote($dbname))
-+                          . '.' . PMA_backquote($tablename);
-+        } else {
-+            // do not remove the escaping character when working at db level 
-+            $db_and_table = PMA_backquote($dbname)
-+                          . '.*'; 
-+        }
-+    }
-+
- 
--    $db_and_table = empty($dbname) ? '*.*' : str_replace('\\','',PMA_backquote($dbname)) . '.' . (empty($tablename) ? '*' : PMA_backquote($tablename));
-     $sql_query0 = 'REVOKE ALL PRIVILEGES ON ' . $db_and_table . ' FROM \'' . PMA_sqlAddslashes($username) . '\'@\'' . $hostname . '\';';
-     if (!isset($Grant_priv) || $Grant_priv != 'Y') {
-         $sql_query1 = 'REVOKE GRANT OPTION ON ' . $db_and_table . ' FROM \'' . PMA_sqlAddslashes($username) . '\'@\'' . $hostname . '\';';
-     }
-     $sql_query2 = 'GRANT ' . join(', ', PMA_extractPrivInfo()) . ' ON ' . $db_and_table . ' TO \'' . PMA_sqlAddslashes($username) . '\'@\'' . $hostname . '\'';
-+
-     if ((isset($Grant_priv) && $Grant_priv == 'Y') || (empty($dbname) && PMA_MYSQL_INT_VERSION >= 40002 && (isset($max_questions) || isset($max_connections) || isset($max_updates)))) {
-         $sql_query2 .= 'WITH';
-         if (isset($Grant_priv) && $Grant_priv == 'Y') {
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.3_p1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.3_p1
new file mode 100644
index 000000000000..2c2cff6e74bd
--- /dev/null
+++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.3_p1
@@ -0,0 +1 @@
+MD5 28f6c827e99e1c96f6852c441f7e42ef phpMyAdmin-2.6.3-pl1.tar.bz2 1710233
diff --git a/dev-db/phpmyadmin/files/postinstall-en.txt b/dev-db/phpmyadmin/files/postinstall-en.txt
index 1e48e7659320..32e06db5890c 100644
--- a/dev-db/phpmyadmin/files/postinstall-en.txt
+++ b/dev-db/phpmyadmin/files/postinstall-en.txt
@@ -1,11 +1,11 @@
 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
+     mysql -u root -p < /usr/share/webapps/phpmyadmin/VERSION/sqlscripts/mysql/VERSION_create.sql
 
 If you are upgrading from an earlier version and are using phpMyAdmin's
 features for master/foreign tables be sure to read
-  http://localhost/phpmyadmin/Documentation.html#col_com
+  http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/Documentation.html#col_com
 You will need to perform the ALTER TABLE step yourself.
 
-Finally, point your browser to http://localhost/phpmyadmin/.
+Finally, point your browser to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/.
diff --git a/dev-db/phpmyadmin/files/reconfig b/dev-db/phpmyadmin/files/reconfig
new file mode 100644
index 000000000000..56998b47a1f2
--- /dev/null
+++ b/dev-db/phpmyadmin/files/reconfig
@@ -0,0 +1,8 @@
+#!/bin/bash
+if [ $1 = "install" ]; then
+	cd ${MY_INSTALLDIR}
+	sed -e "s|\$cfg\['PmaAbsoluteUri'\] = '';|\$cfg\['PmaAbsoluteUri'\] = 'http://${VHOST_HOSTNAME}${VHOST_APPDIR}';|g" -i config.inc.php
+		
+elif [ $1 = "clean" ]; then
+	echo $1
+fi
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.6.3_p1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.6.3_p1.ebuild
new file mode 100644
index 000000000000..08331fba5e1f
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-2.6.3_p1.ebuild
@@ -0,0 +1,69 @@
+# 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.3_p1.ebuild,v 1.1 2005/07/06 18:31:28 rl03 Exp $
+
+inherit eutils webapp
+
+MY_P=phpMyAdmin-${PV/_p/-pl}
+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
+}
+
+src_compile() {
+	einfo "Setting random user/password details for the controluser"
+
+	local pmapass="${RANDOM}${RANDOM}${RANDOM}${RANDOM}"
+	sed -e "s/@pmapass@/${pmapass}/g" -i 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="CREDITS ChangeLog Documentation.txt INSTALL README RELEASE-DATE-2.6.3-pl1 TODO"
+
+	# 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
+
+	dodoc ${docs}
+
+	# Copy the app's main files
+
+	einfo "Installing main files"
+	cp -r . ${D}${MY_HTDOCSDIR}
+	for doc in ${docs} LICENSE; do
+		rm -f ${D}/${MY_HTDOCSDIR}/${doc}
+	done
+
+	webapp_configfile ${MY_HTDOCSDIR}/config.inc.php
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+	webapp_hook_script ${FILESDIR}/reconfig
+	webapp_src_install
+
+	fperms 0640 ${MY_HTDOCSDIR}/config.inc.php
+	fowners root:apache ${MY_HTDOCSDIR}/config.inc.php
+	# bug #88831, make sure the create script it's world-readable.
+	fperms 0600 ${MY_SQLSCRIPTSDIR}/mysql/${PVR}_create.sql
+}