* [gentoo-commits] gentoo-x86 commit in dev-lang/php: php-5.3.4.ebuild ChangeLog php-5.2.16.ebuild
@ 2010-12-19 14:24 Matti Bickel (mabi)
0 siblings, 0 replies; 6+ messages in thread
From: Matti Bickel (mabi) @ 2010-12-19 14:24 UTC (permalink / raw
To: gentoo-commits
mabi 10/12/19 14:24:49
Modified: ChangeLog
Added: php-5.3.4.ebuild php-5.2.16.ebuild
Log:
new upstream version with security fixes (bug #340807), also provide complete fpm config/init file instead of patching upstream (thanks to Ole Markus)
(Portage version: 2.1.9.24/cvs/Linux x86_64)
Revision Changes Path
1.441 dev-lang/php/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.441&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.441&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?r1=1.440&r2=1.441
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v
retrieving revision 1.440
retrieving revision 1.441
diff -u -r1.440 -r1.441
--- ChangeLog 22 Nov 2010 11:53:15 -0000 1.440
+++ ChangeLog 19 Dec 2010 14:24:49 -0000 1.441
@@ -1,6 +1,15 @@
# ChangeLog for dev-lang/php
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.440 2010/11/22 11:53:15 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.441 2010/12/19 14:24:49 mabi Exp $
+
+*php-5.3.4 (19 Dec 2010)
+*php-5.2.16 (19 Dec 2010)
+
+ 19 Dec 2010; Matti Bickel <mabi@gentoo.org>
+ files/eblits/src_install-v2.eblit, files/eblits/src_prepare-v2.eblit,
+ +php-5.2.16.ebuild, +php-5.3.4.ebuild:
+ new upstream version with security fixes (bug #340807), also provide complete
+ fpm config/init file instead of patching upstream (thanks to Ole Markus)
22 Nov 2010; Ole Markus With <olemarkus@gentoo.org>
files/eblits/pkg_postinst-v1.eblit, files/eblits/pkg_postinst-v2.eblit:
1.1 dev-lang/php/php-5.3.4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.4.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.4.ebuild?rev=1.1&content-type=text/plain
Index: php-5.3.4.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.4.ebuild,v 1.1 2010/12/19 14:24:49 mabi Exp $
EAPI=2
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=""
#SUHOSIN_VERSION="${PV}-0.9.10"
FPM_VERSION="builtin"
EXPECTED_TEST_FAILURES=""
KEYWORDS="~amd64 ~arm ~hppa ~x86"
function php_get_uri ()
{
case "${1}" in
"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_RELEASE="php"
PHP_P="${PN}-${PHP_PV}"
PHP_PATCHSET_LOC="gentoo"
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"
# We can build the following SAPIs in the given order
SAPIS="cli cgi fpm embed 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
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
>=dev-libs/libpcre-7.9[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 )
fpm? ( >=dev-libs/libevent-1.4.12 )
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 )
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* ) )
sqlite3? ( =dev-db/sqlite-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? ( !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}"
RDEPEND="${DEPEND}
truetype? ( || ( $php[gd] $php[gd-external] ) )
cjk? ( || ( $php[gd] $php[gd-external] ) )
exif? ( || ( $php[gd] $php[gd-external] ) )
xpm? ( $php[gd] )
gd? ( $php[zlib,-gd-external] )
gd-external? ( $php[-gd] )
simplexml? ( $php[xml] )
soap? ( $php[xml] )
wddx? ( $php[xml] )
xmlrpc? ( || ( $php[xml] $php[iconv] ) )
xmlreader? ( $php[xml] )
xsl? ( $php[xml] )
ldap-sasl? ( $php[ldap,-oci8] )
adabas? ( $php[odbc] )
birdstep? ( $php[odbc] )
dbmaker? ( $php[odbc] )
empress-bcs? ( $php[empress] )
empress? ( $php[odbc] )
esoob? ( $php[odbc] )
db2? ( $php[odbc] )
sapdb? ( $php[odbc] )
solid? ( $php[odbc] )
kolab? ( $php[imap] )
phar? ( $php[hash] )
mysqlnd? ( || (
$php[mysql]
$php[mysqli]
$php[pdo]
) )
oci8? ( $php[-oci8-instant-client,-ldap-sasl] )
oci8-instant-client? ( $php[-oci8] )
qdbm? ( $php[-gdbm] )
readline? ( $php[-libedit] )
recode? ( $php[-imap,-mysql,-mysqli] )
firebird? ( $php[-interbase] )
sharedmem? ( $php[-threads] )
!cli? ( !cgi? ( !apache2? ( !embed? ( $php[cli] ) ) ) )
enchant? ( !dev-php${PHP_MV}/pecl-enchant )
fileinfo? ( !<dev-php${PHP_MV}/pecl-fileinfo-1.0.4-r2 )
filter? ( !dev-php${PHP_MV}/pecl-filter )
json? ( !dev-php${PHP_MV}/pecl-json )
phar? ( !dev-php${PHP_MV}/pecl-phar )
zip? ( !dev-php${PHP_MV}/pecl-zip )"
[[ -n $SUHOSIN_VERSION ]] && DEPEND="${DEPEND} suhosin? ( $php[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 )"
[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )"
# Portage doesn't support setting PROVIDE based on the USE flags that
# have been enabled, so we have to PROVIDE everything for now and hope
# for the best
PROVIDE="virtual/php"
SLOT="$(get_version_component_range 1-2)"
S="${WORKDIR}/${PHP_P}"
# 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 v2 ; }
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 ; }
1.1 dev-lang/php/php-5.2.16.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.2.16.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.2.16.ebuild?rev=1.1&content-type=text/plain
Index: php-5.2.16.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.16.ebuild,v 1.1 2010/12/19 14:24:49 mabi Exp $
EAPI=2
PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob
interbase msql oci8 sapdb solid"
inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool
#SUHOSIN_VERSION="$PV-0.9.7"
SUHOSIN_VERSION=""
EXPECTED_TEST_FAILURES=""
KEYWORDS="~amd64 ~arm ~hppa ~x86"
function php_get_uri ()
{
case "${1}" in
"php-pre")
echo "http://downloads.php.net/johannes/${2}"
;;
"php")
echo "http://www.php.net/distributions/${2}"
;;
"suhosin")
echo "http://download.suhosin.org/${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"
PHP_P="${PN}-${PHP_PV}"
PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
PHP_PATCHSET="0"
PHP_PATCHSET_URI="
$(php_get_uri gentoo "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, Apache2 and embed SAPIs."
HOMEPAGE="http://php.net/"
LICENSE="PHP-3"
# We can build the following SAPIs in the given order
SAPIS="cli cgi embed apache2"
# Gentoo-specific, common features
IUSE="kolab"
# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
IUSE="${IUSE}
${SAPIS/cli/+cli}
threads force-cgi-redirect discard-path"
IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk
crypt +ctype curl curlwrappers db2 dbase dbmaker debug doc empress
empress-bcs esoob exif fdftk frontbase +filter firebird
flatfile ftp gd gd-external gdbm gmp +hash +iconv imap inifile
interbase iodbc ipv6 +json kerberos ldap ldap-sasl libedit
mcve mhash msql mssql mysql mysqli ncurses nls oci8
oci8-instant-client odbc pcntl +pcre pdo pic +posix postgres qdbm
readline recode reflection sapdb +session sharedext sharedmem
+simplexml snmp soap sockets solid spell spl sqlite ssl suhosin
sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
xml xmlreader xmlwriter xmlrpc xpm xsl yaz zip zlib"
# Enable suhosin if available
[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin"
DEPEND="app-admin/eselect-php
pcre? ( >=dev-libs/libpcre-7.9[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? (
>=media-libs/jpeg-6b
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 )
esoob? ( >=dev-db/unixODBC-1.8.13 )
exif? ( !gd? ( !gd-external? (
>=media-libs/jpeg-6b
media-libs/libpng
sys-libs/zlib
) ) )
fdftk? ( app-text/fdftk )
firebird? ( dev-db/firebird )
gd? ( >=media-libs/jpeg-6b 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 )
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 ) )
mhash? ( app-crypt/mhash )
mssql? ( dev-db/freetds[mssql] )
mysql? ( virtual/mysql )
mysqli? ( >=virtual/mysql-4.1 )
ncurses? ( sys-libs/ncurses )
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* ) )
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? (
>=media-libs/jpeg-6b media-libs/libpng sys-libs/zlib ) )
)
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
>=media-libs/jpeg-6b
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}"
RDEPEND="${DEPEND}
truetype? ( || ( $php[gd] $php[gd-external] ) )
cjk? ( || ( $php[gd] $php[gd-external] ) )
exif? ( || ( $php[gd] $php[gd-external] ) )
xpm? ( $php[gd] )
gd? ( $php[zlib,-gd-external] )
gd-external? ( $php[-gd] )
simplexml? ( $php[xml] )
soap? ( $php[xml] )
wddx? ( $php[xml] )
xmlrpc? ( || ( $php[xml] $php[iconv] ) )
xmlreader? ( $php[xml] )
xsl? ( $php[xml] )
ldap-sasl? ( $php[ldap,-oci8] )
suhosin? ( $php[unicode] )
adabas? ( $php[odbc] )
birdstep? ( $php[odbc] )
dbmaker? ( $php[odbc] )
empress-bcs? ( $php[empress] )
empress? ( $php[odbc] )
esoob? ( $php[odbc] )
db2? ( $php[odbc] )
sapdb? ( $php[odbc] )
solid? ( $php[odbc] )
kolab? ( $php[imap] )
oci8? ( $php[-oci8-instant-client,-ldap-sasl] )
oci8-instant-client? ( $php[-oci8] )
qdbm? ( $php[-gdbm] )
readline? ( $php[-libedit] )
recode? ( $php[-imap,-mysql,-mysqli] )
firebird? ( $php[-interbase] )
sharedmem? ( $php[-threads] )
!cli? ( !cgi? ( !apache2? ( !embed? ( $php[cli] ) ) ) )
filter? ( !dev-php${PHP_MV}/pecl-filter )
json? ( !dev-php${PHP_MV}/pecl-json )
zip? ( !dev-php${PHP_MV}/pecl-zip )"
[[ -n $SUHOSIN_VERSION ]] && DEPEND="${DEPEND} suhosin? ( $php[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 )
suhosin? ( dev-php${PHP_MV}/suhosin )
mcve? ( dev-php${PHP_MV}/pecl-mcve )
yaz? ( dev-php${PHP_MV}/pecl-yaz )"
[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )"
# Portage doesn't support setting PROVIDE based on the USE flags that
# have been enabled, so we have to PROVIDE everything for now and hope
# for the best
PROVIDE="virtual/php"
SLOT="$(get_version_component_range 1-2)"
S="${WORKDIR}/${PHP_P}"
# Allow users to install production version if they want to
# PHP 5.2 has other filenames for prod and dev versions
case "${PHP_INI_VERSION}" in
production)
PHP_INI_UPSTREAM="php.ini-recommended"
;;
development)
PHP_INI_UPSTREAM="php.ini-dist"
;;
*)
PHP_INI_VERSION="development"
PHP_INI_UPSTREAM="php.ini-dist"
;;
esac
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 v2 ; }
src_configure() { eblit-run src_configure v521 ; }
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] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/php: php-5.3.4.ebuild ChangeLog php-5.2.16.ebuild
@ 2010-12-19 19:38 PaweA Hajdan (phajdan.jr)
0 siblings, 0 replies; 6+ messages in thread
From: PaweA Hajdan (phajdan.jr) @ 2010-12-19 19:38 UTC (permalink / raw
To: gentoo-commits
phajdan.jr 10/12/19 19:38:58
Modified: php-5.3.4.ebuild ChangeLog php-5.2.16.ebuild
Log:
x86 stable wrt security bug #340807
(Portage version: 2.1.9.24/cvs/Linux i686)
Revision Changes Path
1.2 dev-lang/php/php-5.3.4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.4.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.4.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.4.ebuild?r1=1.1&r2=1.2
Index: php-5.3.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-5.3.4.ebuild 19 Dec 2010 14:24:49 -0000 1.1
+++ php-5.3.4.ebuild 19 Dec 2010 19:38:58 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.4.ebuild,v 1.1 2010/12/19 14:24:49 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.4.ebuild,v 1.2 2010/12/19 19:38:58 phajdan.jr Exp $
EAPI=2
@@ -13,7 +13,7 @@
FPM_VERSION="builtin"
EXPECTED_TEST_FAILURES=""
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~hppa x86"
function php_get_uri ()
{
@@ -247,7 +247,6 @@
phar? ( !dev-php${PHP_MV}/pecl-phar )
zip? ( !dev-php${PHP_MV}/pecl-zip )"
-
[[ -n $SUHOSIN_VERSION ]] && DEPEND="${DEPEND} suhosin? ( $php[unicode] )"
DEPEND="${DEPEND}
1.442 dev-lang/php/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.442&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.442&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?r1=1.441&r2=1.442
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -r1.441 -r1.442
--- ChangeLog 19 Dec 2010 14:24:49 -0000 1.441
+++ ChangeLog 19 Dec 2010 19:38:58 -0000 1.442
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/php
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.441 2010/12/19 14:24:49 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.442 2010/12/19 19:38:58 phajdan.jr Exp $
+
+ 19 Dec 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> php-5.2.16.ebuild,
+ php-5.3.4.ebuild:
+ x86 stable wrt security bug #340807
*php-5.3.4 (19 Dec 2010)
*php-5.2.16 (19 Dec 2010)
1.2 dev-lang/php/php-5.2.16.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.2.16.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.2.16.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.2.16.ebuild?r1=1.1&r2=1.2
Index: php-5.2.16.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.16.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-5.2.16.ebuild 19 Dec 2010 14:24:49 -0000 1.1
+++ php-5.2.16.ebuild 19 Dec 2010 19:38:58 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.16.ebuild,v 1.1 2010/12/19 14:24:49 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.16.ebuild,v 1.2 2010/12/19 19:38:58 phajdan.jr Exp $
EAPI=2
@@ -13,7 +13,7 @@
SUHOSIN_VERSION=""
EXPECTED_TEST_FAILURES=""
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~hppa x86"
function php_get_uri ()
{
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/php: php-5.3.4.ebuild ChangeLog php-5.2.16.ebuild
@ 2010-12-20 0:46 Markos Chandras (hwoarang)
0 siblings, 0 replies; 6+ messages in thread
From: Markos Chandras (hwoarang) @ 2010-12-20 0:46 UTC (permalink / raw
To: gentoo-commits
hwoarang 10/12/20 00:46:38
Modified: php-5.3.4.ebuild ChangeLog php-5.2.16.ebuild
Log:
Stable on amd64 wrt bug #340807
(Portage version: 2.1.9.25/cvs/Linux x86_64)
Revision Changes Path
1.3 dev-lang/php/php-5.3.4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.4.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.4.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.4.ebuild?r1=1.2&r2=1.3
Index: php-5.3.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.4.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-5.3.4.ebuild 19 Dec 2010 19:38:58 -0000 1.2
+++ php-5.3.4.ebuild 20 Dec 2010 00:46:38 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.4.ebuild,v 1.2 2010/12/19 19:38:58 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.4.ebuild,v 1.3 2010/12/20 00:46:38 hwoarang Exp $
EAPI=2
@@ -13,7 +13,7 @@
FPM_VERSION="builtin"
EXPECTED_TEST_FAILURES=""
-KEYWORDS="~amd64 ~arm ~hppa x86"
+KEYWORDS="amd64 ~arm ~hppa x86"
function php_get_uri ()
{
1.444 dev-lang/php/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.444&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.444&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?r1=1.443&r2=1.444
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -r1.443 -r1.444
--- ChangeLog 19 Dec 2010 22:45:22 -0000 1.443
+++ ChangeLog 20 Dec 2010 00:46:38 -0000 1.444
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/php
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.443 2010/12/19 22:45:22 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.444 2010/12/20 00:46:38 hwoarang Exp $
+
+ 20 Dec 2010; Markos Chandras <hwoarang@gentoo.org> php-5.2.16.ebuild,
+ php-5.3.4.ebuild:
+ Stable on amd64 wrt bug #340807
19 Dec 2010; Matti Bickel <mabi@gentoo.org>
+files/php-fpm-gentooified-5.3.4.patch, +files/php-fpm-r3.init,
1.3 dev-lang/php/php-5.2.16.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.2.16.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.2.16.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.2.16.ebuild?r1=1.2&r2=1.3
Index: php-5.2.16.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.16.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-5.2.16.ebuild 19 Dec 2010 19:38:58 -0000 1.2
+++ php-5.2.16.ebuild 20 Dec 2010 00:46:38 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.16.ebuild,v 1.2 2010/12/19 19:38:58 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.16.ebuild,v 1.3 2010/12/20 00:46:38 hwoarang Exp $
EAPI=2
@@ -13,7 +13,7 @@
SUHOSIN_VERSION=""
EXPECTED_TEST_FAILURES=""
-KEYWORDS="~amd64 ~arm ~hppa x86"
+KEYWORDS="amd64 ~arm ~hppa x86"
function php_get_uri ()
{
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/php: php-5.3.4.ebuild ChangeLog php-5.2.16.ebuild
@ 2010-12-25 17:22 Jeroen Roovers (jer)
0 siblings, 0 replies; 6+ messages in thread
From: Jeroen Roovers (jer) @ 2010-12-25 17:22 UTC (permalink / raw
To: gentoo-commits
jer 10/12/25 17:22:42
Modified: php-5.3.4.ebuild ChangeLog php-5.2.16.ebuild
Log:
Stable for HPPA (bug #340807).
(Portage version: 2.2.0_alpha10/cvs/Linux i686)
Revision Changes Path
1.5 dev-lang/php/php-5.3.4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.4.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.4.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.4.ebuild?r1=1.4&r2=1.5
Index: php-5.3.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.4.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- php-5.3.4.ebuild 25 Dec 2010 09:19:08 -0000 1.4
+++ php-5.3.4.ebuild 25 Dec 2010 17:22:42 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.4.ebuild,v 1.4 2010/12/25 09:19:08 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.4.ebuild,v 1.5 2010/12/25 17:22:42 jer Exp $
EAPI=2
@@ -13,7 +13,7 @@
FPM_VERSION="builtin"
EXPECTED_TEST_FAILURES=""
-KEYWORDS="amd64 ~arm ~hppa x86"
+KEYWORDS="amd64 ~arm hppa x86"
function php_get_uri ()
{
1.448 dev-lang/php/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.448&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.448&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?r1=1.447&r2=1.448
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -r1.447 -r1.448
--- ChangeLog 25 Dec 2010 09:19:08 -0000 1.447
+++ ChangeLog 25 Dec 2010 17:22:42 -0000 1.448
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/php
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.447 2010/12/25 09:19:08 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.448 2010/12/25 17:22:42 jer Exp $
+
+ 25 Dec 2010; Jeroen Roovers <jer@gentoo.org> php-5.2.16.ebuild,
+ php-5.3.4.ebuild:
+ Stable for HPPA (bug #340807).
25 Dec 2010; <olemarkus@gentoo.org> php-5.3.4.ebuild:
Prevented the fpm sapi from force-enabling the cli sapi (bug 349122)
1.4 dev-lang/php/php-5.2.16.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.2.16.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.2.16.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.2.16.ebuild?r1=1.3&r2=1.4
Index: php-5.2.16.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.16.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-5.2.16.ebuild 20 Dec 2010 00:46:38 -0000 1.3
+++ php-5.2.16.ebuild 25 Dec 2010 17:22:42 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.16.ebuild,v 1.3 2010/12/20 00:46:38 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.16.ebuild,v 1.4 2010/12/25 17:22:42 jer Exp $
EAPI=2
@@ -13,7 +13,7 @@
SUHOSIN_VERSION=""
EXPECTED_TEST_FAILURES=""
-KEYWORDS="amd64 ~arm ~hppa x86"
+KEYWORDS="amd64 ~arm hppa x86"
function php_get_uri ()
{
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/php: php-5.3.4.ebuild ChangeLog php-5.2.16.ebuild
@ 2010-12-27 22:33 Ole Markus With (olemarkus)
0 siblings, 0 replies; 6+ messages in thread
From: Ole Markus With (olemarkus) @ 2010-12-27 22:33 UTC (permalink / raw
To: gentoo-commits
olemarkus 10/12/27 22:33:47
Modified: php-5.3.4.ebuild ChangeLog php-5.2.16.ebuild
Log:
Readded some keywords that was dropped without reason
(Portage version: 2.1.9.25/cvs/Linux x86_64)
Revision Changes Path
1.6 dev-lang/php/php-5.3.4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.4.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.4.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.4.ebuild?r1=1.5&r2=1.6
Index: php-5.3.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.4.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- php-5.3.4.ebuild 25 Dec 2010 17:22:42 -0000 1.5
+++ php-5.3.4.ebuild 27 Dec 2010 22:33:47 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.4.ebuild,v 1.5 2010/12/25 17:22:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.4.ebuild,v 1.6 2010/12/27 22:33:47 olemarkus Exp $
EAPI=2
@@ -13,7 +13,7 @@
FPM_VERSION="builtin"
EXPECTED_TEST_FAILURES=""
-KEYWORDS="amd64 ~arm hppa x86"
+KEYWORDS="amd64 ~arm hppa ~ppc64 x86"
function php_get_uri ()
{
1.449 dev-lang/php/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.449&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.449&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?r1=1.448&r2=1.449
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -r1.448 -r1.449
--- ChangeLog 25 Dec 2010 17:22:42 -0000 1.448
+++ ChangeLog 27 Dec 2010 22:33:47 -0000 1.449
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/php
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.448 2010/12/25 17:22:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.449 2010/12/27 22:33:47 olemarkus Exp $
+
+ 27 Dec 2010; <olemarkus@gentoo.org> php-5.2.16.ebuild, php-5.3.4.ebuild:
+ Readded some keywords that was dropped without reason
25 Dec 2010; Jeroen Roovers <jer@gentoo.org> php-5.2.16.ebuild,
php-5.3.4.ebuild:
1.5 dev-lang/php/php-5.2.16.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.2.16.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.2.16.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.2.16.ebuild?r1=1.4&r2=1.5
Index: php-5.2.16.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.16.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- php-5.2.16.ebuild 25 Dec 2010 17:22:42 -0000 1.4
+++ php-5.2.16.ebuild 27 Dec 2010 22:33:47 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.16.ebuild,v 1.4 2010/12/25 17:22:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.16.ebuild,v 1.5 2010/12/27 22:33:47 olemarkus Exp $
EAPI=2
@@ -13,7 +13,7 @@
SUHOSIN_VERSION=""
EXPECTED_TEST_FAILURES=""
-KEYWORDS="amd64 ~arm hppa x86"
+KEYWORDS="amd64 ~arm hppa ~ppc64 x86"
function php_get_uri ()
{
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/php: php-5.3.4.ebuild ChangeLog php-5.2.16.ebuild
@ 2010-12-28 13:44 Brent Baude (ranger)
0 siblings, 0 replies; 6+ messages in thread
From: Brent Baude (ranger) @ 2010-12-28 13:44 UTC (permalink / raw
To: gentoo-commits
ranger 10/12/28 13:44:25
Modified: php-5.3.4.ebuild ChangeLog php-5.2.16.ebuild
Log:
Marking -5.2.16 and -5.3.4 ppc64 for bug 340807
(Portage version: 2.1.9.25/cvs/Linux ppc64)
Revision Changes Path
1.7 dev-lang/php/php-5.3.4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.4.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.4.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.4.ebuild?r1=1.6&r2=1.7
Index: php-5.3.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.4.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-5.3.4.ebuild 27 Dec 2010 22:33:47 -0000 1.6
+++ php-5.3.4.ebuild 28 Dec 2010 13:44:25 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.4.ebuild,v 1.6 2010/12/27 22:33:47 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.4.ebuild,v 1.7 2010/12/28 13:44:25 ranger Exp $
EAPI=2
@@ -13,7 +13,7 @@
FPM_VERSION="builtin"
EXPECTED_TEST_FAILURES=""
-KEYWORDS="amd64 ~arm hppa ~ppc64 x86"
+KEYWORDS="amd64 ~arm hppa ppc64 x86"
function php_get_uri ()
{
1.451 dev-lang/php/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.451&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.451&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?r1=1.450&r2=1.451
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v
retrieving revision 1.450
retrieving revision 1.451
diff -u -r1.450 -r1.451
--- ChangeLog 27 Dec 2010 22:38:19 -0000 1.450
+++ ChangeLog 28 Dec 2010 13:44:25 -0000 1.451
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/php
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.450 2010/12/27 22:38:19 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.451 2010/12/28 13:44:25 ranger Exp $
+
+ 28 Dec 2010; Brent Baude <ranger@gentoo.org> php-5.2.16.ebuild,
+ php-5.3.4.ebuild:
+ Marking -5.2.16 and -5.3.4 ppc64 for bug 340807
27 Dec 2010; <olemarkus@gentoo.org> -php-5.2.14-r2.ebuild,
-php-5.3.3-r3.ebuild:
1.6 dev-lang/php/php-5.2.16.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.2.16.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.2.16.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.2.16.ebuild?r1=1.5&r2=1.6
Index: php-5.2.16.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.16.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- php-5.2.16.ebuild 27 Dec 2010 22:33:47 -0000 1.5
+++ php-5.2.16.ebuild 28 Dec 2010 13:44:25 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.16.ebuild,v 1.5 2010/12/27 22:33:47 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.16.ebuild,v 1.6 2010/12/28 13:44:25 ranger Exp $
EAPI=2
@@ -13,7 +13,7 @@
SUHOSIN_VERSION=""
EXPECTED_TEST_FAILURES=""
-KEYWORDS="amd64 ~arm hppa ~ppc64 x86"
+KEYWORDS="amd64 ~arm hppa ppc64 x86"
function php_get_uri ()
{
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-12-28 13:44 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-28 13:44 [gentoo-commits] gentoo-x86 commit in dev-lang/php: php-5.3.4.ebuild ChangeLog php-5.2.16.ebuild Brent Baude (ranger)
-- strict thread matches above, loose matches on Subject: below --
2010-12-27 22:33 Ole Markus With (olemarkus)
2010-12-25 17:22 Jeroen Roovers (jer)
2010-12-20 0:46 Markos Chandras (hwoarang)
2010-12-19 19:38 PaweA Hajdan (phajdan.jr)
2010-12-19 14:24 Matti Bickel (mabi)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox