diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2004-01-11 00:38:18 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2004-01-11 00:38:18 +0000 |
| commit | 494d37bfc5d20fd247e86f68a8a021843477ba02 (patch) | |
| tree | c399a51052b26c2fcfbdf0d10a340a61df621c30 /dev-php | |
| parent | Added ~sparc keyword. (diff) | |
| download | gentoo-2-494d37bfc5d20fd247e86f68a8a021843477ba02.tar.gz gentoo-2-494d37bfc5d20fd247e86f68a8a021843477ba02.tar.bz2 gentoo-2-494d37bfc5d20fd247e86f68a8a021843477ba02.zip | |
Undo brad_mssw's broken fixup and fix it properly, it's a bug in portage for the moment.
Diffstat (limited to 'dev-php')
| -rw-r--r-- | dev-php/mod_php/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-php/mod_php/mod_php-4.3.4-r2.ebuild | 13 |
2 files changed, 11 insertions, 8 deletions
diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog index 470941ac38dc..11f0806353b5 100644 --- a/dev-php/mod_php/ChangeLog +++ b/dev-php/mod_php/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-php/mod_php # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.118 2004/01/10 20:58:12 brad_mssw Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.119 2004/01/11 00:38:18 robbat2 Exp $ + + 10 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.4-r2.ebuild: + Undo brad_mssw's broken fixup and fix it properly, it's a bug in portage for + the moment. 10 Jan 2004; Brad House <brad_mssw@gentoo.org> mod_php-4.3.4-r2.ebuild: reverse change made by robbat2, as it messed up stable x86 diff --git a/dev-php/mod_php/mod_php-4.3.4-r2.ebuild b/dev-php/mod_php/mod_php-4.3.4-r2.ebuild index 33d814559cfb..45fb7faade22 100644 --- a/dev-php/mod_php/mod_php-4.3.4-r2.ebuild +++ b/dev-php/mod_php/mod_php-4.3.4-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.4-r2.ebuild,v 1.5 2004/01/10 20:58:12 brad_mssw Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.4-r2.ebuild,v 1.6 2004/01/11 00:38:18 robbat2 Exp $ IUSE="${IUSE} apache2" @@ -56,12 +56,11 @@ DEPEND_EXTRA=">=net-www/apache-1.3.26-r2 DEPEND="${DEPEND} ${DEPEND_EXTRA}" RDEPEND="${RDEPEND} ${DEPEND_EXTRA}" -# Remove pkg_setup as it caused failures on stable x86 when trying to -# install. This part was just committed today by robbat2 -# Brad House <brad_mssw@gentoo.org> 01/10/2004 -#pkg_setup() { -# use debug && einfo "Installing in SLOT=${SLOT}" -#} +# Add a 'return 0' as we DON'T want the return code checked +pkg_setup() { + use debug && einfo "Installing in SLOT=${SLOT}" + return 0 +} src_unpack() { multiinstwarn |