version bump, security bug #149849. cleaned out old versions

Package-Manager: portage-2.1.2_pre1

5 files changed, 15 insertions, 203 deletions

diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 7fc356af7cda..8376711f5c55 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -17,25 +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.4.tar.bz2 2014789 RMD160 e15d76200c8c2935d837ff7de7723ed0da312bab SHA1 82cee19e7fabc3a4efb0813751ca217ba6abcc09 SHA256 71693c6eedcdb616fa7195e36e27450b7ac0756e3f8f3275f54fb1b1db994ddf
 DIST phpMyAdmin-2.8.2.tar.bz2 2013981 RMD160 56bf381358333f806d738c42891370d3b74d5d6e SHA1 1af7caee3c90e64e456fcc226d68f3ed88581289 SHA256 d359cfb70ae14dcfe055f4eacca9fbe10d13d88c93407c1816d2229125e56b7d
-DIST phpMyAdmin-2.9.0.tar.bz2 2040824 RMD160 97a07b41db17306d42fdfae0521cc0ac78e897b0 SHA1 6564e636af81478ce05c1ab938888f6841ceeee6 SHA256 01e08a64b31c395cecb44dd1213956b4dbbc0a02af3cafaf6d566dd811819222
-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
+DIST phpMyAdmin-2.9.0.1.tar.bz2 2040595 RMD160 ebf0a75bd397336beebd6c8a87d9177094f876ad SHA1 4e88fdcafbed6e5874e66ab2d8bfbd77286bca43 SHA256 1491902a2e5614d506b6dc129116a640d2802ed3f210b2734579e72df5430b00
 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.ebuild 2554 RMD160 3463232ad81b740daaceef32a9efe287ce0daeca SHA1 b246d3673662e885516f0cd5fa67659e95093329 SHA256 539d73bbc7150e5256c4be787e86115f9cdc0ae25a55200802d571c0825b12af
-MD5 83ba1206d10495e904487232ce9e3a7f phpmyadmin-2.9.0.ebuild 2554
-RMD160 3463232ad81b740daaceef32a9efe287ce0daeca phpmyadmin-2.9.0.ebuild 2554
-SHA256 539d73bbc7150e5256c4be787e86115f9cdc0ae25a55200802d571c0825b12af phpmyadmin-2.9.0.ebuild 2554
-MISC ChangeLog 27750 RMD160 00c1235b2a8ebdc89f85d8980684217f3bf73a29 SHA1 ead5e1dcfadff5d0a5984f3095208a995fbc8e0a SHA256 9c9c0478f666caa6ebfc04e94a1ececa7f075378a16d86f44bef2cbe87f6801f
-MD5 36c6474258e296dd2e02f17c1ce4002d ChangeLog 27750
-RMD160 00c1235b2a8ebdc89f85d8980684217f3bf73a29 ChangeLog 27750
-SHA256 9c9c0478f666caa6ebfc04e94a1ececa7f075378a16d86f44bef2cbe87f6801f ChangeLog 27750
+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
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
 MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 metadata.xml 162
@@ -43,16 +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 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
-MD5 4b2e9a68c446d711f1ddff0e829aa335 files/digest-phpmyadmin-2.9.0 256
-RMD160 46243dbf5a13b3a9a5902156a3d5291a9d00fba5 files/digest-phpmyadmin-2.9.0 256
-SHA256 45cd8558312a5f4c3af572cf1c33b0aa4a62b790787053798998c015d67d2b8f files/digest-phpmyadmin-2.9.0 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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFFEygQEzitwsaoONoRAhxSAJ0Qy0+/C6q1kVKdIz72uLyzTLVAqgCfbzm6
-mOO9wurLF+wNA6fQLIhmWDI=
-=bgfJ
+iD8DBQFFIdu/EzitwsaoONoRAg5FAJ43QfRdnppke4XFtmIByPgmuXe+cQCeJCDs
+2qQQkcwVJ7HQkB9/WgeYmFk=
+=9Ltf
 -----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.2.4 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.2.4
deleted file mode 100644
index daa60fd48da2..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.2.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9f777c577a04b84100b94c70e8c5ac55 phpMyAdmin-2.8.2.4.tar.bz2 2014789
-RMD160 e15d76200c8c2935d837ff7de7723ed0da312bab phpMyAdmin-2.8.2.4.tar.bz2 2014789
-SHA256 71693c6eedcdb616fa7195e36e27450b7ac0756e3f8f3275f54fb1b1db994ddf phpMyAdmin-2.8.2.4.tar.bz2 2014789
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.9.0 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.9.0
deleted file mode 100644
index 161dd9e0fdee..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.9.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7157ce0246b356d5b60ec854f73eccc7 phpMyAdmin-2.9.0.tar.bz2 2040824
-RMD160 97a07b41db17306d42fdfae0521cc0ac78e897b0 phpMyAdmin-2.9.0.tar.bz2 2040824
-SHA256 01e08a64b31c395cecb44dd1213956b4dbbc0a02af3cafaf6d566dd811819222 phpMyAdmin-2.9.0.tar.bz2 2040824
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.8.2.4.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.8.2.4.ebuild
deleted file mode 100644
index 166c4f4b37c5..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.8.2.4.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.4.ebuild,v 1.1 2006/08/22 18:57:31 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
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.9.0.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.9.0.ebuild
deleted file mode 100644
index e328599daf28..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.9.0.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.ebuild,v 1.1 2006/09/22 00:01:33 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
-}