* [gentoo-commits] gentoo-x86 commit in dev-lang/php: ChangeLog php-5.4.0_alpha1.ebuild
@ 2011-06-29 6:38 Ole Markus With (olemarkus)
0 siblings, 0 replies; 2+ messages in thread
From: Ole Markus With (olemarkus) @ 2011-06-29 6:38 UTC (permalink / raw
To: gentoo-commits
olemarkus 11/06/29 06:38:38
Modified: ChangeLog
Added: php-5.4.0_alpha1.ebuild
Log:
Added php 5.4 alpha 1
(Portage version: 2.1.10.3/cvs/Linux x86_64)
Revision Changes Path
1.492 dev-lang/php/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.492&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.492&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?r1=1.491&r2=1.492
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v
retrieving revision 1.491
retrieving revision 1.492
diff -u -r1.491 -r1.492
--- ChangeLog 17 Jun 2011 10:03:02 -0000 1.491
+++ ChangeLog 29 Jun 2011 06:38:38 -0000 1.492
@@ -1,6 +1,13 @@
# ChangeLog for dev-lang/php
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.491 2011/06/17 10:03:02 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.492 2011/06/29 06:38:38 olemarkus Exp $
+
+*php-5.4.0_alpha1 (29 Jun 2011)
+
+ 29 Jun 2011; Ole Markus With <olemarkus@gentoo.org>
+ +files/eblits/src_configure-v3.eblit, +files/eblits/src_prepare-v4.eblit,
+ +php-5.4.0_alpha1.ebuild:
+ Added php 5.4 alpha 1
*php-5.3.7_rc1 (17 Jun 2011)
1.1 dev-lang/php/php-5.4.0_alpha1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.4.0_alpha1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.4.0_alpha1.ebuild?rev=1.1&content-type=text/plain
Index: php-5.4.0_alpha1.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.0_alpha1.ebuild,v 1.1 2011/06/29 06:38:38 olemarkus Exp $
EAPI=4
inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool
SUHOSIN_VERSION=""
FPM_VERSION="builtin"
EXPECTED_TEST_FAILURES=""
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
function php_get_uri ()
{
case "${1}" in
"php-stas")
echo "http://downloads.php.net/stas/${2}"
;;
"php-pre")
echo "http://downloads.php.net/johannes/${2}"
;;
"php")
echo "http://www.php.net/distributions/${2}"
;;
"suhosin")
echo "http://download.suhosin.org/${2}"
;;
"olemarkus")
echo "http://olemarkus.org/~olemarkus/gentoo/${2}"
;;
"gentoo")
echo "mirror://gentoo/${2}"
;;
*)
die "unhandled case in php_get_uri"
;;
esac
}
PHP_MV="$(get_major_version)"
# alias, so we can handle different types of releases (finals, rcs, alphas,
# betas, ...) w/o changing the whole ebuild
PHP_PV="${PV/_rc/RC}"
PHP_PV="${PV/_alpha/alpha}"
PHP_RELEASE="php-stas"
PHP_P="${PN}-${PHP_PV}"
PHP_PATCHSET_LOC="olemarkus"
PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
PHP_PATCHSET="0"
PHP_PATCHSET_URI="
$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")"
if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then
# in some cases we use our own suhosin patch (very recent version,
# patch conflicts, etc.)
SUHOSIN_TYPE="gentoo"
else
SUHOSIN_TYPE="suhosin"
fi
if [[ -n ${SUHOSIN_VERSION} ]]; then
SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch";
SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )"
fi
SRC_URI="
${PHP_SRC_URI}
${PHP_PATCHSET_URI}"
if [[ -n ${SUHOSIN_VERSION} ]]; then
SRC_URI="${SRC_URI}
suhosin? ( ${SUHOSIN_URI} )"
fi
DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
HOMEPAGE="http://php.net/"
LICENSE="PHP-3"
SLOT="$(get_version_component_range 1-2)"
S="${WORKDIR}/${PHP_P}"
# We can build the following SAPIs in the given order
SAPIS="embed cli cgi fpm apache2"
# Gentoo-specific, common features
IUSE="kolab"
# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
IUSE="${IUSE}
${SAPIS/cli/+cli}
threads"
IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
crypt +ctype curl curlwrappers debug doc
enchant exif frontbase +fileinfo +filter firebird
flatfile ftp gd gdbm gmp +hash +iconv imap inifile
intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
mssql mysql mysqlnd mysqli nls
oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm
readline recode +session sharedext sharedmem
+simplexml snmp soap sockets spell sqlite sqlite3 ssl
sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
# Enable suhosin if available
[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin"
DEPEND="!dev-lang/php:5
>=app-admin/eselect-php-0.6.2
>=dev-libs/libpcre-8.12[unicode]
apache2? ( www-servers/apache[threads=] )
berkdb? ( =sys-libs/db-4* )
birdstep? ( >=dev-db/unixODBC-1.8.13 )
bzip2? ( app-arch/bzip2 )
cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
cjk? ( !gd? (
virtual/jpeg
media-libs/libpng
sys-libs/zlib
) )
crypt? ( >=dev-libs/libmcrypt-2.4 )
curl? ( >=net-misc/curl-7.10.5 )
enchant? ( app-text/enchant )
exif? ( !gd? (
virtual/jpeg
media-libs/libpng
sys-libs/zlib
) )
firebird? ( dev-db/firebird )
gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib )
gdbm? ( >=sys-libs/gdbm-1.8.0 )
gmp? ( >=dev-libs/gmp-4.1.2 )
iconv? ( virtual/libiconv )
imap? ( virtual/imap-c-client[ssl=] )
intl? ( dev-libs/icu )
iodbc? ( dev-db/libiodbc )
kerberos? ( virtual/krb5 )
kolab? ( >=net-libs/c-client-2004g-r1 )
ldap? ( >=net-nds/openldap-1.2.11 )
ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
mssql? ( dev-db/freetds[mssql] )
!mysqlnd? (
mysql? ( virtual/mysql )
mysqli? ( >=virtual/mysql-4.1 )
)
nls? ( sys-devel/gettext )
oci8-instant-client? ( dev-db/oracle-instantclient-basic )
odbc? ( >=dev-db/unixODBC-1.8.13 )
postgres? ( dev-db/postgresql-base )
qdbm? ( dev-db/qdbm )
readline? ( sys-libs/readline )
recode? ( app-text/recode )
sharedmem? ( dev-libs/mm )
simplexml? ( >=dev-libs/libxml2-2.6.8 )
snmp? ( >=net-analyzer/net-snmp-5.2 )
soap? ( >=dev-libs/libxml2-2.6.8 )
spell? ( >=app-text/aspell-0.50 )
sqlite? ( =dev-db/sqlite-2* pdo? ( >=dev-db/sqlite-3.7.6.3 ) )
sqlite3? ( >=dev-db/sqlite-3.7.6.3 )
ssl? ( >=dev-libs/openssl-0.9.7 )
sybase-ct? ( dev-db/freetds )
tidy? ( app-text/htmltidy )
truetype? (
=media-libs/freetype-2*
>=media-libs/t1lib-5.0.0
!gd? (
virtual/jpeg media-libs/libpng sys-libs/zlib )
)
unicode? ( dev-libs/oniguruma )
wddx? ( >=dev-libs/libxml2-2.6.8 )
xml? ( >=dev-libs/libxml2-2.6.8 )
xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
xmlreader? ( >=dev-libs/libxml2-2.6.8 )
xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
xpm? (
x11-libs/libXpm
virtual/jpeg
media-libs/libpng sys-libs/zlib
)
xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
zip? ( sys-libs/zlib )
zlib? ( sys-libs/zlib )
virtual/mta
"
php="=${CATEGORY}/${PF}"
REQUIRED_USE="
truetype? ( gd )
cjk? ( gd )
exif? ( gd )
xpm? ( gd )
gd? ( zlib )
simplexml? ( xml )
soap? ( xml )
wddx? ( xml )
xmlrpc? ( || ( xml iconv ) )
xmlreader? ( xml )
xsl? ( xml )
ldap-sasl? ( ldap )
kolab? ( imap )
mhash? ( hash )
phar? ( hash )
mysqlnd? ( || (
mysql
mysqli
pdo
) )
qdbm? ( !gdbm )
readline? ( !libedit )
recode? ( !imap !mysql !mysqli )
sharedmem? ( !threads )
!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
DEPEND="${DEPEND}
enchant? ( !dev-php5/pecl-enchant )
fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 )
filter? ( !dev-php5/pecl-filter )
json? ( !dev-php5/pecl-json )
phar? ( !dev-php5/pecl-phar )
zip? ( !dev-php5/pecl-zip )"
[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? (
=${CATEGORY}/${PN}-${SLOT}*[unicode] )"
DEPEND="${DEPEND}
sys-devel/flex
>=sys-devel/m4-1.4.3
>=sys-devel/libtool-1.5.18"
# They are in PDEPEND because we need PHP installed first!
PDEPEND="doc? ( app-doc/php-docs )"
# No longer depend on the extension. The suhosin USE flag only installs the
# patch
#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )"
# Allow users to install production version if they want to
case "${PHP_INI_VERSION}" in
production|development)
;;
*)
PHP_INI_VERSION="development"
;;
esac
PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
PHP_INI_FILE="php.ini"
want_apache
# eblit-core
# Usage: <function> [version] [eval]
# Main eblit engine
eblit-core() {
[[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files"
local e v func=$1 ver=$2 eval_=$3
for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
e="${FILESDIR}/eblits/${func}${v}.eblit"
if [[ -e ${e} ]] ; then
. "${e}"
[[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }"
return 0
fi
done
return 1
}
# eblit-include
# Usage: [--skip] <function> [version]
# Includes an "eblit" -- a chunk of common code among ebuilds in a given
# package so that its functions can be sourced and utilized within the
# ebuild.
eblit-include() {
local skipable=false r=0
[[ $1 == "--skip" ]] && skipable=true && shift
[[ $1 == pkg_* ]] && skipable=true
[[ -z $1 ]] && die "Usage: eblit-include <function> [version]"
eblit-core $1 $2
r="$?"
${skipable} && return 0
[[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/"
}
# eblit-run-maybe
# Usage: <function>
# Runs a function if it is defined in an eblit
eblit-run-maybe() {
[[ $(type -t "$@") == "function" ]] && "$@"
}
# eblit-run
# Usage: <function> [version]
# Runs a function defined in an eblit
eblit-run() {
eblit-include --skip common "${*:2}"
eblit-include "$@"
eblit-run-maybe eblit-$1-pre
eblit-${PN}-$1
eblit-run-maybe eblit-$1-post
}
# eblit-pkg
# Usage: <phase> [version]
# Includes the given functions AND evals them so they're included in the binpkgs
eblit-pkg() {
[[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]"
eblit-core $1 $2 1
}
eblit-pkg pkg_setup v2
src_prepare() { eblit-run src_prepare v4 ; }
src_configure() { eblit-run src_configure v3 ; }
src_compile() { eblit-run src_compile v1 ; }
src_install() { eblit-run src_install v2 ; }
src_test() { eblit-run src_test v1 ; }
pkg_postinst() { eblit-run pkg_postinst v2 ; }
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/php: ChangeLog php-5.4.0_alpha1.ebuild
@ 2011-07-02 15:14 Ole Markus With (olemarkus)
0 siblings, 0 replies; 2+ messages in thread
From: Ole Markus With (olemarkus) @ 2011-07-02 15:14 UTC (permalink / raw
To: gentoo-commits
olemarkus 11/07/02 15:14:41
Modified: ChangeLog php-5.4.0_alpha1.ebuild
Log:
Removed call to silly phpconfutils_init. Added addpredict to src_configure (also silly)
(Portage version: 2.1.10.3/cvs/Linux x86_64)
Revision Changes Path
1.495 dev-lang/php/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.495&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.495&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?r1=1.494&r2=1.495
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v
retrieving revision 1.494
retrieving revision 1.495
diff -u -r1.494 -r1.495
--- ChangeLog 1 Jul 2011 11:45:01 -0000 1.494
+++ ChangeLog 2 Jul 2011 15:14:41 -0000 1.495
@@ -1,6 +1,12 @@
# ChangeLog for dev-lang/php
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.494 2011/07/01 11:45:01 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.495 2011/07/02 15:14:41 olemarkus Exp $
+
+ 02 Jul 2011; Ole Markus With <olemarkus@gentoo.org>
+ +files/eblits/pkg_setup-v3.eblit, files/eblits/src_configure-v3.eblit,
+ php-5.4.0_alpha1.ebuild:
+ Removed call to silly phpconfutils_init. Added addpredict to src_configure
+ (also silly)
*php-5.3.7_rc2 (01 Jul 2011)
1.3 dev-lang/php/php-5.4.0_alpha1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.4.0_alpha1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.4.0_alpha1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.4.0_alpha1.ebuild?r1=1.2&r2=1.3
Index: php-5.4.0_alpha1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.0_alpha1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-5.4.0_alpha1.ebuild 30 Jun 2011 07:30:11 -0000 1.2
+++ php-5.4.0_alpha1.ebuild 2 Jul 2011 15:14:41 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.0_alpha1.ebuild,v 1.2 2011/06/30 07:30:11 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.0_alpha1.ebuild,v 1.3 2011/07/02 15:14:41 olemarkus Exp $
EAPI=4
@@ -318,7 +318,7 @@
eblit-core $1 $2 1
}
-eblit-pkg pkg_setup v2
+eblit-pkg pkg_setup v3
src_prepare() { eblit-run src_prepare v4 ; }
src_configure() { eblit-run src_configure v3 ; }
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-07-02 15:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-02 15:14 [gentoo-commits] gentoo-x86 commit in dev-lang/php: ChangeLog php-5.4.0_alpha1.ebuild Ole Markus With (olemarkus)
-- strict thread matches above, loose matches on Subject: below --
2011-06-29 6:38 Ole Markus With (olemarkus)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox