summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatti Bickel <mabi@gentoo.org>2010-11-04 12:01:29 +0000
committerMatti Bickel <mabi@gentoo.org>2010-11-04 12:01:29 +0000
commita6abfc43e01061b3bd744c5a3493473514c83807 (patch)
treeb8c63ad6a034fc6057a482c6c2f0f887c02a5630 /dev-lang
parentx86 stable, bug #343375 (diff)
downloadhistorical-a6abfc43e01061b3bd744c5a3493473514c83807.tar.gz
historical-a6abfc43e01061b3bd744c5a3493473514c83807.tar.bz2
historical-a6abfc43e01061b3bd744c5a3493473514c83807.zip
do not block versions of pecl-fileinfo supporting minor version slotting
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/php/ChangeLog5
-rw-r--r--dev-lang/php/Manifest4
-rw-r--r--dev-lang/php/php-5.3.3-r3.ebuild4
3 files changed, 8 insertions, 5 deletions
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index cedae5ae2163..f1d922d65e60 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -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.434 2010/11/02 17:12:42 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.435 2010/11/04 12:01:29 mabi Exp $
+
+ 04 Nov 2010; Matti Bickel <mabi@gentoo.org> php-5.3.3-r3.ebuild:
+ do not block versions of pecl-fileinfo supporting minor version slotting
02 Nov 2010; <olemarkus@gentoo.org> files/eblits/pkg_postinst-v2.eblit,
files/eblits/src_install-v2.eblit:
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 3d4a8b3e3c27..62716861a584 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -36,6 +36,6 @@ DIST suhosin-patch-5.3.3-0.9.10.patch.gz 41298 RMD160 8dcd8b51ea0357b6cc51e70e49
EBUILD php-5.2.14-r2.ebuild 9345 RMD160 3e4b1681120e1a33de589a42d73f41ad02efd292 SHA1 001f4d69c34596e4e5ef2fbd1f3324b48aafd035 SHA256 6a57655c67a02ec124d6571bf91c1550ca8b34b98e1d4a6a699ca34699cc869a
EBUILD php-5.2.14.ebuild 9164 RMD160 893778d74f25ee5a0f1310be970499152102c7f6 SHA1 4f82548143854bcb759eda79a040b40d160408c3 SHA256 0c91e2a72176d103d377f328af20f759fd087ebb00e761b28d3fc372dfb09a59
EBUILD php-5.3.3-r1.ebuild 9494 RMD160 ecc97c2d06e736f6a7e0e991b19669508c5f3ab0 SHA1 2083da14f8466d3231eed46604039e6bc4864cff SHA256 df33c39b610bbbc1e46ac3da97817205b7a57238f7bbaca72c10ff5dd30eec05
-EBUILD php-5.3.3-r3.ebuild 9665 RMD160 5fa5791438d985b0166d73e2c1ebee519c512e95 SHA1 7dcc9a889053de8b6dc1e6d3b1afd43180c516de SHA256 02702d97dd49defd358c3f3c62b5c6316ee1b6d55bf0520cabb5f59dcc42f7c8
-MISC ChangeLog 74493 RMD160 23592bb85b1ec47225b9334db28f2684bf1ed85a SHA1 aa9bda4b6aa4697d2416a3eb0b0c47c8a5eff033 SHA256 55dcd025d5e81957d757baacf4a6e47d751ffe168759e4fab3a465e75d7b4a07
+EBUILD php-5.3.3-r3.ebuild 9670 RMD160 39e8e92f263cd62d49903d6796cc0a8528631bcf SHA1 71e1a73fd4de9da58b90c8d5b95655e49fc257cb SHA256 8e8260bc4bc9b4b519540b5396119a3a1dd8b42c96812f4bba1bc96ce8b80fa2
+MISC ChangeLog 74631 RMD160 ce17796d8e295bbcd2fde0d987b6de0b41645635 SHA1 31f8d3535729a10feda599b43fde1dc30223330e SHA256 b2a50af0aabd83b92923659e25fafce76339ad7d3daf1f5fc00cfc4b749c6013
MISC metadata.xml 2090 RMD160 5e8fc242c6035f8f3f12bd2ce2f77a5621398ac5 SHA1 3726febbe532141d65abccd6d6573ece6a3682c7 SHA256 0ba00cbf8509c6d9d21bf5d92759b32d5259051b4ed044fed71a4164460c65d8
diff --git a/dev-lang/php/php-5.3.3-r3.ebuild b/dev-lang/php/php-5.3.3-r3.ebuild
index d95505479c8b..833cc61c94d1 100644
--- a/dev-lang/php/php-5.3.3-r3.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-r3.ebuild,v 1.1 2010/10/31 19:01:55 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.3-r3.ebuild,v 1.2 2010/11/04 12:01:29 mabi Exp $
EAPI=2
@@ -238,7 +238,7 @@ RDEPEND="${DEPEND}
!cli? ( !cgi? ( !apache2? ( !embed? ( $php[cli] ) ) ) )
enchant? ( !dev-php${PHP_MV}/pecl-enchant )
- fileinfo? ( !dev-php${PHP_MV}/pecl-fileinfo )
+ 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 )