Change dependency from mod_php to virtual/php. Bug # 76623. Removed old versions.

6 files changed, 8 insertions, 191 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 987b0c78b1c4..5102151eab58 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.79 2005/01/01 17:41:02 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.80 2005/01/11 17:25:05 twp Exp $
+
+  11 Jan 2005; Tom Payne <twp@gentoo.org> -phpmyadmin-2.6.0_p2.ebuild,
+  -phpmyadmin-2.6.0_p3.ebuild, phpmyadmin-2.6.1_rc1.ebuild:
+  Change dependency from mod_php to virtual/php. Bug # 76623. Removed old
+  versions.
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.0_p2 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.0_p2
deleted file mode 100644
index a2f75ceebd70..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.0_p2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f9000262ce736ec21369e1be1522ea0d phpMyAdmin-2.6.0-pl2.tar.bz2 1278267
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.0_p3 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.0_p3
deleted file mode 100644
index 0c61acd2abdc..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.0_p3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9580c5da497af4ff9ff3af7fa6e2793c phpMyAdmin-2.6.0-pl3.tar.bz2 1279183
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.6.0_p2.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.6.0_p2.ebuild
deleted file mode 100644
index 2cbbc8896231..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.6.0_p2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.6.0_p2.ebuild,v 1.9 2005/01/01 17:41:02 eradicator Exp $
-
-inherit eutils webapp
-
-MY_P=phpMyAdmin-${PV/_p/-pl}
-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 ppc hppa sparc x86 amd64 ~mips"
-IUSE=""
-DEPEND=">=net-www/apache-1.3
-	>=dev-db/mysql-3.23.32 <dev-db/mysql-5.1
-	>=dev-php/mod_php-4.1.0
-	sys-apps/findutils
-	!<=dev-db/phpmyadmin-2.5.6"
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/config.inc.php-2.5.6.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}"
-	mv config.inc.php ${T}/config.inc.php
-	sed -e "s/@pmapass@/${pmapass}/g" \
-		${T}/config.inc.php > config.inc.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="ANNOUNCE.txt CREDITS Documentation.txt RELEASE-DATE-${PV} TODO ChangeLog LICENSE README"
-
-	# 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
-
-	# handle documentation files
-	#
-	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
-	# get installed per vhost!
-
-	dodoc ${docs}
-	for doc in ${docs} INSTALL; do
-		rm -f ${doc}
-	done
-
-	# Copy the app's main files
-
-	einfo "Installing main files"
-	cp -r . ${D}${MY_HTDOCSDIR}
-
-	# Identify the configuration files that this app uses
-
-	webapp_configfile ${MY_HTDOCSDIR}/config.inc.php
-
-	# Identify any script files that need #! headers adding to run under
-	# a CGI script (such as PHP/CGI)
-	#
-	# for phpmyadmin, we *assume* that all .php files that don't end in
-	# .inc.php need to have CGI/BIN support added
-
-	for x in `find . -name '*.php' -print | grep -v 'inc.php'` ; do
-		webapp_runbycgibin php ${MY_HTDOCSDIR}/$x
-	done
-
-	# there are no files which need to be owned by the web server
-
-	# add the post-installation instructions
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	# all done
-	#
-	# now we let the eclass strut its stuff ;-)
-
-	webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.6.0_p3.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.6.0_p3.ebuild
deleted file mode 100644
index 96f84e764db5..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.6.0_p3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.6.0_p3.ebuild,v 1.7 2005/01/01 17:41:02 eradicator Exp $
-
-inherit eutils webapp
-
-MY_P=phpMyAdmin-${PV/_p/-pl}
-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 ppc hppa sparc x86 amd64 ~mips"
-IUSE=""
-DEPEND=">=net-www/apache-1.3
-	>=dev-db/mysql-3.23.32 <dev-db/mysql-5.1
-	>=dev-php/mod_php-4.1.0
-	sys-apps/findutils
-	!<=dev-db/phpmyadmin-2.5.6"
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/config.inc.php-2.5.6.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}"
-	mv config.inc.php ${T}/config.inc.php
-	sed -e "s/@pmapass@/${pmapass}/g" \
-		${T}/config.inc.php > config.inc.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="ANNOUNCE.txt CREDITS Documentation.txt RELEASE-DATE-${PV} TODO ChangeLog LICENSE README"
-
-	# 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
-
-	# handle documentation files
-	#
-	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
-	# get installed per vhost!
-
-	dodoc ${docs}
-	for doc in ${docs} INSTALL; do
-		rm -f ${doc}
-	done
-
-	# Copy the app's main files
-
-	einfo "Installing main files"
-	cp -r . ${D}${MY_HTDOCSDIR}
-
-	# Identify the configuration files that this app uses
-
-	webapp_configfile ${MY_HTDOCSDIR}/config.inc.php
-
-	# Identify any script files that need #! headers adding to run under
-	# a CGI script (such as PHP/CGI)
-	#
-	# for phpmyadmin, we *assume* that all .php files that don't end in
-	# .inc.php need to have CGI/BIN support added
-
-	for x in `find . -name '*.php' -print | grep -v 'inc.php'` ; do
-		webapp_runbycgibin php ${MY_HTDOCSDIR}/$x
-	done
-
-	# there are no files which need to be owned by the web server
-
-	# add the post-installation instructions
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	# all done
-	#
-	# now we let the eclass strut its stuff ;-)
-
-	webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.6.1_rc1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.6.1_rc1.ebuild
index 147c936d24e1..ab4b114bfba6 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.6.1_rc1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.6.1_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.6.1_rc1.ebuild,v 1.7 2005/01/01 17:41:02 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.6.1_rc1.ebuild,v 1.8 2005/01/11 17:25:05 twp Exp $
 
 inherit eutils webapp
 
@@ -15,7 +15,7 @@ KEYWORDS="alpha ppc hppa sparc x86 amd64 ~mips"
 IUSE=""
 DEPEND=">=net-www/apache-1.3
 	>=dev-db/mysql-3.23.32 <dev-db/mysql-5.1
-	>=dev-php/mod_php-4.1.0
+	virtual/php
 	sys-apps/findutils
 	!<=dev-db/phpmyadmin-2.5.6"
 S=${WORKDIR}/${MY_P}