Version bump, fixes bugs #169697, #176521.

Package-Manager: portage-2.1.2.8

5 files changed, 129 insertions, 22 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 6152ce360a69..b61414e48bb2 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.253 2007/05/26 23:11:41 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.254 2007/05/26 23:25:01 rl03 Exp $
+
+*phpmyadmin-2.10.1 (26 May 2007)
+
+  26 May 2007; Renat Lumpau <rl03@gentoo.org>
+  files/postinstall-en-2.8.0.txt, +phpmyadmin-2.10.1.ebuild:
+  Version bump, fixes bugs #169697, #176521.
 
   26 May 2007; Renat Lumpau <rl03@gentoo.org> -phpmyadmin-2.9.2_rc1.ebuild:
   Clean out old version
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index b9151ae7d23a..af60e944b282 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -17,23 +17,28 @@ AUX mysql-setup.sql.in-2.5.6 3231 RMD160 7b462640601d77d01c8f11322cb2cb84ce8e79a
 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
-AUX postinstall-en-2.8.0.txt 1089 RMD160 8e253c8837b14f625c2fbc6c349eb90014cff5c2 SHA1 a7fff448282c509bef42ec1e4464b3715662fff6 SHA256 17b54badf94376e1b3bd6fa83fd11392d39aa406bbcde945d8c2d40e17110d9d
-MD5 5e07b58e9aaae8ef093c41b731a76d03 files/postinstall-en-2.8.0.txt 1089
-RMD160 8e253c8837b14f625c2fbc6c349eb90014cff5c2 files/postinstall-en-2.8.0.txt 1089
-SHA256 17b54badf94376e1b3bd6fa83fd11392d39aa406bbcde945d8c2d40e17110d9d files/postinstall-en-2.8.0.txt 1089
+AUX postinstall-en-2.8.0.txt 1146 RMD160 bf699b21596c24f8f08be4eb53c18a3154be39a9 SHA1 f61856930f39872a3af08a43f06583468024c221 SHA256 93836b091c71c0316744b3a4b601e465a2d98d9e7b74cfa98c17aa66d4fb31d7
+MD5 1f870e1e6f56206c8b7f809df6f5f1d2 files/postinstall-en-2.8.0.txt 1146
+RMD160 bf699b21596c24f8f08be4eb53c18a3154be39a9 files/postinstall-en-2.8.0.txt 1146
+SHA256 93836b091c71c0316744b3a4b601e465a2d98d9e7b74cfa98c17aa66d4fb31d7 files/postinstall-en-2.8.0.txt 1146
 AUX reconfig-2.8 329 RMD160 993162aa564ab7d37c7f32db439518c5cab9ace5 SHA1 0557bde5e20a06f46c4a7b1733038f7dc9745965 SHA256 526f7efb31adde131ffaff0271ea12693315c2d4e8a1f96ae4af6947815d6612
 MD5 cf0af0543cb29eb88163220df6f14669 files/reconfig-2.8 329
 RMD160 993162aa564ab7d37c7f32db439518c5cab9ace5 files/reconfig-2.8 329
 SHA256 526f7efb31adde131ffaff0271ea12693315c2d4e8a1f96ae4af6947815d6612 files/reconfig-2.8 329
 DIST phpMyAdmin-2.10.0.2-all-languages-utf-8-only.tar.bz2 2189322 RMD160 8e3b21b3ea6bfde369bf332758dd3c3330c2846d SHA1 15609a42fc5f013b93d4d31b9fe7cbab56ad0c93 SHA256 e6faadabc2b1c0f5c0bd74d5f318359b0d15a8f4e795089a6ac7c6b7788ad48d
