5 files changed, 316 insertions, 39 deletions
diff --git a/app-forensics/sleuthkit/Manifest b/app-forensics/sleuthkit/Manifest
index adb9984d196e..2de33f013350 100644
--- a/app-forensics/sleuthkit/Manifest
+++ b/app-forensics/sleuthkit/Manifest
@@ -5,10 +5,12 @@ DIST SparseBitSet-1.1.jar 23706 BLAKE2B 8623a723f11f97386a108c775fefddd324997b68
 DIST commons-validator-1.6.jar 186077 BLAKE2B 39080bebfde71d87847b65f212d47a51bab9567cb0aaf7122359a67a8eb817877a6cc80495a15aefb12936d0e36532ed771dc0a2dff8401fc301f658ed38ef88 SHA512 aded530d3b79ead6ba5c44668c6d6964d7721f9617249f6aaa1c8f558ad4b3d3c1b6d78b639a4cb8dd27a671879b662fdbba0502fd04e131f3286169507df30c
 DIST gson-2.8.5.jar 241622 BLAKE2B b13887177b5d5f2a11b2dde1fdbaa3a95b55bb7b5500624c7eb0745e861c897ed1e27868bad19d30a1670c90f3068a8fd40e1b81e5e25e96819fa5c371a5e1af SHA512 5dd7214c542a7b93aab3eab0ba13e4ac3d6ddb05c795fb6d3992e21925a98dce87cb186ac67b4d3ad146f96e14d38b3892837eca57a27b4e845aca6d4e4f708a
 DIST sleuthkit-4.10.1.tar.gz 3524246 BLAKE2B ddea16693730a993032868ea60423d4bfcf3cba470010854c7bd36ab0a033325d906a0e4760501d59fdda4f37e12052f8672d33e4e374d1a6cdb03e22d0de367 SHA512 3ee335ba98bbb16985207ad50bc15a607ea2bcf550bba392be1cace8982c893a29e9de64e6598d02f41f9f745dc720f829317ed31f068e6cb1f6c230699e47bf
+DIST sleuthkit-4.11.0.tar.gz 3619891 BLAKE2B ce18579d1e82ab26fd05c92da6bac84a50b856b321fa9cb21c42cb36c1795794e72b71225b392b1a3f732738e9da0161c4e93c17359730ab6dabba6fa3a77154 SHA512 fabaf0e7815145f82cf7d8c342d403939511afa36f29318a89212a8aa1a3465e2050629ff9e308b34cfeb3c2c98efa94f9546737cba749c075c4e583b8808580
 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-r2.ebuild 8533 BLAKE2B 539b9dd5f5ce39132cb9ef0b125b75e7cda4e63a4462636da12593ab9f62b1ccce456ebc3b739a037ac0cc86da9e61dc1ac68fb509150730d7e1ae6b469290f8 SHA512 366c279c8e56dd0da44c223404fac7310d8ef57e96bc92e2618cd13086dc08ec448da2b1c2aefdf97a230e6daedbca2fa9657de8ea2940be200e93bc20d18cda
