Cleaned out old versions. Version bump.

(Portage version: 2.1.2_rc1-r5)
 (Signed Manifest commit)

5 files changed, 22 insertions, 202 deletions

diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index b52a4ef5aa01..9d66a925b324 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX common.lib.php.diff 272 RMD160 47977c97e73ed2d5a09e9951c7f814eb993a04ec SHA1 3358710b668b33e348d640be2837fbb7c0cfad29 SHA256 066b0241e466db73d1f9ca694e96b6bb23a56e3e4fa16d9b31bf4e5d3fd6b57a
 MD5 da50258f238da90ef88e4600b6068a55 files/common.lib.php.diff 272
 RMD160 47977c97e73ed2d5a09e9951c7f814eb993a04ec files/common.lib.php.diff 272
@@ -18,34 +21,34 @@ 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.9.0.2.tar.bz2 2041197 RMD160 d344a2a5c84bcfe4b915d151e7bfb8a60d4e1712 SHA1 64a0f6bfdf1d4f0de1456d4b5d8f9dc9d76e6b63 SHA256 e8f9089a8e87191be751e989e4a3e11c2698865a5bcb8507e3361a58bbb4376a
 DIST phpMyAdmin-2.9.0.3-all-languages-utf-8-only.tar.bz2 1542886 RMD160 522c932bd1020652d1923e0c98118fa26cc02986 SHA1 45c11c5de79138cb472ca24f763e266797dd1cd2 SHA256 08e2e7997cd8e9c3123e22a7fc90ba0363928231edbd79e41651316b0c42669e
-EBUILD phpmyadmin-2.9.0.2-r1.ebuild 2643 RMD160 f49ac11eefe1d3f7ef3f8cc9141c24a18b43cc19 SHA1 6ad5e0d43b1e97c8d57785d535afe974932c9167 SHA256 bd7672ab13c5d31bffcaa8c1dadefabfb76853aac349a9dd536b8d4ee140b816
-MD5 206d21dbc1c8eedfeac7c50421c8cdf8 phpmyadmin-2.9.0.2-r1.ebuild 2643
-RMD160 f49ac11eefe1d3f7ef3f8cc9141c24a18b43cc19 phpmyadmin-2.9.0.2-r1.ebuild 2643
-SHA256 bd7672ab13c5d31bffcaa8c1dadefabfb76853aac349a9dd536b8d4ee140b816 phpmyadmin-2.9.0.2-r1.ebuild 2643
-EBUILD phpmyadmin-2.9.0.2.ebuild 2559 RMD160 6795da4805d2f19e97bc3a0f56d162a500934019 SHA1 873fbdb3cc9ae4ea205bfbc05aaab33c8279e2d5 SHA256 dd422a4b7109d6b3bd4402455d2d7185a8245dc730912bf3b8c1e14e83ca14a4
-MD5 b0ff5e14b63bf07fdb97da849d8e02f8 phpmyadmin-2.9.0.2.ebuild 2559
-RMD160 6795da4805d2f19e97bc3a0f56d162a500934019 phpmyadmin-2.9.0.2.ebuild 2559
-SHA256 dd422a4b7109d6b3bd4402455d2d7185a8245dc730912bf3b8c1e14e83ca14a4 phpmyadmin-2.9.0.2.ebuild 2559
+DIST phpMyAdmin-2.9.1-all-languages-utf-8-only.tar.bz2 1544946 RMD160 0eb4b6acde8ab3a9c35ead3d1a064ce1efbaf565 SHA1 7eda2decf117b644b0e7d22986b4020ddab3f287 SHA256 463a0cf156aab1c32e2a46a1b736f43614b97cf082b45b64147084a6211f7905
 EBUILD phpmyadmin-2.9.0.3.ebuild 2663 RMD160 949a8120f34dccd81a574e9592de558b2e393b2d SHA1 fb91ac035f80eadfede25ec36f1b70d573571cee SHA256 1f53a10ae64c95171817256bfa4f92edf34f8f05fc4b4a9a678f3114bb0782be
 MD5 93ebc2700e48feb8a6b1cf43daf440cd phpmyadmin-2.9.0.3.ebuild 2663
 RMD160 949a8120f34dccd81a574e9592de558b2e393b2d phpmyadmin-2.9.0.3.ebuild 2663
 SHA256 1f53a10ae64c95171817256bfa4f92edf34f8f05fc4b4a9a678f3114bb0782be phpmyadmin-2.9.0.3.ebuild 2663
