gentoo resync : 28.04.2021

3 files changed, 15 insertions, 15 deletions

diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 294c919b9e36..3bcc816e3aff 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,5 +1,5 @@
-DIST libgphoto2-2.5.22.tar.bz2 7169810 BLAKE2B d4947a4b5cf4a6f48ec619e0531ab29a035143031529436f566ade26d11b354328dc70e5d20533a3c023fd8b87afd0db9d85617fea9d06ee433137da6a1d9413 SHA512 8f02c460324c115810f56a9408ecba7aabb801947249c1ee79f0f0a1db1d785d34992508232bad7af112aed2dfc6b213365cee694dd0e7d5edf4072c63fa01cb
 DIST libgphoto2-2.5.26.tar.bz2 7572381 BLAKE2B 671ef19b1d427a4c9d31bb383b4b0513a6423780910a2fabbcf9d9f45e9060a833336fcda0ccc6456068a702e94f1fffeece41a6f08b882f4e1e65b317e69c52 SHA512 d05a559447ac867f4826d2e20b83831dc4b4776c1e3edc9de0867050a4d39dc45b25a33ec73806282e16f75adb1dded3b59fe428bdb1dde4365c12d7af244cec
-EBUILD libgphoto2-2.5.22.ebuild 6170 BLAKE2B a83709b54295c4994ca246aca207bc5376688155cc29f3d6df086718a7f0dde4db7e9bcb2aa3c686b76ead993e806b1b59dc9754292a6c287eb4d237e9d5f365 SHA512 fcc78f218b711f4b363cd3cfa72bb6dd83ccee3e7656e4382a8160021269a4405429037d387bf0645779603430fe292aa8aed14cd10ad54565ae85c4af9dfa28
-EBUILD libgphoto2-2.5.26.ebuild 6156 BLAKE2B 01413add0b6e6fe0ba35b79109d2e2fbb2a9036410aa3deebd7dc7a4f890c0abe2d801e4436756215764becb14ed55862854f283c67755993d708c980db17293 SHA512 a5dbad3cf94cb0a4c0b78ee0f0f506033fd18dcf6318c3fd5d9c31725de7dfa24796cf91e6acc799d9ada7e5def8e9a70ccd6c6b3e6bb6400c0542ab07ab2d0e
+DIST libgphoto2-2.5.27.tar.bz2 7540660 BLAKE2B 6fa2d54497e2162b8e9a4be17a8fe74c6e13ccf15d8fe873649c4285188d86e45cbe8359572bcfd252f1abce28ac327d3333fcb62ad958e6f992c9e11fff4fb1 SHA512 7cc82977e62034c539c7e62bff62ee61a299d3adb0c42e88b8e5521e75eedbc22437b9520af8a4bbd7dc0639ce5a8a10b1f5e5e8075e9b73a566da9061c958f8
+EBUILD libgphoto2-2.5.26.ebuild 6151 BLAKE2B 98707be43724f61f931e84fbd9da9d07afd3447ddb0403a98c64fdf35ad780a509bf6c6028c9cad7063497c249869a97002d7b11a08772e661216ba8ef99584a SHA512 b0296444ffc649971aa4c7910cac202ceffc6b162a78e626382f7760f055c1101645877045aa8d23ffddd31b7098d2c4644ebc003390268a2e0a87086aed4cd7
+EBUILD libgphoto2-2.5.27.ebuild 6158 BLAKE2B 7ccc8bc4e4eedcd708591cbe0db5427dc88cb4aad27ea8d7b45b9ff41b4c29dc02ffb0a56ab06dc4eb276ec0a17945fcaff5f49827050d443aa7695ac2ab2a9b SHA512 e26b29401d16ba123a8509bbc44ffc0d0b946fdc462ab88c0b4d3d14b9b143d009f3301de86a6a6e2127ff8d4112928db125c6462dfd6ed1cae601d891d74d5d
 MISC metadata.xml 400 BLAKE2B 2c435dd678051ca73f903a55574f62c9f6b71c17717411f0b6c201e80694d3efd88520d010898725197e9915ed0a5d486a9132dd4a33bb4f5285c3812f114e95 SHA512 c4cb0fe1a6bb6e60ddac16dfaa17d7131dae260ee6bcecdea7fee2e2cecee5b3c1ffbe44ac36e7f48af1085fe0775c47c46b05be5e074a0893fc2fcb1548d632
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.26.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.26.ebuild
index 22c68ebd81ab..195c78aeac27 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.26.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.26.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples exif gd jpeg nls serial"
 
 # By default, drivers for all supported cameras will be compiled.
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.27.ebuild
index d45dbc32ba06..51ddafc86c55 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.27.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO
 # 1. Track upstream bug --disable-docs does not work.
 #    https://sourceforge.net/p/gphoto/bugs/643/
 
-EAPI=6
-inherit eutils ltprune multilib multilib-minimal udev
+EAPI=7
+inherit multilib multilib-minimal udev
 
 DESCRIPTION="Library that implements support for numerous digital cameras"
 HOMEPAGE="http://www.gphoto.org/"
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples exif gd jpeg nls serial"
 
 # By default, drivers for all supported cameras will be compiled.
@@ -60,9 +60,9 @@ RDEPEND="
 	gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,${MULTILIB_USEDEP}] )
 	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
 	serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[${MULTILIB_USEDEP}] )
-	!<sys-fs/udev-201
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/gtk-doc-am
 	sys-devel/flex
 	>=sys-devel/gettext-0.14.1
@@ -154,14 +154,14 @@ multilib_src_compile() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files --modules
+	find "${ED}" -name '*.la' -delete || die
 
 	einstalldocs
-	dodoc TESTERS MAINTAINERS HACKING
+	dodoc TESTERS MAINTAINERS
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/README examples/*.c examples/*.h
+		docinto /usr/share/doc/${PF}/examples
+		dodoc examples/README examples/*.c examples/*.h
 	fi
 
 	# FIXME: fixup autoconf bug #????
@@ -201,7 +201,7 @@ pkg_postinst() {
 		elog "if you want to be able to access your camera."
 	fi
 
-	local old_udev_rules="${EROOT}"etc/udev/rules.d/99-libgphoto2.rules
+	local old_udev_rules="${EROOT}"/etc/udev/rules.d/99-libgphoto2.rules
 	if [[ -f ${old_udev_rules} ]]; then
 		rm -f "${old_udev_rules}"
 	fi