-EBUILD sleuthkit-4.10.1-r3.ebuild 8424 BLAKE2B 12c69aadd53ec5f15ef2304444c2d128917445988aea4fd72b83cfa169d4e063f5768368d69c658097bb5499fa01a1265f3e21fd7fb2a5555c2f29e7002e9b8c SHA512 5cf9e810aa9ce629ce52316338ab8bb1e560e03690a915cf9781dcf436549db87e1c9c8ba0702302488eb347e4467c8e7d24c24b5240fb8f6047630e896d1039
-EBUILD sleuthkit-4.9.0-r1.ebuild 8265 BLAKE2B a7a4cc2cc3dd9ff9abe31b2f5731923cf9b41d352683f8f0a58d3ecaf26c717a912ab55291220e21c6bdf87c603bd1cc883d76b8d49df2da097e440c0c400d12 SHA512 b91d5270090b25d7b6788bdd692686db9ba14c2b5bc534e9f8bcf8b8c3a2fdcd99d4af9cbf0914630f6771234ef9b9fc0f7110763480af394defa38f58cdee1e
+EBUILD sleuthkit-4.10.1-r3.ebuild 8388 BLAKE2B 076c1ab552815ed45dafa09d6cf30b4f826d803730e4804a9277ab6fe0c62cb4b3a29cfe65838a08ae9db4c8975df19acd128eaa162f31675eaa89f939831506 SHA512 d223facfada10b40063f1d36f4ea3eeeb96354abde5189033943bb335acaf1f6a9fd8fb26aa8a735b11512b90702751e3a9586bed87863ac873fc2da8eb63659
+EBUILD sleuthkit-4.10.1-r4.ebuild 7873 BLAKE2B 27dc0eb205ec70dd4949f00539ffe4cf6824b2c0727ee05151e46a099b4727482eebd79454a9a1ca6e34dfc9287213ab6592599ccc3ed4fe05adfeb603e70dc7 SHA512 7f7e7ecd7f4282c0ac9144d2a4dd3aafd2883dd81037335a1c68c842781786f56c90cf9ab0a5031b7c051734e8551694b0c97ef3a7b1013af15f0041da6f298d
+EBUILD sleuthkit-4.11.0.ebuild 7873 BLAKE2B 27dc0eb205ec70dd4949f00539ffe4cf6824b2c0727ee05151e46a099b4727482eebd79454a9a1ca6e34dfc9287213ab6592599ccc3ed4fe05adfeb603e70dc7 SHA512 7f7e7ecd7f4282c0ac9144d2a4dd3aafd2883dd81037335a1c68c842781786f56c90cf9ab0a5031b7c051734e8551694b0c97ef3a7b1013af15f0041da6f298d
+EBUILD sleuthkit-4.9.0-r1.ebuild 8231 BLAKE2B 7b4f0e8dd2d27fe04c9206b1f9730457f3f66d872bb03cedd2ac7c59b9f25bf9a690ba44e8d7c4b3c8088835dd7ccb0d3d74bc86869994e08b07b2596213ad1e SHA512 686c92fd1fe586c9f77f166e37a6a22b71f8eb9d43961873ab41b9fddf81c949895b40c7349ca85e326a5e9f79df8310347eb13828c035dde132d49a49655628
 MISC metadata.xml 607 BLAKE2B 2c651da1253ec986eb766b6949ea9a9059d76351081e805aba5f795971bb3b9368987cc9d39fc335c1e65c12de9347471686984e2753487cafab431488762064 SHA512 2dbce141f133a9172c6ba61924a9fac2674394096063b899be5a90111a9741789e2a09aa06cc49e17a253d088d20c1ddad1c748b6e09f650131ec0f91116ae08
diff --git a/app-forensics/sleuthkit/sleuthkit-4.10.1-r3.ebuild b/app-forensics/sleuthkit/sleuthkit-4.10.1-r3.ebuild
index 7d36f1fb6984..bac42a739a7b 100644
--- a/app-forensics/sleuthkit/sleuthkit-4.10.1-r3.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-4.10.1-r3.ebuild
@@ -34,7 +34,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz
 
 LICENSE="BSD CPL-1.0 GPL-2+ IBM java? ( Apache-2.0 )"
 SLOT="0/19" # subslot = major soname version
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ppc ~x86"
 IUSE="aff doc ewf java static-libs test +threads zlib"
 RESTRICT="!test? ( test )"
 
@@ -62,12 +62,7 @@ DEPEND="
 # "
 
 RDEPEND="${DEPEND}
-	java? (
-		|| (
-			virtual/jre:1.8
-			virtual/jdk:1.8
-		)
-	)
+	java? ( virtual/jre:1.8 )
 "
 DEPEND="${DEPEND}
 	java? ( virtual/jdk:1.8 )
