[gentoo-commits] repo/gentoo:master commit in: dev-libs/libksba/files/, dev-libs/libksba/

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libksba/files/, dev-libs/libksba/

[Sam James]

commit:     d1b7bc443ed4de4e83812e7cd360c9bcc9bb8e3a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 11 17:48:45 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 11 17:48:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1b7bc44

dev-libs/libksba: fix fgrep warnings in ksba-config

Closes: https://bugs.gentoo.org/868384
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/libksba-1.6.0-no-fgrep-ksba-config.patch  | 21 +++++++++++++++++++++
 ...libksba-1.6.0.ebuild => libksba-1.6.0-r1.ebuild} |  7 ++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/dev-libs/libksba/files/libksba-1.6.0-no-fgrep-ksba-config.patch b/dev-libs/libksba/files/libksba-1.6.0-no-fgrep-ksba-config.patch
new file mode 100644
index 000000000000..7c5f7e85cd0d
--- /dev/null
+++ b/dev-libs/libksba/files/libksba-1.6.0-no-fgrep-ksba-config.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/868384
+--- a/src/ksba-config.in
++++ b/src/ksba-config.in
+@@ -126,7 +126,7 @@ if test "$echo_cflags" = "yes"; then
+     fi
+     tmp=""
+     for i in $includes $cflags; do
+-       if echo "$tmp" | fgrep -v -- "$i" >/dev/null; then
++       if echo "$tmp" | grep -F -v -- "$i" >/dev/null; then
+            tmp="$tmp $i"
+        fi
+     done
+@@ -140,7 +140,7 @@ if test "$echo_libs" = "yes"; then
+     fi
+     tmp=""
+     for i in $libdirs $libs; do
+-       if echo "$tmp" | fgrep -v -- "$i" >/dev/null; then
++       if echo "$tmp" | grep -F -v -- "$i" >/dev/null; then
+            tmp="$tmp $i"
+        fi
+     done

diff --git a/dev-libs/libksba/libksba-1.6.0.ebuild b/dev-libs/libksba/libksba-1.6.0-r1.ebuild
similarity index 88%
rename from dev-libs/libksba/libksba-1.6.0.ebuild
rename to dev-libs/libksba/libksba-1.6.0-r1.ebuild
index 184c9cd1140c..4519c155623c 100644
--- a/dev-libs/libksba/libksba-1.6.0.ebuild
+++ b/dev-libs/libksba/libksba-1.6.0-r1.ebuild
@@ -16,6 +16,10 @@ RDEPEND=">=dev-libs/libgpg-error-1.8"
 DEPEND="${RDEPEND}"
 BDEPEND="sys-devel/bison"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.0-no-fgrep-ksba-config.patch
+)
+
 src_configure() {
 	local myeconfargs=(
 		$(use_enable static-libs static)
@@ -28,6 +32,7 @@ src_configure() {
 
 src_install() {
 	default
-	# ppl need to use lib*-config for --cflags and --libs
+
+	# People need to use ksba-config for --cflags and --libs
 	find "${ED}" -type f -name '*.la' -delete || die
 }