From 690dc0def974d570ed9dd37d7dd957b2f2ea6020 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Wed, 13 Jun 2018 14:29:38 +0000 Subject: [PATCH] libuuid: add CONFLICTS with (util-linux's) lib:libuuid. (#2683) While at it, declare version for devel:libuuid. --- sys-devel/libuuid/libuuid-1.0.3.recipe | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys-devel/libuuid/libuuid-1.0.3.recipe b/sys-devel/libuuid/libuuid-1.0.3.recipe index ee2b8b571..485e63c92 100644 --- a/sys-devel/libuuid/libuuid-1.0.3.recipe +++ b/sys-devel/libuuid/libuuid-1.0.3.recipe @@ -10,13 +10,13 @@ unique\"." HOMEPAGE="https://sourceforge.net/projects/libuuid/" COPYRIGHT="2013-2014 Ralph Böhme" LICENSE="GNU GPL v2" -REVISION="5" +REVISION="6" SOURCE_URI="https://downloads.sourceforge.net/project/libuuid/libuuid-1.0.3.tar.gz" CHECKSUM_SHA256="46af3275291091009ad7f1b899de3d0cea0252737550e7919d17237997db5644" PATCHES="libuuid-1.0.3.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" libuuid$secondaryArchSuffix = $portVersion @@ -25,10 +25,13 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix " +CONFLICTS=" + lib:libuuid$secondaryArchSuffix + " PROVIDES_devel=" libuuid${secondaryArchSuffix}_devel = $portVersion - devel:libuuid$secondaryArchSuffix + devel:libuuid$secondaryArchSuffix = 1.0.0 compat >= 1 " REQUIRES_devel=" libuuid$secondaryArchSuffix == $portVersion base