diff options
| author |   Ian Delaney <idella4@gentoo.org> | 2016-02-09 15:17:35 +0800 |
|---|---|---|
| committer | Ian Delaney <idella4@gentoo.org> | 2016-02-09 15:17:35 +0800 |
| commit | 0c018e78723be545c7cbfde686ddd376cd4f584c (patch) | |
| tree | dfcabf953f4879d4ac654587d9bd8a8fa76dd542 /dev-libs | |
| parent | Merge remote-tracking branch 'remotes/atlaua/aranea/nethack' (diff) | |
| parent | dev-libs/{lib,}ucl: Avoid simultaneous installation (diff) | |
| download | gentoo-0c018e78723be545c7cbfde686ddd376cd4f584c.tar.gz gentoo-0c018e78723be545c7cbfde686ddd376cd4f584c.tar.bz2 gentoo-0c018e78723be545c7cbfde686ddd376cd4f584c.zip | |
Merge remote-tracking branch 'remotes/jbergstroem/fix/dev-libs/ucl-conflict'
Pull request: https://github.com/gentoo/gentoo/pull/819
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/libucl/libucl-0.7.3.ebuild | 3 | ||||
| -rw-r--r-- | dev-libs/ucl/ucl-1.03-r1.ebuild | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/dev-libs/libucl/libucl-0.7.3.ebuild b/dev-libs/libucl/libucl-0.7.3.ebuild index 585a76baa977..ca66ff3056e4 100644 --- a/dev-libs/libucl/libucl-0.7.3.ebuild +++ b/dev-libs/libucl/libucl-0.7.3.ebuild @@ -14,7 +14,8 @@ SLOT="0" KEYWORDS="~x86 ~amd64" IUSE="lua +regex signatures static-libs urlfetch utils" -DEPEND="lua? ( >=dev-lang/lua-5.1:= ) +DEPEND="!!dev-libs/ucl + lua? ( >=dev-lang/lua-5.1:= ) signatures? ( dev-libs/openssl:0 ) urlfetch? ( net-misc/curl )" RDEPEND="${DEPEND}" diff --git a/dev-libs/ucl/ucl-1.03-r1.ebuild b/dev-libs/ucl/ucl-1.03-r1.ebuild index 906fda7117a8..49083baea207 100644 --- a/dev-libs/ucl/ucl-1.03-r1.ebuild +++ b/dev-libs/ucl/ucl-1.03-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -14,6 +14,8 @@ SLOT="0" KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" IUSE="static-libs" +DEPEND="!!dev-libs/libucl" + src_prepare() { epatch "${FILESDIR}"/${P}-CFLAGS.patch epatch "${FILESDIR}"/${P}-x32.patch #426334 |