old

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

8 files changed, 18 insertions, 135 deletions

diff --git a/app-text/zathura-pdf-mupdf/ChangeLog b/app-text/zathura-pdf-mupdf/ChangeLog
index fed48bd4350d..697df94c4fb4 100644
--- a/app-text/zathura-pdf-mupdf/ChangeLog
+++ b/app-text/zathura-pdf-mupdf/ChangeLog
@@ -1,6 +1,14 @@
 # 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.11 2014/04/04 21:25:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-pdf-mupdf/ChangeLog,v 1.12 2014/04/04 21:25:49 ssuominen Exp $
+
+  04 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -files/zathura-pdf-mupdf-9999-fz_drop_display_list.patch,
+  -files/zathura-pdf-mupdf-9999-mupdf-fz_new_text_page.patch,
+  -files/zathura-pdf-mupdf-9999-mupdf-pkgconfig.patch,
+  -files/zathura-pdf-mupdf-9999-mupdf-split-headers.patch,
+  -zathura-pdf-mupdf-0.2.4.ebuild, metadata.xml:
+  old
 
 *zathura-pdf-mupdf-0.2.6 (04 Apr 2014)
 
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index 3128200371a7..221b58a2174a 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,25 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX zathura-pdf-mupdf-9999-fz_drop_display_list.patch 495 SHA256 396ca8dd10e8079c3702331b47696b076ac2456c2948771b9577304b6c082571 SHA512 41a89026d0ce3904b7f526d5ac1d9bf733cc01a7b4c5cf96da16f173a9c8d0501f0b97cbd914f4d00061bc9fe04bef6841cc6cbbe11409a2b9ae4784ccddeeae WHIRLPOOL ded3648c0d78b9eab1a57b392740115ee020ba78217986857d705529f8c6143c920d805076a43f4a430ce8848ece918a86e62e65b31ba557c0d63749f448379e
-AUX zathura-pdf-mupdf-9999-mupdf-fz_new_text_page.patch 400 SHA256 579e69e50096170059f731ac70a4aaac492db76fde9193bfd66037a794da24d1 SHA512 812c63d9bce07ed18f9e3f2c26626a4c01b14df8474b6880e696e439e4df0867b284369b79f10b7996914b140851906cba8142be8b0f22ae612cc06a174f5844 WHIRLPOOL a88c6b849768362666eaa4e0cfa0dea48cf0d74863d3bf92c14de42c998f4af262f0e8b79edd74e6200f8f792f88c37da75c6587216945f4976df9dfd961c935
-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-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
+MISC ChangeLog 2436 SHA256 38f7ce41290bff242ea9ecd47187fcfc80dbff7de7fa1d20a4a1481eb9bc77a0 SHA512 edd61aad3e3723337d639300213e1d21c7bb81fbe9f4e610e5705954cce6f54af3cd1b8cb6064b4aa79265879d6fcc1620cae20ce3595c320f54df1711d131aa WHIRLPOOL f2826e38949d922bcf7b9332a8374e46450550b8cb90083f158a0cc93d2a5d8a7c9213dcfbafd1d160c2c338288e1664cd48f16d38ed9c2644d65f84a23a3e8f
+MISC metadata.xml 792 SHA256 34611a880defaaaa12f93fb91186e6b302733dac7b65d1e107e55536b916cd45 SHA512 cb3b1a3727d5d43dd5cadf975ead8a37931ee4809879af28ada6d8d2a0d6a71243ec1fe17c1c4f3f20580ce24e13b750007a2144c8bb184eb726ad0877e85198 WHIRLPOOL c4b9034f5d60c8a1f67fe5a53f8fa36c3ffd8c2776eff655e0a62065bc3e33394f765e25fa4a081aba06b61f56abbf4e652796955711b119d0fc5c902965ab4a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTPyHaAAoJEEdUh39IaPFNjeoH/iN02r6YqfSdz6IaEJZBWkYh
-CiQivgRffFD69BGGwswG0sjzSpGnnssfvOWvMS5+zCKjt4xyjCppWSWi9MA6aZ1P
-A0L47sTyV4IzHT4IrWe35bllEgD7+KTynx1TYoWOVxiQSm91MVBrxcadcJlxHgcf
-5aYMNW4UB0IeIELR4UKwfo1N4f1sUCz28Jkev8J0oJJi8k0VcEiZPkc4oIYb4o5w
-vW2ZOTXvqg1VlS2tyCGmlpQnrv/upyXgIwjyaHRyg8fYUjFZw/wbB/toIK+qFDXs
-Am46d+XrBquoobePzSFBOr1mM1RWYXrKd6ebSCUHcf0pwnrmBnNVBE4pivDI+Ls=
-=YQUD
+iQEcBAEBCAAGBQJTPyIJAAoJEEdUh39IaPFNKAIH/ji3yCrLTtbNXn6v/mSrWawY
+X+XFfbbKPPiNz4p2ryQWYpcU9z5ECsB7n99LTq8YwH2c+F/TKcUYKUC5j3LYeC0j
+ynENZnE5geEsaxM63A9V/qse/O3MqXl+udoDkYH6ECu1LaRE0/S7G/7jwsIiBmHZ
+4splNcVQt2q0HP3JxStRbjNFTqIv8XaEoyb0Hh0+Y4EXJRokTHTcGqAg0EHfbL3I
+/pz4K+/jBLE5UzI4XwpI6ugPJPfNk7NGTwHwuvJhCVYv0IEKmDGP5xBXENeVSQUq
+upjfY3ZondqUHZtRdUjCVZ0XrUb0qY5jUlZ5HAFqagNcSUs5vJ1uVP+Pfb3r3WI=
+=LWUX
 -----END PGP SIGNATURE-----
