gentoo resync : 28.04.2021

4 files changed, 70 insertions, 23 deletions

diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 0023287af477..96e8a1aaaa03 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,11 +1,12 @@
 AUX mupdf-1.10a-add-desktop-pc-xpm-files.patch 13387 BLAKE2B e0100380b328cfd8ce6099c35886a6f2e9508f6d08c678dbc1386e88998d01bdacd160020dc6ceefffbe09f4cf2b64d08acfb76f8535ffcc0dc93c65a3a2da78 SHA512 1d6ccfccf785cca01b1a607e94f90a5e31c748154e9fa7664b9863c7b26951f17a584ffc7cd23dd83d1e547498e22c902067e9695006824017e69d33dbf25a5b
 AUX mupdf-1.15-CFLAGS.patch 376 BLAKE2B ace255a4110df9200d627ac68f5950218eeaa993bbd37fa7fe2d676572cad02d50a632750e6a9bdf6269cd97501f709d075a79d7db8b9832909b59b33251b594 SHA512 c00cd5cb30d33a9cbc55557cab3c4e2be1ae86121c5b1b28b6e35f97f93751aa2e96e106f13b7f365a56ebcce8e1c5e4163a440e8c85a48130803f5a7aec63ed
-AUX mupdf-1.15-openssl-x11.patch 735 BLAKE2B 03e53970a145db913bad9c03de899ffeb7eed3abfad4d3db15819d5e101ba03e376fc0faea9c4939b7167b276fffe022975bae2e99238d5b4bee92edfb924fd5 SHA512 028930d5e6c86a9052de6e1e0f3e937d89a3f22e10b7fb71f1dba998c480c9914520e4248c21d68291c6fd7684c627b5068c1bb2e027ff6a518d1ca5533eb677
+AUX mupdf-1.15-openssl-x11.patch 668 BLAKE2B 40810d21718e0f30e47e3d61fc3c10442568565e519d2713f952fb11355fc532717ef2df40a074c0c79ed725d34e639e9fbde02694b5ae7a76ae9a9ef9a36acb SHA512 89cd9bbef7c7e920aacf1de4a513fb98199ff2f033818b617203a4517a2aeb7ad5ed4a3720ceb6dec370560d85759c973a7c15d9a47924d0c3d51cd3a9c6ad5b
 AUX mupdf-1.18-Makefile.patch 1246 BLAKE2B e0054c441b067ef4aec069cb0fd4342f16919af51ac53096f20a2dbc87a81e2bece8478441df493d6825eedca53f4c9634cfe8724980da119d0ac20035a4d423 SHA512 def7524e0468ca15220b2d9c718ef61da4ce007c43f591ae3ad80afe55f86549985b1c5ec3d3d266045a0a6ca399580f8f4e001893d4feaabb7785a8a4df278e
 AUX mupdf-1.18.0-CVE-2021-3407.patch 1597 BLAKE2B acd956c6b2c50f1699af32c264c38bc2bd7c6d07de2b3d52b28aa44d63766f6a3f5d95400b0d364c4baf3949022bba6e7be33ae7c33831308c2e006fe8d061f6 SHA512 c63da7cd1c245e7b10a6823998a42398981c16ec87d059779d14d44f2c5d87adcd58b0d7b758e6aa22c04f7cc68f3989b882456122ca1cc9d6cd0a5ae79ca21e
 AUX mupdf-1.18.0-cross-fixes.patch 5830 BLAKE2B e91e41b4889f2716d20b112b18924799db5d21274feb3699f2bca04fd3d93528d86e2ef05ccf25d1a0800e81a333d0703f837d45fef926746aeec1ece60c6ced SHA512 0e7a91474c3f31a5d5f7ddc461d74f1bc0cc8de7eb7bedbaa0f6335a6038327f5c7261d16baade5dba567b3d1ad49adf7a65ea40b226fca5f1eb58cc7bc0b07a
