cleanup

5 files changed, 3 insertions, 254 deletions

diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 311badd45f57..7d2cda5b589c 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,5 +1,5 @@
-MD5 670aa2105bf0594629912eff7b53ad1b phpmyadmin-2.5.6.ebuild 2970
-MD5 634ffec4e851462a21dc29c1df8b218f phpmyadmin-2.5.5_p1.ebuild 2966
+MD5 cf5ba87264f915f282eb35f99818ce0c phpmyadmin-2.5.6.ebuild 2999
+MD5 02cd31270333733444625dbb848abd4f phpmyadmin-2.5.6_rc1-r1.ebuild 3006
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
 MD5 c98a6c84cdcf1ad298b77aaff27bc988 ChangeLog 6384
 MD5 b81e9225085298c3556e7a5e52966638 phpmyadmin-2.5.6_rc1.ebuild 2968
@@ -11,6 +11,4 @@ MD5 396133c1da8d8b716ad2da23aa0a5a30 files/phpmyadmin-mysql-setup.sql.in 2712
 MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525
 MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6_rc1.patch 5525
 MD5 5367bc809b77e6374f18d126990fba75 files/digest-phpmyadmin-2.5.6 70
-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-r1 74
diff --git a/dev-db/phpmyadmin/files/config.inc.php-2.5.5_p1.patch b/dev-db/phpmyadmin/files/config.inc.php-2.5.5_p1.patch
deleted file mode 100644
index 17ce8c8187fc..000000000000
--- a/dev-db/phpmyadmin/files/config.inc.php-2.5.5_p1.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- 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
-                                                     // (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.5.5_p1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.5_p1
deleted file mode 100644
index 44ad0d4d26de..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.5_p1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1bb6ad48a8bda6635cad7510a1d3e3de phpMyAdmin-2.5.5-pl1.tar.bz2 1095293
diff --git a/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.5_p1 b/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.5_p1
deleted file mode 100644
index 147c07f721b8..000000000000
--- a/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.5_p1
+++ /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/phpmyadmin-2.5.5_p1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.5.5_p1.ebuild
deleted file mode 100644
index 5a0b8206590e..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.5.5_p1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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.4 2004/02/22 19:43:47 agriffis Exp $
-
-inherit eutils
-inherit webapp-apache
-
-MY_P=phpMyAdmin-${PV/_p/-pl}
-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 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"
-}