Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/dev-lang/php
diff options
context:
space:
mode:
authorChristian Faulhammer <fauli@gentoo.org>2009-04-07 11:03:16 +0000
committerChristian Faulhammer <fauli@gentoo.org>2009-04-07 11:03:16 +0000
commita4350b0ace91a018c961fbc043ce0ae7fdc47743 (patch)
treec619859d0e1db10e216abaa438aa2532f1978e6e /dev-lang/php
parentdisable Firefox support the hard way and make seamonkey not depend on USE=xul... (diff)
downloadhistorical-a4350b0ace91a018c961fbc043ce0ae7fdc47743.tar.gz
historical-a4350b0ace91a018c961fbc043ce0ae7fdc47743.tar.bz2
historical-a4350b0ace91a018c961fbc043ce0ae7fdc47743.zip
revert from EAPI 2 to 0 again, see bug 265245
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/Manifest16
-rw-r--r--dev-lang/php/php-5.2.8-r1.ebuild12
-rw-r--r--dev-lang/php/php-5.2.8-r2.ebuild9
4 files changed, 32 insertions, 11 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/Manifest b/dev-lang/php/Manifest
index e305deed4364..2ea126c65dce 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX 20php4-envd 145 RMD160 fb57b2d202ab1031303e7525a8ef5b353dc04ef8 SHA1 34ef066d2de22f147fc86bbe884692af7631f726 SHA256 17cd1a952434988b4c2125e4d1eef1df7114809f404605d35f255674419dd5d5
AUX 20php5-envd 145 RMD160 8c81fb7dc1d1ddf16fd956d748514db3bcb27603 SHA1 f1cef57c0def8e2c5422aaf136f40b4ff47801d2 SHA256 efaae9e6ae5f7010e073c2ab6d8a9dda009f0707c7d7b0c027e142c94f7041a4
AUX 70_mod_php5.conf-apache2 490 RMD160 745bdb5db622577f473703d5ee8dc7f3c66f8f0c SHA1 7daf9c9ec2e6d108f850981853f9f4f599be0b71 SHA256 5667d06cb7a18c30d11decd28d55b87e36287c76c4d3a450b1cb37271e7fdcd1
@@ -15,7 +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 16684 RMD160 3a12f6907c754f771f0fd25c39aa1f02e9d1fe21 SHA1 4a5eee0f4c1624de94b86b8be38e7d657bb03560 SHA256 a7b43d353c7ac629c1c9357808b440798057b17f7f3feab1e1168d9ca7eb7029
-EBUILD php-5.2.8-r2.ebuild 16586 RMD160 8b86ef6e49c54595049da2c102d5ca24ed5b10c0 SHA1 d8d587381427f3f8fe89fdd891eb62a9212ccc63 SHA256 a0662ff5a6d20849d88896ffda212ab3db9aea91a3ee933df88e2ab156074cf7
-MISC ChangeLog 56382 RMD160 cd04ad97cc340d84c1fbf8b925807fc6e62b1e05 SHA1 b91ce6d206c371ba610273d00b7703609200e274 SHA256 53b061a5f42560959e88df13639b8d4b055bf7ea5ecfe26bcd3e24a50d933318
+EBUILD php-5.2.8-r1.ebuild 16796 RMD160 b66bbd1268a7154f6e282703b1f2dd047899299e SHA1 144fa582a39ea919e3dc98833b19af6db4ca87d7 SHA256 ada88ba7cf0ea38820f6707b0c5a37f31b673d0672a05285a2320b381c576352
+EBUILD php-5.2.8-r2.ebuild 16706 RMD160 083944aeaf27db1141ab431ac3905f0b009ab135 SHA1 b8e642d6a8509472fc0507ee8d9a092c4b4e281a SHA256 ae37c4b24d12c44e1968c1b5e8a04c4fbb29ffe3d01464eca60393d4c681c724
+MISC ChangeLog 56528 RMD160 1f46cddeac1957e1c76dd3b205f99133055ad45f SHA1 837b7db4c34d3145c558bfa5b3274bac76fd3fbf SHA256 290ef00248379fcb9cb70d1e098469ef6d5b3997f57182252e9587e4d1bec1a4
MISC metadata.xml 1579 RMD160 0920abfbde60e12facdc827d194fba87bb7c30c4 SHA1 afeb224e80c98a8ab22957acea61cc5313be51d6 SHA256 81a1bf83b5827ef4310c576d1b3ffb416f70dafe6ceedfedff8a58480ef1609c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAknbMyAACgkQNQqtfCuFneM3YACeIGYl2CQ89RjRYTh3cSvLi7A9
+um4An1c430t0C0PPvRzKR4oRJKQR3cFY
+=qUmw
+-----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 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
}