gentoo resync : 20.10.2021

3 files changed, 2 insertions, 57 deletions

diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index 5f5c26c68949..c2b1b5445d06 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -1,6 +1,4 @@
 AUX libexif-0.6.13-pkgconfig.patch 255 BLAKE2B 397c0e88f951628e697cdd749936b3e4e676bccac2fb2bff2553b12d5978f03719175b9d25fa66bc06dd459e0f6671af48276d449de9b029202dfe7a3622fc85 SHA512 859c6b5bf179f315184f5f34a986761f113786792ff2e13461cf64ccf394dd2d7bd97215db0651d52819533cb918652d7eae9f18b2a913dd9ccf390cdf3adb65
-DIST libexif-0.6.22_p20201105.tar.gz 1111695 BLAKE2B d4eb856ad950f8ae068a27088e54311789c7b8b646dd1c4851ef637b626015119b3b5ac9cbac58f9c79c37c07ba7d3e9a9a67dc52715187495aa824846ec2335 SHA512 5472bf2531d9147be5c6e681d0257325f6609d6aa3935243f887df0ab32e51242ff9d853fc2c183cf5c2709c89d5c52d8fecb9144343d6f959f4bed1062098ab
 DIST libexif-0.6.23.tar.gz 2764684 BLAKE2B 517eaadc71b6ccaa7899b89b770a14fc051f365c728d5518fe6f0c05aa14690eaa6a33323c9305d02398df6ba2fceb806537202224a3c00018f7bcf835a3ff84 SHA512 c382b5f36e4fc1501664e3bad18553abb1b18f752f93111af5081e996bcc37b425ac9f0b0e1ffd7145270254ac44a4adb7875d5b0d8379113da6162b17442e23
-EBUILD libexif-0.6.22_p20201105.ebuild 1444 BLAKE2B 06eaa6fd9f35df9057b57c1b25b30358a3b295e4f365e97e7beaea46dde17dff5a0592e225c746675b2dc6e4e884a64346fc704119769a35a267ba5fc772253a SHA512 5fe208d86dfc950a0cf7b529654de444ed4513d4c38e7925756c74ccc0089d3803ae231705e25a6a25f92850c0f505b324663380e9d5e847c8e22d2c6dced904
-EBUILD libexif-0.6.23.ebuild 1266 BLAKE2B 9e985acf0340b10c89b5e28952d50b6fc581f8c4aaad1f999b3b27b7c3d23fca2bcf0eb16977025a51363ed7dff47a5583b6a342348f9d75c6161df403257c02 SHA512 41ab866895aac46841c18a3fe73fcf6d207fb22f1e4c64830713d383e0ac64337636427e4b0b0fec4b573d69bf45646e46e10728db7ec671ea34cfddc5535444
+EBUILD libexif-0.6.23.ebuild 1259 BLAKE2B 37fbb51a58132fd41e93dd1bb739027b333c685fbf359936d706a4835a682f289238905fda934e3d92ac966ae4e997c7a5e179fc8e3fde1fd03163824e309d4e SHA512 06aba07cca26cbe47f175ca566004972cb6de84b4396bd74c37858351057d8bb4421f094e9d664981740873234d4a7d3bfd97bcbd6201bb166b14ff12ee53c40
 MISC metadata.xml 453 BLAKE2B a6539b21b1ea55bbd09ab7385ae771673a802a3dcc41d637fae7ad50f2f67aecc2c253cc77c86d80df83649972d8619f9e18e8b9d7c6259ecc1326617be8ffff SHA512 44b76d19654a28cfaedbd9627d9556554846ce48f142cdfd67753f395547cb3717772cdef6935a641354a5621c560a0b7d276dac4ab62d467d42946a8327e0cc
diff --git a/media-libs/libexif/libexif-0.6.22_p20201105.ebuild b/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
deleted file mode 100644
index 221fff98bbf9..000000000000
--- a/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-COMMIT="9266d14b5ca4e29b970fa03272318e5f99386e06"
-DESCRIPTION="Library for parsing, editing, and saving EXIF data"
-HOMEPAGE="https://libexif.github.io/"
-SRC_URI="https://github.com/libexif/libexif/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-#SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PN}-${PV//./_}-release/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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
-)
-
-src_prepare() {
-	default
-	sed -i -e '/FLAGS=/s:-g::' configure.ac || die #390249
-	# Previously elibtoolize for BSD
-	eautoreconf
-}
-
-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 "${ED}" -name '*.la' -delete || die
-	rm -f "${ED}"/usr/share/doc/${PF}/{ABOUT-NLS,COPYING} || die
-}
diff --git a/media-libs/libexif/libexif-0.6.23.ebuild b/media-libs/libexif/libexif-0.6.23.ebuild
index f8e8ac1b6299..c195ebb72b5f 100644
--- a/media-libs/libexif/libexif-0.6.23.ebuild
+++ b/media-libs/libexif/libexif-0.6.23.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="doc nls static-libs"
 
 RDEPEND="nls? ( virtual/libintl )"