+DIST phpMyAdmin-2.10.1-all-languages-utf-8-only.tar.bz2 2155294 RMD160 55e769c92c20c0b90e87fb4291b49b8229844fd1 SHA1 5b9037148dff9251bdf6072fc7d7992763dd0782 SHA256 78bbb7b9affb3f4671ecb1c97ebdd9338206978b3aca5653ceb5e0747ec1c8c8
 EBUILD phpmyadmin-2.10.0.2.ebuild 2635 RMD160 0afb99cb493a6c0b8556cc5011aad7548416bfb2 SHA1 14f3033e3b6043f3914ff5dc935c7ade279a9763 SHA256 22f68cc6f5a85d5046a1f5e692dbaf83ba61d6cb6a6045e0ca4e809c6c519ee7
 MD5 9fee7a84d18609f31aa6b8ca02197f90 phpmyadmin-2.10.0.2.ebuild 2635
 RMD160 0afb99cb493a6c0b8556cc5011aad7548416bfb2 phpmyadmin-2.10.0.2.ebuild 2635
 SHA256 22f68cc6f5a85d5046a1f5e692dbaf83ba61d6cb6a6045e0ca4e809c6c519ee7 phpmyadmin-2.10.0.2.ebuild 2635
-MISC ChangeLog 34440 RMD160 fa75b3c61228af0f582302587907169fb0de567d SHA1 1b41bff649b113230aa65e7b24f67a15d9a86f78 SHA256 aaad01bf3728312c3c62aaa893aa9a2d2334bc14998171212aafcee37fbe2e9d
-MD5 2b2406ecd3d711bf469c20ce06c0510a ChangeLog 34440
-RMD160 fa75b3c61228af0f582302587907169fb0de567d ChangeLog 34440
-SHA256 aaad01bf3728312c3c62aaa893aa9a2d2334bc14998171212aafcee37fbe2e9d ChangeLog 34440
+EBUILD phpmyadmin-2.10.1.ebuild 2485 RMD160 44f5126becd230f3110693789ff0171453ad9675 SHA1 2c9739df64f2c5fbeabf4f0ccc8928a7afaa9f8c SHA256 d82943dd51de3d52696248a7c4160cd5e4f64219c35b886b7d428de6aeeb69a6
+MD5 a13a9d6f396abe1adcc5bd35ef6863b7 phpmyadmin-2.10.1.ebuild 2485
+RMD160 44f5126becd230f3110693789ff0171453ad9675 phpmyadmin-2.10.1.ebuild 2485
+SHA256 d82943dd51de3d52696248a7c4160cd5e4f64219c35b886b7d428de6aeeb69a6 phpmyadmin-2.10.1.ebuild 2485
+MISC ChangeLog 34627 RMD160 f65ec9a00ae8a097709cc536b722827280be7496 SHA1 d3ade92cc6016e8e17373d7565122bfbed385fef SHA256 a41d958cfe91368ee8f7a6101adcf294031dcd6a7014a5d53dac88fb6b9ef4a0
+MD5 f0d023006e37117c185f94cd3079d6cf ChangeLog 34627
+RMD160 f65ec9a00ae8a097709cc536b722827280be7496 ChangeLog 34627
+SHA256 a41d958cfe91368ee8f7a6101adcf294031dcd6a7014a5d53dac88fb6b9ef4a0 ChangeLog 34627
 MISC metadata.xml 182 RMD160 9b377947041edce61a201266f0c982e3b7c91d8d SHA1 a6d1f4b69883a0940325b7b4ad1de261c7b8c485 SHA256 cf12fb82ad3a864f109328701bfc9b17657184fdb51c04b4af301b3322def6c1
 MD5 4bfbfdac057f18787bab530fdaf64fdf metadata.xml 182
 RMD160 9b377947041edce61a201266f0c982e3b7c91d8d metadata.xml 182
@@ -41,10 +46,13 @@ SHA256 cf12fb82ad3a864f109328701bfc9b17657184fdb51c04b4af301b3322def6c1 metadata
 MD5 2ab8cb078ef01f847c80559485c119e3 files/digest-phpmyadmin-2.10.0.2 340
 RMD160 8233bc1915bdc85657f5b1325ac12735d820e1da files/digest-phpmyadmin-2.10.0.2 340
 SHA256 94c4c55bad7ce1cd7a001425fcc1573dcc9f3aeef2aed30acdfdce24bc85d759 files/digest-phpmyadmin-2.10.0.2 340
