Version bump

Package-Manager: portage-2.1.2_pre1

3 files changed, 15 insertions, 105 deletions

diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 8376711f5c55..896868623d0d 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -18,19 +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.2.tar.bz2 2013981 RMD160 56bf381358333f806d738c42891370d3b74d5d6e SHA1 1af7caee3c90e64e456fcc226d68f3ed88581289 SHA256 d359cfb70ae14dcfe055f4eacca9fbe10d13d88c93407c1816d2229125e56b7d
-DIST phpMyAdmin-2.9.0.1.tar.bz2 2040595 RMD160 ebf0a75bd397336beebd6c8a87d9177094f876ad SHA1 4e88fdcafbed6e5874e66ab2d8bfbd77286bca43 SHA256 1491902a2e5614d506b6dc129116a640d2802ed3f210b2734579e72df5430b00
+DIST phpMyAdmin-2.9.0.2.tar.bz2 2041197 RMD160 d344a2a5c84bcfe4b915d151e7bfb8a60d4e1712 SHA1 64a0f6bfdf1d4f0de1456d4b5d8f9dc9d76e6b63 SHA256 e8f9089a8e87191be751e989e4a3e11c2698865a5bcb8507e3361a58bbb4376a
 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
-EBUILD phpmyadmin-2.9.0.1.ebuild 2556 RMD160 c4946f864bdd8a0aa8e94e94a84d0bf522cf72e7 SHA1 49d1e0447bc61b1cfd2721be7b6df74d83c219a4 SHA256 4015ce7f08fb0130a3bd94c4838f1dd2d2977f03911c48c3e28230334e55b8a1
-MD5 8f0102f90365a4a295791f1c2c9496b0 phpmyadmin-2.9.0.1.ebuild 2556
-RMD160 c4946f864bdd8a0aa8e94e94a84d0bf522cf72e7 phpmyadmin-2.9.0.1.ebuild 2556
-SHA256 4015ce7f08fb0130a3bd94c4838f1dd2d2977f03911c48c3e28230334e55b8a1 phpmyadmin-2.9.0.1.ebuild 2556
-MISC ChangeLog 27979 RMD160 d60c1cacb167e179e06dbd4ad91e3d385f7138be SHA1 f6281425b2da76d2bc26d867bb1ee1631fef21cc SHA256 ffa39a49a723f078312764f50be5f9b6125e08ba2f36c0ffa91ab88c0601520d
-MD5 14fc99fe562472ff541846c9d2a11cd7 ChangeLog 27979
-RMD160 d60c1cacb167e179e06dbd4ad91e3d385f7138be ChangeLog 27979
-SHA256 ffa39a49a723f078312764f50be5f9b6125e08ba2f36c0ffa91ab88c0601520d ChangeLog 27979
+EBUILD phpmyadmin-2.9.0.2.ebuild 2556 RMD160 eced06e83553b733be513da668dcf51d0ddb5af4 SHA1 a4209268819962c4552d9d45362ce4abf1a4c04a SHA256 d7598f4053a0324a45ef56d667a1ea4f5459699fe5b41c3eb478d6d22cd21835
+MD5 eb917606ca9746451ab5abd795c505a9 phpmyadmin-2.9.0.2.ebuild 2556
+RMD160 eced06e83553b733be513da668dcf51d0ddb5af4 phpmyadmin-2.9.0.2.ebuild 2556
+SHA256 d7598f4053a0324a45ef56d667a1ea4f5459699fe5b41c3eb478d6d22cd21835 phpmyadmin-2.9.0.2.ebuild 2556
+MISC ChangeLog 28134 RMD160 0835fe215b961b530c2147b9f0c7c551cfb63867 SHA1 26ac037b119705644b55a35a3355d7aa3c184b00 SHA256 f9b64ea3ae922b6b621a40c32af064418312ce513a2cdb2126e5bb948ac5c4c7
+MD5 6f17fcd44c4bf9e78b6985c8c038147a ChangeLog 28134
+RMD160 0835fe215b961b530c2147b9f0c7c551cfb63867 ChangeLog 28134
+SHA256 f9b64ea3ae922b6b621a40c32af064418312ce513a2cdb2126e5bb948ac5c4c7 ChangeLog 28134
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
 MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 metadata.xml 162
@@ -38,13 +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 e54e04cf1d16f27254c4f22f4d98b7fa files/digest-phpmyadmin-2.9.0.1 262
-RMD160 fe6c1c554700176d39f57e372889b1f2cce47479 files/digest-phpmyadmin-2.9.0.1 262
-SHA256 dd2b9a462692f0b4fac7f3a8b44660166d1fd03895ff6650b897a695ee39163e files/digest-phpmyadmin-2.9.0.1 262
+MD5 e18685b04b3ca2bcba6bd098a14ff02d files/digest-phpmyadmin-2.9.0.2 262
+RMD160 6e873b0cb5415a5400527ca22b3c4f4de188c01a files/digest-phpmyadmin-2.9.0.2 262
+SHA256 9f3d9858f0dcaf4f07f0e3816ca9be7b3919c72f9c3bbde3716062afb221f291 files/digest-phpmyadmin-2.9.0.2 262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFFIdu/EzitwsaoONoRAg5FAJ43QfRdnppke4XFtmIByPgmuXe+cQCeJCDs
-2qQQkcwVJ7HQkB9/WgeYmFk=
-=9Ltf
+iD8DBQFFIzEYEzitwsaoONoRAhRGAJ95BD8oWx+37eSth6ZG5bjW7NL4PACbB6jA
+Emuq7oJyTlo5/DqupKOxgnI=
+=B8iU
 -----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.9.0.1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.9.0.1
deleted file mode 100644
index 1611b8ada8cd..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.9.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 006fe1dc2ac4e6b15f246fe798e0e68f phpMyAdmin-2.9.0.1.tar.bz2 2040595
-RMD160 ebf0a75bd397336beebd6c8a87d9177094f876ad phpMyAdmin-2.9.0.1.tar.bz2 2040595
-SHA256 1491902a2e5614d506b6dc129116a640d2802ed3f210b2734579e72df5430b00 phpMyAdmin-2.9.0.1.tar.bz2 2040595
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.9.0.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.9.0.1.ebuild
deleted file mode 100644
index 59d311cb94e9..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.9.0.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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.9.0.1.ebuild,v 1.1 2006/10/03 03:40:38 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
-}