Update to newer patchset

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index 3bc51e79cfb240d2d16002fdc8144924cc4dde4b..6f3e5c712daa61317f39661876242c6bb6b52389 100644 (file)
--- a/app-text/mupdf/ChangeLog
+++ b/app-text/mupdf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/mupdf
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.17 2011/08/10 16:48:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.18 2011/08/13 02:53:03 xmw Exp $
+
+  13 Aug 2011; Michael Weber <xmw@gentoo.org> mupdf-9999.ebuild:
+  Update to newer patchset, thanks to Jan Psota for the hint (bug 378983)
 
   10 Aug 2011; Markos Chandras <hwoarang@gentoo.org> mupdf-0.8.165.ebuild:
   Stable on amd64 wrt bug #378427

diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 2322ed1fa9583c614bac89663a47b8f852f558a8..32a3efc7cae9886588f42f8e565650837546bf0a 100644 (file)
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX mupdf-0.8.15-buildsystem.patch 424 RMD160 86c2353b985e1a767c32304c82461ee29bd8f6b0 SHA1 0c28884a67d9ed3711f4df4ab6919f37c3da3e41 SHA256 41933115b462466690b05985a1e1b0cda6194ac5a5753947d378c6d9773d1314
 AUX mupdf-0.8.15-zoom.patch 1287 RMD160 8c449b6586047318bf76ac0a125fd4322f4b5f60 SHA1 50130736687209a892557aebb69ace88ab656f91 SHA256 62a25b7342853bbac783b58c7339b3c6b85a77e20d378e239b55a46d9cacb114
@@ -9,23 +9,13 @@ DIST mupdf-0.8.15-source.tar.gz 3837265 RMD160 0bd7e493f193f44a963e30e57d449e350
 DIST mupdf-0.8.165-source.tar.gz 3775041 RMD160 2fb4c6ad4e9a4dd00cc60fd635377c353823e569 SHA1 17222ebc80a482ef7cdb190d015cefd4821028dd SHA256 cfa00870ef857def5de1a8d20e5a20b21d72a5d31ce4746953539d2299cbc59e
 EBUILD mupdf-0.8.15.ebuild 1489 RMD160 f68975ba24f9b2c130e5c6ae63d3b7e36bd57bbe SHA1 49ed1c42971a8f98a7bdc82a2d61f4200a12dbac SHA256 c4065012a49d5947e824fcef70719fb46916403d16c94929419324b6d449c9f4
 EBUILD mupdf-0.8.165.ebuild 1503 RMD160 7536ee6f8fe69f7d12ba3ca5f3497bdef8060647 SHA1 06f65ff1f6fe6186451ca0fe82a899cc3adcb8cc SHA256 5bc174d6b264939ab7dde4055ae39fb84a4649346dfd42e1aaa78af76aedb7c6
-EBUILD mupdf-9999.ebuild 1513 RMD160 13bd15baaac683d56d0e20b9fd47700875ac47a2 SHA1 f2f6959ca81c082be5be0c654ad607663f3912d2 SHA256 ce582b8cad89fda79a5101c6592a290641cb384962194fb2e9fa2e4798476c3a
-MISC ChangeLog 3315 RMD160 8a0b3635ead2fa3d3b20564a3d98595e020287cd SHA1 3127ab9fa6d75272b5808469cf9338701f96326b SHA256 a80d25b4be97378c75ff40dbef432f952526f11d8063cabbbc57f66bb1b2bb4e
+EBUILD mupdf-9999.ebuild 1522 RMD160 81708ffd6ee9850a64c38e44ffa94d5fcc1e8752 SHA1 8698f46877f52eeab13b92d770f3a9de2c5a24b2 SHA256 89874a9ee422e2861c315a3a2d7b9cc612ddcc67388efcb8fecf49a6fa7ffd1d
+MISC ChangeLog 3450 RMD160 3b722c317ee193cbc588eb8f8a73a303369acb38 SHA1 5db30e6aa7ab1b7cce4edf785bea7b957727ae48 SHA256 194a7036987d482cb6c57d4cc804c4658475a2e44ef3c692c9106d3896a02582
 MISC metadata.xml 245 RMD160 6b03982a4d5f32d9fa6b9259ae36f9fcb07c8404 SHA1 fb16c7b4c5ab071dd979f761b8bb075f5396b737 SHA256 375a1da02cd2c393ce2378a73c1ce08134bc030b3bb378c6a4d6ca9cd5be1f8d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOQrZDAAoJEPqDWhW0r/LCF+sP/iw2bS7AJYyTw9YCt80NQBp0
