gentoo auto-resync : 14:03:2025 - 00:28:41

5 files changed, 209 insertions, 3 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 926374e59b1d..561ec78ed43c 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 6ebfe2e6ed01..582ca22c20f7 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -6,6 +6,7 @@ DIST ghostscript-10.02.1.tar.xz 68017088 BLAKE2B b491473f0b3d50121e4373e21af3d8c
 DIST ghostscript-10.03.0.tar.xz 68041176 BLAKE2B c64e0fc9dd290b81e61793671e8645f16b04070685f6ab9d35a60cb910d7504e1e686525af8b74121ae31a5b344e2332efd8bdf99f2a4c5586bff747b8df78d7 SHA512 74d7da586eefbf3fb3c085bb4d2b73ee667fd0ae9cff73ece613c77c443148b847086f91802124baf91ac35cdc83be07199799378def92c8fbd96ced7d0ee9a8
 DIST ghostscript-10.03.1.tar.xz 68048612 BLAKE2B 991e81c4a9f8459220f6af988fb533cc3c2393fef0c57b35da5685fb6f8b0e76af00457f9b0e552ea241b272cdfaa90cf4a06d6cb1008b55efe782faa14c90da SHA512 59e071cd23aed246b51317d3cccd9ccf8e1e84c4ecf9b22fb938e561eff42cec61915b0bdd96a313a3ea27750579c54ca0d0862b65edd306a621731c0063ffd3
 DIST ghostscript-10.04.0.tar.xz 68070680 BLAKE2B 702e6c4281105ee8cce809f155097e13eb1aa33fbd40446ce8f44b45e964e5c128e12e910cb7008faa5dc247c7236bccac1dc42fe459f4e00034257865363d8c SHA512 2e711f8ba86491570684f13851190f41e6eee87dcfacce0a4adfd09a4523abf2e0b6727f0958ee2683834218f5705675b531fd2419cb7fc314ed4becf51f3ce3
+DIST ghostscript-10.05.0.tar.xz 68044488 BLAKE2B 4f223fb6bf1412fd1a4e69af14d29ef6d4e5903a21a6714244bde3801b2428d184c001dc20b8454b598ffb4c3217234c0b90af07c09911a07ac92167a20c6b12 SHA512 5a8695726ea2c70fd153bac47696c9e9046e9f74eccf8eea500794f79f09d5d2be70597c9d85c0b51b71d46d7974f50c5c9e3b0e242816bb84e64f1098a306a6
 DIST ghostscript-gpl-10.0-patches.tar.xz 2980 BLAKE2B e2c20195b153bf45f374e84d91a4df1885a3696f4061340a0a2ac5f586b9723b45eade343ad0e5760e66616624b5f7dad82d62747040493d7ca40c13329b2df2 SHA512 dac26d7f75bbdc2a56891db7d607c2120717fdf8b1cd55c53ed3be09de3e0a62338585f4dac74496d634ce03ecb2212f386187e72b5e6b59debf8d07694e0c83
 DIST ghostscript-gpl-10.04.0-patches.tar.xz 3088 BLAKE2B 4bac1ebfc5f4be7e5174add2439ce4f4cf02f6c91929df9b03dc46c78b150d05cb5cade553303fc8b6795fe3b62ebc37dc5805da438c2f23578784e520a4c4a0 SHA512 f6973b4a9fc5722c49e9c088516accd6e91a3627eb554c58b37113392f8ed0cd1d27e2c65a8d0cce3bb2da5aa6beec726d4605fcb393162fd24256b92aa0ae67
 EBUILD ghostscript-gpl-10.02.1-r1.ebuild 5557 BLAKE2B e01a38acf3a9f8a1f964451381a65fefacedfaacbbbf9580d5392264dc5cd9627193855ecc3a9318b37b30328beb1a994fd2ff724744678f8ddea643c6cd9c67 SHA512 75a1b1fbf0b97b91b606a2586a4b99e6342eb94aa219c4e648b0e0f279295cad8a3d59db517e65abf17cac3eaccce6c5ec89439a6b904c95bf61c2cc139647cb
