gentoo auto-resync : 20:01:2025 - 06:42:03

11 files changed, 27 insertions, 100 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index f0f0c6625226..b9b285dac0fb 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/hyperestraier/Manifest b/app-text/hyperestraier/Manifest
index b4c7fa8a7d0c..3824b3d77347 100644
--- a/app-text/hyperestraier/Manifest
+++ b/app-text/hyperestraier/Manifest
@@ -1,7 +1,8 @@
 AUX hyperestraier-configure.patch 12359 BLAKE2B 52fb2210ee4945c07fcd4e9812be052a748eed64ab323bbfc33feec828d56bb9243f64ec800e9750b094e84c6347ee6c25e74d6881ab2f9b012e13f6b28a06b6 SHA512 db0496b6e826ece8db2d9bae4758134b56204982e07783986cf0406df7a3c7006a39ccb56dcd4b303bf1b1227acc43b98533546dd5957ae6334fe56e3ad63378
 AUX hyperestraier-java-11.patch 2602 BLAKE2B 718462095f4ff2746b2193cddd366de547591047eba53fc855c48be7d90069284771b2c007e4d13c80e7d11a74ae3c9ab7ffec6dcb1b86739fc81b2d1a0ffc04 SHA512 81077f319830d6ab28164cfbd5e57d89a0ddf0197135dbf71b3d33f1edc2b21e253431604122f1f82e718dae125228da57a93585d2ce9bce478ddcb8dceb17d8
 AUX hyperestraier-perl.patch 844 BLAKE2B fd221a027e47ed7582e697a8104d1ef82d66b87919f20c82f185b9167ad03ae6b9f0b6996b47a99e58fb42443f1c1b1c9f53a6badab935361b26f8693b680694 SHA512 73c7bd659d80464baf1d28a0eed69c9fdb3052a62aa46dc0b56f2ba6f75d458531dc6023684bd92b22b7fc4b79869ccd82e835827096b163faee0f94b0615465
+AUX hyperestraier-ruby-varargs.patch 563 BLAKE2B c20af35842e46c899a0473f4319a5d44c18e78f752444fadf5c6109070b0b90587fad3377eb49f15065a1069a2262c692f95753c34f160cd9ac2dba6a24b45fd SHA512 21b847654cf2527fae5772c5cd67b67dd5c4285bc28786764ad19d3e97b815870af103f5afd726eaefc55874c215dc13aac08facdb2246e86c3f07c4679e0640
 AUX hyperestraier-ruby19.patch 5143 BLAKE2B c9ea3c9e045583dee3ca119ebea07946522c50b00aba4d94fc40f7172925b9aedb8cbdc88e087a87590422566b12269641511c2c1c0a484390b1c2fa8bd1fecc SHA512 fcae611f594eeb35b6aca6eb1139304538793afc6b794e8dee1a59243d5da216f364165c90e7cf7691ed9a7f38a610ba27f37c2eef2baa4042c4a993cbfefb2a
 DIST hyperestraier-1.4.13.tar.gz 1014600 BLAKE2B 02be7cd374c47094dedd239e967dbbe5045a77302125861541dbf4d5fc60d488968718fd6b9ca57b88aac96cf2cfe73397af6bbc3d53ff6e983063ed98748e70 SHA512 ec97f487bb0e085f74222106fc5fab227c8c02ee8d736c0b4adef57ec0e4310f829ac59fff5a1c92321786e89bbc2a059a0acff6ab0e5844b83627567bb265fc
-EBUILD hyperestraier-1.4.13-r2.ebuild 3619 BLAKE2B cd4374914774a416efe33b1e596785073c4545042dc5160109389116849c0dd8f7da8e74c68f43ae93fd0cc66ef8ea7a334297948c93e92775877a1ae49f2a52 SHA512 c82cb4e4011aba6eb9da0373a3d7bb88bb1e8e5494712a580cd70b4723df08e859d892cdc3f0af0f6fbdebf582ec49d8cc4aac727057a4736995d4f7eb8a3836
+EBUILD hyperestraier-1.4.13-r2.ebuild 3652 BLAKE2B 8819fb063d31926b36295b919122963b4f42f429e5be511ec71c3522f4c96db1f7ad0ebd0e4faed7731e9b1a0864694a8ed857f5bab0fd7d9ca1785edcc7ed74 SHA512 f4c7bf76ecd11621e90b45d44e5adc483150a17c61f60673d8a75a76b2a1539ea1824cca728f9eb7044dabadf0608bb4862fcf83edf35f35f5d7f6f368bc2ebe
 MISC metadata.xml 441 BLAKE2B d0c43a24b0a988b9b5d30a7c0d002ca45587c13f166dc2b43cfabac3b4c73f78a57cbee98d5967609dcaff3bb8e25b6be2df2f6328fb6b441e5b15d3dc0ce9bf SHA512 aab164bf0b80548a5867b8347963f9bc8dde159e879fc464e8b12e9a1f7bfa0dad572d453a28ab5d0fb6169cc6238f9a2f79016ee835b0560396f1631b3f3e85
