libexif: upgraded package to upstream
Upgraded media-libs/libexif to version 0.6.22_p20201105 on amd64
BUG=chromium:1140482
TEST=CQ passes
Change-Id: I11451455f071404d955e3686df46d7d0f9fc5fa2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/2582591
Reviewed-by: Alex Klein <saklein@chromium.org>
Commit-Queue: Allen Webb <allenwebb@google.com>
Tested-by: Allen Webb <allenwebb@google.com>
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index ee3abdd..bc21d72 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -1 +1 @@
-DIST libexif-0.6.21.tar.bz2 1368435 RMD160 979f06096b7271d8713c1766e0ad5dfabb06c531 SHA1 a52219b12dbc8d33fc096468591170fda71316c0 SHA256 16cdaeb62eb3e6dfab2435f7d7bccd2f37438d21c5218ec4e58efa9157d4d41a
+DIST libexif-0.6.22_p20201105.tar.gz 1111695 BLAKE2B d4eb856ad950f8ae068a27088e54311789c7b8b646dd1c4851ef637b626015119b3b5ac9cbac58f9c79c37c07ba7d3e9a9a67dc52715187495aa824846ec2335 SHA512 5472bf2531d9147be5c6e681d0257325f6609d6aa3935243f887df0ab32e51242ff9d853fc2c183cf5c2709c89d5c52d8fecb9144343d6f959f4bed1062098ab
diff --git a/media-libs/libexif/libexif-0.6.21.ebuild b/media-libs/libexif/libexif-0.6.21.ebuild
deleted file mode 100644
index ea5e372..0000000
--- a/media-libs/libexif/libexif-0.6.21.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/libexif-0.6.21.ebuild,v 1.8 2012/11/07 19:03:58 grobian Exp $
-
-EAPI=4
-inherit eutils libtool
-
-DESCRIPTION="Library for parsing, editing, and saving EXIF data"
-HOMEPAGE="http://libexif.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="*"
-IUSE="doc nls static-libs"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- nls? ( sys-devel/gettext )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.6.13-pkgconfig.patch
- sed -i -e '/FLAGS=/s:-g::' configure || die #390249
- elibtoolize # For *-bsd
-}
-
-src_configure() {
- econf \
- $(use_enable static-libs static) \
- $(use_enable nls) \
- $(use_enable doc docs) \
- --with-doc-dir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- prune_libtool_files
- rm -f "${ED}"/usr/share/doc/${PF}/{ABOUT-NLS,COPYING}
-}
diff --git a/media-libs/libexif/libexif-0.6.22_p20201105.ebuild b/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
new file mode 100644
index 0000000..887b749
--- /dev/null
+++ b/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 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/ https://github.com/libexif/libexif"
+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="*"
+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="${ED}" 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/metadata.xml b/media-libs/libexif/metadata.xml
index 09f8547..f8874c5 100644
--- a/media-libs/libexif/metadata.xml
+++ b/media-libs/libexif/metadata.xml
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>graphics</herd>
-<upstream>
-<remote-id type="cpe">cpe:/a:curtis_galloway:libexif</remote-id>
-</upstream>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="cpe">cpe:/a:curtis_galloway:libexif</remote-id>
+ <remote-id type="sourceforge">libexif</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/metadata/md5-cache/media-libs/libexif-0.6.21 b/metadata/md5-cache/media-libs/libexif-0.6.21
deleted file mode 100644
index 98d7e1d..0000000
--- a/metadata/md5-cache/media-libs/libexif-0.6.21
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=nls? ( virtual/libintl ) virtual/pkgconfig doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
-DESCRIPTION=Library for parsing, editing, and saving EXIF data
-EAPI=4
-HOMEPAGE=http://libexif.sourceforge.net/
-IUSE=doc nls static-libs
-KEYWORDS=*
-LICENSE=LGPL-2.1
-RDEPEND=nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://sourceforge/libexif/libexif-0.6.21.tar.bz2
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dbe272f418e92f6edf4de64f495c13a5
diff --git a/metadata/md5-cache/media-libs/libexif-0.6.22_p20201105 b/metadata/md5-cache/media-libs/libexif-0.6.22_p20201105
new file mode 100644
index 0000000..239ff1d
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libexif-0.6.22_p20201105
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=nls? ( virtual/libintl ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Library for parsing, editing, and saving EXIF data
+EAPI=7
+HOMEPAGE=https://libexif.github.io/ https://github.com/libexif/libexif
+IUSE=doc nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+KEYWORDS=*
+LICENSE=LGPL-2+
+RDEPEND=nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=https://github.com/libexif/libexif/archive/9266d14b5ca4e29b970fa03272318e5f99386e06.tar.gz -> libexif-0.6.22_p20201105.tar.gz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build 1979aa0ff4d356d32507ca4650d9f37d multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=9b5fe8bc6a81ec5cca116da1b65edf3c
