From 91971e7f1cd9cf47891442003310cc0b3caa1d73 Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Fri, 11 Nov 2011 13:18:38 +0000 Subject: [PATCH] Removed beta of 5.4 Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64 --- dev-lang/php/ChangeLog | 5 +- dev-lang/php/Manifest | 5 +- dev-lang/php/php-5.4.0_beta2.ebuild | 332 ---------------------------- 3 files changed, 5 insertions(+), 337 deletions(-) delete mode 100644 dev-lang/php/php-5.4.0_beta2.ebuild diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog index b3c091561fcb..eb4b5c8b7f36 100644 --- a/dev-lang/php/ChangeLog +++ b/dev-lang/php/ChangeLog @@ -1,6 +1,9 @@ # 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.520 2011/11/11 13:14:36 olemarkus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.521 2011/11/11 13:18:38 olemarkus Exp $ + + 11 Nov 2011; Ole Markus With -php-5.4.0_beta2.ebuild: + Removed beta of 5.4 *php-5.4.0_rc1 (11 Nov 2011) diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index 1b4926ab28f7..bedf208745d7 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -24,18 +24,15 @@ DIST php-5.2.17.tar.bz2 9092312 RMD160 567fa8d718b93fb83a89494c83a8bec224ac99e9 DIST php-5.3.8.tar.bz2 11190060 RMD160 f18a18e2dfd7ea7885760eec2a05b3c4a15ad9db SHA1 8f29029e092f262876bfdd2ce56f6867e2b74b85 SHA256 a1dd06fd5593e97d9a5bd9818d6501d28d3ee8f09b83f0ec78f7cdfc060f3ea2 DIST php-5.3.9RC1.tar.bz2 11230477 RMD160 d00734de38b5cc2e719f5f80ac609e4362f6dfad SHA1 34306d0a7926a21ba15ee29ab37bbab44633b3fa SHA256 6d76af052c1575765d9bf03d8963415d437209fd790f74d85b523799f1dd718d DIST php-5.4.0RC1.tar.bz2 11321722 RMD160 4cae98d1d388bf18d70cd3041d0c314ac4788c69 SHA1 dc7fafeffb2039947bcbccf54fd811f66e46b558 SHA256 98f71de2d474c975326fd8452058f741843fe3b7db601f4788ed327adcc7a781 -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.3.9_rc1-r0.tar.bz2 7522 RMD160 4bf3d9bb26d86858ab26be0aa0466eaef4001553 SHA1 cd0dd6704b0c0b04cc1c78027efdfbcc5a9d182c SHA256 95863c23bd9a72013729dcdd005dc585ad5b3d689082503a3702f20df514362f -DIST php-patchset-5.4.0_beta2-r0.tar.bz2 6001 RMD160 0200e6ada41e471a30bfddeeb166d3254a9e2856 SHA1 3b1f71255db1c003f452c2fe41f93284a50967c4 SHA256 06834d624ce6269aa8005a28ccc0e55b2e8d500af57e4392e641978d5993a3ea DIST php-patchset-5.4.0_rc1-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.3.9_rc1.ebuild 11665 RMD160 bd460ad19d1b84e6cc630c1e1410fb0dd925f788 SHA1 438bdd1d05f86d3d9eaef8ae6a0f97e9630b60f2 SHA256 4d1621135856512b6f426f8724cd32e4ad063bf0d1f5b8790dc5cb63b6fbac5a -EBUILD php-5.4.0_beta2.ebuild 8573 RMD160 9f45eeebc863094cec28cf9cbef2f269e53d140b SHA1 0c449feb717f6dae582b895c6140b8e100064cd1 SHA256 9221cc9cba5d6b4496a5fa8823ef290350450e6e36b85126a653de47cc03bd95 EBUILD php-5.4.0_rc1.ebuild 8579 RMD160 35d43804cf6af0af3b14c47824b08b98b25a4118 SHA1 3f32b99e456ef6577079f0b57d923dbf9de4481c SHA256 4ae41e327bc363abd7b9ffb4c869256b661fc4a21a8beb18015bec9150609267 -MISC ChangeLog 88813 RMD160 56af0589c50b5964c268fcf67bab72dcdf49dc06 SHA1 ee1843ff21288f407f46bf24770dafd48170fa18 SHA256 17396a635e3e795f394657566d7193d10b4de1a5b00f9fcf179eb421e3625890 +MISC ChangeLog 88915 RMD160 dfb96c1d8380ff6e7070c813134d179acc5c6b5f SHA1 c6b3394f600c21bdbce373f87592a8aa3888b5b3 SHA256 7c34c8056ad68d8617c1655d033dbfddf14f2250a39e2b935d286afe018ce5ff MISC metadata.xml 2075 RMD160 e2eb44e39169dc2ff8e099d670a222e7102b1aea SHA1 9cebbc373dc8441aa0374132a3b5d87df6d37ffc SHA256 3d8bc9305be300ef7ef92d18ba5476927ec90a5b6d43c2408936229590ff5ac5 diff --git a/dev-lang/php/php-5.4.0_beta2.ebuild b/dev-lang/php/php-5.4.0_beta2.ebuild deleted file mode 100644 index 60ae61a66cca..000000000000 --- a/dev-lang/php/php-5.4.0_beta2.ebuild +++ /dev/null @@ -1,332 +0,0 @@ -# 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.3 2011/11/08 18:14:08 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")" - -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} 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 v2 ; } -src_install() { eblit-run src_install v3 ; } -src_test() { eblit-run src_test v1 ; } -pkg_postinst() { eblit-run pkg_postinst v2 ; } -- 2.26.2