gentoo auto-resync : 30:12:2022 - 02:16:21

4 files changed, 28 insertions, 3 deletions

diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 816039723f45..3c0d1ec15e07 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -6,6 +6,7 @@ AUX mupdf-1.19.0-cross-fixes.patch 5740 BLAKE2B dcc38e628e1c0ddde9647d06ea8c5812
 AUX mupdf-1.19.0-darwin.patch 1056 BLAKE2B ae532c2d68842c3a1bb424c707a51a5ed56a72e7557e89b3830ac55bc713982065d1ec7055b84b91589c8b98a690d037c0fb6c90480fd89989e0f90cc49f9b97 SHA512 24cb6885c174bbfbe5ddc2e8f9a15c5154aa5699a19b5931d60ebb761a7587d717dbb65fba45070f963c0c3f432f8f58c00537d10b050546173a48f5c729a7c4
 AUX mupdf-1.20.0-lcms2.patch 2512 BLAKE2B b641519f069c43ef2e9efdf0e18418e663e3fa39d1fb2a0a4b759f8af0412e3a63f212961d80430de86a8ea3d8228ece07e2a04cbe08ccbe330afcbad18e3527 SHA512 d25a843286f9376f17cc73dd974835eaa7be7a0a7b26fab338ae5b3cf54588f476538c73e3053edc2367bd5856eb1af0ebbffce426f7da287784dcb0ee3fc684
 AUX mupdf-1.21.0-add-desktop-pc-files.patch 845 BLAKE2B 8fa08810dd0b797af517c7932a2b81c080721155f607970664ca68a8eb4ec53bcfdda417790bf002aff1b1e1e8257d67c3a2e6bf6d500ee50cc03a7f440b60c6 SHA512 96835698141898a9509321c6125d5bfce1b31d3a0329d3c2be55d9026cff65204112a8ac0774ece1ac1ca7a1ce3dc534437aca1a76eb7716317b2c7e648e549f
+AUX mupdf-1.21.1-no-drm.patch 586 BLAKE2B dad2f0544153830cd8fff32a667edc229e5f149f4a474af065bb3e4b47d0508125077810a652b63837cafa5c441223eb2993a51c8be25809793aa2c098018947 SHA512 6149a8527a3025cb3b9ddc97db8d2638a4f0653b55fd78a86a97aefd2bf44d8b35c42e31c79558d8e8ec396427577ddb792e85e4055b4e4c8d704ba510378579
 DIST mupdf-1.19.1-source.tar.xz 64884172 BLAKE2B a0dc3783c70cee1b7eb48d1658eb48186e35a42513aa9e98f7155bb82ed771ed0c5d5032013d09d93cdca4f49deda65553fe0e1af7645893722dafa855b2c958 SHA512 d6bc5b6adb6a418de50021864f4b3a75da653fa534eeedbfe9875cb202efeb13efdec66b4d108ca8fa6b0dc76733468b214e5fdf331bebc35fc6f722203fa3f7
 DIST mupdf-1.20.0-source.tar.gz 88455853 BLAKE2B 686d8b02972fc6cb7fa4541e4f0561c11e616f800decd20a79f23b577977785633bd3e17e2007f621db97dab6db1fcf500ac8e283984fbe675a25e7a4301b75b SHA512 6837299c589ece9cc443b027433fa3eee545f5155aeb6359b7a43da239d2e99195e9ae3950ddec6cb6ebae77bc877573c6f89a90754c58723d7e87d9739ed1f4
 DIST mupdf-1.20.3-source.tar.gz 88457290 BLAKE2B b16abfd4d9ac8123f1be60350d6124b8f36b6e8260f266d4dc7798610819128519944de8179a9e5453bc28da695ef8557fd8d755439113e520a8cad19039e52f SHA512 ed3fe09971223c500fb85558bb3f8c4a605c82fca3cd2217cdf4758e44bdfe3ef4106c95037d7a8ea536117414e5acbfa14aa736bfb7e33e591050c12c07a0ee
@@ -15,5 +16,5 @@ EBUILD mupdf-1.19.1.ebuild 4490 BLAKE2B cf556d6ba654118ccd0316fb75f2f970cb96990f
 EBUILD mupdf-1.20.0.ebuild 4750 BLAKE2B 9675a86e5f8bbf05933f49d422adb3d3d246953c7abe80eab58d75946265b4e5b4b17ed3e64098bc4fa5b1b0537884263ce50a084bf4f9109bd8f217212a2541 SHA512 591df3401dee953bb51499fb754e13127e32737dcbde3d924b02d713b1de8a7736e2c1bc123c24e5fb31a530a49c7a7eab0fc47ae8b9a22aea1206bb8df07989
 EBUILD mupdf-1.20.3.ebuild 4780 BLAKE2B 399303c48befa35538363af41b5b0a888715cb152dba91f6de31ea96b03bcc0e312f287f005483a9ba3d09096ebc55cbf1ce56a9848ad68de496a9eec90cbf00 SHA512 386d319b390e90920d877ff68bc62594e7e99ad5b8aa2218f7b8b058559b9cff81dcb75aa0c7651fe15992e8dfc7cbe44d594d39f7399643a371aa5b9e551f23
 EBUILD mupdf-1.21.0.ebuild 4750 BLAKE2B c41d5e0bdae99e855c69e176d93612826bff39179ccabdd0b78b4da1882e014ed1a2aaf17db10fe2d520c162e939203ac61583db0b9cc2159b7a1c143dee2206 SHA512 e20aff284df761a4293577027826a2fcea65d6771849e5867ef9c5c675ebdde5d3ca667ba23439c3def33617ddeb44a70fb9c74c708ae51dbc674067978388d3
