| 1 |
fauli 09/04/07 11:03:16 |
| 2 |
|
| 3 |
Modified: php-5.2.8-r2.ebuild php-5.2.8-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
revert from EAPI 2 to 0 again, see bug 265245 |
| 6 |
(Portage version: 2.1.6.7/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.11 dev-lang/php/php-5.2.8-r2.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/php/php-5.2.8-r2.ebuild?rev=1.11&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/php/php-5.2.8-r2.ebuild?rev=1.11&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/php/php-5.2.8-r2.ebuild?r1=1.10&r2=1.11 |
| 14 |
|
| 15 |
Index: php-5.2.8-r2.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.8-r2.ebuild,v |
| 18 |
retrieving revision 1.10 |
| 19 |
retrieving revision 1.11 |
| 20 |
diff -u -r1.10 -r1.11 |
| 21 |
--- php-5.2.8-r2.ebuild 18 Mar 2009 10:41:03 -0000 1.10 |
| 22 |
+++ php-5.2.8-r2.ebuild 7 Apr 2009 11:03:16 -0000 1.11 |
| 23 |
@@ -1,8 +1,6 @@ |
| 24 |
# Copyright 1999-2009 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $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 $ |
| 27 |
- |
| 28 |
-EAPI=2 |
| 29 |
+# $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 $ |
| 30 |
|
| 31 |
CGI_SAPI_USE="discard-path force-cgi-redirect" |
| 32 |
APACHE2_SAPI_USE="concurrentmodphp threads" |
| 33 |
@@ -102,6 +100,11 @@ |
| 34 |
ewarn |
| 35 |
fi |
| 36 |
|
| 37 |
+ if use pcre ; then |
| 38 |
+ built_with_use dev-libs/libpcre unicode || \ |
| 39 |
+ die "Please rebuild dev-libs/libpcre with USE=unicode" |
| 40 |
+ fi |
| 41 |
+ |
| 42 |
php5_2-sapi_pkg_setup |
| 43 |
} |
| 44 |
|
| 45 |
|
| 46 |
|
| 47 |
|
| 48 |
1.11 dev-lang/php/php-5.2.8-r1.ebuild |
| 49 |
|
| 50 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/php/php-5.2.8-r1.ebuild?rev=1.11&view=markup |
| 51 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/php/php-5.2.8-r1.ebuild?rev=1.11&content-type=text/plain |
| 52 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/php/php-5.2.8-r1.ebuild?r1=1.10&r2=1.11 |
| 53 |
|
| 54 |
Index: php-5.2.8-r1.ebuild |
| 55 |
=================================================================== |
| 56 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.8-r1.ebuild,v |
| 57 |
retrieving revision 1.10 |
| 58 |
retrieving revision 1.11 |
| 59 |
diff -u -r1.10 -r1.11 |
| 60 |
--- php-5.2.8-r1.ebuild 18 Mar 2009 10:41:03 -0000 1.10 |
| 61 |
+++ php-5.2.8-r1.ebuild 7 Apr 2009 11:03:16 -0000 1.11 |
| 62 |
@@ -1,8 +1,6 @@ |
| 63 |
# Copyright 1999-2009 Gentoo Foundation |
| 64 |
# Distributed under the terms of the GNU General Public License v2 |
| 65 |
-# $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 $ |
| 66 |
- |
| 67 |
-EAPI=2 |
| 68 |
+# $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 $ |
| 69 |
|
| 70 |
CGI_SAPI_USE="discard-path force-cgi-redirect" |
| 71 |
APACHE2_SAPI_USE="concurrentmodphp threads" |
| 72 |
@@ -31,6 +29,7 @@ |
| 73 |
# kolab patch - http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/patches/php/ |
| 74 |
# bugs about this go to wrobel@g.o |
| 75 |
KOLAB_PATCH="${MY_PHP_PV}/opt/kolab-imap-annotations.patch" |
| 76 |
+ |
| 77 |
inherit versionator php5_2-sapi apache-module |
| 78 |
|
| 79 |
SRC_URI="http://home.hoffie.info/php-patchset-${PV}-r${PHP_PATCHSET_REV}.tar.bz2 |
| 80 |
@@ -43,7 +42,7 @@ |
| 81 |
|
| 82 |
DEPEND="app-admin/php-toolkit |
| 83 |
imap? ( >=virtual/imap-c-client-2006k ) |
| 84 |
- pcre? ( >=dev-libs/libpcre-7.8[unicode] )" |
| 85 |
+ pcre? ( >=dev-libs/libpcre-7.8 )" |
| 86 |
RDEPEND="${DEPEND}" |
| 87 |
if [[ -n "${KOLAB_PATCH}" ]] ; then |
| 88 |
IUSE="${IUSE} kolab" |
| 89 |
@@ -101,6 +100,11 @@ |
| 90 |
ewarn |
| 91 |
fi |
| 92 |
|
| 93 |
+ if use pcre ; then |
| 94 |
+ built_with_use dev-libs/libpcre unicode || \ |
| 95 |
+ die "Please rebuild dev-libs/libpcre with USE=unicode" |
| 96 |
+ fi |
| 97 |
+ |
| 98 |
php5_2-sapi_pkg_setup |
| 99 |
} |
| 100 |
|
| 101 |
|
| 102 |
|
| 103 |
|
| 104 |
1.320 dev-lang/php/ChangeLog |
| 105 |
|
| 106 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/php/ChangeLog?rev=1.320&view=markup |
| 107 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/php/ChangeLog?rev=1.320&content-type=text/plain |
| 108 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/php/ChangeLog?r1=1.319&r2=1.320 |
| 109 |
|
| 110 |
Index: ChangeLog |
| 111 |
=================================================================== |
| 112 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v |
| 113 |
retrieving revision 1.319 |
| 114 |
retrieving revision 1.320 |
| 115 |
diff -u -r1.319 -r1.320 |
| 116 |
--- ChangeLog 18 Mar 2009 10:41:03 -0000 1.319 |
| 117 |
+++ ChangeLog 7 Apr 2009 11:03:16 -0000 1.320 |
| 118 |
@@ -1,6 +1,10 @@ |
| 119 |
# ChangeLog for dev-lang/php |
| 120 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 121 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.319 2009/03/18 10:41:03 armin76 Exp $ |
| 122 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.320 2009/04/07 11:03:16 fauli Exp $ |
| 123 |
+ |
| 124 |
+ 07 Apr 2009; Christian Faulhammer <fauli@g.o> php-5.2.8-r1.ebuild, |
| 125 |
+ php-5.2.8-r2.ebuild: |
| 126 |
+ revert from EAPI 2 to 0 again, see bug 265245 |
| 127 |
|
| 128 |
18 Mar 2009; Raúl Porcel <armin76@g.o> php-5.2.8-r1.ebuild, |
| 129 |
php-5.2.8-r2.ebuild: |
Archives