diff options
| author |   Stuart Herbert <stuart@gentoo.org> | 2005-03-07 19:47:11 +0000 |
|---|---|---|
| committer | Stuart Herbert <stuart@gentoo.org> | 2005-03-07 19:47:11 +0000 |
| commit | f67cd04782d4183bce1793b76ea025cdaee18f90 (patch) | |
| tree | 6d802b86cdb2352b496127f14f05ec06ddc2fd24 /dev-db | |
| parent | make motif-config usable on ppc-macos (diff) | |
| download | gentoo-2-f67cd04782d4183bce1793b76ea025cdaee18f90.tar.gz gentoo-2-f67cd04782d4183bce1793b76ea025cdaee18f90.tar.bz2 gentoo-2-f67cd04782d4183bce1793b76ea025cdaee18f90.zip | |
Fixed DEPENDs for non-apache users
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/phpmyadmin/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/phpmyadmin/Manifest | 26 | ||||
| -rw-r--r-- | dev-db/phpmyadmin/phpmyadmin-2.6.1_p2-r1.ebuild | 17 |
3 files changed, 16 insertions, 33 deletions
diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog index b5ad373aa526..727de573b471 100644 --- a/dev-db/phpmyadmin/ChangeLog +++ b/dev-db/phpmyadmin/ChangeLog @@ -1,6 +1,10 @@ # 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.93 2005/03/03 15:04:48 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.94 2005/03/07 19:47:11 stuart Exp $ + + 07 Mar 2005; Stuart Herbert <stuart@gentoo.org> + phpmyadmin-2.6.1_p2-r1.ebuild: + Removed depend on apache; depend on mod_php/php-cgi rather than just mod_php 03 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> phpmyadmin-2.6.1_p2-r1.ebuild: diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest index 6a2306c52862..23ef063f05b1 100644 --- a/dev-db/phpmyadmin/Manifest +++ b/dev-db/phpmyadmin/Manifest @@ -1,26 +1,16 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +MD5 082dc2090e4c1de82b61e30c5306da64 ChangeLog 13174 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244 MD5 3a33dda459f41b062d86576003c1e0ec phpmyadmin-2.6.1.ebuild 2595 -MD5 77028cd3d2da035928221cd8d3616b7f ChangeLog 13011 MD5 d0ac5e24e09567b4888c6ee2fbd88b3e phpmyadmin-2.6.1_rc1.ebuild 2593 MD5 8953a4dca66a41467a427449f47ea16e phpmyadmin-2.6.1_p2.ebuild 2599 -MD5 841056392e4c426df421484639a3318e phpmyadmin-2.6.1_p2-r1.ebuild 2832 +MD5 ef46c8313e1b4d5bab1969a15c57fdd0 phpmyadmin-2.6.1_p2-r1.ebuild 2476 +MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525 +MD5 c4e16f440d397574f36ec04130d54ba0 files/digest-phpmyadmin-2.6.1 70 +MD5 4badbcc4cd669e6f934d5c993ff9ae4e files/digest-phpmyadmin-2.6.1_rc1 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 22a63a92c01eef5a268311e15594367b files/digest-phpmyadmin-2.6.1_p2 74 MD5 4c95d31af8becb428be471fcedf664a4 files/2.6.1_p2-no-wildcard-privs-for-you.patch 3731 MD5 22a63a92c01eef5a268311e15594367b files/digest-phpmyadmin-2.6.1_p2-r1 74 -MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857 -MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525 -MD5 22a63a92c01eef5a268311e15594367b files/digest-phpmyadmin-2.6.1_p2 74 -MD5 c4e16f440d397574f36ec04130d54ba0 files/digest-phpmyadmin-2.6.1 70 -MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231 -MD5 4badbcc4cd669e6f934d5c993ff9ae4e files/digest-phpmyadmin-2.6.1_rc1 74 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.0 (GNU/Linux) - -iD8DBQFCJyecugEuf3OQ0akRAuc3AJ9yEFxQWqqu3SiKWlL0Sb5mbUMm6QCgjXTK -LVrpfRT2pZ/1FHTWR/XJux4= -=hh8a ------END PGP SIGNATURE----- diff --git a/dev-db/phpmyadmin/phpmyadmin-2.6.1_p2-r1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.6.1_p2-r1.ebuild index 1a0bc5b51736..70da8a1e90cb 100644 --- a/dev-db/phpmyadmin/phpmyadmin-2.6.1_p2-r1.ebuild +++ b/dev-db/phpmyadmin/phpmyadmin-2.6.1_p2-r1.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_p2-r1.ebuild,v 1.6 2005/03/03 15:04:48 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.6.1_p2-r1.ebuild,v 1.7 2005/03/07 19:47:11 stuart Exp $ inherit eutils webapp @@ -13,9 +13,8 @@ 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 - virtual/php +DEPEND=">=dev-db/mysql-3.23.32 <dev-db/mysql-5.1 + virtual/httpd-php sys-apps/findutils !<=dev-db/phpmyadmin-2.5.6" S=${WORKDIR}/${MY_P} @@ -78,16 +77,6 @@ src_install() { 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 |