gentoo auto-resync : 12:09:2024 - 12:31:23

4 files changed, 2 insertions, 330 deletions

diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 11223c88dc57..e04503d87ed5 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/sleuthkit/Manifest b/app-forensics/sleuthkit/Manifest
index f2fc3cec7d32..727d0aa0e224 100644
--- a/app-forensics/sleuthkit/Manifest
+++ b/app-forensics/sleuthkit/Manifest
@@ -5,6 +5,5 @@ AUX sleuthkit-4.6.4-default-jar-location-fix.patch 1768 BLAKE2B d9a0675223506649
 DIST sleuthkit-4.12.1.tar.gz 3768424 BLAKE2B 506d21645cfe809994ebe3edac47402b3590ab4d5bc16260daa706b1fba5ceacf5eb2c3baa96cfa1b7404fbdfcf77705d6f28ddaf293e8d71a1e4cbde93f74a6 SHA512 f3efe1339edc9eb07023975a1e2e2dc7bc47d61d838aada941b7591e2c5beb74fc5298ebf68ae71875bf8f0f09c0d7929a11762fa47840e7e18398d3ff80b9fc
 DIST sleuthkit-libewf_64bit-20130416.tar.gz 23818247 BLAKE2B 23be933ed8a74e4834ee6571a28d81ba16e98e4e4e27b5b1b3b655d1d92a6eadcba35aadf96aa404e6e0a225b27f3f5daff2836879b87fe58440a3ad5645de44 SHA512 611cbb57de17600caee0330bbe9917c4481d7711a35dba8c072fd49cd3e1714e0a3ce30fd8fcac9981db848e80870bf5d215326c56808bb6f5b4c8dcc1e5a3c9
 DIST sqlite-jdbc-3.42.0.0.jar 13030515 BLAKE2B 02ffee9875fefd3f2ba4e9115d0b4fee53163bab994830b28033159ab08df264e5f86bbcfb7d1fae145c9aaafc6537fb9084594ce6b21c9715226a1cf644f174 SHA512 6d0491f7f2f542629f4e69d5891ded85e887f0d8dad8c4568ead07b1eda79e0b97f625374a635f12d419d2f42a4049976365e0a8265ee371172f330be9571616
-EBUILD sleuthkit-4.12.1-r1.ebuild 8805 BLAKE2B 5977668ffc51f3f8e33743cb2178d0046786e09f4e5ba8b645f934025028d4537164bdd78e915d6b526083f4460e62c5d1bd55c9ac8dfc13b8b8869dde2ffc88 SHA512 8e8f9da702c40e6c4e1b3b76bfd9dd215db32a790e159c285a79d3342432a2d85c66b4d9a894bce1bc19a260554d94b5bbe8d5c3483db8efbbe43f7b4eeebd50
-EBUILD sleuthkit-4.12.1-r2.ebuild 8832 BLAKE2B 182d2066a51507a4eceb889759509750cfefe71e83d4f97d3db3506e1d0e47d588a8db510e80ddf2440cbbfe1eb3781164f8b1138058c7ba08ae638272b0589e SHA512 e1503acb6d45802f87ea427793618788205843cee270e13594f4ec3e81b32b0e57792355063f7b97e7d26c6c9d9dfdeb7a8d89ac6333ca363145c216f25bee06
+EBUILD sleuthkit-4.12.1-r2.ebuild 8831 BLAKE2B 018ef5401c2e7488895a4d1fdc034c6e4ba5cb071429fa6e966a3c9f65805667fa73aed07518751b91d39d0d5a97e5b46030b235aacd0999c5b380d590a9e5fc SHA512 fa1ec8d30478365f8459d8f4f54cfb599fd2caa9c3a7362778a3aec8e72cefa033da71082e6405e8c8feb0cd92c69157a1828598d7b11e76ae8d9f4e9768249d
 MISC metadata.xml 608 BLAKE2B 4ffbcef7c2ce2700da294752bdc19b2e98323f2fe3f73aa8f8bfe430fa6a148b8a464959a21300398ae4f6933f1383bc014a697283d148dcbe9616e6a38b01d6 SHA512 59fc9a08d8fa875adc1b9cf8a2f47e38611e474a160ef00a7b75582601cb503bb10f19ab303487658d5f16c25991eba2b7a98d4ff5182b8c4ca8dc6e905a04f3
