media-libs/lensfun: update ebuilds from main tree

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Manifest-Sign-Key: 0x5FAF488FBEC1FE30
Signed-off-by: Markus Meier <maekke@gentoo.org>

3 files changed, 59 insertions, 46 deletions

diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index 0efa2bd..c475aa5 100644
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -3,20 +3,20 @@ Hash: SHA256
 
 DIST lensfun-0.3.2.tar.gz 784825 BLAKE2B c77cd6b2f1bda0313a980fbd3bbc7ca9ad5ed0b9777cce924f66da5de3974ccfc8939d054c7a7532508b6b0913e2d436a825a83916800b625ff2c552c96a0ae3 SHA512 9c6f546fa70e6dc692e66ef378447345be6d3383812934780d326d772d775c1918cbf3447cd91c067655044cf659025763bf47ba2d938a82a3c2de4d60127446
 DIST lensfun-0.3.95.tar.gz 2731561 BLAKE2B b5ea2b8b98c6178a93c969fafdd39f2495856dda9c7d61b7df43de89e0918bbe336d3552255b94c8d5edc03210f1f8907a73881ec7db71e46d77a3c2b746171b SHA512 27740d90a26be0d20a20f5ecab2991d85afd87ae96822025374f69bd0df0ddb825aee284f7861a34f0da6e57a8c021354244665852a6b77368918b6820d6b51e
-EBUILD lensfun-0.3.2-r1.ebuild 1432 BLAKE2B 9d92b2d0a28126b1d410f537f35c6eb662227006640ccc018dbaa0eb9bf0ae6246162bd9c8efa993aa5a42b450694c42dc0af882b6444c6ff88d63dd03bf25e6 SHA512 9aaaca0433f54c54b8daf87e2652289c172d81b493520805081c74be30a64161c7b8931390717e55a6a0d0972a1b1675e0546976e57fadd8e328731c259d5609
-EBUILD lensfun-0.3.95.ebuild 1353 BLAKE2B aa74e259305b962b9c36aeb3b6454c0100886f1129e3ed7d679e0af78dba32f8975c99f185ccd79be16200733f1aeab1cb3419695d1bc82f5f1e15fe6a9f7e70 SHA512 dd139d47263991cc6641e9945fe2a28a5e15050192609dd25a39a7ab3ebae5450f74e941977f304eb62053d1493a8663076319a8cdb9ff7a6ab0d2d89975a79b
+EBUILD lensfun-0.3.2-r1.ebuild 1425 BLAKE2B 37045036e950a9466e1ffcd3abf1d0c32f625d881ee13a5937b8f5e2a145fd4b6bf2ff64c827d246e8c5d7cdd2b08e918a3405de4257e21e4b1d7bc02fd8bf5e SHA512 dfea007fc8988f66f159c8aeaadea6292a37ea9d0f56f088cfd977a0bc9e744326265edd73742f0fa48e0753474a7256dd2813303fc90b0ca1460f4dc47ad3f4
+EBUILD lensfun-0.3.95.ebuild 1385 BLAKE2B 36b22c92f1d61a9230ff975b33606c54ff1ae13c6bfd7d01159301901f63106e1fd3ab154c89232933a32a5f6ce66f200f6703e30bec9fdb4ed5cf7fcf89eb3f SHA512 242a7c5a32c0e5e4b1c5a2aea37d4a2eb0906154da53b678682091f375a3595351f608ff73a3977ff78e66a9b2376cf467ccdacd5a91ac4a2c0edd8fdb45b567
 MISC metadata.xml 612 BLAKE2B e0e745eb0d418ebbd7461736d92c432b48d88823142bc2bebf9765c3b9270124fd4a9718e384fd46acd8667bbb602d10c74435acaedfa0449e3890a186671ea0 SHA512 f61a2e3333e7f8fa5f3a64f93eabccac5bfd6587a195c019a3f2ed786f2d996412921a8308fc48e70b4347f230704b8fc18f0f7274a5e00ab68e0e5667640faa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGTBAEBCAB9FiEEO7vfxj/1NCgzMht7hGSR/kUngVoFAl6bXj9fFIAAAAAALgAo
+iQGTBAEBCAB9FiEEO7vfxj/1NCgzMht7hGSR/kUngVoFAl7bhFRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNC
 QkJERkM2M0ZGNTM0MjgzMzMyMUI3Qjg0NjQ5MUZFNDUyNzgxNUEACgkQhGSR/kUn
-gVqOzgf/WCmFhzjaQbiykzjDEFQDhOpYZej/flMquEE+4n3sJA3q0io6/5CaKnat
-XvYmeKCwMyuPcS5b4uIm1227p5kQuOQJyyFmTyuF9ApbhFMQSlrhJAptYkH5UjJj
-hO7pVpUUvvJRuR6qy4unGsxnTNdAvgDIbr9gihDa6W0+liuKnbSpCSnfRQn2sV/o
-Od5/gBUfmpyTMxov/U1utHBW42+pNqc3X+Bvwh4iZX+AFDnzA46iTPKOIrxtbMM5
-tNDV/0NB3TdVLZVjzKIcP6FT28WJ4kIt3qSyALUckuUpxnsCoGXOR1mFv4k+h8ZB
-4m8Jm+GehEbnDG8VYCdNzmH1kswOAg==
-=EI4e
+gVpQRAf+K6xNXoiFRd+s/T16ePgTY/rxaxbyJnh4tBj4VS9oK7ExOidPjlvXPm7q
+9S1YAFOPFdICpcjMPDrONWKMmDbU5tCZZP0ek/x1B6TBzQI9o+TrbjwSJQXnmBUz
+LppiUBqwAWsGhyWS21y9XravJqwwPXr21vrdCIuEboUDeUXNs0uvjYjHtZubdyU7
+BC0VhZoIhsGQEKe6Gtt2MjUgXHIcKi+HS5zXzbx3F+nTmN8oujxbQM5R1iYjSa1H
+jltJrqAtrQ6i50g7iaF1Iz3qkeWyUJPlBFUa5ce19LQfHlvZTr2yV5oqfDYKfyiA
+KPjjl23Uu49QvRYR47v3J0gucfn+vg==
+=OAcO
 -----END PGP SIGNATURE-----
diff --git a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild b/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
index be3d497..528d11d 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
 }
diff --git a/media-libs/lensfun/lensfun-0.3.95.ebuild b/media-libs/lensfun/lensfun-0.3.95.ebuild
index b9039ad..aa7ff1a 100644
--- a/media-libs/lensfun/lensfun-0.3.95.ebuild
+++ b/media-libs/lensfun/lensfun-0.3.95.ebuild
@@ -1,39 +1,42 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-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="http://lensfun.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="https://lensfun.github.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning.
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+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"
 
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.40
-	media-libs/libpng:0=
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+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)
 		-DBUILD_LENSTOOL=ON
 		-DBUILD_STATIC=OFF
 		-DBUILD_DOC=$(usex doc)
@@ -41,13 +44,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
 }