-N/Lv+AsWsC9aRhy7JgNwCUq9z3FxMXYaS5/UIkoW3ihaUfdhAU675Lm88cmIPI8d
-LO7+pi9QyLJlgWk4kJnk+5vlvvmKGYqbW0Pz4jQLbKydeevqH/y8K+RvwwdZk+rJ
-o5dWk59jbep2zPCgQwYb3OIrSsdoos4Qv3KKhDY9VBQCT1lSmu7hDKczpcz2ZSj1
-9scJ6ZWU336m5ssOd/VR5/CEyp+nRf9UklaEv4Cs+O8qoMk45ximaapMiqQhH0DE
-Ka8o107Qtu6qQZCR/ro+poyY4SGABTEzbldwJidkUsP8j624J1lV8o9jUTwk2YxU
-rOcjSnjQcqI/zec62YenMJ6Zs/LjKcQqbqaSHxrgpxbG3IvO+r9KySRkX5UcHRGe
-6SXkIRUYl6uLVtAd6X/bv/DFauGp5zTn43hQePwcqWSJt9DqdgVfM9lNcbwFB3Ta
-Aj8Y2rZPaKYiLxg3kP5BsBMG/JEQrt7RSnG72VbqhsFSADTAO/vrbclxCqYYXizQ
-6aUXtxUM4MIm9CKFy4LLur9t10IZdSzBeGff4bafpnrugulQkLKXIe8Iy1AfcjXK
-scL9joGra88TUGupuoC48U8poBwVsTqGY3F9JF7rJycpIb46A1QNffxKuRidmFk/
-nsm+3keBtmk5tlwyUIVL
-=8hyo
+iF4EAREIAAYFAk5F50kACgkQknrdDGLu8JDfbQD+NyxtH9SP9bja9DuYXB3iNeC+
+FJyQTEt+PvvQZCeMAVAA/3EyLHZuKO1d0E0/5gOpAP2GokDR5oUkdulxXZePOrcx
+=4Glb
 -----END PGP SIGNATURE-----

diff --git a/app-text/mupdf/mupdf-9999.ebuild b/app-text/mupdf/mupdf-9999.ebuild
index 03f2ba688985a10e313755baea3057b5dfb16a66..cd052a4bd09639d73b8b9a18913c7baf2f6882c5 100644 (file)
--- a/app-text/mupdf/mupdf-9999.ebuild
+++ b/app-text/mupdf/mupdf-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.3 2011/03/29 14:13:56 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.4 2011/08/13 02:53:03 xmw Exp $
 
 EAPI=2
 
@@ -27,21 +27,22 @@ DEPEND="${RDEPEND}
        dev-util/pkgconfig"
 
 src_prepare() {
-       epatch "${FILESDIR}"/${PN}-0.8.15-buildsystem.patch
+       epatch "${FILESDIR}"/${PN}-0.8.165-buildsystem.patch
 
-       use vanilla || epatch "${FILESDIR}"/${PN}-0.8.15-zoom.patch
+       use vanilla || epatch "${FILESDIR}"/${PN}-0.8.165-zoom.patch
 }
 
 src_compile() {
-       local my_pdfexe=
-       use X || my_pdfexe="PDFVIEW_EXE="
+       local my_nox11=
+       use X || my_nox11="NOX11=yes MUPDF= "
 
-       emake build=debug ${my_pdfexe} CC="$(tc-getCC)" verbose=true -j1 || die
+       emake CC="$(tc-getCC)" \
+               build=debug verbose=true ${my_nox11} -j1 || die
 }
 
 src_install() {
-       emake build=debug ${my_pdfexe} prefix="${D}usr" \
-               LIBDIR="${D}usr/$(get_libdir)" verbose=true install || die
+       emake prefix="${D}usr" LIBDIR="${D}usr/$(get_libdir)" \
+               build=debug verbose=true ${my_nox11} install || die
 
        insinto /usr/$(get_libdir)/pkgconfig
        doins debian/mupdf.pc || die