Fixed bug #121815. Dropped ~mips, please see bug #122963.

(Portage version: 2.1_pre4-r1)

6 files changed, 105 insertions, 0 deletions

diff --git a/dev-db/phpmyadmin/files/config.default.php-2.8.0.patch b/dev-db/phpmyadmin/files/config.default.php-2.8.0.patch
new file mode 100644
index 000000000000..8a199a23b041
--- /dev/null
+++ b/dev-db/phpmyadmin/files/config.default.php-2.8.0.patch
@@ -0,0 +1,66 @@
+--- libraries/config.default.php.org	2003-12-02 21:59:24.000000000 +0000
++++ libraries/config.default.php	2003-12-29 01:09:58.000000000 +0000
+@@ -72,14 +72,15 @@
+ $cfg['Servers'][$i]['connect_type']  = 'tcp';       // How to connect to MySQL server ('tcp' or 'socket')
+ $cfg['Servers'][$i]['compress']      = FALSE;       // Use compressed protocol for the MySQL connection
+                                                     // (requires PHP >= 4.3.0)
+-$cfg['Servers'][$i]['controluser']   = '';          // MySQL control user settings
++$cfg['Servers'][$i]['controluser']   = 'pma';       // MySQL control user settings
+                                                     // (this user must have read-only
+-$cfg['Servers'][$i]['controlpass']   = '';          // access to the "mysql/user"
++$cfg['Servers'][$i]['controlpass']   = '@pmapass@';
++                                                    // access to the "mysql/user"
+                                                     // and "mysql/db" tables).
+                                                     // The controluser is also
+                                                     // used for all relational
+                                                     // features (pmadb)
+-$cfg['Servers'][$i]['auth_type']     = 'config';    // Authentication method (config, http or cookie based)?
++$cfg['Servers'][$i]['auth_type']     = 'http';      // Authentication method (config, http or cookie based)?
+ $cfg['Servers'][$i]['user']          = 'root';      // MySQL user
+ $cfg['Servers'][$i]['password']      = '';          // MySQL password (only needed
+                                                     // with 'config' auth_type)
+@@ -88,29 +89,36 @@
+                                                     // It may also be an array of db-names, where sorting order is relevant.
+ $cfg['Servers'][$i]['verbose']       = '';          // Verbose name for this host - leave blank to show the hostname
+ 
+-$cfg['Servers'][$i]['pmadb']         = '';          // Database used for Relation, Bookmark and PDF Features
++$cfg['Servers'][$i]['pmadb']         = 'pmadb';     // Database used for Relation, Bookmark and PDF Features
+                                                     // (see scripts/create_tables.sql)
+                                                     //   - leave blank for no support
+                                                     //     DEFAULT: 'phpmyadmin'
+-$cfg['Servers'][$i]['bookmarktable'] = '';          // Bookmark table
++$cfg['Servers'][$i]['bookmarktable'] = 'PMA_bookmark';
++                                                    // Bookmark table
+                                                     //   - leave blank for no bookmark support
+                                                     //     DEFAULT: 'pma_bookmark'
+-$cfg['Servers'][$i]['relation']      = '';          // table to describe the relation between links (see doc)
++$cfg['Servers'][$i]['relation']      = 'PMA_relation';
++                                                    // table to describe the relation between links (see doc)
+                                                     //   - leave blank for no relation-links support
+                                                     //     DEFAULT: 'pma_relation'
+-$cfg['Servers'][$i]['table_info']    = '';          // table to describe the display fields
++$cfg['Servers'][$i]['table_info']    = 'PMA_table_info';
++                                                    // table to describe the display fields
+                                                     //   - leave blank for no display fields support
+                                                     //     DEFAULT: 'pma_table_info'
+-$cfg['Servers'][$i]['table_coords']  = '';          // table to describe the tables position for the PDF schema
++$cfg['Servers'][$i]['table_coords']  = 'PMA_table_coords';
++                                                    // table to describe the tables position for the PDF schema
+                                                     //   - leave blank for no PDF schema support
+                                                     //     DEFAULT: 'pma_table_coords'
+-$cfg['Servers'][$i]['pdf_pages']     = '';          // table to describe pages of relationpdf
++$cfg['Servers'][$i]['pdf_pages']     = 'PMA_pdf_pages';
++                                                    // table to describe pages of relationpdf
+                                                     //   - leave blank if you don't want to use this
+                                                     //     DEFAULT: 'pma_pdf_pages'
+-$cfg['Servers'][$i]['column_info']   = '';          // table to store column information
++$cfg['Servers'][$i]['column_info']   = 'PMA_column_info';
++                                                    // table to store column information
+                                                     //   - leave blank for no column comments/mime types
+                                                     //     DEFAULT: 'pma_column_info'
+-$cfg['Servers'][$i]['history']       = '';          // table to store SQL history
++$cfg['Servers'][$i]['history']       = 'PMA_history';
++                                                    // table to store SQL history
+                                                     //   - leave blank for no SQL query history
+                                                     //     DEFAULT: 'pma_history'
+ $cfg['Servers'][$i]['verbose_check'] = TRUE;        // set to FALSE if you know that your pma_* tables
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.7.0_p1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.7.0_p1
index 230e213f3463..d7b3b86f9247 100644
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.7.0_p1
+++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.7.0_p1
@@ -1 +1,3 @@
 MD5 39bfebd35f9a2de03504812df173f27d phpMyAdmin-2.7.0-pl1.tar.bz2 1962675
