Version bump. Fixed setup path in postinstall info, filter is now requirement in php, bug #254764, thank Jamie Learmonth for this work. Removed old.

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

5 files changed, 54 insertions, 74 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index e6dff2bd3898..f668cdd56f3b 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.357 2009/01/05 17:31:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.358 2009/01/24 11:30:10 pva Exp $
+
+*phpmyadmin-3.1.2 (24 Jan 2009)
+
+  24 Jan 2009; Peter Volkov <pva@gentoo.org> +files/postinstall-en-3.1.txt,
+  -phpmyadmin-2.11.9.3.ebuild, -phpmyadmin-3.1.1.ebuild,
+  +phpmyadmin-3.1.2.ebuild:
+  Version bump. Fixed setup path in postinstall info, filter is now
+  requirement in php, bug #254764, thank Jamie Learmonth for this work.
+  Removed old.
 
   05 Jan 2009; Raúl Porcel <armin76@gentoo.org> phpmyadmin-2.11.9.4.ebuild:
   alpha stable wrt #250752
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 320258683c3c..80c267d4af40 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,11 +1,10 @@
 AUX phpmyadmin-2.11.5-custom-cert.patch 1000 RMD160 e8ae7f29c5958e8626c91bf626008ec79c77ae8c SHA1 90f8e5d61a0620a6855a47097124e0b9adca5e0f SHA256 68eda0cf9dc0bdd90f59f334842483906e8330400e314c40ddbad2f7f97981c6
 AUX postinstall-en-2.8.0.txt 1117 RMD160 09838ab10f2f2cc44ca6154d182ddb573905f12c SHA1 c0c08a1ca71c54a1c900221a5bfd1fd12ecbb04a SHA256 b353e94a59c71131bc617f2e2c2b8d659c67d9277c86d20545da6b26bb08d12d
+AUX postinstall-en-3.1.txt 1106 RMD160 75302bc9009db38cd7564feb5f48a776ab6457e8 SHA1 fab327c0a7212c85e283632a83d3899aa4388f2c SHA256 80296f8df3e1c7740f205bd876c841dd5712a262c4d903034f5db6fb8f26448a
 AUX reconfig-2.8 329 RMD160 993162aa564ab7d37c7f32db439518c5cab9ace5 SHA1 0557bde5e20a06f46c4a7b1733038f7dc9745965 SHA256 526f7efb31adde131ffaff0271ea12693315c2d4e8a1f96ae4af6947815d6612
-DIST phpMyAdmin-2.11.9.3-all-languages-utf-8-only.tar.bz2 2243495 RMD160 5e030f3ae0ef112f3cf9da7f4d3c51a8a8199f2f SHA1 181a7a942b345e51a41567b22388e9690b3907ef SHA256 bb272272c242caa8dc8fe806d25cf3d616b76d62368dec02c002c9572566bdde
 DIST phpMyAdmin-2.11.9.4-all-languages-utf-8-only.tar.bz2 2243244 RMD160 dff596b0ecd38d461650662cb6542aa868e64302 SHA1 469a15667a53f962ddd89e2b5c0b2a76fe197be4 SHA256 fbbb5a7d87df3d0ca13b8b7758cef46d4570b2ecb1776a4f26009ac2f76f320a
-DIST phpMyAdmin-3.1.1-all-languages.tar.bz2 2643658 RMD160 2f3e97d4b935c2bcd90c2d9005efb51a139cec88 SHA1 89cc0425323bdd4d6865688b93bc24b713513d07 SHA256 6d5f7f85446a892d02cd89831bf4bd4e642b425686b1d36427d7b38c458218ad
-EBUILD phpmyadmin-2.11.9.3.ebuild 1744 RMD160 b88d54615eff7c3c605216045d639bec36d96ef4 SHA1 cfe36cc04b0db3a94ec1965df9ed4eb704571630 SHA256 be9bf450dc0982807290f1c989f4fe1485d3b20b8dbcb953975c40dfdfee7a2b
+DIST phpMyAdmin-3.1.2-all-languages.tar.bz2 2647073 RMD160 7b8403d4f0c6330ef16a86504d87ae798e133c03 SHA1 c5e43fb49888bd31df968c386a456b1b07125fb7 SHA256 1c4a6b016f2e7d5b7042e500963786a04990c55c2a8aa6b7db4b4029c3db9cb6
 EBUILD phpmyadmin-2.11.9.4.ebuild 1744 RMD160 16e704cd7dd248a0cc81db0c2d57908c4bc67009 SHA1 f74e793c9dbb5a1f641d2dadfa1ee049a1f78f05 SHA256 45ea5b16854dfe2183f3ff0ede4e0af5d0aa1d3be8b89db1ccac89a3c990b7ff