+MD5 708dac35c296ff43badb904922bb78d3 files/digest-phpmyadmin-2.10.1 334
+RMD160 4ffa5fa85d809f0630b72382dac2aa2a6bcd62e8 files/digest-phpmyadmin-2.10.1 334
+SHA256 1cd6d3dff125817c44e1cc7799443b20863e6604263ac6c5e7d5410b06c89112 files/digest-phpmyadmin-2.10.1 334
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFGWL62EzitwsaoONoRAtSwAJ92e+TamTSFinGkhetcTdtQU9cs5gCgwIOn
-r1qHJVrPlZXpIKvfaxA9vog=
-=0Rr+
+iD8DBQFGWMH4EzitwsaoONoRAn5AAJwMCGSbCusi7098gtdaG6gwixa9ewCcD9Xj
+zhoXWIhQYGkl8jDPr0ajebI=
+=pIwW
 -----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.10.1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.10.1
new file mode 100644
index 000000000000..3141c26b1626
--- /dev/null
+++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.10.1
@@ -0,0 +1,3 @@
+MD5 4426bbc1eadb43707b3a947891ae4d9e phpMyAdmin-2.10.1-all-languages-utf-8-only.tar.bz2 2155294
+RMD160 55e769c92c20c0b90e87fb4291b49b8229844fd1 phpMyAdmin-2.10.1-all-languages-utf-8-only.tar.bz2 2155294
+SHA256 78bbb7b9affb3f4671ecb1c97ebdd9338206978b3aca5653ceb5e0747ec1c8c8 phpMyAdmin-2.10.1-all-languages-utf-8-only.tar.bz2 2155294
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 70a380642b86..3c0db528ad79 100644
--- a/dev-db/phpmyadmin/files/postinstall-en-2.8.0.txt
+++ b/dev-db/phpmyadmin/files/postinstall-en-2.8.0.txt
@@ -1,18 +1,23 @@
-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!
+If this is a new installation:
 
-     mysql -u root -p < /usr/share/webapps/phpmyadmin/${PVR}/sqlscripts/mysql/${PVR}_create.sql
+1. Configure ${PN}:
+
+   a) Create config.inc.php. You can use the web-based installer:
 
-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
+   b) Alternatively, use an existing configuration:
 
    mkdir ${MY_INSTALLDIR}/config
    chmod o+rw ${MY_INSTALLDIR}/config
-   # if you want to edit existing configuration:
-   cp ${MY_INSTALLDIR}/config.inc.php ${MY_INSTALLDIR}/config/
+   cp <path to existing config.inc.php file>/config.inc.php ${MY_INSTALLDIR}/config/
+   chown -R ${VHOST_SERVER_UID}:${VHOST_SERVER_UID} ${MY_INSTALLDIR}/config
+
+   C) Alternatively, use the default config file in libraries/config.default.php
+
+   mkdir ${MY_INSTALLDIR}/config
+   chmod o+rw ${MY_INSTALLDIR}/config
+   cp ${MY_INSTALLDIR}/libraries/config.default.php ${MY_INSTALLDIR}/config/
    chown -R ${VHOST_SERVER_UID}:${VHOST_SERVER_UID} ${MY_INSTALLDIR}/config
 
 2. Be sure that the libraries/ directory is not visible. You can use the
@@ -20,7 +25,8 @@ 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
+If you are upgrading from an earlier version:
+
+1.  If you are using ${PN}'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/phpmyadmin-2.10.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.10.1.ebuild
new file mode 100644
index 000000000000..9feb18c5acc6
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-2.10.1.ebuild
@@ -0,0 +1,84 @@
+# 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.1.ebuild,v 1.1 2007/05/26 23:25:01 rl03 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 crypt 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"
+
+	#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
+}