[gentoo-commits] repo/gentoo:master commit in: dev-libs/libucl/, dev-libs/ucl/

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libucl/, dev-libs/ucl/

[Ian Delaney]

commit:     66973a2eb514ce7bed31ed2799934c80c59c9c34
Author:     Johan Bergström <bugs <AT> bergstroem <DOT> nu>
AuthorDate: Mon Feb  8 21:53:44 2016 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Mon Feb  8 21:53:44 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66973a2e

dev-libs/{lib,}ucl: Avoid simultaneous installation

Both libraries opts to use /usr/{include,lib}/libucl* which
leads to a conflict. There unfortunately doesn't seem to be
a resolution upstream; dev-libs/ucl is 12 years old and
dev-libs/libucl has stated that no changes related to this
will occur.

 dev-libs/libucl/libucl-0.7.3.ebuild | 3 ++-
 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 585a76b..ca66ff3 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 906fda7..49083ba 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