[gentoo-commits] repo/gentoo:master commit in: app-portage/iwdevtools/files/, app-portage/iwdevtools/

[Ionen Wolkens]

commit:     bf3ee3557073e6b2680c59f319b6f46dc58202d3
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 25 09:32:47 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Feb 25 09:36:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf3ee355

app-portage/iwdevtools: backport ldpath include fix

Trivial 1-line change reverting to the old (proper)
behavior, safe and not worth a new release for now.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../iwdevtools-0.10.1-ldpath-regression.patch      | 22 ++++++++++++++++++++++
 ...s-0.10.1.ebuild => iwdevtools-0.10.1-r1.ebuild} |  4 ++++
 2 files changed, 26 insertions(+)

diff --git a/app-portage/iwdevtools/files/iwdevtools-0.10.1-ldpath-regression.patch b/app-portage/iwdevtools/files/iwdevtools-0.10.1-ldpath-regression.patch
new file mode 100644
index 000000000000..5a5312639979
--- /dev/null
+++ b/app-portage/iwdevtools/files/iwdevtools-0.10.1-ldpath-regression.patch
@@ -0,0 +1,22 @@
+https://github.com/ionenwks/iwdevtools/commit/4e89c42455330b6660583ff1a4b54384346a123d
+From: Ionen Wolkens <ionen@g.o>
+Date: Fri, 25 Feb 2022 04:20:17 -0500
+Subject: [PATCH] qa-vdb: fix ldpath include regression
+
+commit dd0bb44a3b190c756ce55c190b70f33bf350b7c5 was meant for
+directories, however this is /not/ a directory. As a result
+gcc's ld.so.conf wasn't included which could result in:
+
+ * VDB: detected possibly incorrect RDEPEND (app-text/qpdf-10.6.2)
+ *                > cross-aarch64-unknown-linux-gnu/gcc:11
+--- a/scripts/qa-vdb
++++ b/scripts/qa-vdb
+@@ -674,7 +674,7 @@ _vdb-set_ldpath() {
+ 				path=${1%/*}/${path}
+ 			fi
+ 			for path in ${path}; do
+-				[[ -d ${path} && -x ${path} ]] || continue # ignore bad includes
++				[[ -r ${path} ]] || continue # ignore bad includes
+ 				_vdb-set_ldpath "${path}"
+ 			done
+ 		fi

diff --git a/app-portage/iwdevtools/iwdevtools-0.10.1.ebuild b/app-portage/iwdevtools/iwdevtools-0.10.1-r1.ebuild
similarity index 96%
rename from app-portage/iwdevtools/iwdevtools-0.10.1.ebuild
rename to app-portage/iwdevtools/iwdevtools-0.10.1-r1.ebuild
index 09262d7fea22..bc84297f29a9 100644
--- a/app-portage/iwdevtools/iwdevtools-0.10.1.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-0.10.1-r1.ebuild
@@ -27,6 +27,10 @@ BDEPEND="
 	|| ( sys-apps/util-linux app-misc/getopt )
 	test? ( ${RDEPEND} )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-ldpath-regression.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		-Ddocdir=${PF}