From 2127bd2e00813d988dc2bdb6dd6324053db9948e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 21 Jun 2019 17:21:38 +0200
Subject: [PATCH] xbps-src: require xbps>=0.55.

Build dependencies are now installed with -I, --ignore-file-conflicts.
A new option introduced in xbps-0.55 that just prints
conflicting files but does not error out.

Switch to xbps-fetch and xbps-digest.
---
 common/xbps-src/shutils/build_dependencies.sh | 6 +++---
 xbps-src                                      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/xbps-src/shutils/build_dependencies.sh b/common/xbps-src/shutils/build_dependencies.sh
index 55a8ee635c..f4f31c8227 100644
--- a/common/xbps-src/shutils/build_dependencies.sh
+++ b/common/xbps-src/shutils/build_dependencies.sh
@@ -77,9 +77,9 @@ install_pkg_from_repos() {
     tmplogf=${XBPS_STATEDIR}/xbps_${XBPS_TARGET_MACHINE}_bdep_${pkg}.log
 
     if [ -n "$cross" ]; then
-        $XBPS_INSTALL_XCMD -Ayd "$pkg" >$tmplogf 2>&1
+        $XBPS_INSTALL_XCMD -IAyd "$pkg" >$tmplogf 2>&1
     else
-        $XBPS_INSTALL_CMD -Ayd "$pkg" >$tmplogf 2>&1
+        $XBPS_INSTALL_CMD -IAyd "$pkg" >$tmplogf 2>&1
     fi
     rval=$?
     if [ $rval -ne 0 -a $rval -ne 17 ]; then
@@ -89,7 +89,7 @@ install_pkg_from_repos() {
         # ENOENT   (2): package missing in repositories.
         # ENXIO    (6): package depends on invalid dependencies.
         # EAGAIN  (11): package conflicts.
-        # EEXIST  (17): package already installed.
+        # EEXIST  (17): file conflicts in transaction.
         # ENODEV  (19): package depends on missing dependencies.
         # ENOTSUP (95): no repositories registered.
         #
diff --git a/xbps-src b/xbps-src
index 00daec93ce..b7472013c3 100755
--- a/xbps-src
+++ b/xbps-src
@@ -390,7 +390,7 @@ setup_distfiles_mirror() {
     done
 }
 
-readonly XBPS_VERSION_REQ="0.46"
+readonly XBPS_VERSION_REQ="0.55"
 readonly XBPS_VERSION=$(xbps-uhelper -V|awk '{print $2}')
 readonly XBPS_SRC_VERSION="113"
 export XBPS_MACHINE=$(xbps-uhelper arch)
@@ -571,8 +571,8 @@ else
     readonly XBPS_LIBEXECDIR=$XBPS_COMMONDIR/xbps-src/libexec
     readonly XBPS_BUILDHELPERDIR=$XBPS_COMMONDIR/build-helper
 fi
-readonly XBPS_FETCH_CMD="xbps-uhelper fetch"
-readonly XBPS_DIGEST_CMD="xbps-uhelper digest"
+readonly XBPS_FETCH_CMD="xbps-fetch"
+readonly XBPS_DIGEST_CMD="xbps-digest"
 readonly XBPS_CMPVER_CMD="xbps-uhelper cmpver"
 
 readonly XBPS_TARGET="$1"