diff --git a/app-forensics/sleuthkit/sleuthkit-4.10.1-r2.ebuild b/app-forensics/sleuthkit/sleuthkit-4.10.1-r4.ebuild
index 1ac22499ceb9..78faebc794c0 100644
--- a/app-forensics/sleuthkit/sleuthkit-4.10.1-r2.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-4.10.1-r4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 JAVA_PKG_BSFIX_NAME="build.xml build-unix.xml"
 inherit autotools java-pkg-opt-2 java-ant-2
@@ -10,28 +10,13 @@ DESCRIPTION="A collection of file system and media management forensic analysis
 HOMEPAGE="https://www.sleuthkit.org/sleuthkit/"
 # TODO: sqlite-jdbc does not exist in the tree, we bundle it for now
 #		See: https://bugs.gentoo.org/690010
-# TODO: SparseBitSet does not exist in the tree, we bundle it for now
-#		See: https://bugs.gentoo.org/690012
 # TODO: Upstream uses a very specific version of libewf which is not in
 #       the tree anymore. So we statically compile and link to sleuthkit.
 #       Hopefully upstream will figure something out in the future.
 #		See: https://bugs.gentoo.org/689752
-# TODO: gson-2.8.5 does not exist in the tree. Building it seems to
-# 		require Java 9. We have Java 11 in the tree but I don't see a
-# 		way to use it as a gentoo-vm in order to build gson. Sleuthkit
-# 		upstream still uses Java 8.
-# 		See: https://bugs.gentoo.org/706274
-# TODO: commons-validator-1.6 does not exist in the tree. The latest version
-#		as of writing this ebuild is 1.4.1, for which the build fails. As
-#		per #711930, this is a security sensitive bump. We're gonna fetch
-#		the jar file here and file a bug request for a bump as well:
-#		    https://bugs.gentoo.org/721020
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz
 	java? (
-		https://repo1.maven.org/maven2/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar
 		http://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.25.2/sqlite-jdbc-3.25.2.jar
-		http://repo1.maven.org/maven2/com/zaxxer/SparseBitSet/1.1/SparseBitSet-1.1.jar
-		https://repo1.maven.org/maven2/commons-validator/commons-validator/1.6/commons-validator-1.6.jar
 	)
 	ewf? ( https://github.com/sleuthkit/libewf_64bit/archive/VisualStudio_2010.tar.gz -> sleuthkit-libewf_64bit-20130416.tar.gz )"
 
@@ -49,9 +34,12 @@ DEPEND="
 	java? (
 		>=dev-java/c3p0-0.9.5:0
 		dev-java/commons-lang:3.6
+		>=dev-java/commons-validator-1.6:0
+		>=dev-java/gson-2.8.5:2.6
 		dev-java/guava:20
 		>=dev-java/jdbc-postgresql-9.4:0
 		>=dev-java/joda-time-2.4:0
+		dev-java/sparsebitset:0
 	)
 	zlib? ( sys-libs/zlib )
 "
@@ -64,18 +52,15 @@ DEPEND="
 # "
 
 RDEPEND="${DEPEND}
-	java? (
-		|| (
-			virtual/jre:1.8
-			virtual/jdk:1.8
-		)
-	)
+	java? ( virtual/jre:1.8 )
 "
 DEPEND="${DEPEND}
 	java? ( virtual/jdk:1.8 )
-	doc? ( app-doc/doxygen )
 	test? ( >=dev-util/cppunit-1.2.1 )
 "
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.1.0-tools-shared-libs.patch
@@ -245,13 +230,17 @@ src_compile() {
 	if use java; then
 		java-pkg_jar-from --into "${TSK_JAR_DIR}" c3p0
 		java-pkg_jar-from --into "${TSK_JAR_DIR}" commons-lang:3.6
+		java-pkg_jar-from --into "${TSK_JAR_DIR}" commons-validator
+		java-pkg_jar-from --into "${TSK_JAR_DIR}" gson:2.6
 		java-pkg_jar-from --into "${TSK_JAR_DIR}" guava:20
 		java-pkg_jar-from --into "${TSK_JAR_DIR}" jdbc-postgresql
 		java-pkg_jar-from --into "${TSK_JAR_DIR}" joda-time
+		java-pkg_jar-from --into "${TSK_JAR_DIR}" sparsebitset
 
 		# case-uco needs gson and expects it under case-uco/java/lib
 		# symlink it to the jar dir we create for java bindings
 		ln -s "${TSK_JAR_DIR}" "${S}"/case-uco/java/lib || die
+		ln -s ./gson.jar "${TSK_JAR_DIR}"/gson-2.8.5.jar || die
 	fi
 
 	# Create the doc output dirs if requested
diff --git a/app-forensics/sleuthkit/sleuthkit-4.11.0.ebuild b/app-forensics/sleuthkit/sleuthkit-4.11.0.ebuild
new file mode 100644
index 000000000000..78faebc794c0
--- /dev/null
+++ b/app-forensics/sleuthkit/sleuthkit-4.11.0.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_BSFIX_NAME="build.xml build-unix.xml"
+inherit autotools java-pkg-opt-2 java-ant-2
+
+DESCRIPTION="A collection of file system and media management forensic analysis tools"
+HOMEPAGE="https://www.sleuthkit.org/sleuthkit/"
+# TODO: sqlite-jdbc does not exist in the tree, we bundle it for now
+#		See: https://bugs.gentoo.org/690010
+# TODO: Upstream uses a very specific version of libewf which is not in
+#       the tree anymore. So we statically compile and link to sleuthkit.
+#       Hopefully upstream will figure something out in the future.
+#		See: https://bugs.gentoo.org/689752
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz
+	java? (
+		http://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.25.2/sqlite-jdbc-3.25.2.jar
+	)
+	ewf? ( https://github.com/sleuthkit/libewf_64bit/archive/VisualStudio_2010.tar.gz -> sleuthkit-libewf_64bit-20130416.tar.gz )"
+
+LICENSE="BSD CPL-1.0 GPL-2+ IBM java? ( Apache-2.0 )"
+SLOT="0/19" # subslot = major soname version
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="aff doc ewf java static-libs test +threads zlib"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-db/sqlite:3
+	dev-lang/perl:*
+	aff? ( app-forensics/afflib )
+	ewf? ( sys-libs/zlib )
+	java? (
+		>=dev-java/c3p0-0.9.5:0
+		dev-java/commons-lang:3.6
+		>=dev-java/commons-validator-1.6:0
+		>=dev-java/gson-2.8.5:2.6
+		dev-java/guava:20
+		>=dev-java/jdbc-postgresql-9.4:0
+		>=dev-java/joda-time-2.4:0
+		dev-java/sparsebitset:0
+	)
+	zlib? ( sys-libs/zlib )
+"
+# TODO: add support for not-in-tree libraries libvhdi and libvmdk
+# libvhdi: https://github.com/libyal/libvhdi
+# libvmdk: https://github.com/libyal/libvmdk
+# DEPEND="${DEPEND}
+# 	vhdi? ( dev-libs/libvhdi )
+# 	vmdk? ( dev-libs/libvmdk )
+# "
+
+RDEPEND="${DEPEND}
+	java? ( virtual/jre:1.8 )
+"
+DEPEND="${DEPEND}
+	java? ( virtual/jdk:1.8 )
+	test? ( >=dev-util/cppunit-1.2.1 )
+"
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
+
+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() {
+	local f
+
+	unpack ${P}.tar.gz
+
+	if use ewf; then
+		pushd "${T}" &>/dev/null || die
+		unpack sleuthkit-libewf_64bit-20130416.tar.gz
+		export TSK_LIBEWF_SRCDIR="${T}"/libewf_64bit-VisualStudio_2010
+		popd &>/dev/null || die
+	fi
+
+	# Copy the jar files that don't exist in the tree yet
+	if use java; then
+		TSK_JAR_DIR="${T}/lib"
+		mkdir "${TSK_JAR_DIR}" || die
+		for f in ${A}; do
+			if [[ ${f} =~ .jar$ ]]; then
+				cp "${DISTDIR}"/"${f}" "${TSK_JAR_DIR}" || die
+			fi
+		done
+		export TSK_JAR_DIR
+	fi
+}
+
+tsk_prepare_libewf() {
+	# Inlining breaks the compilation, disable it
+	sed -e 's/LIBUNA_INLINE inline/LIBUNA_INLINE/' \
+		-i "${TSK_LIBEWF_SRCDIR}"/libuna/libuna_inline.h || die
+}
+
+src_prepare() {
+	use ewf && tsk_prepare_libewf
+
+	# Do not pass '-Werror'. This is overkill for user builds.
+	sed -e '/AM_CXXFLAGS/ s/-Werror//g' \
+		-i tsk/util/Makefile.am \
+		-i tsk/pool/Makefile.am || die
+	# Remove -static from LDFLAGS because it doesn't actually create
+	# a static binary. It confuses libtool, who then inserts rpath
+	sed -e '/LDFLAGS/ s/-static//' \
+		-i tools/pooltools/Makefile.am || die
+
+	if use java; then
+		pushd "${S}"/bindings/java &>/dev/null || die
+
+		# Prevent "make install" from installing
+		# jar files under /usr/share/java
+		# We'll use the java eclasses for this
+		# See: https://github.com/sleuthkit/sleuthkit/pull/1379
+		sed -e '/^jar_DATA/ d;' -i Makefile.am || die
+
+		java-pkg-opt-2_src_prepare
+
+		popd &>/dev/null || die
+	fi
+
+	# Override the doxygen output directories
+	if use doc; then
+		sed -e "/^OUTPUT_DIRECTORY/ s|=.*$|= ${T}/doc|" \
+			-i tsk/docs/Doxyfile \
+			-i bindings/java/doxygen/Doxyfile || die
+	fi
+
+	# It's safe to call this even after java-pkg-opt-2_src_prepare
+	# because future calls to eapply_user do nothing and return 0
+	default
+
+	eautoreconf
+}
+
+tsk_compile_libewf() {
+	local myeconfargs=(
+		--prefix=/
+		--libdir=/lib
+		--enable-static
+		--disable-shared
+		--disable-winapi
+		--without-libbfio
+		--with-zlib
+		--without-bzip2
+		--without-libhmac
+		--without-openssl
+		--without-libuuid
+		--without-libfuse
+
+		--with-libcstring=no
+		--with-libcerror=no
+		--with-libcdata=no
+		--with-libclocale=no
+		--with-libcnotify=no
+		--with-libcsplit=no
+		--with-libuna=no
+		--with-libcfile=no
+		--with-libcpath=no
+		--with-libbfio=no
+		--with-libfcache=no
+		--with-libfvalue=no
+
+	)
+	# We want to contain our build flags
+	local CFLAGS="${CFLAGS}"
+	local LDFLAGS="${LDFLAGS}"
+
+	pushd "${TSK_LIBEWF_SRCDIR}" &>/dev/null || die
+
+	# Produce relocatable code
+	CFLAGS+=" -fPIC"
+	LDFLAGS+=" -fPIC"
+	econf "${myeconfargs[@]}"
+
+	# Do not waste CPU cycles on building ewftools
+	sed -e '/ewftools/ d' -i Makefile || die
+	emake
+
+	# Only install the headers and the library
+	emake -C libewf DESTDIR="${T}"/image install
+	emake -C include DESTDIR="${T}"/image install
+	find "${T}"/image -name '*.la' -delete || die
+
+	popd &>/dev/null || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-offline="${TSK_JAR_DIR}"
+		$(use_enable java)
+		$(use_enable static-libs static)
+		$(use_enable threads multithreading)
+		$(use_with aff afflib)
+		$(use_with zlib)
+	)
+	# TODO: add support for non-existing libraries libvhdi and libvmdk
+	# myeconfargs+=(
+	# 	$(use_with vhdi libvhdi)
+	# 	$(use_with vmdk libvmdk)
+	# )
+	myeconfargs+=(
+		--without-libvhdi
+		--without-libvmdk
+	)
+
+	use ewf && tsk_compile_libewf
+	myeconfargs+=( $(use_with ewf libewf "${T}"/image) )
+
+	if use java; then
+		pushd "${S}"/bindings/java &>/dev/null || die
+		java-ant-2_src_configure
+		popd &>/dev/null || die
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Give it an existing bogus ivy home #672220
+	local -x IVY_HOME="${T}"
+
+	# Create symlinks of jars for the required dependencies
+	if use java; then
+		java-pkg_jar-from --into "${TSK_JAR_DIR}" c3p0
+		java-pkg_jar-from --into "${TSK_JAR_DIR}" commons-lang:3.6
+		java-pkg_jar-from --into "${TSK_JAR_DIR}" commons-validator
+		java-pkg_jar-from --into "${TSK_JAR_DIR}" gson:2.6
+		java-pkg_jar-from --into "${TSK_JAR_DIR}" guava:20
+		java-pkg_jar-from --into "${TSK_JAR_DIR}" jdbc-postgresql
+		java-pkg_jar-from --into "${TSK_JAR_DIR}" joda-time
+		java-pkg_jar-from --into "${TSK_JAR_DIR}" sparsebitset
+
+		# case-uco needs gson and expects it under case-uco/java/lib
+		# symlink it to the jar dir we create for java bindings
+		ln -s "${TSK_JAR_DIR}" "${S}"/case-uco/java/lib || die
+		ln -s ./gson.jar "${TSK_JAR_DIR}"/gson-2.8.5.jar || die
+	fi
+
+	# Create the doc output dirs if requested
+	if use doc; then
+		mkdir -p "${T}"/doc/{api-docs,jni-docs} || die
+	fi
+
+	emake all $(usex doc api-docs "")
+}
+
+src_install() {
+	# Give it an existing bogus ivy home #756766
+	local -x IVY_HOME="${T}"
+	local f
+
+	if use java; then
+		pushd "${S}"/bindings/java &>/dev/null || die
+
+		# Install case-uco
+		pushd "${S}"/case-uco/java &>/dev/null || die
+		java-pkg_newjar "dist/${PN}-caseuco-${PV}".jar "${PN}-caseuco.jar"
+		popd || die
+
+		# Install the bundled jar files as well as the
+		# sleuthkit jar installed here by case-uco
+		pushd "${TSK_JAR_DIR}" &>/dev/null || die
+		for f in *; do
+			# Skip the symlinks java-pkg_jar-from created
+			[[ -f ${f} ]] || continue
+
+			# Strip the version numbers as per eclass recommendation
+			[[ ${f} =~ -([0-9]+\.)+jar$ ]] || continue
+
+			java-pkg_newjar "${f}" "${f/${BASH_REMATCH[0]}/.jar}"
+		done
+		popd &>/dev/null || die
+
+		popd &>/dev/null || die
+	fi
+
+	default
+	# Default install target for case-uco installs the jar in the wrong place
+	rm -r "${ED}"/usr/share/java
+
+	# It unconditionally builds both api and jni docs
+	# We install conditionally based on the provided use flags
+	if use doc; then
+		dodoc -r "${T}"/doc/api-docs
+		use java && dodoc -r "${T}"/doc/jni-docs
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-forensics/sleuthkit/sleuthkit-4.9.0-r1.ebuild b/app-forensics/sleuthkit/sleuthkit-4.9.0-r1.ebuild
index 823f11e23f2f..14c04f32bf32 100644
--- a/app-forensics/sleuthkit/sleuthkit-4.9.0-r1.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-4.9.0-r1.ebuild
@@ -71,12 +71,7 @@ DEPEND="
 # "
 
 RDEPEND="${DEPEND}
-	java? (
-		|| (
-			virtual/jre:1.8
-			virtual/jdk:1.8
-		)
-	)
+	java? ( virtual/jre:1.8 )
 "
 DEPEND="${DEPEND}
 	java? ( virtual/jdk:1.8 )