[gentoo-commits] repo/gentoo:master commit in: media-gfx/photoqt/

[Andreas Sturmlechner]

commit:     f31a16ea4e8ac0bb599edc608ed55e06faecc86b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 21:29:41 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 22:02:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f31a16ea

media-gfx/photoqt: USE exiv2 (local) -> exif (global)

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/photoqt/metadata.xml            | 3 ---
 media-gfx/photoqt/photoqt-1.5.1-r1.ebuild | 8 ++++----
 media-gfx/photoqt/photoqt-1.7.1.ebuild    | 8 ++++----
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/media-gfx/photoqt/metadata.xml b/media-gfx/photoqt/metadata.xml
index c0acf63798d..d6620e46687 100644
--- a/media-gfx/photoqt/metadata.xml
+++ b/media-gfx/photoqt/metadata.xml
@@ -12,8 +12,5 @@
                <flag name="freeimage">
                        Support additional iamge formats using 
<pkg>media-libs/freeimage</pkg>
                </flag>
-               <flag name="exiv2">
-                       Use <pkg>media-gfx/exiv2</pkg> as optional dependency
-               </flag>
        </use>
 </pkgmetadata>

diff --git a/media-gfx/photoqt/photoqt-1.5.1-r1.ebuild 
b/media-gfx/photoqt/photoqt-1.5.1-r1.ebuild
index ff02aa7771c..7702e5284c0 100644
--- a/media-gfx/photoqt/photoqt-1.5.1-r1.ebuild
+++ b/media-gfx/photoqt/photoqt-1.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://photoqt.org/pkgs/${P}.tar.gz";
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="exiv2 graphicsmagick raw"
+IUSE="exif graphicsmagick raw"
 
 RDEPEND="
        dev-qt/qtcore:5
@@ -27,7 +27,7 @@ RDEPEND="
        dev-qt/qtsvg:5
        dev-qt/qtwidgets:5
        dev-qt/qtxml:5
-       exiv2? ( media-gfx/exiv2:= )
+       exif? ( media-gfx/exiv2:= )
        graphicsmagick? ( >=media-gfx/graphicsmagick-1.3.20:= )
        raw? ( media-libs/libraw:= )
 "
@@ -37,7 +37,7 @@ DEPEND="${RDEPEND}
 
 src_configure() {
        local mycmakeargs=(
-               -DEXIV2=$(usex exiv2)
+               -DEXIV2=$(usex exif)
                -DGM=$(usex graphicsmagick)
                -DRAW=$(usex raw)
        )

diff --git a/media-gfx/photoqt/photoqt-1.7.1.ebuild 
b/media-gfx/photoqt/photoqt-1.7.1.ebuild
index b1e9fd011de..b37af5d4f16 100644
--- a/media-gfx/photoqt/photoqt-1.7.1.ebuild
+++ b/media-gfx/photoqt/photoqt-1.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://photoqt.org/pkgs/${P}.tar.gz";
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="devil exiv2 freeimage graphicsmagick pdf raw"
+IUSE="devil exif freeimage graphicsmagick pdf raw"
 
 RDEPEND="
        dev-qt/qtcore:5
@@ -30,7 +30,7 @@ RDEPEND="
        app-arch/libarchive:=
        app-arch/unrar
        devil? ( media-libs/devil )
-       exiv2? ( media-gfx/exiv2:= )
+       exif? ( media-gfx/exiv2:= )
        freeimage? ( media-libs/freeimage )
        graphicsmagick? ( >=media-gfx/graphicsmagick-1.3.20:= )
        pdf? ( app-text/poppler[qt5] )
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
 src_configure() {
        local mycmakeargs=(
                -DDEVIL=$(usex devil)
-               -DEXIV2=$(usex exiv2)
+               -DEXIV2=$(usex exif)
                -DFREEIMAGE=$(usex freeimage)
                -DGM=$(usex graphicsmagick)
                -DPOPPLER=$(usex pdf)