5 files changed, 162 insertions, 3 deletions
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index a930bd1ba668..7fbe1c4670db 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/merkuro/Manifest b/app-office/merkuro/Manifest
index aef4810a7a06..1db33b631fc5 100644
--- a/app-office/merkuro/Manifest
+++ b/app-office/merkuro/Manifest
@@ -1,5 +1,5 @@
 DIST merkuro-24.08.3.tar.xz 774932 BLAKE2B 9e8a302762c4e777c85e7c511233f0b8f6db4e9c6b63488953ccf6db21da766ac31a5fb1d4211d455db19a2e5eba1cd0b4fd06adc06dcb42e665536a263fab86 SHA512 935e91fc731a5bf1dc68fa005b6c7043008ef662d06c7de8ae088dd5885e9bba5f4417c7570cc21cd3dbf9c514008ff9a4def21d421caefc27f17d622b6c8361
-DIST merkuro-24.12.0.tar.xz 792316 BLAKE2B 55db585397223c8f5b885737b30b91696743e18e6233b860036403e64b3424544eb042a9f960675db859f6e3155d268bff33da261dff5ab3ee83f6d588eee40c SHA512 9a4197a7b0b32470a5ac8146e45d2ee4b35861bebfeb1e131337fd3ea9df20925c424bb727ae4826bda9141cbc15ed37b69709a55ab7111c32b4d5e991f9d5e6
+DIST merkuro-24.12.1.tar.xz 793160 BLAKE2B f1717145aacb71b676afe8d83e7060eed2dd9070c0e2a62936398f43dd8f63d8d0cbbbf3057a97e5f7aba8168294828a6add8a64044ea33fee3079575c3393f9 SHA512 8a62440021b0dfa2d5b3193f777a8543e6f930c4ae79909b69a5555225172e3b3394eb8e0fbe2d683745aac39b55ce8ef56f41d117ce3268d90a34041d6beb7a
 EBUILD merkuro-24.08.3.ebuild 1967 BLAKE2B fc53261876c654762e32e2b22365cfa2e84e960fa614a75dfc64b113b32e337e9d18fe90fba0adf925d82a5c73050c9949b8f641fb9cfe9d7762b9c36552a9d7 SHA512 a6b75e0abba25063aef6b61b32ca6df2bf38171017d6f98e1ae1111226adde86d04d312372aa1eaf005d4293dad9732224d9bfcb1b0b8602cd92c131cb0715a8
-EBUILD merkuro-24.12.0-r1.ebuild 2068 BLAKE2B 608b7d03ead7cf4c3189228faf72d6cff5c2ee82d6be50753102bf3fd541e700d042d31e8471c5b79ba159352b0fdab3419aeac08ea98c573495e4eb4347f901 SHA512 1a91565705c4d80491a24bec3d3feb12e5e3893f840b0c4d39b9e34032924e6776ce27b82e92a5ae0caac1fd468b7a5efc8d09be1fc1c205b4e4ff1c1d8ed271
+EBUILD merkuro-24.12.1.ebuild 2068 BLAKE2B 45ad5d81fb813ce9696887da36ed9d279a05a31590b413cb605e9b4bfc52676c327877817b44cea2d0f2afc2f7d92e8220f41647569a70b9aec07b94cceaa03b SHA512 647d6e4cf9afaf1c245b1bd5da69feb7ea9e449edf9baa1a6b8fcb97395af0a4ebaf3fbabfe1f383117d18cc2887054bbd4d37722df3258c015503f2f54a0e1e
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/app-office/merkuro/merkuro-24.12.0-r1.ebuild b/app-office/merkuro/merkuro-24.12.1.ebuild
index bcdf0f7dbf27..35779b72d340 100644
--- a/app-office/merkuro/merkuro-24.12.0-r1.ebuild
+++ b/app-office/merkuro/merkuro-24.12.1.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
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 4c4ffe2a7810..0b63d99dd60c 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -8,7 +8,9 @@ AUX scribus-1.7.0-dont-install-thirdparty-license.patch 517 BLAKE2B cba2d9ad7e3b
 AUX scribus-1.7.0-findhyphen.patch 1900 BLAKE2B 6d5ef69a889afefa8449e35cdb4348d9cdf3ebe1b110b4de86a35e72e5faae97ae2fbadfe9ae2672a144d7ccea33ea95e0e25f2894f444c3a58a6e1b713aa357 SHA512 cde9231dd4783832340d9dd3df1522d3f5f7a3ab4f26d18ca5825d634d8102e3ca1bae483f0bd111e7e4fff31e5c9154923a9d79eae735a0445b6829e74b5c5f
 AUX scribus-1.7.0-fix-icon-version.patch 410 BLAKE2B 65d077457d8c85a8830345d7299b054806c16285e75ed4055f14ba4d844a9b0fd4972f0f1eba6ec889af4f460f50522d88722bfa34b123b80f280f2f0e029462 SHA512 230085c17081a33fb900e686e7469b878965c659e10845c39d2c7dc68a11e1f6a01bd614a21a555539c437a567ac8231490da739bfe5c17ef13fed9bd61352e2
 DIST scribus-1.6.2.tar.xz 73129400 BLAKE2B 2da98dc322319db18a157f66aef024b7392dbbfaf22adba14f719b48c644d1cc1546cc4d0cccf6dfe479571cf84de6f5645e5d452154f96ddc886e390702d547 SHA512 2f691c1f6b7beada89be410a2936b23641913bf26bd2152974bbaa747aeafb05aa797356a85bd55c14f60f0031ce1addedc9a3ce3e92546ebbb45f96a5ff3e62
