Fixed bug #121815. Dropped ~mips, please see bug #122963.

(Portage version: 2.1_pre4-r1)

11 files changed, 251 insertions, 30 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 58bfcc8e39c6..1addf77d0fbd 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/phpmyadmin
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.159 2005/12/29 15:14:00 rl03 Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.160 2006/02/15 22:26:19 rl03 Exp $
+
+*phpmyadmin-2.8.0_beta1 (15 Feb 2006)
+
+  15 Feb 2006; Renat Lumpau <rl03@gentoo.org> +files/reconfig-2.8,
+  +files/config.default.php-2.8.0.patch, +files/postinstall-en-2.8.0.txt,
+  phpmyadmin-2.7.0_p1.ebuild, phpmyadmin-2.7.0_p2.ebuild,
+  +phpmyadmin-2.8.0_beta1.ebuild:
+  Fixed bug #121815. Dropped ~mips, please see bug #122963.
 
 *phpmyadmin-2.7.0_p2 (29 Dec 2005)
 
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 81cb8be9a324..138f35e38514 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,20 +1,45 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 2d66feff5e4e7e15a6b2cd41f25ce941 ChangeLog 22145
+RMD160 30a6055244772f74489ec87a5f1493bc2580c22b ChangeLog 22145
+SHA256 b0a8f67e4b8e2c06ff9bdc685eda476435fc8bec37f2417af8a6404c2b5592b9 ChangeLog 22145
 MD5 ab6e8b5ecc163d415aebb7d2c42238a3 files/config.default.php-2.7.0.patch 5533
-MD5 df2cdcb5a7b42d061bc4603ee5b7d1d3 files/digest-phpmyadmin-2.7.0_p1 74
-MD5 f14c984a7a7ef42ca61491639f07f40a files/digest-phpmyadmin-2.7.0_p2 74
+RMD160 4b043b198dc517846e5282d0574c9a05eb6906a3 files/config.default.php-2.7.0.patch 5533
+SHA256 5956d96dd9ba02107a46302703df458cf45a495ff175d5e64b0154d9e815b7a3 files/config.default.php-2.7.0.patch 5533
+MD5 9dc203a856638d41f9992d0e54f8c8f8 files/config.default.php-2.8.0.patch 5553
+RMD160 60869c33523751098a98a067fee3482c2c26795a files/config.default.php-2.8.0.patch 5553
+SHA256 78ab8d8910101accd03f8820210feb49a997571e66156d86255dc8fafebf16ce files/config.default.php-2.8.0.patch 5553
+MD5 1d85eb9be97d60027aaf8510dfa9f6d5 files/digest-phpmyadmin-2.7.0_p1 268
+RMD160 46a38163b7c59314e872794f64aa6e2f9aff061c files/digest-phpmyadmin-2.7.0_p1 268
+SHA256 fcb7855b1d5625530e11d71b2594ef631850ab163312d19fc98f55da39d1ba68 files/digest-phpmyadmin-2.7.0_p1 268
+MD5 3b6a4be3903f9737aaeed4cb2d1cd441 files/digest-phpmyadmin-2.7.0_p2 268
+RMD160 1240eee2470b5146d93d24ddd116c31b6ea87f04 files/digest-phpmyadmin-2.7.0_p2 268
+SHA256 f6ac671a9db61a92e56b5f543d1f59958f4beb8fb911137e8a1d0b6c9e774e28 files/digest-phpmyadmin-2.7.0_p2 268
+MD5 2e98de730709b9d0ba0bd41aae5b08a2 files/digest-phpmyadmin-2.8.0_beta1 274
+RMD160 b39227d755ca66a3bb74b329f1153949f809d26f files/digest-phpmyadmin-2.8.0_beta1 274
+SHA256 4e71b12a2d3c04c13ac654b00f16cf243e380862b908ee3b31c33b4edac7e754 files/digest-phpmyadmin-2.8.0_beta1 274
 MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231
