diff options
| author |   Christian Faulhammer <fauli@gentoo.org> | 2009-04-07 11:03:16 +0000 |
|---|---|---|
| committer | Christian Faulhammer <fauli@gentoo.org> | 2009-04-07 11:03:16 +0000 |
| commit | 73e7bab400a3a1ab040362a6ea3602b1b1e47635 (patch) | |
| tree | 57a6c7e6961cf88bf7822a0d176a2d5af74d104a /dev-lang/php | |
| parent | disable Firefox support the hard way and make seamonkey not depend on USE=xul... (diff) | |
| download | gentoo-2-73e7bab400a3a1ab040362a6ea3602b1b1e47635.tar.gz gentoo-2-73e7bab400a3a1ab040362a6ea3602b1b1e47635.tar.bz2 gentoo-2-73e7bab400a3a1ab040362a6ea3602b1b1e47635.zip | |
revert from EAPI 2 to 0 again, see bug 265245
(Portage version: 2.1.6.7/cvs/Linux i686)
Diffstat (limited to 'dev-lang/php')
| -rw-r--r-- | dev-lang/php/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/php/php-5.2.8-r1.ebuild | 12 | ||||
| -rw-r--r-- | dev-lang/php/php-5.2.8-r2.ebuild | 9 |
3 files changed, 19 insertions, 8 deletions
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog index da05a6e874c9..10dd30e7a4c8 100644 --- a/dev-lang/php/ChangeLog +++ b/dev-lang/php/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/php # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.319 2009/03/18 10:41:03 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.320 2009/04/07 11:03:16 fauli Exp $ + + 07 Apr 2009; Christian Faulhammer <fauli@gentoo.org> php-5.2.8-r1.ebuild, + php-5.2.8-r2.ebuild: + revert from EAPI 2 to 0 again, see bug 265245 18 Mar 2009; Raúl Porcel <armin76@gentoo.org> php-5.2.8-r1.ebuild, php-5.2.8-r2.ebuild: diff --git a/dev-lang/php/php-5.2.8-r1.ebuild b/dev-lang/php/php-5.2.8-r1.ebuild index 7c0213b42448..689d036f970f 100644 --- a/dev-lang/php/php-5.2.8-r1.ebuild +++ b/dev-lang/php/php-5.2.8-r1.ebuild @@ -1,8 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.8-r1.ebuild,v 1.10 2009/03/18 10:41:03 armin76 Exp $ - -EAPI=2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.8-r1.ebuild,v 1.11 2009/04/07 11:03:16 fauli Exp $ CGI_SAPI_USE="discard-path force-cgi-redirect" APACHE2_SAPI_USE="concurrentmodphp threads" @@ -31,6 +29,7 @@ CONCURRENTMODPHP_PATCH="${MY_PHP_PV}/opt/concurrent_apache_modules.patch" # kolab patch - http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/patches/php/ # bugs about this go to wrobel@gentoo.org KOLAB_PATCH="${MY_PHP_PV}/opt/kolab-imap-annotations.patch" + inherit versionator php5_2-sapi apache-module SRC_URI="http://home.hoffie.info/php-patchset-${PV}-r${PHP_PATCHSET_REV}.tar.bz2 @@ -43,7 +42,7 @@ DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache2 SAPIs." DEPEND="app-admin/php-toolkit imap? ( >=virtual/imap-c-client-2006k ) - pcre? ( >=dev-libs/libpcre-7.8[unicode] )" + pcre? ( >=dev-libs/libpcre-7.8 )" RDEPEND="${DEPEND}" if [[ -n "${KOLAB_PATCH}" ]] ; then IUSE="${IUSE} kolab" @@ -101,6 +100,11 @@ pkg_setup() { ewarn fi + if use pcre ; then + built_with_use dev-libs/libpcre unicode || \ + die "Please rebuild dev-libs/libpcre with USE=unicode" + fi + php5_2-sapi_pkg_setup } diff --git a/dev-lang/php/php-5.2.8-r2.ebuild b/dev-lang/php/php-5.2.8-r2.ebuild index a5b9c0fe7921..5e9811542a04 100644 --- a/dev-lang/php/php-5.2.8-r2.ebuild +++ b/dev-lang/php/php-5.2.8-r2.ebuild @@ -1,8 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.8-r2.ebuild,v 1.10 2009/03/18 10:41:03 armin76 Exp $ - -EAPI=2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.8-r2.ebuild,v 1.11 2009/04/07 11:03:16 fauli Exp $ CGI_SAPI_USE="discard-path force-cgi-redirect" APACHE2_SAPI_USE="concurrentmodphp threads" @@ -102,6 +100,11 @@ pkg_setup() { ewarn fi + if use pcre ; then + built_with_use dev-libs/libpcre unicode || \ + die "Please rebuild dev-libs/libpcre with USE=unicode" + fi + php5_2-sapi_pkg_setup } |