gentoo auto-resync : 07:08:2024 - 12:37:20

3 files changed, 4 insertions, 111 deletions

diff --git a/sci-libs/dlib/Manifest b/sci-libs/dlib/Manifest
index 47a9d130c938..aa69dda4258e 100644
--- a/sci-libs/dlib/Manifest
+++ b/sci-libs/dlib/Manifest
@@ -1,5 +1,3 @@
 DIST dlib-19.24.2.tar.gz 22252165 BLAKE2B cd6a911e16d9ff6cf94a4334e84983a9c48da42e3f696de20fb28a5bba9720507ec19ddc984bb753288f86359a1c19cdf15ed29f18c43769a1c17d3177d8dedf SHA512 a38a3079c169b16d81d7aca9fc294bcd63bd2dc1a21573f9141ca310542da3629b6523fa6f348be8b41bf5b478c0846a13a4c3fee77f1ac38dfbfc4a01effb57
-DIST dlib-19.24.tar.gz 10863367 BLAKE2B eda85c6ec38fcf212754aae2cdb68539425028735b5148a2f6668ac19f2583129585a7101b74fe202fbfa3d3d2f09e533805a82f8291540919a7eb11483812e8 SHA512 f6ef2fec0977782cdcc15c6340bd91e3471294332de391405f14d86e9fd0cfcc8195fbf5b702f8d269a90b06db23a8134d112ed3fcfb780ff0433d988c41d199
-EBUILD dlib-19.24.2.ebuild 2513 BLAKE2B a593d1d7842022e8b58650a1cfd9ed8b0bcd3b4c8e058e3846cf43fac4bce02664a6914274f783b49ad455edefa6eb066eb073d998d1f86b6ab5ae9aa91426b4 SHA512 45a7c8e72572a336d874cabd125695028c369dedee5974b73ae3f7285e789c43f1e02f09b93548d40786b83f80ededa1dee6ebabed1cdf858dab376407b15ac2
-EBUILD dlib-19.24.ebuild 2513 BLAKE2B 8faf0274b9ef05963a34b12c2bd47fdf89999d0af7cde697ad671b5de39b565a0b23ca555c1824575781e6bd2cf9fe2cbe8e55673e74ecc14e67ec5ab768b342 SHA512 d3934515077f1d3810bf7dbec5c37b480c615ce24075ef0048c3076eeaf1122d32f1d241620f77231c2fc6c508bb074b9bf886055e639a77298060b3c8eb7b6a
+EBUILD dlib-19.24.2.ebuild 2530 BLAKE2B 6bd30eae48a08ba1626a021766104f476d7e566f24efb93d236ca8a4413577406b29a811d97f49064fef96e9fbf8d63d82df30b4c8284ca35e16caecf8336d59 SHA512 69ec18776c92dc7d8bff65adc33624dd6b0f5fcef6ad30d9681838b02a5b67bd60f07689ddd5b6f3a093f324af4f321e25e96e20b6bacf17121d985531c759d9
 MISC metadata.xml 1003 BLAKE2B 3c4e623c6abbd4d1ec8a9402009b2d01e6edb547bfd24f03c27853d0386170833553feecc7b0f6b751a3ad4e52f0575a4a87fbcf801a0952fc3d4e5c77645a43 SHA512 2c59cabd74e9433b9b31b96d1f476c2c9200cce51960c09de5ebd7aabbfe4cff1f4449a6a9ecaaf1907f58dd12c04039a9f58f69f2d036bc18bf82b4438cbc01
diff --git a/sci-libs/dlib/dlib-19.24.2.ebuild b/sci-libs/dlib/dlib-19.24.2.ebuild
index dd936a0dc155..f7967da999d3 100644
--- a/sci-libs/dlib/dlib-19.24.2.ebuild
+++ b/sci-libs/dlib/dlib-19.24.2.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_EXT=1
 DISTUTILS_OPTIONAL=1
 inherit cmake cuda distutils-r1
 
diff --git a/sci-libs/dlib/dlib-19.24.ebuild b/sci-libs/dlib/dlib-19.24.ebuild
deleted file mode 100644
index 7390b5b72a3d..000000000000
--- a/sci-libs/dlib/dlib-19.24.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_OPTIONAL=1
-inherit cmake cuda distutils-r1
-
-DESCRIPTION="Numerical and networking C++ library"
-HOMEPAGE="http://dlib.net/"
-SRC_URI="https://github.com/davisking/dlib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Boost-1.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cblas cuda debug examples gif jpeg lapack mkl png python sqlite test X cpu_flags_x86_avx cpu_flags_x86_sse2 cpu_flags_x86_sse4_1"
-REQUIRED_USE="python? ( png ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-# doc needs a bunch of deps not in portage
-RDEPEND="
-	cblas? ( virtual/cblas )
-	cuda? ( dev-libs/cudnn:= )
-	gif? ( media-libs/giflib:= )
-	jpeg? ( media-libs/libjpeg-turbo:0= )
-	lapack? ( virtual/lapack )
-	mkl? ( sci-libs/mkl )
-	png? ( media-libs/libpng:0= )
-	python? ( ${PYTHON_DEPS} )
-	sqlite? ( dev-db/sqlite:3 )
-	X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	python? (
-		${DISTUTILS_DEPS}
-		test? (
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-DOCS=( docs/README.txt )
-
-src_prepare() {
-	use cuda && cuda_src_prepare
-	cmake_src_prepare
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDLIB_ENABLE_ASSERTS=$(usex debug)
-		-DDLIB_ENABLE_STACK_TRACE=$(usex debug)
-		-DDLIB_GIF_SUPPORT=$(usex gif)
-		-DDLIB_JPEG_SUPPORT=$(usex jpeg)
-		-DDLIB_PNG_SUPPORT=$(usex png)
-		-DDLIB_LINK_WITH_SQLITE3=$(usex sqlite)
-		-DDLIB_NO_GUI_SUPPORT=$(usex X OFF ON)
-		-DDLIB_USE_BLAS=$(usex cblas)
-		-DDLIB_USE_CUDA=$(usex cuda)
-		-DDLIB_USE_LAPACK=$(usex lapack)
-		-DUSE_AVX_INSTRUCTIONS=$(usex cpu_flags_x86_avx)
-		-DUSE_SSE2_INSTRUCTIONS=$(usex cpu_flags_x86_sse2)
-		-DUSE_SSE4_INSTRUCTIONS=$(usex cpu_flags_x86_sse4_1)
-	)
-	cmake_src_configure
-	use python && distutils-r1_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use python && distutils-r1_src_compile
-}
-
-src_test() {
-	(
-		local BUILD_DIR="${BUILD_DIR}"/dlib/test
-		mkdir -p "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" >/dev/null || die
-
-		local CMAKE_USE_DIR="${S}"/dlib/test
-		cmake_src_configure
-		cmake_build
-
-		./dtest --runall || die "Tests failed"
-	)
-
-	use python && distutils-r1_src_test
-}
-
-python_test() {
-	epytest
-}
-
-src_install() {
-	cmake_src_install
-	use python && distutils-r1_src_install
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}
-	fi
-}