gentoo auto-resync : 09:01:2025 - 06:41:15

6 files changed, 128 insertions, 44 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 2db9dd908d46..08cca52a4a1e 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index b65d8acf124b..6115509443fa 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -1,6 +1,9 @@
 AUX highlight-3.57-qt_libs_lua.patch 334 BLAKE2B 6cd387009986ef29f309dc52668f08c404ca7f744c8d1c6d1bb8ed47a392834f4ce9c8474397c4294fc40633501d52754caa0938ea84d9b050800a33db46e5cc SHA512 db298ed4a12e90c8745d7307fd916dd73f3fc62bd306fec279d9c38973e3556425ca7b90759b03e645983c35de298b3d28e80bdcde5ece94b480ee32d7742a18
+DIST highlight-4.12.tar.bz2 1501961 BLAKE2B 39b8ded3588a65e3a570a11c007ecbaf3ec61bf79bd412f1c29a5d130007a1b9fe8ab0d6b32876891f55cf5ec5d69448632c1b4ed38dd127b6cbbda7850d0b92 SHA512 6174f00adb28182b2eddf087458c04e0914f74d515615f36f11181225ab4d964bc7c9d08145f58f285fbd3c30759248f99df1274f80cfda8c53a1f3f0016cb0f
+DIST highlight-4.12.tar.bz2.asc 488 BLAKE2B 7a63fcee8093c5cd9d2d1da26f4c6f20e7319ab6ea2b2fb7d56e8c0a72165495a823f7d767e65261179393cf9b67452c8cc1b1f84bf80cabccb5c67b0f3cd90f SHA512 c14ee33b4ded0fd1a0d936c839ca87152660d1f8ad3c32b0c693bb845b510e482cba745149d1df1f8ce526fa009db4031b3843aa30ac30c7a0bf3a7f0fdb6438
 DIST highlight-4.9.tar.bz2 1498248 BLAKE2B 09ff0a5cc81da45270a8382dc6b2a2d3b44d1f084e661fae4a3d39d2ded9af6c77b1fb0d51d32c59f22ccba1612ab7faf68b5e918dda70c9f2e25b29b5c44ecd SHA512 280abd98182c5b95f629ca126e8a59ca6bf6f9e301fc7678aa3e4cb37b714827dfdfab1e008c798e203c7408355be63e01e88f93eacfcf2c5fad95afc6e22112
 DIST highlight-4.9.tar.bz2.asc 488 BLAKE2B cbd3541f65ec714ff1fda17fb141aa19f53952634a2027819fdbf50f7cf781f875b76ebd9a82119347f17940d8200f856082dfff51ff994a71a2ece04d654764 SHA512 04c2aca4050cae0dde97340a1ebafd968526e2d811e4551e8895acca50613f7e5902e31d735a0da1427d69e85e152530776fa1b9f5896efe410d8f9437768298
 DIST highlight-test-suite-a3479468672cdbc570a17ae84e047fe8f0b88798.tar.bz2 33310 BLAKE2B a06f2503fc571f5978f648fdc677f58f3fdfa759f9b5cf31a85d03589bbbfd2b56c7055517c59292369653503047af63d9c3bfbbe541a50bd2ea2adede28f60c SHA512 9583fe0af315e0dd1e37e137adf5c97a83832885a5a8a12b91790d7d7b0758c03fd76c02fbda368a2481eaec98f7b010a530bc31da98337d6fa7201aadb023ce
+EBUILD highlight-4.12.ebuild 3146 BLAKE2B 060960565316690df30b498515a8d0324175c6083a2cd20b98d46015f6631997b96e8dc16be90eb4cafc41907cc7a158dd502001eeb6a943a3bd6f38ee2567e3 SHA512 502fb4584fe9b75349efacf7051e75e81db34bb8b69dc2586bdebf82aa2717c58d9286d6a8a58f0b34b85032400b5267798b08e04a31df9750e4c777e1e244b9
 EBUILD highlight-4.9.ebuild 3176 BLAKE2B 7310a5628e9bb07ec02ccafebb7d5907b20e756f26ccaf15347188a9698ad9e534dc61d3ff9f408405998a0a58a752fef3430ae2208d16a42682c79117a1805e SHA512 d41df82d1942350b4c5dc266354a455b6892ebb629972858223fa42111f199631508479b81f719537d0725008593db610c0eff82a6cbaef5a89eef02ddf4fb7d
 MISC metadata.xml 331 BLAKE2B 3c864f08058c451342b7f7799f36e901f392207b36114dd123bb3faa59f04fe3b00d8e65cee4ad3bbbe44606bdafbd246c64d5fce03cd54fc64cd40cfde59788 SHA512 eb96ee44971855de0b12f9e230d58714acb54de1b0a814c0681f8c31124a5c3e39290e2fd17523b2b52b65efaf30f64580f00777a8e9c908779b582577897906
