Fix mupdf dep (bug #545508). Remove old.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x4FDF9CFD2FAC514E!)

4 files changed, 18 insertions, 101 deletions

diff --git a/app-text/qpdfview/ChangeLog b/app-text/qpdfview/ChangeLog
index 243253200610..da59886f125e 100644
--- a/app-text/qpdfview/ChangeLog
+++ b/app-text/qpdfview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/qpdfview
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/ChangeLog,v 1.74 2015/06/16 01:33:55 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/ChangeLog,v 1.75 2015/06/16 10:18:48 yngwin Exp $
+
+  16 Jun 2015; Ben de Groot <yngwin@gentoo.org> -qpdfview-0.4.14.ebuild,
+  metadata.xml, qpdfview-0.4.15.ebuild:
+  Fix mupdf dep (bug #545508). Remove old.
 
 *qpdfview-0.4.15 (16 Jun 2015)
 
diff --git a/app-text/qpdfview/metadata.xml b/app-text/qpdfview/metadata.xml
index 81247efe5a04..40dcf6c24c57 100644
--- a/app-text/qpdfview/metadata.xml
+++ b/app-text/qpdfview/metadata.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
-	<use>
-		<flag name="fitz">Use experimental fitz rendering, provided by <pkg>app-text/mupdf</pkg>,
-			instead of poppler</flag>
-		<flag name="synctex">Add support for searching TeX sources</flag>
-	</use>
-	<upstream>
-		<remote-id type="launchpad">qpdfview</remote-id>
-	</upstream>
+  <herd>qt</herd>
+  <use>
+    <flag name="fitz">
+      Use experimental fitz rendering, provided by <pkg>app-text/mupdf</pkg>,
+      instead of poppler
+    </flag>
+    <flag name="synctex">Add support for searching TeX sources</flag>
+  </use>
+  <upstream>
+    <remote-id type="launchpad">qpdfview</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-text/qpdfview/qpdfview-0.4.14.ebuild b/app-text/qpdfview/qpdfview-0.4.14.ebuild
deleted file mode 100644
index 3098f9bd6611..000000000000
--- a/app-text/qpdfview/qpdfview-0.4.14.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.4.14.ebuild,v 1.2 2015/03/05 13:48:24 yngwin Exp $
-
-EAPI=5
-
-PLOCALES="ast az be bg bs ca cs da de el en_GB eo es eu fi fr gl he hr id it kk ky lt ms my pl pt pt_BR ro ru sk sv th tr ug uk vi zh_CN"
-inherit eutils l10n multilib qmake-utils
-
-DESCRIPTION="A tabbed document viewer"
-HOMEPAGE="http://launchpad.net/qpdfview"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="cups dbus djvu fitz +pdf postscript +qt4 qt5 sqlite +svg synctex"
-
-REQUIRED_USE="^^ ( qt4 qt5 )
-	?? ( fitz pdf )"
-
-RDEPEND="cups? ( net-print/cups )
-	djvu? ( app-text/djvu )
-	fitz? ( app-text/mupdf:0/1.4 )
-	postscript? ( app-text/libspectre )
-	qt4? ( dev-qt/qtcore:4[iconv]
-		dev-qt/qtgui:4
-		dbus? ( dev-qt/qtdbus:4 )
-		pdf? ( app-text/poppler[qt4] )
-		sqlite? ( dev-qt/qtsql:4[sqlite] )
-		svg? ( dev-qt/qtsvg:4 ) )
-	qt5? ( dev-qt/linguist-tools:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		dbus? ( dev-qt/qtdbus:5 )
-		pdf? ( >=app-text/poppler-0.26.4[qt5] )
-		sqlite? ( dev-qt/qtsql:5[sqlite] )
-		svg? ( dev-qt/qtsvg:5 ) )
-	!svg? ( virtual/freedesktop-icon-theme )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( CHANGES CONTRIBUTORS README TODO )
-
-src_prepare() {
-	prepare_locale() {
-		local _lrel
-		use qt4 && _lrel="$(qt4_get_bindir)/lrelease"
-		use qt5 && _lrel="$(qt5_get_bindir)/lrelease"
-		${_lrel} "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
-	}
-
-	rm_help() {
-		rm -f "miscellaneous/help_${1}.html" || die "removing extraneous help files failed"
-	}
-
-	l10n_find_plocales_changes translations "${PN}_" '.ts'
-	l10n_for_each_locale_do prepare_locale
-	l10n_for_each_disabled_locale_do rm_help
-
-	# adapt for prefix
-	sed -i -e "s:/usr:${EPREFIX}/usr:g" qpdfview.pri || die
-}
-
-src_configure() {
-	local config i
-	for i in cups dbus pdf djvu svg synctex; do
-		if ! use ${i}; then
-			config+=" without_${i}"
-		fi
-	done
-
-	use fitz && config+=" with_fitz"
-	use postscript || config+=" without_ps"
-	use sqlite || config+=" without_sql"
-
-	if use qt4; then
-		eqmake4 CONFIG+="${config}" PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
-	else
-		eqmake5 CONFIG+="${config}" PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}" qpdfview.pro
-	fi
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
diff --git a/app-text/qpdfview/qpdfview-0.4.15.ebuild b/app-text/qpdfview/qpdfview-0.4.15.ebuild
index 2a6b3efd6e5b..8ef3d56f431e 100644
--- a/app-text/qpdfview/qpdfview-0.4.15.ebuild
+++ b/app-text/qpdfview/qpdfview-0.4.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.4.15.ebuild,v 1.1 2015/06/16 01:33:55 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.4.15.ebuild,v 1.2 2015/06/16 10:18:48 yngwin Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ REQUIRED_USE="^^ ( qt4 qt5 )
 
 RDEPEND="cups? ( net-print/cups )
 	djvu? ( app-text/djvu )
-	fitz? ( >=app-text/mupdf-1.4:= )
+	fitz? ( >=app-text/mupdf-1.7:= )
 	postscript? ( app-text/libspectre )
 	qt4? ( dev-qt/qtcore:4[iconv]
 		dev-qt/qtgui:4