* [gentoo-commits] gentoo-x86 commit in eclass: php5_2-sapi.eclass
@ 2007-09-08 12:06 Markus Ullmann (jokey)
0 siblings, 0 replies; 17+ messages in thread
From: Markus Ullmann (jokey) @ 2007-09-08 12:06 UTC (permalink / raw
To: gentoo-commits
jokey 07/09/08 12:06:21
Modified: php5_2-sapi.eclass
Log:
re-enable internal extensions
Revision Changes Path
1.13 eclass/php5_2-sapi.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?r1=1.12&r2=1.13
Index: php5_2-sapi.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- php5_2-sapi.eclass 2 Sep 2007 17:49:20 -0000 1.12
+++ php5_2-sapi.eclass 8 Sep 2007 12:06:20 -0000 1.13
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.12 2007/09/02 17:49:20 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.13 2007/09/08 12:06:20 jokey Exp $
# ========================================================================
# Based on robbat2's work on the php4 sapi eclass
@@ -114,12 +114,6 @@
DEPEND="${DEPEND}
!media-libs/libswf"
-# force use of the internal extensions,
-# as they're better maintained upstream
-DEPEND="${DEPEND}
- !dev-php5/pecl-filter
- !dev-php5/pecl-json"
-
# simplistic for now
RDEPEND="${DEPEND}"
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php5_2-sapi.eclass
@ 2007-09-10 21:00 Markus Ullmann (jokey)
0 siblings, 0 replies; 17+ messages in thread
From: Markus Ullmann (jokey) @ 2007-09-10 21:00 UTC (permalink / raw
To: gentoo-commits
jokey 07/09/10 21:00:25
Modified: php5_2-sapi.eclass
Log:
Fix interbase support for bug #186791
Revision Changes Path
1.14 eclass/php5_2-sapi.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?r1=1.13&r2=1.14
Index: php5_2-sapi.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- php5_2-sapi.eclass 8 Sep 2007 12:06:20 -0000 1.13
+++ php5_2-sapi.eclass 10 Sep 2007 21:00:24 -0000 1.14
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.13 2007/09/08 12:06:20 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.14 2007/09/10 21:00:24 jokey Exp $
# ========================================================================
# Based on robbat2's work on the php4 sapi eclass
@@ -523,7 +523,7 @@
# Interbase support
if use firebird || use interbase ; then
- my_conf="${my_conf} --with-interbase=/usr"
+ my_conf="${my_conf} --with-interbase=/opt"
fi
# LDAP support
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php5_2-sapi.eclass
@ 2007-09-30 12:20 Christian Hoffmann (hoffie)
0 siblings, 0 replies; 17+ messages in thread
From: Christian Hoffmann (hoffie) @ 2007-09-30 12:20 UTC (permalink / raw
To: gentoo-commits
hoffie 07/09/30 12:20:11
Modified: php5_2-sapi.eclass
Log:
removing USE=pdo-external support from dev-lang/php-5.2*, use internal pdo (USE=pdo) instead
Revision Changes Path
1.15 eclass/php5_2-sapi.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?r1=1.14&r2=1.15
Index: php5_2-sapi.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- php5_2-sapi.eclass 10 Sep 2007 21:00:24 -0000 1.14
+++ php5_2-sapi.eclass 30 Sep 2007 12:20:10 -0000 1.15
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.14 2007/09/10 21:00:24 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.15 2007/09/30 12:20:10 hoffie Exp $
# ========================================================================
# Based on robbat2's work on the php4 sapi eclass
@@ -43,7 +43,7 @@
S="${WORKDIR}/${MY_PHP_P}"
fi
-IUSE="adabas bcmath berkdb birdstep bzip2 calendar cdb cjk crypt ctype curl curlwrappers db2 dbase dbmaker debug doc empress empress-bcs esoob exif frontbase fdftk filter firebird flatfile ftp gd gd-external gdbm gmp hash iconv imap inifile interbase iodbc ipv6 java-external json kerberos ldap ldap-sasl libedit mcve mhash msql mssql mysql mysqli ncurses nls oci8 oci8-instant-client odbc pcntl pcre pdo pdo-external pic posix postgres qdbm readline reflection recode sapdb session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl suhosin sybase sybase-ct sysvipc tidy tokenizer truetype unicode wddx xml xmlreader xmlwriter xmlrpc xpm xsl yaz zip zip-external zlib"
+IUSE="adabas bcmath berkdb birdstep bzip2 calendar cdb cjk crypt ctype curl curlwrappers db2 dbase dbmaker debug doc empress empress-bcs esoob exif frontbase fdftk filter firebird flatfile ftp gd gd-external gdbm gmp hash iconv imap inifile interbase iodbc ipv6 java-external json kerberos ldap ldap-sasl libedit mcve mhash msql mssql mysql mysqli ncurses nls oci8 oci8-instant-client odbc pcntl pcre pdo pic posix postgres qdbm readline reflection recode sapdb session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl suhosin sybase sybase-ct sysvipc tidy tokenizer truetype unicode wddx xml xmlreader xmlwriter xmlrpc xpm xsl yaz zip zip-external zlib"
# these USE flags should have the correct dependencies
DEPEND="adabas? ( >=dev-db/unixODBC-1.8.13 )
@@ -131,7 +131,6 @@
json? ( !dev-php5/pecl-json )
mcve? ( dev-php5/pecl-mcve )
pdo? ( !dev-php5/pecl-pdo )
- pdo-external? ( dev-php5/pecl-pdo )
suhosin? ( dev-php5/suhosin )
yaz? ( dev-php5/pecl-yaz )
zip? ( !dev-php5/pecl-zip )
@@ -203,7 +202,6 @@
phpconfutils_use_conflict "gd" "gd-external"
phpconfutils_use_conflict "oci8" "oci8-instant-client"
phpconfutils_use_conflict "oci8" "ldap-sasl"
- phpconfutils_use_conflict "pdo" "pdo-external"
phpconfutils_use_conflict "zip" "zip-external"
phpconfutils_use_conflict "qdbm" "gdbm"
phpconfutils_use_conflict "readline" "libedit"
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php5_2-sapi.eclass
@ 2008-03-03 17:06 Markus Ullmann (jokey)
0 siblings, 0 replies; 17+ messages in thread
From: Markus Ullmann (jokey) @ 2008-03-03 17:06 UTC (permalink / raw
To: gentoo-commits
jokey 08/03/03 17:06:17
Modified: php5_2-sapi.eclass
Log:
Some cleanups and silence QA ;)
Revision Changes Path
1.18 eclass/php5_2-sapi.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?r1=1.17&r2=1.18
Index: php5_2-sapi.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- php5_2-sapi.eclass 12 Nov 2007 18:13:29 -0000 1.17
+++ php5_2-sapi.eclass 3 Mar 2008 17:06:16 -0000 1.18
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.17 2007/11/12 18:13:29 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.18 2008/03/03 17:06:16 jokey Exp $
# ========================================================================
# Based on robbat2's work on the php4 sapi eclass
@@ -70,6 +70,7 @@
imap? ( virtual/imap-c-client )
iodbc? ( dev-db/libiodbc >=dev-db/unixODBC-1.8.13 )
kerberos? ( virtual/krb5 )
+ kolab? ( >=net-libs/c-client-2004g-r1 )
ldap? ( !oci8? ( >=net-nds/openldap-1.2.11 ) )
ldap-sasl? ( !oci8? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) )
libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
@@ -197,6 +198,7 @@
phpconfutils_use_depend_all "iodbc" "odbc"
phpconfutils_use_depend_all "sapdb" "odbc"
phpconfutils_use_depend_all "solid" "odbc"
+ phpconfutils_use_depend_all "kolab" "imap"
# Direct USE conflicts
phpconfutils_use_conflict "gd" "gd-external"
@@ -205,7 +207,7 @@
phpconfutils_use_conflict "zip" "zip-external"
phpconfutils_use_conflict "qdbm" "gdbm"
phpconfutils_use_conflict "readline" "libedit"
- phpconfutils_use_conflict "recode" "mysql" "imap" "yaz"
+ phpconfutils_use_conflict "recode" "mysql" "imap" "yaz" "kolab"
phpconfutils_use_conflict "sharedmem" "threads"
phpconfutils_use_conflict "firebird" "interbase"
@@ -701,60 +703,29 @@
# @DESCRIPTION:
# Provides important information to users after install is finished.
php5_2-sapi_pkg_postinst() {
- ewarn
- ewarn "If you have additional third party PHP extensions (such as"
- ewarn "dev-php5/phpdbg) you may need to recompile them now."
- ewarn "A new way of enabling/disabling PHP extensions was introduced"
- ewarn "with the newer PHP packages releases, so please reemerge any"
- ewarn "PHP extensions you have installed to automatically adapt to"
- ewarn "the new configuration layout."
- if use sharedext ; then
- ewarn "The core PHP extensions are now loaded through external"
- ewarn ".ini files, not anymore using a 'extension=name.so' line"
- ewarn "in the php.ini file. Portage will take care of this by"
- ewarn "creating new, updated config-files, please make sure to"
- ewarn "install those using etc-update or dispatch-conf."
- fi
- ewarn
-
- if use curl ; then
- ewarn "Please be aware that CURL can allow the bypass of open_basedir restrictions."
- ewarn "This can be a security risk!"
+ ewarn "If you have additional third party PHP extensions (such as"
+ ewarn "dev-php5/phpdbg) you may need to recompile them now."
+ ewarn
+
+ if use sharedext ; then
+ ewarn "Make sure to use etc-update or dispatch-conf so that extension-specific"
+ ewarn "ini files get merged properly"
+ ewarn
+ fi
+
+ if has kolab ${IUSE} && use kolab ; then
+ ewarn "Please note that kolab support is still experimental!"
+ ewarn "Issues specific to USE=kolab must be reported to Gentoo bugzilla only!"
+ ewarn
+ ewarn "Kolab groupware server requires annotations support for IMAP, which is enabled"
+ ewarn "by a third-party patch. Please do NOT report issues with the imap extension"
+ ewarn "to bugs.php.net until you have recompiled both PHP and net-libs/c-client"
+ ewarn "with USE=\"-kolab\" and confirmed that those issues still exist!"
ewarn
fi
- ewarn "The 'pic' USE flag was added to newer releases of dev-lang/php."
- ewarn "With PIC enabled, your PHP installation may become slower, but"
- ewarn "PIC is required on Hardened-Gentoo platforms (where the USE flag"
- ewarn "is enabled automatically). You may also need this on other"
- ewarn "configurations where TEXTRELs are disabled, for example when using"
- ewarn "certain PaX options in the kernel."
- ewarn
-
- ewarn "With PHP 5.2, some extensions were removed from PHP because"
- ewarn "they were unmaintained or moved to PECL. Our ebuilds reflect"
- ewarn "this: the Filepro and HwAPI (Hyperwave-API) extensions were"
- ewarn "removed altogether and have no available substitute."
- ewarn "The Informix extension was also removed, as well as the optional"
- ewarn "memory-limit setting: memory-limit is now always enforced!"
- ewarn "The 'vm-goto' and 'vm-switch' USE flags were also removed,"
- ewarn "since the alternative VMs aren't really supported upstream"
- ewarn "and were found to behave badly with PHP 5.2. Once their"
- ewarn "state becomes clearer, we'll consider readding the USE flags."
- ewarn "The Ming extension was removed from our PHP 5.2 ebuild, because"
- ewarn "there were serious problems with compilation and the required"
- ewarn "Ming library. This functionality will be reintroduced later"
- ewarn "as an independant, external PHP extension."
- ewarn "The configure option --enable-gd-native-ttf (enabled by the"
- ewarn "'truetype' USE flag) was removed at upstreams request,"
- ewarn "as it's considered old and broken."
- ewarn "Hardened-PHP was also removed from the PHP 5.2 ebuilds in"
- ewarn "favour of its successor Suhosin, enable the 'suhosin' USE"
- ewarn "flag to install it."
- ewarn
-
- ewarn "The 'xml' and 'xml2' USE flags were unified in only the 'xml' USE"
- ewarn "flag. To get the features that were once controlled by the 'xml2'"
- ewarn "USE flag, turn the 'xml' USE flag on."
- ewarn
+ ewarn "USE=\"pic\" slows down PHP but has to be enabled on setups where TEXTRELs"
+ ewarn "are disabled (e.g. when using PaX in the kernel). On hardened profiles this"
+ ewarn "USE flag is enabled automatically"
+ ewarn
}
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php5_2-sapi.eclass
@ 2008-03-03 20:49 Christian Hoffmann (hoffie)
0 siblings, 0 replies; 17+ messages in thread
From: Christian Hoffmann (hoffie) @ 2008-03-03 20:49 UTC (permalink / raw
To: gentoo-commits
hoffie 08/03/03 20:49:08
Modified: php5_2-sapi.eclass
Log:
dropping not-yet-available kolab from php5_2-sapi.eclass again (import from php-overlay, thanks jakub)
Revision Changes Path
1.19 eclass/php5_2-sapi.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?r1=1.18&r2=1.19
Index: php5_2-sapi.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- php5_2-sapi.eclass 3 Mar 2008 17:06:16 -0000 1.18
+++ php5_2-sapi.eclass 3 Mar 2008 20:49:07 -0000 1.19
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.18 2008/03/03 17:06:16 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.19 2008/03/03 20:49:07 hoffie Exp $
# ========================================================================
# Based on robbat2's work on the php4 sapi eclass
@@ -70,7 +70,6 @@
imap? ( virtual/imap-c-client )
iodbc? ( dev-db/libiodbc >=dev-db/unixODBC-1.8.13 )
kerberos? ( virtual/krb5 )
- kolab? ( >=net-libs/c-client-2004g-r1 )
ldap? ( !oci8? ( >=net-nds/openldap-1.2.11 ) )
ldap-sasl? ( !oci8? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) )
libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php5_2-sapi.eclass
@ 2008-04-16 18:14 Christian Hoffmann (hoffie)
0 siblings, 0 replies; 17+ messages in thread
From: Christian Hoffmann (hoffie) @ 2008-04-16 18:14 UTC (permalink / raw
To: gentoo-commits
hoffie 08/04/16 18:14:51
Modified: php5_2-sapi.eclass
Log:
php: fixing autotools usage (use eautoreconf instead of calling binaries directly), bug 215027
Revision Changes Path
1.20 eclass/php5_2-sapi.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?r1=1.19&r2=1.20
Index: php5_2-sapi.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- php5_2-sapi.eclass 3 Mar 2008 20:49:07 -0000 1.19
+++ php5_2-sapi.eclass 16 Apr 2008 18:14:51 -0000 1.20
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.19 2008/03/03 20:49:07 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.20 2008/04/16 18:14:51 hoffie Exp $
# ========================================================================
# Based on robbat2's work on the php4 sapi eclass
@@ -387,21 +387,14 @@
fi
fi
- # Fix configure scripts to correctly support Suhosin
- einfo "Running aclocal"
- aclocal --force || die "Unable to run aclocal successfully"
- einfo "Running libtoolize"
- libtoolize --copy --force || die "Unable to run libtoolize successfully"
-
- # Rebuild configure to make sure it's up to date
- einfo "Rebuilding configure script"
- autoreconf --force -W no-cross || die "Unable to regenerate configure script successfully"
+ # We are heavily patching autotools base files (configure.in) because
+ # of suhosin etc., so let's regenerate the whole stuff now
- # Run elibtoolize
- elibtoolize
+ # eaclocal doesn't accept --force, so we try to force re-generation
+ # this way
+ rm aclocal.m4
+ eautoreconf --force -W no-cross
- # Just in case ;-)
- chmod 0755 configure || die "Failed to chmod configure to 0755"
}
# @FUNCTION: php5_2-sapi_src_compile
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php5_2-sapi.eclass
@ 2008-05-03 14:38 Christian Hoffmann (hoffie)
0 siblings, 0 replies; 17+ messages in thread
From: Christian Hoffmann (hoffie) @ 2008-05-03 14:38 UTC (permalink / raw
To: gentoo-commits
hoffie 08/05/03 14:38:25
Modified: php5_2-sapi.eclass
Log:
adjusting php's dba-related options as they changed from --with to --disable (bug 220076)
Revision Changes Path
1.21 eclass/php5_2-sapi.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?r1=1.20&r2=1.21
Index: php5_2-sapi.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- php5_2-sapi.eclass 16 Apr 2008 18:14:51 -0000 1.20
+++ php5_2-sapi.eclass 3 May 2008 14:38:25 -0000 1.21
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.20 2008/04/16 18:14:51 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.21 2008/05/03 14:38:25 hoffie Exp $
# ========================================================================
# Based on robbat2's work on the php4 sapi eclass
@@ -486,9 +486,9 @@
# DBA drivers support
phpconfutils_extension_with "cdb" "cdb" 0
phpconfutils_extension_with "db4" "berkdb" 0
- phpconfutils_extension_with "flatfile" "flatfile" 0
+ phpconfutils_extension_disable "flatfile" "flatfile" 0
phpconfutils_extension_with "gdbm" "gdbm" 0
- phpconfutils_extension_with "inifile" "inifile" 0
+ phpconfutils_extension_disable "inifile" "inifile" 0
phpconfutils_extension_with "qdbm" "qdbm" 0
# Support for the GD graphics library
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php5_2-sapi.eclass
@ 2008-07-07 1:51 Jeroen Roovers (jer)
0 siblings, 0 replies; 17+ messages in thread
From: Jeroen Roovers (jer) @ 2008-07-07 1:51 UTC (permalink / raw
To: gentoo-commits
jer 08/07/07 01:51:09
Modified: php5_2-sapi.eclass
Log:
Fix whitespace.
Revision Changes Path
1.23 eclass/php5_2-sapi.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?r1=1.22&r2=1.23
Index: php5_2-sapi.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- php5_2-sapi.eclass 25 May 2008 09:27:48 -0000 1.22
+++ php5_2-sapi.eclass 7 Jul 2008 01:51:08 -0000 1.23
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.22 2008/05/25 09:27:48 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.23 2008/07/07 01:51:08 jer Exp $
# ========================================================================
# Based on robbat2's work on the php4 sapi eclass
@@ -696,15 +696,15 @@
# @DESCRIPTION:
# Provides important information to users after install is finished.
php5_2-sapi_pkg_postinst() {
- ewarn "If you have additional third party PHP extensions (such as"
- ewarn "dev-php5/phpdbg) you may need to recompile them now."
- ewarn
-
- if use sharedext ; then
- ewarn "Make sure to use etc-update or dispatch-conf so that extension-specific"
- ewarn "ini files get merged properly"
- ewarn
- fi
+ ewarn "If you have additional third party PHP extensions (such as"
+ ewarn "dev-php5/phpdbg) you may need to recompile them now."
+ ewarn
+
+ if use sharedext ; then
+ ewarn "Make sure to use etc-update or dispatch-conf so that extension-specific"
+ ewarn "ini files get merged properly"
+ ewarn
+ fi
if has kolab ${IUSE} && use kolab ; then
ewarn "Please note that kolab support is still experimental!"
@@ -717,8 +717,8 @@
ewarn
fi
- ewarn "USE=\"pic\" slows down PHP but has to be enabled on setups where TEXTRELs"
- ewarn "are disabled (e.g. when using PaX in the kernel). On hardened profiles this"
- ewarn "USE flag is enabled automatically"
- ewarn
+ ewarn "USE=\"pic\" slows down PHP but has to be enabled on setups where TEXTRELs"
+ ewarn "are disabled (e.g. when using PaX in the kernel). On hardened profiles this"
+ ewarn "USE flag is enabled automatically"
+ ewarn
}
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php5_2-sapi.eclass
@ 2009-06-21 23:09 Christian Hoffmann (hoffie)
0 siblings, 0 replies; 17+ messages in thread
From: Christian Hoffmann (hoffie) @ 2009-06-21 23:09 UTC (permalink / raw
To: gentoo-commits
hoffie 09/06/21 23:09:02
Modified: php5_2-sapi.eclass
Log:
removing traces of USE=zip-external for dev-lang/php
Revision Changes Path
1.24 eclass/php5_2-sapi.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?r1=1.23&r2=1.24
Index: php5_2-sapi.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- php5_2-sapi.eclass 7 Jul 2008 01:51:08 -0000 1.23
+++ php5_2-sapi.eclass 21 Jun 2009 23:09:02 -0000 1.24
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.23 2008/07/07 01:51:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.24 2009/06/21 23:09:02 hoffie Exp $
# ========================================================================
# Based on robbat2's work on the php4 sapi eclass
@@ -43,7 +43,7 @@
S="${WORKDIR}/${MY_PHP_P}"
fi
-IUSE="adabas bcmath berkdb birdstep bzip2 calendar cdb cjk crypt ctype curl curlwrappers db2 dbase dbmaker debug doc empress empress-bcs esoob exif frontbase fdftk filter firebird flatfile ftp gd gd-external gdbm gmp hash iconv imap inifile interbase iodbc ipv6 java-external json kerberos ldap ldap-sasl libedit mcve mhash msql mssql mysql mysqli ncurses nls oci8 oci8-instant-client odbc pcntl pcre pdo pic posix postgres qdbm readline reflection recode sapdb session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl suhosin sybase sybase-ct sysvipc tidy tokenizer truetype unicode wddx xml xmlreader xmlwriter xmlrpc xpm xsl yaz zip zip-external zlib"
+IUSE="adabas bcmath berkdb birdstep bzip2 calendar cdb cjk crypt ctype curl curlwrappers db2 dbase dbmaker debug doc empress empress-bcs esoob exif frontbase fdftk filter firebird flatfile ftp gd gd-external gdbm gmp hash iconv imap inifile interbase iodbc ipv6 java-external json kerberos ldap ldap-sasl libedit mcve mhash msql mssql mysql mysqli ncurses nls oci8 oci8-instant-client odbc pcntl pcre pdo pic posix postgres qdbm readline reflection recode sapdb session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl suhosin sybase sybase-ct sysvipc tidy tokenizer truetype unicode wddx xml xmlreader xmlwriter xmlrpc xpm xsl yaz zip zlib"
# these USE flags should have the correct dependencies
DEPEND="adabas? ( >=dev-db/unixODBC-1.8.13 )
@@ -133,9 +133,7 @@
mcve? ( dev-php5/pecl-mcve )
pdo? ( !dev-php5/pecl-pdo )
suhosin? ( dev-php5/suhosin )
- yaz? ( dev-php5/pecl-yaz )
- zip? ( !dev-php5/pecl-zip )
- zip-external? ( dev-php5/pecl-zip )"
+ yaz? ( dev-php5/pecl-yaz )"
# ========================================================================
# php.ini Support
@@ -204,7 +202,6 @@
phpconfutils_use_conflict "gd" "gd-external"
phpconfutils_use_conflict "oci8" "oci8-instant-client"
phpconfutils_use_conflict "oci8" "ldap-sasl"
- phpconfutils_use_conflict "zip" "zip-external"
phpconfutils_use_conflict "qdbm" "gdbm"
phpconfutils_use_conflict "readline" "libedit"
phpconfutils_use_conflict "recode" "mysql" "imap" "yaz" "kolab"
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php5_2-sapi.eclass
@ 2009-07-20 10:32 Diego Petteno (flameeyes)
0 siblings, 0 replies; 17+ messages in thread
From: Diego Petteno (flameeyes) @ 2009-07-20 10:32 UTC (permalink / raw
To: gentoo-commits
flameeyes 09/07/20 10:32:35
Modified: php5_2-sapi.eclass
Log:
Use emake -j1 for install, explicitly. Just to make use of -s in MAKEOPTS for instance.
Revision Changes Path
1.25 eclass/php5_2-sapi.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?r1=1.24&r2=1.25
Index: php5_2-sapi.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- php5_2-sapi.eclass 21 Jun 2009 23:09:02 -0000 1.24
+++ php5_2-sapi.eclass 20 Jul 2009 10:32:34 -0000 1.25
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.24 2009/06/21 23:09:02 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.25 2009/07/20 10:32:34 flameeyes Exp $
# ========================================================================
# Based on robbat2's work on the php4 sapi eclass
@@ -644,7 +644,7 @@
addpredict /usr/share/snmp/mibs/.index
# Install PHP
- make INSTALL_ROOT="${D}" install-build install-headers install-programs || die "make install failed"
+ emake -j1 INSTALL_ROOT="${D}" install-build install-headers install-programs || die "make install failed"
# Install missing header files
if use unicode || phpconfutils_usecheck unicode ; then
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php5_2-sapi.eclass
@ 2009-11-13 15:57 Dawid Weglinski (cla)
0 siblings, 0 replies; 17+ messages in thread
From: Dawid Weglinski (cla) @ 2009-11-13 15:57 UTC (permalink / raw
To: gentoo-commits
cla 09/11/13 15:57:25
Modified: php5_2-sapi.eclass
Log:
Let non php maintainers to upload patchset tarballs somewhere where they have write acces by $PHP_PATCHSET_URI
Revision Changes Path
1.26 eclass/php5_2-sapi.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?r1=1.25&r2=1.26
Index: php5_2-sapi.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- php5_2-sapi.eclass 20 Jul 2009 10:32:34 -0000 1.25
+++ php5_2-sapi.eclass 13 Nov 2009 15:57:24 -0000 1.26
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.25 2009/07/20 10:32:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.26 2009/11/13 15:57:24 cla Exp $
# ========================================================================
# Based on robbat2's work on the php4 sapi eclass
@@ -147,7 +147,13 @@
# @ECLASS-VARIABLE: PHP_PATCHSET_REV
# @DESCRIPTION:
# Provides PHP patchsets support.
-SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-patchset-${MY_PHP_PV}-r${PHP_PATCHSET_REV}.tar.bz2"
+# This condition will help non php maintainers in fixing bugs and let them to
+# upload patchset tarballs somewhere else.
+if [[ ! -n ${PHP_PATCHSET_URI} ]]; then
+ SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-patchset-${MY_PHP_PV}-r${PHP_PATCHSET_REV}.tar.bz2"
+else
+ SRC_URI="${SRC_URI} ${PHP_PATCHSET_URI}"
+fi
# @ECLASS-VARIABLE: SUHOSIN_PATCH
# @DESCRIPTION:
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php5_2-sapi.eclass
@ 2009-11-25 0:03 Mike Frysinger (vapier)
0 siblings, 0 replies; 17+ messages in thread
From: Mike Frysinger (vapier) @ 2009-11-25 0:03 UTC (permalink / raw
To: gentoo-commits
vapier 09/11/25 00:03:24
Modified: php5_2-sapi.eclass
Log:
fix php configure generation with autoconf-2.64+ #281697
Revision Changes Path
1.27 eclass/php5_2-sapi.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?r1=1.26&r2=1.27
Index: php5_2-sapi.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- php5_2-sapi.eclass 13 Nov 2009 15:57:24 -0000 1.26
+++ php5_2-sapi.eclass 25 Nov 2009 00:03:24 -0000 1.27
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.26 2009/11/13 15:57:24 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.27 2009/11/25 00:03:24 vapier Exp $
# ========================================================================
# Based on robbat2's work on the php4 sapi eclass
@@ -394,6 +394,13 @@
# We are heavily patching autotools base files (configure.in) because
# of suhosin etc., so let's regenerate the whole stuff now
+ # work around divert() issues with newer autoconf #281697
+ if has_version '>=sys-devel/autoconf-2.64' ; then
+ sed -i -r \
+ -e 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \
+ $(grep -l divert $(find -name '*.m4') configure.in) || die
+ fi
+
# eaclocal doesn't accept --force, so we try to force re-generation
# this way
rm aclocal.m4
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php5_2-sapi.eclass
@ 2010-02-05 9:40 Alexis Ballier (aballier)
0 siblings, 0 replies; 17+ messages in thread
From: Alexis Ballier (aballier) @ 2010-02-05 9:40 UTC (permalink / raw
To: gentoo-commits
aballier 10/02/05 09:40:59
Modified: php5_2-sapi.eclass
Log:
libedit is not in freebsd-lib anymore these days. This was fixed years ago in php5_1-sapi.eclass but wasn't carried to php5_2. See http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_1-sapi.eclass?r1=1.35&r2=1.36
Revision Changes Path
1.29 eclass/php5_2-sapi.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?r1=1.28&r2=1.29
Index: php5_2-sapi.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- php5_2-sapi.eclass 27 Jan 2010 12:06:22 -0000 1.28
+++ php5_2-sapi.eclass 5 Feb 2010 09:40:59 -0000 1.29
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.28 2010/01/27 12:06:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.29 2010/02/05 09:40:59 aballier Exp $
# ========================================================================
# Based on robbat2's work on the php4 sapi eclass
@@ -72,7 +72,7 @@
kerberos? ( virtual/krb5 )
ldap? ( !oci8? ( >=net-nds/openldap-1.2.11 ) )
ldap-sasl? ( !oci8? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) )
- libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+ libedit? ( dev-libs/libedit )
mcve? ( >=dev-libs/openssl-0.9.7 )
mhash? ( app-crypt/mhash )
mssql? ( dev-db/freetds )
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php5_2-sapi.eclass
@ 2010-02-26 21:25 Patrick Lauer (patrick)
0 siblings, 0 replies; 17+ messages in thread
From: Patrick Lauer (patrick) @ 2010-02-26 21:25 UTC (permalink / raw
To: gentoo-commits
patrick 10/02/26 21:25:58
Modified: php5_2-sapi.eclass
Log:
Fixing dependencies for libpq masking
Revision Changes Path
1.30 eclass/php5_2-sapi.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?r1=1.29&r2=1.30
Index: php5_2-sapi.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- php5_2-sapi.eclass 5 Feb 2010 09:40:59 -0000 1.29
+++ php5_2-sapi.eclass 26 Feb 2010 21:25:58 -0000 1.30
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.29 2010/02/05 09:40:59 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.30 2010/02/26 21:25:58 patrick Exp $
# ========================================================================
# Based on robbat2's work on the php4 sapi eclass
@@ -82,8 +82,8 @@
nls? ( sys-devel/gettext )
oci8-instant-client? ( dev-db/oracle-instantclient-basic )
odbc? ( >=dev-db/unixODBC-1.8.13 )
- postgres? ( || ( >=dev-db/libpq-7.1 ( app-admin/eselect-postgresql
- >=dev-db/postgresql-base-7.1 ) ) )
+ postgres? ( app-admin/eselect-postgresql
+ >=dev-db/postgresql-base-7.1 )
qdbm? ( dev-db/qdbm )
readline? ( sys-libs/readline )
recode? ( app-text/recode )
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php5_2-sapi.eclass
@ 2010-02-26 21:56 Mark Loeser (halcy0n)
0 siblings, 0 replies; 17+ messages in thread
From: Mark Loeser (halcy0n) @ 2010-02-26 21:56 UTC (permalink / raw
To: gentoo-commits
halcy0n 10/02/26 21:56:58
Modified: php5_2-sapi.eclass
Log:
Add back dev-db/libpq since not all archs have postgresql-base stable
Revision Changes Path
1.31 eclass/php5_2-sapi.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?r1=1.30&r2=1.31
Index: php5_2-sapi.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- php5_2-sapi.eclass 26 Feb 2010 21:25:58 -0000 1.30
+++ php5_2-sapi.eclass 26 Feb 2010 21:56:58 -0000 1.31
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.30 2010/02/26 21:25:58 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.31 2010/02/26 21:56:58 halcy0n Exp $
# ========================================================================
# Based on robbat2's work on the php4 sapi eclass
@@ -82,8 +82,8 @@
nls? ( sys-devel/gettext )
oci8-instant-client? ( dev-db/oracle-instantclient-basic )
odbc? ( >=dev-db/unixODBC-1.8.13 )
- postgres? ( app-admin/eselect-postgresql
- >=dev-db/postgresql-base-7.1 )
+ postgres? ( || ( >=dev-db/libpq-7.1 ( app-admin/eselect-postgresql
+ >=dev-db/postgresql-base-7.1 ) ) )
qdbm? ( dev-db/qdbm )
readline? ( sys-libs/readline )
recode? ( app-text/recode )
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php5_2-sapi.eclass
@ 2010-03-16 13:17 Ben de Groot (yngwin)
0 siblings, 0 replies; 17+ messages in thread
From: Ben de Groot (yngwin) @ 2010-03-16 13:17 UTC (permalink / raw
To: gentoo-commits
yngwin 10/03/16 13:17:27
Modified: php5_2-sapi.eclass
Log:
correct find usage, fixes bug #305827
Revision Changes Path
1.32 eclass/php5_2-sapi.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?r1=1.31&r2=1.32
Index: php5_2-sapi.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- php5_2-sapi.eclass 26 Feb 2010 21:56:58 -0000 1.31
+++ php5_2-sapi.eclass 16 Mar 2010 13:17:26 -0000 1.32
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# cOPYRIGht 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.31 2010/02/26 21:56:58 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.32 2010/03/16 13:17:26 yngwin Exp $
# ========================================================================
# Based on robbat2's work on the php4 sapi eclass
@@ -41,7 +41,7 @@
LICENSE="PHP-3"
SRC_URI="http://www.php.net/distributions/${MY_PHP_P}.tar.bz2"
S="${WORKDIR}/${MY_PHP_P}"
-fi
+FI
IUSE="adabas bcmath berkdb birdstep bzip2 calendar cdb cjk crypt ctype curl curlwrappers db2 dbase dbmaker debug doc empress empress-bcs esoob exif frontbase fdftk filter firebird flatfile ftp gd gd-external gdbm gmp hash iconv imap inifile interbase iodbc ipv6 java-external json kerberos ldap ldap-sasl libedit mcve mhash msql mssql mysql mysqli ncurses nls oci8 oci8-instant-client odbc pcntl pcre pdo pic posix postgres qdbm readline reflection recode sapdb session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl suhosin sybase sybase-ct sysvipc tidy tokenizer truetype unicode wddx xml xmlreader xmlwriter xmlrpc xpm xsl yaz zip zlib"
@@ -84,7 +84,7 @@
odbc? ( >=dev-db/unixODBC-1.8.13 )
postgres? ( || ( >=dev-db/libpq-7.1 ( app-admin/eselect-postgresql
>=dev-db/postgresql-base-7.1 ) ) )
- qdbm? ( dev-db/qdbm )
+ QDBM? ( Dev-db/qdbm )
readline? ( sys-libs/readline )
recode? ( app-text/recode )
sapdb? ( >=dev-db/unixODBC-1.8.13 )
@@ -127,7 +127,7 @@
#
# They are in PDEPEND because we need PHP installed first!
PDEPEND="doc? ( app-doc/php-docs )
- filter? ( !dev-php5/pecl-filter )
+ FILTER? ( !dev-php5/pecl-filter )
java-external? ( dev-php5/php-java-bridge )
json? ( !dev-php5/pecl-json )
mcve? ( dev-php5/pecl-mcve )
@@ -170,7 +170,7 @@
# INTERNAL FUNCTIONS
# ========================================================================
-php5_2-sapi_check_use_flags() {
+PHP5_2-SApi_check_use_flags() {
# Multiple USE dependencies
phpconfutils_use_depend_any "truetype" "gd" "gd" "gd-external"
phpconfutils_use_depend_any "cjk" "gd" "gd" "gd-external"
@@ -299,7 +299,7 @@
dodir ${PHP_EXT_INI_DIR}
dodir ${PHP_EXT_INI_DIR_ACTIVE}
- # Install any extensions built as shared objects
+ # iNSTALL any extensions built as shared objects
if use sharedext ; then
for x in `ls "${D}/${PHPEXTDIR}/"*.so | sort` ; do
inifilename=${x/.so/.ini}
@@ -342,7 +342,7 @@
sed -re "s|^(PHP_)?EXTRA_VERSION=\".*\"|\1EXTRA_VERSION=\"${PHP_EXTRA_BRANDING}-pl${PHPPR}-gentoo\"|g" -i configure.in \
|| die "Unable to change PHP branding to ${PHP_EXTRA_BRANDING}-pl${PHPPR}-gentoo"
- # multilib-strict support
+ # MULTILIb-strict support
if [[ -n "${MULTILIB_PATCH}" ]] && [[ -f "${WORKDIR}/${MULTILIB_PATCH}" ]] ; then
epatch "${WORKDIR}/${MULTILIB_PATCH}"
else
@@ -385,7 +385,7 @@
# Suhosin support
if use suhosin ; then
if [[ -n "${SUHOSIN_PATCH}" ]] && [[ -f "${DISTDIR}/${SUHOSIN_PATCH}" ]] ; then
- epatch "${DISTDIR}/${SUHOSIN_PATCH}"
+ EPATCH "${DISTDIR}/${SUHOSIN_PATCH}"
else
ewarn "There is no Suhosin patch available for this PHP release yet!"
fi
@@ -398,7 +398,7 @@
if has_version '>=sys-devel/autoconf-2.64' ; then
sed -i -r \
-e 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \
- $(grep -l divert $(find -name '*.m4') configure.in) || die
+ $(grep -l divert $(find . -name '*.m4') configure.in) || die
fi
# eaclocal doesn't accept --force, so we try to force re-generation
@@ -428,7 +428,7 @@
phpconfutils_extension_with "bz2" "bzip2" 1
phpconfutils_extension_enable "calendar" "calendar" 1
phpconfutils_extension_disable "ctype" "ctype" 0
- phpconfutils_extension_with "curl" "curl" 1
+ PHPCONFUTils_extension_with "curl" "curl" 1
phpconfutils_extension_with "curlwrappers" "curlwrappers" 0
phpconfutils_extension_enable "dbase" "dbase" 1
phpconfutils_extension_disable "dom" "xml" 0
@@ -471,7 +471,7 @@
phpconfutils_extension_with "sybase-ct" "sybase-ct" 1
phpconfutils_extension_enable "sysvmsg" "sysvipc" 1
phpconfutils_extension_enable "sysvsem" "sysvipc" 1
- phpconfutils_extension_enable "sysvshm" "sysvipc" 1
+ PHPCONFUTils_extension_enable "sysvshm" "sysvipc" 1
phpconfutils_extension_with "tidy" "tidy" 1
phpconfutils_extension_disable "tokenizer" "tokenizer" 0
phpconfutils_extension_enable "wddx" "wddx" 1
@@ -514,7 +514,7 @@
phpconfutils_extension_enable "gd-jis-conv" "cjk" 0
phpconfutils_extension_with "jpeg-dir" "gd" 0 "/usr"
phpconfutils_extension_with "png-dir" "gd" 0 "/usr"
- phpconfutils_extension_with "xpm-dir" "xpm" 0 "/usr"
+ PHPCONFUTils_extension_with "xpm-dir" "xpm" 0 "/usr"
# enable gd last, so configure can pick up the previous settings
phpconfutils_extension_with "gd" "gd" 0
fi
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: php5_2-sapi.eclass
@ 2010-03-16 14:06 Ben de Groot (yngwin)
0 siblings, 0 replies; 17+ messages in thread
From: Ben de Groot (yngwin) @ 2010-03-16 14:06 UTC (permalink / raw
To: gentoo-commits
yngwin 10/03/16 14:06:12
Modified: php5_2-sapi.eclass
Log:
Fix snafu
Revision Changes Path
1.33 eclass/php5_2-sapi.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?r1=1.32&r2=1.33
Index: php5_2-sapi.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- php5_2-sapi.eclass 16 Mar 2010 13:17:26 -0000 1.32
+++ php5_2-sapi.eclass 16 Mar 2010 14:06:11 -0000 1.33
@@ -1,6 +1,6 @@
-# cOPYRIGht 1999-2007 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.32 2010/03/16 13:17:26 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.33 2010/03/16 14:06:11 yngwin Exp $
# ========================================================================
# Based on robbat2's work on the php4 sapi eclass
@@ -41,7 +41,7 @@
LICENSE="PHP-3"
SRC_URI="http://www.php.net/distributions/${MY_PHP_P}.tar.bz2"
S="${WORKDIR}/${MY_PHP_P}"
-FI
+fi
IUSE="adabas bcmath berkdb birdstep bzip2 calendar cdb cjk crypt ctype curl curlwrappers db2 dbase dbmaker debug doc empress empress-bcs esoob exif frontbase fdftk filter firebird flatfile ftp gd gd-external gdbm gmp hash iconv imap inifile interbase iodbc ipv6 java-external json kerberos ldap ldap-sasl libedit mcve mhash msql mssql mysql mysqli ncurses nls oci8 oci8-instant-client odbc pcntl pcre pdo pic posix postgres qdbm readline reflection recode sapdb session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl suhosin sybase sybase-ct sysvipc tidy tokenizer truetype unicode wddx xml xmlreader xmlwriter xmlrpc xpm xsl yaz zip zlib"
@@ -84,7 +84,7 @@
odbc? ( >=dev-db/unixODBC-1.8.13 )
postgres? ( || ( >=dev-db/libpq-7.1 ( app-admin/eselect-postgresql
>=dev-db/postgresql-base-7.1 ) ) )
- QDBM? ( Dev-db/qdbm )
+ qdbm? ( dev-db/qdbm )
readline? ( sys-libs/readline )
recode? ( app-text/recode )
sapdb? ( >=dev-db/unixODBC-1.8.13 )
@@ -127,7 +127,7 @@
#
# They are in PDEPEND because we need PHP installed first!
PDEPEND="doc? ( app-doc/php-docs )
- FILTER? ( !dev-php5/pecl-filter )
+ filter? ( !dev-php5/pecl-filter )
java-external? ( dev-php5/php-java-bridge )
json? ( !dev-php5/pecl-json )
mcve? ( dev-php5/pecl-mcve )
@@ -170,7 +170,7 @@
# INTERNAL FUNCTIONS
# ========================================================================
-PHP5_2-SApi_check_use_flags() {
+php5_2-sapi_check_use_flags() {
# Multiple USE dependencies
phpconfutils_use_depend_any "truetype" "gd" "gd" "gd-external"
phpconfutils_use_depend_any "cjk" "gd" "gd" "gd-external"
@@ -299,7 +299,7 @@
dodir ${PHP_EXT_INI_DIR}
dodir ${PHP_EXT_INI_DIR_ACTIVE}
- # iNSTALL any extensions built as shared objects
+ # Install any extensions built as shared objects
if use sharedext ; then
for x in `ls "${D}/${PHPEXTDIR}/"*.so | sort` ; do
inifilename=${x/.so/.ini}
@@ -342,7 +342,7 @@
sed -re "s|^(PHP_)?EXTRA_VERSION=\".*\"|\1EXTRA_VERSION=\"${PHP_EXTRA_BRANDING}-pl${PHPPR}-gentoo\"|g" -i configure.in \
|| die "Unable to change PHP branding to ${PHP_EXTRA_BRANDING}-pl${PHPPR}-gentoo"
- # MULTILIb-strict support
+ # multilib-strict support
if [[ -n "${MULTILIB_PATCH}" ]] && [[ -f "${WORKDIR}/${MULTILIB_PATCH}" ]] ; then
epatch "${WORKDIR}/${MULTILIB_PATCH}"
else
@@ -385,7 +385,7 @@
# Suhosin support
if use suhosin ; then
if [[ -n "${SUHOSIN_PATCH}" ]] && [[ -f "${DISTDIR}/${SUHOSIN_PATCH}" ]] ; then
- EPATCH "${DISTDIR}/${SUHOSIN_PATCH}"
+ epatch "${DISTDIR}/${SUHOSIN_PATCH}"
else
ewarn "There is no Suhosin patch available for this PHP release yet!"
fi
@@ -428,7 +428,7 @@
phpconfutils_extension_with "bz2" "bzip2" 1
phpconfutils_extension_enable "calendar" "calendar" 1
phpconfutils_extension_disable "ctype" "ctype" 0
- PHPCONFUTils_extension_with "curl" "curl" 1
+ phpconfutils_extension_with "curl" "curl" 1
phpconfutils_extension_with "curlwrappers" "curlwrappers" 0
phpconfutils_extension_enable "dbase" "dbase" 1
phpconfutils_extension_disable "dom" "xml" 0
@@ -471,7 +471,7 @@
phpconfutils_extension_with "sybase-ct" "sybase-ct" 1
phpconfutils_extension_enable "sysvmsg" "sysvipc" 1
phpconfutils_extension_enable "sysvsem" "sysvipc" 1
- PHPCONFUTils_extension_enable "sysvshm" "sysvipc" 1
+ phpconfutils_extension_enable "sysvshm" "sysvipc" 1
phpconfutils_extension_with "tidy" "tidy" 1
phpconfutils_extension_disable "tokenizer" "tokenizer" 0
phpconfutils_extension_enable "wddx" "wddx" 1
@@ -514,7 +514,7 @@
phpconfutils_extension_enable "gd-jis-conv" "cjk" 0
phpconfutils_extension_with "jpeg-dir" "gd" 0 "/usr"
phpconfutils_extension_with "png-dir" "gd" 0 "/usr"
- PHPCONFUTils_extension_with "xpm-dir" "xpm" 0 "/usr"
+ phpconfutils_extension_with "xpm-dir" "xpm" 0 "/usr"
# enable gd last, so configure can pick up the previous settings
phpconfutils_extension_with "gd" "gd" 0
fi
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2010-03-16 14:06 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-10 21:00 [gentoo-commits] gentoo-x86 commit in eclass: php5_2-sapi.eclass Markus Ullmann (jokey)
-- strict thread matches above, loose matches on Subject: below --
2010-03-16 14:06 Ben de Groot (yngwin)
2010-03-16 13:17 Ben de Groot (yngwin)
2010-02-26 21:56 Mark Loeser (halcy0n)
2010-02-26 21:25 Patrick Lauer (patrick)
2010-02-05 9:40 Alexis Ballier (aballier)
2009-11-25 0:03 Mike Frysinger (vapier)
2009-11-13 15:57 Dawid Weglinski (cla)
2009-07-20 10:32 Diego Petteno (flameeyes)
2009-06-21 23:09 Christian Hoffmann (hoffie)
2008-07-07 1:51 Jeroen Roovers (jer)
2008-05-03 14:38 Christian Hoffmann (hoffie)
2008-04-16 18:14 Christian Hoffmann (hoffie)
2008-03-03 20:49 Christian Hoffmann (hoffie)
2008-03-03 17:06 Markus Ullmann (jokey)
2007-09-30 12:20 Christian Hoffmann (hoffie)
2007-09-08 12:06 Markus Ullmann (jokey)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox