From 71361104411facb9476406a74c1c26c2ab080443 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 10 Nov 2011 14:33:59 +0100
Subject: [PATCH] xbps-src: if pkgver from repos not matched, build from src.

---
 xbps-src/shutils/builddep_funcs.sh | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/xbps-src/shutils/builddep_funcs.sh b/xbps-src/shutils/builddep_funcs.sh
index bfb7a7f27b..d01e3ecb66 100644
--- a/xbps-src/shutils/builddep_funcs.sh
+++ b/xbps-src/shutils/builddep_funcs.sh
@@ -30,7 +30,7 @@
 #
 install_pkg_from_repos()
 {
-	local cmd rval tmplogf tmpdepf
+	local rval tmplogf tmpdepf
 
 	msg_normal "$pkgver: installing '$1'... "
 
@@ -43,19 +43,22 @@ install_pkg_from_repos()
 			return 2
 		fi
 		_pkgver=$($XBPS_REPO_CMD} -oversion show ${_pkgdepname})
-		_repoloc=$($XBPS_REPO_CMD} -orepository show ${_pkgdepname})
-		msg_normal_append "found ${_pkgver} (${_repoloc})\n"
+		msg_normal_append "found ${_pkgver} "
+		$XBPS_PKGDB_CMD pkgmatch "${_pkgdepname}-${_pkgver}" "${1}"
+		if [ $? -eq 1 ]; then
+			_repoloc=$($XBPS_REPO_CMD} -orepository show ${_pkgdepname})
+			msg_normal_append "(${_repoloc})\n"
+		else
+			msg_normal_append "not matched, building from source...\n"
+			return 2
+		fi
 		;;
 	*)	msg_normal_append "\n";;
 	esac
 
-	cmd="${FAKEROOT_CMD} ${FAKEROOT_CMD_ARGS} ${XBPS_BIN_CMD} -Ay install"
 	tmplogf=$(mktemp)
-	tmpdepf=$(mktemp)
-	echo "'${1}'" > $tmpdepf
-	${cmd} $(cat $tmpdepf) >$tmplogf 2>&1
+	$FAKEROOT_CMD $FAKEROOT_CMD_ARGS $XBPS_BIN_CMD -Ay install ${_pkgdepname} >$tmplogf 2>&1
 	rval=$?
-	rm -f $tmpdepf
 	if [ $rval -ne 0 -a $rval -ne 6 ]; then
 		# xbps-bin can return:
 		#