diff --git a/app-text/highlight/highlight-4.12.ebuild b/app-text/highlight/highlight-4.12.ebuild
new file mode 100644
index 000000000000..1dfabf98e87b
--- /dev/null
+++ b/app-text/highlight/highlight-4.12.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/andresimon.asc
+inherit lua-single qmake-utils toolchain-funcs verify-sig xdg
+
+DESCRIPTION="Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight"
+HOMEPAGE="http://andre-simon.de/"
+# This is arbitrary; upstream uses master.  Update when possible.
+TESTSUITE_COMMIT="a3479468672cdbc570a17ae84e047fe8f0b88798"
+SRC_URI="
+	http://andre-simon.de/zip/${P}.tar.bz2
+	test? ( https://gitlab.com/tajmone/${PN}-test-suite/-/archive/${TESTSUITE_COMMIT}/${PN}-test-suite-${TESTSUITE_COMMIT}.tar.bz2 )
+	verify-sig? ( http://www.andre-simon.de/zip/${P}.tar.bz2.asc )
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="examples gui test"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}
+	gui? ( dev-qt/qtbase:6[gui,widgets] )
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
+BDEPEND="
+	virtual/pkgconfig
+	gui? ( dev-qt/qttools:6[linguist] )
+	verify-sig? ( sec-keys/openpgp-keys-andresimon )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.57-qt_libs_lua.patch )
+
+myhlopts=(
+	CXX="$(tc-getCXX)"
+	AR="$(tc-getAR)"
+	LDFLAGS="${LDFLAGS}"
+	CFLAGS="${CXXFLAGS} -DNDEBUG"
+	DESTDIR="${D}"
+	PREFIX="${EPREFIX}/usr"
+	HL_CONFIG_DIR="${EPREFIX}/etc/highlight/"
+	HL_DATA_DIR="${EPREFIX}/usr/share/highlight/"
+	doc_dir="${EPREFIX}/usr/share/doc/${PF}/"
+	conf_dir="${EPREFIX}/etc/highlight/"
+	examples_dir="${EPREFIX}/usr/share/doc/${PF}/extras"
+)
+
+src_prepare() {
+	default
+
+	# Disable man page compression
+	sed \
+		-e "/GZIP/d" \
+		-e "/COPYING/d" \
+		-i makefile || die
+
+	sed -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+		-i src/core/datadir.cpp || die
+
+	sed -r -i \
+		-e "/^LUA_.*pkg-config/s,\<lua\>,${ELUA},g" \
+		"${S}"/extras/tcl/makefile \
+		"${S}"/extras/swig/makefile \
+		|| die "Failed to set Lua implementation"
+
+	# We set it via eqmake6, otherwise it forces clang...
+	sed -e "s/QMAKE_CC/#QMAKE_CC/g" \
+		-e "s/QMAKE_CXX /#QMAKE_CXX /g" \
+		-i src/gui-qt/highlight.pro || die
+}
+
+src_configure() {
+	if use gui ; then
+		pushd src/gui-qt > /dev/null || die
+		eqmake6 \
+			'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	emake -f makefile LUA_PKG_NAME="${ELUA}" "${myhlopts[@]}"
+	if use gui ; then
+		emake -C src/gui-qt
+	fi
+}
+
+src_test() {
+	find "../${PN}-test-suite-${TESTSUITE_COMMIT}" -mindepth 1 -maxdepth 1 -type d | sort | while read line
+	do
+		"${SHELL}" "${line}/regression.sh" || die "Regression tests failed for language $(basename "${line}")"
+	done
+}
+
+src_install() {
+	emake -f makefile "${myhlopts[@]}" install
+
+	if use gui; then
+		emake -f makefile "${myhlopts[@]}" install-gui
+		docompress -x /usr/share/doc/${PF}/{ChangeLog,COPYING,README,README_PLUGINS}
+	fi
+
+	if ! use examples ; then
+		rm -r "${ED}"/usr/share/doc/${PF}/extras || die
+	fi
+}
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 5393d0436b65..753c959ba486 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,14 +1,13 @@
 AUX mupdf-1.15-CFLAGS.patch 376 BLAKE2B ace255a4110df9200d627ac68f5950218eeaa993bbd37fa7fe2d676572cad02d50a632750e6a9bdf6269cd97501f709d075a79d7db8b9832909b59b33251b594 SHA512 c00cd5cb30d33a9cbc55557cab3c4e2be1ae86121c5b1b28b6e35f97f93751aa2e96e106f13b7f365a56ebcce8e1c5e4163a440e8c85a48130803f5a7aec63ed
 AUX mupdf-1.19.0-Makefile.patch 1043 BLAKE2B 7f449713700d57c0bf072661babcb5122d09be82a0b89520999618e22c7b44ae950f0e9fd653330d34078229da8bd36f8e5fd273c5110cbeaeb47347b3e4f666 SHA512 ddbc11d3bf7a1480effd57c9587b85d735c97c5215dbf9dc66bac535356f9cbc5ecc0dd1003c367d6e60d969383afdd9014a66e8fb51384632be407fe01694d4
