Version bump

Package-Manager: portage-2.1.1_pre2-r6

4 files changed, 111 insertions, 8 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index ec642e2b9711..c16bf27b857c 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.195 2006/07/24 21:58:50 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.196 2006/08/03 03:47:06 rl03 Exp $
+
+*phpmyadmin-2.8.2.1 (03 Aug 2006)
+
+  03 Aug 2006; Renat Lumpau <rl03@gentoo.org> +phpmyadmin-2.8.2.1.ebuild:
+  Version bump
 
   24 Jul 2006; Renat Lumpau <rl03@gentoo.org> -phpmyadmin-2.8.0.4.ebuild,
   -phpmyadmin-2.8.1.ebuild:
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 6b0ed9243179..97ac40888fc0 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -17,15 +17,20 @@ AUX reconfig-2.8 329 RMD160 993162aa564ab7d37c7f32db439518c5cab9ace5 SHA1 0557bd
 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.2.1.tar.bz2 2014791 RMD160 619007a2b637eda9d70af3d84ae40f0d207ef053 SHA1 1e38597e2def8f7b064a7980a5e7c085ffba0fe3 SHA256 3de84bd3466eff22b55ffb6643a08c96145b76b68300b9f52ea0562d0eeda76c
 DIST phpMyAdmin-2.8.2.tar.bz2 2013981 RMD160 56bf381358333f806d738c42891370d3b74d5d6e SHA1 1af7caee3c90e64e456fcc226d68f3ed88581289 SHA256 d359cfb70ae14dcfe055f4eacca9fbe10d13d88c93407c1816d2229125e56b7d
+EBUILD phpmyadmin-2.8.2.1.ebuild 2556 RMD160 89ab5789fafe78e7be80bab268ac3cf8d09a8795 SHA1 f250eb29d4f884cfab81e34c3e986d672bd7cafa SHA256 c03fb84afec3cd6fdb74e02d656fc30ff14b22aae5a0e5002461eb949556d58e
+MD5 46712db15e5d051b5a309b1287e2be12 phpmyadmin-2.8.2.1.ebuild 2556
+RMD160 89ab5789fafe78e7be80bab268ac3cf8d09a8795 phpmyadmin-2.8.2.1.ebuild 2556
+SHA256 c03fb84afec3cd6fdb74e02d656fc30ff14b22aae5a0e5002461eb949556d58e phpmyadmin-2.8.2.1.ebuild 2556
 EBUILD phpmyadmin-2.8.2.ebuild 2550 RMD160 40aac346f531916d4e81dc5e202b6822fd2915ab SHA1 6c0e9d50253531395becaeb12a70947db509c843 SHA256 61d765e923cbb14a92c6570005592656ba460c18c16c9bd90fa566265a6b08dd
 MD5 a0b9dd019b1c976aa27c107d5fd3ff43 phpmyadmin-2.8.2.ebuild 2550
 RMD160 40aac346f531916d4e81dc5e202b6822fd2915ab phpmyadmin-2.8.2.ebuild 2550
 SHA256 61d765e923cbb14a92c6570005592656ba460c18c16c9bd90fa566265a6b08dd phpmyadmin-2.8.2.ebuild 2550
-MISC ChangeLog 26908 RMD160 1699bc96d3465fe24ca38fd584c3abc00a262fb8 SHA1 50ecba17397f7b48e04d9d61e959803e4752a8e1 SHA256 24396e1f1a0d712d25dbeb052d1e6d6af66f9ef237ac4628295c2e39734a9e0b
-MD5 84f5d62fda8b7bb7f024d7268621500a ChangeLog 26908
-RMD160 1699bc96d3465fe24ca38fd584c3abc00a262fb8 ChangeLog 26908
-SHA256 24396e1f1a0d712d25dbeb052d1e6d6af66f9ef237ac4628295c2e39734a9e0b ChangeLog 26908
+MISC ChangeLog 27033 RMD160 e4c49095f5c6c378633b1e607a67e55072285642 SHA1 c9a77187747075b40157438d58b57a4b26d8aadf SHA256 5154a2b925b940873fdf8af68d2688926b79ea54c9cc69fd52ffb75a8a60159b
+MD5 607341c1991f04c3fd197f2dd84385b5 ChangeLog 27033
+RMD160 e4c49095f5c6c378633b1e607a67e55072285642 ChangeLog 27033
+SHA256 5154a2b925b940873fdf8af68d2688926b79ea54c9cc69fd52ffb75a8a60159b ChangeLog 27033
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
 MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 metadata.xml 162
@@ -33,10 +38,13 @@ SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0 metadata
 MD5 787a7a740a00675635448b770bcbc5d9 files/digest-phpmyadmin-2.8.2 256
 RMD160 0d1628619a79fc51fd12606bba983321ea938288 files/digest-phpmyadmin-2.8.2 256
 SHA256 23b7988ccb64df8bb408618c70956da0954dff8d87673e5db550ea799692b33d files/digest-phpmyadmin-2.8.2 256
+MD5 1684919741b56b03ea94ac943ac97e49 files/digest-phpmyadmin-2.8.2.1 262
+RMD160 23779d724d8230cdadc240c5cf333714b374d8c0 files/digest-phpmyadmin-2.8.2.1 262
+SHA256 2ff61187fd1bd31bd0526dc11211d47eaa78a296f806a370166cb92a3984c4e9 files/digest-phpmyadmin-2.8.2.1 262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFExUKjEzitwsaoONoRAqRIAKCQvuO3ih3p289BnILOXKZZ2MSfqACg22Tr
-KFMlP5pGAwU75pGBFPLNIIw=
-=WoFs
+iD8DBQFE0XHHEzitwsaoONoRAk7/AJ9d8PmCnQUEW6f8JYWKn9MhSNe/RACgvq6O
+DVu06oV1Bf2tiQWc0/fkvO4=
+=oJRk
 -----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.2.1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.2.1
new file mode 100644
index 000000000000..eabd7de0d1eb
--- /dev/null
+++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.2.1
@@ -0,0 +1,3 @@
+MD5 dd11f126650c88eda95c4b719663811f phpMyAdmin-2.8.2.1.tar.bz2 2014791
+RMD160 619007a2b637eda9d70af3d84ae40f0d207ef053 phpMyAdmin-2.8.2.1.tar.bz2 2014791
+SHA256 3de84bd3466eff22b55ffb6643a08c96145b76b68300b9f52ea0562d0eeda76c phpMyAdmin-2.8.2.1.tar.bz2 2014791
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.8.2.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.8.2.1.ebuild
new file mode 100644
index 000000000000..24469783722e
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-2.8.2.1.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.2.1.ebuild,v 1.1 2006/08/03 03:47:06 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
+}