gentoo resync : 12.03.2021

3 files changed, 32 insertions, 2 deletions

diff --git a/app-forensics/sleuthkit/Manifest b/app-forensics/sleuthkit/Manifest
index 78af162933f4..543b5b7489c2 100644
--- a/app-forensics/sleuthkit/Manifest
+++ b/app-forensics/sleuthkit/Manifest
@@ -1,4 +1,5 @@
 AUX sleuthkit-4.1.0-tools-shared-libs.patch 1678 BLAKE2B f60496480425fd78bc211a663be80db2472a9683f1ff76c747f8190d5544df532857f6e1fb4343d0405f8bf51aa7b7bf86ed55fffbeea0153341ce9f2dca077b SHA512 b559f669837194bed447ac269884ab50e6ea746aba2df799688964245c22814567871f12f96d43ba74016d5c448247b02bef5d7bdfd32fd782ef5e668686238e
+AUX sleuthkit-4.10.1-exclude-usr-local.patch 858 BLAKE2B 706aee34f3555fb703e2b2d88ebe63919b02ac93f1627dda12116bea89f0303a5d4b9adc5f1695e4e96d643d09f88514fe41d144fca1a4f8cd7618b22d21b2f7 SHA512 a4d5d31b63483e6fb88c4a1b06f40587d2b66f63092c67755fec41c29e9f671e9e2e508c0752d2894e77b059a96ae15fd33e663fd23a13dad16acf5184959c88
 AUX sleuthkit-4.6.4-default-jar-location-fix.patch 1768 BLAKE2B d9a0675223506649a5db7aa4e0ef883ecea84c8484836d2020528696f13e14bbe9334c2967c7b698126fb1cedd6a6719fbbe3fb945b4ea9b89d643a61232d5e8 SHA512 acc076ca74d3e5d7c75425292730783801a7afe858ea119186229a319ba4fd2e076c1214daca3e4aa3d5a7717c5ed08a9ca0bf11bb4dc2a04d3aad190dbf57c6
 DIST SparseBitSet-1.1.jar 23706 BLAKE2B 8623a723f11f97386a108c775fefddd324997b68bea7f7ade0581ec5800bfa8d32f699ab903ad66c631b7b5c69ba1ef377243653f5044f39234dac07543eb129 SHA512 cf75431c5f705961800ce5cbca2acb9b2459eaf98ec37b5ee21c5a90d204ffb466fa25457b0560fbb024489777efbea0276201024c7b1b2853124930ac490983
 DIST commons-validator-1.6.jar 186077 BLAKE2B 39080bebfde71d87847b65f212d47a51bab9567cb0aaf7122359a67a8eb817877a6cc80495a15aefb12936d0e36532ed771dc0a2dff8401fc301f658ed38ef88 SHA512 aded530d3b79ead6ba5c44668c6d6964d7721f9617249f6aaa1c8f558ad4b3d3c1b6d78b639a4cb8dd27a671879b662fdbba0502fd04e131f3286169507df30c
@@ -7,6 +8,6 @@ DIST sleuthkit-4.10.1.tar.gz 3524246 BLAKE2B ddea16693730a993032868ea60423d4bfcf
 DIST sleuthkit-4.9.0.tar.gz 3473764 BLAKE2B 3950e586595f53a81c845b3b1fbaf4939a84ee3d81e8141cabf41c9fbee1b1f5cf1b8bd6cab95b157d60364541736f750c8ada61c76da89e663721b9a67330ef SHA512 1db8b9f825aa551fe5bdf01285832b903fb4f2d6a8fd9a57a5cd5c9005dfdbec22d3dd49d394616d838e2a2111110018e787f2ed467a1c27a500fc75bed0dd0b
 DIST sleuthkit-libewf_64bit-20130416.tar.gz 23818247 BLAKE2B 23be933ed8a74e4834ee6571a28d81ba16e98e4e4e27b5b1b3b655d1d92a6eadcba35aadf96aa404e6e0a225b27f3f5daff2836879b87fe58440a3ad5645de44 SHA512 611cbb57de17600caee0330bbe9917c4481d7711a35dba8c072fd49cd3e1714e0a3ce30fd8fcac9981db848e80870bf5d215326c56808bb6f5b4c8dcc1e5a3c9
 DIST sqlite-jdbc-3.25.2.jar 7064881 BLAKE2B 3917da6127137bab710a9e61f326f59320ce94654ebb8ae5e694b05aed6b9b1bd367ade2f08ce5bb52c3ac296992240ad949969f5eff712615d07a18588c6a17 SHA512 efd1ea26d7f4f9bc66bf0d5f80234a0c535829bd498e4c5a0cab42873b58ac69133497d8c45689a1d3a39e657a2d0474d6b930c7bc415dd623801ee4a7354ffb
