Version bumped.

9 files changed, 115 insertions, 151 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index a1e03cd3ef30..18256a4fe782 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.35 2004/02/02 18:15:25 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.36 2004/02/04 11:15:04 mholzer Exp $
+
+*phpmyadmin-2.5.6_rc1 (04 Feb 2004)
+
+  04 Feb 2004; Martin Holzer <mholzer@gentoo.org> phpmyadmin-2.5.6_rc1.ebuild,
+  files/config.inc.php-2.5.6_rc1.patch, files/mysql-setup.sql.in-2.5.6_rc1:
+  Version bumped.
 
   02 Feb 2004; Martin Holzer <mholzer@gentoo.org> phpmyadmin-2.5.5_p1.ebuild:
   Marked stable on all ARCHes.
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index d37bc1ddc86e..02408211a5cf 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,14 +1,12 @@
-MD5 bedbcd1c71f5170235cb4aaed2fe8ce0 ChangeLog 5853
+MD5 2ff60850dc88ea9ee5d22908fa28e254 ChangeLog 6064
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
-MD5 e1aff2b038756a5f845021f8af691455 phpmyadmin-2.5.6_rc1.ebuild 2977
-MD5 30a7e8e1e79fe8d7dba4cf627c913030 phpmyadmin-2.5.5_p1.ebuild 2976
-MD5 069e2c15dc9725b90d0255b042d88489 files/config.inc.php-2.5.4.patch 4826
-MD5 12e8a97118eb6912911e207e72d1a421 files/mysql-setup.sql.in-2.5.4 3230
+MD5 25fb66f03d8c91012a7da1f1ce9dc62a phpmyadmin-2.5.6_rc1.ebuild 2979
+MD5 1c3b53d1a68016bbb67904f64852fb7e phpmyadmin-2.5.5_p1.ebuild 2969
 MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857
 MD5 396133c1da8d8b716ad2da23aa0a5a30 files/phpmyadmin-mysql-setup.sql.in 2712
-MD5 a356cfed6f61c3ab1f1600f63eb67a6b files/config.inc.php-2.5.5.patch 5549
-MD5 12e8a97118eb6912911e207e72d1a421 files/mysql-setup.sql.in-2.5.5 3230
 MD5 c1d7fa926b7ce3c5f2db032ede08217d files/digest-phpmyadmin-2.5.5_p1 74
 MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.5_p1.patch 5525
 MD5 12e8a97118eb6912911e207e72d1a421 files/mysql-setup.sql.in-2.5.5_p1 3230
 MD5 53b6d69a4dd7609b24b4407800557f37 files/digest-phpmyadmin-2.5.6_rc1 74
+MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6_rc1.patch 5525
+MD5 12e8a97118eb6912911e207e72d1a421 files/mysql-setup.sql.in-2.5.6_rc1 3230
diff --git a/dev-db/phpmyadmin/files/config.inc.php-2.5.4.patch b/dev-db/phpmyadmin/files/config.inc.php-2.5.4.patch
deleted file mode 100644
index cf729cde8d9c..000000000000
--- a/dev-db/phpmyadmin/files/config.inc.php-2.5.4.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- phpMyAdmin-2.5.4/config.inc.php	2003-10-18 23:32:01.000000000 +0200
-+++ phpMyAdmin/config.inc.php	2003-10-20 17:29:55.000000000 +0200
-@@ -72,11 +72,11 @@
- $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)
--$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)
-@@ -87,29 +87,29 @@
-                                                     // 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
-                                                     // (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/config.inc.php-2.5.5.patch b/dev-db/phpmyadmin/files/config.inc.php-2.5.6_rc1.patch
index 016ff6a372e3..17ce8c8187fc 100644
--- a/dev-db/phpmyadmin/files/config.inc.php-2.5.5.patch
+++ b/dev-db/phpmyadmin/files/config.inc.php-2.5.6_rc1.patch
@@ -1,5 +1,5 @@
---- phpMyAdmin-2.5.5/config.inc.php	2003-12-02 21:59:24.000000000 +0000
-+++ phpMyAdmin/config.inc.php	2003-12-29 01:09:58.000000000 +0000
+--- config.inc.php.org	2003-12-02 21:59:24.000000000 +0000
++++ config.inc.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
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.6_rc1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.6_rc1
new file mode 100644
index 000000000000..36d80adab454
--- /dev/null
+++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.6_rc1
@@ -0,0 +1 @@
+MD5 a1233c2068c230895fe389b8fcb72e29 phpMyAdmin-2.5.6-rc1.tar.bz2 1107008
diff --git a/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.5 b/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.5
deleted file mode 100644
index 147c07f721b8..000000000000
--- a/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.5
+++ /dev/null
@@ -1,84 +0,0 @@
-GRANT USAGE ON mysql.* TO 'pma'@'localhost' IDENTIFIED BY '@pmapass@';
-
-GRANT SELECT (Host, User, Select_priv, Insert_priv, Update_priv, Delete_priv,
-	Create_priv, Drop_priv, Reload_priv, Shutdown_priv, Process_priv,
-	File_priv, Grant_priv, References_priv, Index_priv, Alter_priv)
-	ON mysql.user TO 'pma'@'localhost';
-
-GRANT SELECT ON mysql.db TO 'pma'@'localhost';
-
-GRANT SELECT (Host, Db, User, Table_name, Table_priv, Column_priv)
-	ON mysql.tables_priv TO 'pma'@'localhost';
-
-GRANT SELECT, INSERT, UPDATE, DELETE ON pmadb.* TO 'pma'@'localhost';
-
-CREATE DATABASE IF NOT EXISTS pmadb;
-USE pmadb;
-
-CREATE TABLE IF NOT EXISTS `PMA_bookmark` (
-	`id` int(11) DEFAULT '0' NOT NULL auto_increment,
-	`dbase` varchar(255) NOT NULL,
-	`user` varchar(255) NOT NULL,
-	`label` varchar(255) NOT NULL,
-	`query` text NOT NULL,
-	PRIMARY KEY (id)
-	) TYPE=MyISAM COMMENT='Bookmarks';
-
-CREATE TABLE IF NOT EXISTS `PMA_relation` (
-	`master_db` varchar(64) NOT NULL default '',
-	`master_table` varchar(64) NOT NULL default '',
-	`master_field` varchar(64) NOT NULL default '',
-	`foreign_db` varchar(64) NOT NULL default '',
-	`foreign_table` varchar(64) NOT NULL default '',
-	`foreign_field` varchar(64) NOT NULL default '',
-	PRIMARY KEY (`master_db`, `master_table`, `master_field`),
-	KEY foreign_field (foreign_db, foreign_table)
-	) TYPE=MyISAM COMMENT='Relation table';
-
-CREATE TABLE IF NOT EXISTS `PMA_table_info` (
-	`db_name` varchar(64) NOT NULL default '',
-	`table_name` varchar(64) NOT NULL default '',
-	`display_field` varchar(64) NOT NULL default '',
-	PRIMARY KEY (`db_name`, `table_name`)
-	) TYPE=MyISAM COMMENT='Table information for phpMyAdmin';
-
-CREATE TABLE IF NOT EXISTS `PMA_table_coords` (
-	`db_name` varchar(64) NOT NULL default '',
-	`table_name` varchar(64) NOT NULL default '',
-	`pdf_page_number` int NOT NULL default '0',
-	`x` float unsigned NOT NULL default '0',
-	`y` float unsigned NOT NULL default '0',
-	PRIMARY KEY (`db_name`, `table_name`, `pdf_page_number`)
-	) TYPE=MyISAM COMMENT='Table coordinates for phpMyAdmin PDF output';
-
-CREATE TABLE IF NOT EXISTS `PMA_pdf_pages` (
-	`db_name` varchar(64) NOT NULL default '',
-	`page_nr` int(10) unsigned NOT NULL auto_increment,
-	`page_descr` varchar(50) NOT NULL default '',
-	PRIMARY KEY (page_nr),
-	KEY (db_name)
-	) TYPE=MyISAM COMMENT='PDF Relationpages for PMA';
-
-CREATE TABLE IF NOT EXISTS `PMA_column_info` (
-	id int(5) unsigned NOT NULL auto_increment,
-	db_name varchar(64) NOT NULL default '',
-	table_name varchar(64) NOT NULL default '',
-	column_name varchar(64) NOT NULL default '',
-	`comment` varchar(255) NOT NULL default '',
-	mimetype varchar(255) NOT NULL default '',
-	transformation varchar(255) NOT NULL default '',
-	transformation_options varchar(255) NOT NULL default '',
-	PRIMARY KEY (id),
-	UNIQUE KEY db_name (db_name, table_name, column_name)
-	) TYPE=MyISAM COMMENT='Comments for Columns';
-
-CREATE TABLE IF NOT EXISTS `PMA_history` (
-	`id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
-	`username` VARCHAR( 64 ) NOT NULL ,
-	`db` VARCHAR( 64 ) NOT NULL ,
-	`table` VARCHAR( 64 ) NOT NULL ,
-	`timevalue` TIMESTAMP NOT NULL ,
-	`sqlquery` TEXT NOT NULL ,
-	PRIMARY KEY ( `id` ) ,
-	INDEX ( `username` , `db` , `table` , `timevalue` )
-	) TYPE=MyISAM COMMENT='SQL history';
diff --git a/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.4 b/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.6_rc1
index 147c07f721b8..147c07f721b8 100644
--- a/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.4
+++ b/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.6_rc1
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.5.5_p1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.5.5_p1.ebuild
index 9ef7dbb193b5..354c468d8a56 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.5.5_p1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.5.5_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.5.5_p1.ebuild,v 1.2 2004/02/02 18:13:13 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.5.5_p1.ebuild,v 1.3 2004/02/04 11:15:04 mholzer Exp $
 
 inherit eutils
 inherit webapp-apache
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~arm ~ppc ~hppa ~mips ~sparc x86 ~amd64"
+KEYWORDS="alpha arm ppc hppa mips sparc x86 amd64"
 DEPEND=">=net-www/apache-1.3
 	>=dev-db/mysql-3.23.32 <dev-db/mysql-5.0
 	>=dev-php/mod_php-4.1
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.5.6_rc1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.5.6_rc1.ebuild
new file mode 100644
index 000000000000..6d240e26636c
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-2.5.6_rc1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.5.6_rc1.ebuild,v 1.1 2004/02/04 11:15:04 mholzer Exp $
+
+inherit eutils
+inherit webapp-apache
+
+MY_P=phpMyAdmin-${PV/_rc/-rc}
+DESCRIPTION="Web-based administration for MySQL database in PHP"
+HOMEPAGE="http://phpmyadmin.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+RESTRICT="nomirror"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~arm ~ppc ~hppa ~mips ~sparc ~x86 ~amd64"
+DEPEND=">=net-www/apache-1.3
+	>=dev-db/mysql-3.23.32 <dev-db/mysql-5.0
+	>=dev-php/mod_php-4.1
+	sys-apps/findutils"
+S=${WORKDIR}/${MY_P}
+
+webapp-detect || NO_WEBSERVER=1
+
+pkg_setup() {
+	webapp-pkg_setup "${NO_WEBSERVER}"
+	einfo "Installing into ${ROOT}${HTTPD_ROOT}."
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/config.inc.php-${PV}.patch
+}
+
+src_compile() {
+	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-${PV} > ${T}/mysql-setup.sql
+}
+
+src_install() {
+	webapp-mkdirs
+
+	local DocumentRoot=${HTTPD_ROOT}
+	local destdir=${DocumentRoot}/phpmyadmin
+	local docs="CREDITS Documentation.txt RELEASE-DATE-* TODO"
+
+	# Copy everything
+	mkdir -p ${D}${destdir}
+	cp -r . ${D}${destdir}
+	# Remove documentation files
+	for doc in ${docs} INSTALL; do
+		rm -f ${D}${destdir}/${doc}
+	done
+	# Remove .cvs* files and CVS directories
+	find ${D}${destdir} -name .cvs\* -or \( -type d -name CVS -prune \) | xargs rm -rf
+	# Fix permissions
+	find ${D}${destdir} -type d | xargs chmod 755
+	find ${D}${destdir} -type f | xargs chmod 644
+
+	dodoc ${docs} ChangeLog LICENSE README
+
+	dosym /etc/phpmyadmin/config.inc.php ${destdir}/config.inc.php
+	insinto /etc/phpmyadmin
+	insopts -g apache -m 640
+	doins config.inc.php
+	doins ${T}/mysql-setup.sql
+
+}
+
+pkg_postinst() {
+	einfo
+	einfo "To complete installation, you must"
+	einfo "1. Update your configuration files:"
+	einfo "     etc-update"
+	einfo "2. Update MySQL's grant tables and the pmadb database:"
+	einfo "     ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
+	einfo "3. Reload MySQL:"
+	einfo "     /etc/init.d/mysql restart"
+	einfo
+	einfo "If you are upgrading from an earlier version and are using phpMyAdmin's"
+	einfo "features for master/foreign tables be sure to read"
+	einfo "  http://localhost/phpmyadmin/Documentation.html#col_com"
+	einfo "You will need to perform the ALTER TABLE step yourself."
+	einfo
+	einfo "Finally, point your browser to http://localhost/phpmyadmin/."
+	einfo
+}
+
+pkg_config() {
+	einfo "This will execute the contents of ${ROOT}etc/phpmyadmin/mysql-setup.sql"
+	einfo "Type in your MySQL root password:"
+	mysql -u root -p < ${ROOT}etc/phpmyadmin/mysql-setup.sql || die
+	einfo "You need to reload MySQL for the changes to take effect"
+}