Version bump.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 77 insertions, 20 deletions

diff --git a/app-text/zathura-pdf-mupdf/ChangeLog b/app-text/zathura-pdf-mupdf/ChangeLog
index e600b8bc4e6c..fed48bd4350d 100644
--- a/app-text/zathura-pdf-mupdf/ChangeLog
+++ b/app-text/zathura-pdf-mupdf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/zathura-pdf-mupdf
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-pdf-mupdf/ChangeLog,v 1.10 2014/03/30 15:56:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-pdf-mupdf/ChangeLog,v 1.11 2014/04/04 21:25:02 ssuominen Exp $
+
+*zathura-pdf-mupdf-0.2.6 (04 Apr 2014)
+
+  04 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +zathura-pdf-mupdf-0.2.6.ebuild, zathura-pdf-mupdf-9999.ebuild:
+  Version bump.
 
   30 Mar 2014; Samuli Suominen <ssuominen@gentoo.org>
   -zathura-pdf-mupdf-0.2.3.ebuild:
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.6.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.6.ebuild
new file mode 100644
index 000000000000..e6bac27648e5
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.6.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.6.ebuild,v 1.1 2014/04/04 21:25:02 ssuominen Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+[[ ${PV} == 9999* ]] && inherit git-2
+
+DESCRIPTION="PDF plug-in for zathura"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+if ! [[ ${PV} == 9999* ]]; then
+SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+EGIT_REPO_URI="git://git.pwmt.org/${PN}.git"
+EGIT_BRANCH="mupdf-git"
+
+LICENSE="ZLIB"
+SLOT="0"
+if ! [[ ${PV} == 9999* ]]; then
+KEYWORDS="~amd64 ~x86"
+else
+KEYWORDS=""
+fi
+IUSE=""
+
+RDEPEND="!app-text/zathura-pdf-poppler
+	>=app-text/mupdf-1.3:=
+	>=app-text/zathura-0.2.7
+	media-libs/jbig2dec:=
+	media-libs/openjpeg:2=
+	virtual/jpeg:0
+	x11-libs/cairo:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	myzathuraconf=(
+		CC="$(tc-getCC)"
+		LD="$(tc-getLD)"
+		VERBOSE=1
+		DESTDIR="${D}"
+	)
+}
+
+src_compile() {
+	emake "${myzathuraconf[@]}"
+}
+
+src_install() {
+	emake "${myzathuraconf[@]}" install
+	dodoc AUTHORS
+}
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
index 2dacd63357a1..6509dc8fc6c8 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
@@ -1,35 +1,41 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild,v 1.5 2013/06/23 12:43:39 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild,v 1.6 2014/04/04 21:25:02 ssuominen Exp $
 
 EAPI=5
 
-inherit eutils git-2 toolchain-funcs
+inherit eutils toolchain-funcs
+[[ ${PV} == 9999* ]] && inherit git-2
 
 DESCRIPTION="PDF plug-in for zathura"
 HOMEPAGE="http://pwmt.org/projects/zathura/"
+if ! [[ ${PV} == 9999* ]]; then
+SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
 EGIT_REPO_URI="git://git.pwmt.org/${PN}.git"
 EGIT_BRANCH="mupdf-git"
 
 LICENSE="ZLIB"
 SLOT="0"
+if ! [[ ${PV} == 9999* ]]; then
+KEYWORDS="~amd64 ~x86"
+else
 KEYWORDS=""
-IUSE="+deprecated"
+fi
+IUSE=""
 
 RDEPEND="!app-text/zathura-pdf-poppler
-	>=app-text/mupdf-9999:=
-	>=app-text/zathura-0.2.0[deprecated=]
-	media-libs/jbig2dec
-	media-libs/openjpeg:2
-	virtual/jpeg
+	>=app-text/mupdf-1.3:=
+	>=app-text/zathura-0.2.7
+	media-libs/jbig2dec:=
+	media-libs/openjpeg:2=
+	virtual/jpeg:0
 	x11-libs/cairo:="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 pkg_setup() {
-	#does not render w/o cairo
 	myzathuraconf=(
-		WITH_CAIRO=1
 		CC="$(tc-getCC)"
 		LD="$(tc-getLD)"
 		VERBOSE=1
@@ -37,14 +43,6 @@ pkg_setup() {
 	)
 }
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-mupdf-fz_new_text_page.patch \
-		"${FILESDIR}"/${P}-mupdf-pkgconfig.patch \
-		"${FILESDIR}"/${P}-mupdf-split-headers.patch \
-		"${FILESDIR}"/${P}-fz_drop_display_list.patch
-}
-
 src_compile() {
 	emake "${myzathuraconf[@]}"
 }