+DIST scribus-1.6.3.tar.xz 74909384 BLAKE2B b208270fce3e013692e90ec354849f99440efc97bda0e15c0baea16a5fd039b7435498c4d2669bd5c3caaca9c7d1125f78ea6fde483bf81449a451f9f54bf26d SHA512 b408ed862285d06d0f79a646ac2b43b0eb0b241c23dc276544e94a72e4fc3a0bf4efd500c5893c295886b11490115cdbe5f34ce7de51da30d31099831ba25d87
 EBUILD scribus-1.6.2.ebuild 4201 BLAKE2B 1e28eb40199277d68579f85d47468acb34b0b5575f11e628ff5edb6a45fca4056f1d8ee9f7f3933cb81e389903498db0d450628443643cc3358116f8e47aa0e6 SHA512 bd3be20c40fd83e5d22154b8c4ceb95cbb212403941f5bbe28eae80191d346e2d512db3fbdf87cac5e932fe0e2a194c8f61b2896ce573e6ef67b385b588386b9
+EBUILD scribus-1.6.3.ebuild 4102 BLAKE2B 1e1aa6814bde06709b4612734881778cd627523ab5474d39877c96b6e4c7d75a27cd7ecff62aba4646792fd02d79663980221618a2ca6da3d3f03556806aa9b9 SHA512 b09019162ffae7857bb3d3b0ed3c82caeabec120a53b2f93c5aa4a76b9430fdec81cf6bb7675e0198ed6e29773ca3a1bcc5dfe83b3d64af52844944f66ad1f04
 EBUILD scribus-1.6.9999.ebuild 4102 BLAKE2B 5e2a0cd07aae3d44d0439fc55343aede839ef7391e72c9e9dcfb92246f127f58faa1a597c2ff9a3564bc77522f709ceb9e424aa3a61540ce6e569f633104f028 SHA512 85b061e3e87e6d9dcf0c5e025ecc7e2acb533c2e7420bda14d3be53b91e5daa7b6b74f4d5061e74cf9fc22d89eeb7e03be956c2c3aaed5e997a7c6ad090b652f
 EBUILD scribus-9999.ebuild 3989 BLAKE2B 20bbc3996092f2e2afd085b749fb9d043ce01b4571447edca5498970f2879aa3a3284f282276fc60d0642ea55f0b8609445d8f6e387abe420ebabf768856ae40 SHA512 882a57ab93f56ee6afc81dda58d79b41e9d2035b4a24cc8c70edfc7aeed6b7beba6bb392cd0d751747d58cc66b5ce7dc625b627e172b6335ecbf060383d7b326
 MISC metadata.xml 883 BLAKE2B 7dc92ce97a3337f9397b52c647c00313790a8a674c88ba3491ef55b056941d6dcdfe1eac9009c4a5f2c4ebe70d81f9fa27439efad544bf8415ffb2235440402e SHA512 3348ea8be21835e88182c23e21dfaef4f52928aee1f4af1c88707cc3bd3f016d56986f197eec9b26279f4df72f20559fe7f4cad7439e67a66ab2c1b4f585ad91
