From 897726483669e0f4f4df26f388b901d841ebf40d Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sat, 26 Aug 2023 07:44:30 +0000 Subject: [PATCH] boost170, add conflict for devel package for boost 169 (#9288) --- dev-libs/boost/boost170-1.70.0.recipe | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dev-libs/boost/boost170-1.70.0.recipe b/dev-libs/boost/boost170-1.70.0.recipe index d3c71d098..12da42374 100644 --- a/dev-libs/boost/boost170-1.70.0.recipe +++ b/dev-libs/boost/boost170-1.70.0.recipe @@ -6,7 +6,7 @@ expressions, and unit testing. It contains over eighty individual libraries." HOMEPAGE="https://www.boost.org/" SOURCE_URI="https://boostorg.jfrog.io/artifactory/main/release/$portVersion/source/boost_${portVersion//./_}.tar.bz2" CHECKSUM_SHA256="430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778" -REVISION="7" +REVISION="8" LICENSE="Boost v1.0" COPYRIGHT="1998-2018 Beman Dawes, David Abrahams, Rene Rivera, et al." SOURCE_DIR="boost_${portVersion//./_}" @@ -104,10 +104,12 @@ PROVIDES_devel=" $devel_libs devel:libboost_config$secondaryArchSuffix = $libVersion " - REQUIRES_devel=" boost170$secondaryArchSuffix == $portVersion base " +CONFLICTS_devel=" + boost169${secondaryArchSuffix}_devel + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= r1~alpha4_pm_hrev51470