gentoo auto-resync : 05:06:2024 - 00:07:52

7 files changed, 190 insertions, 3 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index fe684077a0da..d9b551c380c7 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/drawio-desktop-bin/Manifest b/app-office/drawio-desktop-bin/Manifest
index 346c5747a519..2303df789b5b 100644
--- a/app-office/drawio-desktop-bin/Manifest
+++ b/app-office/drawio-desktop-bin/Manifest
@@ -10,7 +10,7 @@ DIST drawio-desktop-bin-arm64-24.1.0.deb 91068516 BLAKE2B d2781782b63105d58898e9
 DIST drawio-desktop-bin-arm64-24.4.0.deb 91198066 BLAKE2B 615854d6a68e41c0b082a1c468ec08051510dc0c4ef90b5e831320e3cf3a66666ed02d523a729ac3c77d54be60b341c6758725292e1d540f8c374db8b0bca00c SHA512 2dd4fd3dcf3ecd97d6e38809725ae66cc8a8746d82b4499032e0c109fbd003444b0e2e5a75c4428c46d0b7c57438fc509be3161bb274cbaf3538419cf1d4a260
 DIST drawio-icon.svg 1194 BLAKE2B 624a024e95ff1a68ac298b64d0e633f46411f7ec142d8b2a7d639c7e6a66a1f7c695f67b28a64e323ec1dea36ec4d657e2ee9119cd58f1c84f0d9cb9b5d9755d SHA512 ce010d61c5de3322d4e3c66c87ae199b7d15e68ee7253078f001eccb3b725c0290426978cfd81a4d06276b8b50ea8bd650213a50eb72432451afe536790eb39e
 EBUILD drawio-desktop-bin-23.1.5.ebuild 3163 BLAKE2B e1db8729fa8a6801cf9598035f0b493e786d3e7854bafc0aade2e26cea6e1f5f5cd44abb3c8357104c82526802045b69b23d090ff47c9357a6c37013ff39a792 SHA512 935e726fad572aee18c73e2de0a64c347b71e14ccfd3dd0355bb9cd69a4592291bde451eca49845c6af536db87629e5a8f60b4e5153a488778fa3bee39faaa6c
-EBUILD drawio-desktop-bin-24.0.4.ebuild 3164 BLAKE2B 8270e3cbff84651a25879d381be785d249929a104daee46457a82a2cadb79b0245487607e558a1751af8f7a9f558cf9a382aae64a04836cc18c8313d6c4d86c8 SHA512 9a67fbeb3efe63b39fc987949ba3da4a9c214b9a413a84f836550addb67c0ca2adc7a2e140a2ae108fd53cbae19a67b983b955cfa62a685b7caace910d45a4f3
+EBUILD drawio-desktop-bin-24.0.4.ebuild 3163 BLAKE2B 9ca85c75136524c6b7a01e380ad2c5a6e972766e0329fb588ca70e4bd424a33c68dcc0c3600bf2033d7282adbbc47a403cc806c5bc1fbb985d4a8e14ddc8bb73 SHA512 4e3d55bd4117fc314eeb8b76092b188667c84b1bf270e7583fa96afe06bdddc93d1932c20b7b79275adc7bb440c276bf142da1a029e35bd112eb40c8cd884fd8
 EBUILD drawio-desktop-bin-24.1.0.ebuild 3137 BLAKE2B fa51b4b6e078de26357435007e3ffe98c90d80b86304aa5656f35fcc871eac37ac6167d68b256ab312cb9fa347ac909c44ea2525617337a2613dbafb13f11eac SHA512 4bccb562f83caef35c579caa073feaa6c3d545d4bb06348b0dd4e27898f66a723b33e34e95a9f3b21fc5adf386cf1bf5af1ddeedd8a8d82a686ecdedf076cbe3
 EBUILD drawio-desktop-bin-24.4.0.ebuild 3136 BLAKE2B 94bf89b9a8ca1298aaddacfab60fb46fdc3a03d282c78a34837b33d0da5df4d9e7b2eaeb546b8844edbb743a0d42c251fdf80f7bd217303b4b203eee347d883a SHA512 c0ce79a559cf859a06d6295e6dba0cebf10a8f6914cb3342d1be74760f581fef77a688ff60e34bfc8352d875b411311b2edee233e7c3939b3089e234c1e63832
 MISC metadata.xml 555 BLAKE2B 258a9fc60050bc19713173448b3d10d74bd2b8cec26a4f6f2b0dc3e7306311b702d487e60b9eff8f4bb53b34577ecefab6acd49f5e1375e9de1b2cc967977e68 SHA512 f69146abbdd622e0499a985a8ab23c4c3a614c718e85cd5d9f85d7041b165aa60dc8bc3363cdccd2d5836feda1af21824fdd75cb1c63b1ded7987302021731c9
