Housekeeping. Drop mysql dep per bug #159781.

Package-Manager: portage-2.1.2_rc4-r4

5 files changed, 18 insertions, 210 deletions

diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 9bf4d128bd34..02dd2c3d2009 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,35 +21,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.9.0.3-all-languages-utf-8-only.tar.bz2 1542886 RMD160 522c932bd1020652d1923e0c98118fa26cc02986 SHA1 45c11c5de79138cb472ca24f763e266797dd1cd2 SHA256 08e2e7997cd8e9c3123e22a7fc90ba0363928231edbd79e41651316b0c42669e
-DIST phpMyAdmin-2.9.1-all-languages-utf-8-only.tar.bz2 1544946 RMD160 0eb4b6acde8ab3a9c35ead3d1a064ce1efbaf565 SHA1 7eda2decf117b644b0e7d22986b4020ddab3f287 SHA256 463a0cf156aab1c32e2a46a1b736f43614b97cf082b45b64147084a6211f7905
 DIST phpMyAdmin-2.9.1.1-all-languages-utf-8-only.tar.bz2 1545641 RMD160 8c21b9450534f674931c3c056c4b0f34a0ba009f SHA1 12eb273ce3a91e0dcf5ba84b42acbd1f564233f8 SHA256 2a4b8379f0fbcdef6bbc3112be13fa19de67a564196456fda77e13642f7ac0e5
