Version bump.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 88 insertions, 29 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/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index 4ac796455e87..3128200371a7 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -6,18 +6,20 @@ AUX zathura-pdf-mupdf-9999-mupdf-fz_new_text_page.patch 400 SHA256 579e69e500961
 AUX zathura-pdf-mupdf-9999-mupdf-pkgconfig.patch 540 SHA256 a97e0ee2a4aa87f858568f1b3751cc8040e7fc3d3d0cbe78cf68fe518bbd654d SHA512 ca7f936570a5323ab549baff7c9f8b035e48c7fbb2100540b4340f2f5b8a02772c5d43d3ffa9d370dc1d48eeb15114c4f7bb8ac72ce2eff805ff188881db724a WHIRLPOOL f01a3a45218b7ecc345ad9bbd9d9e908f86ba7d04613c5213973543871be7e331714d47695c42327480dde8827bda029698dff726d67872d35ec354e8985b4ee
 AUX zathura-pdf-mupdf-9999-mupdf-split-headers.patch 507 SHA256 b2a1afd166247cda0f169559a3bdf1c7909aa5bd1345dc71cc1e50b0dcde2994 SHA512 39766f573576429f2bbb7f2f1fb22faa9893e7b9460690fcad132646b0bd8ab4b9a417d6af96c629753d6e3572c6fab37cca7054c96fb32b2fcd3fba3e1c1c98 WHIRLPOOL 2964995840e05e0de0d9d9b8b5ba9319c005aed884f2e0c65a49e38851fe18b6b36e7270503fa479ea7037a5d002f69a6adbfd375c795cdfc479404667d1e8b3
 DIST zathura-pdf-mupdf-0.2.4.tar.gz 9170 SHA256 0df530701b2a6620d543412a20195c5305c81c907961e25830b349c59f67370c SHA512 4ed7f2170f7eb5bf22cd3fd171d2f1563ab5a309082bfe1bbe8aaf3ebcab743f46c44820c15a3af64c8f6a28d04b734045d2bc17652570ed7e57a5567afa7e52 WHIRLPOOL 558252f5e7c8dea8959ddbfc0c9ba0cf64bc40ef9ed9172293bb89f8e26315e73be5ec960e6b0eecdac52bd3a08f8ac963dbdf42c5d0cd105468416a669bdc9c
+DIST zathura-pdf-mupdf-0.2.6.tar.gz 9094 SHA256 5df94b6f906008b5f3bca770a552da6d2917d6b8d3e4b3049cb7001302041b20 SHA512 5dda347055a0286229e63b7de02bd58314590bfe0edd25d793169f30061083dbf7915669657c7f717c6a3b141b23acd4481dbdb81fa69e399385b2c3eff4272f WHIRLPOOL 6ea732523c0fe4f1324a690a4a7120da5d422f976358270ea096516fb2470b61f1efd3f3be0c1735320e3b9d5de5f0672ee69fd48c6b72135ae686908f1d089e
 EBUILD zathura-pdf-mupdf-0.2.4.ebuild 925 SHA256 ad7a123003f0cbe7d8b1999f27e8dc9e5f29647657c4bdad1acba30c465504cf SHA512 cb4631a732d550feec238c7c4ea7cc7980c9ea1b08fa244cda191734309397ad4437908bf9a9931e4423fb0681d04d05cc07350ae1f6766cb64b6deed71fa500 WHIRLPOOL b7b2a28c64135a6188933202422d33824630b16b62845297c3e310e311b63ae7cc8d99d2741e09b1116f430200df0a88e9645a8e2c83d31133d138da638669c1
