From 3a3aff5e5c1e38fd05a2e86342849df4a0b193b6 Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Fri, 16 Sep 2011 07:04:41 +0000 Subject: [PATCH] Bump 5.4 to beta1 Package-Manager: portage-2.1.10.3/cvs/Linux x86_64 --- dev-lang/php/ChangeLog | 7 +- dev-lang/php/Manifest | 19 +- dev-lang/php/php-5.4.0_beta1.ebuild | 329 ++++++++++++++++++++++++++++ 3 files changed, 346 insertions(+), 9 deletions(-) create mode 100644 dev-lang/php/php-5.4.0_beta1.ebuild diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog index 2ac0a2f600b8..6ea8a4477317 100644 --- a/dev-lang/php/ChangeLog +++ b/dev-lang/php/ChangeLog @@ -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.512 2011/09/16 07:02:56 olemarkus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.513 2011/09/16 07:04:41 olemarkus Exp $ + +*php-5.4.0_beta1 (16 Sep 2011) + + 16 Sep 2011; Ole Markus With +php-5.4.0_beta1.ebuild: + Bump 5.4 to beta1 16 Sep 2011; Ole Markus With files/eblits/src_configure-v3.eblit, files/eblits/src_install-v3.eblit, diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index c1209af57dcb..9121f4d39ae3 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -39,11 +39,13 @@ DIST php-5.3.6.tar.bz2 10952171 RMD160 619bf96cf24bf6aa0988494186f8914fde94d44d DIST php-5.3.7RC5.tar.bz2 11140021 RMD160 177e483959c9e23e4b12a3c63086ac755d6d67e7 SHA1 675bc619f54414b09c38a9fb0271561892c07baa SHA256 d869ccabe05feb244c795514a3dd769e846b6b54e6ac362008e90c5cd57ea58a DIST php-5.3.8.tar.bz2 11190060 RMD160 f18a18e2dfd7ea7885760eec2a05b3c4a15ad9db SHA1 8f29029e092f262876bfdd2ce56f6867e2b74b85 SHA256 a1dd06fd5593e97d9a5bd9818d6501d28d3ee8f09b83f0ec78f7cdfc060f3ea2 DIST php-5.4.0alpha3.tar.bz2 11112693 RMD160 3b731cf7b2230013b7752c20c8e3dc695877c38e SHA1 400af62e1a5d495fe87d98432a38a692abfd0649 SHA256 263282185d2c50ccb1cd4c051157411c6da05cf0384c64f8bdff71c0d50113e1 +DIST php-5.4.0beta1.tar.bz2 11200782 RMD160 358ae467f1a64e704adbe614acce1a846631d0ed SHA1 933ec30e7f24bed2745f554b61e2c3a3e19eebfb SHA256 f288855f07d37e84e3e51a8fd9617556155e69fcaf0a84633360ada718226b15 DIST php-patchset-5.2.17-r0.tar.bz2 8369 RMD160 544af4eb2de8e4478e675810f18a5b494b59709b SHA1 7b3c56437b435f60f72f7af08112e77c01e2f827 SHA256 fb159a02faf5120dd9bc620bd3f3094735f181aa6893273bb7dd29771b8b23b2 DIST php-patchset-5.3.6-r0.tar.bz2 10033 RMD160 352290d674cfc3bb76c4ee44b90e3ef7a231c405 SHA1 cd9e5ae79595adf7ca42d6e2fe81dd275a8b7575 SHA256 544aae373fcff288bf22706a30f06da6bcc29695d0014dc7768585197c80aaeb DIST php-patchset-5.3.7_rc5-r0.tar.bz2 7519 RMD160 ec76e0b1d60d2f8f48c835e1bf9e3d3fd912688f SHA1 2a672db9d742330f6a3b122ad170a7ab6282a9eb SHA256 8faf9573fd0a255413ead940323e11c439e3a74eb9eb4bad71959334a81e2da1 DIST php-patchset-5.3.8-r0.tar.bz2 7518 RMD160 3b9fc4063202b0a83b76a8c0f5bcfeb2ab358a50 SHA1 8b20057a68c9f6f4554ab96a884e874707fcd2e5 SHA256 a4677d75648529ccec61fc0edaa2684ad72c0b15bc81dc0770a6cbc927337686 DIST php-patchset-5.4.0_alpha3-r0.tar.bz2 6001 RMD160 0200e6ada41e471a30bfddeeb166d3254a9e2856 SHA1 3b1f71255db1c003f452c2fe41f93284a50967c4 SHA256 06834d624ce6269aa8005a28ccc0e55b2e8d500af57e4392e641978d5993a3ea +DIST php-patchset-5.4.0_beta1-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 @@ -52,16 +54,17 @@ EBUILD php-5.3.6.ebuild 9794 RMD160 9be2d19b4cfc93aa0f6920958f7868198b254427 SHA EBUILD php-5.3.7_rc5.ebuild 9586 RMD160 11d58a882bf84a1774972c681e966843be5b9848 SHA1 0ff0dd39b93d07a0f71d9f5347b71a4924469a50 SHA256 36254b1d768560550d4a38b5d24c7ddfe7a1c3ff5376a4de8bfc3e2a63e35a02 EBUILD php-5.3.8.ebuild 9598 RMD160 3939461700878f93866114ab290b89218668ff28 SHA1 7d8a45f88145b501c07434b6f2d73a4e62298e01 SHA256 d25b65288ffbd417ad3746f4d0114245c481b18ae363a1e9dde4a9fec13ec6d7 EBUILD php-5.4.0_alpha3.ebuild 8505 RMD160 9dcb8ab8fa4f161a18a00b94a9916c1c633b2a9b SHA1 b453ab4e22b97dc9a666aef259c40219799ad819 SHA256 b8b625360a4843790bd72af5a6a9a2e1891e2a481e6c4ba6d2d0a389ffa0592b -MISC ChangeLog 87015 RMD160 9d287c882b048550c23342636179c0e901e4112d SHA1 fce42708e45ff79b8f58b9f3ae11ba07717fba18 SHA256 b4c3cc0dea02c75f2a95afbec22672b05132fcf9fc3cf499926ee13dfed03efe +EBUILD php-5.4.0_beta1.ebuild 8530 RMD160 f74007f6f70c2cb9e0fcd63bb3a8867f24c4cbba SHA1 893cf7c3d7dd05dd9b0aad2aa6838bb1c008e89c SHA256 650e9840c21e596f88e27435d3ed199b691b3610e4ecc1d0e3cd175dde16d01c +MISC ChangeLog 87147 RMD160 39c173cae8ff42cb19cb21bdca50adbb27a3cce9 SHA1 79ac597ecc9e4f44f03a988602e70705a2d6efe5 SHA256 4d531ef284f1a661a6c8d987521a8a3d5c4b6b4e71c083eccdef2ccabe77d5a3 MISC metadata.xml 2075 RMD160 e2eb44e39169dc2ff8e099d670a222e7102b1aea SHA1 9cebbc373dc8441aa0374132a3b5d87df6d37ffc SHA256 3d8bc9305be300ef7ef92d18ba5476927ec90a5b6d43c2408936229590ff5ac5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQEcBAEBAgAGBQJOcvTfAAoJEGurSuXEqSv1pLEH/jhlb3HolsJHZVz2e20h8fPM -ftzn1Jk4AtjfxX+4zHfncqyOH3LLUH7grsUpD35V67vS9/N0+ssVIlCdnULyYjGA -g/ba79eQwpMAcDtkXG5Y9vfZfskyVS/vGaUN2spr2IYOqKGcIxIEJC4CUeOkFQ6U -H4G3dof1eZrOdFmvRs7KNryBewXhE3zyOZYSDFN+BMok/TNeRyL8wC8TdTrHaJNI -pwFMRX6P9xvOvBfvgiA3IhFY8kE28j1RCjDH52d24KLjIXkHYG8Ds2dwqqU3uRz0 -k+4moxGnnn/xHINc9IE1BU5ZUepgsyqBm7iYGshSNtOBbmraZj4vgJKBV+/3hHE= -=Gya4 +iQEcBAEBAgAGBQJOcvVBAAoJEGurSuXEqSv1X7cH/2XfseYWrM+GPWwASmdjyFKc +tJwVAPmxaLE6YxyUgCRX2C87HoM4DQgTrJoiHmj49TOOATKRMSeIn7WeD3MPKqiF +dXKpOZYI/JD8vPVCTjy3q5SI/LDUlpfZtI0oW7MlEu8/sSTYX9Jn6jRIVGcMjAIi +Ewm5c4zM6fofmYWLXw3NW4HqBIdHgCPXeXpJ2YSvTztnLFOuoBMHnlKI25KiHb/r +4xd7pP9XDoghbFgnoZWIiAm4HnNwg6AuoIIflRAM+jeAUcug6pZoabAJVbW7QTjg +5yoL5gDkA7HWz035LafVjc1oNa96ky5jlWyLRil92cYL5ZjRaUJaJxEDISYyPtk= +=qOFo -----END PGP SIGNATURE----- diff --git a/dev-lang/php/php-5.4.0_beta1.ebuild b/dev-lang/php/php-5.4.0_beta1.ebuild new file mode 100644 index 000000000000..dfba09179a93 --- /dev/null +++ b/dev-lang/php/php-5.4.0_beta1.ebuild @@ -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_beta1.ebuild,v 1.1 2011/09/16 07:04:41 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? ( ! [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] [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 [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: +# Runs a function if it is defined in an eblit +eblit-run-maybe() { + [[ $(type -t "$@") == "function" ]] && "$@" +} + +# eblit-run +# Usage: [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: [version] +# Includes the given functions AND evals them so they're included in the binpkgs +eblit-pkg() { + [[ -z $1 ]] && die "Usage: eblit-pkg [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 ; } -- 2.26.2