media-gfx/pqiv: Version bump

5 files changed, 24 insertions, 26 deletions

diff --git a/media-gfx/pqiv/Manifest b/media-gfx/pqiv/Manifest
index 338ed42d..86d8ac18 100644
--- a/media-gfx/pqiv/Manifest
+++ b/media-gfx/pqiv/Manifest
@@ -1,2 +1,2 @@
 DIST pqiv-2.2.tar.gz 52414 SHA256 88d625de4437c8e65a49d74e993df5debf224ecf726365e138bf90a602b8b74b
-DIST pqiv-2.6.tar.gz 96050 SHA256 f0c0d803724cdde2ccac1dc8d7e8928bdc633e758914a67320734a6961ee099c
+DIST pqiv-2.8.3.tar.gz 108525 SHA256 b90c45d829eb180459dcfbf1420b8feb670dc9bb542fe307adbc4ff201445bbd
diff --git a/media-gfx/pqiv/metadata.xml b/media-gfx/pqiv/metadata.xml
index e8041f64..286ea225 100644
--- a/media-gfx/pqiv/metadata.xml
+++ b/media-gfx/pqiv/metadata.xml
@@ -18,6 +18,7 @@
     <remote-id type="github">phillipberndt/pqiv</remote-id>
   </upstream>
   <use>
+    <flag name="archive">Enable support for images in archives and cbX comic book files</flag>
     <flag name="gtk2">Use gtk:2 instead of gtk:3</flag>
   </use>
 </pkgmetadata>
diff --git a/media-gfx/pqiv/pqiv-2.6.ebuild b/media-gfx/pqiv/pqiv-2.8.3.ebuild
index ff2c65bf..95b9f89b 100644
--- a/media-gfx/pqiv/pqiv-2.6.ebuild
+++ b/media-gfx/pqiv/pqiv-2.8.3.ebuild
@@ -1,34 +1,36 @@
-# Copyright 2016 Gentoo Foundation
+# Copyright 2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit linux-info toolchain-funcs
+inherit linux-info toolchain-funcs fdo-mime
 
-DESCRIPTION="Modern rewrite of Quick Image Viewer"
-HOMEPAGE="https://github.com/phillipberndt/pqiv http://www.pberndt.com/Programme/Linux/pqiv/"
 SRC_URI="https://github.com/phillipberndt/pqiv/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="powerful GTK based command-line image viewer with a minimal UI"
+HOMEPAGE="https://github.com/phillipberndt/pqiv http://www.pberndt.com/Programme/Linux/pqiv/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ffmpeg gtk2 imagemagick kernel_linux libav pdf postscript"
+IUSE="archive ffmpeg gtk2 imagemagick kernel_linux libav pdf postscript"
 
-RDEPEND=">=dev-libs/glib-2.8:2
+RDEPEND="
+	>=dev-libs/glib-2.8:2
 	>=x11-libs/cairo-1.6
 	gtk2? ( x11-libs/gtk+:2 )
 	!gtk2? ( x11-libs/gtk+:3 )
+	archive? ( app-arch/libarchive:0= )
 	ffmpeg? (
 		!libav? ( media-video/ffmpeg:0= )
 		libav? ( media-video/libav:0= )
 	)
 	imagemagick? ( media-gfx/imagemagick:0= )
 	pdf? ( app-text/poppler:0= )
-	postscript? ( app-text/libspectre:0= )"
+	postscript? ( app-text/libspectre:0= )
+"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-DOCS=( "README.markdown" )
-
 pkg_setup() {
 	if use kernel_linux; then
 		CONFIG_CHECK="~INOTIFY_USER"
@@ -36,16 +38,10 @@ pkg_setup() {
 	fi
 }
 
-src_prepare() {
-	default
-	sed -i \
-		-e "s:/lib/:/$(get_libdir)/:g" \
-		GNUmakefile || die
-}
-
 src_configure() {
 	local backends="gdkpixbuf" gtkver=3
 	! use gtk2 || gtkver=2
+	use archive && backends="${backends},archive,archive_cbx"
 	use ffmpeg || use libav && backends="${backends},libav"
 	use imagemagick && backends="${backends},wand"
 	use pdf && backends="${backends},poppler"
@@ -56,16 +52,20 @@ src_configure() {
 		--backends-build=shared \
 		--backends=${backends} \
 		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
 		--destdir="${ED}" \
 		|| die
 }
 
 src_compile() {
 	tc-export CC
-	emake CFLAGS="${CFLAGS}"
+	emake VERBOSE=1 CFLAGS="${CFLAGS}"
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
 }
 
-src_install() {
-	default
-	dodoc README.markdown
+pkg_postrm() {
+	fdo-mime_desktop_database_update
 }
diff --git a/profiles/package.mask b/profiles/package.mask
index 3d7cf4e3..b72bc268 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -13,10 +13,6 @@ games-rpg/magus
 # Upstream is dead.
 ~games-rpg/magus-1.3.3
 
-# Martin Väth <martin@mvath.de> (09 Jan 2017)
-# media-gfx/pqiv-2.6 currently doesn't recognize jpeg and gives only segfaults.
-=media-gfx/pqiv-2.6
-
 # Martin Väth <martin@mvath.de> (03 Jan 2016)
 # net-dns/noip-updater does not use https for transferring user sensitive data,
 # see e.g. https://bugs.gentoo.org/show_bug.cgi?id=261194
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 6eebe70c..a6d823e8 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -185,6 +185,7 @@ mail-client/alpine:onlyalpine - installs only the alpine binary, so it does not
 mail-client/alpine:passfile - Adds support for caching passwords into a file between sessions
 mail-client/alpine:smime - Enable support for S/MIME
 mail-client/alpine:topal - Enable support for net-mail/topal
+media-gfx/pqiv:archive - Enable support for images in archives and cbX comic book files
 media-gfx/pqiv:gtk2 - Use gtk:2 instead of gtk:3
 media-libs/avidemux-core:system-ffmpeg - Use the ffmpeg provided by the system.
 media-libs/avidemux-plugins:aften - Enable A/52 (AC-3) audio encoder support.