new version. fixes issue with PHP warnings enabled. fixes bug #234767. discussed commit with robbat2 and trapni

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25-gentoo-r6 x86_64

3 files changed, 77 insertions, 5 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 4638a94c5963..5fef72486b29 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.323 2008/08/09 21:30:41 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.324 2008/08/21 14:07:39 cardoe Exp $
+
+*phpmyadmin-2.11.8.1 (21 Aug 2008)
+
+  21 Aug 2008; Doug Goldstein <cardoe@gentoo.org>
+  +phpmyadmin-2.11.8.1.ebuild:
+  new version. fixes issue with PHP warnings enabled. fixes bug #234767.
+  discussed commit with robbat2 and trapni
 
   09 Aug 2008; Christian Hoffmann <hoffie@gentoo.org>
   phpmyadmin-2.11.8.ebuild:
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 45929c4f2272..1538c9268db9 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -5,13 +5,15 @@ AUX phpmyadmin-2.11.5-custom-cert.patch 1000 RMD160 e8ae7f29c5958e8626c91bf62600
 AUX postinstall-en-2.8.0.txt 1117 RMD160 09838ab10f2f2cc44ca6154d182ddb573905f12c SHA1 c0c08a1ca71c54a1c900221a5bfd1fd12ecbb04a SHA256 b353e94a59c71131bc617f2e2c2b8d659c67d9277c86d20545da6b26bb08d12d
 AUX reconfig-2.8 329 RMD160 993162aa564ab7d37c7f32db439518c5cab9ace5 SHA1 0557bde5e20a06f46c4a7b1733038f7dc9745965 SHA256 526f7efb31adde131ffaff0271ea12693315c2d4e8a1f96ae4af6947815d6612
 DIST phpMyAdmin-2.11.8-all-languages-utf-8-only.tar.bz2 2240917 RMD160 a339f55ac2ae8b4b28100fd156dde190eba3be3e SHA1 0051bb833e1f5951d297b2de562b6ce55de505b2 SHA256 f554fd5d4f57283514aec401ce621d96687f39fef2ce53984d93dbaca35c6d70
+DIST phpMyAdmin-2.11.8.1-all-languages-utf-8-only.tar.bz2 2242072 RMD160 91de205ef104bdbcab23ad0d31baa3bc9815443a SHA1 7158f0e7fa6378ba67101f2ac5dcec75e78a3241 SHA256 e934f0bbbca6c7ad19d8bc12502201840aa434e1370e370b019b5484d2701466
+EBUILD phpmyadmin-2.11.8.1.ebuild 1744 RMD160 58541f39496c0249ba2b956a90fc20e9961f8358 SHA1 cbd32486c83d5a1ea892900ccbc0fff670132569 SHA256 58f69fbc7743d3ac7cc7b9a766caecb1c86f6c2f7bcb9fe41387fa17101cbd4b
 EBUILD phpmyadmin-2.11.8.ebuild 1735 RMD160 726c0ca8f48610985a48b66b06ea3e1ea090a075 SHA1 779de7f9106d38a0ab0a065f4a62a139bada9ce3 SHA256 a4864d40305e350a049f25356a5ad7a903b8d503c4c6b0e6d19024dc5a36aef2
-MISC ChangeLog 43707 RMD160 495be6c204afe6ccce2bae4b6d03b8a0581d6b3b SHA1 5469cb2fc937d00d82b98304e204e275492bfff7 SHA256 227cde8acd48bcdef3b60fe524f63d751c28382e0b2f8b7c90243bc239cfd020
+MISC ChangeLog 43941 RMD160 86948cd5049b4faa1e54011f0b73c337f1b8b50d SHA1 8be27f61c19f459dcbe8c010df71e22acb0d236c SHA256 a73ddef3a039c704407c3447109d20105aa3edd721ebcf943b869ceab3cfd633
 MISC metadata.xml 182 RMD160 9b377947041edce61a201266f0c982e3b7c91d8d SHA1 a6d1f4b69883a0940325b7b4ad1de261c7b8c485 SHA256 cf12fb82ad3a864f109328701bfc9b17657184fdb51c04b4af301b3322def6c1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkieDIcACgkQV6E0EIywUuV9AgCdEYx7A5UjODkjz7PQlb7EYRev
-noYAnio+SFk9cRIbW7D4jSTNT/4CqskT
-=ofb/
+iEYEARECAAYFAkitdrgACgkQoeSe8B0zEfzjnwCfb6rckmO6mmghX80aTn2Yfaom
+NgEAn1/fp1m0CrQAzU8twdKWRUg2OB98
+=SSUL
 -----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.11.8.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.11.8.1.ebuild
new file mode 100644
index 000000000000..2566eea088c1
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-2.11.8.1.ebuild
@@ -0,0 +1,63 @@
+# 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.8.1.ebuild,v 1.1 2008/08/21 14:07:40 cardoe 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 "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
+}