Version bump (#133204), fixed multiple dies (#133103).

Package-Manager: portage-2.1_pre10-r5

4 files changed, 111 insertions, 8 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 5b09dc437bb1..53139e4a60ea 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.177 2006/05/12 11:21:20 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.178 2006/05/13 16:04:35 rl03 Exp $
+
+*phpmyadmin-2.8.0.4 (13 May 2006)
+
+  13 May 2006; Renat Lumpau <rl03@gentoo.org> +phpmyadmin-2.8.0.4.ebuild:
+  Version bump (#133204), fixed multiple dies (#133103).
 
   12 May 2006; Renat Lumpau <rl03@gentoo.org> -files/reconfig-2.7,
   -files/config.default.php-2.7.0.patch, -files/postinstall-en.txt,
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 24072523f17e..fc68d31088f5 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -18,14 +18,19 @@ MD5 cf0af0543cb29eb88163220df6f14669 files/reconfig-2.8 329
 RMD160 993162aa564ab7d37c7f32db439518c5cab9ace5 files/reconfig-2.8 329
 SHA256 526f7efb31adde131ffaff0271ea12693315c2d4e8a1f96ae4af6947815d6612 files/reconfig-2.8 329
 DIST phpMyAdmin-2.8.0.3.tar.bz2 2011518 RMD160 d40d236c4041c16a1d06e1c158f14707938ab16c SHA256 89a15217b9b090ec01e1a4b90c90b2df2ac6b6e192c64385c816d33cc7efaff0 size 2011518
+DIST phpMyAdmin-2.8.0.4.tar.bz2 1993879 RMD160 05d175d72c2ed25ef070bee56b69c1dd7d81665c SHA256 0002f8b93a9c4d2c18c0cb193065840fecf0470e7123c1a17dd73c1ad4d47273 size 1993879
 EBUILD phpmyadmin-2.8.0.3.ebuild 2391 RMD160 2db5696d10b2b3a32f88589d9f98e77cee54043e SHA1 0f98082d72ec64d0865b247c98a347adb6bfa23c SHA256 697061c4acd247fbc7055eea1df8d543c03cc71bf1b08f1a03dfa9829a3d828b size 2391
 MD5 389943a690695121dc305e56437d087f phpmyadmin-2.8.0.3.ebuild 2391
 RMD160 2db5696d10b2b3a32f88589d9f98e77cee54043e phpmyadmin-2.8.0.3.ebuild 2391
 SHA256 697061c4acd247fbc7055eea1df8d543c03cc71bf1b08f1a03dfa9829a3d828b phpmyadmin-2.8.0.3.ebuild 2391
-MISC ChangeLog 24800 RMD160 c439dc6a0fb87219cee7abe966e88687adc9a83f SHA1 9b59e51346645777b4f50c2dc1ae377fc193fc9e SHA256 bb91c9fc6e1056c0a3e7fe498efbdba6c03f967789459e8e2aa0fd6ba604b772 size 24800
-MD5 ab914ebbc9005299a5de287de49da5b6 ChangeLog 24800
-RMD160 c439dc6a0fb87219cee7abe966e88687adc9a83f ChangeLog 24800
-SHA256 bb91c9fc6e1056c0a3e7fe498efbdba6c03f967789459e8e2aa0fd6ba604b772 ChangeLog 24800
+EBUILD phpmyadmin-2.8.0.4.ebuild 2556 RMD160 97f23d804a9394ce825e1c0a1aae714044f9a084 SHA1 9a3a68c069136decac0186f7e6203db9e41fd90d SHA256 ebda1e10bdf5b79c488b15e7e57bf833d97134a33a76ffaf5e186c38df8f3912 size 2556
+MD5 dc6697077be534c2f0116888e27051b8 phpmyadmin-2.8.0.4.ebuild 2556
+RMD160 97f23d804a9394ce825e1c0a1aae714044f9a084 phpmyadmin-2.8.0.4.ebuild 2556
+SHA256 ebda1e10bdf5b79c488b15e7e57bf833d97134a33a76ffaf5e186c38df8f3912 phpmyadmin-2.8.0.4.ebuild 2556
+MISC ChangeLog 24967 RMD160 e098d1c29b7e305bc152917a36f14ce65c9fe072 SHA1 0fa736d7f92239967a6c6ad42e3cfab4fffbd11c SHA256 80b85ad8692ab63c4ba0cf86eb195962989211bd33e681475b713d7c968f1db4 size 24967
+MD5 79e62b4532188c18650f30e170f6015b ChangeLog 24967
+RMD160 e098d1c29b7e305bc152917a36f14ce65c9fe072 ChangeLog 24967
+SHA256 80b85ad8692ab63c4ba0cf86eb195962989211bd33e681475b713d7c968f1db4 ChangeLog 24967
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0 size 162
 MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 metadata.xml 162
@@ -33,10 +38,13 @@ SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0 metadata
 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
+MD5 e5f38debc7a11dd6a59f4516022606d8 files/digest-phpmyadmin-2.8.0.4 262
+RMD160 b44985b111c590b7b908877dade958b37d4ddac4 files/digest-phpmyadmin-2.8.0.4 262
+SHA256 b442e86133e60e2cdc6f852c529e1a7e017e25a1a470171b8e5df63910813c5a files/digest-phpmyadmin-2.8.0.4 262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEZG+5EzitwsaoONoRAumCAJ4zbHw6XUgHI7o0Vz6o1GhCMHLblACcD3Ly
-qrNGlhgE2tJ7wA4KNGB/lv4=
-=RzWo
+iD8DBQFEZgO6EzitwsaoONoRAh0XAJ991PTSSm5YqnCpklDqGTI1nXm7DQCfc40d
+YjMQH1QgSAXuhE0l+4cwGIM=
+=c87p
 -----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.0.4 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.0.4
new file mode 100644
index 000000000000..a50bd6067898
--- /dev/null
+++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.0.4
@@ -0,0 +1,3 @@
+MD5 f7bfa65e72a78a96850799fca6bb70ca phpMyAdmin-2.8.0.4.tar.bz2 1993879
+RMD160 05d175d72c2ed25ef070bee56b69c1dd7d81665c phpMyAdmin-2.8.0.4.tar.bz2 1993879
+SHA256 0002f8b93a9c4d2c18c0cb193065840fecf0470e7123c1a17dd73c1ad4d47273 phpMyAdmin-2.8.0.4.tar.bz2 1993879
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.8.0.4.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.8.0.4.ebuild
new file mode 100644
index 000000000000..1661403973b0
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-2.8.0.4.ebuild
@@ -0,0 +1,87 @@
+# 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.4.ebuild,v 1.1 2006/05/13 16:04:36 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 ~x86-fbsd"
+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
+
+	if ! PHPCHECKNODIE="yes" require_php_with_use 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 "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.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
+}