diff --git a/app-forensics/sleuthkit/sleuthkit-4.12.1-r1.ebuild b/app-forensics/sleuthkit/sleuthkit-4.12.1-r1.ebuild
deleted file mode 100644
index ea1a014a2a9c..000000000000
--- a/app-forensics/sleuthkit/sleuthkit-4.12.1-r1.ebuild
+++ /dev/null
@@ -1,327 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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? (
-		https://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.42.0.0/sqlite-jdbc-3.42.0.0.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.5:0
-		dev-java/commons-lang:3.6
-		>=dev-java/commons-validator-1.6:0
-		>=dev-java/gson-2.8.5:0
-		dev-java/guava:0
-		>=dev-java/jdbc-postgresql-9.4:0
-		>=dev-java/joda-time-2.4:0
-		>=dev-java/mchange-commons-0.2.20:0
-		dev-java/sparsebitset:0
-	)
-	zlib? ( sys-libs/zlib )
-"
-# TODO: add support for not-in-tree libraries:
-# libvhdi: https://github.com/libyal/libvhdi
-# libvmdk: https://github.com/libyal/libvmdk
-# libvslvm: https://github.com/libyal/libvslvm
-#   Upstream also says "A stand-alone version of libbfio is needed
-#   to allow libvslvm to directly read from a TSK_IMAGE." Not sure
-#   what it means yet.
-#
-# DEPEND="${DEPEND}
-# 	vhdi? ( dev-libs/libvhdi )
-# 	vmdk? ( dev-libs/libvmdk )
-#   vslvm? ( dev-libs/libvslvm dev-libs/libbfio )
-# "
-
-RDEPEND="${DEPEND}
-	java? ( virtual/jre:1.8 )
-"
-DEPEND="${DEPEND}
-	java? ( virtual/jdk:1.8 )
-	test? (
-		>=dev-util/cppunit-1.2.1
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/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
-	"${FILESDIR}"/${PN}-4.12.0-configure-ac-test-fix.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
-
-		# Call ant with jar target for case-uco.
-		# The default invocation of ant tries to
-		# run junit tests, which there are none.
-		# It ends up failing with:
-		# junit.framework.AssertionFailedError: No tests found in org.sleuthkit.caseuco.TestSuite
-		sed -e '/\tant \$(ant_args)/ s|$| jar|' \
-			-i "${S}"/case-uco/java/Makefile.am \
-			|| 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 test cppunit)
-		$(use_enable threads multithreading)
-		$(use_with aff afflib)
-		$(use_with zlib)
-	)
-	# TODO: add support for non-existing libraries:
-	# myeconfargs+=(
-	# 	$(use_with vhdi libvhdi)
-	# 	$(use_with vmdk libvmdk)
-	# 	$(use_with vslvm libvslvm)
-	# 	$(use_with vslvm libbfio) # not a typo
-	# )
-	myeconfargs+=(
-		--without-libvhdi
-		--without-libvmdk
-		--without-libvslvm
-		--without-libbfio
-	)
-
-	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
-		java-pkg_jar-from --into "${TSK_JAR_DIR}" guava
-		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}" mchange-commons
-		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
-			[[ -L ${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
-}
-
-src_test() {
-	emake -C "${S}"/unit_tests check
-}
diff --git a/app-forensics/sleuthkit/sleuthkit-4.12.1-r2.ebuild b/app-forensics/sleuthkit/sleuthkit-4.12.1-r2.ebuild
index 15e447293178..357f7c67d8b1 100644
--- a/app-forensics/sleuthkit/sleuthkit-4.12.1-r2.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-4.12.1-r2.ebuild
@@ -22,7 +22,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 )"