diff options
| author |   Matti Bickel <mabi@gentoo.org> | 2011-12-14 22:56:49 +0000 |
|---|---|---|
| committer | Matti Bickel <mabi@gentoo.org> | 2011-12-14 22:56:49 +0000 |
| commit | 39ed38738100ea378cb0e5349bff2d2277171150 (patch) | |
| tree | a700e91fabd732e5f69e5456e3a2df668fa908d5 /dev-libs/syck | |
| parent | Moving package from dev-php5 to dev-php category (bug #324665) (diff) | |
| download | gentoo-2-39ed38738100ea378cb0e5349bff2d2277171150.tar.gz gentoo-2-39ed38738100ea378cb0e5349bff2d2277171150.tar.bz2 gentoo-2-39ed38738100ea378cb0e5349bff2d2277171150.zip | |
Merging categories dev-php5 and dev-php (bug #324665)
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/syck')
| -rw-r--r-- | dev-libs/syck/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/syck/syck-0.55-r4.ebuild | 4 |
2 files changed, 6 insertions, 3 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/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") |