-MISC ChangeLog 29967 RMD160 bc01e766dd68f871d6ce872d7c3e7b6569c457a2 SHA1 76170e0a641465eff2ad63c1b9156bdf6ceab76e SHA256 f7f007753d3752c5a35b700a00e7072639901cd5ff38e273d4c997a2d99a11bc
-MD5 45b741e5ef278ddb03b83db55319db7e ChangeLog 29967
-RMD160 bc01e766dd68f871d6ce872d7c3e7b6569c457a2 ChangeLog 29967
-SHA256 f7f007753d3752c5a35b700a00e7072639901cd5ff38e273d4c997a2d99a11bc ChangeLog 29967
+EBUILD phpmyadmin-2.9.1.ebuild 2665 RMD160 a6e8774e5298324e1d8203f39da4994acbcf9488 SHA1 2f7f9e3ca5eadfe14b8bdeef208dfa65db1f9757 SHA256 2a7fb406aa8c5e62a41354ff0335da90d5ecc2dea02551a3a46957c3a70e61c0
+MD5 8fd145f4cb4f4dfb1b33ef48a99165c9 phpmyadmin-2.9.1.ebuild 2665
+RMD160 a6e8774e5298324e1d8203f39da4994acbcf9488 phpmyadmin-2.9.1.ebuild 2665
+SHA256 2a7fb406aa8c5e62a41354ff0335da90d5ecc2dea02551a3a46957c3a70e61c0 phpmyadmin-2.9.1.ebuild 2665
+MISC ChangeLog 30173 RMD160 f4935b8f1072e09a3c7729298ff77222692674cd SHA1 005f3fd4b94a3e06f96636cc7e99a9a7e1e47a98 SHA256 a7bb05bceaf35dc78af3037dfa721312977918e8220fc77a0f8c1843a750b25b
+MD5 d27cf5a9a79f25a7c65bd708daf121e3 ChangeLog 30173
+RMD160 f4935b8f1072e09a3c7729298ff77222692674cd ChangeLog 30173
+SHA256 a7bb05bceaf35dc78af3037dfa721312977918e8220fc77a0f8c1843a750b25b ChangeLog 30173
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
 MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 metadata.xml 162
 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0 metadata.xml 162
-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
-MD5 e18685b04b3ca2bcba6bd098a14ff02d files/digest-phpmyadmin-2.9.0.2-r1 262
-RMD160 6e873b0cb5415a5400527ca22b3c4f4de188c01a files/digest-phpmyadmin-2.9.0.2-r1 262
-SHA256 9f3d9858f0dcaf4f07f0e3816ca9be7b3919c72f9c3bbde3716062afb221f291 files/digest-phpmyadmin-2.9.0.2-r1 262
 MD5 dfcd98d0ec2c0a0dbf11f7d122f17625 files/digest-phpmyadmin-2.9.0.3 337
 RMD160 0f4a7831e3f449ef58a64e2aa72a78c2edf2b918 files/digest-phpmyadmin-2.9.0.3 337
 SHA256 63bb1c6023a04ce4c8fef070f82ec27fabe31b65a2657aad96ea21c69b15bfc9 files/digest-phpmyadmin-2.9.0.3 337
+MD5 88174fc3a7299617336e581c9ceb5ee1 files/digest-phpmyadmin-2.9.1 331
+RMD160 51af71b750395cce38faafdee935139878e58b7c files/digest-phpmyadmin-2.9.1 331
+SHA256 07251dbec6a4f709faa0082f8cb03f995fccb71e4f3917e9ef90f5403a870bb1 files/digest-phpmyadmin-2.9.1 331
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFU6pREzitwsaoONoRAgksAJ9aYaAdisb8GqJfc5ZY2C2w9tA4XQCg2omX
+0aoEjF7aOLHzbR/IeDWUl/w=
+=Uz08
+-----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.9.0.2 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.9.0.2
deleted file mode 100644
index 176a761b0ca4..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.9.0.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c85e8b2b08dc7bd9be1e85ee38f5e4d9 phpMyAdmin-2.9.0.2.tar.bz2 2041197
-RMD160 d344a2a5c84bcfe4b915d151e7bfb8a60d4e1712 phpMyAdmin-2.9.0.2.tar.bz2 2041197
-SHA256 e8f9089a8e87191be751e989e4a3e11c2698865a5bcb8507e3361a58bbb4376a phpMyAdmin-2.9.0.2.tar.bz2 2041197
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.9.0.2-r1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.9.0.2-r1
deleted file mode 100644
index 176a761b0ca4..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.9.0.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c85e8b2b08dc7bd9be1e85ee38f5e4d9 phpMyAdmin-2.9.0.2.tar.bz2 2041197
-RMD160 d344a2a5c84bcfe4b915d151e7bfb8a60d4e1712 phpMyAdmin-2.9.0.2.tar.bz2 2041197
-SHA256 e8f9089a8e87191be751e989e4a3e11c2698865a5bcb8507e3361a58bbb4376a phpMyAdmin-2.9.0.2.tar.bz2 2041197
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.9.0.2-r1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.9.0.2-r1.ebuild
deleted file mode 100644
index 0dd32e6fbaee..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.9.0.2-r1.ebuild
+++ /dev/null
@@ -1,90 +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.2-r1.ebuild,v 1.1 2006/10/27 01:35:55 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 ~ppc64 ~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
-	# bug 152933
-	cd libraries && epatch ${FILESDIR}/common.lib.php.diff
-	cd ..
-
-	# 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.2.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.9.0.2.ebuild
deleted file mode 100644
index 336333c7495c..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.9.0.2.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.2.ebuild,v 1.7 2006/10/15 14:56:01 corsair 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 ppc64 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
-}