Version bump (#129850); fixed postinstall instructions (#129590).

Package-Manager: portage-2.1_pre9-r1

3 files changed, 42 insertions, 100 deletions

diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 3f7fad023fc9..331e43354ebf 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,55 +1,73 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 4795b27f15846ce68a8f4f32664f1986 ChangeLog 23559
-RMD160 33752fcfa472c42f03566635f263d0bfe9a183ee ChangeLog 23559
-SHA256 ecf31768fa1ae2ad5024eddcdd55f138a205f0a4747271b46a0bd6b9edf2c4f2 ChangeLog 23559
+AUX config.default.php-2.7.0.patch 5533 RMD160 4b043b198dc517846e5282d0574c9a05eb6906a3 SHA1 c25f29be789c99c636f2331ae9caf49c6aa9753a SHA256 5956d96dd9ba02107a46302703df458cf45a495ff175d5e64b0154d9e815b7a3 size 5533
 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
+AUX config.default.php-2.8.0.patch 5553 RMD160 60869c33523751098a98a067fee3482c2c26795a SHA1 329047d7eaaf3c24bc1deb86809361fe6eb35b7c SHA256 78ab8d8910101accd03f8820210feb49a997571e66156d86255dc8fafebf16ce size 5553
 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 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
+AUX mysql-setup.sql.in-2.5.6 3231 RMD160 7b462640601d77d01c8f11322cb2cb84ce8e79a6 SHA1 fa3ffac6200d8f372daccdb3051753ca94ce236d SHA256 482ada180bcaf41fa4dc103edae4a78a55f3ced1fb2becc12124b914db1dcbfe size 3231
 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 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
+AUX postinstall-en-2.8.0.txt 917 RMD160 00f7f94544ead826cbd64b1516389d4d17b15dac SHA1 009203c0e9fc1540c89e203c62b099c13334c55a SHA256 855e69328aa4cd40f5ec3bb75c382d7631c95d8855f5f3f11ab372ce21f9bb74 size 917
+MD5 3ed90574ac9aa1cc3d0662ceedc4e96e files/postinstall-en-2.8.0.txt 917
+RMD160 00f7f94544ead826cbd64b1516389d4d17b15dac files/postinstall-en-2.8.0.txt 917
+SHA256 855e69328aa4cd40f5ec3bb75c382d7631c95d8855f5f3f11ab372ce21f9bb74 files/postinstall-en-2.8.0.txt 917
+AUX postinstall-en.txt 591 RMD160 77ef47191d81687c67ca05b142a217643bd27964 SHA1 91b4a9a2f1d47aa15890696f4fc924d43acec08e SHA256 8f17a152a9d8d0472edc3238c7e27c472cb261c367eb86619869a8e9a2a175e7 size 591
 MD5 465c40880998c64b5cbe5fd686b62240 files/postinstall-en.txt 591
 RMD160 77ef47191d81687c67ca05b142a217643bd27964 files/postinstall-en.txt 591
 SHA256 8f17a152a9d8d0472edc3238c7e27c472cb261c367eb86619869a8e9a2a175e7 files/postinstall-en.txt 591
+AUX reconfig-2.7 319 RMD160 c865d236bf1af7846ae4a572df35385d09985f50 SHA1 af893475f287ee74818d86b0e31796b83face5b8 SHA256 4f1d68f5107184bd3c3947fe4f27d25f11d0da816c143d313ec20e80b75bc2b1 size 319
 MD5 03e1c16e02d105f6fcfb56c1bf734f6e files/reconfig-2.7 319
 RMD160 c865d236bf1af7846ae4a572df35385d09985f50 files/reconfig-2.7 319
 SHA256 4f1d68f5107184bd3c3947fe4f27d25f11d0da816c143d313ec20e80b75bc2b1 files/reconfig-2.7 319
+AUX reconfig-2.8 329 RMD160 993162aa564ab7d37c7f32db439518c5cab9ace5 SHA1 0557bde5e20a06f46c4a7b1733038f7dc9745965 SHA256 526f7efb31adde131ffaff0271ea12693315c2d4e8a1f96ae4af6947815d6612 size 329
 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
+DIST phpMyAdmin-2.7.0-pl1.tar.bz2 1962675 RMD160 beca913be2a139f87e65a8798b9f3378e224d9ec SHA256 0d324fd68f186b04f69ed46eb6b74577fff4f0d015dca75edcd8e089a9366865 size 1962675
+DIST phpMyAdmin-2.8.0.2.tar.bz2 2010290 RMD160 8c94abbf9479c053848374cefcf4d8046197c262 SHA256 0973b40a42cff88a167d643f025551756ab364c0bffe3cc47365f4799e473724 size 2010290
+DIST phpMyAdmin-2.8.0.3.tar.bz2 2011518 RMD160 d40d236c4041c16a1d06e1c158f14707938ab16c SHA256 89a15217b9b090ec01e1a4b90c90b2df2ac6b6e192c64385c816d33cc7efaff0 size 2011518
+EBUILD phpmyadmin-2.7.0_p1.ebuild 2097 RMD160 8e2e90f93ffcafadc9967b21926e0485f824b320 SHA1 967549a26a99e4bafeb82ea8095366f37e16c472 SHA256 41ba3ada95fcc36ca59ced583668d2189bd7c4b7ef0b8a52e3626a24687657de size 2097
 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
+EBUILD phpmyadmin-2.8.0.2.ebuild 2381 RMD160 16da7cfd626c64e11c70cc9eba39bbc729837b90 SHA1 5081c7ab6ab92eef582c60108262915023c98509 SHA256 9b1adc7ff3afe336e6c30b1854b7658c641f9a98abd25f88ecde399f572fb8f4 size 2381
 MD5 507b890a51276164800c48e5b6568a51 phpmyadmin-2.8.0.2.ebuild 2381
 RMD160 16da7cfd626c64e11c70cc9eba39bbc729837b90 phpmyadmin-2.8.0.2.ebuild 2381
 SHA256 9b1adc7ff3afe336e6c30b1854b7658c641f9a98abd25f88ecde399f572fb8f4 phpmyadmin-2.8.0.2.ebuild 2381
+EBUILD phpmyadmin-2.8.0.3.ebuild 2383 RMD160 168f10e63bb7ec3672de44556ed23e7b6f45dce7 SHA1 616e5bda3d09577584e7bf681cdd1b3c3329b4db SHA256 3468b418b5aaddbdfba4c446a7009aee47c2844e89f6013f33da19882bc90e84 size 2383
+MD5 349931baccb2ca2a187f23ec59f57f18 phpmyadmin-2.8.0.3.ebuild 2383
+RMD160 168f10e63bb7ec3672de44556ed23e7b6f45dce7 phpmyadmin-2.8.0.3.ebuild 2383
+SHA256 3468b418b5aaddbdfba4c446a7009aee47c2844e89f6013f33da19882bc90e84 phpmyadmin-2.8.0.3.ebuild 2383
+MISC ChangeLog 23799 RMD160 1199c91fdc9801d4fc1e06687644b48ff76c493e SHA1 5f46fb24bcb00d3291ee50135ec44abc8491289f SHA256 c8070a9710bde0f156bdf316fd83a7e1aea7d64453b52acce4576d922e0c0128 size 23799
+MD5 2f29dabc9d8d5ee080bce94ddff28aa4 ChangeLog 23799
+RMD160 1199c91fdc9801d4fc1e06687644b48ff76c493e ChangeLog 23799
+SHA256 c8070a9710bde0f156bdf316fd83a7e1aea7d64453b52acce4576d922e0c0128 ChangeLog 23799
+MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0 size 162
+MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
+RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 metadata.xml 162
+SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0 metadata.xml 162
+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
+size 268 files/digest-phpmyadmin-2.7.0_p1 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
+size 262 files/digest-phpmyadmin-2.8.0.2 262
+MD5 7a61197a13ff34f8b2a38eb00a7d03c7 files/digest-phpmyadmin-2.8.0.3 262
+RMD160 e23fed73ca61ba1224e2ff9eae0b18e9f0ac7203 files/digest-phpmyadmin-2.8.0.3 262
+SHA256 035615ed468b8b8f393e5324019b40337ada4ff89925f624c5d132b26fe4a64b files/digest-phpmyadmin-2.8.0.3 262
+size 262 files/digest-phpmyadmin-2.8.0.3 262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEOCE9CRZPokWLroQRAkiDAJ0UIU1h4U97KhuVjcUffebSdyXNpgCgnNaV
-TaluQu6SBNU4MllljXYIID4=
-=cmB1
+iD8DBQFER695EzitwsaoONoRAmkzAJsGH1yJxa+zxLzmXgh+CIgRI44tMgCeN/h2
+aNBYoe0ERt0WAPNied32uvs=
+=v67W
 -----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.7.0_p2 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.7.0_p2
deleted file mode 100644
index b75f3e10b2db..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.7.0_p2
+++ /dev/null
@@ -1,3 +0,0 @@
-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/phpmyadmin-2.7.0_p2.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.7.0_p2.ebuild
deleted file mode 100644
index 5f1d528ad0a8..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.7.0_p2.ebuild
+++ /dev/null
@@ -1,73 +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.7.0_p2.ebuild,v 1.2 2006/02/15 22:26:19 rl03 Exp $
-
-inherit eutils webapp depend.php
-
-MY_PV=${PV/_p/-pl}
-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.7.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 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} ChangeLog
-	dohtml Documentation.html
-
-	# Copy the app's main files
-
-	einfo "Installing main files"
-	cp -r . ${D}${MY_HTDOCSDIR}
-
-	webapp_configfile ${MY_HTDOCSDIR}/config.default.php
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-	webapp_hook_script ${FILESDIR}/reconfig-2.7
-	webapp_src_install
-
-	fperms 0640 ${MY_HTDOCSDIR}/config.default.php
-	fowners root:apache ${MY_HTDOCSDIR}/config.default.php
-	# bug #88831, make sure the create script is world-readable.
-	fperms 0600 ${MY_SQLSCRIPTSDIR}/mysql/${PVR}_create.sql
-}