Housekeeping

Package-Manager: portage-2.1.1_pre2-r6

5 files changed, 8 insertions, 204 deletions

diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index f9d55bfc6235..6b0ed9243179 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -17,42 +17,26 @@ 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.0.4.tar.bz2 1993879 RMD160 05d175d72c2ed25ef070bee56b69c1dd7d81665c SHA1 51d29a0f5008dde8e1b9bf88e8cefc954df14e00 SHA256 0002f8b93a9c4d2c18c0cb193065840fecf0470e7123c1a17dd73c1ad4d47273
-DIST phpMyAdmin-2.8.1.tar.bz2 2013450 RMD160 d51570e8bacabae619fbf0553e1aead7519c915e SHA1 b08b3c959e44ddbe88c1aca6c217c14aa84bfc5a SHA256 1fb9ac93d5df33679f796287818cfa579d94e6f073132ce8dea4be3730f3c30e
 DIST phpMyAdmin-2.8.2.tar.bz2 2013981 RMD160 56bf381358333f806d738c42891370d3b74d5d6e SHA1 1af7caee3c90e64e456fcc226d68f3ed88581289 SHA256 d359cfb70ae14dcfe055f4eacca9fbe10d13d88c93407c1816d2229125e56b7d
-EBUILD phpmyadmin-2.8.0.4.ebuild 2555 RMD160 e4ac5c8b7c7979fa11c82929d5aba1be4d2ac4f4 SHA1 68c43cc2cc6b77a590d9cebefa7cf9121dd25db2 SHA256 b55644211e1e703af2e289ee611462ea999557b6d2d31d82de380fca234c3c22
-MD5 01cc1805a0d37a2f4645d46637b6257c phpmyadmin-2.8.0.4.ebuild 2555
-RMD160 e4ac5c8b7c7979fa11c82929d5aba1be4d2ac4f4 phpmyadmin-2.8.0.4.ebuild 2555
-SHA256 b55644211e1e703af2e289ee611462ea999557b6d2d31d82de380fca234c3c22 phpmyadmin-2.8.0.4.ebuild 2555
-EBUILD phpmyadmin-2.8.1.ebuild 2554 RMD160 7a64a988696513b21ff7e29dd6cecd6b555abeac SHA1 c421687c0ad6795f807694489a9feff56c772902 SHA256 79191d141a753c294bf319eec1cbc0ac8aeae8eae0df928788b15e279bbbb670
-MD5 a83cede35b5cd1cbd52ef52e69fdf9b7 phpmyadmin-2.8.1.ebuild 2554
-RMD160 7a64a988696513b21ff7e29dd6cecd6b555abeac phpmyadmin-2.8.1.ebuild 2554
-SHA256 79191d141a753c294bf319eec1cbc0ac8aeae8eae0df928788b15e279bbbb670 phpmyadmin-2.8.1.ebuild 2554
 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 26792 RMD160 1d1f8d2312361bfeae75bd64478169713cf20868 SHA1 213943bfdeba7254ec14fd4add24859292293eb2 SHA256 26865a5923843c0efe425785d234c0bad5cbad76ca98bf10b5ffa23989640d57
-MD5 4c5a3126e64c038be5a2cb48c16897c1 ChangeLog 26792
-RMD160 1d1f8d2312361bfeae75bd64478169713cf20868 ChangeLog 26792
-SHA256 26865a5923843c0efe425785d234c0bad5cbad76ca98bf10b5ffa23989640d57 ChangeLog 26792
+MISC ChangeLog 26908 RMD160 1699bc96d3465fe24ca38fd584c3abc00a262fb8 SHA1 50ecba17397f7b48e04d9d61e959803e4752a8e1 SHA256 24396e1f1a0d712d25dbeb052d1e6d6af66f9ef237ac4628295c2e39734a9e0b
+MD5 84f5d62fda8b7bb7f024d7268621500a ChangeLog 26908
+RMD160 1699bc96d3465fe24ca38fd584c3abc00a262fb8 ChangeLog 26908
+SHA256 24396e1f1a0d712d25dbeb052d1e6d6af66f9ef237ac4628295c2e39734a9e0b ChangeLog 26908
 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 e5f38debc7a11dd6a59f4516022606d8 files/digest-phpmyadmin-2.8.0.4 262
-RMD160 b44985b111c590b7b908877dade958b37d4ddac4 files/digest-phpmyadmin-2.8.0.4 262
-SHA256 b442e86133e60e2cdc6f852c529e1a7e017e25a1a470171b8e5df63910813c5a files/digest-phpmyadmin-2.8.0.4 262
-MD5 9f94daf03eb0ef677cfb5bc1b928fe55 files/digest-phpmyadmin-2.8.1 256
-RMD160 ad22f03fa0bfae8a5d676ebce031aa4138b45bdf files/digest-phpmyadmin-2.8.1 256
-SHA256 8f1caaf769a42ae22690cb13ff14517baf62b0b816279ba9a3c7e2c78f08027f files/digest-phpmyadmin-2.8.1 256
 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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEsn2A2ZWR0Jhg/EsRAsOJAJ4xWlw6ypF2h9LgrW4nyCVIS13OigCfY1uB
-wdkc7nf0DhoZdarm8A5l/pM=
-=YAiX
+iD8DBQFExUKjEzitwsaoONoRAqRIAKCQvuO3ih3p289BnILOXKZZ2MSfqACg22Tr
+KFMlP5pGAwU75pGBFPLNIIw=
+=WoFs
 -----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.0.4 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.0.4
deleted file mode 100644
index a50bd6067898..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.0.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f7bfa65e72a78a96850799fca6bb70ca phpMyAdmin-2.8.0.4.tar.bz2 1993879
-RMD160 05d175d72c2ed25ef070bee56b69c1dd7d81665c phpMyAdmin-2.8.0.4.tar.bz2 1993879
-SHA256 0002f8b93a9c4d2c18c0cb193065840fecf0470e7123c1a17dd73c1ad4d47273 phpMyAdmin-2.8.0.4.tar.bz2 1993879
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.1
deleted file mode 100644
index 529a27927a56..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 82d7ed4a71608fd7eeef5510c4a49056 phpMyAdmin-2.8.1.tar.bz2 2013450
-RMD160 d51570e8bacabae619fbf0553e1aead7519c915e phpMyAdmin-2.8.1.tar.bz2 2013450
-SHA256 1fb9ac93d5df33679f796287818cfa579d94e6f073132ce8dea4be3730f3c30e phpMyAdmin-2.8.1.tar.bz2 2013450
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.8.0.4.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.8.0.4.ebuild
deleted file mode 100644
index f03f2987b081..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.8.0.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.0.4.ebuild,v 1.6 2006/05/15 17:39:04 killerfox 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.8.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.8.1.ebuild
deleted file mode 100644
index 3f08908d9ff8..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.8.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.8.1.ebuild,v 1.1 2006/05/21 19:29:13 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
-}