+AUX mupdf-1.18.0-darwin.patch 1001 BLAKE2B 1d6f8452cda38dfca3b0e62069a560ed6119d02b391eb29740d093883a7eedb776df7d7a561fb116eee3315bd497a64658927d299af8315d0dc8215e300e192a SHA512 6ed41a5b61859cc6fdac2b5c93fbb6e6e16dfd9540d0950e702935c28e3793006d72dd178a95d6ccb06d1b76b5df7dd439006bbe5d98210c2985ee91c263d755
 AUX mupdf-1.18.0-fix-oob-in-pdf-layer.c 3462 BLAKE2B 861f5d6d0f81aed837d19ed19ba54158856bed5cab3ce8202bad11bb509b017e554ea37d9ebd05213386251b26bce10f83311c3de99fe663bf2995adc1231a9e SHA512 91620d0d429d2f4068e1834ec9466d9e9f9bfb363fba33247636e38651196580a89bd36785e42b31328070c42bd2210585ddabea8a0a970d72e7066e61804d6c
 AUX mupdf-1.18.0-fix-oob-in-pixmap.c 1123 BLAKE2B d49194b540b489ad9d3a4b5057bbe6ac3a1414d0123b7c2d4710adad1ed7fd439f8e83162d07a86aee6bd778c35ea6798da166461ac6e358af6910cc6b492624 SHA512 1d836c1a3f37c21ed349da799d5cb0c57d3fc275a632a42343cda81aae76394273c06230fc9c22a6d5366498b51a057d5a11797376a4b2af96b937618ba31e11
 DIST mupdf-1.18.0-source.tar.xz 53621544 BLAKE2B d0057f4240bd4f6b4b6d9381ae1c3871c56b97604d5c6ea6438a8bde72d4696c10a9f0e8e2ed8f43d63a04bb1d973bade8a708327c00b0d0c6802b28af697a55 SHA512 7551f18b9bac6e2dc1cf073741cbc975ce3a16dc7e37c9d5a58254c67bf2c07bb36185d6585e435d4126f3ae351f67d7432d19a986c9b47b15105ca43db0edb8
-EBUILD mupdf-1.18.0-r3.ebuild 4204 BLAKE2B 830de2bc9308efbe316af379c226f011c48318130094e7e3766ffb883b86b522712d7f094948cce82b7a18e4e25a8e66ba532a1146b7d28d0b30a6d15a02df4b SHA512 ab4f14683ef92059f40ac96dc44cbe198c5e09ecef4c15b3a1c714d7fb3086c2965de578bea18917fd8cfe03a5b71b3edbe668629b18dfe80487410836c14070
+EBUILD mupdf-1.18.0-r4.ebuild 4259 BLAKE2B c95febaeb6be6ccef3c48ee358e3f1f32e37af133bf3885dbc381efbf0fa9a85d81f50efbebd7da36d70c339ca465b3670db1daec0061c876ff9ee52a765a65d SHA512 827ae51bdf6613893eddee22708c8fb5ae6322752afc76cf1eae0386f3f610f5e26697e0c68729a65fec0bfcf6ba3d8eeee82544ad9d4d4c7bf5c440ae79b044
 MISC metadata.xml 345 BLAKE2B 6adf08490e4a701eeb6ab07c2e5619cff42ff02bf75ec38fd94f215f000972f0b3d88c8b0fab827728dd12d7906dd580b7650f11da1d77964eb5fddd773ee4a9 SHA512 32902c1fac57a44927a53dbb52fb22cb04317bcdf3dd2ae8e9863bef557178e33565bb122e128908c61ade9a5e2d1f067c530ff05e7ed0242eccf193e6fa2026
diff --git a/app-text/mupdf/files/mupdf-1.15-openssl-x11.patch b/app-text/mupdf/files/mupdf-1.15-openssl-x11.patch
index 22829279e147..3f3aac4c933a 100644
--- a/app-text/mupdf/files/mupdf-1.15-openssl-x11.patch
+++ b/app-text/mupdf/files/mupdf-1.15-openssl-x11.patch
@@ -1,5 +1,3 @@
-diff --git a/Makerules b/Makerules
-index 298b5737..b2079435 100644
 --- a/Makerules
 +++ b/Makerules
 @@ -119,13 +119,13 @@ else ifeq ($(OS),Linux)
diff --git a/app-text/mupdf/files/mupdf-1.18.0-darwin.patch b/app-text/mupdf/files/mupdf-1.18.0-darwin.patch
new file mode 100644
index 000000000000..cdd8ccf0f40d
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.18.0-darwin.patch
@@ -0,0 +1,41 @@
+--- a/Makerules
++++ b/Makerules
+@@ -117,11 +117,11 @@ ifeq ($(OS),MINGW)
+ else ifeq ($(OS),MACOS)
+   HAVE_GLUT := yes
+   SYS_GLUT_CFLAGS := -Wno-deprecated-declarations
+-  SYS_GLUT_LIBS := -framework GLUT -framework OpenGL
+-  CC = xcrun cc
+-  AR = xcrun ar
+-  LD = xcrun ld
+-  RANLIB = xcrun ranlib
++  SYS_GLUT_LIBS ?= -framework GLUT -framework OpenGL
++  CC ?= xcrun cc
++  AR ?= xcrun ar
++  LD ?= xcrun ld
++  RANLIB ?= xcrun ranlib
+ 
+ else ifeq ($(OS),Linux)
+   HAVE_OBJCOPY := yes
+--- a/Makerules
++++ b/Makerules
+@@ -122,9 +122,7 @@ else ifeq ($(OS),MACOS)
+   AR ?= xcrun ar
+   LD ?= xcrun ld
+   RANLIB ?= xcrun ranlib
+-
+-else ifeq ($(OS),Linux)
+-  HAVE_OBJCOPY := yes
++endif
+ 
+   ifeq ($(shell $(PKG_CONFIG) --exists freetype2 && echo yes),yes)
+ 	SYS_FREETYPE_CFLAGS := $(shell $(PKG_CONFIG) --cflags freetype2)
+@@ -197,8 +195,6 @@ else ifeq ($(OS),Linux)
+ 	PTHREAD_LIBS := -lpthread
+   endif
+ 
+-endif
+-
+ # The following section has various cross compilation configurations.
+ #
+ # Invoke these as:
diff --git a/app-text/mupdf/mupdf-1.18.0-r3.ebuild b/app-text/mupdf/mupdf-1.18.0-r4.ebuild
index 21ae5eb3fcf4..db2b4ba6fd92 100644
--- a/app-text/mupdf/mupdf-1.18.0-r3.ebuild
+++ b/app-text/mupdf/mupdf-1.18.0-r4.ebuild
@@ -8,18 +8,17 @@ inherit desktop flag-o-matic toolchain-funcs xdg
 DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
 HOMEPAGE="https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git"
 SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