+RMD160 7b462640601d77d01c8f11322cb2cb84ce8e79a6 files/mysql-setup.sql.in-2.5.6 3231
+SHA256 482ada180bcaf41fa4dc103edae4a78a55f3ced1fb2becc12124b914db1dcbfe files/mysql-setup.sql.in-2.5.6 3231
+MD5 7cb4e3d6a35ebf8041ea3d2abaac8c28 files/postinstall-en-2.8.0.txt 728
+RMD160 3b8143e570d157259b6b84d0edc968b1f6431880 files/postinstall-en-2.8.0.txt 728
+SHA256 153fa7b02cc6f8d33c4568484e2e6814dd82202de4037b67a85648fcc9dc8755 files/postinstall-en-2.8.0.txt 728
 MD5 465c40880998c64b5cbe5fd686b62240 files/postinstall-en.txt 591
+RMD160 77ef47191d81687c67ca05b142a217643bd27964 files/postinstall-en.txt 591
+SHA256 8f17a152a9d8d0472edc3238c7e27c472cb261c367eb86619869a8e9a2a175e7 files/postinstall-en.txt 591
 MD5 03e1c16e02d105f6fcfb56c1bf734f6e files/reconfig-2.7 319
+RMD160 c865d236bf1af7846ae4a572df35385d09985f50 files/reconfig-2.7 319
+SHA256 4f1d68f5107184bd3c3947fe4f27d25f11d0da816c143d313ec20e80b75bc2b1 files/reconfig-2.7 319
+MD5 cf0af0543cb29eb88163220df6f14669 files/reconfig-2.8 329
+RMD160 993162aa564ab7d37c7f32db439518c5cab9ace5 files/reconfig-2.8 329
+SHA256 526f7efb31adde131ffaff0271ea12693315c2d4e8a1f96ae4af6947815d6612 files/reconfig-2.8 329
 MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
-MD5 0d9048898d33b93e3bba78e7384fd385 phpmyadmin-2.7.0_p1.ebuild 2057
-MD5 3abb011b1886ca0f5de0fffc602611f5 phpmyadmin-2.7.0_p2.ebuild 2059
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDs/1EEzitwsaoONoRAnwPAJ0bvlA+GsQVtAfqQX1UJ1nuBd0dyACcCR21
-XCdEWHvKk6MineEoGetZ638=
-=JTl0
------END PGP SIGNATURE-----
+RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 metadata.xml 162
+SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0 metadata.xml 162
+MD5 8374405bcd0b2a2bf2e08bef96fd1ab3 phpmyadmin-2.7.0_p1.ebuild 2101
+RMD160 058ad7034523a9afd59fe4556fe4b54ab15752c4 phpmyadmin-2.7.0_p1.ebuild 2101
+SHA256 05dacaf9f2a04f73dc5cd9c82493854a04cc165d50de8bfe98e3997753ed407d phpmyadmin-2.7.0_p1.ebuild 2101
+MD5 d9b5d9bd86e6b01a3ea69c5a07a57812 phpmyadmin-2.7.0_p2.ebuild 2103
+RMD160 b51fdea7b4c4402516e59413b535da7100e9b24a phpmyadmin-2.7.0_p2.ebuild 2103
+SHA256 2fb91ea6af2fc75c2c6a4c60b98e63052b39a5ec51a05ad5ea8af6ac5d45678f phpmyadmin-2.7.0_p2.ebuild 2103
+MD5 2ae377581fcd417ceac1f7e1c7a90b2c phpmyadmin-2.8.0_beta1.ebuild 2136
+RMD160 676095db5fdbc735dc5989f5bd12b8d9fe130648 phpmyadmin-2.8.0_beta1.ebuild 2136
+SHA256 44be98604979f552e7ee321e67f766d095b324537c867f58938861caf15bcc99 phpmyadmin-2.8.0_beta1.ebuild 2136
diff --git a/dev-db/phpmyadmin/files/config.default.php-2.8.0.patch b/dev-db/phpmyadmin/files/config.default.php-2.8.0.patch
new file mode 100644
index 000000000000..8a199a23b041
--- /dev/null
+++ b/dev-db/phpmyadmin/files/config.default.php-2.8.0.patch
@@ -0,0 +1,66 @@
+--- libraries/config.default.php.org	2003-12-02 21:59:24.000000000 +0000
++++ libraries/config.default.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.7.0_p1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.7.0_p1
index 230e213f3463..d7b3b86f9247 100644
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.7.0_p1
+++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.7.0_p1
@@ -1 +1,3 @@
 MD5 39bfebd35f9a2de03504812df173f27d phpMyAdmin-2.7.0-pl1.tar.bz2 1962675
