gentoo resync : 13.06.2020

4 files changed, 20 insertions, 170 deletions

diff --git a/sci-libs/dlib/Manifest b/sci-libs/dlib/Manifest
index 469912daa2f4..1b07c09561d0 100644
--- a/sci-libs/dlib/Manifest
+++ b/sci-libs/dlib/Manifest
@@ -1,9 +1,5 @@
 DIST dlib-19.16.tar.gz 10411975 BLAKE2B 93047590a4d8f4685970d3db6841cbf9cc90ca8a5e50f0929a106d887e5db1b4fd96bbe14380537a3e28369a8db6d9d8c067e7768000ac3c7d0f225b46369326 SHA512 4e040ef88acff05e1a48e499b813c876b22ad3f989d076bdf19969d01036b62e51a0dff30b70046910ba31dfa1b1c2450a7fad41ae3142b7285ed74b8d584887
-DIST dlib-19.4.tar.gz 7226923 BLAKE2B 2d72936fc46d559a80288e7f88a64c372fb5f8dcfc69b57abee8a27519f3084fa0cf4193261dd9758f9eb718e755d46a17655e38cb74aaa0046855f11676e157 SHA512 23bf80353f9b6ce07b6a3a7df05016705645c18bcf2b3ead567935008ea12c9f6dc0722d9bbacc009bd26f78eb43c1cbecf776bfed5a3445c1f2e8e208f201e2
-DIST dlib-19.7.tar.gz 7670615 BLAKE2B 13343f3b99bf5dd7a9c032de09eff47f1675bbc978a93edfbd952196b2347e4a887a8eed805f22985477b10ecfa1df85fc568e32f1a00b17b0292a0a51db9764 SHA512 a3877066e04a411d96e910f4229c60a86971a9290e840aa4a5b2f0b102e9b8c37bfede259b80b71ba066d21eb0aa2565808e51d0eab6397ff5fd2bac60dcedd5
 DIST dlib-19.9.tar.gz 8892457 BLAKE2B d18548e09f8169bbc9d7f339599bd58b940410839b259a8d7be9cb999f82e634ad5cd0539adb45239dab821ea1029493d24ae9990ca32c75c744e2c5d9e218f6 SHA512 1e2123c22e1b13cc84108fa627bfa92eadc9dee63f93a9f45676bbf2b752c8728117d915ac327f5223b0cdbce87dd3bef2f4d8d5ed3f8f5a314ffa9e8962a246
-EBUILD dlib-19.16.ebuild 2975 BLAKE2B 4ded3ab6329c15b3ab34765bb69c4cd7f48bd2e24315b6eea7136a0685309ece5eae7541ff1d8d0b6dde110a9c98675ef7a8a3ddac4b9bb0427c1cdcc7cee866 SHA512 359ef635af4ca95b541e4205092afbe00e5d753f45f7e9d3103ea7bd5012d931bfa97a8d2b3cf98545f966644cfef325d9fe23e2e3bfa3f7cb2fc494a4d3f602
-EBUILD dlib-19.4.ebuild 1821 BLAKE2B 22b259faf3b3eb0ae4ce4fbd0930f81f2ef0ac79a249c8af45a23476e290ab08ce6b27c9bf918890bf7e994994eb6371f5a16fb2dc4cbbe698ae2b16a739d83e SHA512 a56e6c3b13248450dfbe243b561873d1147e2d3a94832c5d092934868c3e0233b4b90b95ba2b1c57d8362605b065c208c860024e4026ba71670038b7b2eb2dc9
-EBUILD dlib-19.7.ebuild 1819 BLAKE2B 3e259e1dfb027149dcff41ffe2dc861e3072991755d3d7a545fffc6a61f844566e02a9482305472cc62cf7623c8eec6c7794afe26cef9b2983cd6a0327760ba4 SHA512 993f94efc9712bac9bcd584bf6e8d918d7638fd6d2a13d127c8f41c484d9fe4c10c40063c2516925a543f4e6894c639c858cc8416162d9f8aee4b27c71011e43
+EBUILD dlib-19.16-r1.ebuild 2843 BLAKE2B ae97763c222aff271a8726f9aa2b0653b9a3f7a9952f45e7715e2a3b175c7cf46ed780463e767e6f0ec11a9307d0d7c933a72a0b4335cecb109cb34cea9fa5b7 SHA512 0b201837d08d22452e8b292bdb8f0fdea967b8e4758fe1c0b6bf9dc4d599bab7fb88a2ec01886e0f306f263327207b16c60d80ff3f63c1c0723e8498699828aa
 EBUILD dlib-19.9.ebuild 2062 BLAKE2B 8d693459b90472916c37d9d20febf48c7120116d368346277926e7ad9ec5b0aa3c5ccdf9f1d7e1cb62ff22b7cb8fcf269ab43087b51a3d149be79f002db54db0 SHA512 370d72e972404a9a709dd499203abb7652f85126cda4b400dc59d1396badbeb331a117120889eae0835eb7fe311cae4bb11f6c0f590dd2fa3fe05d7383822a6d
 MISC metadata.xml 1002 BLAKE2B 899d622186d6ed4ab0c8c448bdbe312be12f0eeeec5e4d4ae031de4dcb26d73f0489b697375893d4c4bd16651c6b2d40ac156b67be0b376ec270d7d99a6f465a SHA512 1977d192107b78b97d5336d3e5b2e43a7ea12ede631a864ce14aeab2f9d328526f815fab0d62ae1417842cdfe9e1e7c0494fcf79be535dbfc4e3ca9342447b5c
