summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Bergström <bugs@bergstroem.nu>2016-02-09 08:53:44 +1100
committerJohan Bergström <bugs@bergstroem.nu>2016-02-09 08:53:44 +1100
commit66973a2eb514ce7bed31ed2799934c80c59c9c34 (patch)
tree4eb77f5b802e3f9a2edf491e833f49bb7cda2e2c /dev-libs/ucl
parentapp-emulation/lxc: Use rm -f (diff)
downloadgentoo-66973a2eb514ce7bed31ed2799934c80c59c9c34.tar.gz
gentoo-66973a2eb514ce7bed31ed2799934c80c59c9c34.tar.bz2
gentoo-66973a2eb514ce7bed31ed2799934c80c59c9c34.zip
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.
Diffstat (limited to 'dev-libs/ucl')
-rw-r--r--dev-libs/ucl/ucl-1.03-r1.ebuild4
1 files changed, 3 insertions, 1 deletions
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