Version bump

(Portage version: 2.1.2-r10)

5 files changed, 36 insertions, 32 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index b2453bd45765..2dbff6ee5fcc 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.240 2007/02/04 14:57:16 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.241 2007/02/28 13:35:21 rl03 Exp $
+
+*phpmyadmin-2.10.0 (28 Feb 2007)
+
+  28 Feb 2007; Renat Lumpau <rl03@gentoo.org>
+  -files/config.default.php-2.8.0.patch,
+  +files/config.default.php-2.9.10.patch, -phpmyadmin-2.9.2.ebuild,
+  +phpmyadmin-2.10.0.ebuild:
+  Version bump
 
   04 Feb 2007; Renat Lumpau <rl03@gentoo.org> -phpmyadmin-2.9.1.1.ebuild:
   Removed vulnerable version
diff --git a/dev-db/phpmyadmin/files/config.default.php-2.8.0.patch b/dev-db/phpmyadmin/files/config.default.php-2.9.10.patch
index 8a199a23b041..5852d25c1f8b 100644
--- a/dev-db/phpmyadmin/files/config.default.php-2.8.0.patch
+++ b/dev-db/phpmyadmin/files/config.default.php-2.9.10.patch
@@ -1,66 +1,62 @@
---- 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')
+--- libraries/config.default.php	2007-02-28 13:26:55.000000000 +0000
++++ libraries/config.default.php.patched	2007-02-28 13:30:09.000000000 +0000
+@@ -61,14 +61,14 @@ $cfg['Servers'][$i]['connect_type']  = '
+ $cfg['Servers'][$i]['extension']     = 'mysql';     // The php MySQL extension to use ('mysql' or 'mysqli')
  $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
++$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"
++$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]['auth_type']     = 'config';    // Authentication method (valid choices: config, http, HTTP, signon or cookie)
++$cfg['Servers'][$i]['auth_type']     = 'http';    // Authentication method (valid choices: config, http, HTTP, signon or cookie)
  $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.
+@@ -82,32 +82,32 @@ $cfg['Servers'][$i]['only_db']       = '
+ $cfg['Servers'][$i]['hide_db']       = '';          // Database name to be hidden from listings
  $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
++$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
++$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)
++$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
++$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
++$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
++$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
++$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
++$cfg['Servers'][$i]['history']       = 'PMA_history';          // table to store SQL history
                                                      //   - leave blank for no SQL query history
                                                      //     DEFAULT: 'pma_history'
+-$cfg['Servers'][$i]['designer_coords'] = '';        // table to store the coordinates for Designer
++$cfg['Servers'][$i]['designer_coords'] = 'PMA_designer_coords';        // table to store the coordinates for Designer
+                                                     //   - leave blank for no Designer feature
+                                                     //     DEFAULT: 'pma_designer_coords'
  $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.10.0 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.10.0
new file mode 100644
index 000000000000..5d225d661491
--- /dev/null
+++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.10.0
@@ -0,0 +1,3 @@
+MD5 5e203616485ef81ec6a51e0f4ac4da53 phpMyAdmin-2.10.0-all-languages-utf-8-only.tar.bz2 2188767
+RMD160 2f529a3edd56cc808f89742eb1d35244ba9c81c6 phpMyAdmin-2.10.0-all-languages-utf-8-only.tar.bz2 2188767
+SHA256 3d6d469431e7b320189f76906bc9e7a20629486538237fabe0c94c8cc01b0332 phpMyAdmin-2.10.0-all-languages-utf-8-only.tar.bz2 2188767
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.9.2 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.9.2
deleted file mode 100644
index 27395f188f37..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.9.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 aba8f8fe4e69fc49772b22404401bc4a phpMyAdmin-2.9.2-all-languages-utf-8-only.tar.bz2 1546499
-RMD160 9ac84c22f2759363b7710bbe7748bfa01fdf9e9e phpMyAdmin-2.9.2-all-languages-utf-8-only.tar.bz2 1546499
-SHA256 28f8610adff238207dbd09a12e8da33f38b224e2fda3a50902443be2e663b29e phpMyAdmin-2.9.2-all-languages-utf-8-only.tar.bz2 1546499
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.9.2.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.10.0.ebuild
index aa25818f09b2..5ea9077321b0 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.9.2.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.9.2.ebuild,v 1.1 2007/01/22 00:09:33 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.10.0.ebuild,v 1.1 2007/02/28 13:35:21 rl03 Exp $
 
 inherit eutils webapp depend.php
 
@@ -40,7 +40,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/config.default.php-2.9.2.patch
+	epatch ${FILESDIR}/config.default.php-2.9.10.patch
 	# bug 152933
 	cd libraries && epatch ${FILESDIR}/common.lib.php.diff
 	cd ..