Version bump

(Portage version: 2.0.51.22-r2)

7 files changed, 150 insertions, 84 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 61a1d70da2cc..c40f9baaaef4 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,13 @@
 # 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.138 2005/10/24 21:48:26 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.139 2005/11/09 19:10:18 rl03 Exp $
+
+*phpmyadmin-2.7.0_beta1 (09 Nov 2005)
+
+  09 Nov 2005; Renat Lumpau <rl03@gentoo.org>
+  +files/config.default.php-2.7.0.patch, -files/phpmyadmin-config.patch,
+  phpmyadmin-2.6.4_p3.ebuild, +phpmyadmin-2.7.0_beta1.ebuild:
+  Version bump
 
   24 Oct 2005; Renat Lumpau <rl03@gentoo.org> -phpmyadmin-2.6.4.ebuild,
   -phpmyadmin-2.6.4_p1.ebuild, -phpmyadmin-2.6.4_p2.ebuild:
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 407178b726f8..73d7a267649f 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,19 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ec5564ec2db64c22ce9ce029047245c2 phpmyadmin-2.6.4_p3.ebuild 2095
+MD5 2a2b0f63d85bbff64d4bcfe2c86aef0a phpmyadmin-2.7.0_beta1.ebuild 2061
+MD5 adc0249f60923c956ebf2e203a59021f phpmyadmin-2.6.4_p3.ebuild 2095
 MD5 ce6e1f87320365b41c8937359b28a9a0 ChangeLog 19199
 MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
 MD5 0fb913f47fa22640fc0df136df21818c files/digest-phpmyadmin-2.6.4_p3 74
+MD5 0cd8fc0cfff0431b90baeaa43ab92365 files/digest-phpmyadmin-2.7.0_beta1 76
+MD5 ab6e8b5ecc163d415aebb7d2c42238a3 files/config.default.php-2.7.0.patch 5533
 MD5 c9eb06723752a2bcafd88c3164e83ea2 files/postinstall-en.txt 593
 MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525
 MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857
 MD5 a7201a857705dfcec9502fc7dd3a96db files/reconfig 315
 MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDXVa5EzitwsaoONoRArIkAKCS3HJ8ytLhLV7DYmjkRkgb+BiwMwCg1SCz
