From 5d2efcaa7fc60e0af6c96f79ac25e3716a881049 Mon Sep 17 00:00:00 2001 From: blshkv Date: Sun, 29 Dec 2019 21:46:55 +0800 Subject: [PATCH] dlib: remove in Gentoo's favour --- dev-python/dlib/Manifest | 1 - dev-python/dlib/dlib-19.18.0.ebuild | 30 ------------------- .../face_recognition-1.2.3.ebuild | 4 +-- .../base/package.accept_keywords/sci-libs | 3 ++ profiles/pentoo/base/package.use/sci-libs | 2 ++ 5 files changed, 7 insertions(+), 33 deletions(-) delete mode 100644 dev-python/dlib/Manifest delete mode 100644 dev-python/dlib/dlib-19.18.0.ebuild diff --git a/dev-python/dlib/Manifest b/dev-python/dlib/Manifest deleted file mode 100644 index 0557e77eb..000000000 --- a/dev-python/dlib/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST dlib-19.18.0.tar.gz 3100095 BLAKE2B e67019f3840578abcd1ff2a20b2ee8dc01524ce492e90358ec7394bd5ac9a224598218b84c9bdafb4400f1f82eb6e8d9560fb2df08f392b6c0bfcd14443a1450 SHA512 6561e7a9d9ec5093696410e11a24afc40e7ea1119b710944d9507a91e56512a1cf0295830fbd5ede23acf0f14b58b8302c091eb7335655a4d4b07909414f369d diff --git a/dev-python/dlib/dlib-19.18.0.ebuild b/dev-python/dlib/dlib-19.18.0.ebuild deleted file mode 100644 index 74eddaf48..000000000 --- a/dev-python/dlib/dlib-19.18.0.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{6,7} ) - -inherit distutils-r1 - -DESCRIPTION="A toolkit for making real world machine learning and data analysis applications" -HOMEPAGE="https://github.com/davisking/dlib https://pypi.org/project/dlib/" -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Boost-1.0" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="test" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/nose[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - )" - -python_test() { - nosetests --verbose || die - py.test -v -v || die -} diff --git a/dev-python/face_recognition/face_recognition-1.2.3.ebuild b/dev-python/face_recognition/face_recognition-1.2.3.ebuild index b43e83f3a..3f3e6cdd3 100644 --- a/dev-python/face_recognition/face_recognition-1.2.3.ebuild +++ b/dev-python/face_recognition/face_recognition-1.2.3.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=7 PYTHON_COMPAT=( python3_{6,7} ) @@ -20,7 +20,7 @@ RDEPEND=">=dev-python/face_recognition_models-0.3.0[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] dev-python/pillow[${PYTHON_USEDEP}] dev-python/click[${PYTHON_USEDEP}] - >=dev-python/dlib-19.7[${PYTHON_USEDEP}]" + >=sci-libs/dlib-19.7[python,${PYTHON_USEDEP}]" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] test? ( diff --git a/profiles/pentoo/base/package.accept_keywords/sci-libs b/profiles/pentoo/base/package.accept_keywords/sci-libs index 91e122e70..8213fdf03 100644 --- a/profiles/pentoo/base/package.accept_keywords/sci-libs +++ b/profiles/pentoo/base/package.accept_keywords/sci-libs @@ -19,3 +19,6 @@ sci-electronics/litescope #https://bugs.gentoo.org/670246 =sci-libs/arpack-3.4* + +#required by app-forensics/eagleeye deps +~sci-libs/dlib-19.16 diff --git a/profiles/pentoo/base/package.use/sci-libs b/profiles/pentoo/base/package.use/sci-libs index 94edbf80f..dd5d42f23 100644 --- a/profiles/pentoo/base/package.use/sci-libs +++ b/profiles/pentoo/base/package.use/sci-libs @@ -1,2 +1,4 @@ sci-libs/fftw threads sci-libs/gsl cblas-external + +sci-libs/dlib python