-S="${WORKDIR}/${P}-source"
+S="${WORKDIR}"/${P}-source
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 x86"
-IUSE="+javascript libressl opengl ssl X"
+IUSE="+javascript opengl ssl X"
 REQUIRED_USE="opengl? ( javascript )"
 
 # Although we use the bundled, patched version of freeglut in mupdf (because of
 # bug #653298), the best way to ensure that its dependencies are present is to
 # install system's freeglut.
-BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	dev-libs/gumbo
 	media-libs/freetype:2=
@@ -30,21 +29,20 @@ RDEPEND="
 	virtual/jpeg
 	javascript? ( >=dev-lang/mujs-1.0.7:= )
 	opengl? ( >=media-libs/freeglut-3.0.0 )
-	ssl? (
-		libressl? ( >=dev-libs/libressl-3.1.4:0= )
-		!libressl? ( >=dev-libs/openssl-1.1:0= )
-	)
+	ssl? ( >=dev-libs/openssl-1.1:0= )
 	X? (
 		x11-libs/libX11
 		x11-libs/libXext
 	)
 "
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.15-CFLAGS.patch
 	"${FILESDIR}"/${PN}-1.18-Makefile.patch
 	"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
+	"${FILESDIR}"/${PN}-1.18.0-darwin.patch
 	# See bugs #662352
 	"${FILESDIR}"/${PN}-1.15-openssl-x11.patch
 	# General cross fixes from Debian (refreshed)
@@ -69,14 +67,12 @@ src_prepare() {
 		-e "1iAR = $(tc-getAR)" \
 		-e "1iverbose = yes" \
 		-e "1ibuild = debug" \
-		-e "1iprefix = ${ED}/usr" \
-		-e "1ilibdir = ${ED}/usr/$(get_libdir)" \
-		-e "1idocdir = ${ED}/usr/share/doc/${PF}" \
 		-i Makerules || die
 }
 
 _emake() {
 	# When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
+	#
 	# Bundled libs
 	# * General
 	# Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's
@@ -100,19 +96,24 @@ _emake() {
 	#
 	# [0] https://git.ghostscript.com/?p=mupdf.git;a=blob;f=Makethird;h=c4c540fa4a075df0db85e6fdaab809099881f35a;hb=HEAD#l9
 	# [1] https://www.ghostscript.com/doc/lcms2mt/doc/WhyThisFork.txt
-	emake \
-		GENTOO_PV=${PV} \
-		HAVE_GLUT=$(usex opengl) \
-		HAVE_LIBCRYPTO=$(usex ssl) \
-		HAVE_X11=$(usex X) \
-		USE_SYSTEM_LIBS=yes \
-		USE_SYSTEM_MUJS=$(usex javascript) \
-		USE_SYSTEM_GLUT=no \
-		HAVE_OBJCOPY=no \
+	local myemakeargs=(
+		GENTOO_PV=${PV}
+		HAVE_GLUT=$(usex opengl)
+		HAVE_LIBCRYPTO=$(usex ssl)
+		HAVE_X11=$(usex X)
+		USE_SYSTEM_LIBS=yes
+		USE_SYSTEM_MUJS=$(usex javascript)
+		USE_SYSTEM_GLUT=no
+		HAVE_OBJCOPY=no
 		"$@"
+	)
+
+	emake "${myemakeargs[@]}"
 }
 
 src_compile() {
+	tc-export PKG_CONFIG
+
 	_emake XCFLAGS="-fPIC"
 }
 
@@ -124,6 +125,12 @@ src_install() {
 		rm docs/man/${PN}.1 || die
 	fi
 
+	sed -i \
+		-e "1iprefix = ${ED}/usr" \
+		-e "1ilibdir = ${ED}/usr/$(get_libdir)" \
+		-e "1idocdir = ${ED}/usr/share/doc/${PF}" \
+		-i Makerules || die
+
 	_emake install
 
 	dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so