summaryrefslogtreecommitdiff
path: root/dev-libs/libgcrypt
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-09-14 11:10:11 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-09-14 11:10:11 +0100
commit81b8f20732954c4508baf2f77472b5435e3f851f (patch)
tree4180177cb7ba85eab50159ce96218c2419fb24a6 /dev-libs/libgcrypt
parent946859e0e36904cffb3e0ccbccb6b7b1347c1cc8 (diff)
gentoo auto-resync : 14:09:2022 - 11:10:10
Diffstat (limited to 'dev-libs/libgcrypt')
-rw-r--r--dev-libs/libgcrypt/Manifest5
-rw-r--r--dev-libs/libgcrypt/files/libgcrypt-1.9.4-no-fgrep-libgcrypt-config.patch21
-rw-r--r--dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild (renamed from dev-libs/libgcrypt/libgcrypt-1.10.1-r1.ebuild)1
-rw-r--r--dev-libs/libgcrypt/libgcrypt-1.9.4-r2.ebuild (renamed from dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild)1
4 files changed, 26 insertions, 2 deletions
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 829053661c02..a16d553f5a34 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,11 +1,12 @@
AUX libgcrypt-1.10.1-fix-no-asm-hppa.patch 1166 BLAKE2B 17b27fd88b0e9ccf97c3f46780f16495d6df84e3d58ed9073af6f200908422273a6cbaa18a7285b87db2203c12a9f45f6d2853caf05d667be94a95979b5a0c47 SHA512 02e0c174844fd56da7212518f41b582894e72714e9cbc013448a5eea748cedc7d6ee5719af4049ee6695b83b5f44eb63e6c95972096ba0fc180c2cfe2482ad6e
AUX libgcrypt-1.9.4-arm-neon-compile-fix.patch 1389 BLAKE2B 548fc764050f322786f3c0ec8f806a6a897987115db0cfd8a2a4f1ffc134a31e9069dca4e334a7a5288f5176ce8e2e8450dc2003c56915d5fdd4dc3c11012c0a SHA512 0b83ab2585502d65d1ccf36440f4a73aa9a9d3a8cb40375ca6a4e81fcc962040fb233df9a345c823281605c061b8ea0e509e0e16a5c3a32581a279e5904bbfd0
+AUX libgcrypt-1.9.4-no-fgrep-libgcrypt-config.patch 646 BLAKE2B a6a4b46dfa9a113446fb10e3c66ab64c08ea2cb768acfe0f5057e102c827ca6e3d676e1970f9234db5bec86ea6745b765a412c1b5cdc263bd7154b169960b136 SHA512 a49af765a1175dd8041a500d3c7213df27c00699bf8a5202b080539bf2909084214d008509039c81d6a28a0f4a3b9fe1f45f89aaa87742bce9a5dd8c8c469fbf
AUX libgcrypt-multilib-syspath.patch 588 BLAKE2B 6a8d30246263339571455df3c1cccfc9f38e50117cef34bc92ce37a296c3e31017c0190923ea992f51706c55a63c6f75b1d9fc7d8d40930707486f419e1795c4 SHA512 913c1a474aba50ec3589fb5a991f65204ba2cc28203b92353fdef8fb092350c3be814a57f29a26a2176627509a4f573f6db02ebdbcde3f04a2f1d632879293dc
AUX libgcrypt-powerpc-darwin.patch 444 BLAKE2B 37b95d21f0df07c5c06cd7e1e1efe73d02b9ac59dfe2a31d43b7a535bed356ff24095d528662d58a0cdc9c3eb25de50b5b5a4d9feb0ddb917a42f9332b33982e SHA512 2a2e7e84222f4672a70df827955bb8592e714580fecf6b5238e131038460169f9d80fd04d63d6e232f6fc448c04e0acf214993537ef22e297ea98a4d12c6ade5
DIST libgcrypt-1.10.1.tar.bz2 3778457 BLAKE2B 46f30459891183b6d9ec18f1c7907fee0ad156c7dd75044f3db2b4d1c19dc6f30b2dfa6f85bc82adc9243aaba913e40fb6faf77d2226ca5a33897220d032437a SHA512 e5ca7966624fff16c3013795836a2c4377f0193dbb4ac5ad2b79654b1fa8992e17d83816569a402212dc8367a7980d4141f5d6ac282bae6b9f02186365b61f13
DIST libgcrypt-1.10.1.tar.bz2.sig 119 BLAKE2B 5261d7dbfd5d82b2d3fa2ebf864a9ef0c7c978dd66a71c078df7bbb3b63f5d85180e5f909f43a49712fc16c45f7aabaa6bc30ed82a39ffc9a5d483ea6a94d162 SHA512 b156ae05079776698bc95ba5a9e48e95de8f716aa1760ef4b2e7cb8518ccec660337fc7823f865bde870461800d472fd8e458d03a7095b6bb614f6dd96f796d8
DIST libgcrypt-1.9.4.tar.bz2 3239704 BLAKE2B b8244bc12a68955797b0c2b474ac5c95df1014231f7180a2ffa113e3aacedc98eed60ee1e4b30b032a5fcd6a04855ae07142c223906d5db9c28328a71e014f33 SHA512 d0e117ac73c94d70e9521ee1e6328691498cc8328f8c4e21338096908f5c04c7b838966eb63d59494565f4e19f506c07dab4f4d922150d75610d9f7b57abbf60
DIST libgcrypt-1.9.4.tar.bz2.sig 119 BLAKE2B 4012c22259a9fd56f9da6c87d60077cea0dbfef85d4d4ad1ff6a2375ddefafc4cd03ee9083d18e080c14c95887b495062af886732a9593bcf1b8f187d21073fe SHA512 4aee16449b4b50dac62bd80217e769f32f43fb7cd994402b7d9cffbb1934b2771041c8c0c41a63ced9c8d9408025f9c5608ffc7f00e5e9a9b92a07cb5118a98a
-EBUILD libgcrypt-1.10.1-r1.ebuild 4973 BLAKE2B 9b4e61d861451d60dc27e330a4c8573033e602b96a2ecd871ad8998740c81a1642487f53a4f0442db95ac1f1147afc459cc0cab8fd0bb67ec873958161dafef7 SHA512 240b5b4fce16dcf8da47329616036ac9bc60a3297da01c2d2424b520852e8e3fb1025fbd19735a1b70b62f590df5b05d306dee9af8e50c00e161964b2230659c
-EBUILD libgcrypt-1.9.4-r1.ebuild 4962 BLAKE2B 5f7437ccbd2e5c7a4b9224e7b0a8676856c75a5765477147c524cbf4ca8f5c7d30b626b2ecda429161cd64e067ddda634da62be0fd5c68de03f5cfc7c6bad065 SHA512 01a11ba7af71892211fc0fbe382021aafee7c56f930af1ff581c248a1f29fbc4456bf125328a069eca024925c4f686825d91bb1644a128e87a8258dde676c7a7
+EBUILD libgcrypt-1.10.1-r2.ebuild 5032 BLAKE2B e8ddd6f2d6e69daa60d38666dfffe376b4ad031e8fc8075000bf07fd990f79ceae138445d986395f865e823b21139a84be6a0fc17cc805f7478c895cd4fe5f36 SHA512 15864294c5fa14197416992150e700eb3049b218a617d35f921350cd9955627332f201c5f7d1c10aaab02a111b5eae8e407c299a09ead0ce3b6a018423915bfc
+EBUILD libgcrypt-1.9.4-r2.ebuild 5021 BLAKE2B 28031c72d8ee46ff5ce9820339c3397d6300e07c0a7f6a88b91c2cea144546001cb3d5a2bf3a47d4018ae1d5ebfc565e2789f1b5255e581382a44b2b5949b4eb SHA512 c6cf36fac494c3e90dc1b4b5178a83676b55e5bb785644ba79af83febd431d123e1dca0f4092863e3638e476465f4fdb8e5ac0ff2418ab276e05c0761a56e908
MISC metadata.xml 524 BLAKE2B ab417ec172246d92822cafcadf2ccb72d2b8e0c056d93f1575284afbfc30dae74086d5a3b2d0bc60ec03de0a9f02ac08dc8f961f1f38eb639d862708886141ee SHA512 52d663d33d8d76f5a4613d1fded0630a5597796b0c20ddfc5eecda92fbf28f4f3b8c976e2fdb418cebd9d743ca26b1c6329ad65e1655f6eae5c1d797df1d1f95
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
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
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=(