diff --git a/sci-libs/dlib/dlib-19.16.ebuild b/sci-libs/dlib/dlib-19.16-r1.ebuild
index cb682127de97..5b0ca7e80ee9 100644
--- a/sci-libs/dlib/dlib-19.16.ebuild
+++ b/sci-libs/dlib/dlib-19.16-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_OPTIONAL=1
-inherit cmake-utils cuda distutils-r1
+inherit cmake cuda distutils-r1
 
 DESCRIPTION="Numerical and networking C++ library"
 HOMEPAGE="http://dlib.net/"
@@ -14,34 +14,31 @@ 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 static-libs test X cpu_flags_x86_avx cpu_flags_x86_sse2 cpu_flags_x86_sse4_1"
+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 )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 # doc needs a bunch of deps not in portage
-
 RDEPEND="
-	cblas? ( virtual/cblas:= )
+	cblas? ( virtual/cblas )
 	cuda? ( dev-libs/cudnn:= )
 	gif? ( media-libs/giflib:= )
 	jpeg? ( virtual/jpeg:0= )
-	lapack? ( virtual/lapack:= )
-	mkl? ( sci-libs/mkl:= )
+	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}
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	)"
+	sqlite? ( dev-db/sqlite:3 )
+	X? ( x11-libs/libX11 )"
+DEPEND="${RDEPEND}"
+BDEPEND="python? ( test? ( dev-python/pytest[${PYTHON_USEDEP}] ) )"
 
 DOCS=( docs/README.txt )
 
 src_prepare() {
 	use cuda && cuda_src_prepare
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	use python && distutils-r1_src_prepare
 }
 
@@ -76,12 +73,12 @@ src_configure() {
 		-DUSE_SSE2_INSTRUCTIONS="$(usex cpu_flags_x86_sse2)"
 		-DUSE_SSE4_INSTRUCTIONS="$(usex cpu_flags_x86_sse4_1)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 	use python && distutils-r1_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	use python && distutils-r1_src_compile
 }
 
@@ -92,16 +89,16 @@ python_test() {
 src_test() {
 	mkdir "${BUILD_DIR}"/dlib/test || die
 	pushd "${BUILD_DIR}"/dlib/test > /dev/null || die
-	cmake "${S}"/dlib/test && emake
+	cmake "${S}"/dlib/test || die
+	emake
 	./dtest --runall || die
 	popd > /dev/null || die
 	use python && distutils-r1_src_test
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use python && distutils-r1_src_install
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
 	if use examples; then
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}
diff --git a/sci-libs/dlib/dlib-19.4.ebuild b/sci-libs/dlib/dlib-19.4.ebuild
deleted file mode 100644
index 8e755d5722ee..000000000000
--- a/sci-libs/dlib/dlib-19.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils cuda
-
-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 debug cuda examples gif jpeg lapack mkl png
-	 sqlite static-libs test X"
-RESTRICT="!test? ( test )"
-
-# doc needs a bunch of deps not in portage
-
-RDEPEND="
-	cblas? ( virtual/cblas:= )
-	cuda? ( dev-libs/cudnn:= )
-	jpeg? ( virtual/jpeg:0= )
-	lapack? ( virtual/lapack:= )
-	mkl? ( sci-libs/mkl:= )
-	png? ( media-libs/libpng:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	X? ( x11-libs/libX11:= )
-"
-DEPEND="test? ( ${RDEPEND} )"
-
-src_prepare() {
-	use cuda && cuda_src_prepare
-	cmake-utils_src_prepare
-	sed -i -e '/LICENSE.txt/d' dlib/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-		-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)"
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	mkdir "${BUILD_DIR}"/dlib/test || die
-	pushd "${BUILD_DIR}"/dlib/test > /dev/null || die
-	cmake "${S}"/dlib/test && emake
-	./dtest --runall || die
-	popd > /dev/null || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc docs/README.txt
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}
-	fi
-}
diff --git a/sci-libs/dlib/dlib-19.7.ebuild b/sci-libs/dlib/dlib-19.7.ebuild
deleted file mode 100644
index 470c52a217e6..000000000000
--- a/sci-libs/dlib/dlib-19.7.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils cuda
-
-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 debug cuda examples gif jpeg lapack mkl png sqlite static-libs test X"
-RESTRICT="!test? ( test )"
-
-# doc needs a bunch of deps not in portage
-
-RDEPEND="
-	cblas? ( virtual/cblas:= )
-	cuda? ( dev-libs/cudnn:= )
-	jpeg? ( virtual/jpeg:0= )
-	lapack? ( virtual/lapack:= )
-	mkl? ( sci-libs/mkl:= )
-	png? ( media-libs/libpng:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	X? ( x11-libs/libX11:= )
-"
-DEPEND="test? ( ${RDEPEND} )"
-
-src_prepare() {
-	use cuda && cuda_src_prepare
-	cmake-utils_src_prepare
-	sed -i -e '/LICENSE.txt/d' dlib/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-		-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)"
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	mkdir "${BUILD_DIR}"/dlib/test || die
-	pushd "${BUILD_DIR}"/dlib/test > /dev/null || die
-	cmake "${S}"/dlib/test && emake
-	./dtest --runall || die
-	popd > /dev/null || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc docs/README.txt
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}
-	fi
-}