gentoo auto-resync : 14:09:2022 - 11:10:10

5 files changed, 29 insertions, 72 deletions

diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest
index cd5a342fddc5..fe54c778a0a3 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -1,7 +1,4 @@
-DIST libksba-1.5.0.tar.bz2 656518 BLAKE2B 077655031f82ff13c596ad0be0d0f15408a5b793f00e3af3516f4f207285f7d76096216c7bf11d2c46c28eb332cc74df39bef84afb0f47184c8ebdd8cb92a86d SHA512 84383e8b084bf47ac646a9aacb174e510ffcab4b966b649e4351990eaf7ce78cc9d199e6c4f3a1be697888c857ee86ecef949c06156790c7d8d0bd0fb0142721
-DIST libksba-1.5.1.tar.bz2 659280 BLAKE2B f247a2c9545e3c3ae3bbcf50344ca530ef320d12b9a1e301bca086b0e1a69e6b7a88b912b14f862d82e7ad45bf588754db601d987ee42579d8042e68b5108d33 SHA512 156fe6a36daa7b11ce580366ab36a5fceda253413f0057ace791e4f028fd3158a70a3f6ba1d0c824fafee4420d1076864dbd0911606fb65e14c8b2332b6cc92b
+AUX libksba-1.6.0-no-fgrep-ksba-config.patch 636 BLAKE2B 5a24f231225d77835b62c3acc1fe5f36b9c9cc8d99d0ab0e86c3de34d49211f660105a8f9b4fe9e3b0ba0fec5ce9a6bceaebb31bbcbd80d7e623be69f17aa8a4 SHA512 8393052c0d1338e51cac150db5aa4f6b9607f437a13c0d58be22e9f7975f031d757790accb053db0c621a76ebc1b1603721f6d79f90f0d515aecf525e5b65999
 DIST libksba-1.6.0.tar.bz2 662120 BLAKE2B 59bee23f764ab3e0f79fae6074ffe568845b6089ff29b8c5112973490ff5e1436834d5d0b50954ba9fbd6be655f47043a6345181c5c7e552322ceb331d030780 SHA512 a7c76d41dfd8ec6383ac2de3c53848cd9f066b538f6f3cd43175e3c8095df51b96d0a24a573481c0c4856b09b7c224e2b562d88f5c0801e7acfb582ea2739c2b
-EBUILD libksba-1.5.0.ebuild 1045 BLAKE2B 3a522d4a2e1c74b5f7480643697905061c39dbe8c40f448679ca5102b630f94566766ff286c588847cad686a8aeb24c8105097613359a30a51f92ef26989ce99 SHA512 0a0b32fccad43d1e6c06fc451ea300c847053802157e0e72b5c38501144074a8b3dd6bb4292225ca712c4dd0b5460525ca8b5a8401da9f11a4617d6762365fb6
-EBUILD libksba-1.5.1.ebuild 1045 BLAKE2B 3a522d4a2e1c74b5f7480643697905061c39dbe8c40f448679ca5102b630f94566766ff286c588847cad686a8aeb24c8105097613359a30a51f92ef26989ce99 SHA512 0a0b32fccad43d1e6c06fc451ea300c847053802157e0e72b5c38501144074a8b3dd6bb4292225ca712c4dd0b5460525ca8b5a8401da9f11a4617d6762365fb6
-EBUILD libksba-1.6.0.ebuild 1058 BLAKE2B 51ce7a93f6561d8c631072a742132676eaf636924ab46bfd93fd45f789403c40298ce31a92677e30e43868e7636a95d6740999c31e3f9961ef419ce952f7a6b7 SHA512 9cc8ed42f6fc43ce99294be3c02495e5d5f4918f441d44576e01038571955db9da96268846f1cc90751f91eaf40ccd03cf2d0b6b1ad761000350fc5279f16d85
+EBUILD libksba-1.6.0-r1.ebuild 1129 BLAKE2B 02bc3e3ca7d5ff452f0adabbde65371df3eee9ad17fa8972b7440637dcfcc1caf9830b1b70645fd6bc95c49de6a9dd0f8d0f90009bf169af9f4e64bc2e1d06fb SHA512 211797f35a8f267e511fafc946fab54a4aaf8bcd52c6df6ea1d46c6c7f58d952adb92f175f940c49dd2b58443ce985b196256e2e39a247f94334aae54967c1df
 MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e
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.5.0.ebuild b/dev-libs/libksba/libksba-1.5.0.ebuild
deleted file mode 100644
index 24c1dc721659..000000000000
--- a/dev-libs/libksba/libksba-1.5.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="X.509 and CMS (PKCS#7) library"
-HOMEPAGE="https://www.gnupg.org/related_software/libksba"
-SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
-
-LICENSE="LGPL-3+ GPL-2+ GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.8"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/bison"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# ppl need to use lib*-config for --cflags and --libs
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-libs/libksba/libksba-1.5.1.ebuild b/dev-libs/libksba/libksba-1.5.1.ebuild
deleted file mode 100644
index 24c1dc721659..000000000000
--- a/dev-libs/libksba/libksba-1.5.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="X.509 and CMS (PKCS#7) library"
-HOMEPAGE="https://www.gnupg.org/related_software/libksba"
-SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
-
-LICENSE="LGPL-3+ GPL-2+ GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.8"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/bison"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# ppl need to use lib*-config for --cflags and --libs
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-libs/libksba/libksba-1.6.0.ebuild b/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
 }