From: Tom William Payne Date: Tue, 11 Jan 2005 17:25:05 +0000 (+0000) Subject: Change dependency from mod_php to virtual/php. Bug # 76623. Removed old versions. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b693f4ff9df58fcb002072748d012184b4f88b14;p=gentoo.git Change dependency from mod_php to virtual/php. Bug # 76623. Removed old versions. --- 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 -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 : Change encoding to UTF-8 for GLEP 31 compliance diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest index 1c1f8b82d7d0..8a2377c0ccf9 100644 --- a/dev-db/phpmyadmin/Manifest +++ b/dev-db/phpmyadmin/Manifest @@ -1,13 +1,9 @@ -MD5 3d9ab8b0d660f3a5048d93527d712f02 ChangeLog 11082 +MD5 d0ac5e24e09567b4888c6ee2fbd88b3e phpmyadmin-2.6.1_rc1.ebuild 2593 +MD5 e851bd1469e82acf51ad1a1e3cd809a3 ChangeLog 11293 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244 -MD5 41b0419343f11fe225684a2eeac500c5 phpmyadmin-2.6.0_p3.ebuild 2576 -MD5 1e76dd7d049f7da2bb330abdbd98e2f3 phpmyadmin-2.6.1_rc1.ebuild 2612 -MD5 a33cd2e556f7df72694717bed9f0ec48 phpmyadmin-2.6.0_p2.ebuild 2576 +MD5 4badbcc4cd669e6f934d5c993ff9ae4e files/digest-phpmyadmin-2.6.1_rc1 74 +MD5 56dcb2efb84915a521c18a004f96d37c files/postinstall-en.txt 506 MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525 -MD5 7507cfb3edae5600142424613b1eb892 files/digest-phpmyadmin-2.6.0_p3 74 -MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231 MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857 MD5 396133c1da8d8b716ad2da23aa0a5a30 files/phpmyadmin-mysql-setup.sql.in 2712 -MD5 56dcb2efb84915a521c18a004f96d37c files/postinstall-en.txt 506 -MD5 4badbcc4cd669e6f934d5c993ff9ae4e files/digest-phpmyadmin-2.6.1_rc1 74 -MD5 a424f37ca165d4c8e3c7c0c4295902d8 files/digest-phpmyadmin-2.6.0_p2 74 +MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231 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-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-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-php/mod_php-4.1.0 + virtual/php sys-apps/findutils !<=dev-db/phpmyadmin-2.5.6" S=${WORKDIR}/${MY_P}