gentoo resync : 31.01.2018

4 files changed, 65 insertions, 9 deletions

diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index 2ed312062375..e04cd6ef5e4f 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,4 +1,6 @@
 DIST zathura-pdf-mupdf-0.3.1.tar.gz 9755 BLAKE2B bbacecd503bda14301e1111799bf8fd82aa1488d4db5a28db7c0805b1e1391c038be64a0f4c64be974c2173396f972115ec6300686f34ac9b8b3e7e091d7ae5c SHA512 87b5b8a750a6911be37a0195b0f4bc3304350f9d29173091b3eeece40350b10cb98b009b2722a69ae1e617b4242292f3eba17fea97d5276e485069180f2bd67d
-EBUILD zathura-pdf-mupdf-0.3.1.ebuild 1067 BLAKE2B 752b5fe80f5fd71ab0acae672bcbc3b1797376ef15e1639b72c7683e6f763a1e1761c5b2648ac3883ef129034953289e95bde9707e66476e2eee54590990b994 SHA512 5c7e87e45a69d3825603b0daac4c6059b65d4159e6773ee4c4c93d648f8b40a7348221e90bbe68678d747a2a4fffbc16d4254ea54e508ff694702cbffa6efe58
-EBUILD zathura-pdf-mupdf-9999.ebuild 1065 BLAKE2B a6e7d7e5d15bfe3c990042df363b67d3c535299356623e945ba6dd9907cbdf14b4a4f3272c878303cd4cb02302fea27cd37e154ce4e8982c684da298d5a9b47c SHA512 e2f18d3064982da07fa0a4dee55218f6caa9404f748000a90863984f0714dc2044be14533a6fdefebec4cc348646117e4bc447f4c7e1cfdfadb8812b4c433fab
+DIST zathura-pdf-mupdf-0.3.2.tar.gz 9687 BLAKE2B 53ec5997c69ee160f60b90ba83ab15bff55fcd14f22b34cd54bf226a57d71d1fc95e62c2daac97f0285eee6bf6cd71e9c49a5f97920d19860c58bcc9d568deae SHA512 f6273923d0c1d7f6fad5cc3369c35fff9f87dabcb726d5ab4f814775f5e8783c552cbac7ad1381f3c6d91753698d64a96c7e76e0b8b5a16d9c28147fbdeb3089
+EBUILD zathura-pdf-mupdf-0.3.1.ebuild 1093 BLAKE2B d394921870e0cd321d0b98648ae1676787393fd3967ad7885d7f8e21b46843b0f488a49c63343bbd4adcc38af46e99d6fcfe189754fdbefdd3dc7d6fdfc77fbb SHA512 7e4d97e84f2ed0feca1d0778199e731aa205606d3c573816841ed0f53fd14b8642280de00ab1830d5d066c16773b71e8484c9d92cb04412191fd0ef55ef3c634
+EBUILD zathura-pdf-mupdf-0.3.2.ebuild 1075 BLAKE2B 57f54296611fdab7fc827ba64a5529919d532e7e89fd6210b5547e02633c55ab6ba75edc2c6efd8d47c9684c37f020cbcccdd71cfe7b3ba2ecf318109880da06 SHA512 231cd7f38a3b2d6e86ee9e3749d85ea17d50dd1f31c9ff5247079ecd7b0ccb5fd2184794849f3edbb5e4fe5ae06fbbc4544345179f04f10f179f00007fe454b9
+EBUILD zathura-pdf-mupdf-9999.ebuild 1075 BLAKE2B 57f54296611fdab7fc827ba64a5529919d532e7e89fd6210b5547e02633c55ab6ba75edc2c6efd8d47c9684c37f020cbcccdd71cfe7b3ba2ecf318109880da06 SHA512 231cd7f38a3b2d6e86ee9e3749d85ea17d50dd1f31c9ff5247079ecd7b0ccb5fd2184794849f3edbb5e4fe5ae06fbbc4544345179f04f10f179f00007fe454b9
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.1.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.1.ebuild
index afb28a916dbb..88bff2989670 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.1.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,6 +23,7 @@ IUSE=""
 
 RDEPEND="!app-text/zathura-pdf-poppler
 	>=app-text/mupdf-1.10a:=
+	<app-text/mupdf-1.12.0:=
 	>=app-text/zathura-0.3.1
 	media-libs/jbig2dec:=
 	media-libs/openjpeg:2=
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.2.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.2.ebuild
new file mode 100644
index 000000000000..6ff77ca5cd96
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs xdg
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+
+DESCRIPTION="PDF plug-in for zathura"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE=""
+
+RDEPEND="!app-text/zathura-pdf-poppler
+	>=app-text/mupdf-1.12.0:=
+	>=app-text/zathura-0.3.8
+	media-libs/jbig2dec:=
+	media-libs/openjpeg:2=
+	virtual/jpeg:0
+	x11-libs/cairo:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	myzathuraconf=(
+		CC="$(tc-getCC)"
+		LD="$(tc-getLD)"
+		VERBOSE=1
+		DESTDIR="${D}"
+		MUPDF_LIB="$($(tc-getPKG_CONFIG) --libs mupdf)"
+		OPENSSL_INC="$($(tc-getPKG_CONFIG) --cflags mupdf)"
+		OPENSSL_LIB=''
+	)
+}
+
+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 9b166e7d5b50..6ff77ca5cd96 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs xdg
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~x86"
 	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
 fi
 
@@ -22,8 +22,8 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="!app-text/zathura-pdf-poppler
-	>=app-text/mupdf-1.10a:=
-	>=app-text/zathura-0.3.1
+	>=app-text/mupdf-1.12.0:=
+	>=app-text/zathura-0.3.8
 	media-libs/jbig2dec:=
 	media-libs/openjpeg:2=
 	virtual/jpeg:0