diff options
author | Ole Markus With <olemarkus@gentoo.org> | 2010-10-31 19:01:55 +0000 |
---|---|---|
committer | Ole Markus With <olemarkus@gentoo.org> | 2010-10-31 19:01:55 +0000 |
commit | aa17926d1beb4cb79e6cef98da3c9f0719a8e1c3 (patch) | |
tree | 718c1a5acbb91bdda54187a0eb6a3403e45c6664 /dev-lang/php | |
parent | Removed masking of various PHP packages now ready for a broader audience (diff) | |
download | gentoo-2-aa17926d1beb4cb79e6cef98da3c9f0719a8e1c3.tar.gz gentoo-2-aa17926d1beb4cb79e6cef98da3c9f0719a8e1c3.tar.bz2 gentoo-2-aa17926d1beb4cb79e6cef98da3c9f0719a8e1c3.zip |
Revbumping with a new patchset (bug 342397)
(Portage version: 2.1.9.23/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/php')
-rw-r--r-- | dev-lang/php/ChangeLog | 9 | ||||
-rw-r--r-- | dev-lang/php/php-5.2.14-r2.ebuild (renamed from dev-lang/php/php-5.2.14-r1.ebuild) | 7 | ||||
-rw-r--r-- | dev-lang/php/php-5.3.3-r3.ebuild (renamed from dev-lang/php/php-5.3.3-r2.ebuild) | 9 |
3 files changed, 15 insertions, 10 deletions
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog index de68622217bc..ca1a20ee30e2 100644 --- a/dev-lang/php/ChangeLog +++ b/dev-lang/php/ChangeLog @@ -1,6 +1,13 @@ # 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.431 2010/10/31 17:24:34 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.432 2010/10/31 19:01:55 olemarkus Exp $ + +*php-5.3.3-r3 (31 Oct 2010) +*php-5.2.14-r2 (31 Oct 2010) + + 31 Oct 2010; <olemarkus@gentoo.org> -php-5.2.14-r1.ebuild, + +php-5.2.14-r2.ebuild, -php-5.3.3-r2.ebuild, +php-5.3.3-r3.ebuild: + Revbumping with a new patchset (bug 342397) 31 Oct 2010; Matti Bickel <mabi@gentoo.org> files/eblits/src_configure-v2.eblit: diff --git a/dev-lang/php/php-5.2.14-r1.ebuild b/dev-lang/php/php-5.2.14-r2.ebuild index 8cb5af5459f2..64e1bafe2adb 100644 --- a/dev-lang/php/php-5.2.14-r1.ebuild +++ b/dev-lang/php/php-5.2.14-r2.ebuild @@ -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.14-r1.ebuild,v 1.3 2010/10/31 17:24:34 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.14-r2.ebuild,v 1.1 2010/10/31 19:01:55 olemarkus Exp $ EAPI=2 @@ -9,11 +9,10 @@ interbase msql oci8 sapdb solid" inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool -PHP_PATCHSET="" SUHOSIN_VERSION="$PV-0.9.7" EXPECTED_TEST_FAILURES="" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~x86" function php_get_uri () { @@ -45,7 +44,7 @@ PHP_RELEASE="php" PHP_P="${PN}-${PHP_PV}" PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" -PHP_PATCHSET="${PHP_PATCHSET:-${PR/r/}}" +PHP_PATCHSET="2" PHP_PATCHSET_URI=" $(php_get_uri gentoo "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")" diff --git a/dev-lang/php/php-5.3.3-r2.ebuild b/dev-lang/php/php-5.3.3-r3.ebuild index 029c450473f0..d95505479c8b 100644 --- a/dev-lang/php/php-5.3.3-r2.ebuild +++ b/dev-lang/php/php-5.3.3-r3.ebuild @@ -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.3-r2.ebuild,v 1.3 2010/10/31 17:24:34 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.3-r3.ebuild,v 1.1 2010/10/31 19:01:55 olemarkus Exp $ EAPI=2 @@ -8,12 +8,11 @@ PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool -PHP_PATCHSET="2" SUHOSIN_VERSION="${PV}-0.9.10" FPM_VERSION="builtin" EXPECTED_TEST_FAILURES="" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~x86" function php_get_uri () { @@ -51,7 +50,7 @@ PHP_PATCHSET_LOC="gentoo" PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" -PHP_PATCHSET="${PHP_PATCHSET:-${PR/r/}}" +PHP_PATCHSET="3" PHP_PATCHSET_URI=" $(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")" @@ -105,7 +104,7 @@ IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" DEPEND="!dev-lang/php:5 - app-admin/eselect-php + >=app-admin/eselect-php-0.6 >=dev-libs/libpcre-7.9[unicode] adabas? ( >=dev-db/unixODBC-1.8.13 ) apache2? ( www-servers/apache[threads=] ) |