Version bump

(Portage version: 2.1.1_pre2-r6)
 (Signed Manifest commit)

3 files changed, 15 insertions, 105 deletions

diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index b0967d8dac66..0c659244f884 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -17,20 +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.3.tar.bz2 2014397 RMD160 5a1f5dd82cbbe4ba562449b358b74eed490622b1 SHA1 2bcccd5c36f42d6bef557f911cf4624784aa55b2 SHA256 15fe9002a12a17e53496e6beece6f600cb4f0d0315272553e702d7fb31f83b67
+DIST phpMyAdmin-2.8.2.4.tar.bz2 2014789 RMD160 e15d76200c8c2935d837ff7de7723ed0da312bab SHA1 82cee19e7fabc3a4efb0813751ca217ba6abcc09 SHA256 71693c6eedcdb616fa7195e36e27450b7ac0756e3f8f3275f54fb1b1db994ddf
 DIST phpMyAdmin-2.8.2.tar.bz2 2013981 RMD160 56bf381358333f806d738c42891370d3b74d5d6e SHA1 1af7caee3c90e64e456fcc226d68f3ed88581289 SHA256 d359cfb70ae14dcfe055f4eacca9fbe10d13d88c93407c1816d2229125e56b7d
-EBUILD phpmyadmin-2.8.2.3.ebuild 2556 RMD160 0c67ca0a5b14d508ffa069064b515c2615c45592 SHA1 c6fac328d3f69a4d9c6651919af7c4b57829ec52 SHA256 4eabd2e78b0bb5b91cba6af3d4af93a1cf1eefd4fda0462bbe27c7faa186e908
-MD5 148fcd206fc1fd76f0e5aa5c9f9fe15a phpmyadmin-2.8.2.3.ebuild 2556
-RMD160 0c67ca0a5b14d508ffa069064b515c2615c45592 phpmyadmin-2.8.2.3.ebuild 2556
-SHA256 4eabd2e78b0bb5b91cba6af3d4af93a1cf1eefd4fda0462bbe27c7faa186e908 phpmyadmin-2.8.2.3.ebuild 2556
+EBUILD phpmyadmin-2.8.2.4.ebuild 2556 RMD160 9d28e026525c745bf54467841b0f06daa23c6f46 SHA1 3529e03fe638c163036117fea9df5114266ba99e SHA256 8f8fbeae6b4ed1e6c2f488ba1124cc5e9a358ac3004c2615becc9d9205c3454d
+MD5 14abb0be32a03a575a1cc84ab083c380 phpmyadmin-2.8.2.4.ebuild 2556
+RMD160 9d28e026525c745bf54467841b0f06daa23c6f46 phpmyadmin-2.8.2.4.ebuild 2556
+SHA256 8f8fbeae6b4ed1e6c2f488ba1124cc5e9a358ac3004c2615becc9d9205c3454d phpmyadmin-2.8.2.4.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 27357 RMD160 e6e83fbb9253f64704775026ee3f5cf8017ecd26 SHA1 489dffdd927587b58d6fd6744aae44ceb47bfec7 SHA256 882fb5f6c7f3e43daee288714f90f4f61c85c54b0e72adc87dbce36c88faacd7
-MD5 2944ccff0352284972f61c3272e3c3c1 ChangeLog 27357
-RMD160 e6e83fbb9253f64704775026ee3f5cf8017ecd26 ChangeLog 27357
-SHA256 882fb5f6c7f3e43daee288714f90f4f61c85c54b0e72adc87dbce36c88faacd7 ChangeLog 27357
+MISC ChangeLog 27512 RMD160 2952f6605071d8a35574c92aaffabb53dc90bab1 SHA1 134871ef61152a74fc86b5b4232aabad8da7199b SHA256 5d9dc14689ffd6f4d705c49f58e2e6ce99b1f88c8cf7daa992e94cc557353c16
+MD5 029a4eeb65a2936eb9d42f0f4d0e0563 ChangeLog 27512
+RMD160 2952f6605071d8a35574c92aaffabb53dc90bab1 ChangeLog 27512
+SHA256 5d9dc14689ffd6f4d705c49f58e2e6ce99b1f88c8cf7daa992e94cc557353c16 ChangeLog 27512
 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 e396a5610ef653abe1674c584c03dd5b files/digest-phpmyadmin-2.8.2.3 262
-RMD160 38d2683e807d075c8e7592ecacefadb04a92e298 files/digest-phpmyadmin-2.8.2.3 262
-SHA256 62e59eb33a337f5ce6d5b847ae597c418b7a956f4421be4ee15bccdbc95bfa9f files/digest-phpmyadmin-2.8.2.3 262
+MD5 45b6de567dbd70812c586b6bf6ee25e0 files/digest-phpmyadmin-2.8.2.4 262
+RMD160 1219f80c84baec3266472c3250b01ac58e9921c8 files/digest-phpmyadmin-2.8.2.4 262
+SHA256 defac565efad664f094910748902a9d70d23e655b72d7dfb8ba1c99055164535 files/digest-phpmyadmin-2.8.2.4 262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFE6wZbEzitwsaoONoRAi98AJwPeC3t/Qr8w5Dazy48vbOu3jtRDQCgiYgM
-c/hFjfcx0Imsh2rHLGtlFPE=
-=78Kz
+iD8DBQFE61OjEzitwsaoONoRArk1AJ9gzLj81WsS2+Ym4ph81jz3I3rrvgCg3z+v
+0uU3qgkjWSdxswzuEkcU+Ro=
+=vbk3
 -----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.2.3 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.2.3
deleted file mode 100644
index 63ed31439de3..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.2.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c991cba399618248c3c0e6a00846e1d9 phpMyAdmin-2.8.2.3.tar.bz2 2014397
-RMD160 5a1f5dd82cbbe4ba562449b358b74eed490622b1 phpMyAdmin-2.8.2.3.tar.bz2 2014397
-SHA256 15fe9002a12a17e53496e6beece6f600cb4f0d0315272553e702d7fb31f83b67 phpMyAdmin-2.8.2.3.tar.bz2 2014397
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.8.2.3.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.8.2.3.ebuild
deleted file mode 100644
index 4198f8508826..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.8.2.3.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.8.2.3.ebuild,v 1.1 2006/08/22 13:27:44 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
-}