-AUX mupdf-1.21.0-add-desktop-pc-files.patch 845 BLAKE2B 8fa08810dd0b797af517c7932a2b81c080721155f607970664ca68a8eb4ec53bcfdda417790bf002aff1b1e1e8257d67c3a2e6bf6d500ee50cc03a7f440b60c6 SHA512 96835698141898a9509321c6125d5bfce1b31d3a0329d3c2be55d9026cff65204112a8ac0774ece1ac1ca7a1ce3dc534437aca1a76eb7716317b2c7e648e549f
 AUX mupdf-1.21.1-fix-aliasing-violation.patch 2651 BLAKE2B 649b9cde7eefdf16ba5a57e40128dc57710d63a04281bae4f26f2ee9dc19933628826d52ff4aee95fd7e6141b35c59efe883439b852758bc5075e30a89507564 SHA512 deccc9193d9266a9add6e1d80eb289f4576e12703d8a0af640ebdbfc698cbb3a15ac9da3b752b1f6beb4ad901aa3bfd43d08d34738b5c7545182bf20200ecaac
 AUX mupdf-1.24.1-cross-fixes.patch 7098 BLAKE2B a97c6c0454e9e1b2b0476c36387709b925901075dc01ec2df5af6629e05c5c435a7fdfdb683a83ba4cda7f1d22582ce77d2ca75f3c272fa3d84826c9e9d4045f SHA512 4a40334b6957cc349fb12feeee98bfea3b2c4aaf04c64814020021468dfe93d8b8ff163e995dd5030799e07a5517046970e79c6084ee14a228025a277d9d638a
 AUX mupdf-1.24.1-darwin.patch 604 BLAKE2B 47421e731a53eaa12f963e928900a978db651325dd9ac180861494ed7a4456afed90953ca1b5ebd51310144f383d72ae95726d6feebbda73b17be46f1a656804 SHA512 e239d15b68fced7ff51d85fa67afdbdaf5da77d67be1ca45d49f91080d87a7e2bd583b70678be9a6ed7c5ef69121aa2bc45bb26c7ed4bef3a0121aee5865f7d3
 AUX mupdf-1.24.1-openssl-x11.patch 660 BLAKE2B 5fc5d680e05d9ebdf0243ed7cbf44cbf69d836725288059b894fec7c47d8bffa621099303270d8298b966cbbbde49a0fb18a6d1e47ced7558558439b19b31b74 SHA512 24117446375fb8222a4adcef0955cb5e79cdef033faa9fe9331d29eeea85849206eae40bdb9f5e4ff8e8cd98261c28e6bf8f16f218fb3c78adf0fa6e60e8b9fb
 AUX mupdf-1.24.8-add-desktop-pc-files.patch 841 BLAKE2B ec5bb8c70fb01fd54e58952123f1c1f9ba07a18e9d2718a1d7ef4d5a847049e49578556ebdfb5afca228e0abb4312b07bbed814b267c6401583309357cd5c135 SHA512 78f2c0662caccec43a8b83e9402cb24a6c24efe730860be64157595474e7a738389a11ee1695a22abe5f904aa3587ad4e11940f4c2677f7823ea2545018efd88
 AUX mupdf-1.24.8-c23.patch 782 BLAKE2B da6da463c77cb58256327c98c9db04581c115c57009598e74517d6912ee33f11089e35c392312afae0c709bb716c4898d2fcee4766dc26c20460c6d8df6454a6 SHA512 bd4bde8468010841fc22abe445e5a78d35cbb01333378512c045367b58895354631bb1e694b6fe5809a3f844eeaed8719a606db57b64cb6c03965768e7388454
