gentoo resync : 20.03.2022

3 files changed, 11 insertions, 9 deletions

diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index e048bd41bebc..8142d16696cc 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,6 +1,6 @@
 AUX 2.5.28-configure-Allow-with-jpeg-yes-argument-again.patch 6423 BLAKE2B ef91e230e39cb4a57db00b858f7375c1e2d62dd390373b2d70ba9ec4f2950c7a2ccc753ce467de9569c2888f2cd2c4d8f9333edd90a905a98b76b091f1184e82 SHA512 4bfe532bf3148627146310b4ab21814042402a7f0c78411ca5af2d992102d6be82b9675ba90df4c427843faede90bcdbe6e78b700cb4c83e7a2ef3e0b9371465
-DIST libgphoto2-2.5.27.tar.bz2 7540660 BLAKE2B 6fa2d54497e2162b8e9a4be17a8fe74c6e13ccf15d8fe873649c4285188d86e45cbe8359572bcfd252f1abce28ac327d3333fcb62ad958e6f992c9e11fff4fb1 SHA512 7cc82977e62034c539c7e62bff62ee61a299d3adb0c42e88b8e5521e75eedbc22437b9520af8a4bbd7dc0639ce5a8a10b1f5e5e8075e9b73a566da9061c958f8
 DIST libgphoto2-2.5.28.tar.bz2 7399434 BLAKE2B 3feed613fd84cbea6109afa2ce643ad8be9b3df14cf332cbd93a8260d7082756f5278578b4052a289b954751a82a2f62583ea327ce96255bd653912130319bfc SHA512 5898d35a991361a6cc6824cb88aab79326b59e4080b5e885e1619667d11c4a92d24a1d3fbdbd6af49696508ace1eba1b17bf2f406c72dc9ad69bcf019bc86eec
-EBUILD libgphoto2-2.5.27-r1.ebuild 6138 BLAKE2B 83d032cea7648fd9abab34677882082dc9589fa568e6d3451e48c63a8e35b774a41071ccd0c6249b7c3efb2d28cc4fc411827a8bd7b5a5aeeeab5f6730fdf336 SHA512 7f313d046bc0a3ae0cddb1b09b6b5ea472d14a741305bfdc9427872e8b1bcf221793ee20d0e4c86fc1bc83d61e614298efe96cf20da6e032d9d1c73e923e3256
-EBUILD libgphoto2-2.5.28.ebuild 6270 BLAKE2B 0bc7d864dc6e6942e52ca5ee014938688b5a2d47092d3367bc69fb2db842726604497ec6acbc8227a846239ce4c620c86806d76881b90e9a82d7ffcae1a36b15 SHA512 9228db88081ea83e025bbb5b800e6a2e2a36824a629a8263c5dd0dc0687bf92a547b457f820047c65abec6cfedb21f5fca97be06afd5340975e6e5aed278acac
+DIST libgphoto2-2.5.29.tar.xz 5875684 BLAKE2B a0bc48b95ecff3c7f157b7baee18bc3ad86d376c9adc6f7eedd2f8cea40434cc97598cad49ebc1e4683492f9eb3e5b3494de3112bb740d2ccd8e2c55cf4ff1ed SHA512 f8e3dbea58fa6f19a100ee319d5561387a54e8701a19d034bc7d6fe474dc6e4f21fccc4b6c11346df4fdc811666d49ea0b9a2b5b67aab00acd5a1e94d9259c94
+EBUILD libgphoto2-2.5.28.ebuild 6263 BLAKE2B 90b8acfb93c0237076ad1bd5a03ef12a472b1598f9dc4db35472209fb6186c7c7f786531063c6a250de68d8a2e3aae7b797b1d19e5303a2ad972a7d0186f7813 SHA512 99b679a74ff8883a17619b327332c5db56ffa23532d1e4807a2c39f5514059ce513eef299458fabd8eade9bd9903fe3bbda1046bf1cb00f0212c759ed5651f79
+EBUILD libgphoto2-2.5.29.ebuild 6184 BLAKE2B fc31faae2c9b70eff9069f5c86dabd7439a414936179dbcb8e39071c267d3dabcd2e1091320751f9579266fb74eb8a1bac7615af33743dc8851a5f904e69bd61 SHA512 b46e1f8c793545c824e6fbb7c8e12f67fe1bd57b67eac969830c1766504b67c1c876ea1d960a7b0cb9272b1ed8302a2372a9ac96cf8ee24aa3382df34f3b8bf8
 MISC metadata.xml 401 BLAKE2B 114b82879f1ab00f4b6b0784a675fc50ba303fee05355f5d6edf32e3f5d3e3015f43e8f300fb9ff45b9dc9100a30431d0458ea8fe1c868090ad739e83587053e SHA512 87a96a6120a0a29c1b05aa43c1548cea9d7fcf0ff3c5815c3369dac7545c8ca05f5a7795f870566bd264cb2873fdf6a79a7dea92d318fca8078d8ec6d8c6a2e3
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.28.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.28.ebuild
index 21661ad1025e..cac1cf938107 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.28.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.28.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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~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.27-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.29.ebuild
index 5ef1555d66f1..6e421c8a0712 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.27-r1.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.29.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO
@@ -6,18 +6,18 @@
 #    https://sourceforge.net/p/gphoto/bugs/643/
 
 EAPI=7
-inherit multilib multilib-minimal udev
+inherit autotools multilib-minimal udev
 
 DESCRIPTION="Library that implements support for numerous digital cameras"
 HOMEPAGE="http://www.gphoto.org/"
-SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.xz"
 
 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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~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.
@@ -89,11 +89,13 @@ src_prepare() {
 		|| die "examples sed failed"
 
 	sed -e 's/sleep 2//' -i configure || die
+
+	eautoreconf # For configure.ac patching
 }
 
 multilib_src_configure() {
 	local myconf
-	use doc || myconf=( ac_cv_path_DOXYGEN=false )
+	use doc || myconf=( ac_cv_path_DOXYGEN=no )
 
 	# Upstream doesn't default to --enable-option-checking due having another
 	# configure in libgphoto2_port/ that also needs to be checked on every bump