| 1 |
commit: f31a16ea4e8ac0bb599edc608ed55e06faecc86b |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 29 21:29:41 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 29 22:02:02 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f31a16ea |
| 7 |
|
| 8 |
media-gfx/photoqt: USE exiv2 (local) -> exif (global) |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
media-gfx/photoqt/metadata.xml | 3 --- |
| 14 |
media-gfx/photoqt/photoqt-1.5.1-r1.ebuild | 8 ++++---- |
| 15 |
media-gfx/photoqt/photoqt-1.7.1.ebuild | 8 ++++---- |
| 16 |
3 files changed, 8 insertions(+), 11 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-gfx/photoqt/metadata.xml b/media-gfx/photoqt/metadata.xml |
| 19 |
index c0acf63798d..d6620e46687 100644 |
| 20 |
--- a/media-gfx/photoqt/metadata.xml |
| 21 |
+++ b/media-gfx/photoqt/metadata.xml |
| 22 |
@@ -12,8 +12,5 @@ |
| 23 |
<flag name="freeimage"> |
| 24 |
Support additional iamge formats using <pkg>media-libs/freeimage</pkg> |
| 25 |
</flag> |
| 26 |
- <flag name="exiv2"> |
| 27 |
- Use <pkg>media-gfx/exiv2</pkg> as optional dependency |
| 28 |
- </flag> |
| 29 |
</use> |
| 30 |
</pkgmetadata> |
| 31 |
|
| 32 |
diff --git a/media-gfx/photoqt/photoqt-1.5.1-r1.ebuild b/media-gfx/photoqt/photoqt-1.5.1-r1.ebuild |
| 33 |
index ff02aa7771c..7702e5284c0 100644 |
| 34 |
--- a/media-gfx/photoqt/photoqt-1.5.1-r1.ebuild |
| 35 |
+++ b/media-gfx/photoqt/photoqt-1.5.1-r1.ebuild |
| 36 |
@@ -1,4 +1,4 @@ |
| 37 |
-# Copyright 1999-2018 Gentoo Foundation |
| 38 |
+# Copyright 1999-2018 Gentoo Authors |
| 39 |
# Distributed under the terms of the GNU General Public License v2 |
| 40 |
|
| 41 |
EAPI=6 |
| 42 |
@@ -12,7 +12,7 @@ SRC_URI="https://photoqt.org/pkgs/${P}.tar.gz" |
| 43 |
LICENSE="GPL-2+" |
| 44 |
SLOT="0" |
| 45 |
KEYWORDS="amd64 x86" |
| 46 |
-IUSE="exiv2 graphicsmagick raw" |
| 47 |
+IUSE="exif graphicsmagick raw" |
| 48 |
|
| 49 |
RDEPEND=" |
| 50 |
dev-qt/qtcore:5 |
| 51 |
@@ -27,7 +27,7 @@ RDEPEND=" |
| 52 |
dev-qt/qtsvg:5 |
| 53 |
dev-qt/qtwidgets:5 |
| 54 |
dev-qt/qtxml:5 |
| 55 |
- exiv2? ( media-gfx/exiv2:= ) |
| 56 |
+ exif? ( media-gfx/exiv2:= ) |
| 57 |
graphicsmagick? ( >=media-gfx/graphicsmagick-1.3.20:= ) |
| 58 |
raw? ( media-libs/libraw:= ) |
| 59 |
" |
| 60 |
@@ -37,7 +37,7 @@ DEPEND="${RDEPEND} |
| 61 |
|
| 62 |
src_configure() { |
| 63 |
local mycmakeargs=( |
| 64 |
- -DEXIV2=$(usex exiv2) |
| 65 |
+ -DEXIV2=$(usex exif) |
| 66 |
-DGM=$(usex graphicsmagick) |
| 67 |
-DRAW=$(usex raw) |
| 68 |
) |
| 69 |
|
| 70 |
diff --git a/media-gfx/photoqt/photoqt-1.7.1.ebuild b/media-gfx/photoqt/photoqt-1.7.1.ebuild |
| 71 |
index b1e9fd011de..b37af5d4f16 100644 |
| 72 |
--- a/media-gfx/photoqt/photoqt-1.7.1.ebuild |
| 73 |
+++ b/media-gfx/photoqt/photoqt-1.7.1.ebuild |
| 74 |
@@ -1,4 +1,4 @@ |
| 75 |
-# Copyright 1999-2018 Gentoo Foundation |
| 76 |
+# Copyright 1999-2018 Gentoo Authors |
| 77 |
# Distributed under the terms of the GNU General Public License v2 |
| 78 |
|
| 79 |
EAPI=6 |
| 80 |
@@ -12,7 +12,7 @@ SRC_URI="https://photoqt.org/pkgs/${P}.tar.gz" |
| 81 |
LICENSE="GPL-2+" |
| 82 |
SLOT="0" |
| 83 |
KEYWORDS="~amd64 ~x86" |
| 84 |
-IUSE="devil exiv2 freeimage graphicsmagick pdf raw" |
| 85 |
+IUSE="devil exif freeimage graphicsmagick pdf raw" |
| 86 |
|
| 87 |
RDEPEND=" |
| 88 |
dev-qt/qtcore:5 |
| 89 |
@@ -30,7 +30,7 @@ RDEPEND=" |
| 90 |
app-arch/libarchive:= |
| 91 |
app-arch/unrar |
| 92 |
devil? ( media-libs/devil ) |
| 93 |
- exiv2? ( media-gfx/exiv2:= ) |
| 94 |
+ exif? ( media-gfx/exiv2:= ) |
| 95 |
freeimage? ( media-libs/freeimage ) |
| 96 |
graphicsmagick? ( >=media-gfx/graphicsmagick-1.3.20:= ) |
| 97 |
pdf? ( app-text/poppler[qt5] ) |
| 98 |
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND} |
| 99 |
src_configure() { |
| 100 |
local mycmakeargs=( |
| 101 |
-DDEVIL=$(usex devil) |
| 102 |
- -DEXIV2=$(usex exiv2) |
| 103 |
+ -DEXIV2=$(usex exif) |
| 104 |
-DFREEIMAGE=$(usex freeimage) |
| 105 |
-DGM=$(usex graphicsmagick) |
| 106 |
-DPOPPLER=$(usex pdf) |
Archives