-DIST mupdf-1.24.1-source.tar.gz 55310618 BLAKE2B 33396b0cca6e2beb1b2bc70c606917c8d9b30b6a277645849ef7ba1e7efbf909c21196acdd5d94d964dd20d3ba746c45cab3c899dfbee1b2138de12e32375a4e SHA512 9d6fbd3388173f06c5db4a27753e69afd21ed32d93f263d4448c3be60a3be747b61102edd5430459f0dbe7ae4df2019689a2f3a582acec77ff322b6d41066fba
 DIST mupdf-1.24.8-source.tar.gz 54039703 BLAKE2B 0fe25d9f0f01a1e387da590c28abac66309247c46c05c7c9b36c4bc911fc16adab681243c2c1d2c50ec91bb76b737022bd3faf06b0b3a803e9120829d9cae5b4 SHA512 17d8fd9fd0e176c8abd1ebc594259a0f7cf822338085ea4574451ba8ec1ac72ba8bd2d5388a1421bbfd4e91257a48d0e0766213ace0933c39d3cb8d774a3860e
-EBUILD mupdf-1.24.1.ebuild 4966 BLAKE2B d8470b8685706eeac458eb4a49271a25415c4921ff398501dbc7b629630d69fdc2b93f1397c94dc0449ada79b3f0cfa6186d5840b7676a2b0a719a6d4d309186 SHA512 2d039fa41bd7c971127760a6beec47c8cfda2f4d737fad0eeec755469e2197dfe52e3a10a4fb892e44110f9961bd785c228baa31e2b7f4c97176ce073ac18552
+DIST mupdf-1.25.2-source.tar.gz 54635699 BLAKE2B 08e4c1bd4d8f9a731b10e1368c3f4a62a9b949c4a1842f2ce297ef3a595107f63e184230c31149a6a5db9038838d891fdeb0330323afcdc0b6966bee06046288 SHA512 089bcf228a28e5f47e793d66f6355b22b531c031a6d1feb0dd07a5fee55780fda92d6cde646336ca0200869c32d523be23a8fe2232fad010b38673419c7859f2
 EBUILD mupdf-1.24.8.ebuild 5016 BLAKE2B 7ad624151e5f4285eb9cd18ad5426a6ab1917f39810ff1441ce13fa1099b2d4d786582ff87e592a3e8f52514d4e758ddde921b42a37f595ddbabe3a8eaa27433 SHA512 c5bb133077d468362feca0aadb2c85dfae28976ae42da0f16480d45bb4de2b7e5a0598457d66e6f9811a7abb37ae591032396bd4921ef4d090c6d7fc781b123e
+EBUILD mupdf-1.25.2.ebuild 5023 BLAKE2B d775893b3197771b94017ee8c3e2817be85104761a850b60d33bf567e180406e5662db071159a16accabf600cf9cbfc848687c423eadbf8e86fb34ac252b1e8b SHA512 4e2deaedbd69c738407f0bd4c908d3e0e491733a570b6a4491079faf4d8c94b3f4ab6552b607e61b664ee8ed5703c642d6185a9e4c846438ef2a0cda10e0becb
 MISC metadata.xml 516 BLAKE2B ad2fb06efd79889747566fbef91a71dcdc3452443dc6edbf077510b494b74b75a153262390c09eb625e54d6c13b63e557acdf11b0843ab35337ff581536fccb8 SHA512 d823f015eb0c9e5354845adf5296de8c52bc33c135b17fba04955ed85b6c5f2ff7c4c630fbf6010b4cd98728591a7340f30e2d6bd90573c1a9f2b3a47ae9a537