diff --git a/app-office/drawio-desktop-bin/drawio-desktop-bin-24.0.4.ebuild b/app-office/drawio-desktop-bin/drawio-desktop-bin-24.0.4.ebuild
index d4950afc3ba9..5d367b630901 100644
--- a/app-office/drawio-desktop-bin/drawio-desktop-bin-24.0.4.ebuild
+++ b/app-office/drawio-desktop-bin/drawio-desktop-bin-24.0.4.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 "
 S="${WORKDIR}"
 
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 
 # These are the licenses used by node_modules packages, drawio and drawio-desktop repositories
 LICENSE="
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 056adc6cdf11..f76db271b961 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,5 +1,6 @@
 AUX scribus-1.5.3-fpic.patch 376 BLAKE2B 102f6ca21c96d0b05354bf65c551efde01291c1b878db27e24ee8680eca6bebc9e402b19d62fe2001ed5dfc46ca11c3b3450816a017c942ba848bd43476628fc SHA512 531c3697983adbdeef4959c44a89ccf5e3802f2b1e64a65a63747a659cb808a08095d7592e6f8974e3e0e16ad913ba05bd3f3fe9c9fbd0a50463fd8df6f47d34
 AUX scribus-1.5.8-cmake.patch 951 BLAKE2B 7f64fbb7d92974b44946eeee359a87ea3c1564a804765169f0271d5cbdef488b142eec3d057d0367415b665c09ef82ef4da2934b3343e6bf0f0a91abe949bb23 SHA512 340185ac6ae1a0dbb6138ff2d714ba330ce4957864788a5f7786d7f5149abddcda222e5b902bc67c6ed61bf01dd4225eb66ce6abc5e3a672ef2c0586701384e7
+AUX scribus-1.6.1-boost-1.85-2.patch 942 BLAKE2B 127bcc04259e6d70697c3ee2cc6588e6ec34c80a69a0d8978cfd41605dd4532f85718202132edc391b6e372a2718c7f0e9f4168f7d25b03bdd360095af4eaf59 SHA512 460bd65f8584d94c43580d110544cfbb44c9858ef25bb19b86cd19cde9641e1e62e1acdcc360d241306e25e5c801a9ba40c77644a109f4e513169493097747f2
 AUX scribus-1.6.1-boost-1.85.patch 1458 BLAKE2B 34fc90aa2c4f3e0d95f3b1726a496c407dbbf1acd337c594afcfc30d7dec85fe290e7411667d238870179008aba193ccc88bcdeb4b7e66c8573d9c4be3bd4386 SHA512 4afae51c247df799cfd9d4f936d0af7dcfd09b9dd21d974d4f830840f3e8170466a7e56340251070936f2640aa092cf7ea44e484fa05391454314779b6324760
 AUX scribus-1.6.1-findhyphen.patch 1787 BLAKE2B 28faaa033a876516333ce10f89cc741c56090c53e98b0b9dee44cd05153533b0fd088e178f087f1125365b199385463ae1e07add1a92976e32a8b500d6e2979c SHA512 772ded373a356a679416dcd4f87abaf4b2a47bcf48738a8d40103cadff6eb332381e07bd277c5013c5e112f5b2997b2e9667052b83324960990ce96fa7ec4542
 AUX scribus-1.6.1-poppler-24.03.patch 2716 BLAKE2B b10db99ac5814fcfb30640c9de407d59ee7d0580b49975e261de6ca7f5fd04e71b7ecedba5e800ad91bc39d7c2e94ae718041bcf8e82703edaa5f1eaafd5565a SHA512 33d0951876a267c87b40beec435a0c4d1ab4ae646970131ccf2109f1b1385b8419e59a977b7c534cc207ef00d80e67de9c2c17f3dabcbc0f39f059f4c4b19e42