+RMD160 beca913be2a139f87e65a8798b9f3378e224d9ec phpMyAdmin-2.7.0-pl1.tar.bz2 1962675
+SHA256 0d324fd68f186b04f69ed46eb6b74577fff4f0d015dca75edcd8e089a9366865 phpMyAdmin-2.7.0-pl1.tar.bz2 1962675
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.7.0_p2 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.7.0_p2
index 0d4f1efae279..b75f3e10b2db 100644
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.7.0_p2
+++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.7.0_p2
@@ -1 +1,3 @@
 MD5 19a46b06254276f4e7c3803ea2d9b335 phpMyAdmin-2.7.0-pl2.tar.bz2 1968200
+RMD160 52746f657c3d41a1839a515856710f9825714c2d phpMyAdmin-2.7.0-pl2.tar.bz2 1968200
+SHA256 19ba6032a266cc74866d1cc5bd5d196f5b14b092b515485faad405e3c8ea2cd4 phpMyAdmin-2.7.0-pl2.tar.bz2 1968200
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.0_beta1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.0_beta1
new file mode 100644
index 000000000000..7d4a9aba2e5d
--- /dev/null
+++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.0_beta1
@@ -0,0 +1,3 @@
+MD5 467bf74272791ddf9be1a2bec0e6995a phpMyAdmin-2.8.0-beta1.tar.bz2 1999891
+RMD160 982927a4b68dc8a530aef2907da53ed9efa3abc4 phpMyAdmin-2.8.0-beta1.tar.bz2 1999891
+SHA256 c66e7902d8dd0f5025fc925f15459d628eff78db4d5c49b1491a5f3b50d990b0 phpMyAdmin-2.8.0-beta1.tar.bz2 1999891
diff --git a/dev-db/phpmyadmin/files/postinstall-en-2.8.0.txt b/dev-db/phpmyadmin/files/postinstall-en-2.8.0.txt
new file mode 100644
index 000000000000..fb0e92ef5137
--- /dev/null
+++ b/dev-db/phpmyadmin/files/postinstall-en-2.8.0.txt
@@ -0,0 +1,16 @@
+0. Update MySQL's grant tables and the pmadb database:
+     mysql -u root -p < /usr/share/webapps/phpmyadmin/${PVR}/sqlscripts/mysql/${PVR}_create.sql
+
+1. Create the file config.inc.php. You can use the web-based installer:
+   http://${VHOST_HOSTNAME}${VHOST_APPDIR}/scripts/setup.php
+   Alternatively, use the default config file in libraries/config.default.php
+
+2. Be sure that the libraries/ directory is not visible. You can use the
+provided .htaccess file.
+
+===============
+
+If you are upgrading from an earlier version and are using phpMyAdmin's
+features for master/foreign tables be sure to read
+  http://${VHOST_HOSTNAME}${VHOST_APPDIR}/Documentation.html#col_com
+You will need to perform the ALTER TABLE step yourself.
diff --git a/dev-db/phpmyadmin/files/reconfig-2.8 b/dev-db/phpmyadmin/files/reconfig-2.8
new file mode 100644
index 000000000000..a73d90f088bf
--- /dev/null
+++ b/dev-db/phpmyadmin/files/reconfig-2.8
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+die() {
+	echo "#####"
+	echo $1
+	echo "#####"
+	exit 1
+}
+
+if [ $1 = "install" ]; then
+	cd ${MY_INSTALLDIR}/libraries
+	sed -e "s|\$cfg\['PmaAbsoluteUri'\] = '';|\$cfg\['PmaAbsoluteUri'\] = 'http://${VHOST_HOSTNAME}/${VHOST_APPDIR}';|g" -i config.default.php || die "sed failed"
+
+elif [ $1 = "clean" ]; then
+	echo $1
+fi