diff --git a/app-text/mupdf/files/mupdf-1.21.0-add-desktop-pc-files.patch b/app-text/mupdf/files/mupdf-1.21.0-add-desktop-pc-files.patch
deleted file mode 100644
index 4d449a2fec15..000000000000
--- a/app-text/mupdf/files/mupdf-1.21.0-add-desktop-pc-files.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- /dev/null
-+++ ./platform/debian/mupdf.desktop
-@@ -0,0 +1,15 @@
-+[Desktop Entry]
-+Name=MuPDF
-+GenericName=PDF file viewer
-+Exec=mupdf %f
-+TryExec=mupdf
-+Icon=new-mupdf-icon
-+Terminal=false
-+Type=Application
-+MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;image/jpeg;image/pjpeg;image/png;image/tiff;image/x-tiff;
-+Categories=Viewer;Graphics;
-+Actions=View;
-+
-+[Desktop Action View]
-+Name=View with mupdf
-+Exec=mupdf %f
---- /dev/null
-+++ ./platform/debian/mupdf.pc
-@@ -0,0 +1,12 @@
-+prefix=/usr
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/lib
-+includedir=${prefix}/include
-+
-+Name: mupdf
-+Description: Library for rendering PDF documents
-+Requires: freetype2 libopenjp2 libcrypto
-+Version: 0.5.0
-+Libs: -L${libdir} -lmupdf
-+Libs.private: -lmupdf-js-none
-+Cflags: -I${includedir}
diff --git a/app-text/mupdf/mupdf-1.24.1.ebuild b/app-text/mupdf/mupdf-1.25.2.ebuild
index 5f43ffbabd57..f35a2e91fa71 100644
--- a/app-text/mupdf/mupdf-1.24.1.ebuild
+++ b/app-text/mupdf/mupdf-1.25.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="archive +javascript opengl ssl X"
 REQUIRED_USE="opengl? ( javascript )"
 
@@ -50,13 +50,14 @@ BDEPEND="virtual/pkgconfig"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.15-CFLAGS.patch
 	"${FILESDIR}"/${PN}-1.19.0-Makefile.patch
-	"${FILESDIR}"/${PN}-1.21.0-add-desktop-pc-files.patch
-	"${FILESDIR}"/${P}-cross-fixes.patch
-	"${FILESDIR}"/${P}-darwin.patch
+	"${FILESDIR}"/${PN}-1.24.8-add-desktop-pc-files.patch
+	"${FILESDIR}"/${PN}-1.24.1-cross-fixes.patch
+	"${FILESDIR}"/${PN}-1.24.1-darwin.patch
 	# See bugs #662352
-	"${FILESDIR}"/${P}-openssl-x11.patch
+	"${FILESDIR}"/${PN}-1.24.1-openssl-x11.patch
 	# General cross fixes from Debian (refreshed)
 	"${FILESDIR}"/${PN}-1.21.1-fix-aliasing-violation.patch
+	"${FILESDIR}"/${PN}-1.24.8-c23.patch
 )
 
 src_prepare() {
@@ -76,7 +77,7 @@ src_prepare() {
 		-i Makerules || die "Failed adding build variables to Makerules in src_prepare()"
 
 	# Adjust MuPDF version in .pc file created by the
-	# mupdf-1.21.0-add-desktop-pc-files.patch file
+	# [...]-add-desktop-pc-files.patch file
 	sed -e "s/Version: \(.*\)/Version: ${PV}/" \
 		-i platform/debian/${PN}.pc || die "Failed substituting version in ${PN}.pc"
 }
@@ -131,7 +132,7 @@ src_compile() {
 src_install() {
 	if use opengl || use X ; then
 		domenu platform/debian/${PN}.desktop
-		doicon -s scalable docs/logo/new-${PN}-icon.svg
+		doicon -s scalable docs/logo/${PN}-icon.svg
 	else
 		rm docs/man/${PN}.1 || die "Failed to remove man page in src_install()"
 	fi