Bump beta version of 5.4.0
authorOle Markus With <olemarkus@gentoo.org>
Thu, 20 Oct 2011 08:27:33 +0000 (08:27 +0000)
committerOle Markus With <olemarkus@gentoo.org>
Thu, 20 Oct 2011 08:27:33 +0000 (08:27 +0000)
Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

dev-lang/php/ChangeLog
dev-lang/php/Manifest
dev-lang/php/php-5.4.0_beta2.ebuild [new file with mode: 0644]

index 81e5adae4ec69718f5621606707ebab649598779..544a7392d756b2b2b951e428ff2894b0aa45c676 100644 (file)
@@ -1,6 +1,11 @@
 # 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.515 2011/09/22 17:35:18 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.516 2011/10/20 08:27:33 olemarkus Exp $
+
+*php-5.4.0_beta2 (20 Oct 2011)
+
+  20 Oct 2011; Ole Markus With <olemarkus@gentoo.org> +php-5.4.0_beta2.ebuild:
+  Bump beta version of 5.4.0
 
   22 Sep 2011; Ole Markus With <olemarkus@gentoo.org> php-5.3.8.ebuild:
   Enabling xml USE flag by default
index 63287dd54df3301d32dfce0949ca47ade08ca283..c47f45422c141d3c296b74546bc306f7b5424526 100644 (file)
@@ -37,24 +37,27 @@ AUX php5-ldvs 22 RMD160 5846dab2745b68a88175dd4e72d0b8cf4756dd46 SHA1 592398c925
 DIST php-5.2.17.tar.bz2 9092312 RMD160 567fa8d718b93fb83a89494c83a8bec224ac99e9 SHA1 d68f3b09f766990d815a3c4c63c157db8dab8095 SHA256 e81beb13ec242ab700e56f366e9da52fd6cf18961d155b23304ca870e53f116c
 DIST php-5.3.8.tar.bz2 11190060 RMD160 f18a18e2dfd7ea7885760eec2a05b3c4a15ad9db SHA1 8f29029e092f262876bfdd2ce56f6867e2b74b85 SHA256 a1dd06fd5593e97d9a5bd9818d6501d28d3ee8f09b83f0ec78f7cdfc060f3ea2
 DIST php-5.4.0beta1.tar.bz2 11200782 RMD160 358ae467f1a64e704adbe614acce1a846631d0ed SHA1 933ec30e7f24bed2745f554b61e2c3a3e19eebfb SHA256 f288855f07d37e84e3e51a8fd9617556155e69fcaf0a84633360ada718226b15
+DIST php-5.4.0beta2.tar.bz2 11291274 RMD160 0ee88f511d3390e8448afbe9554d713015e31e95 SHA1 6851d51078975965fb2796a87ad634d81225408b SHA256 d67c347142c75c080b306fe9b63359da3c2c00ecfcea097945c569d3f4560226
 DIST php-patchset-5.2.17-r0.tar.bz2 8369 RMD160 544af4eb2de8e4478e675810f18a5b494b59709b SHA1 7b3c56437b435f60f72f7af08112e77c01e2f827 SHA256 fb159a02faf5120dd9bc620bd3f3094735f181aa6893273bb7dd29771b8b23b2
 DIST php-patchset-5.3.8-r0.tar.bz2 7518 RMD160 3b9fc4063202b0a83b76a8c0f5bcfeb2ab358a50 SHA1 8b20057a68c9f6f4554ab96a884e874707fcd2e5 SHA256 a4677d75648529ccec61fc0edaa2684ad72c0b15bc81dc0770a6cbc927337686
 DIST php-patchset-5.4.0_beta1-r0.tar.bz2 6001 RMD160 0200e6ada41e471a30bfddeeb166d3254a9e2856 SHA1 3b1f71255db1c003f452c2fe41f93284a50967c4 SHA256 06834d624ce6269aa8005a28ccc0e55b2e8d500af57e4392e641978d5993a3ea
