3 files changed, 2 insertions, 53 deletions
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index da33315a8488..078ec667770e 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -3,6 +3,5 @@ AUX libexif-0.6.21-CVE-2017-7544.patch 1060 BLAKE2B 130b95e5f4f44402385bb6825e87
 AUX libexif-0.6.21-CVE-2018-20030.patch 4629 BLAKE2B 574f95d21507887851da9486cbd8d263ad25e1df59dd8020f1e4b640d5cc4852667c689993e67a7d705c748b521a46cd5e187a99c9d92787bc9758631c8d7741 SHA512 c49437dffebb901209748b884d67192d2b77072b2fb96c77b95f398d3c68272b14ac4a6ddd33111df8dac49cd6ab8f38e230f8f3f0a842d4b40f2fd38f141a1d
 AUX libexif-0.6.21-fix-C89-compatibility-issue.patch 1138 BLAKE2B 5b3923a7fd82fc4c0f267684c67f329b4ff2dc43f9d088acd4a352a9f3c329b08c338c51c77b3f55654e5cf2dbb2f7ba317b10de7e963ccc7b4c1989332fd544 SHA512 a91c2f12141b7a0c399f08f038746ca44cbc468776e5b34672d38921b8a131df3938e400fea04d20c323d6d1363f8fb176a4abac7be4b1ea9bb9694aa902f19e
 DIST libexif-0.6.21.tar.bz2 1368435 BLAKE2B 151e3ddcdd45759fd70be91db27511f48a9b7d5de72c8af510e5a231e2f053f8b5d62d1269a1206e419461b07fb723788492604f1f1142edcb5ab7a0876dd307 SHA512 4e0fe2abe85d1c95b41cb3abe1f6333dc3a9eb69dba106a674a78d74a4d5b9c5a19647118fa1cc2d72b98a29853394f1519eda9e2889eb28d3be26b21c7cfc35
-EBUILD libexif-0.6.21-r2.ebuild 1270 BLAKE2B f8753e55e91ca4e35e390c326c14945a288b81dcb717476594d6299f126455de5fc5e3f1095b340140ecea93453dffff37fdf6f4061d658d28774d67de00ec65 SHA512 f1a6e41ea987e51f36e70e4078deddcbedc28c7c8931c0b8ce6e5e68fc8411a8f23319c05e6dc178d1799990ea42d223ab587452d4329445ab1605fc47ed34f6
-EBUILD libexif-0.6.21-r3.ebuild 1374 BLAKE2B 8b31dff514504dbacb510bb5a15c14064b43f233134d4ed4023d442f30076a09e04f3c8c899f045d71097f5577d8f24a4cf50f504523255cb591bb832c8fe3f0 SHA512 597660c2235e5fdcc86abcb4ed6cc7ceb960f1d7f68a5b28cce7eb6cf2ad6131df1fb3621cb7eb9953f8bf3b7c6e695ab22054cdef91ba872c1475aac77e8a07
+EBUILD libexif-0.6.21-r3.ebuild 1365 BLAKE2B f423574c76bdcbd9c9f8eb5e7716371280dc3422c2ccc60bc8aff7d74c1f4e524c763b64b04048310650b75bbd3a669ff24b6528943942a24c99dcdaff8e38e6 SHA512 328ef707b3f1d555e071edab2168b351f7ac3b4713dda375d9bb471a6b74224b2edc4bdff632e7f31d6e715679dbc62f40fe3662132586bf162266dd7540e919
 MISC metadata.xml 336 BLAKE2B 7f77063db7c0cf51903da446071dff6d4dccf66e552dd1229f01b79ab7716d02adcb146f755971d0fe96c2a04bacbd082f606c4023e6e98f9c502a3f8eda7416 SHA512 8a6e3d7c973692a37f57ce34136c863e6ad14efd064c42ea0be6c14d93beec3c7ae36ed44afd6d2454ab29f4cb633c097a0c3b2ea5c019bf06df4f306dbfced0
diff --git a/media-libs/libexif/libexif-0.6.21-r2.ebuild b/media-libs/libexif/libexif-0.6.21-r2.ebuild
deleted file mode 100644
index 6295d63c4a05..000000000000
--- a/media-libs/libexif/libexif-0.6.21-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="Library for parsing, editing, and saving EXIF data"
-HOMEPAGE="https://libexif.github.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc nls static-libs"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.13-pkgconfig.patch
-	"${FILESDIR}"/${P}-CVE-2017-7544.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e '/FLAGS=/s:-g::' configure || die #390249
-	elibtoolize # For *-bsd
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf \
-		$(use_enable doc docs) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -delete || die
-	rm -f "${ED}"/usr/share/doc/${PF}/{ABOUT-NLS,COPYING} || die
-}
diff --git a/media-libs/libexif/libexif-0.6.21-r3.ebuild b/media-libs/libexif/libexif-0.6.21-r3.ebuild
index b9af2c870d3c..77ed7b4ce609 100644
--- a/media-libs/libexif/libexif-0.6.21-r3.ebuild
+++ b/media-libs/libexif/libexif-0.6.21-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="doc nls static-libs"
 
 RDEPEND="nls? ( virtual/libintl )"