gentoo auto-resync : 25:09:2023 - 05:24:31

9 files changed, 36 insertions, 16 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 222ca74652da..c58204c82544 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/languagetool/Manifest b/app-text/languagetool/Manifest
index 7e7ada5833e8..eee0e1668bcf 100644
--- a/app-text/languagetool/Manifest
+++ b/app-text/languagetool/Manifest
@@ -1,6 +1,6 @@
 AUX languagetool.desktop 191 BLAKE2B 726e670645f78c3ea11c788a6440116753d66cf9886155ffa0f9cfad7deab000891276526aea17bae4977472c5d154837fb779de6abdb9cbe47148ce6ff96fe7 SHA512 d54542d4e742e83a7514857a11756f66966a9714f0f7b781aabd635b14cfa4f4d2b0fc1f98b2148af92e469fe877ffb61995c2abe5f59678174eae1d9c3dcbfe
-AUX languagetool.initd 473 BLAKE2B 74f55cfaf5b6c2e2fa166533c031408dc7e2e2b1882e6e09227af38e500f12481a551e8cec166620c73e671f00063cb63cc9dda500355110ff048d806dfa2d77 SHA512 fb9ab4fa28df1f43791995557fc4568ee79f7af7991481d295c28739c975c6648999676ea078ee852dc3dc9f49fbb9945c9dc571c385dd4db3d69ca5bf501623
+AUX languagetool.initd 472 BLAKE2B 516159aa5e5571ddf96cca65d734a9574cbb3e0a29af2c681318a4f553316c434f74661810e3a29cadb21c677645ac3e840d551a9079c0c685745befa7930d42 SHA512 3623b31d446ecfbccc674109dd29e6bb8fbf4c5d20bccff4d430e8fb3674ffc380fa2a53ee1cfa2af49daf306d0d19da2480d7da5b87018461c8a9a33406294b
 AUX logo.svg 2824 BLAKE2B 7653478b44ebd3dc80691849751745aba14a652d1ffaf52ef27910a52fae15b39c9ef0224795f698b1ac6f95a3e677ee46603b29261dff0d50d9eedba5e09de5 SHA512 501e3dee99f762556774f42829a9e450fc412271a7ade87f17ffb211929d24564ea3385b2bfc1c261e46d4b0b3562be62903b111ecd1c7dacb97c3c8ffb0d6d5
 DIST LanguageTool-5.4.zip 202761711 BLAKE2B b23c2944bf40dbef70d43391761849fb83b55538ac1cf0312c82079caef0a91f177f67c0e5818ea558c485d0bc2f4425f6cd32064095aede755a3b1233cf62d7 SHA512 08048f5bb8c5f7050ca2081a9f00405b0b397c37511a8297675f031bbb59e19863195e3b624dabb0964d436ad1570112e8c85225905ae22f2bde2a0200fcd883
-EBUILD languagetool-5.4.ebuild 1706 BLAKE2B c07f7f3e837217d85fc8deca86f32a38e7988a6fa1fd15669c0d603755147d332c6400687586d772cbd8010ffcbaf9bf1a8879767df3fb4abdc69bf71dab6acd SHA512 fb88af597a204694a7f1dbf3dc462c8f7891a3811b0656735dac8a00172c8349180813fc46034da481c6e5f5aefc6c0952e2064cc34920a389d4f503060267f4
+EBUILD languagetool-5.4-r1.ebuild 1706 BLAKE2B c07f7f3e837217d85fc8deca86f32a38e7988a6fa1fd15669c0d603755147d332c6400687586d772cbd8010ffcbaf9bf1a8879767df3fb4abdc69bf71dab6acd SHA512 fb88af597a204694a7f1dbf3dc462c8f7891a3811b0656735dac8a00172c8349180813fc46034da481c6e5f5aefc6c0952e2064cc34920a389d4f503060267f4
 MISC metadata.xml 256 BLAKE2B a2cc41acd036354767d8637d65524b95dd6a79ae0126f7e6ba61abd53bf681cc4b7eb8f06c2842be9a634ef4b6820aa20bf7931debb508b2e819706665dd6eef SHA512 bd920ac1d3d1ac26afc3685652533d93bed59162ce9acab9f44cf4548f75ebcec2a1713f0f596a1d3e08a06a72fa27c56331a19321eeae5bce74e8a10a79ae70
