summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatti Bickel <mabi@gentoo.org>2011-12-14 22:56:49 +0000
committerMatti Bickel <mabi@gentoo.org>2011-12-14 22:56:49 +0000
commite10ad2e27c02b915cd23a9e09531561870c94e9a (patch)
treed9877c5269c57c14840c9dc801ac29a687317f80
parentarm stable, bug #393927 (diff)
downloadhistorical-e10ad2e27c02b915cd23a9e09531561870c94e9a.tar.gz
historical-e10ad2e27c02b915cd23a9e09531561870c94e9a.tar.bz2
historical-e10ad2e27c02b915cd23a9e09531561870c94e9a.zip
Merging categories dev-php5 and dev-php (bug #324665)
Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64
-rw-r--r--dev-libs/syck/ChangeLog5
-rw-r--r--dev-libs/syck/Manifest24
-rw-r--r--dev-libs/syck/syck-0.55-r4.ebuild4
3 files changed, 8 insertions, 25 deletions
diff --git a/dev-libs/syck/ChangeLog b/dev-libs/syck/ChangeLog
index 007b7a04b1df..86e77be50991 100644
--- a/dev-libs/syck/ChangeLog
+++ b/dev-libs/syck/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-libs/syck
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/syck/ChangeLog,v 1.29 2011/04/10 19:54:30 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/syck/ChangeLog,v 1.30 2011/12/14 22:56:49 mabi Exp $
+
+ 14 Dec 2011; Matti Bickel <mabi@gentoo.org> syck-0.55-r4.ebuild:
+ Merging categories dev-php5 and dev-php (bug #324665)
10 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
syck-0.55-r4.ebuild:
diff --git a/dev-libs/syck/Manifest b/dev-libs/syck/Manifest
index a58a3b7231a7..44b25d6e20ae 100644
--- a/dev-libs/syck/Manifest
+++ b/dev-libs/syck/Manifest
@@ -1,25 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX syck-0.55-64bit.patch 1008 RMD160 93e4f0ffb56da161a7211b8765f29190184c80ec SHA1 5100672f6f99fe71d4ed6a2bfb483005fe9074f2 SHA256 989e62b3cba6a85489df57157a1437098d1995b475edf89658f6d4d23717a182
DIST syck-0.55.tar.gz 354205 RMD160 ffd26db70cf743b90cbfecfe7402c6fb8d698ee8 SHA1 acb0aea04a6a0e82220223ffaf889ad6587402eb SHA256 ac881945c9dfe5dd6395a5db921e8256d1d359295bb66a1acbfe49fb637c1a3a
-EBUILD syck-0.55-r4.ebuild 1305 RMD160 ee3cf11477eebff023b761a269b22e4978a3e2e7 SHA1 9de46426c05b35c3cc57ad0cdcd96221dc7d189e SHA256 8fb5b400c85bce3cda1e4b62f30abd9bddabd9a7521f90fdd4cbb381c238d53d
-MISC ChangeLog 3576 RMD160 8a05273730f6d5157ac15614ce816c1fda16af33 SHA1 eca9c4984c4c453165f40be1b44db6eefba91eb3 SHA256 9747455c01abf0d951aff05ddc88607a800a8817f82d68430dfcf631425c9319
+EBUILD syck-0.55-r4.ebuild 1300 RMD160 0bbcfaf79870fd8bb97edf161a62cc98b0da8c37 SHA1 007ff598056a9f9564bfa7d56032a362cbb6552a SHA256 045e25a5a355980179c4fa61f7615f2a8885627ad6b7a3f71edfb772e6552f96
+MISC ChangeLog 3696 RMD160 6cb717e57abca8062a4b3ca2af6f5d055edf6f00 SHA1 f00187a1bff3618beeed3c5da517588196a127d3 SHA256 e3fdaa87a05852ed6c9f6b007593d7c75abc7cf98504f91afa8146290a10bdb8
MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBAgAGBQJNpNZIAAoJENgZr6v6gHY0WMkP/joaIgp63IuG5/GrRWmm8Y56
-pRASOhuNflX7ZlFD/MMz+NW0W00C+cPOyx+e7IcAMCVvjNqktJtsZfvBb/wGQqQ+
-ScW+v/xAoCRW3LO+H6uzR1NY6VcbS+A8w5jFNNJem7Tm3n8xPJ5CYeW6B13jK9gp
-R9F1mgEiJdJWKXuV1WQMRUyRnn2O49DVcSvqnOdY43CoF+fsxeC4KPwU0CNu7knN
-KVA/OTy/1KIpxZV9Mrn5xkjMxjN+2KpKvqElWUGxKd/Rpn/9VW4B6nUu7vS5tBWk
-MMRer+eqzLrqaCOK02I5/xgN+RmBeXRZLnQjd/H8MWwxhay2pVFsS9HKv5Ic+GWg
-XaOh2d0tuqBBXWxU0EdkkOIFf9PihEK3PR2eU1W+5KkD+QGCvFTUqxr4yC/2Yi+n
-a0wKOilo3zrlayxNRVn0NafvZDEqPtPUFgEsX0Jfxcb2JMbHWcX8CxD6IF/yDIiH
-8xa95Isacj+LbT0etXnYiXY8mdLifG0IlfETmgUrOE02wh1+tpRkhiAaieNBOlLo
-Z3E2OVKhsNUnhtIoaQkMZFgprkd/9qdiOqLnd0clOQFhLlIqA1FMR9zlU73OpLiI
-vldddVEIE4Gjzgc165kzMdjSz78qAdH7FLuypnL4GGi3ThsYRoEXP96BEz16kBqy
-ydKsplETZ+1x/ZuTLsWZ
-=mAWx
------END PGP SIGNATURE-----
diff --git a/dev-libs/syck/syck-0.55-r4.ebuild b/dev-libs/syck/syck-0.55-r4.ebuild
index bf819ece9473..23a433fdc400 100644
--- a/dev-libs/syck/syck-0.55-r4.ebuild
+++ b/dev-libs/syck/syck-0.55-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/syck/syck-0.55-r4.ebuild,v 1.16 2011/04/12 22:46:11 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/syck/syck-0.55-r4.ebuild,v 1.17 2011/12/14 22:56:49 mabi Exp $
EAPI="3"
PYTHON_DEPEND="python? 2"
@@ -20,7 +20,7 @@ IUSE="php python"
DEPEND="python? ( !dev-python/pysyck )"
RDEPEND="${DEPEND}"
-PDEPEND="php? ( dev-php5/pecl-syck
+PDEPEND="php? ( dev-php/pecl-syck
!=dev-libs/syck-0.55-r1 )"
DISTUTILS_SETUP_FILES=("ext/python|setup.py")