@@ -13,4 +14,5 @@ EBUILD ghostscript-gpl-10.02.1.ebuild 5508 BLAKE2B 033bea6de3043f151dc2cb9d36c1d
 EBUILD ghostscript-gpl-10.03.0-r1.ebuild 5533 BLAKE2B 2d36792340870c0a19b1ff3ae8814580ea6841cd9ccd3e8da43ec408543e54ebebf7d67538ee1d2aa565d8da3d58a97e944fc7e6623b6a7f21702d9d6955c869 SHA512 194731943a8db22bdb65a8de90cb08f662627fedd9409fd574c2d22c12306eb380393b55efeb8ac82b62338e87500704c98cd098eda2c4a31c1c1dde28748a91
 EBUILD ghostscript-gpl-10.03.1.ebuild 5649 BLAKE2B 5ceede37a5f0d9d1a4bf22cd1eba0a18070e9614c6ba0b2496d9c28bdca4998adb840b0579be781b8af564088aecd5e3a14bdbb12f5e2bfa0123e5f1b3217b84 SHA512 db49b64c438fb6b5848533f7bc7dd6585bb6a2ac921269cad81c05ed22c678eff4d9e409e19aa01a565cc2adabde2345394c44e4371b9d894328e744f5b3ecfd
 EBUILD ghostscript-gpl-10.04.0.ebuild 5722 BLAKE2B 297fc7c9fc67e15d9336eea77dc92fb9f7729b55e1ab786a8a753519832b07519790515b7137cbab688a772b9fdc869d8f04ccf7c087379186384d5349581814 SHA512 e25f0c22a1aec5cbaf2c76632fc0ae5f865ec24e66969f73b958e428a71296374d9a4e85d5fd4861bf59ae7606230f5b7eedb2b57ade7ab9abfcc2cd780dedbb