diff --git a/app-text/hyperestraier/files/hyperestraier-ruby-varargs.patch b/app-text/hyperestraier/files/hyperestraier-ruby-varargs.patch
new file mode 100644
index 000000000000..bcf2753f3a0a
--- /dev/null
+++ b/app-text/hyperestraier/files/hyperestraier-ruby-varargs.patch
@@ -0,0 +1,20 @@
+--- a/rubynative/src/estraier.c	2025-01-19 09:16:41.340299738 +0100
++++ b/rubynative/src/estraier.c	2025-01-19 09:17:18.404701204 +0100
+@@ -125,7 +125,7 @@
+ static CBMAP *objtocbmap(VALUE obj);
+ static void db_informer(const char *message, void *opaque);
+ static VALUE db_informer_process(VALUE arg);
+-static VALUE db_informer_resque(VALUE arg);
++static VALUE db_informer_resque(VALUE arg1, VALUE arg2);
+ 
+ 
+ 
+@@ -1259,7 +1259,7 @@
+ }
+ 
+ 
+-static VALUE db_informer_resque(VALUE arg){
++static VALUE db_informer_resque(VALUE arg1, VALUE arg2){
+   return Qnil;
+ }
+ 
diff --git a/app-text/hyperestraier/hyperestraier-1.4.13-r2.ebuild b/app-text/hyperestraier/hyperestraier-1.4.13-r2.ebuild
index c5934ea45287..537b033d18db 100644
--- a/app-text/hyperestraier/hyperestraier-1.4.13-r2.ebuild
+++ b/app-text/hyperestraier/hyperestraier-1.4.13-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32"
 RUBY_OPTIONAL="yes"
 
 inherit autotools java-pkg-opt-2 perl-functions ruby-ng
@@ -34,6 +34,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-java-11.patch
 	"${FILESDIR}"/${PN}-perl.patch
 	"${FILESDIR}"/${PN}-ruby19.patch
+	"${FILESDIR}"/${PN}-ruby-varargs.patch
 )
 HTML_DOCS=( doc/. )
 
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 6a4e087c46f3..7e103d9bae76 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -2,5 +2,5 @@ DIST Sigil_User_Guide_2024.08.15.epub 12641984 BLAKE2B feaa8a4f6b64786d5cbf494a6
 DIST sigil-2.3.1.tar.gz 17475697 BLAKE2B 668d02f941c900921224977bc2d8edeb6a21cf7985d1f7980ffc6b8ecc6627fe5a29f71ea75e12d1f54c2b1959afa7323dda807b1189e4189a996e98c90bdea2 SHA512 da0433882040212a8385c1b872b568ef39660b6c0127d64d9fc4cdd4f3939c2e14f3d08056ab1b405142e012caf363ebfe170761a74e684590c1a358e1115d09
 DIST sigil-2.4.0.tar.gz 19135045 BLAKE2B 311fe0894818c08fc5ecee8b29b04e24aa8f13d4f28b1011f455fcf7944561e68832ddd36885f69f794333bb790b7b84c49bc6d3d2367772150e936708916d0c SHA512 1c5687f31494ea5f1c8e3ac5fe3c3892ee68a0645795c57f10802d4e579c95a4ef5e3cb0fedc598f647282b3fe7b56e1a3efd547e08a44fea4619ae5b9581c20
 EBUILD sigil-2.3.1.ebuild 2239 BLAKE2B b65ea5a5e057f828cb5f8a092de01b2d05d70112c51f3279254ecf8066169c02ac7719ff5cc90465a62a90e07407bc161499622284da8939ec3ddf44094597dc SHA512 ceec367745e5ff537ded0bbc84bdc44b91bcc27d451ebe751dd91e5b547e58ed7835d965584e1fd6eebedf2dcd9c8d8a8267807fb37bfc911c30804609963f5f
