[gentoo-commits] repo/gentoo:master commit in: media-libs/lensfun/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     381d06c87ed0cae4d3ad12073331eb0d940a0190
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 25 11:41:20 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 25 12:37:41 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=381d06c8

media-libs/lensfun: EAPI-7 bump, use cmake.eclass, python3_8

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

 media-libs/lensfun/lensfun-0.3.2-r1.ebuild | 38 +++++++++++++++++-------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild b/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
index be3d497432b..528d11db736 100644
--- a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
+++ b/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
@@ -1,11 +1,10 @@
 # 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} )
-
-inherit python-single-r1 cmake-utils
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit python-single-r1 cmake
 
 DESCRIPTION="Library for rectifying and simulating photographic lens distortions"
 HOMEPAGE="https://lensfun.github.io"
@@ -15,26 +14,29 @@ LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning.
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc cpu_flags_x86_sse cpu_flags_x86_sse2 test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 RESTRICT="!test? ( test )"
 
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.40
-	media-libs/libpng:0=
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}
+BDEPEND="
 	doc? (
 		app-doc/doxygen
 		dev-python/docutils
-	)"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+	)
+"
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.40
+	media-libs/libpng:0=
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
 
 DOCS=( README.md docs/mounts.txt ChangeLog )
 
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
-		-DCMAKE_INSTALL_LIBDIR="${EPREFIX}"/usr/$(get_libdir)
 		-DSETUP_PY_INSTALL_PREFIX="${ED}"/usr
 		-DBUILD_LENSTOOL=ON
 		-DBUILD_STATIC=OFF
@@ -43,13 +45,17 @@ src_configure() {
 		-DBUILD_FOR_SSE2=$(usex cpu_flags_x86_sse2)
 		-DBUILD_TESTS=$(usex test)
 	)
-
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
 	mkdir -p "${T}/db/lensfun" || die
 	cp data/db/* "${T}/db/lensfun/" || die
 
-	XDG_DATA_HOME="${T}/db" cmake-utils_src_test
+	XDG_DATA_HOME="${T}/db" cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+	python_optimize
 }