4 files changed, 2 insertions, 91 deletions
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index 1bda9cf1f961..d1760c4addca 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,6 +1,3 @@
-AUX gphoto2-2.5.26-s-cdk-cdk.h-cdk.h.patch 883 BLAKE2B cdbc9626b09610eb98cc32e04e68f6d4ea7d13709258ea6d23e9c1a800be1c7bb02589da354234ad523f43d9c93335eeaf8bbd42c26ffe8747a19fbd5fec3b2c SHA512 b2f3e36d151fefa78b63ba478efa17ab419a4f9d60c03a5951b149cb045495d4cd5e102a2977af6097f6d902449c5c56a8b1c0ac55eaa924f08931d08488b0ab
-DIST gphoto2-2.5.26.tar.bz2 804521 BLAKE2B 20ddf39ad8668543864119cb1cf8dd5db4be5a773ccdd73efe434fe790ce001842512acf9a9f3ad08bad43460b42e4de257b2ca5561b5d7727f0703dba8f8098 SHA512 fbfc8d860db830be423271a0f569d51a296e9394884fe1a9e22eafd4ba0b7e4e68d86ba0391df81a64d4a4976b2644b2c39339532bd0e8e01f461b9a89cceb47
 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
+EBUILD gphoto2-2.5.27.ebuild 1209 BLAKE2B f1f3547bffd426b36772ef930f7294f65f9877c23d4d7458185b75a1445dda1efd4a0ddabdee591354cb6ef5bbc9e2f795bf576f5ea4c1c49a44ff3d2a31ed4f SHA512 428e2f4abf2a68d3ed4db3be9041eca736ce0073e8d611e6f5bf69cc0b2afa6860861354c5bdb27f9b38c0284a3e334ad808f8c94f973fb3b7dd8463a70a620b
 MISC metadata.xml 329 BLAKE2B aa29f56b9c69aa63e45a1a7b6ba6e7a680f33227521a705f5273689774f4cb22d37cdd345b3aa9c43f254861b7fb1fca34d60ac9e1536d07a0806ab881b9e2e7 SHA512 d4107a001067b831a81094ad13f8ee531b52ac62e5dc0fd8810c3a7d85a069fe352bedb8275a34d3e1cb11c003405035dbfaf9b48270b5dbb02cd25772075ab7
diff --git a/media-gfx/gphoto2/files/gphoto2-2.5.26-s-cdk-cdk.h-cdk.h.patch b/media-gfx/gphoto2/files/gphoto2-2.5.26-s-cdk-cdk.h-cdk.h.patch
deleted file mode 100644
index b68e618cc018..000000000000
--- a/media-gfx/gphoto2/files/gphoto2-2.5.26-s-cdk-cdk.h-cdk.h.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://bugs.gentoo.org/679332
-
-diff --git a/configure.ac b/configure.ac
-index ed76a66..b0db85c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -141,7 +141,7 @@ AC_ARG_WITH([cdk-prefix],AS_HELP_STRING([--with-cdk-prefix=PREFIX],
- if $try_cdk; then
-         CPPFLAGS_save="$CPPFLAGS"
-         CPPFLAGS="-I$cdk_prefix/include $CPPFLAGS"
--        AC_CHECK_HEADER([cdk/cdk.h], [
-+        AC_CHECK_HEADER([cdk.h], [
-                 have_cdk=:
-                 AC_PATH_PROG([CDK_CONFIG], [cdk5-config])
-                 if test -n "${CDK_CONFIG}"; then
-diff --git a/gphoto2/gphoto2-cmd-config.c b/gphoto2/gphoto2-cmd-config.c
-index 360fd61..c801604 100644
---- a/gphoto2/gphoto2-cmd-config.c
-+++ b/gphoto2/gphoto2-cmd-config.c
-@@ -29,7 +29,7 @@
- 
- #include <gphoto2/gphoto2-widget.h>
- 
--#include <cdk/cdk.h>
-+#include <cdk.h>
- 
- #ifndef MAX
- # define MAX(a, b) ((a) > (b) ? (a) : (b))
--- 
diff --git a/media-gfx/gphoto2/gphoto2-2.5.26.ebuild b/media-gfx/gphoto2/gphoto2-2.5.26.ebuild
deleted file mode 100644
index fe0d36cbfff3..000000000000
--- a/media-gfx/gphoto2/gphoto2-2.5.26.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="Free, redistributable digital camera software application"
-HOMEPAGE="http://www.gphoto.org/"
-SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~sparc x86"
-IUSE="aalib exif ncurses nls readline"
-
-# aalib -> needs libjpeg
-RDEPEND="
-	dev-libs/popt
-	>=media-libs/libgphoto2-2.5.17:=[exif?]
-	aalib? (
-		media-libs/aalib
-		virtual/jpeg:0 )
-	exif? (	media-libs/libexif )
-	ncurses? ( dev-libs/cdk:0= )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.14.1 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-s-cdk-cdk.h-cdk.h.patch
-)
-
-src_prepare() {
-	default
-	if ! use exif ; then
-		# Remove tests that require EXIF to pass, bug 610024
-		rm "${S}"/tests/data/test0{35,36,37,40}* || die
-	fi
-	# Leave GCC debug builds under user control
-	sed -r '/(C|LD)FLAGS/ s/ -g( |")/\1/' \
-		-i configure{.ac,} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with aalib) \
-		$(use_with aalib jpeg) \
-		$(use_with exif libexif auto) \
-		$(use_with ncurses cdk) \
-		$(use_enable nls) \
-		$(use_with readline)
-}
diff --git a/media-gfx/gphoto2/gphoto2-2.5.27.ebuild b/media-gfx/gphoto2/gphoto2-2.5.27.ebuild
index a48879567c57..7e2fd259acb4 100644
--- a/media-gfx/gphoto2/gphoto2-2.5.27.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.5.27.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