+EBUILD ghostscript-gpl-10.05.0.ebuild 5730 BLAKE2B 33b82713196eb26ce8601753e5b79f9903c6580daa62c78ee39dff09a1e5072192fab1d1b44954019b9af118eaf4820469c40987287952cc277cc5cb7381d958 SHA512 eba06295dba20464cb64f23e2c981cede23c4eff3cc318ee7b3081170226886fa4f8fec32579769a34e5a3b84b614108592dea6bd3e8b3aca0550aee8bd45350
 MISC metadata.xml 831 BLAKE2B e594fcc7ef78d3eb9f157a46c63f33fd35887fa82cdc304bc4b2db4e772473e8ba695b0ef932a69df0c8a5ac5269955ae600b436444782820475f44c6fc1d9f1 SHA512 2b067dfde63ffd8da3afb27c889884e51a3e1158cef153bc30ffb10a69cb0f7d409bc38a335651010d4e1dddad3bf09a9873445d77416da2bbd2ac7af5ab1598
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-10.05.0.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-10.05.0.ebuild
new file mode 100644
index 000000000000..20c56b97daac
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-10.05.0.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic toolchain-funcs
+
+MY_PN=${PN/-gpl}
+MY_P="${MY_PN}-${PV/_}"
+PVM=$(ver_cut 1-2)
+PVM_S=$(ver_rs 1-2 "")
+
+# Use https://gitweb.gentoo.org/proj/codec/ghostscript-gpl-patches.git/ for patches
+# See 'index' branch for README
+MY_PATCHSET="ghostscript-gpl-10.04.0-patches.tar.xz"
+
+DESCRIPTION="Interpreter for the PostScript language and PDF"
+HOMEPAGE="https://ghostscript.com/ https://git.ghostscript.com/?p=ghostpdl.git;a=summary"
+SRC_URI="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz"
+if [[ -n "${MY_PATCHSET}" ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCHSET}"
+fi
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="AGPL-3 CPL-1.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="cups cpu_flags_arm_neon dbus gtk l10n_de static-libs unicode X"
+
+LANGS="ja ko zh-CN zh-TW"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} l10n_${X}"
+done
+
+DEPEND="
+	app-text/libpaper:=
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.9:2=
+	>=media-libs/jbig2dec-0.19:=
+	>=media-libs/lcms-2.6:2
+	>=media-libs/libpng-1.6.2:=
+	media-libs/libjpeg-turbo:=
+	>=media-libs/openjpeg-2.1.0:2=
+	>=media-libs/tiff-4.0.1:=
+	>=sys-libs/zlib-1.2.7
+	cups? ( >=net-print/cups-1.3.8 )
+	dbus? ( sys-apps/dbus )
+	gtk? ( x11-libs/gtk+:3 )
+	unicode? ( net-dns/libidn:= )
+	X? ( x11-libs/libXt x11-libs/libXext )
+"
+BDEPEND="virtual/pkgconfig"
+# bug #844115 for newer poppler-data dep
+RDEPEND="
+	${DEPEND}
+	>=app-text/poppler-data-0.4.11-r2
+	>=media-fonts/urw-fonts-2.4.9
+	l10n_ja? ( media-fonts/kochi-substitute )
+	l10n_ko? ( media-fonts/baekmuk-fonts )
+	l10n_zh-CN? ( media-fonts/arphicfonts )
+	l10n_zh-TW? ( media-fonts/arphicfonts )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.03.1-arm64-neon-tesseract.patch
+)
+
+src_prepare() {
+	if [[ -n ${MY_PATCHSET} ]] ; then
+		# apply various patches, many borrowed from Fedora
+		# https://src.fedoraproject.org/rpms/ghostscript
+		# and Debian
+		# https://salsa.debian.org/printing-team/ghostscript/-/tree/debian/latest/debian/patches
+		eapply "${WORKDIR}"/${MY_PATCHSET%%.tar*}
+	fi
+
+	default
+
+	# Remove internal copies of various libraries
+	rm -r cups/libs || die
+	rm -r freetype || die
+	rm -r jbig2dec || die
+	rm -r jpeg || die
+	rm -r lcms2mt || die
+	rm -r libpng || die
+	rm -r tiff || die
+	rm -r zlib || die
+	rm -r openjpeg || die
+	# Remove internal CMaps (CMaps from poppler-data are used instead)
+	rm -r Resource/CMap || die
+
+	if ! use gtk ; then
+		sed -e "s:\$(GSSOX)::" \
+			-e "s:.*\$(GSSOX_XENAME)$::" \
+			-i base/unix-dll.mak || die "sed failed"
+	fi
+
+	# Force the include dirs to a neutral location.
+	sed -e "/^ZLIBDIR=/s:=.*:=${T}:" \
+		-i configure.ac || die
+	# Some files depend on zlib.h directly.  Redirect them. #573248
+	# Also make sure to not define OPJ_STATIC to avoid linker errors due to
+	# hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1)
+	sed -e '/^zlib_h/s:=.*:=:' \
+		-e 's|-DOPJ_STATIC ||' \
+		-i base/lib.mak || die
+
+	# Search path fix
+	# put LDFLAGS after BINDIR, bug #383447
+	sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PV}/$(get_libdir):" \
+		-e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
+		-e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
+		-e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
+		-e 's:-L$(BINDIR):& $(LDFLAGS):g' \
+		-i Makefile.in base/*.mak || die "sed failed"
+
+	# Remove incorrect symlink, bug 590384
+	rm ijs/ltmain.sh || die
+	eautoreconf
+
+	cd ijs || die
+	eautoreconf
+}
+
+src_configure() {
+	# Unsupported upstream, bug #884841
+	filter-lto
+
+	# bug #943857
+	# Build system passes CFLAGS to C++ compiler (bug #945826)
+	tc-export CC
+	CC+=" -std=gnu17"
+
+	# bug #899952
+	append-lfs-flags
+
+	local FONTPATH
+	for path in \
+		"${EPREFIX}"/usr/share/fonts/urw-fonts \
+		"${EPREFIX}"/usr/share/fonts/Type1 \
+		"${EPREFIX}"/usr/share/fonts
+	do
+		FONTPATH="${FONTPATH}${FONTPATH:+:}${EPREFIX}${path}"
+	done
+
+	# Do not add --enable-dynamic here, it's not supported fully upstream
+	# https://bugs.ghostscript.com/show_bug.cgi?id=705895
+	# bug #884707
+	#
+	# leptonica and tesseract are bundled but modified upstream, like in
+	# mujs/mupdf.
+	PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) econf \
+		--enable-freetype \
+		--enable-fontconfig \
+		--enable-openjpeg \
+		--disable-compile-inits \
+		--with-drivers=ALL \
+		--with-fontpath="${FONTPATH}" \
+		--with-ijs \
+		--with-jbig2dec \
+		--with-libpaper \
+		--with-system-libtiff \
+		$(use_enable cups) \
+		$(use_enable dbus) \
+		$(use_enable gtk) \
+		$(use_enable cpu_flags_arm_neon neon) \
+		$(use_with cups pdftoraster) \
+		$(use_with unicode libidn) \
+		$(use_with X x) \
+		DARWIN_LDFLAGS_SO_PREFIX="${EPREFIX}/usr/lib/"
+
+	cd "${S}/ijs" || die
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake so all
+	emake -C ijs
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-so install
+
+	# move gsc to gs, bug #343447
+	# gsc collides with gambit, bug #253064
+	mv -f "${ED}"/usr/bin/{gsc,gs} || die
+
+	cd "${S}/ijs" || die
+	emake DESTDIR="${D}" install
+
+	# Sometimes the upstream versioning deviates from the tarball(!)
+	# bug #844115#c32
+	local my_gs_version=$(find "${ED}"/usr/share/ghostscript/ -maxdepth 1 -mindepth 1 -type d || die)
+	my_gs_version=${my_gs_version##*/}
+
+	# Install the CMaps from poppler-data properly, bug #409361
+	dosym -r /usr/share/poppler/cMaps /usr/share/ghostscript/${my_gs_version}/Resource/CMap
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+}
diff --git a/app-text/pdfsandwich/Manifest b/app-text/pdfsandwich/Manifest
index dc697a8014c5..621ae5967ff4 100644
--- a/app-text/pdfsandwich/Manifest
+++ b/app-text/pdfsandwich/Manifest
@@ -1,4 +1,4 @@
 AUX pdfsandwich-0.1.7-gentoo.patch 1211 BLAKE2B 47461d33a0ecea51de9db0cda447f13c74094b7bf630abfa0ca0b5a72357e20b9adfc86b2035b89af8addbec9ee9ebdac9751490afe7166005c2ebad2b9333bb SHA512 d9865439ea2ed6ffec6c30abe9da1042b5b12a28d266131d421e1d459ff8f0bd60f8d6c2e68017464341f26215a04b4a537cf3f445cebeec55723831a9dee454
 DIST pdfsandwich-0.1.7.tar.bz2 17461 BLAKE2B edeb08ab55df89ef2d1f3e43446e831c66e57273b36ecd56a4cc5f910ca5b59a03e2a66b13e7150f06f8f3eb26ed14cd1c80d02cd38d6bd6cfe923c30c801577 SHA512 ac315aeba2cc753fddc380e2522d0c41d65ea80372a23c2cd5371ebc239ac104ab5a5a1386378b9e026b2935a767128224f7617a5eb8f5ef9d6874cc18ef83ff