diff --git a/app-text/languagetool/files/languagetool.initd b/app-text/languagetool/files/languagetool.initd
index 30a72a91a932..79568f20051a 100644
--- a/app-text/languagetool/files/languagetool.initd
+++ b/app-text/languagetool/files/languagetool.initd
@@ -7,13 +7,13 @@ depend() {
 
 start() {
 	ebegin "Starting languagetool [server]"
-	start-stop-daemon --start --background --exec /bin/bash /usr/bin/languagetool-server \
-        --config "/etc/languagetool.cfg" --allow-origin "*" --port 8081
+	start-stop-daemon --start --background --exec /bin/bash -- /usr/bin/languagetool-server \
+		--config "/etc/languagetool.cfg" --allow-origin "*" --port 8081
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping languagetool [server]"
-	start-stop-daemon --stop --exec /bin/bash /usr/bin/languagetool-server 
+	start-stop-daemon --stop --exec /bin/bash -- /usr/bin/languagetool-server
 	eend $?
 }
diff --git a/app-text/languagetool/languagetool-5.4.ebuild b/app-text/languagetool/languagetool-5.4-r1.ebuild
index 870c19e57437..870c19e57437 100644
--- a/app-text/languagetool/languagetool-5.4.ebuild
+++ b/app-text/languagetool/languagetool-5.4-r1.ebuild
diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest
index 36b00fa3d0a4..bf8e03bc7241 100644
--- a/app-text/podofo/Manifest
+++ b/app-text/podofo/Manifest
@@ -3,6 +3,6 @@ DIST podofo-0.10.1-test-resources.tar.gz 4228392 BLAKE2B 95526d145a18976d5b9f782
 DIST podofo-0.10.1.tar.gz 1690279 BLAKE2B 0fc161c467ffce07c1b2cb1a2124ffddc6c18189b5c8b31dc1212921637601a667cd2b0d6f1269214bd0fe47e8853367283e3053813d45aed01589f0dfb1c29b SHA512 cbbd183cd940345f9b077b7da140414c27badc70fdf754e2f3c6f0e51c25072de46d7fe312b014c0eab359bd03e9dca0283260db00f079c5014e268d5c5ef5c9
 DIST podofo-0.9.8-bug-888463.patch 1269 BLAKE2B 632e9326112eecb484a15a532fc218263eab081acaf2af2bc1cc3d1020347846ce9ce82147d9d2fa9b42d690270b01b68eaf621cfbbdcfce041b8d651754c08e SHA512 9b0764d8697fad57107647a620f6dbe5d8025628faf02b1d6839d3f975216b16a58ccc115f58809aa4e31fb6b4b487b1490eedf468ddc8b90e494f68d8e50dc6
 DIST podofo-0.9.8.tar.gz 1012918 BLAKE2B 5d343128bcf06dbb8ef1d70b32f580a800726c33e4c14c86a6c7df0278a34b2d96cba7975c00d32e792596ca3cb54fa66fee262b49a240cd52e31646947b943e SHA512 b220322114450f1656c73d325f5172bc4cec0b1913e98b4eb2455f8ed7394bcaa47438d41003c9678937ef44d411e135431ddd6784f83d3663337d471baa02b1
-EBUILD podofo-0.10.1.ebuild 1616 BLAKE2B c6844f2e48aa96ab1cad09230bbe82885c1d22919861b3994f5e138c274cd7548d3cca2fc0c67ba3a721cc4aa8a628196e6568795a81023d085041496edc70d8 SHA512 4f62a79ffe7d4940414294a883d015b68f574002a5f0ca029e7bed83103b1bc312606f1f3a238686227d6d0fea043f220054482b95ecd347236ce1dd05c3bbdb
+EBUILD podofo-0.10.1-r1.ebuild 2271 BLAKE2B 88adc6154ecfd642475e0b77ad9ccbf2f3c13d617ff3679ea32b95c435c78fedd0da80341f620f9b655b14995e26a42eaa2b3083db4d3b40065c17a3f2b095d5 SHA512 9a3ad3f91f9ce0b0c0716360fb242b51ab6789c45d617de51d28a2cd528e5e26056978cf38ea2794ae607aadd8b78213c01c9c782254f1481501e444c37517b7
 EBUILD podofo-0.9.8-r1.ebuild 3304 BLAKE2B 9914548743904ca027878a0c8584786e427700744bd6e56bc8f4c4b21de837a85d66cf74c56072b7ae39a918202a2f2955c521439f8aa4699327229d430026c1 SHA512 dd67345ef90972668c896cbb81f3a8bb31289da2a008f8b2b896d9f80cc5c0bb2df24348cbc9a92e753a072f7630ee474567194eb723990186d248667cbd8470
 MISC metadata.xml 485 BLAKE2B 80da5271943f738cfbc6076d00e93ea404208f8d24604beab0f2cfd339efc535e1b217f87f9d2a87908db0c9c1b77759b66355d5c0a3f61aef128b44990c9969 SHA512 4ea145783ae9f42702dcf2936d2f5bed576f0222675f481d7a2118d44ab7eecfa12d889707942a5c60482f37e1e36e2476657fd401d523022cc1b2d9c76e56ca
diff --git a/app-text/podofo/podofo-0.10.1.ebuild b/app-text/podofo/podofo-0.10.1-r1.ebuild
index 29d54510af38..01677dd282b6 100644
--- a/app-text/podofo/podofo-0.10.1.ebuild
+++ b/app-text/podofo/podofo-0.10.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake flag-o-matic
 
 DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format"
 HOMEPAGE="https://github.com/podofo/podofo"
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/podofo/podofo/archive/refs/tags/${PV}.tar.gz -> ${P}
 
 LICENSE="LGPL-2+ tools? ( GPL-2+ )"
 SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="idn jpeg tiff png fontconfig test tools"
 RESTRICT="!test? ( test )"
 
@@ -32,7 +32,10 @@ RDEPEND="
 	tiff? ( media-libs/tiff:= )
 	sys-libs/zlib:="
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( fontconfig? ( media-fonts/liberation-fonts ) )
+"
 
 src_prepare() {
 	cmake_src_prepare
@@ -52,5 +55,22 @@ src_configure() {
 		$(cmake_use_find_package png PNG)
 		$(cmake_use_find_package fontconfig Fontconfig)
 	)
+
+	# some optimizations cause testsuite failures which may indicate
+	# unsoundness with contraction. Be cautious for now. Reported
+	# upstream as https://github.com/podofo/podofo/issues/103
+	append-cxxflags $(test-flags-CXX -ffp-contract=off)
+
 	cmake_src_configure
 }
+
+src_test() {
+	local CMAKE_SKIP_TESTS=(
+		$(usev !png 'TestImage3')
+		$(usev !jpeg 'TestImage2 TestImage4 TestImage5')
+		# relies on finding arial font
+		$(usev !fontconfig 'testLoadEncrypedFilePdfMemDocument testLoadEncrypedFilePdfParser testCyclicTree testNestedArrayTree testEmptyKidsTree testNestedArrayTree testCreateDelete')
+	)
+
+	cmake_src_test
+}
diff --git a/app-text/scdoc/Manifest b/app-text/scdoc/Manifest
index bd3ed7492b3b..7428498c2be8 100644
--- a/app-text/scdoc/Manifest
+++ b/app-text/scdoc/Manifest
@@ -1,4 +1,4 @@
 DIST scdoc-1.11.2.tar.gz 12746 BLAKE2B f4cb2c400103c1f2247a2bee79dca9ae5c50b8397c65edbdf4d70265a4596f85e0c47aab014699c4d63929b258db8ae3ff6728a9b95f212be9db1fa657e5b93a SHA512 3fbf1a74b222dd88410636124e4b6ca73f7e77f67d512cf430a878fefcaa5c6c13a1e9f6c0c9654de15353f94bb1bd528665acebc2293bebb325501d1eb6cda3
-EBUILD scdoc-1.11.2-r1.ebuild 1228 BLAKE2B a046c9b88578f56bde6f70fefc5356269f6ba40074f1f4f83f16bea2d537eb9f948ff6130739154cb520139ea83e9d959c94f89766817d145c4e7a2cffc9936b SHA512 0e8b50bf14361e58cd1d4b0c0652e75e7c166a0c62883c0a831376d45f692309c916de0276afe7c12a2409775b517a2b1de40067b4233058b540cef26a52efb9
-EBUILD scdoc-9999.ebuild 1207 BLAKE2B d45d60cca9e3068067694e3c6b5134a7943c0628c92c3af4c3d897d0a6cda4ec8f2f517e20a95f608e90b1d06f72446e086e0f233ce5dfc82ebbf1e866e995b3 SHA512 6bc57216b217ca045b330a646fa542976dad6835a5698079acede9b81fba96c5987598d800101b75e1a7f2ef2da9e847233fb8d410406abdd839bdd878e2c991
+EBUILD scdoc-1.11.2-r1.ebuild 1237 BLAKE2B 201356c1c9e675cd798f91341d8d7c9614838757de74daca7f523e7d1aa206d874436edfcd11e8f423dc29244939361b505c8fc232cbdeee2bf90c58147f404f SHA512 000f32000431d70ecafaa3a86eb87f41abfbdf666ed21114a7b47ec378ff9d35e88decd1650d6bbb34e4ade7540243a3969c4e1960b2317fcb78f01e713f1513
+EBUILD scdoc-9999.ebuild 1216 BLAKE2B a1dc6844716ea3a4151f61dd4ef433f818447b1ca27e0ad850394eddc1daacdee6b5a6cd47a96aad3a4dc6cb33ca66e87efe6bddfb89956a1cb739e1d665fcb2 SHA512 f0a8ef320dd9a975ce32dbdd3fc12428095ae7a6d36ddbe4e90ccf63d96e989860d54567677cc34f1d23186fbb1bca12e5739c4623f4df7ad162aba9b15fb2b9
 MISC metadata.xml 334 BLAKE2B b4dfa2cd4f88781ab650e1f2514c98d4ff7122703b2a5fdf4ea68a6deab002222fac5c17f80b4f11260b2c22853f98846b2064b38d4c8297fdce9dda5030569d SHA512 e4161c4d0c51306cd1e93ff43390534f1bb4f5393a77b360762619884a8b057a75e1da784cf5f28c092c035f1681469b38b2f0871c70c027fad9b1902fe28c9c
diff --git a/app-text/scdoc/scdoc-1.11.2-r1.ebuild b/app-text/scdoc/scdoc-1.11.2-r1.ebuild
index cb92a9c00651..35243659e867 100644
--- a/app-text/scdoc/scdoc-1.11.2-r1.ebuild
+++ b/app-text/scdoc/scdoc-1.11.2-r1.ebuild
@@ -40,6 +40,6 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${ED}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \
-		PCDIR="/usr/$(get_libdir)/pkgconfig" install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \
+		PCDIR="${EPREFIX}/usr/$(get_libdir)/pkgconfig" install
 }
diff --git a/app-text/scdoc/scdoc-9999.ebuild b/app-text/scdoc/scdoc-9999.ebuild
index 1e3c06c1ea69..938aa8493a7c 100644
--- a/app-text/scdoc/scdoc-9999.ebuild
+++ b/app-text/scdoc/scdoc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -40,6 +40,6 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${ED}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \
-		PCDIR="/usr/$(get_libdir)/pkgconfig" install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \
+		PCDIR="${EPREFIX}/usr/$(get_libdir)/pkgconfig" install
 }