-EBUILD zathura-pdf-mupdf-9999.ebuild 1199 SHA256 12819510d84b7ae7b7b5e55b60e648ddd3bd633c85b23c7c00cbcb31773605e7 SHA512 84f84feb845416f6dd1b40fde764b343c0891676ec9aa610296c6c32e480964d3d83e01c07878ce29f6f02fdb57e9bc22aba992dcc8749d4065dcad4173a234a WHIRLPOOL faece0da330dfdc6768ba55eea28f3fa4b20edda7f88e25c8532ccb235999b1d9a4bec930183537114ca52c94bc0698f0401288516b01d6eb1ff61308015919e
-MISC ChangeLog 1913 SHA256 2f4a22a8b755e4ec90676f5725fb3fd6a5eadfbb6f9e9725b2fff554429e1378 SHA512 7b2c3a347e099647ff043242330b1f9f400c7156507c07799e20c38a3417783fd4aab04cb43ce8bcb38e809dfb4b814cab67c240dbc2981c0db99d3ea260ceb9 WHIRLPOOL d7e184d4b9ae0e320a6cdf0ad38238e94ea2e9eb6819d2b0c2d0c3351c264614688f9f3e5d28f85bd9fc1337626dd4492f68e9fc97e1dc37f91722c5b33fbc62
+EBUILD zathura-pdf-mupdf-0.2.6.ebuild 1122 SHA256 651d85729cdebeaeee5ac35d5a0a7c8f2f71e60d4ac6f499f294889e358979f1 SHA512 0b317ffdf97adad7edac3b8928f63520b52cdb851592d4e71852361218ac2f72c7d8c714d3284de295299511a2141f9f480d19aa844ee14da89c8d9ba531424e WHIRLPOOL a2f1f513485b436e84b5ba849b61fd39408c48c7a55156a4ab6210e35b283102946b985b5d1a97ed6696e24abc97197a679f2ed839143a2a3c3d306ea7e00aef
+EBUILD zathura-pdf-mupdf-9999.ebuild 1121 SHA256 444cbd1bfcf3f381a80bd2000e7e425ba91fc50d432a7d32715e1c33cb64b76e SHA512 d17ed262681ae85d15235985c3f1f0a0a3250fa493cc60318f6ebe0d258a4e0879c11caef9231d35d7bdc6610aa630b9f0f23dc0149600121e6bb4b0749dc988 WHIRLPOOL 365ac66fa06cc004d2978735e829a81cab6ad862dceab7e31d1fe35d3b56304b0b6407fbf86aa77de346be59a5cc19dda4c7fc6761f0af404174337e0296391a
+MISC ChangeLog 2090 SHA256 b3b54f04cf07fe7f677904cdadaae4e141a76c228c13b638721e4aa369c80b8d SHA512 4c3a682e3d16e27c7475abbb0c17788116bc4d2f323235b3be9f988aba07454678b83a31929533ba6bc102619dfd8728a72ddbf03cf89ef60bb54ca5cde21fb8 WHIRLPOOL 23f0993b45e3c6882dd2f9239f682d432c7d92a61ac3e59a885e17c12ba4faad14b6db9097ec279835dee44d121e52e8f1d46c9053c9cf0b07cab4f29897cb55
 MISC metadata.xml 891 SHA256 fd8cff830b610de908d5d60fb0e639498bc67a7bb65bb779127bc3d41fdc14a2 SHA512 bc8dc04bad036aecbb1b83885b03806b6cd17ae55c434b18e72f948ccf0c6bd9ce6b7f80dbe49fd86ff8a46934f97114ef0b49cc352dc9949d0b38ee909d23d5 WHIRLPOOL d89d27afe35561405540752d0d70bdbcfaf9e927adf23663f207716e6de5f30017ed024e2903bb04f5b1d2bb53190085e6efe65a9dc33f6192f318965e495744
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTOD1vAAoJEEdUh39IaPFNrLEIAJP2+AF4yo5A36KTdqlARAeC
-1We0CpXfxXy/cBX1Hdgg8eBs1xB5vV8z2NKNc/EYUJV9o5e5Fl7B6ObYlG8WkdMq
-90DJUs8pfXd2EclVmJMPVXv7Hh/44tQJzR0cP+tYuEyB7e3JEq4ax+FPNS7mo4RM
-8+fiNg3SiUXtfqxKSJwjc1F2fF6xjqtnNt0VWSXsEKk+uHDQyqFYDlHcnVMoJJGF
-1pkYAEmgbc1XTVpNR6wy2LMpJi0Y9Mst9haJVVCFISDqlZWhSpWZ+muWXHMshdlw
-ybvVABMCysZKItlDTF5jjlkYA3xy3YExnwfCeIZ5GDpPK+MzruCeHkYbp87oiSk=
-=Q5yl
+iQEcBAEBCAAGBQJTPyHaAAoJEEdUh39IaPFNjeoH/iN02r6YqfSdz6IaEJZBWkYh
+CiQivgRffFD69BGGwswG0sjzSpGnnssfvOWvMS5+zCKjt4xyjCppWSWi9MA6aZ1P
+A0L47sTyV4IzHT4IrWe35bllEgD7+KTynx1TYoWOVxiQSm91MVBrxcadcJlxHgcf
+5aYMNW4UB0IeIELR4UKwfo1N4f1sUCz28Jkev8J0oJJi8k0VcEiZPkc4oIYb4o5w
+vW2ZOTXvqg1VlS2tyCGmlpQnrv/upyXgIwjyaHRyg8fYUjFZw/wbB/toIK+qFDXs
+Am46d+XrBquoobePzSFBOr1mM1RWYXrKd6ebSCUHcf0pwnrmBnNVBE4pivDI+Ls=
+=YQUD
 -----END PGP SIGNATURE-----
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[@]}"
 }