-EBUILD phpmyadmin-3.1.1.ebuild 1682 RMD160 fdac61fdd180e17e8d66e536552b7ec297d74ee5 SHA1 20a4a45de66452f3bc3216ef41d5860fb01e3e80 SHA256 3918d2d3e73a4e31691d60938a18ebea174dc6f2e2ac939c8bff4209496cfd4f
-MISC ChangeLog 48486 RMD160 97a1787a45344581e523a74dc10339f83761b487 SHA1 698cbfbc952afedf0e98db7f5f8aca05d2ffca7b SHA256 6f5ab906b3abe0f331538acaa611af524d33aaf6c1a5dc6e07b09f04ac0618cf
+EBUILD phpmyadmin-3.1.2.ebuild 1691 RMD160 338e845f9b23be871533ab6d27c4bef31b714ab7 SHA1 135730701971e41bb49ad77101ee0bda3cc7c2b7 SHA256 3d10224332119ef9e3bb71e5ee5d5f3e31b0650ac9a4583ed0e6b299a2feceae
+MISC ChangeLog 48832 RMD160 3e6c75b77c2a5db3a804bf861ecdc06d05fef7d7 SHA1 604443d8f9aa3c4e4c1de0f7968cc0af0a6ac8a9 SHA256 8d26e5db5a47a3657ee96a1ca80e764c478ba5b55e7e051428850acea6d81205
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
diff --git a/dev-db/phpmyadmin/files/postinstall-en-3.1.txt b/dev-db/phpmyadmin/files/postinstall-en-3.1.txt
new file mode 100644
index 000000000000..29a8dc77ba7a
--- /dev/null
+++ b/dev-db/phpmyadmin/files/postinstall-en-3.1.txt
@@ -0,0 +1,35 @@
+If this is a new installation:
+
+1. Configure ${PN}:
+
+a) Create config.inc.php. You can use the web-based installer:
+
+   mkdir ${MY_INSTALLDIR}/config
+   chown ${VHOST_SERVER_UID}:${VHOST_SERVER_UID} ${MY_INSTALLDIR}/config
+
+   then go to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/setup/
+
+   once you've saved the configuration:
+
+   cp ${MY_INSTALLDIR}/config/config.inc.php ${MY_INSTALLDIR}/config.inc.php
+   rm -rf ${MY_INSTALLDIR}/config
+
+b) Alternatively, use an existing configuration:
+
+   cp <path to existing config.inc.php file> ${MY_INSTALLDIR}/
+
+c) Alternatively, use the sample config file:
+
+   cp ${MY_INSTALLDIR}/config.sample.inc.php ${MY_INSTALLDIR}/config.inc.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:
+
+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.11.9.3.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.11.9.3.ebuild
deleted file mode 100644
index 31221f6d7cc7..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.11.9.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.11.9.3.ebuild,v 1.7 2008/11/14 21:42:48 robbat2 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=""
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}"/${MY_P}
-
-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 "crypt 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
-		die "Re-install ${PHP_PKG}"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-2.11.5-custom-cert.patch
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc CREDITS Documentation.txt INSTALL README RELEASE-DATE-${MY_PV} TODO ChangeLog
-	rm -f LICENSE CREDITS INSTALL README RELEASE-DATE-${MY_PV} TODO
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	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
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-3.1.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-3.1.2.ebuild
index 151fe0f1961e..a4ec5d84c15f 100644
--- a/dev-db/phpmyadmin/phpmyadmin-3.1.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-3.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.1.1.ebuild,v 1.1 2008/12/28 20:53:39 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.1.2.ebuild,v 1.1 2009/01/24 11:30:10 pva Exp $
 
 inherit eutils webapp depend.php
 
@@ -25,13 +25,13 @@ S="${WORKDIR}"/${MY_P}
 pkg_setup() {
 	webapp_pkg_setup
 
-	if ! PHPCHECKNODIE="yes" require_php_with_use crypt ctype pcre session spl unicode \
+	if ! PHPCHECKNODIE="yes" require_php_with_use crypt ctype filter pcre session spl 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 "crypt ctype pcre session spl unicode"
+		eerror "crypt ctype filter pcre session spl unicode"
 		eerror
 		eerror "as well as any of the following USE flags enabled:"
 		eerror
@@ -53,7 +53,7 @@ src_install() {
 	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_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
 	webapp_hook_script "${FILESDIR}"/reconfig-2.8
 	webapp_src_install
 }