-EBUILD sigil-2.4.0.ebuild 2258 BLAKE2B 85f7058dc2c33a9277c4704f1653c24dd649ff78b672025cb1d84e79e53aa0abf0825269b490104a8e670da90732a793ea56ced344b3df08fa0489b302961d5b SHA512 5bfd21c58859fb93c8c09e72e093cd8d34b506ffbd8b9142649f351f6f9a97e4b182c21c43ad1b667afe94caac15d93265fbb7eed0007ac331bbfe053d6b84ee
+EBUILD sigil-2.4.0.ebuild 2257 BLAKE2B 5b93eac3bb8ceb6c857e06807a23da009b03c34d836cf53f2eda33a44676f1c9dc46c2884816ebe0a91c56c33ec429f9d05b26414a6bb479fe04706d61ceee48 SHA512 71654f5193d0829b03f30639506c13ca9d32358e6749df1e00e6d5c3262520e86e0b1750e8945f42cc1ea4c478cba8e5d14c18156d852faa03d45a08563ddf3e
 MISC metadata.xml 810 BLAKE2B 9790a33fa436de084e57410b5fea4fc477bef40dafbc9b0467b0b01a27dfcb9b6874df529f5e0ecc1aca5e48fb07adde0b3a8c99fdd1ff1bd14f6877ecfedc98 SHA512 8b0c12e38cf8516e139bc1277062f0499148b6eba417e9c65389dd5aa8fdae9b967cffbe066f5e3bee5ed11d2eac2d909c782dc3b3f1432b3f4515adb04acaf2
diff --git a/app-text/sigil/sigil-2.4.0.ebuild b/app-text/sigil/sigil-2.4.0.ebuild
index c071247e701b..c8972858090d 100644
--- a/app-text/sigil/sigil-2.4.0.ebuild
+++ b/app-text/sigil/sigil-2.4.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${P^}
 
 LICENSE="GPL-3+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc +plugins +system-mathjax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-text/zeal/Manifest b/app-text/zeal/Manifest
index 20fb9233fead..fb87bc26a6b5 100644
--- a/app-text/zeal/Manifest
+++ b/app-text/zeal/Manifest
@@ -1,9 +1,4 @@
-AUX add-missing-qt-components.patch 532 BLAKE2B 278d3ff4d5833d4b5e63be4fe8bb9942fa764aa97426d415793436b431d8ecd3cc44b687d2b594ec5eedcf44661174d15283b4d2f7a235278c499ec64c97c446 SHA512 3dbaf47a8d197f6892a430bba0f8e89410923fe405a1d5318c0081e66784fc125e29254f81a0da4fba31a38f60858dde35309ec7e3fa0f8f64423631f8fa6fa5
 AUX disable-werror-0.7.2.patch 349 BLAKE2B 716370eff9708efe384e8c119bd4580a85820d8d3cfe4d725fca9e44708132b71d234abdf6516899b9f978b312799af84538375f25e1a568ca1ad03ad6138672 SHA512 33fe55a13d64ff4a466eb495acdf0a7b7e02737c187ed9c41ae735e0ec35d7bcc9da45baaeac7deff6ac6f4f58f72fa56270c7efaa3fa758098047d0853ae469
-AUX disable-werror.patch 245 BLAKE2B 187197e65082ce3724569fde73a4d737ff24881cf80d9383d4c83e17c2c8d23667bdf4fabcc12eb5e65186896e1cb66123fa1704299ef3eecf5288e64a4ef900 SHA512 de53fecba780c088e3dc0dc2d69a2e1a48cade216b048b55078eb4dd6758962aa2a353f7981bcd21a6f117de6c0d233dae438c157d0eff129e93669acaa42f84
-AUX qt6.patch 404 BLAKE2B bc757d9ee15e4a85750bc6762107bcce5b7bfd71988738ef08120744d0c9d846bf8dc97946bb76e7439dde49ce6ad4150bfa96b66e0f7a406000caf9eaf43437 SHA512 5fc4ebeedcba98aec13e150eb1a3a1ba82490537431ab765944ee323ae243ec94fa7cc451fa4aeb86edc8892f4a796cff1bb2fb21083cf1902b84ad11fde43e4
-DIST zeal-0.7.1.tar.gz 1195333 BLAKE2B 56e6d56e152ed94559d15ba4a5dd7972466db75a4d760640b55b532ba3ed325a429e8e03f450efaa3e24f09af68ff5b43463d9b8f21b8a9bd11e23a3841780c4 SHA512 bf2b5e2878b349ec4e5e74377a2a74e263d5f20649f152f194375547c5e69b3e6115c9d0f103acad7f087b20456d888a3be9f7ce1aa232206bba7e0ed38d252b
 DIST zeal-0.7.2.tar.gz 1217853 BLAKE2B e82c3a977375317cfb4d5ad32f577f668f38cfc1d3a2685d44c96814817623001a8fff848a04acf07d3ab942bee9a0c6801dfadad3fceaf24d55beb5a78a9522 SHA512 41f79f4c441938a60f80796376de31643ad1b80d989c6452653647be533b6e4e23d96b556895c457d574e00d75a57e4b2ef2a77096fa1d120e0c2e5b511366fb