-d3B/cRIpVlTz2yaG5os56Uw=
-=+Gav
------END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/files/config.default.php-2.7.0.patch b/dev-db/phpmyadmin/files/config.default.php-2.7.0.patch
new file mode 100644
index 000000000000..e6af179c158c
--- /dev/null
+++ b/dev-db/phpmyadmin/files/config.default.php-2.7.0.patch
@@ -0,0 +1,66 @@
+--- config.default.php.org	2003-12-02 21:59:24.000000000 +0000
++++ 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_beta1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.7.0_beta1
new file mode 100644
index 000000000000..c59c2f2b5c64
--- /dev/null
+++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.7.0_beta1
@@ -0,0 +1 @@
+MD5 f237b7921c06b990d4c436ea73dc3a9b phpMyAdmin-2.7.0-beta1.tar.bz2 1921812
diff --git a/dev-db/phpmyadmin/files/phpmyadmin-config.patch b/dev-db/phpmyadmin/files/phpmyadmin-config.patch
deleted file mode 100644
index 081603b47bb2..000000000000
--- a/dev-db/phpmyadmin/files/phpmyadmin-config.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- phpMyAdmin-2.4.0/config.inc.php	2003-02-23 21:05:16.000000000 +0000
-+++ phpMyAdmin/config.inc.php	2003-03-26 13:50:05.000000000 +0000
-@@ -36,7 +36,7 @@
-  * If the auto-detection code does work properly, you can set to TRUE the
-  * $cfg['PmaAbsoluteUri_DisableWarning'] variable below.
-  */
--$cfg['PmaAbsoluteUri'] = '';
-+$cfg['PmaAbsoluteUri'] = 'http://localhost/phpmyadmin/';
- 
- 
- /**
-@@ -44,7 +44,7 @@
-  * You should use this if and ONLY if the PmaAbsoluteUri auto-detection
-  * works perfectly.
-  */
--$cfg['PmaAbsoluteUri_DisableWarning'] = FALSE;
-+$cfg['PmaAbsoluteUri_DisableWarning'] = TRUE;
- 
- /**
-  * Disable the default warning that is displayed on the DB Details Structure page if
-@@ -66,11 +66,12 @@
- $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']                  // access to the "mysql/user"
-                                                     // and "mysql/db" tables)
--$cfg['Servers'][$i]['auth_type']     = 'config';    // Authentication method (config, http or cookie based)?
-+                                     = '@pmapass@';
-+$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)
-@@ -81,19 +82,25 @@
-                                                     // of db-names
- $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
-                                                     // - leave blank for no support
--$cfg['Servers'][$i]['bookmarktable'] = '';          // Bookmark table - leave blank for no bookmark support
--$cfg['Servers'][$i]['relation']      = '';          // table to describe the relation between links (see doc)
-+$cfg['Servers'][$i]['bookmarktable']                // Bookmark table - leave blank for no bookmark support
-+                                     = 'PMA_bookmark';
-+$cfg['Servers'][$i]['relation']                     // table to describe the relation between links (see doc)
-                                                     //   - leave blank for no relation-links support
--$cfg['Servers'][$i]['table_info']    = '';          // table to describe the display fields
-+                                     = 'PMA_relation';
-+$cfg['Servers'][$i]['table_info']                   // table to describe the display fields
-                                                     //   - leave blank for no display fields support
--$cfg['Servers'][$i]['table_coords']  = '';          // table to describe the tables position for the PDF
-+                                     = 'PMA_table_info';
-+$cfg['Servers'][$i]['table_coords']                 // table to describe the tables position for the PDF
-                                                     //   schema - leave blank for no PDF schema support
--$cfg['Servers'][$i]['pdf_pages']     = '';          // table to describe pages of relationpdf
-+                                     = 'PMA_table_coords';
-+$cfg['Servers'][$i]['pdf_pages']                    // table to describe pages of relationpdf
-                                                     // - leave blank if you don't want to use this
-+                                     = 'PMA_pdf_pages';
- $cfg['Servers'][$i]['column_comments']              // table to store columncomments
--                                     = '';          // - leave blank if you don't want to use this
-+                                                    // - leave blank if you don't want to use this
-+                                     = 'PMA_column_comments';
- $cfg['Servers'][$i]['AllowDeny']['order']           // Host authentication order, leave blank to not use
-                                      = '';
- $cfg['Servers'][$i]['AllowDeny']['rules']           // Host authentication rules, leave blank for defaults
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.6.4_p3.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.6.4_p3.ebuild
index 8d2eb98c668d..e38339feb2e4 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.6.4_p3.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.6.4_p3.ebuild
@@ -1,6 +1,6 @@
 # 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.4_p3.ebuild,v 1.6 2005/10/24 19:52:07 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.6.4_p3.ebuild,v 1.7 2005/11/09 19:10:18 rl03 Exp $
 
 inherit eutils webapp
 
@@ -39,7 +39,7 @@ src_compile() {
 src_install() {
 	webapp_src_preinst
 
-	local docs="CREDITS ChangeLog Documentation.txt INSTALL README RELEASE-DATE-${MY_PV} TODO"
+	local docs="CREDITS Documentation.txt INSTALL README RELEASE-DATE-${MY_PV} TODO"
 
 	# install the SQL scripts available to us
 	#
@@ -48,7 +48,7 @@ src_install() {
 
 	webapp_sqlscript mysql ${T}/mysql-setup.sql
 
-	dodoc ${docs}
+	dodoc ${docs} ChangeLog
 	dohtml Documentation.html
 
 	# Copy the app's main files
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.7.0_beta1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.7.0_beta1.ebuild
new file mode 100644
index 000000000000..bbd898304b3c
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-2.7.0_beta1.ebuild
@@ -0,0 +1,68 @@
+# 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.7.0_beta1.ebuild,v 1.1 2005/11/09 19:10:18 rl03 Exp $
+
+inherit eutils webapp
+
+MY_PV=${PV/_beta/-beta}
+MY_P=phpMyAdmin-${MY_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 ~amd64 ~hppa ~mips ~ppc ~sparc x86"
+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.default.php-2.7.0.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.default.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 Documentation.txt INSTALL README RELEASE-DATE-${MY_PV} TODO ChangeLog"
+
+	# 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} ChangeLog
+	dohtml Documentation.html
+
+	# Copy the app's main files
+
+	einfo "Installing main files"
+	cp -r . ${D}${MY_HTDOCSDIR}
+
+	webapp_configfile ${MY_HTDOCSDIR}/config.default.php
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+	webapp_hook_script ${FILESDIR}/reconfig
+	webapp_src_install
+
+	fperms 0640 ${MY_HTDOCSDIR}/config.default.php
+	fowners root:apache ${MY_HTDOCSDIR}/config.default.php
+	# bug #88831, make sure the create script is world-readable.
+	fperms 0600 ${MY_SQLSCRIPTSDIR}/mysql/${PVR}_create.sql
+}