-EBUILD phpmyadmin-2.9.0.3.ebuild 2652 RMD160 d7c4290c4ea00750928e9aa6600ceff97f2085ca SHA1 1626615e9f8d0062908e54119490265c8fd6f740 SHA256 bd7ea4d79b2e3504176ff8400cb55c149aad8ca4a7cfc28b4620a275ce09be12
-MD5 eb36acb23b1b88c411a5ae0653766231 phpmyadmin-2.9.0.3.ebuild 2652
-RMD160 d7c4290c4ea00750928e9aa6600ceff97f2085ca phpmyadmin-2.9.0.3.ebuild 2652
-SHA256 bd7ea4d79b2e3504176ff8400cb55c149aad8ca4a7cfc28b4620a275ce09be12 phpmyadmin-2.9.0.3.ebuild 2652
-EBUILD phpmyadmin-2.9.1.1.ebuild 2654 RMD160 8cbd648296b3714d37e6fa4e4114ac1751b698cc SHA1 d3dad0ee5a769e316d14b1cd21d200fdae412476 SHA256 0bb99dada5d11704c19377af824cbcabf3b5b6650cdea080be15a88b35f7bb47
-MD5 c6dbdef92ce92f32810de061595d7a0d phpmyadmin-2.9.1.1.ebuild 2654
-RMD160 8cbd648296b3714d37e6fa4e4114ac1751b698cc phpmyadmin-2.9.1.1.ebuild 2654
-SHA256 0bb99dada5d11704c19377af824cbcabf3b5b6650cdea080be15a88b35f7bb47 phpmyadmin-2.9.1.1.ebuild 2654
-EBUILD phpmyadmin-2.9.1.ebuild 2657 RMD160 f3cf4e64cc3e6fbd996b718924c0191f3230d03a SHA1 6f3531a84b5ea0a9952222b25000992788089aa4 SHA256 67aa6b4e05abf4560103ffc38b4f68d6194a395aa13947c01fdb495886b83635
-MD5 8af529a2cb1c9c7a3bb246719157bf6c phpmyadmin-2.9.1.ebuild 2657
-RMD160 f3cf4e64cc3e6fbd996b718924c0191f3230d03a phpmyadmin-2.9.1.ebuild 2657
-SHA256 67aa6b4e05abf4560103ffc38b4f68d6194a395aa13947c01fdb495886b83635 phpmyadmin-2.9.1.ebuild 2657
-MISC ChangeLog 31272 RMD160 ae897ae438d45bc045af1111b46edc8fd7f6b954 SHA1 6c33f686b8a53d277bac8d7f96d30be9232f88d0 SHA256 41d754a156c1c40a826ce5a8a823c4baff99d3e63f3480c080f5f0409e0ee095
-MD5 c1486407a056af4905c723c25028cb9b ChangeLog 31272
-RMD160 ae897ae438d45bc045af1111b46edc8fd7f6b954 ChangeLog 31272
-SHA256 41d754a156c1c40a826ce5a8a823c4baff99d3e63f3480c080f5f0409e0ee095 ChangeLog 31272
+EBUILD phpmyadmin-2.9.1.1.ebuild 2619 RMD160 b25e4aa08897cc309855f96f2d442b434ca0b7b2 SHA1 6e6a938af91e58938e399990f3e85c50b99cffdd SHA256 2e4c429b4780acd323e2805b3b2a35e9b63293ca648a79dfc9f7a99cc8c0b4ef
+MD5 2fa9a492f4be08eedb5b56c229b27de4 phpmyadmin-2.9.1.1.ebuild 2619
+RMD160 b25e4aa08897cc309855f96f2d442b434ca0b7b2 phpmyadmin-2.9.1.1.ebuild 2619
+SHA256 2e4c429b4780acd323e2805b3b2a35e9b63293ca648a79dfc9f7a99cc8c0b4ef phpmyadmin-2.9.1.1.ebuild 2619
+MISC ChangeLog 31448 RMD160 b2841632516abd41c5bb53caaea3a4b6f83d5e5f SHA1 71ca76ece40a79b66b7bcc9caf3b86609572a69e SHA256 0d1ba442b4f0fef780975cd9cb61dd06fbb4576baa75d983ecd6e96faa8a4a68
+MD5 49e68a580638233fec60e946d1b3bc40 ChangeLog 31448
+RMD160 b2841632516abd41c5bb53caaea3a4b6f83d5e5f ChangeLog 31448
+SHA256 0d1ba442b4f0fef780975cd9cb61dd06fbb4576baa75d983ecd6e96faa8a4a68 ChangeLog 31448
 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 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
 MD5 bf0d666ad3ebeb9629500545aff539dd files/digest-phpmyadmin-2.9.1.1 337
 RMD160 f8e6770d06ab77da4066dce624fde52f52122e52 files/digest-phpmyadmin-2.9.1.1 337
 SHA256 439b479648f77327d77f2e01224bdaf5a9d280dd23beb5a12b46b3c6319334f1 files/digest-phpmyadmin-2.9.1.1 337
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFmtjxEzitwsaoONoRAsBMAKDZFpUtkLdKkps1DtmM012z5A9z9gCeK4b/
+sbjd5lp4dz5i63TqjcGBsbU=
+=k1E4
+-----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.9.0.3 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.9.0.3
deleted file mode 100644
index bf4cb0e952fc..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.9.0.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6287ad11448b4ed8c1448d0a3911cff7 phpMyAdmin-2.9.0.3-all-languages-utf-8-only.tar.bz2 1542886
-RMD160 522c932bd1020652d1923e0c98118fa26cc02986 phpMyAdmin-2.9.0.3-all-languages-utf-8-only.tar.bz2 1542886
-SHA256 08e2e7997cd8e9c3123e22a7fc90ba0363928231edbd79e41651316b0c42669e phpMyAdmin-2.9.0.3-all-languages-utf-8-only.tar.bz2 1542886
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.9.1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.9.1
deleted file mode 100644
index cd32ebe50e60..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.9.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c4f1c7658e6019e70480f81702b12614 phpMyAdmin-2.9.1-all-languages-utf-8-only.tar.bz2 1544946
-RMD160 0eb4b6acde8ab3a9c35ead3d1a064ce1efbaf565 phpMyAdmin-2.9.1-all-languages-utf-8-only.tar.bz2 1544946
-SHA256 463a0cf156aab1c32e2a46a1b736f43614b97cf082b45b64147084a6211f7905 phpMyAdmin-2.9.1-all-languages-utf-8-only.tar.bz2 1544946
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.9.0.3.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.9.0.3.ebuild
deleted file mode 100644
index 65677b00517a..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.9.0.3.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.3.ebuild,v 1.9 2006/11/23 20:03:42 vivo Exp $
-
-inherit eutils webapp depend.php
-
-MY_PV=${PV/_/-}
-MY_P="phpMyAdmin-${MY_PV}-all-languages-utf-8-only"
-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="virtual/mysql <virtual/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.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.9.1.ebuild
deleted file mode 100644
index 5b903a114b6d..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.9.1.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.1.ebuild,v 1.2 2006/11/23 20:03:42 vivo Exp $
-
-inherit eutils webapp depend.php
-
-MY_PV=${PV/_/-}
-MY_P="phpMyAdmin-${MY_PV}-all-languages-utf-8-only"
-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="virtual/mysql <virtual/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
-}