diff --git a/app-office/scribus/scribus-1.6.3.ebuild b/app-office/scribus/scribus-1.6.3.ebuild
new file mode 100644
index 000000000000..909c74802d90
--- /dev/null
+++ b/app-office/scribus/scribus-1.6.3.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="tk?"
+inherit cmake desktop flag-o-matic optfeature python-single-r1 xdg
+
+DESCRIPTION="Desktop publishing (DTP) and layout program"
+HOMEPAGE="https://www.scribus.net/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/scribusproject/scribus"
+	EGIT_BRANCH="Version16x"
+	inherit git-r3
+else
+	SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.xz"
+	S="${WORKDIR}/${P}"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1-2)"
+IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	tk? ( scripts )"
+
+# osg
+# couple of third_party libs bundled
+DEPEND="${PYTHON_DEPS}
+	app-text/libmspub
+	app-text/libqxp
+	app-text/poppler:=
+	dev-libs/hyphen
+	dev-libs/icu:0=
+	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[-gles2-only,X]
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/harfbuzz:0=[icu]
+	media-libs/lcms:2
+	media-libs/libcdr
+	media-libs/libfreehand
+	media-libs/libjpeg-turbo:=
+	media-libs/libpagemaker
+	media-libs/libpng:0=
+	media-libs/libvisio
+	media-libs/libzmf
+	media-libs/tiff:=
+	net-print/cups
+	sys-libs/zlib[minizip]
+	x11-libs/cairo[X,svg(+)]
+	boost? ( dev-libs/boost:= )
+	graphicsmagick? ( media-gfx/graphicsmagick:= )
+	hunspell? ( app-text/hunspell:= )
+	osg? ( dev-games/openscenegraph:= )
+	pdf? ( app-text/podofo:0= )
+	scripts? (
+		$(python_gen_cond_dep '
+			dev-python/pillow[tk?,${PYTHON_USEDEP}]
+		')
+	)
+"
+RDEPEND="${DEPEND}
+	app-text/ghostscript-gpl
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.8-cmake.patch # bug 886251
+	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
+	"${FILESDIR}"/${PN}-1.6.1-findhyphen.patch
+	"${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+	cmake_run_in scribus cmake_comment_add_subdirectory ui/qml
+
+	# for safety remove files that we patched out
+	rm -r scribus/third_party/hyphen || die
+}
+
+src_configure() {
+	# bug #550818
+	append-cppflags -DHAVE_MEMRCHR
+
+	local mycmakeargs=(
+		-DTAG_VERSION="-${SLOT}"
+		-DHAVE_PYTHON=ON
+		-DWANT_DISTROBUILD=ON
+		-DWANT_CPP17=ON
+		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DWITH_BOOST=$(usex boost)
+		-DWANT_DEBUG=$(usex debug)
+		-DWANT_NOEXAMPLES=$(usex !examples)
+		-DWANT_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DWANT_HUNSPELL=$(usex hunspell)
+		-DWANT_HEADERINSTALL=$(usex !minimal)
+		-DWANT_NOOSG=$(usex !osg)
+		-DWITH_PODOFO=$(usex pdf)
+		-DWANT_NOTEMPLATES=$(usex !templates)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use tk; then
+		rm "${ED}"/usr/share/scribus-${SLOT}/scripts/{FontSample,CalendarWizard}.py || die
+	fi
+	if use scripts; then
+		python_fix_shebang "${ED}"/usr/share/scribus-${SLOT}/scripts
+		python_optimize "${ED}"/usr/share/scribus-${SLOT}/scripts
+	else
+		rm "${ED}"/usr/share/scribus-${SLOT}/scripts/*.py || die
+	fi
+
+	mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
+	ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
+
+	# These files are parsed to populate the help/about window.
+	cat >> "${T}"/COPYING <<- EOF || die
+	${PN} is licensed under the "${LICENSE}".
+	Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text.
+	EOF
+	dodoc "${T}"/COPYING
+	docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING}
+
+	local size
+	for size in 16 32 128 256 512; do
+		newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus-${SLOT}.png
+	done
+	newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus-${SLOT}.png
+	newicon resources/iconsets/1_5_1/scribus.png scribus-${SLOT}.png
+	newmenu scribus.desktop scribus-${SLOT}.desktop
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "MS Word .doc file import filter support" app-text/antiword
+}