@@ -8,6 +9,7 @@ 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.1.tar.xz 73266900 BLAKE2B b8120823cf98201ed197748cffe3f12019acfbd4831b497585ad7d04fa6d6e470bf4bc85dac15700483dfc977c56136cb49bcee20106f482cd9b0022d75d28d5 SHA512 ffde5628ea314dab8f212f78e7dd96cd258ceaebccc5b8de2c21e338a433f82d7fbbb047d05882abb07b4dceac031141b77fef933c9a3ed0e26f29bb94377e7e
-EBUILD scribus-1.6.1-r1.ebuild 4089 BLAKE2B d290f8e91ed1329b6f4ebbadb8eafbebc3609cbc55fdd0d61e6bb83b4f52fc7f97a6d94b4776743220002d92d5f4c399a36a0a2ca95544f4501defc4342abb20 SHA512 957f16e3f9ae740faf8ef06acb4bf7a7a33eed4b042702e2386f789ed1890a9b846ee60073620eeadf8272007d4375eeacef7f5cd728177e24bb994dd7b6f312
+EBUILD scribus-1.6.1-r1.ebuild 4135 BLAKE2B 024f5d049e6fc0ec798092fd1127b996d463ac4d17bfedc5b12cbf7ba967b9665d2ba3965aae529e7060ad51377f9b9b9f2335c65ccd4612654002f627d1109f SHA512 c51aa4048aed27376d48e682164bf62496e98d30af4e2c717f0d9dc3f65c03b2410b34e70c9356c09dc4701fc79d261130592973895a4b2e2bfb515e4ccec809
+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/files/scribus-1.6.1-boost-1.85-2.patch b/app-office/scribus/files/scribus-1.6.1-boost-1.85-2.patch
new file mode 100644
index 000000000000..55bc9934964b
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.6.1-boost-1.85-2.patch
@@ -0,0 +1,27 @@
+From 3116328e804c7366ec64c4224cbf20b0f14e52c8 Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Sun, 31 Mar 2024 21:40:42 +0000
+Subject: [PATCH] Fix C++20 related warning "template-id is not allowed for
+ constructor in C++20"
+
+git-svn-id: svn://scribus.net/trunk/Scribus@26079 11d20701-8431-0410-a711-e3c959e3b870
+--- a/scribus/third_party/lib2geom/rect.h
++++ b/scribus/third_party/lib2geom/rect.h
+@@ -56,14 +56,14 @@ class D2<Interval> {
+   private:
+     Interval f[2];
+   public:
+-    D2<Interval>() { f[X] = f[Y] = Interval(0, 0); }
++    D2() { f[X] = f[Y] = Interval(0, 0); }
+     
+-    D2<Interval>(Interval const &a, Interval const &b) {
++    D2(Interval const &a, Interval const &b) {
+         f[X] = a;
+         f[Y] = b;
+     }
+ 
+-    D2<Interval>(Point const & a, Point const & b) {
++    D2(Point const & a, Point const & b) {
+         f[X] = Interval(a[X], b[X]);
+         f[Y] = Interval(a[Y], b[Y]);
+     }
diff --git a/app-office/scribus/scribus-1.6.1-r1.ebuild b/app-office/scribus/scribus-1.6.1-r1.ebuild
index e112af815030..3b20f7808237 100644
--- a/app-office/scribus/scribus-1.6.1-r1.ebuild
+++ b/app-office/scribus/scribus-1.6.1-r1.ebuild
@@ -79,6 +79,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.1-poppler-24.03.patch
 	"${FILESDIR}"/${PN}-1.6.1-poppler-24.05.patch
 	"${FILESDIR}"/${PN}-1.6.1-boost-1.85.patch
+	"${FILESDIR}"/${PN}-1.6.1-boost-1.85-2.patch
 )
 
 src_prepare() {
diff --git a/app-office/scribus/scribus-1.6.9999.ebuild b/app-office/scribus/scribus-1.6.9999.ebuild
new file mode 100644
index 000000000000..13ccc1b48d25
--- /dev/null
+++ b/app-office/scribus/scribus-1.6.9999.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2024 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
+}