summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Faulhammer <fauli@gentoo.org>2009-03-07 22:44:30 +0000
committerChristian Faulhammer <fauli@gentoo.org>2009-03-07 22:44:30 +0000
commit2d957921cde1e3176310a2b2725a273555d29525 (patch)
treecb1e6681a386a8882be8cbbfd8ca9aaa114e4de0 /dev-lang/php
parentuse EAPI 2 for USE flag check (diff)
downloadhistorical-2d957921cde1e3176310a2b2725a273555d29525.tar.gz
historical-2d957921cde1e3176310a2b2725a273555d29525.tar.bz2
historical-2d957921cde1e3176310a2b2725a273555d29525.zip
use EAPI 2 for USE flag check
Package-Manager: portage-2.1.6.7/cvs/Linux i686
Diffstat (limited to 'dev-lang/php')
-rw-r--r--dev-lang/php/ChangeLog6
-rw-r--r--dev-lang/php/Manifest12
-rw-r--r--dev-lang/php/php-5.2.8-r1.ebuild14
-rw-r--r--dev-lang/php/php-5.2.8-r2.ebuild9
4 files changed, 19 insertions, 22 deletions
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index c62e3488a368..f673937e97cc 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.317 2009/02/02 05:41:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.318 2009/03/07 22:44:30 fauli Exp $
+
+ 07 Mar 2009; Christian Faulhammer <fauli@gentoo.org> php-5.2.8-r1.ebuild,
+ php-5.2.8-r2.ebuild:
+ use EAPI 2 for USE flag check
02 Feb 2009; Mike Frysinger <vapier@gentoo.org> metadata.xml:
Document local USE=pic flag.
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 1a8eefebd2d1..213452c51a7c 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -18,14 +18,14 @@ DIST suhosin-patch-5.2.6-0.9.6.2-r1.patch.gz 22987 RMD160 9c7bc7441e16686382a2b9
DIST suhosin-patch-5.2.7-0.9.6.3.patch.gz 23125 RMD160 9c8a0972e75e1ad887b940f57aec4d877e9364bd SHA1 b1f12dd856778e734837819114d278adaa3cfe05 SHA256 85e6262f53014e393977d1efed2d3a7e686767a07f96b14b2c3f126f694aee46
DIST suhosin-patch-5.2.8-0.9.6.3.patch.gz 23125 RMD160 9c8a0972e75e1ad887b940f57aec4d877e9364bd SHA1 b1f12dd856778e734837819114d278adaa3cfe05 SHA256 85e6262f53014e393977d1efed2d3a7e686767a07f96b14b2c3f126f694aee46
EBUILD php-5.2.6-r7.ebuild 15504 RMD160 8741d834f622dc672eb996a248f6bd32a799f011 SHA1 8ac6d6d8934191a5ed6367e25f5bec9e65a25606 SHA256 ccb8574fc22ce8fa7a8c09cb82f7f6b551434c66d1d57d8677a7d9232f7a338f
-EBUILD php-5.2.8-r1.ebuild 16800 RMD160 369aa39aec69c2b27656fd32b632666ff6c48eab SHA1 5fcd7e64e0133a0f799813ee1ec71d5350ed178f SHA256 e78c50ccdf06468f8a42e13d885338c7027bd90b423e97ef36bbef53234bc4fc
-EBUILD php-5.2.8-r2.ebuild 16712 RMD160 2f690b172e4cd88bb9a4b8af6d705cf9a9bafa1c SHA1 1c14f5d943a9278fc70b20c02b5c51fd495444c0 SHA256 e51a1500747b0cb281beac69c56a5df9239947998078672dfc42a0a8b3a4f725
-MISC ChangeLog 56129 RMD160 799c6b0221c9068ff924c5ec02e99f4afe410913 SHA1 3b9dc4278bfb149f8d9ddc6682808858df53e2d2 SHA256 9c66d3c2aedb3e59ba03fb0a31f030a9dd290f5f8db119442fca0895266938f6
+EBUILD php-5.2.8-r1.ebuild 16684 RMD160 e4b24bada369b21938aa42c8c1b96d806677097a SHA1 9027ae3f6210ce838ce2a08fa247dfe93e9878b1 SHA256 ffa0f37c4a1d07a439b6d6b79b6deabc895ca9f30ff1b63aa265b6f6bc2af380
+EBUILD php-5.2.8-r2.ebuild 16587 RMD160 87f27506dfc4ccaeb08165a2c19e0990a0925c65 SHA1 14a3abf93dd485e5ce866b1af06f8a388ea2f4f4 SHA256 e1744710ac7a438b360f11d8a5496ad39164b7a1cbe4650e2beb4050db3bc562
+MISC ChangeLog 56260 RMD160 070a012c3d822bb0a247cfb65b8041d49e862197 SHA1 41845ff196bc9261b40e347efe7bb35b05f06c40 SHA256 531089badb235e1bce1ca65895b357da0c57271664ac188c706a3c86a57eaee4
MISC metadata.xml 1579 RMD160 0920abfbde60e12facdc827d194fba87bb7c30c4 SHA1 afeb224e80c98a8ab22957acea61cc5313be51d6 SHA256 81a1bf83b5827ef4310c576d1b3ffb416f70dafe6ceedfedff8a58480ef1609c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkmGh50ACgkQn/5bYzqsSmHJLQCfTs7Z2qDPH5hwtyejcVYo4usV
-5OUAn3pS1Ji6wbV3OHRXkdcFfYf03KUI
-=ATsN
+iEYEARECAAYFAkmy+PsACgkQNQqtfCuFneN5ogCfRxpG8GpSSEE5ODhn5br66fKP
+0WIAoIg6Nicyk506SaBe0eJHY5RfMIHA
+=OYJX
-----END PGP SIGNATURE-----
diff --git a/dev-lang/php/php-5.2.8-r1.ebuild b/dev-lang/php/php-5.2.8-r1.ebuild
index 3e887ac45ed9..80d5850565fe 100644
--- a/dev-lang/php/php-5.2.8-r1.ebuild
+++ b/dev-lang/php/php-5.2.8-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.8 2008/12/24 18:12:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.8-r1.ebuild,v 1.9 2009/03/07 22:44:30 fauli Exp $
+
+EAPI=2
CGI_SAPI_USE="discard-path force-cgi-redirect"
APACHE2_SAPI_USE="concurrentmodphp threads"
@@ -29,7 +31,6 @@ 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
@@ -42,7 +43,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 )"
+ pcre? ( >=dev-libs/libpcre-7.8[unicode] )"
RDEPEND="${DEPEND}"
if [[ -n "${KOLAB_PATCH}" ]] ; then
IUSE="${IUSE} kolab"
@@ -100,11 +101,6 @@ 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 3b7750b8b11b..25d66ee176f4 100644
--- a/dev-lang/php/php-5.2.8-r2.ebuild
+++ b/dev-lang/php/php-5.2.8-r2.ebuild
@@ -1,6 +1,8 @@
# 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.8 2009/02/01 10:39:52 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.8-r2.ebuild,v 1.9 2009/03/07 22:44:30 fauli Exp $
+
+EAPI=2
CGI_SAPI_USE="discard-path force-cgi-redirect"
APACHE2_SAPI_USE="concurrentmodphp threads"
@@ -100,11 +102,6 @@ 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
}