-EBUILD mupdf-1.21.1.ebuild 4758 BLAKE2B 93c141acf40f727c836a2f90518b714af85737001b61902e35121b6bbaea1918da20edc57a5cb1d63f0ffd7a35f011b7ed87bfe534d476bf67ddae7e7b1b8209 SHA512 5ad58e0b978432bb8a38be07ef0e82c69c502d0298d9fb8b7931c301756828e01f140f30c407ca9c10f9af0625919f2cf9ab00614293d0383242a3eabb9eaaf7
-MISC metadata.xml 405 BLAKE2B 8b71db6f16bfb481e524a331eac615661b267d2d2fddde3aa6c9244b75026eacada167e2ed2ad6e7611bad234b53c0b073063925ae6745832585771d5342c913 SHA512 23f707e5ed833c5901d482e0d9cedbae751434311d8c67e7b300b452faabd958eb0c12a5b1c48a3c6d4773891cf3c7426d60a85eecd4b3ceb3358f68f4c8ad87
+EBUILD mupdf-1.21.1.ebuild 4840 BLAKE2B b3a7598c17b1034db02348f844d78c940c57d8d521b3db7054b44c46afa120f164ad27db770ba0da8913cdd03a58b428e5143dfa64e940e5e96e924db0a2dca8 SHA512 14c5c17fb0f188e94c4cd5eae39c475dd553b7384008adb37b78ac98ffcb03a0b3bf92671ed2238bf68bfbfca949391de94520a50aaee8600e36f0798aba6108
+MISC metadata.xml 497 BLAKE2B 35e16ef688aa8b046f3e8ceaa7399da31379ba50b2cbc36d842696d1589aeea5a55eede13d79188f08ae8ff411c16385128633a1fbdaba04ee115158ac7e529b SHA512 225727e22fe2756480f3d502f49a62abbd0fe09d6266c1e00c09b04c2b5da181fc46bb06b19020290fa857b1feb0d557e6a77084f6269b5e0fdfec593cd46709
diff --git a/app-text/mupdf/files/mupdf-1.21.1-no-drm.patch b/app-text/mupdf/files/mupdf-1.21.1-no-drm.patch
new file mode 100644
index 000000000000..9f2b9d692f4e
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.21.1-no-drm.patch
@@ -0,0 +1,18 @@
+diff --git a/source/html/epub-doc.c b/source/html/epub-doc.c
+index f764242..83888dc 100644
+--- a/source/html/epub-doc.c
++++ b/source/html/epub-doc.c
+@@ -692,10 +692,12 @@ epub_parse_header(fz_context *ctx, epub_document *doc)
+ 	epub_chapter **tailp;
+ 	int i;
+ 
++	#ifdef GENTOO_MUPDF_DRM
+	if (fz_has_archive_entry(ctx, zip, "META-INF/rights.xml"))
+ 		fz_throw(ctx, FZ_ERROR_GENERIC, "EPUB is locked by DRM");
+ 	if (fz_has_archive_entry(ctx, zip, "META-INF/encryption.xml"))
+ 		fz_throw(ctx, FZ_ERROR_GENERIC, "EPUB is locked by DRM");
++	#endif
+ 
+ 	fz_var(buf);
+ 	fz_var(container_xml);
+
diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml
index 5d2f87cc3174..c0d61774dbcf 100644
--- a/app-text/mupdf/metadata.xml
+++ b/app-text/mupdf/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<use>
+		<flag name="drm">Enable support for Digital rights management (DRM)</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-text/mupdf/mupdf-1.21.1.ebuild b/app-text/mupdf/mupdf-1.21.1.ebuild
index 87efa898ece6..ac2702bc5da4 100644
--- a/app-text/mupdf/mupdf-1.21.1.ebuild
+++ b/app-text/mupdf/mupdf-1.21.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${P}-source
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
-IUSE="+javascript opengl ssl X"
+IUSE="+drm +javascript opengl ssl X"
 REQUIRED_USE="opengl? ( javascript )"
 
 # Although we use the bundled, patched version of freeglut in mupdf (because of
@@ -52,6 +52,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.15-openssl-x11.patch
 	# General cross fixes from Debian (refreshed)
 	"${FILESDIR}"/${PN}-1.19.0-cross-fixes.patch
+	"${FILESDIR}"/$P-no-drm.patch
 )
 
 src_prepare() {
@@ -59,6 +60,8 @@ src_prepare() {
 
 	use hppa && append-cflags -ffunction-sections
 
+	use drm && append-cflags -DGENTOO_MUPDF_DRM
+
 	append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)"
 
 	sed -e "1iOS = Linux" \