From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1C78F158094 for ; Sun, 11 Sep 2022 17:49:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A7B4E07EF; Sun, 11 Sep 2022 17:49:07 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2FB86E07EF for ; Sun, 11 Sep 2022 17:49:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5AF88340F28 for ; Sun, 11 Sep 2022 17:49:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D2AFF57D for ; Sun, 11 Sep 2022 17:49:03 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1662918313.89403d02a8a9cfdf3ed6356159505774f0b501c2.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libgcrypt/, dev-libs/libgcrypt/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libgcrypt/files/libgcrypt-1.9.4-no-fgrep-libgcrypt-config.patch dev-libs/libgcrypt/libgcrypt-1.10.1-r1.ebuild dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild dev-libs/libgcrypt/libgcrypt-1.9.4-r2.ebuild X-VCS-Directories: dev-libs/libgcrypt/ dev-libs/libgcrypt/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 89403d02a8a9cfdf3ed6356159505774f0b501c2 X-VCS-Branch: master Date: Sun, 11 Sep 2022 17:49:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 369be928-3f80-488b-9022-a831e7bfec29 X-Archives-Hash: 0193220dca1bd9dfbeae36beb19f94e7 commit: 89403d02a8a9cfdf3ed6356159505774f0b501c2 Author: Sam James gentoo org> AuthorDate: Sun Sep 11 17:45:13 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sun Sep 11 17:45:13 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89403d02 dev-libs/libgcrypt: fix fgrep warnings in libgcrypt-config Closes: https://bugs.gentoo.org/868384 Signed-off-by: Sam James gentoo.org> .../libgcrypt-1.9.4-no-fgrep-libgcrypt-config.patch | 21 +++++++++++++++++++++ ...-1.10.1-r1.ebuild => libgcrypt-1.10.1-r2.ebuild} | 1 + ...pt-1.9.4-r1.ebuild => libgcrypt-1.9.4-r2.ebuild} | 1 + 3 files changed, 23 insertions(+) diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.9.4-no-fgrep-libgcrypt-config.patch b/dev-libs/libgcrypt/files/libgcrypt-1.9.4-no-fgrep-libgcrypt-config.patch new file mode 100644 index 000000000000..738eac1631b6 --- /dev/null +++ b/dev-libs/libgcrypt/files/libgcrypt-1.9.4-no-fgrep-libgcrypt-config.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/868384 +--- a/src/libgcrypt-config.in ++++ b/src/libgcrypt-config.in +@@ -154,7 +154,7 @@ if test "$echo_cflags" = "yes"; then + + tmp="" + for i in $includes $cflags_final; 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 +@@ -178,7 +178,7 @@ if test "$echo_libs" = "yes"; then + + tmp="" + for i in $libdirs $libs_final; 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/libgcrypt/libgcrypt-1.10.1-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild similarity index 98% rename from dev-libs/libgcrypt/libgcrypt-1.10.1-r1.ebuild rename to dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild index b7a3aa4aaf26..285a83d7d62f 100644 --- a/dev-libs/libgcrypt/libgcrypt-1.10.1-r1.ebuild +++ b/dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild @@ -39,6 +39,7 @@ PATCHES=( "${FILESDIR}"/${PN}-multilib-syspath.patch "${FILESDIR}"/${PN}-powerpc-darwin.patch "${FILESDIR}"/${PN}-1.10.1-fix-no-asm-hppa.patch + "${FILESDIR}"/${PN}-1.9.4-no-fgrep-libgcrypt-config.patch ) MULTILIB_CHOST_TOOLS=( diff --git a/dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.9.4-r2.ebuild similarity index 98% rename from dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild rename to dev-libs/libgcrypt/libgcrypt-1.9.4-r2.ebuild index 713d3c7e3a16..c7a2a6fe71fc 100644 --- a/dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild +++ b/dev-libs/libgcrypt/libgcrypt-1.9.4-r2.ebuild @@ -39,6 +39,7 @@ PATCHES=( "${FILESDIR}"/${PN}-multilib-syspath.patch "${FILESDIR}"/${PN}-powerpc-darwin.patch "${FILESDIR}"/${PN}-1.9.4-arm-neon-compile-fix.patch + "${FILESDIR}"/${PN}-1.9.4-no-fgrep-libgcrypt-config.patch ) MULTILIB_CHOST_TOOLS=(