diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2005-06-08 17:47:39 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2005-06-08 17:47:39 +0000 |
| commit | c703e0701d8514d450124051ccd1e432fb28f9c9 (patch) | |
| tree | 66599ceb40e9b0f10c5cb7d0cd20503686f540b8 /dev-php | |
| parent | Stable on sparc (diff) | |
| download | historical-c703e0701d8514d450124051ccd1e432fb28f9c9.tar.gz historical-c703e0701d8514d450124051ccd1e432fb28f9c9.tar.bz2 historical-c703e0701d8514d450124051ccd1e432fb28f9c9.zip | |
Bug #95431: make it actaully install properly.
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'dev-php')
| -rw-r--r-- | dev-php/php/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-php/php/Manifest | 4 | ||||
| -rw-r--r-- | dev-php/php/php-5.0.4.ebuild | 12 |
3 files changed, 12 insertions, 9 deletions
diff --git a/dev-php/php/ChangeLog b/dev-php/php/ChangeLog index d53c1f626a7f..09833c08e482 100644 --- a/dev-php/php/ChangeLog +++ b/dev-php/php/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-php/php # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.158 2005/06/07 20:17:23 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.159 2005/06/08 17:47:39 robbat2 Exp $ + + 08 Jun 2005; Robin H. Johnson <robbat2@gentoo.org> php-5.0.4.ebuild: + Bug #95431: make it actaully install properly. *php-5.0.4 (07 Jun 2005) diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest index 462104ea875a..3243eda6bb80 100644 --- a/dev-php/php/Manifest +++ b/dev-php/php/Manifest @@ -8,10 +8,10 @@ MD5 35529685a3e1830ead5cacfad90c737b php-4.3.9.ebuild 1076 MD5 228f5304b8b0dedb94087ad6f555bad9 php-4.3.11.ebuild 1217 MD5 8ae4ced093c22d77265dc452f24ee631 php-4.3.9_rc1.ebuild 1135 MD5 bb72d15f50c43726d3e53dc821addf2b php-5.0.2.ebuild 557 -MD5 a89b0b063cef847a65adef5dbb864301 ChangeLog 21505 +MD5 055f07f4235f96d78cc54c59640c9d15 ChangeLog 21626 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384 MD5 8a5dced6630e496f509c8c89ce64a66e php-5.0.0-r1.ebuild 538 -MD5 0dfca269cda2b8b60da59309d2c91957 php-5.0.4.ebuild 905 +MD5 3adb258b8cbca1e0ae024f2bba0f11ff php-5.0.4.ebuild 905 MD5 db2a030a2f6d34869c4e46d0b3d79761 php-4.3.8.ebuild 1071 MD5 7515e9b1dc298a0fb1c12d35a58c265d files/php-4.3.4-amd64hack.diff 1028 MD5 3d9b5ebf0a273b87c7a9355fa0d0676d files/digest-php-4.3.9_rc1 134 diff --git a/dev-php/php/php-5.0.4.ebuild b/dev-php/php/php-5.0.4.ebuild index efde15d9a697..e6bc70ca21e8 100644 --- a/dev-php/php/php-5.0.4.ebuild +++ b/dev-php/php/php-5.0.4.ebuild @@ -1,13 +1,14 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-5.0.4.ebuild,v 1.1 2005/06/07 20:17:23 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-5.0.4.ebuild,v 1.2 2005/06/08 17:47:39 robbat2 Exp $ PHPSAPI="cli" MY_PHP_P="php-${PV}" PHP_S="${WORKDIR}/${MY_PHP_P}" PHP_PACKAGE=1 +MY_P="${P}" -inherit php5-sapi-r2 eutils +inherit php5-sapi eutils DESCRIPTION="PHP Shell Interpreter" LICENSE="PHP" @@ -17,10 +18,10 @@ RDEPEND="$RDEPEND" PROVIDE="virtual/php" SLOT="0" -# PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-cli" +PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-cli" src_unpack() { - php5-sapi-r2_src_unpack + php5-sapi_src_unpack # merged upstream #[ "${ARCH}" == "sparc" ] && epatch ${FILESDIR}/stdint.diff #EPATCH_OPTS="-p 1 -d ${S}" epatch ${FILESDIR}/${PN}-5.0.3-missing-arches.patch @@ -29,6 +30,5 @@ src_unpack() { src_compile () { my_conf="--disable-cgi --enable-cli --enable-embed" - - php5-sapi-r2_src_compile + php5-sapi_src_compile } |