From fed35dea66677e0aeb6035a79df001b5fdb00437 Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Fri, 12 Aug 2011 07:40:09 +0000 Subject: [PATCH] Bumped RC for 5.3.7 Package-Manager: portage-2.1.10.6/cvs/Linux x86_64 --- dev-lang/php/ChangeLog | 7 +- dev-lang/php/Manifest | 5 +- dev-lang/php/php-5.3.7_rc5.ebuild | 354 ++++++++++++++++++++++++++++++ 3 files changed, 364 insertions(+), 2 deletions(-) create mode 100644 dev-lang/php/php-5.3.7_rc5.ebuild diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog index 4ecd15a6afc5..e3aaa531f745 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.499 2011/08/08 16:15:47 olemarkus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.500 2011/08/12 07:40:09 olemarkus Exp $ + +*php-5.3.7_rc5 (12 Aug 2011) + + 12 Aug 2011; Ole Markus With +php-5.3.7_rc5.ebuild: + Bumped RC for 5.3.7 *php-5.4.0_alpha3 (08 Aug 2011) diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index 0eb6454e1844..40fe93c54b0e 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -43,6 +43,7 @@ DIST php-5.3.3.tar.bz2 10662227 RMD160 9edb51663feac9b787f8382012893f1ac98fec6a DIST php-5.3.6.tar.bz2 10952171 RMD160 619bf96cf24bf6aa0988494186f8914fde94d44d SHA1 0e0b9b4d9117f22080e2204afa9383469eb0dbbd SHA256 30ae880f22e3ee93eccc9b80e3c58b0d6364d139bb4366dcc27f2fab658d3198 DIST php-5.3.7RC2.tar.bz2 11135548 RMD160 446f53e0af86dfaaab025869996fff5b82493904 SHA1 c333becfba3da5d5ee45419d8f66bcdc644154f3 SHA256 556fd00b84858ee46e7c19e3d9fdf17fbb03725211dc39d6cbd44e8060dda017 DIST php-5.3.7RC3.tar.bz2 11135642 RMD160 81945143b1ccfa20139c685e1341ed9a8853d7fe SHA1 6c1ddd5ace11cebb4cdce1979780c4413cae3371 SHA256 19d543aba7b6e88390050ce68df99bcfeb10daa6150c8b46347873595abb6f9f +DIST php-5.3.7RC5.tar.bz2 11140021 RMD160 177e483959c9e23e4b12a3c63086ac755d6d67e7 SHA1 675bc619f54414b09c38a9fb0271561892c07baa SHA256 d869ccabe05feb244c795514a3dd769e846b6b54e6ac362008e90c5cd57ea58a DIST php-5.4.0alpha1.tar.bz2 11015848 RMD160 2f0d10fa22465d984fa584cc62924717e5deb1fc SHA1 40ba6c57ad4e364667170dc0ea448e38e2695ccf SHA256 d06d1b2b598d4a7773b6f90bda64c82ef3028f12cf1bc838f4c4de8bb24c1169 DIST php-5.4.0alpha3.tar.bz2 11112693 RMD160 3b731cf7b2230013b7752c20c8e3dc695877c38e SHA1 400af62e1a5d495fe87d98432a38a692abfd0649 SHA256 263282185d2c50ccb1cd4c051157411c6da05cf0384c64f8bdff71c0d50113e1 DIST php-patchset-5.2.14-r1.tar.bz2 8381 RMD160 7f562ac7df8f918f6d73f61c4e2096a88759889d SHA1 0453926bccfd5bd8089c311f6e16f1e4a8c08993 SHA256 f49aacef203cee8e7ad038492ed43e7677ed2d22e0fef07dc840195cacc95d34 @@ -51,6 +52,7 @@ DIST php-patchset-5.3.3-r2.tar.bz2 9796 RMD160 6620cae9768e6a2c415ad6ed1fe9d5665 DIST php-patchset-5.3.6-r0.tar.bz2 10033 RMD160 352290d674cfc3bb76c4ee44b90e3ef7a231c405 SHA1 cd9e5ae79595adf7ca42d6e2fe81dd275a8b7575 SHA256 544aae373fcff288bf22706a30f06da6bcc29695d0014dc7768585197c80aaeb DIST php-patchset-5.3.7_rc2-r0.tar.bz2 9258 RMD160 97c5be732f3b1d0cdd9f6af3e586e273a9941e9a SHA1 d03b80319fac25aaedf2de7f758bff94f7ec018b SHA256 318ccba899b3af78ba10b74da4dcdde7ca5556650bc5d1ea0a7d68957b4b3811 DIST php-patchset-5.3.7_rc3-r0.tar.bz2 7528 RMD160 7f0389d957fa9048aed4d8787650d3162df742fa SHA1 e1c3354a5cd62b0b00f294bf412ae82fabb76610 SHA256 685fd20a301f42493e5c9f490642402e9da291a1a39d440567f4a9775195aed8 +DIST php-patchset-5.3.7_rc5-r0.tar.bz2 7519 RMD160 ec76e0b1d60d2f8f48c835e1bf9e3d3fd912688f SHA1 2a672db9d742330f6a3b122ad170a7ab6282a9eb SHA256 8faf9573fd0a255413ead940323e11c439e3a74eb9eb4bad71959334a81e2da1 DIST php-patchset-5.4.0_alpha1-r0.tar.bz2 6001 RMD160 0200e6ada41e471a30bfddeeb166d3254a9e2856 SHA1 3b1f71255db1c003f452c2fe41f93284a50967c4 SHA256 06834d624ce6269aa8005a28ccc0e55b2e8d500af57e4392e641978d5993a3ea DIST php-patchset-5.4.0_alpha3-r0.tar.bz2 6001 RMD160 0200e6ada41e471a30bfddeeb166d3254a9e2856 SHA1 3b1f71255db1c003f452c2fe41f93284a50967c4 SHA256 06834d624ce6269aa8005a28ccc0e55b2e8d500af57e4392e641978d5993a3ea DIST php-patchset-5.5.0_pre201105211430-r0.tar.bz2 9532 RMD160 8ef9cafc7652db45aef4421bafd51928f07dabff SHA1 44d7720208895b00a713e0f9ee777ea40a8fcf8a SHA256 3c348d8e09545beb33971c018ff948f4534766349821a477bd28c1b088b09b65 @@ -65,8 +67,9 @@ EBUILD php-5.3.6-r1.ebuild 9538 RMD160 e7365ce71f94f06b5732d497b9fc94b93f12945d EBUILD php-5.3.6.ebuild 9794 RMD160 9be2d19b4cfc93aa0f6920958f7868198b254427 SHA1 ab4f7dfd77ce61441901e4ae6834c6563a1bf96c SHA256 f97847b13e3f5a09f686006401f816ba823850541da4d2ab58a9c7289651809e EBUILD php-5.3.7_rc2.ebuild 9543 RMD160 88a46bcac38f3ebc873f48406cb124f23f402126 SHA1 2100316c2586e434a97c8a508b1d985b02c74a03 SHA256 659d078fa2399ae800734f701357c9a64fbc787693c04d1908470602797fcf75 EBUILD php-5.3.7_rc3.ebuild 9586 RMD160 59388df6b23c096945bc9a44e570949477c9da0a SHA1 24fe50e43390e12dada7fd87a76b159678bfe63d SHA256 11fff86b394f532fe87be99f2424e0a9f92f990cbee7b924ba63c604f69c9045 +EBUILD php-5.3.7_rc5.ebuild 9586 RMD160 11d58a882bf84a1774972c681e966843be5b9848 SHA1 0ff0dd39b93d07a0f71d9f5347b71a4924469a50 SHA256 36254b1d768560550d4a38b5d24c7ddfe7a1c3ff5376a4de8bfc3e2a63e35a02 EBUILD php-5.4.0_alpha1.ebuild 8538 RMD160 194abead36de3e3c7cba14ee4d0191de1fc6003d SHA1 665b74f0b909bac24a331cecc047c6baf58490fe SHA256 5a6c9526d65968cdc50a866ce0a02a1d0e24c826641f6b66e251cfa61c5f67b3 EBUILD php-5.4.0_alpha3.ebuild 8532 RMD160 ce493599d94ac424c07a7969b70effacced85811 SHA1 69ac3e3419877599be62f2117f0915c0a27990ff SHA256 7a070e5e99d1d14f6cac93c986574f4fdaac9ce16b2fb4c9d6133634b32a7b68 EBUILD php-5.5.0_pre201105211430.ebuild 9523 RMD160 ed8fb75cb33d9ac955897bbeffd559e8e91dff3b SHA1 7557061d6f4e0dd38710af7b417f3fa37a8f2214 SHA256 187d2434b926db70e7a2c1f89141a09cc869c431ebb6e0d857913eaa50da7ce2 -MISC ChangeLog 85034 RMD160 706bd5848222fb2f3a99109ccad12e5cde61b7c6 SHA1 31970067abad57d0e6ecaa5cb8c3a6198095ccdb SHA256 3670fa2ff5427c3e224c62bf92b76cb404f500c0e97d941133b1cebd0e82eeed +MISC ChangeLog 85164 RMD160 d6292f9767b49d11758d7393c44695ec22d55c5f SHA1 8e609a647c9e17ac8ff286d5a629fa4b9955cb62 SHA256 6f8d74794f9f8726c8937319cd14eb01ca53264973471833a036509268c24d61 MISC metadata.xml 2212 RMD160 e26ea7f6831acb23854f018fe6d00c213bf62e5a SHA1 25500969d6ef6c1918a8e6abbb04e0553806dee2 SHA256 6fdbba214ce15fae4a1e2eb086586008377fff85e67e38b1e2232a9745432674 diff --git a/dev-lang/php/php-5.3.7_rc5.ebuild b/dev-lang/php/php-5.3.7_rc5.ebuild new file mode 100644 index 000000000000..3dc20ba45636 --- /dev/null +++ b/dev-lang/php/php-5.3.7_rc5.ebuild @@ -0,0 +1,354 @@ +# 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.3.7_rc5.ebuild,v 1.1 2011/08/12 07:40:09 olemarkus Exp $ + +EAPI=4 + +PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob interbase oci8 sapdb solid" + +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-pre") + echo "http://downloads.php.net/ilia/${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_RELEASE="php-pre" +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")" + +PHP_FPM_INIT_VER="4" +PHP_FPM_CONF_VER="1" + +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} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk + crypt +ctype curl curlwrappers db2 dbmaker debug doc empress + empress-bcs enchant esoob exif frontbase +fileinfo +filter firebird + flatfile ftp gd gd-external gdbm gmp +hash +iconv imap inifile + interbase intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash + mssql mysql mysqlnd mysqli nls oci8 + oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm + readline recode sapdb +session sharedext sharedmem + +simplexml snmp soap sockets solid 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] + adabas? ( >=dev-db/unixODBC-1.8.13 ) + 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? ( !gd-external? ( + virtual/jpeg + media-libs/libpng + sys-libs/zlib + ) ) ) + crypt? ( >=dev-libs/libmcrypt-2.4 ) + curl? ( >=net-misc/curl-7.10.5 ) + db2? ( >=dev-db/unixODBC-1.8.13 ) + dbmaker? ( >=dev-db/unixODBC-1.8.13 ) + empress? ( >=dev-db/unixODBC-1.8.13 ) + empress-bcs? ( >=dev-db/unixODBC-1.8.13 ) + enchant? ( app-text/enchant ) + esoob? ( >=dev-db/unixODBC-1.8.13 ) + exif? ( !gd? ( !gd-external? ( + virtual/jpeg + media-libs/libpng + sys-libs/zlib + ) ) ) + firebird? ( dev-db/firebird ) + gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) + gd-external? ( media-libs/gd ) + 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? ( !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 ) ) + 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 ) + sapdb? ( >=dev-db/unixODBC-1.8.13 ) + 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 ) + solid? ( >=dev-db/unixODBC-1.8.13 ) + spell? ( >=app-text/aspell-0.50 ) + sqlite? ( =dev-db/sqlite-2* pdo? ( >=dev-db/sqlite-3.7.7.1 ) ) + sqlite3? ( >=dev-db/sqlite-3.7.7.1 ) + 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? ( !gd-external? ( + 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 gd-external ) ) + cjk? ( || ( gd gd-external ) ) + exif? ( || ( gd gd-external ) ) + + xpm? ( gd ) + gd? ( zlib !gd-external ) + gd-external? ( !gd ) + simplexml? ( xml ) + soap? ( xml ) + wddx? ( xml ) + xmlrpc? ( || ( xml iconv ) ) + xmlreader? ( xml ) + xsl? ( xml ) + ldap-sasl? ( ldap !oci8 ) + adabas? ( odbc ) + birdstep? ( odbc ) + dbmaker? ( odbc ) + empress-bcs? ( empress ) + empress? ( odbc ) + esoob? ( odbc ) + db2? ( odbc ) + sapdb? ( odbc ) + solid? ( odbc ) + kolab? ( imap ) + mhash? ( hash ) + phar? ( hash ) + mysqlnd? ( || ( + mysql + mysqli + pdo + ) ) + + oci8? ( !oci8-instant-client !ldap-sasl ) + oci8-instant-client? ( !oci8 ) + + qdbm? ( !gdbm ) + readline? ( !libedit ) + recode? ( !imap !mysql !mysqli ) + firebird? ( !interbase ) + 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 "${*:2}" + 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 v2 + +src_prepare() { eblit-run src_prepare v3 ; } +src_configure() { eblit-run src_configure v2 ; } +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 ; } -- 2.26.2