gentoo resync : 07.07.2018

5 files changed, 42 insertions, 53 deletions

diff --git a/media-gfx/qiv/Manifest b/media-gfx/qiv/Manifest
index 921b627f1428..37b63ddf41b5 100644
--- a/media-gfx/qiv/Manifest
+++ b/media-gfx/qiv/Manifest
@@ -1,5 +1,4 @@
-DIST qiv-2.2.4.tgz 98874 BLAKE2B 150ea07881d8225801156d395696cef397210e1f5c2f974d08197f3429e1a7e19ebf283037b92cec40a973aa6748f1562dbeba1a6e854438cf069c70781e1561 SHA512 744014ff70c9397d7a90e60740f482976713c9e5ff295a03684ae7b50ae70b86589d9e9066702fd43241bf2767c3537f582aab5ebbde25caea1663ec825f76a5
-DIST qiv-2.3.1.tgz 130621 BLAKE2B 7aa3a63fb83094d4b0a15c4d6422ccf35f34a16df2f0e644a2068c520024b2a22f724ed117ef90292359fb8372969511863b6b0a2ccb0d208bad12649333f993 SHA512 5a9b8ac082c78071c903e2f10a98effc412c0b6b940437b6592077978de03b5c7b6192e4d696f0389c12e99e0d3b5ca40c3be54ca2dfa5439121af2415f32812
-EBUILD qiv-2.2.4.ebuild 832 BLAKE2B 9f31559012ef78a27af6d3c34ad28f4bd4634f0310545c843216c39303a5870cd661ad4946d7d087b73c0714ca04a221d884f62b6ea488075ba89f320a898c63 SHA512 610f4ac7c6d976fa7534b23df722853509286eb49e96baf713224dc2a82369863b3715c0f09ca8420de6c6b46157191ab840e7a2e4299f56556a7099625ef48f
-EBUILD qiv-2.3.1.ebuild 1208 BLAKE2B bd74cf3416a8070ab0c8efc258a129ef478b396ce5df909b3058e676f3cef7ba12767a383c640c4b284c400edc13ecd29ef27ca4c92731815db03984aafea5d1 SHA512 1fe7f0872b04f8ad2702352d3d3e6108cade7eef3aa9ffff905291d48ee6cd65a8559c47f984f5961bf6773d553a1aff2e0735db937ad536a79dcac700584356
-MISC metadata.xml 338 BLAKE2B f7a1f5b1fc91ac9b68c24947274a0182ed76c498d31ca614e09dd24061e14fd2b9dc121435bd3d8e067de6f5346d93c8806d1a004c13bcb8a8eca359b73ab05a SHA512 67b1a99367a1b89fdcf2b8775b69a516e0cd4f2135f5071998049a21613b4237df7a578682534d6a40a418c9653e417a3177256a074ebb3a3cfac6ada429c757
+AUX qiv-2.3.2-optional-tiff.patch 519 BLAKE2B 1c2f4d4d79f3d746927f4c5af05769992460c30cdd438096d4c4d0c39a9460bcb921ddd854786ec394fc9e229ad239c541cc97f5468cd6934c15a0557275270a SHA512 c492b902bbd7771648deaffc7eafb8fccf86d294c0e2597999f2fff02ed1e02f6fc158ea95fe25c2a9b27d15dffe724c85654c99e7769254abb40e9fdcb8f358
+DIST qiv-2.3.2.tar.gz 135164 BLAKE2B b6b82c3007cd3214bb0b812026d22ab0a3c7fce87e51c1f2e19634fe131656f7adc1e92d2e1fcdcc563f1fd8b7c298307e48823bb26e077b336a6983f31894ac SHA512 a6750ecf26bc5b78fbebfdfcfd7a8ab0a5d3ba4e4b19c4a5563e1631dfaf8cc98f7a0bc9449956bc06f8b98cb307b31f78178676ddc9df4fa03429fa31c174e8
+EBUILD qiv-2.3.2.ebuild 1390 BLAKE2B 552b9009ee8aea6a185f2de0675fcd9b3ade4297477cbc4e66c4b1c4ddb437243d053f20cdc9305675d0bc01bbc1241495824874db9b1ef494e8ecf4b45b3452 SHA512 a9e1c44d37f020f8eedac254fec803a7a4b7cdf05db5fb3f435c2b4208e1372b19a80220052b3259a90e9524cf22f58701f270d13ba97c37a244d1daed0981dc
+MISC metadata.xml 419 BLAKE2B 91296f38a94e37a97e1925e348d13de307b5d72e78002e3e5e396658b8ab4f96c909c530947a154317f0e354063f36c8ea4093efed599ed6ffe3c9089827cdea SHA512 d9ae3b413f335a277b97e98ca245a3ffe1982cd777c08062ac43642f76cd8b567b815163738807ff5a826ef1c14ca24e20ae1041394db6b998f02fdd2dbad216
diff --git a/media-gfx/qiv/files/qiv-2.3.2-optional-tiff.patch b/media-gfx/qiv/files/qiv-2.3.2-optional-tiff.patch
new file mode 100644
index 000000000000..e00ad10f93e2
--- /dev/null
+++ b/media-gfx/qiv/files/qiv-2.3.2-optional-tiff.patch
@@ -0,0 +1,22 @@
+Make tiff header usage conditional on LCMS support as intended.
+
+--- ciberandy-qiv-14b562fe2fc3/qiv.h
++++ ciberandy-qiv-14b562fe2fc3/qiv.h
+@@ -12,6 +12,7 @@
+ #ifdef SUPPORT_LCMS
+ #include <lcms2.h>
+ #include <jpeglib.h>
++#include <tiffio.h>
+ #endif
+ 
+ /*
+--- ciberandy-qiv-14b562fe2fc3/utils.c
++++ ciberandy-qiv-14b562fe2fc3/utils.c
+@@ -17,7 +17,6 @@
+ #include <dirent.h>
+ #include <fcntl.h>
+ #include <errno.h>
+-#include <tiffio.h>
+ #include <X11/extensions/dpms.h>
+ #ifdef HAVE_EXIF
+ #include <libexif/exif-loader.h>
diff --git a/media-gfx/qiv/metadata.xml b/media-gfx/qiv/metadata.xml
index 9cc5dff0ad50..55247542f391 100644
--- a/media-gfx/qiv/metadata.xml
+++ b/media-gfx/qiv/metadata.xml
@@ -8,4 +8,7 @@
 	<use>
 		<flag name="magic">Use libmagic to determine mimetypes</flag>
 	</use>
+	<upstream>
+		<remote-id type="bitbucket">ciberandy/qiv</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/qiv/qiv-2.2.4.ebuild b/media-gfx/qiv/qiv-2.2.4.ebuild
deleted file mode 100644
index f26a883e40e5..000000000000
--- a/media-gfx/qiv/qiv-2.2.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit toolchain-funcs
-
-DESCRIPTION="Quick Image Viewer"
-HOMEPAGE="http://spiegl.de/qiv/"
-SRC_URI="http://spiegl.de/qiv/download/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE="xinerama"
-
-RDEPEND=">=x11-libs/gtk+-2.12:2
-	media-libs/imlib2[X]
-	!<media-gfx/pqiv-0.11
-	xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i \
-		-e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' \
-		Makefile || die
-
-	if ! use xinerama; then
-		sed -i \
-			-e 's:-DGTD_XINERAMA::' \
-			Makefile || die
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin qiv
-	doman qiv.1
-	dodoc Changelog qiv-command.example README README.TODO
-}
diff --git a/media-gfx/qiv/qiv-2.3.1.ebuild b/media-gfx/qiv/qiv-2.3.2.ebuild
index 99141eb1eca7..0b0984e667e7 100644
--- a/media-gfx/qiv/qiv-2.3.1.ebuild
+++ b/media-gfx/qiv/qiv-2.3.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils gnome2-utils toolchain-funcs xdg-utils
+EAPI=6
+inherit desktop gnome2-utils toolchain-funcs xdg-utils vcs-snapshot
 
 DESCRIPTION="Quick Image Viewer"
-HOMEPAGE="http://spiegl.de/qiv/"
-SRC_URI="http://spiegl.de/qiv/download/${P}.tgz"
+HOMEPAGE="http://spiegl.de/qiv/ https://bitbucket.org/ciberandy/qiv"
+SRC_URI="https://bitbucket.org/ciberandy/qiv/get/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,12 +16,20 @@ IUSE="exif lcms magic"
 RDEPEND=">=x11-libs/gtk+-2.12:2
 	media-libs/imlib2[X]
 	exif? ( media-libs/libexif )
-	lcms? ( media-libs/lcms:2 )
+	lcms? (
+		media-libs/lcms:2
+		media-libs/tiff:0
+		virtual/jpeg:0
+	)
 	magic? ( sys-apps/file )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/${P}-optional-tiff.patch )
+
 src_prepare() {
+	default
+
 	sed -i \
 		-e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' \
 		Makefile || die