gentoo resync : 28.04.2021

4 files changed, 9 insertions, 51 deletions

diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index 9f3702d5037c..1bda9cf1f961 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,7 +1,6 @@
-AUX 0001-Fix-unwanted-automagic-activation-of-aalib-support.patch 1049 BLAKE2B 62afe72d6630420fa0068e652cdfbfde3c4e73541e53154627ad1cc23ad10f72ac85cf5ae317d2b0bf4127e474af2ca2268e57011eb835d57d88e2d6fa65a85f SHA512 252390cfb2533e9c15d1f881f6729660e2f6cd737a9257c5dec7f06f72f2960c3b5fe940e7fc774c862e6156f517357ca7b933822c23a466ef39fbfc2f14bf8c
 AUX gphoto2-2.5.26-s-cdk-cdk.h-cdk.h.patch 883 BLAKE2B cdbc9626b09610eb98cc32e04e68f6d4ea7d13709258ea6d23e9c1a800be1c7bb02589da354234ad523f43d9c93335eeaf8bbd42c26ffe8747a19fbd5fec3b2c SHA512 b2f3e36d151fefa78b63ba478efa17ab419a4f9d60c03a5951b149cb045495d4cd5e102a2977af6097f6d902449c5c56a8b1c0ac55eaa924f08931d08488b0ab
-DIST gphoto2-2.5.20.tar.bz2 790065 BLAKE2B 6e10aa468696bc3eff51aaa3e886ad2373997f91597e42b33777ac56bf668f918c2fa0cb8b70eb8f7cb45507e67c9cfc3a46a7408449ad35cc3b743daf74859d SHA512 0350c38c264e5ba858ee14952fbf6ad271e7fef05e3f5f8eb3d45102099ae435fec63b09881efa99af60d4e086a9c2f69be92a7e49617643ab13146a5e4655f3
 DIST gphoto2-2.5.26.tar.bz2 804521 BLAKE2B 20ddf39ad8668543864119cb1cf8dd5db4be5a773ccdd73efe434fe790ce001842512acf9a9f3ad08bad43460b42e4de257b2ca5561b5d7727f0703dba8f8098 SHA512 fbfc8d860db830be423271a0f569d51a296e9394884fe1a9e22eafd4ba0b7e4e68d86ba0391df81a64d4a4976b2644b2c39339532bd0e8e01f461b9a89cceb47
-EBUILD gphoto2-2.5.20.ebuild 1334 BLAKE2B 0cbad273e56fa22e1612ce973622b44995e1dc98bae1a17c7533a7c8b2df36d51ea61cad8fa4adad201778401f2540de7e7e5728ebfbbba38f7e6bf9c6305398 SHA512 90ec16fdf308d2c92ffa7397bb9789eaa65e1ee30ae853add5993e359ecefebe118a0fac09e2edfe08b4d0ee490b6bb6ef5ec90e01b557d3a92af93df622390a
-EBUILD gphoto2-2.5.26.ebuild 1269 BLAKE2B 6e365087fec2efbaf88972074ba136174487a138ce77639caca12fc8998a7f22265369818056743b93cd9ffb0b904e8d88d9edda8001e65e8a202dd08807a831 SHA512 f3d4fab65fecb86a4946b41c616810387179ef05d2bce7cf22642d685ff56a0019cc5c0ccc8a1f5de8cc78099ad77df19dfe29d15e9187f5126cb3eea274be47
+DIST gphoto2-2.5.27.tar.bz2 803602 BLAKE2B ad62abc3e91ce3cee1edd8f991ac84616144997bff425eef5cea10c340f9c98694ecda783ec5762f4583d05f38cfecbb7b47e0884c05f114f931a7af8b0a676d SHA512 47001025d3647ac809ab7fd2d9319a2966d72b00471f9a9c865dfad7091c7cac2e299ecd41dfc7997a6665cf2612d4317591964f51a9d336f848e8199e3928b7
+EBUILD gphoto2-2.5.26.ebuild 1266 BLAKE2B 0e2827440e0571d77bd1ba084b14d327c8692606aaeb17fade74de960fa97dc565d22b88af7d94496e61de793f0df0c38b730ecba263c29b61108675b2088973 SHA512 54de9e62b9c74b5d7cffc396c94ec09a63a401d75b464b9d1717dd70f70d7429dd4438eb6f81368c767283da0ac58630910b6ea49bfc9f3a022114bdd2bd4cb3
+EBUILD gphoto2-2.5.27.ebuild 1213 BLAKE2B 651dcb8ec325c67075b4fd85454034f4bd761827b1ebfa0c863e562b6c3e3e945a1ec79c2dc83c5651bb9f937f9ab497d6aa15909c2aff754ec333315552d92b SHA512 8fdcdd4dbd262bf9dc4a24b677c08cf129ac87e000e7a662af07f10a4ba6896588a6dbc2627e3fedc74d47a9afe8088882aaac5e29b60e84ae60862b777cb7fd
 MISC metadata.xml 329 BLAKE2B aa29f56b9c69aa63e45a1a7b6ba6e7a680f33227521a705f5273689774f4cb22d37cdd345b3aa9c43f254861b7fb1fca34d60ac9e1536d07a0806ab881b9e2e7 SHA512 d4107a001067b831a81094ad13f8ee531b52ac62e5dc0fd8810c3a7d85a069fe352bedb8275a34d3e1cb11c003405035dbfaf9b48270b5dbb02cd25772075ab7
diff --git a/media-gfx/gphoto2/files/0001-Fix-unwanted-automagic-activation-of-aalib-support.patch b/media-gfx/gphoto2/files/0001-Fix-unwanted-automagic-activation-of-aalib-support.patch
deleted file mode 100644
index 8e78578d71d1..000000000000
--- a/media-gfx/gphoto2/files/0001-Fix-unwanted-automagic-activation-of-aalib-support.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 45fb2a39195b5b31f61f376323ff78ab40940760 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 8 Dec 2018 16:19:35 +0100
-Subject: [PATCH] Fix unwanted automagic activation of aalib support
-
----
- configure.ac | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index a6068c9..c19fed9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -306,8 +306,9 @@ aa_msg="no (http://www.sourceforge.net/projects/aa-project)"
- try_aa=:
- have_aa=false
- AC_ARG_WITH([aalib],AS_HELP_STRING([--with-aalib],[Do use aalib for preview ASCII rendering]),[
--        if test x$withval = xyes; then
--                try_aa=:
-+        if test x$withval = xno; then
-+                try_aa=false
-+                aa_msg="no (not requested)"
-         fi
- ])
- if $try_aa; then
-@@ -323,8 +324,6 @@ if $try_aa; then
-                         AA_LIBS="-laa"
-                 fi
- 	])
--else
--        aa_msg="no (not requested)"
- fi
- AM_CONDITIONAL([HAVE_AA], [$have_aa])
- AC_SUBST([AA_LIBS])
--- 
-2.19.2
-
diff --git a/media-gfx/gphoto2/gphoto2-2.5.26.ebuild b/media-gfx/gphoto2/gphoto2-2.5.26.ebuild
index cb6815b02bf1..fe0d36cbfff3 100644
--- a/media-gfx/gphoto2/gphoto2-2.5.26.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.5.26.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="aalib exif ncurses nls readline"
 
 # aalib -> needs libjpeg
diff --git a/media-gfx/gphoto2/gphoto2-2.5.20.ebuild b/media-gfx/gphoto2/gphoto2-2.5.27.ebuild
index 0bd55c88a105..a48879567c57 100644
--- a/media-gfx/gphoto2/gphoto2-2.5.20.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.5.27.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit autotools
 
 DESCRIPTION="Free, redistributable digital camera software application"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="aalib exif ncurses nls readline"
 
 # aalib -> needs libjpeg
@@ -24,16 +24,12 @@ RDEPEND="
 	ncurses? ( dev-libs/cdk:0= )
 	readline? ( sys-libs/readline:0= )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	nls? ( >=sys-devel/gettext-0.14.1 )
 "
 
-PATCHES=(
-	# https://github.com/gphoto/gphoto2/pull/179
-	"${FILESDIR}"/0001-Fix-unwanted-automagic-activation-of-aalib-support.patch
-)
-
 src_prepare() {
 	default
 	if ! use exif ; then