Cleaned out old version

Package-Manager: portage-2.1.2.8

7 files changed, 7 insertions, 309 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 35d368328fe8..9371d95794f2 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,12 @@
 # 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.262 2007/05/31 21:55:39 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.263 2007/06/02 05:16:15 rl03 Exp $
+
+  02 Jun 2007; Renat Lumpau <rl03@gentoo.org>
+  -files/mysql-setup.sql.in-2.5.6, -files/config.default.php-2.9.2.patch,
+  -files/config.default.php-2.9.10.patch, -files/common.lib.php.diff,
+  -phpmyadmin-2.10.0.2.ebuild:
+  Cleaned out old version
 
   31 May 2007; Christoph Mende <angelos@gentoo.org>
   phpmyadmin-2.10.1.ebuild:
diff --git a/dev-db/phpmyadmin/files/common.lib.php.diff b/dev-db/phpmyadmin/files/common.lib.php.diff
deleted file mode 100644
index 3ccbb3907caf..000000000000
--- a/dev-db/phpmyadmin/files/common.lib.php.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-*** common.lib.php.ORIGINAL	Wed Sep 27 18:04:30 2006
---- common.lib.php	Mon Oct  2 10:32:46 2006
-***************
-*** 2714,2719 ****
---- 2714,2720 ----
-      '_ENV',
-      '_COOKIE',
-      '_SESSION',
-+     'key',
-  );
-  
-  foreach (get_defined_vars() as $key => $value) {
diff --git a/dev-db/phpmyadmin/files/config.default.php-2.9.10.patch b/dev-db/phpmyadmin/files/config.default.php-2.9.10.patch
deleted file mode 100644
index 5852d25c1f8b..000000000000
--- a/dev-db/phpmyadmin/files/config.default.php-2.9.10.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- 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
-                                                     // (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 (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)
-@@ -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
-                                                     // (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]['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/config.default.php-2.9.2.patch b/dev-db/phpmyadmin/files/config.default.php-2.9.2.patch
deleted file mode 100644
index 5fbb09ac05e7..000000000000
--- a/dev-db/phpmyadmin/files/config.default.php-2.9.2.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- libraries/config.default.php.old	2007-01-14 15:50:51.000000000 +0000
-+++ libraries/config.default.php	2007-01-14 15:52:37.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
-                                                     // (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 (valid choices: config, http, HTTP or cookie)
-+$cfg['Servers'][$i]['auth_type']     = 'http';    // Authentication method (valid choices: config, http, HTTP or cookie)
- $cfg['Servers'][$i]['user']          = 'root';      // MySQL user
- $cfg['Servers'][$i]['password']      = '';          // MySQL password (only needed
-                                                     // with 'config' auth_type)
-@@ -79,29 +79,29 @@ $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
-                                                     // (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.10.0.2 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.10.0.2
deleted file mode 100644
index fd1e5e2fc3ab..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.10.0.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2507b1c8b51b8b3528492d5c5f19daf5 phpMyAdmin-2.10.0.2-all-languages-utf-8-only.tar.bz2 2189322
-RMD160 8e3b21b3ea6bfde369bf332758dd3c3330c2846d phpMyAdmin-2.10.0.2-all-languages-utf-8-only.tar.bz2 2189322
-SHA256 e6faadabc2b1c0f5c0bd74d5f318359b0d15a8f4e795089a6ac7c6b7788ad48d phpMyAdmin-2.10.0.2-all-languages-utf-8-only.tar.bz2 2189322
diff --git a/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.6 b/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.6
deleted file mode 100644
index d5853baf01b4..000000000000
--- a/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.6
+++ /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 NULL 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.10.0.2.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.10.0.2.ebuild
deleted file mode 100644
index a648f405c9a0..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.10.0.2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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.10.0.2.ebuild,v 1.8 2007/03/12 09:27:18 yoswink Exp $
-
-inherit eutils webapp depend.php
-
-MY_PV=${PV/_/-}
-MY_P="phpMyAdmin-${MY_PV}-all-languages-utf-8-only"
-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 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-DEPEND="sys-apps/findutils"
-S=${WORKDIR}/${MY_P}
-
-need_php
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	if ! PHPCHECKNODIE="yes" require_php_with_use ctype pcre session unicode \
-		|| ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli ; then
-		eerror
-		eerror "${PHP_PKG} needs to be re-installed with all of the following"
-		eerror "USE flags enabled:"
-		eerror
-		eerror "ctype pcre session unicode"
-		eerror
-		eerror "as well as any of the following USE flags enabled:"
-		eerror
-		eerror "mysql or mysqli if using dev-lang/php-5"
-		eerror "mysql if using dev-lang/php-4"
-		eerror
-		die "Re-install ${PHP_PKG}"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/config.default.php-2.9.10.patch
-	# bug 152933
-	cd libraries && epatch ${FILESDIR}/common.lib.php.diff
-	cd ..
-
-	# 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 libraries/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}
-	dohtml Documentation.html
-
-	# Copy the app's main files
-
-	einfo "Installing main files"
-	cp -r . ${D}${MY_HTDOCSDIR}
-
-	webapp_configfile ${MY_HTDOCSDIR}/libraries/config.default.php
-	webapp_serverowned ${MY_HTDOCSDIR}/libraries/config.default.php
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en-2.8.0.txt
-	webapp_hook_script ${FILESDIR}/reconfig-2.8
-	webapp_src_install
-	# bug #88831, make sure the create script is world-readable.
-	fperms 0600 ${MY_SQLSCRIPTSDIR}/mysql/${PVR}_create.sql
-}