Version bump and many ebuild improvements

6 files changed, 232 insertions, 7 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index e14d68bb6c6e..abf5915649ea 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,24 +1,25 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.19 2003/05/10 11:29:31 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.20 2003/05/12 22:16:49 twp Exp $
+
+*phpmyadmin-2.5.0 (12 May 2003)
+
+  12 May 2003; Tom Payne <twp@gentoo.org> phpmyadmin-2.5.0.ebuild :
+  Version bump. Ebuild tidy. Improved src_install. Bug # 20874.
 
 *phpmyadmin-2.4.0 (08 Apr 2003)
 
   10 May 2003; Tom Payne <twp@gentoo.org> phpmyadmin-2.4.0.ebuild :
-
   Always install to /home/httpd/htdocs. Bug # 20642.
 
   09 May 2003; Tom Payne <twp@gentoo.org> phpmyadmin-2.4.0.ebuild :
-
   Allow user to override document root with DOCUMENT_ROOT env var. Bug # 20642.
 
   09 Apr 2003; Tom Payne <twp@gentoo.org> phpmyadmin-2.4.0.ebuild :
-
   Dynamically determine DocumentRoot. No bump to ebuild revision number since
   existing users won't see a change.
 
   08 Apr 2003; Tom Payne <twp@gentoo.org> phpmyadmin-2.4.0.ebuild files/phpmyadmin-config.patch files/phpmyadmin-mysql-setup.sql.in :
-
   Version bump.  Improved config file handling (doesn't overwrite on upgrade,
   now stores config file in /etc/phpmyadmin so it is config-protected).  Added
   pkg_config to setup MySQL. Bug # 16521.
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 30d71289e8ce..b774e7eff44c 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,8 +1,8 @@
-MD5 fab05e39a8be50d41394cb5a1b2c5328 ChangeLog 3946
+MD5 2a2d1e80b28e9362227086b110860a91 ChangeLog 3946
 MD5 50116d5aa339dbdbfdec14a907416b36 phpmyadmin-2.3.2-r1.ebuild 1608
 MD5 d89ed894f4f2efad6e88ddcc1bbe4944 phpmyadmin-2.3.3.ebuild 2186
 MD5 b4631be7b7dc1502c754606c64e43acd phpmyadmin-2.4.0.ebuild 2241
-MD5 35681a931d811b1e3236ed57a2a8fa79 phpmyadmin-2.5.0.ebuild 2660
+MD5 b3046fb15ee8ae85ba141b018de68622 phpmyadmin-2.5.0.ebuild 2660
 MD5 0ee9b66e7a73593103df05d91d31dc8d files/digest-phpmyadmin-2.3.2-r1 73
 MD5 fedff25cf01133c5bb8efd8d7f9da56e files/digest-phpmyadmin-2.3.3 76
 MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857
diff --git a/dev-db/phpmyadmin/files/config.inc.php-2.5.0.patch b/dev-db/phpmyadmin/files/config.inc.php-2.5.0.patch
new file mode 100644
index 000000000000..e9fe14beb395
--- /dev/null
+++ b/dev-db/phpmyadmin/files/config.inc.php-2.5.0.patch
@@ -0,0 +1,55 @@
+--- phpMyAdmin-2.5.0/config.inc.php	2003-05-11 11:10:28.000000000 +0100
++++ phpMyAdmin/config.inc.php	2003-05-12 22:18:44.000000000 +0100
+@@ -66,11 +66,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)
+@@ -81,29 +81,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/digest-phpmyadmin-2.5.0 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.0
new file mode 100644
index 000000000000..f08ffc18336f
--- /dev/null
+++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.0
@@ -0,0 +1 @@
+MD5 d64b1e6a630ad8f218196d16c948854e phpMyAdmin-2.5.0-php.tar.bz2 858636
diff --git a/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.0 b/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.0
new file mode 100644
index 000000000000..147c07f721b8
--- /dev/null
+++ b/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.0
@@ -0,0 +1,84 @@
+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/phpmyadmin-2.5.0.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.5.0.ebuild
new file mode 100644
index 000000000000..53a150716f93
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-2.5.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2003 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.0.ebuild,v 1.1 2003/05/12 22:16:49 twp Exp $
+
+inherit eutils
+
+MY_P=phpMyAdmin-${PV}
+DESCRIPTION="Web-based administration for MySQL database in PHP"
+HOMEPAGE="http://phpmyadmin.sourceforge.net/"
+SRC_URI="mirror://sourceforge/phpmyadmin/${MY_P}-php.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~arm ~hppa ~mips ~sparc ~x86"
+DEPEND=">=net-www/apache-1.3
+	>=dev-db/mysql-3.21 <dev-db/mysql-4.1
+	>=dev-php/mod_php-3.0.8
+	sys-apps/findutils"
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/config.inc.php-${PV}.patch
+}
+
+src_compile() {
+	local pmapass="${RANDOM}${RANDOM}${RANDOM}${RANDOM}"
+	mv config.inc.php config.inc.php.orig
+	sed -e "s/@pmapass@/${pmapass}/g" \
+		config.inc.php.orig > config.inc.php
+	sed -e "s/@pmapass@/${pmapass}/g" \
+		${FILESDIR}/mysql-setup.sql.in-${PV} > mysql-setup.sql
+}
+
+src_install() {
+
+	local DocumentRoot=/home/httpd/htdocs
+	local destdir=${DocumentRoot}/phpmyadmin
+	local docs="ANNOUNCE.txt CREDITS Documentation.txt README RELEASE-DATE-${PV} TODO"
+
+	# Copy everything
+	mkdir -p ${D}${destdir}
+	cp -r . ${D}${destdir}
+	# Remove documentation files
+	for doc in ${docs} INSTALL LICENSE; 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
+
+	insinto /etc/phpmyadmin
+	doins config.inc.php mysql-setup.sql
+	dosym /etc/phpmyadmin/config.inc.php ${destdir}/config.inc.php
+	
+}
+
+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 "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"
+}