RESTRICT="nomirror"

5 files changed, 14 insertions, 64 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 538ed5310ae1..03f6f03d5ae1 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,10 @@
 # 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.28 2003/09/29 17:41:42 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.29 2003/10/21 15:37:46 mholzer Exp $
+
+  22 Oct 2003; Martin Holzer <mholzer@gentoo.org> phpmyadmin-2.5.0.ebuild,
+  phpmyadmin-2.5.3-r1.ebuild, files/config.inc.php-2.5.2.patch:
+  adding RESTRICT="nomirror"
 
   29 Sep 2003; Martin Holzer <mholzer@gentoo.org> phpmyadmin-2.5.3-r1.ebuild:
   Marked x86 stable.
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 0c047697e7f3..990d557e8fd8 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,13 +1,12 @@
-MD5 d075ed7dbd3c40bfc48a1f890191ab5a ChangeLog 4982
-MD5 16ffe21b622dc1a247ce45b654674bc8 phpmyadmin-2.5.0.ebuild 2661
-MD5 82945da76dafa0fa486ec91fe048f4a4 phpmyadmin-2.5.3-r1.ebuild 2944
+MD5 a944727c321178338ab16ca9f9b2bb16 ChangeLog 5151
+MD5 b8fd9f5d7c7bbf1cbe564fe5f049b49f phpmyadmin-2.5.3-r1.ebuild 2964
+MD5 9271438a437f2e8bc3eef67f40678fcc phpmyadmin-2.5.0.ebuild 2681
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
 MD5 2f1fcee3c3573d6d92cbcddd4da6291d files/config.inc.php-2.5.0.patch 4826
+MD5 42ef286700d159ee2e074c6782ace0ac files/digest-phpmyadmin-2.5.3-r1 74
 MD5 099c45dd9e247d526bfc7777abb5e232 files/digest-phpmyadmin-2.5.0 73
-MD5 12e8a97118eb6912911e207e72d1a421 files/mysql-setup.sql.in-2.5.3 3230
 MD5 12e8a97118eb6912911e207e72d1a421 files/mysql-setup.sql.in-2.5.0 3230
 MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857
 MD5 396133c1da8d8b716ad2da23aa0a5a30 files/phpmyadmin-mysql-setup.sql.in 2712
-MD5 51bc2409d6f1bf8818b935e352c072ea files/config.inc.php-2.5.2.patch 4826
 MD5 fe846e076048ecd9c28277a5fc9ea0c9 files/config.inc.php-2.5.3.patch 4826
-MD5 42ef286700d159ee2e074c6782ace0ac files/digest-phpmyadmin-2.5.3-r1 74
+MD5 12e8a97118eb6912911e207e72d1a421 files/mysql-setup.sql.in-2.5.3 3230
diff --git a/dev-db/phpmyadmin/files/config.inc.php-2.5.2.patch b/dev-db/phpmyadmin/files/config.inc.php-2.5.2.patch
deleted file mode 100644
index 5572e6fc3fd5..000000000000
--- a/dev-db/phpmyadmin/files/config.inc.php-2.5.2.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- phpMyAdmin-2.5.2/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/phpmyadmin-2.5.0.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.5.0.ebuild
index d1b3d2f3f80b..f0090028eb69 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.5.0.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.5.0.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2003/09/10 20:21:52 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.5.0.ebuild,v 1.5 2003/10/21 15:37:46 mholzer Exp $
 
 inherit eutils
 
@@ -8,6 +8,7 @@ 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"
+RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha arm ppc hppa mips sparc x86"
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.5.3-r1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.5.3-r1.ebuild
index 85c68a46ad5b..3c9c2f7557e7 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.5.3-r1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.5.3-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.3-r1.ebuild,v 1.2 2003/09/29 17:41:42 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.5.3-r1.ebuild,v 1.3 2003/10/21 15:37:46 mholzer Exp $
 
 inherit eutils
 inherit webapp-apache
@@ -9,6 +9,7 @@ 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}-php.tar.bz2"
+RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~arm ~ppc hppa ~mips ~sparc x86"