-EBUILD sleuthkit-4.10.1.ebuild 8481 BLAKE2B 32f0ed88dca38af84b5b9354805e877a0ea8a8d911f83ffbc58d00be43baa968ece12b4bea9c527dae9cf1ce0532059720d5be97cfb110f3f71ae4d9e18ef9b7 SHA512 683edc4526136d4cfd9d96ea0e74898254095aa41a455171509963f4aa8e05b2bc95ab7363feb37b5585dc4d551cd70490b5ddfa0495505f37bae6f365e35461
+EBUILD sleuthkit-4.10.1-r1.ebuild 8533 BLAKE2B 55e43bca89998f65491ff91a30217074e53dd388d8880f2edfa57035b423dbe1dcda2869d2bf05347aa3e6ba6d47cf807a482b5336dad8ef29077378e723d10a SHA512 54dd5d72be48f975d784224a479a1af81d43a881633689882407b436ee6ab26f29ece855766e72600e79dc58811eabda8b0fc06a9db33da8a39af5163b987aff
 EBUILD sleuthkit-4.9.0.ebuild 8265 BLAKE2B ac78ccc377b4d629b6df0a1e6954ae1a18206c83dd1af33c127f8c3178f8a7647909f1e43be45765fed878626dae9799b8c232194ae9f4ad08a14647a800dd1d SHA512 ab286af8087ae7abdc0c7d0dba41fecf02aa10996b83d26af1d8f05447aa00cfd8b41acaa72d29498b59a868370fcf478a19ccac9a4d7896af94e85eb548d411
 MISC metadata.xml 607 BLAKE2B 2c651da1253ec986eb766b6949ea9a9059d76351081e805aba5f795971bb3b9368987cc9d39fc335c1e65c12de9347471686984e2753487cafab431488762064 SHA512 2dbce141f133a9172c6ba61924a9fac2674394096063b899be5a90111a9741789e2a09aa06cc49e17a253d088d20c1ddad1c748b6e09f650131ec0f91116ae08
diff --git a/app-forensics/sleuthkit/files/sleuthkit-4.10.1-exclude-usr-local.patch b/app-forensics/sleuthkit/files/sleuthkit-4.10.1-exclude-usr-local.patch
new file mode 100644
index 000000000000..256dc54548b0
--- /dev/null
+++ b/app-forensics/sleuthkit/files/sleuthkit-4.10.1-exclude-usr-local.patch
@@ -0,0 +1,28 @@
+From: Gokturk Yuksek <gokturk@gentoo.org>
+
+Do not allow the build system to use libs from /usr/local.
+
+Bug: https://bugs.gentoo.org/774039
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -92,19 +92,6 @@
+ dnl Enable multithreading by default in the presence of pthread
+ AS_IF([test "x$ax_pthread_ok" = "xyes" && test "x$enable_multithreading" != "xno"], [ax_multithread=yes], [ax_multithread=no])
+ 
+-case "$host" in
+-*-*-mingw*)
+-  dnl Adding the native /usr/local is wrong for cross-compiling
+-  ;;
+-*)
+-  dnl Not all compilers include /usr/local in the include and link path
+-  if test -d /usr/local/include; then
+-    CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+-    LDFLAGS="$LDFLAGS -L/usr/local/lib"
+-  fi
+-  ;;
+-esac
+-
+ dnl Add enable/disable option
+ AC_ARG_ENABLE([java],
+     [AS_HELP_STRING([--disable-java], [Do not build the java bindings or jar file])])
diff --git a/app-forensics/sleuthkit/sleuthkit-4.10.1.ebuild b/app-forensics/sleuthkit/sleuthkit-4.10.1-r1.ebuild
index 0056a2c48726..ddb5a5ad0eea 100644
--- a/app-forensics/sleuthkit/sleuthkit-4.10.1.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-4.10.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -80,6 +80,7 @@ DEPEND="${DEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.1.0-tools-shared-libs.patch
 	"${FILESDIR}"/${PN}-4.6.4-default-jar-location-fix.patch
+	"${FILESDIR}"/${PN}-4.10.1-exclude-usr-local.patch
 )
 
 src_unpack() {