diff --git a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-fz_drop_display_list.patch b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-fz_drop_display_list.patch
deleted file mode 100644
index 3581028c2052..000000000000
--- a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-fz_drop_display_list.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- zathura-pdf-mupdf-9999/pdf.c
-+++ zathura-pdf-mupdf-9999/pdf.c
-@@ -506,7 +506,7 @@
-   }
- 
-   fz_drop_pixmap(mupdf_page->ctx, pixmap);
--  fz_free_display_list(mupdf_page->ctx, display_list);
-+  fz_drop_display_list(mupdf_page->ctx, display_list);
- 
-   return image_buffer;
- }
-@@ -580,7 +580,7 @@
-   }
- 
-   fz_drop_pixmap(mupdf_page->ctx, pixmap);
--  fz_free_display_list(mupdf_page->ctx, display_list);
-+  fz_drop_display_list(mupdf_page->ctx, display_list);
- 
-   return ZATHURA_ERROR_OK;;
- }
diff --git a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-fz_new_text_page.patch b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-fz_new_text_page.patch
deleted file mode 100644
index 5929f2a2cc2c..000000000000
--- a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-fz_new_text_page.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- zathura-pdf-mupdf-9999/pdf.c
-+++ zathura-pdf-mupdf-9999/pdf.c
-@@ -225,7 +225,7 @@
-   zathura_page_set_height(page, mupdf_page->bbox.y1 - mupdf_page->bbox.y0);
- 
-   /* setup text */
--  mupdf_page->text           = fz_new_text_page(mupdf_page->ctx, &mupdf_page->bbox);
-+  mupdf_page->text           = fz_new_text_page(mupdf_page->ctx);
-   if (mupdf_page->text == NULL) {
-     goto error_free;
-   }
diff --git a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-pkgconfig.patch b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-pkgconfig.patch
deleted file mode 100644
index 9159d643b7fe..000000000000
--- a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-pkgconfig.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- zathura-pdf-mupdf-9999/config.mk
-+++ zathura-pdf-mupdf-9999/config.mk
-@@ -29,8 +29,11 @@
- PLUGINDIR = ${LIBDIR}/zathura
- endif
- 
--INCS = ${GTK_INC} ${ZATHURA_INC} ${GIRARA_INC}
--LIBS = ${GIRARA_LIB} ${GTK_LIB} -lfitz -ljbig2dec -lopenjpeg -ljpeg
-+MUPDF_INC ?= $(shell pkg-config --cflags mupdf)
-+MUPDF_LIB ?= $(shell pkg-config --libs mupdf)
-+
-+INCS = ${GTK_INC} ${ZATHURA_INC} ${GIRARA_INC} ${MUPDF_INC}
-+LIBS = ${GIRARA_LIB} ${GTK_LIB} ${MUPDF_LIB}
- 
- # flags
- CFLAGS += -std=c99 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS)
diff --git a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-split-headers.patch b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-split-headers.patch
deleted file mode 100644
index 7b7547b4afb2..000000000000
--- a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-split-headers.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- zathura-pdf-mupdf-9999/pdf.c
-+++ zathura-pdf-mupdf-9999/pdf.c
-@@ -6,9 +6,9 @@
- #include <ctype.h>
- #include <girara/datastructures.h>
- #include <glib.h>
--#include <muxps.h>
--#include <mupdf.h>
--#include <fitz.h>
-+#include <mupdf/fitz.h>
-+#include <mupdf/pdf.h>
-+#include <mupdf/xps.h>
- 
- #include "pdf.h"
- 
---- zathura-pdf-mupdf-9999/pdf.h
-+++ zathura-pdf-mupdf-9999/pdf.h
-@@ -5,7 +5,6 @@
- 
- #include <stdbool.h>
- #include <zathura/plugin-api.h>
--#include <fitz.h>
- 
- #if HAVE_CAIRO
- #include <cairo.h>
diff --git a/app-text/zathura-pdf-mupdf/metadata.xml b/app-text/zathura-pdf-mupdf/metadata.xml
index b5f17efa767d..e21ab424480f 100644
--- a/app-text/zathura-pdf-mupdf/metadata.xml
+++ b/app-text/zathura-pdf-mupdf/metadata.xml
@@ -9,9 +9,6 @@
     <email>xmw@gentoo.org</email>
     <name>Michael Weber</name>
   </maintainer>
-  <use>
-    <flag name="deprecated">Use x11-libs/gtk+:2 instead of x11-libs/gtk+:3</flag>
-  </use>
   <upstream>
     <maintainer status="active">
       <email>mlq@pwmt.org</email>
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.4.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.4.ebuild
deleted file mode 100644
index 24ab84f7dcd1..000000000000
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 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.4.ebuild,v 1.1 2013/06/20 10:54:48 xmw Exp $
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="PDF plug-in for zathura"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
-SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!app-text/zathura-pdf-poppler
-	>=app-text/mupdf-1.2:=
-	<app-text/mupdf-9999
-	>=app-text/zathura-0.2.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
-		DESTDIR="${D}"
-	)
-}
-
-src_compile() {
-	emake "${myzathuraconf[@]}"
-}
-
-src_install() {
-	emake "${myzathuraconf[@]}" install
-	dodoc AUTHORS
-}