-EBUILD zeal-0.7.1.ebuild 1139 BLAKE2B 9352a25414edd8c98c0286f4a29679e9c1d9ea317903ba3dbbbab0e501365ede3e7887aa4a63fe4fbf15f511bd72ff596a4ccecf15321a9dfac272c5cb6a2a96 SHA512 d2d3e7df26792245772cce9cf758eca010da301c5f495bc21548b38233bce474cf66b3995c1ea028feb5a03fc02450eada7cb4c705ab87e2cac125677f459e38
 EBUILD zeal-0.7.2.ebuild 1059 BLAKE2B d54945df5e7c40d8c2ae0094d7712d9b76ace693219a269b6b3473fafe0a673f4cf8968ee49909a48da88a6b77c9f438448cc814d3b88f9644528bb444809baf SHA512 0f598896376ffe35da63dd7c6dcc7ac1cf8af7a7d66b922c0b40445b6d17ea82ceec2e0700fc240d8f04ea58f0eb4e839d96b84d4100b3fe6b0c6a397bc85e24
 MISC metadata.xml 417 BLAKE2B 50581ec25cc6d51691295bab1d4e8b8351bb396dacbaed3f9a7db94ef01b6174705173db502faaf3130f7d0b6dabb7d3e7f20b7f19a0d92623338b1eaa7e3fb8 SHA512 3722502b6bb659f808866f3a04b02d8f5f6eb337e20c321baf863b52ccec0da99a62647c32e3472fcb05defe83b33de35bc2c472f8baa640f1db9f9380c52d4e
diff --git a/app-text/zeal/files/add-missing-qt-components.patch b/app-text/zeal/files/add-missing-qt-components.patch
deleted file mode 100644
index 423bfed0b081..000000000000
--- a/app-text/zeal/files/add-missing-qt-components.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Backport of https://github.com/zealdocs/zeal/pull/1644
-Done manually because CMakeLists.txt has CRLF line endings in release tarball.
---- a/src/app/CMakeLists.txt
-+++ b/src/app/CMakeLists.txt
-@@ -1,4 +1,4 @@
--find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets REQUIRED)

-+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Concurrent WebEngineWidgets Widgets REQUIRED)

- if (Qt${QT_VERSION_MAJOR}Widgets_VERSION VERSION_LESS QT_MINIMUM_VERSION)

-     message(FATAL_ERROR "Qt version >= ${QT_MINIMUM_VERSION} is required.")

- endif()

diff --git a/app-text/zeal/files/disable-werror.patch b/app-text/zeal/files/disable-werror.patch
deleted file mode 100644
index e1811d3098de..000000000000
--- a/app-text/zeal/files/disable-werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -59,9 +59,5 @@
-     VERBATIM

- )

- 

--if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.24.0")

--    set(CMAKE_COMPILE_WARNING_AS_ERROR ON)

--endif()

--

- add_subdirectory(assets)

- add_subdirectory(src)

diff --git a/app-text/zeal/files/qt6.patch b/app-text/zeal/files/qt6.patch
deleted file mode 100644
index 1312d63abb6f..000000000000
--- a/app-text/zeal/files/qt6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -22,7 +22,7 @@
- set(PROJECT_COPYRIGHT "© 2013-2024 Oleg Shparber and other contributors")

- 

- # Find available major Qt version. It will be stored in QT_VERSION_MAJOR.

--find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)

-+find_package(QT NAMES Qt6 REQUIRED COMPONENTS Core)

- if(QT_VERSION_MAJOR EQUAL 6)

-     set(QT_MINIMUM_VERSION 6.2.0)

- else()

diff --git a/app-text/zeal/zeal-0.7.1.ebuild b/app-text/zeal/zeal-0.7.1.ebuild
deleted file mode 100644
index 4705da258387..000000000000
--- a/app-text/zeal/zeal-0.7.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake edos2unix xdg-utils
-
-DESCRIPTION="Offline documentation browser inspired by Dash"
-HOMEPAGE="https://zealdocs.org/"
-SRC_URI="https://github.com/zealdocs/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	app-arch/libarchive:=
-	dev-db/sqlite:3
-	dev-qt/qtbase:6[concurrent,gui,network,widgets]
-	dev-qt/qtwebchannel:6
-	dev-qt/qtwebengine:6[widgets]
-	x11-libs/libX11
-	x11-libs/libxcb:=
-	x11-libs/xcb-util-keysyms
-"
-RDEPEND="${DEPEND}
-	x11-themes/hicolor-icon-theme
-"
-BDEPEND="kde-frameworks/extra-cmake-modules"
-
-PATCHES=(
-	"${FILESDIR}/disable-werror.patch"
-	"${FILESDIR}/qt6.patch"
-	"${FILESDIR}/add-missing-qt-components.patch"
-)
-
-src_prepare() {
-	edos2unix "${S}/assets/freedesktop/org.zealdocs.zeal.desktop"
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DZEAL_RELEASE_BUILD=ON
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}