+DIST php-patchset-5.4.0_beta2-r0.tar.bz2 6001 RMD160 0200e6ada41e471a30bfddeeb166d3254a9e2856 SHA1 3b1f71255db1c003f452c2fe41f93284a50967c4 SHA256 06834d624ce6269aa8005a28ccc0e55b2e8d500af57e4392e641978d5993a3ea
 DIST suhosin-patch-5.2.16-0.9.7.patch.gz 23069 RMD160 b28b70faf136b3e04c5b483da0f4c2279378f43a SHA1 fec10b2b81582d06bb0d0a96ea55c525afc8ab29 SHA256 aae115a318d80b3f32cedf876e7a8e4b932febb1b0c743c0b398003ebe122f91
 DIST suhosin-patch-5.3.7-0.9.10.patch.gz 41175 RMD160 19f789bf49a5fed2cd88b199fd8ac5d1ffa9bdc8 SHA1 3c38e873584b8f9e325a813cc9b197a342595099 SHA256 0a0dac0e4343596f2bfcef27dcf7180524b78bb1d2d2ca878370a7d0f8313d26
 EBUILD php-5.2.17.ebuild 9357 RMD160 0b58506aa7df24546ecbcf8fce42a6ce7f5cc2f2 SHA1 7d4055e988d1cc7ac4932ce82543bcece76a4ba5 SHA256 8c9f0ba52b7e8297b0ecdbcc1ad5bde40e5d4d602cb70ed2f5d0262032cc393b
 EBUILD php-5.3.8.ebuild 9601 RMD160 82879062916c7e796f872e8627bedf79bf912a0e SHA1 05d6bae0984a63b8e958cd2fae30b4dccc5e7664 SHA256 6a9dc8758b2b219d854c6af51d3245ffdfd6ed732f0a2f7e7c80b32fde09ca0d
 EBUILD php-5.4.0_beta1.ebuild 8530 RMD160 f74007f6f70c2cb9e0fcd63bb3a8867f24c4cbba SHA1 893cf7c3d7dd05dd9b0aad2aa6838bb1c008e89c SHA256 650e9840c21e596f88e27435d3ed199b691b3610e4ecc1d0e3cd175dde16d01c
-MISC ChangeLog 87427 RMD160 acfb2c99b6f38a83ef517248fde7b18380244996 SHA1 868d2a513552f80d9d7ead39176985bf9056a085 SHA256 ff077e56613dc351321db6238fcbea14165e996200a24c04b54d8b746904e7ce
+EBUILD php-5.4.0_beta2.ebuild 8530 RMD160 eb45642338127e1dbf3eb854d488525132113777 SHA1 0862a13b9e528739e9a53e07daf38427dd1ae7f3 SHA256 3c9061df81406b7668f1a80ea9a019d0edb8557207340c81d1fe081b914476f4
+MISC ChangeLog 87568 RMD160 c372de7e320bb334e4d7c976258d67df6cb0a539 SHA1 02e184094efcaf29b069ce630246f7fc32151805 SHA256 438b5fc2ba3a45e526961af42ed3e83534d0a6ce04e6c90245e26a90f8f9ecea
 MISC metadata.xml 2075 RMD160 e2eb44e39169dc2ff8e099d670a222e7102b1aea SHA1 9cebbc373dc8441aa0374132a3b5d87df6d37ffc SHA256 3d8bc9305be300ef7ef92d18ba5476927ec90a5b6d43c2408936229590ff5ac5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOe3mHAAoJEGurSuXEqSv1jbAH/3jiL/xW/ALG9m5qmA6tmTGY
-HleVsZrMZvfePtd0FZBfmorCLZRR0OqfHJ2YY1HEy5DBsOFyq1oyGpvkeNp7Ichx
-g9S8xqoDIYXjZTXdFpeDwGHxI/voje75fJTkskfuGtI011GvctAoJ3Oa+Z2ujZ4W
-lSw3L5uACzuREx3yGpQIPCv2lCkw3fLL0M9h/DI6QbPqvV0l5ZYdOIICrT67UtCk
-DLCQEqbqQ1wVUD+grMfEKW451HJEoSh2oFyWGT7iEiKgoqyzBiU1Kvg+0mOdfnyu
-5hBudepSd9RApZGed+nF6xs6CNrERxhQVntSJ6kn+76SJAvjyFhjVTEogFKoNSs=
-=pLmE
+iQEcBAEBAgAGBQJOn9tvAAoJEGurSuXEqSv16d8H/1YREYy2YFHAIdVmlADOaTPD
+FkHNPmGetrstCyA2GN8z9/nNy+S6WR43x6cpoQP4ZRqD+mdXIG5qlQ+B39KJ/NbZ
+7F2IOFZFvmU2c2TQKPfy9+9FtyZrURhB7ID6gyKlHveDNpbFxjroOxpy/pxV+tX+
+Ioh5pjNygDtQn/U7TX0h1Dcp8ebyn840G15XAentZ7VPOIvtSlnk/eKzDFHdaH75
+j2P+nkBlteY+Z9K3pgOIAPqiiZ5ITJQ/s+rKowjd66CXqvI9NqX5kyhtjkjgbFfn
+eyYYwSlBQU8O1qPebxJmPKHvSqewWGF0Qb5ujx7ooenK9u4HdPAU1jqWoNMt62I=
+=fDV1
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/php/php-5.4.0_beta2.ebuild b/dev-lang/php/php-5.4.0_beta2.ebuild
new file mode 100644 (file)
index 0000000..c6d640e
--- /dev/null
@@ -0,0 +1,329 @@
+# 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_beta2.ebuild,v 1.1 2011/10/20 08:27:33 olemarkus Exp $
+
+EAPI=4
+
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use 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_PV="${PV/_beta/beta}"
+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 sharedmem
+       +simplexml snmp soap sockets spell 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* )
+       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 )
+       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 v2
+       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 v3
+
+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 v3 ; }
+src_test() { eblit-run src_test v1 ; }
+pkg_postinst() { eblit-run pkg_postinst v2 ; }