+RMD160 beca913be2a139f87e65a8798b9f3378e224d9ec phpMyAdmin-2.7.0-pl1.tar.bz2 1962675
+SHA256 0d324fd68f186b04f69ed46eb6b74577fff4f0d015dca75edcd8e089a9366865 phpMyAdmin-2.7.0-pl1.tar.bz2 1962675
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.7.0_p2 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.7.0_p2
index 0d4f1efae279..b75f3e10b2db 100644
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.7.0_p2
+++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.7.0_p2
@@ -1 +1,3 @@
 MD5 19a46b06254276f4e7c3803ea2d9b335 phpMyAdmin-2.7.0-pl2.tar.bz2 1968200
+RMD160 52746f657c3d41a1839a515856710f9825714c2d phpMyAdmin-2.7.0-pl2.tar.bz2 1968200
+SHA256 19ba6032a266cc74866d1cc5bd5d196f5b14b092b515485faad405e3c8ea2cd4 phpMyAdmin-2.7.0-pl2.tar.bz2 1968200
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.0_beta1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.0_beta1
new file mode 100644
index 000000000000..7d4a9aba2e5d
--- /dev/null
+++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.0_beta1
@@ -0,0 +1,3 @@
+MD5 467bf74272791ddf9be1a2bec0e6995a phpMyAdmin-2.8.0-beta1.tar.bz2 1999891
+RMD160 982927a4b68dc8a530aef2907da53ed9efa3abc4 phpMyAdmin-2.8.0-beta1.tar.bz2 1999891
+SHA256 c66e7902d8dd0f5025fc925f15459d628eff78db4d5c49b1491a5f3b50d990b0 phpMyAdmin-2.8.0-beta1.tar.bz2 1999891
diff --git a/dev-db/phpmyadmin/files/postinstall-en-2.8.0.txt b/dev-db/phpmyadmin/files/postinstall-en-2.8.0.txt
new file mode 100644
index 000000000000..fb0e92ef5137
--- /dev/null
+++ b/dev-db/phpmyadmin/files/postinstall-en-2.8.0.txt
@@ -0,0 +1,16 @@
+0. Update MySQL's grant tables and the pmadb database:
+     mysql -u root -p < /usr/share/webapps/phpmyadmin/${PVR}/sqlscripts/mysql/${PVR}_create.sql
+
+1. Create the file config.inc.php. You can use the web-based installer:
+   http://${VHOST_HOSTNAME}${VHOST_APPDIR}/scripts/setup.php
+   Alternatively, use the default config file in libraries/config.default.php
+
+2. Be sure that the libraries/ directory is not visible. You can use the
+provided .htaccess file.
+
+===============
+
+If you are upgrading from an earlier version and are using phpMyAdmin's
+features for master/foreign tables be sure to read
+  http://${VHOST_HOSTNAME}${VHOST_APPDIR}/Documentation.html#col_com
+You will need to perform the ALTER TABLE step yourself.
diff --git a/dev-db/phpmyadmin/files/reconfig-2.8 b/dev-db/phpmyadmin/files/reconfig-2.8
new file mode 100644
index 000000000000..a73d90f088bf
--- /dev/null
+++ b/dev-db/phpmyadmin/files/reconfig-2.8
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+die() {
+	echo "#####"
+	echo $1
+	echo "#####"
+	exit 1
+}
+
+if [ $1 = "install" ]; then
+	cd ${MY_INSTALLDIR}/libraries
+	sed -e "s|\$cfg\['PmaAbsoluteUri'\] = '';|\$cfg\['PmaAbsoluteUri'\] = 'http://${VHOST_HOSTNAME}/${VHOST_APPDIR}';|g" -i config.default.php || die "sed failed"
+
+elif [ $1 = "clean" ]; then
+	echo $1
+fi
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.7.0_p1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.7.0_p1.ebuild
index 37e5fb795927..c85e15fade2a 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.7.0_p1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.7.0_p1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.7.0_p1.ebuild,v 1.6 2005/12/09 22:44:44 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.7.0_p1.ebuild,v 1.7 2006/02/15 22:26:19 rl03 Exp $
 
-inherit eutils webapp
+inherit eutils webapp depend.php
 
 MY_PV=${PV/_p/-pl}
 MY_P=phpMyAdmin-${MY_PV}
@@ -10,14 +10,19 @@ 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 ~mips ppc sparc x86"
+KEYWORDS="alpha amd64 hppa ppc sparc x86"
 IUSE=""
 DEPEND=">=dev-db/mysql-3.23.32 <dev-db/mysql-5.1
-	virtual/httpd-php
-	sys-apps/findutils
-	!<=dev-db/phpmyadmin-2.5.6"
+	sys-apps/findutils"
 S=${WORKDIR}/${MY_P}
 
+need_php
+
+pkg_setup() {
+	webapp_pkg_setup
+	require_php_with_use pcre mysql session
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.7.0_p2.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.7.0_p2.ebuild
index 784900fe4f6d..5f1d528ad0a8 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.7.0_p2.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.7.0_p2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.7.0_p2.ebuild,v 1.1 2005/12/29 15:14:00 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.7.0_p2.ebuild,v 1.2 2006/02/15 22:26:19 rl03 Exp $
 
-inherit eutils webapp
+inherit eutils webapp depend.php
 
 MY_PV=${PV/_p/-pl}
 MY_P=phpMyAdmin-${MY_PV}
@@ -10,14 +10,19 @@ 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 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE=""
 DEPEND=">=dev-db/mysql-3.23.32 <dev-db/mysql-5.1
-	virtual/httpd-php
-	sys-apps/findutils
-	!<=dev-db/phpmyadmin-2.5.6"
+	sys-apps/findutils"
 S=${WORKDIR}/${MY_P}
 
+need_php
+
+pkg_setup() {
+	webapp_pkg_setup
+	require_php_with_use pcre mysql session
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.8.0_beta1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.8.0_beta1.ebuild
new file mode 100644
index 000000000000..4aa8d4babcf9
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-2.8.0_beta1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.8.0_beta1.ebuild,v 1.1 2006/02/15 22:26:19 rl03 Exp $
+
+inherit eutils webapp depend.php
+
+MY_PV=${PV/_/-}
+MY_P=phpMyAdmin-${MY_PV}
+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 ~sparc ~x86"
+IUSE=""
+DEPEND=">=dev-db/mysql-3.23.32 <dev-db/mysql-5.1
+	sys-apps/findutils"
+S=${WORKDIR}/${MY_P}
+
+need_php
+
+pkg_setup() {
+	webapp_pkg_setup
+	require_php_with_use pcre mysql session
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/config.default.php-2.8.0.patch
+
+	# 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_postinst_txt en ${FILESDIR}/postinstall-en-2.8.0.txt
+	webapp_hook_script ${FILESDIR}/reconfig-2.8
+	webapp_src_install
+
+	fperms 0640 ${MY_HTDOCSDIR}/libraries/config.default.php
+	fowners root:apache ${MY_HTDOCSDIR}/libraries/config.default.php
+	# bug #88831, make sure the create script is world-readable.
+	fperms 0600 ${MY_SQLSCRIPTSDIR}/mysql/${PVR}_create.sql
+}