[gentoo-commits] repo/gentoo:master commit in: sci-libs/ViSP/

[Andreas Sturmlechner]

commit:     c7796e57d9d266c5349e8137532f24c374dec102
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 25 08:51:35 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 12:11:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7796e57

sci-libs/ViSP: Switch to cmake.eclass

- fix HOMEPAGE, use https
- one line per dependency
- move REQUIRED_USE below IUSE
- use HTML_DOCS, dropping superfluous cd with missing || die

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-libs/ViSP/ViSP-3.3.0.ebuild | 48 +++++++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/sci-libs/ViSP/ViSP-3.3.0.ebuild b/sci-libs/ViSP/ViSP-3.3.0.ebuild
index 35b2a248ef5..4603eafceba 100644
--- a/sci-libs/ViSP/ViSP-3.3.0.ebuild
+++ b/sci-libs/ViSP/ViSP-3.3.0.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Visual Servoing Platform: visual tracking and visual servoing library"
-HOMEPAGE="http://www.irisa.fr/lagadic/visp/visp.html"
+HOMEPAGE="https://visp.inria.fr/"
 SRC_URI="http://gforge.inria.fr/frs/download.php/latestfile/475/visp-${PV}.tar.gz"
 
 LICENSE="GPL-2"
@@ -17,16 +17,23 @@ IUSE="
 	opencv pcl png test tutorials usb v4l X xml +zbar zlib
 	cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3
 "
+REQUIRED_USE="motif? ( coin )"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
-	coin? ( >=media-libs/coin-4 virtual/opengl )
+COMMON_DEPEND="
+	coin? (
+		>=media-libs/coin-4
+		virtual/opengl
+	)
 	dmtx? ( media-libs/libdmtx )
 	gsl? ( sci-libs/gsl )
 	ieee1394? ( media-libs/libdc1394 )
 	jpeg? ( virtual/jpeg:0 )
 	motif? ( media-libs/SoXt )
-	ogre? ( dev-games/ogre[ois(+)] dev-libs/boost:=[threads] )
+	ogre? (
+		dev-games/ogre[ois(+)]
+		dev-libs/boost:=[threads]
+	)
 	opencv? ( media-libs/opencv:=[contribdnn(+)] )
 	pcl? ( sci-libs/pcl:= )
 	png? ( media-libs/libpng:0= )
@@ -35,20 +42,26 @@ RDEPEND="
 	X? ( x11-libs/libX11 )
 	xml? ( dev-libs/libxml2 )
 	zbar? ( media-gfx/zbar )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
+	zlib? ( sys-libs/zlib )"
+DEPEND="${COMMON_DEPEND}
 	v4l? ( virtual/os-headers )"
-RDEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
 	demos? ( sci-misc/ViSP-images )"
 BDEPEND="
 	virtual/pkgconfig
 	test? ( sci-misc/ViSP-images )
-	doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz )"
-REQUIRED_USE="motif? ( coin )"
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+		virtual/latex-base
+	)"
 
 S="${WORKDIR}/visp-${PV}"
-PATCHES=( "${FILESDIR}/${PN}-3.2.0-ocv.patch" "${FILESDIR}/${PN}-3.0.1-opencv.patch" )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.0-ocv.patch"
+	"${FILESDIR}/${PN}-3.0.1-opencv.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(
@@ -79,20 +92,19 @@ src_configure() {
 		"-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)"
 		"-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile visp_doc
+	cmake_src_compile
+	use doc && cmake_src_compile visp_doc
 }
 
 src_install() {
-	cmake-utils_src_install
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	cmake_src_install
 	if use tutorials ; then
 		dodoc -r tutorial
 		docompress -x /usr/share/doc/${PF}/tutorial
 	fi
-	cd "${BUILD_DIR}"
-	use doc && dodoc -r doc/html
 }