gentoo auto-resync : 15:05:2024 - 00:01:27

5 files changed, 3 insertions, 15 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index e2ee7206fad1..1e5dc753d57f 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index e0a9c255657f..a339fafbd8b0 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -5,8 +5,7 @@ AUX scribus-1.6.1-poppler-24.03.patch 2950 BLAKE2B f2f6b32bf918b4aa935468eb60908
 AUX scribus-1.7.0-dont-install-thirdparty-license.patch 517 BLAKE2B cba2d9ad7e3b4a028f75dddb8296d8d5fd8f38c6eb91f673db4fda779375ed7f29e266874a66c9ea7d40c6e54908a2c98397072805cfb6c640c6a0a58b1cfd2a SHA512 8a38b5a1254f089f94f0fc8ca8f646e1c1d76a1193b232bb4420639a725f10cc2204d83c42a6a7535347dc7e2486048311e8221cfb445542b32511cedb07142e
 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
-AUX scribus-1.7.0-remove-hello-world-test.patch 239 BLAKE2B c74e2fc5f29d3c1a50b1f9a5c0d4205f7f348191dd3b7cde07d21566e85fcea273369b4d47078d2c19db230693fbe2267497b4b106ad0112e5b37a9f22a259a0 SHA512 88f8195144722b991138115bf398b63f3558c12a3a6d02a65a6520a80a710e67d38338d71dc80006f72e946aebf2eac4c692e23e8a759709aa31100791684f49
 DIST scribus-1.6.1.tar.xz 73266900 BLAKE2B b8120823cf98201ed197748cffe3f12019acfbd4831b497585ad7d04fa6d6e470bf4bc85dac15700483dfc977c56136cb49bcee20106f482cd9b0022d75d28d5 SHA512 ffde5628ea314dab8f212f78e7dd96cd258ceaebccc5b8de2c21e338a433f82d7fbbb047d05882abb07b4dceac031141b77fef933c9a3ed0e26f29bb94377e7e
-EBUILD scribus-1.6.1-r1.ebuild 3993 BLAKE2B a24f7623bb064e9e312bdeb565581e49ff03b0d82d00f0e5626a670ea9bf1bc98d0f31377c72eb606200869895315dbed46c8b3cd00f9570fe0fda2a74066c1b SHA512 e9ad57858f53b7b27a083fa9281a0a601a427a52f6e764fe2bd937a508721f787d7515fb194dccfe5d16054c9e634152ddb0de5f88b4e417e32a84209a379785
-EBUILD scribus-9999.ebuild 4044 BLAKE2B 33e10c223d1362e051e3993a9f1d7ff907ebf765768b610a01dd83094a99d2d79d3036d39d0d37447b2c15b087da6874cb798e40b9665902fa42fb7fec90215e SHA512 813be94dea80361b3bb22773b2872758a8478eb2319da2b1c8bde4deeb614e30a66d03cbba23b52d20bd625b1c636e5504174e1d85ac94378faac5e4afe50949
+EBUILD scribus-1.6.1-r1.ebuild 3996 BLAKE2B 9b753183e462da251e994d5a212075703268e35f33f054c484c2cdefb8637a740b4ea8b1ce1f3d90e7cca673f64b03e2612057b223288ecb95d32141b20776c6 SHA512 bae820ecb217dadb52cbf3399037f8b4312c05664dbc155ebbab0080c97575487aa8ec561c1bd054516818cd6793faff0ca311a842a984af292c050cef462242
+EBUILD scribus-9999.ebuild 3987 BLAKE2B 43aeb0200b28fd99bba9b23b717f32230f7908310ed6783ed43eb3051d9c401d556bb7fa4d6ec0f7687ce19fe173e0e6b34ab4a8017db5e05037f26ddaa0e9ed SHA512 50d9389f84838a8f2f031754167594c2b7dd728d0ccf4867d45c516bec077bcd7c5db1863aaf63ce05de8294ab6379f063cd445539d5f336d0d3d3ddf215400a
 MISC metadata.xml 883 BLAKE2B 7dc92ce97a3337f9397b52c647c00313790a8a674c88ba3491ef55b056941d6dcdfe1eac9009c4a5f2c4ebe70d81f9fa27439efad544bf8415ffb2235440402e SHA512 3348ea8be21835e88182c23e21dfaef4f52928aee1f4af1c88707cc3bd3f016d56986f197eec9b26279f4df72f20559fe7f4cad7439e67a66ab2c1b4f585ad91
diff --git a/app-office/scribus/files/scribus-1.7.0-remove-hello-world-test.patch b/app-office/scribus/files/scribus-1.7.0-remove-hello-world-test.patch
deleted file mode 100644
index cf9018fe1924..000000000000
--- a/app-office/scribus/files/scribus-1.7.0-remove-hello-world-test.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/scribus/CMakeLists.txt
-+++ b/scribus/CMakeLists.txt
-@@ -40,7 +40,6 @@ include(styles/CMakeLists.txt)
- include(text/CMakeLists.txt)
- 
- add_subdirectory(dtd)
--add_subdirectory(ui/qml)
- if(WITH_TESTS)
- 	add_subdirectory(tests)
- endif()
diff --git a/app-office/scribus/scribus-1.6.1-r1.ebuild b/app-office/scribus/scribus-1.6.1-r1.ebuild
index 7a3abef52fb0..6943d0b9a6bc 100644
--- a/app-office/scribus/scribus-1.6.1-r1.ebuild
+++ b/app-office/scribus/scribus-1.6.1-r1.ebuild
@@ -75,13 +75,13 @@ 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-remove-hello-world-test.patch
 	"${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch
 	"${FILESDIR}"/${PN}-1.6.1-poppler-24.03.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
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index e6a659a11344..d7e694a35803 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -78,7 +78,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.8-cmake.patch # bug 886251
 	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
 	"${FILESDIR}"/${PN}-1.7.0-findhyphen.patch
-	"${FILESDIR}"/${PN}-1.7.0-remove-hello-world-test.patch
 	"${FILESDIR}"/${PN}-1.7.0-dont-install-thirdparty-license.patch
 	"${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch
 )