-EBUILD pdfsandwich-0.1.7.ebuild 1138 BLAKE2B 561a809ec7a9b8cb4ea0fd99adccb3c1103eb554e56b4a0516a2e26152c5da426d4f0f6fc803579532ba595c27f6646a52b46eee690f1bde5fe19b4b478073a1 SHA512 99291ca9bd74e6d825d149037003a2db068b5123b0fa9649a58eddd2920bf1665cdbc0706dc9e6c19b3d8a24f3fe1d861cdd61e6e21730986e61e2c3b2ada55d
+EBUILD pdfsandwich-0.1.7-r1.ebuild 1131 BLAKE2B 1b5fcd7bb340fb94f2bb14a326c59f30e18262f76d5c6ce36a25f1b27d3247c879bcf74abe54ac0044d21c7d254e3ec7a506223c8670084f09755aa11619f431 SHA512 e547c8f164d01bad64705482bbfc3ead4e0ba764ac42aeda7e676913f0330c79817ab1789e1506c20c6cc6c9be3c2f568cef13a5946f6c2bd82d42272288441c
 MISC metadata.xml 951 BLAKE2B f1aa6c697c50e005369149d1ea3087c495a7c718f53f1023047579679e0c3cbbe8b4d32a8c2f872036e92fcedbe1418c42e63500c7baf45cc7bf60a56cee49f8 SHA512 b69a56de55e62408b841f050ecfd45a3d2cb76881af30f7ab613fcbe2660cfec5813c1bec9aed987e9beb2da39117b7fece2e749c2fd78e1c48cb8b2926b7eed
diff --git a/app-text/pdfsandwich/pdfsandwich-0.1.7.ebuild b/app-text/pdfsandwich/pdfsandwich-0.1.7-r1.ebuild
index d31eaebdc007..3c542157df96 100644
--- a/app-text/pdfsandwich/pdfsandwich-0.1.7.ebuild
+++ b/app-text/pdfsandwich/pdfsandwich-0.1.7-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 inherit flag-o-matic
 
 DESCRIPTION="generator of sandwich OCR pdf files"
@@ -20,7 +20,7 @@ RDEPEND="app-text/tesseract
 	app-text/poppler
 	virtual/imagemagick-tools[png?]"
 DEPEND="sys-apps/gawk
-	>=dev-lang/ocaml-3.10[ocamlopt]"
+	dev-lang/ocaml[ocamlopt]"
 
 DOCS=( changelog )