Removed old version. Small changes to postinstall instructions based on bug

#126390.
(Portage version: 2.1_pre6-r3)

6 files changed, 51 insertions, 94 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 5ce11c5b6fef..964ce696597a 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.162 2006/03/19 13:29:07 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.163 2006/03/26 16:14:14 rl03 Exp $
+
+  26 Mar 2006; Renat Lumpau <rl03@gentoo.org>
+  files/postinstall-en-2.8.0.txt, -phpmyadmin-2.8.0.ebuild:
+  Removed old version. Small changes to postinstall instructions based on bug
+  #126390.
 
 *phpmyadmin-2.8.0.2 (19 Mar 2006)
 
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 51d3fd92023c..43ecd9a56a43 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,17 +1,45 @@
 MD5 c6071585e0650645329efc805b4a706e ChangeLog 22794
+RMD160 f0395abad5b76a4877bd7edbd4fad42b24cb44b5 ChangeLog 22794
+SHA256 faf60f6c9f248fced81e05d356eb84db94d16a88db2c4c1ba13c3f3305eca434 ChangeLog 22794
 MD5 ab6e8b5ecc163d415aebb7d2c42238a3 files/config.default.php-2.7.0.patch 5533
+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
-MD5 8851528c551e62b6ae108470c224a2c4 files/digest-phpmyadmin-2.8.0 256
-MD5 ff631f6d886bb14c787630b268f96e47 files/digest-phpmyadmin-2.8.0.2 72
+RMD160 1240eee2470b5146d93d24ddd116c31b6ea87f04 files/digest-phpmyadmin-2.7.0_p2 268
+SHA256 f6ac671a9db61a92e56b5f543d1f59958f4beb8fb911137e8a1d0b6c9e774e28 files/digest-phpmyadmin-2.7.0_p2 268
+MD5 64ce2122f76c1d7d16a55155aeaac368 files/digest-phpmyadmin-2.8.0.2 262
+RMD160 4bf8884ab0cf9e73dd8e34bb845e25af4a405eeb files/digest-phpmyadmin-2.8.0.2 262
+SHA256 a7a1993f2d924efeb351823c7980026c14ab638ca899e545e7bf8a0ce4c76706 files/digest-phpmyadmin-2.8.0.2 262
 MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231
-MD5 7cb4e3d6a35ebf8041ea3d2abaac8c28 files/postinstall-en-2.8.0.txt 728
+RMD160 7b462640601d77d01c8f11322cb2cb84ce8e79a6 files/mysql-setup.sql.in-2.5.6 3231
+SHA256 482ada180bcaf41fa4dc103edae4a78a55f3ced1fb2becc12124b914db1dcbfe files/mysql-setup.sql.in-2.5.6 3231
+MD5 a8ab36486bd0162a6fd2faa52ea21fa5 files/postinstall-en-2.8.0.txt 927
+RMD160 196f3ff546fcb986af6701563c54e9d2eda63e30 files/postinstall-en-2.8.0.txt 927
+SHA256 c6a9c9daaa44e9182b6b613e7e5e4b64701fdf323e39df7edc042228a5ea3ece files/postinstall-en-2.8.0.txt 927
 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
+RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 metadata.xml 162
+SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0 metadata.xml 162
 MD5 ed2bb53f46dfc48ddbc758d5dc07fdc6 phpmyadmin-2.7.0_p1.ebuild 2097
+RMD160 8e2e90f93ffcafadc9967b21926e0485f824b320 phpmyadmin-2.7.0_p1.ebuild 2097
+SHA256 41ba3ada95fcc36ca59ced583668d2189bd7c4b7ef0b8a52e3626a24687657de phpmyadmin-2.7.0_p1.ebuild 2097
 MD5 a24be197d7a2a4d85249218fda511daf phpmyadmin-2.7.0_p2.ebuild 2103
+RMD160 bfb3d4fb85fdd3733f5f32504bf2b36d8f713f2b phpmyadmin-2.7.0_p2.ebuild 2103
+SHA256 a5229fde41f51b5c0c820fc603b5123f8bd2e049d403e0f2f2d71822426d0a01 phpmyadmin-2.7.0_p2.ebuild 2103
 MD5 015e68f120f91e52fad4e4191b1a8be0 phpmyadmin-2.8.0.2.ebuild 2386
-MD5 790a058ebffcf1b4b23b4829cabc6e99 phpmyadmin-2.8.0.ebuild 2381
+RMD160 37407d03a5a254cfecb9577b3c336ca979e360f9 phpmyadmin-2.8.0.2.ebuild 2386
+SHA256 0416751805d3c6e88f118b25588a4515ee9e146810a5ade554e7f75bcc3aeba9 phpmyadmin-2.8.0.2.ebuild 2386
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.0 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.0
deleted file mode 100644
index 056be597460a..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9562706776f01fccffbaa99c3196f72a phpMyAdmin-2.8.0.tar.bz2 2011697
-RMD160 243a5c58da168b2d30f044c4e14495f295b14d60 phpMyAdmin-2.8.0.tar.bz2 2011697
-SHA256 f729ee1b4f7bd1c558577182357fabb940f153fee85a14e69e216d481bb1cdf4 phpMyAdmin-2.8.0.tar.bz2 2011697
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.0.2 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.0.2
index 6c2b98d75540..841e2d783efe 100644
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.0.2
+++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.0.2
@@ -1 +1,3 @@
 MD5 9c948b20af568304cbb8ff58c322058b phpMyAdmin-2.8.0.2.tar.bz2 2010290
+RMD160 8c94abbf9479c053848374cefcf4d8046197c262 phpMyAdmin-2.8.0.2.tar.bz2 2010290
+SHA256 0973b40a42cff88a167d643f025551756ab364c0bffe3cc47365f4799e473724 phpMyAdmin-2.8.0.2.tar.bz2 2010290
diff --git a/dev-db/phpmyadmin/files/postinstall-en-2.8.0.txt b/dev-db/phpmyadmin/files/postinstall-en-2.8.0.txt
index fb0e92ef5137..980b3a92eee3 100644
--- a/dev-db/phpmyadmin/files/postinstall-en-2.8.0.txt
+++ b/dev-db/phpmyadmin/files/postinstall-en-2.8.0.txt
@@ -1,9 +1,15 @@
-0. Update MySQL's grant tables and the pmadb database:
+0. If this is a new installation, create MySQL's grant tables and the pmadb
+   database. NOTE: this will change the existing pma password to a random
+   string!
+
      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
+1. Create 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:
+
+     cp ${MY_INSTALLDIR}/libraries/config.default.php ${MY_INSTALLDIR}/libraries/config.inc.php
 
 2. Be sure that the libraries/ directory is not visible. You can use the
 provided .htaccess file.
@@ -12,5 +18,5 @@ 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
+  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/phpmyadmin-2.8.0.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.8.0.ebuild
deleted file mode 100644
index f454b7677b9d..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.8.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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.ebuild,v 1.1 2006/03/15 16:53:32 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 session
-	# see bug #124954
-	if ! built_with_use -o =${PHP_PKG} mysql mysqli ; then
-		eerror "${PHP_PKG} needs to be re-installed with one of the following"
-		eerror "USE flags enabled:"
-		eerror
-		eerror "mysql or mysqli if using dev-lang/php-5"
-		eerror "mysql if using dev-lang/php-4"
-		die "Re-install ${PHP_PKG}"
-	fi
-}
-
-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_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
-}