Publish srcux candidate 0000000520-20260929-030310

21 files changed, 582 insertions, 52 deletions

diff --git a/dev-util/codeblocks/codeblocks-25.03-r3.ebuild b/dev-util/codeblocks/codeblocks-25.03-r3.ebuild
new file mode 100644
index 000000000000..558047cd52e6
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-25.03-r3.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+
+inherit autotools flag-o-matic multiprocessing wxwidgets xdg
+
+REV=13518
+REV_DATE="2024-05-05 20:30:28"
+FP_NAME=fortranproject
+FP_REV=378
+
+DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
+HOMEPAGE="https://www.codeblocks.org/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P/-/_}.tar.xz -> ${P}.tar.xz"
+S="${WORKDIR}/${P/-/_}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="fortran contrib debug"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="
+	app-arch/zip
+	dev-libs/glib:2
+	>=dev-libs/tinyxml-2.6.2-r3
+	>=dev-util/astyle-3.1-r2:0=
+	x11-libs/gtk+:3
+	x11-libs/wxGTK:${WX_GTK_VER}=[X]
+	contrib? (
+		app-arch/bzip2
+		app-text/hunspell:=
+		media-libs/fontconfig
+		virtual/zlib:=
+	)
+"
+
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+	contrib? ( dev-libs/boost:= )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}_env.patch"
+	"${FILESDIR}/${PN}-20.03_p13518_FortranProject-r378-autotools-build.patch"
+	"${FILESDIR}/${PN}-25.03_DisplayEvents.cpp-fix-linking-wxGTK-r13653.patch"
+	"${FILESDIR}/${PN}-25.03_autotools-fix-linking-TinyXML-r13855.patch"
+	"${FILESDIR}/${P}_fix_boost-1.89.0.patch"
+)
+
+src_prepare() {
+	default
+
+	# Let's make the autorevision work.
+	echo "m4_define([SVN_REV], ${REV})" > revision.m4
+	echo "m4_define([SVN_DATE], ${REV_DATE})" >> revision.m4
+
+	eautoreconf
+}
+
+src_configure() {
+	# Bug 858338
+	append-flags -fno-strict-aliasing
+
+	setup-wxwidgets
+
+	# USE="contrib -fortran" setup:
+	use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins all,-FortranProject)
+	# USE="contrib fortran" setup:
+	use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
+	# USE="-contrib fortran" setup:
+	use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins FortranProject)
+
+	local myeconfargs=(
+		--disable-pch
+		--disable-static
+		$(use_with contrib boost-libdir "${ESYSROOT}/usr/$(get_libdir)")
+		$(use_enable debug)
+		${CONF_WITH_LST}
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	if use contrib; then
+		if (( $(get_makeopts_jobs) > 8 )); then
+			emake -j8  # Bug 930819
+		else
+			emake
+		fi
+	else
+		emake
+	fi
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/dev-util/codeblocks/files/codeblocks-25.03_DisplayEvents.cpp-fix-linking-wxGTK-r13653.patch b/dev-util/codeblocks/files/codeblocks-25.03_DisplayEvents.cpp-fix-linking-wxGTK-r13653.patch
new file mode 100644
index 000000000000..0fc4bad192ed
--- /dev/null
+++ b/dev-util/codeblocks/files/codeblocks-25.03_DisplayEvents.cpp-fix-linking-wxGTK-r13653.patch
@@ -0,0 +1,130 @@
+DisplayEvents: Fix compilation with Autotools on Ubuntu.
+
+Sort plugins/Makefile.am alphabetically.
+
+Authored by: wh11204 2025-04-10
+
+https://sourceforge.net/p/codeblocks/code/13653/
+
+$ svn diff -r r13652:r13653 > r13653.patch
+
+Patch amended to apply on Gentoo (adds 'a/' and 'b/' prefixes).
+
+This should fix dev-util/codeblocks-25.03 'undefined reference'
+compile errors such as the following:
+
+make[3]: Entering directory '/var/tmp/portage/dev-util/codeblocks-25.03-r2/work/codeblocks_25.03/src/plugins/displayevents'
+/bin/sh ../../../libtool  --tag=CXX   --mode=compile x86_64-pc-linux-gnu-g++ -std=c++11 -DHAVE_CONFIG_H -I. -I../../../src/include  -I/usr/lib64/wx/include/gtk3-unicode-3.2 -I/usr/include/wx-3.2 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -pthread -I../../../src/include -DCB_AUTOCONF  -DNDEBUG -DPIC -DTIXML_USE_STL=YES  -O2 -pipe -march=x86-64 -mtune=generic -fno-strict-aliasing -fPIC -fexceptions -c -o DisplayEvents.lo DisplayEvents.cpp
+PWD=`pwd` cd . && zip -R /var/tmp/portage/dev-util/codeblocks-25.03-r2/work/codeblocks_25.03/src/plugins/displayevents/DisplayEvents.zip manifest.xml > /dev/null
+libtool: compile:  x86_64-pc-linux-gnu-g++ -std=c++11 -DHAVE_CONFIG_H -I. -I../../../src/include -I/usr/lib64/wx/include/gtk3-unicode-3.2 -I/usr/include/wx-3.2 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -pthread -I../../../src/include -DCB_AUTOCONF -DNDEBUG -DPIC -DTIXML_USE_STL=YES -O2 -pipe -march=x86-64 -mtune=generic -fno-strict-aliasing -fPIC -fexceptions -c DisplayEvents.cpp  -fPIC -DPIC -o .libs/DisplayEvents.o
+/bin/sh ../../../libtool  --tag=CXX   --mode=link x86_64-pc-linux-gnu-g++ -std=c++11  -O2 -pipe -march=x86-64 -mtune=generic -fno-strict-aliasing -fPIC -fexceptions -module -version-info 0:1:0 -shared -no-undefined -avoid-version -Wl,--no-undefined -Wl,-O1 -Wl,--as-needed -Wl,-z,pack-relative-relocs -o libDisplayEvents.la -rpath /usr/lib64/codeblocks/plugins DisplayEvents.lo  ../../sdk/libcodeblocks.la -lpthread -ldl
+libtool: link: x86_64-pc-linux-gnu-g++  -fPIC -DPIC -shared -nostdlib /usr/lib/gcc/x86_64-pc-linux-gnu/15/../../../../lib64/crti.o /usr/lib/gcc/x86_64-pc-linux-gnu/15/crtbeginS.o  .libs/DisplayEvents.o   -Wl,-rpath -Wl,/var/tmp/portage/dev-util/codeblocks-25.03-r2/work/codeblocks_25.03/src/sdk/.libs -Wl,--as-needed ../../sdk/.libs/libcodeblocks.so -L/usr/lib64 -lpthread -ldl -L/usr/lib/gcc/x86_64-pc-linux-gnu/15 -L/usr/lib/gcc/x86_64-pc-linux-gnu/15/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib/gcc/x86_64-pc-linux-gnu/15/../../../../x86_64-pc-linux-gnu/lib -L/usr/lib/gcc/x86_64-pc-linux-gnu/15/../../.. -L/lib -L/usr/lib -lstdc++ -lm -lgcc_s -lc -lgcc_s /usr/lib/gcc/x86_64-pc-linux-gnu/15/crtendS.o /usr/lib/gcc/x86_64-pc-linux-gnu/15/../../../../lib64/crtn.o  -O2 -march=x86-64 -mtune=generic -Wl,--no-undefined -Wl,-O1 -Wl,-z -Wl,pack-relative-relocs   -pthread -Wl,-soname -Wl,libDisplayEvents.so -o .libs/libDisplayEvents.so
+/usr/x86_64-pc-linux-gnu/binutils-bin/2.47/ld: .libs/DisplayEvents.o: in function `wxString::append(char const*) [clone .isra.0]':
+DisplayEvents.cpp:(.text+0x150b): undefined reference to `wxConvLibcPtr'
+
+$ find /usr/lib64/ -name 'libwx*.so' | xargs -I {} sh -c 'nm -D --defined-only ${1} 2>/dev/null | grep wxConvLibcPtr && echo ${1}' _ {}
+0000000000145e90 T _Z19wxGet_wxConvLibcPtrv@@WXU_3.2
+00000000002d2cc0 B wxConvLibcPtr@@WXU_3.2
+/usr/lib64/libwx_baseu-3.2.so
+
+Index: src/plugins/Makefile.am
+===================================================================
+--- a/src/plugins/Makefile.am	(revision 13652)
++++ b/src/plugins/Makefile.am	(revision 13653)
+@@ -26,12 +26,20 @@
+ MAYBE_DEBUGGER=debuggergdb
+ endif
+ 
++if BUILD_DISPLAYEVENTS
++MAYBE_DISPLAYEVENTS=displayevents
++endif
++
++if BUILD_MANIFEST
++MAYBE_MANIFEST=xpmanifest
++endif
++
+ if BUILD_MIMEHANDLER
+ MAYBE_MIMEHANDLER=defaultmimehandler
+ endif
+ 
+-if BUILD_DISPLAYEVENTS
+-MAYBE_DISPLAYEVENTS=displayevents
++if BUILD_OCCURRENCESHIGHLIGHTING
++MAYBE_OCCURRENCESHIGHLIGHTING=occurrenceshighlighting
+ endif
+ 
+ if BUILD_OPENFILESLIST
+@@ -38,10 +46,6 @@
+ MAYBE_OPENFILESLIST=openfileslist
+ endif
+ 
+-if BUILD_OCCURRENCESHIGHLIGHTING
+-MAYBE_OCCURRENCESHIGHLIGHTING=occurrenceshighlighting
+-endif
+-
+ if BUILD_PROJECTSIMPORTER
+ MAYBE_PROJECTSIMPORTER=projectsimporter
+ endif
+@@ -54,12 +58,8 @@
+ MAYBE_TODO=todo
+ endif
+ 
+-if BUILD_MANIFEST
+-MAYBE_MANIFEST=xpmanifest
+-endif
+-
+ SUBDIRS=$(MAYBE_ABBREVIATIONS) \
+-    $(MAYBE_ASTYLE) \
++		$(MAYBE_ASTYLE) \
+ 		$(MAYBE_AUTOSAVE) \
+ 		$(MAYBE_CLASSWIZARD) \
+ 		$(MAYBE_CODECOMPLETION) \
+@@ -66,13 +66,13 @@
+ 		$(MAYBE_COMPILER) \
+ 		$(MAYBE_DEBUGGER) \
+ 		$(MAYBE_DISPLAYEVENTS) \
++		$(MAYBE_MANIFEST) \
+ 		$(MAYBE_MIMEHANDLER) \
+-		$(MAYBE_SCRIPTEDWIZARD) \
+ 		$(MAYBE_PROJECTSIMPORTER) \
++		$(MAYBE_OCCURRENCESHIGHLIGHTING) \
+ 		$(MAYBE_OPENFILESLIST) \
+-		$(MAYBE_OCCURRENCESHIGHLIGHTING) \
++		$(MAYBE_SCRIPTEDWIZARD) \
+ 		$(MAYBE_TODO) \
+-		$(MAYBE_MANIFEST) \
+ 		contrib
+ # the 'contrib' subdir contains its own filtering
+ 
+@@ -85,8 +85,8 @@
+ 		debuggergdb \
+ 		defaultmimehandler \
+ 		displayevents \
++		occurrenceshighlighting \
+ 		openfileslist \
+-		occurrenceshighlighting \
+ 		projectsimporter \
+ 		scriptedwizard \
+ 		todo \
+@@ -97,3 +97,4 @@
+ 		loghacker \
+ 		modpoller \
+ 		tidycmt
++
+Index: src/plugins/displayevents/Makefile.am
+===================================================================
+--- a/src/plugins/displayevents/Makefile.am	(revision 13652)
++++ b/src/plugins/displayevents/Makefile.am	(revision 13653)
+@@ -5,10 +5,9 @@
+ 
+ pluginlib_LTLIBRARIES = libDisplayEvents.la
+ 
+-libDisplayEvents_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
++libDisplayEvents_la_LDFLAGS = @MODULE_SHARED_LDFLAGS@ -version-info 0:1:0 -shared -no-undefined -avoid-version
+ 
+-libDisplayEvents_la_LIBADD = $(PLUGIN_WX_LIBS) \
+-							../../sdk/libcodeblocks.la
++libDisplayEvents_la_LIBADD = ../../sdk/libcodeblocks.la $(WX_LIBS)
+ 
+ libDisplayEvents_la_SOURCES = DisplayEvents.cpp
+ 
diff --git a/dev-util/codeblocks/files/codeblocks-25.03_autotools-fix-linking-TinyXML-r13855.patch b/dev-util/codeblocks/files/codeblocks-25.03_autotools-fix-linking-TinyXML-r13855.patch
new file mode 100644
index 000000000000..817376d365d9
--- /dev/null
+++ b/dev-util/codeblocks/files/codeblocks-25.03_autotools-fix-linking-TinyXML-r13855.patch
@@ -0,0 +1,237 @@
+autotools: fix link error when system tinyxml is used. (Thanks hesti)
+
+See discussion in C::B forum:
+https://forums.codeblocks.org/index.php/topic,26015.msg177209.html
+
+Authored by: christoj 2026-05-26
+
+https://sourceforge.net/p/codeblocks/code/13855/
+
+$ svn diff -r r13854:r13855 > r13855.patch
+
+Patch amended to apply on Gentoo (adds 'a/' and 'b/' prefixes).
+
+This should fix dev-util/codeblocks-25.03 'undefined reference'
+compile errors such as the following:
+
+libtool: link: x86_64-pc-linux-gnu-g++  -fPIC -DPIC -shared -nostdlib /usr/lib/gcc/x86_64-pc-linux-gnu/15/../../../../lib64/crti.o /usr/lib/gcc/x86_64-pc-linux-gnu/15/crtbeginS.o  .libs/AutoVersioning.o .libs/avChangesDlg.o .libs/avHeader.o .libs/avSvnRevision.o .libs/avVersionEditorDlg.o   -Wl,-rpath -Wl,/var/tmp/portage/dev-util/codeblocks-25.03-r2/work/codeblocks_25.03/src/sdk/.libs -Wl,--as-needed ../../../sdk/.libs/libcodeblocks.so -L/usr/lib64 -lwx_gtk3u_aui-3.2 -lwx_gtk3u_propgrid-3.2 -lwx_gtk3u_richtext-3.2 -lwx_gtk3u_xrc-3.2 -lwx_gtk3u_html-3.2 -lwx_gtk3u_qa-3.2 -lwx_gtk3u_core-3.2 -lwx_baseu_xml-3.2 -lwx_baseu_net-3.2 -lwx_baseu-3.2 -lpthread -ldl -L/usr/lib/gcc/x86_64-pc-linux-gnu/15 -L/usr/lib/gcc/x86_64-pc-linux-gnu/15/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib/gcc/x86_64-pc-linux-gnu/15/../../../../x86_64-pc-linux-gnu/lib -L/usr/lib/gcc/x86_64-pc-linux-gnu/15/../../.. -L/lib -L/usr/lib -lstdc++ -lm -lgcc_s -lc -lgcc_s /usr/lib/gcc/x86_64-pc-linux-gnu/15/crtendS.o /usr/lib/gcc/x86_64-pc-linux-gnu/15/../../../../lib64/crtn.o  -O2 -march=x86-64 -mtune=generic -Wl,--no-undefined -Wl,-O1 -Wl,-z -Wl,pack-relative-relocs   -pthread -Wl,-soname -Wl,libAutoVersioning.so -o .libs/libAutoVersioning.so
+/usr/x86_64-pc-linux-gnu/binutils-bin/2.47/ld: .libs/AutoVersioning.o: in function `AutoVersioning::OnProjectLoadingHook(cbProject*, TiXmlElement*, bool)':
+AutoVersioning.cpp:(.text+0x7755): undefined reference to `TiXmlNode::FirstChildElement(char const*) const'
+
+$ find /usr/lib64/ -name "libtinyxml.so" | xargs -I {} sh -c 'nm -D --defined-only ${1} 2>/dev/null | grep FirstChildElement && echo ${1}' _ {}
+000000000000db00 T _ZNK11TiXmlHandle17FirstChildElementEPKc
+000000000000dac0 T _ZNK11TiXmlHandle17FirstChildElementEv
+000000000000aa70 T _ZNK9TiXmlNode17FirstChildElementEPKc
+000000000000aa30 T _ZNK9TiXmlNode17FirstChildElementEv
+/usr/lib64/libtinyxml.so
+
+Index: src/plugins/contrib/AutoVersioning/Makefile.am
+===================================================================
+--- a/src/plugins/contrib/AutoVersioning/Makefile.am	(revision 13854)
++++ b/gsrc/plugins/contrib/AutoVersioning/Makefile.am	(revision 13855)
+@@ -11,6 +11,10 @@
+ libAutoVersioning_la_LIBADD = ../../../sdk/libcodeblocks.la \
+ 			$(WX_LIBS)
+ 
++if ! CODEBLOCKS_NT
++libAutoVersioning_la_LIBADD += $(CB_TINYXML_LIBS)
++endif
++
+ libAutoVersioning_la_SOURCES = AutoVersioning.cpp \
+             avChangesDlg.cpp \
+             avHeader.cpp \
+Index: src/plugins/contrib/BrowseTracker/Makefile.am
+===================================================================
+--- a/src/plugins/contrib/BrowseTracker/Makefile.am	(revision 13854)
++++ b/src/plugins/contrib/BrowseTracker/Makefile.am	(revision 13855)
+@@ -11,6 +11,10 @@
+ libBrowseTracker_la_LIBADD = ../../../sdk/libcodeblocks.la \
+ 			$(WX_LIBS)
+ 
++if ! CODEBLOCKS_NT
++libBrowseTracker_la_LIBADD += $(CB_TINYXML_LIBS)
++endif
++
+ libBrowseTracker_la_SOURCES = BrowseTracker.cpp \
+ 			Version.cpp \
+ 			BrowseMarks.cpp \
+Index: src/plugins/contrib/CppCheck/Makefile.am
+===================================================================
+--- a/src/plugins/contrib/CppCheck/Makefile.am	(revision 13854)
++++ b/src/plugins/contrib/CppCheck/Makefile.am	(revision 13855)
+@@ -13,6 +13,10 @@
+ libCppCheck_la_LIBADD = ../../../sdk/libcodeblocks.la \
+ 		$(WX_LIBS)
+ 
++if ! CODEBLOCKS_NT
++libCppCheck_la_LIBADD += $(CB_TINYXML_LIBS)
++endif
++
+ libCppCheck_la_SOURCES = CppCheck.cpp \
+             CppCheckListLog.cpp \
+             ConfigPanel.cpp
+Index: src/plugins/contrib/DoxyBlocks/Makefile.am
+===================================================================
+--- a/src/plugins/contrib/DoxyBlocks/Makefile.am	(revision 13854)
++++ b/src/plugins/contrib/DoxyBlocks/Makefile.am	(revision 13855)
+@@ -11,6 +11,10 @@
+ libDoxyBlocks_la_LIBADD = ../../../sdk/libcodeblocks.la \
+ 			$(WX_LIBS)
+ 
++if ! CODEBLOCKS_NT
++libDoxyBlocks_la_LIBADD += $(CB_TINYXML_LIBS)
++endif
++
+ libDoxyBlocks_la_SOURCES = AutoDoc.cpp \
+ 				Config.cpp \
+ 				ConfigPanel.cpp \
+Index: src/plugins/contrib/EditorConfig/Makefile.am
+===================================================================
+--- a/src/plugins/contrib/EditorConfig/Makefile.am	(revision 13854)
++++ b/src/plugins/contrib/EditorConfig/Makefile.am	(revision 13855)
+@@ -11,6 +11,10 @@
+ libEditorConfig_la_LIBADD = ../../../sdk/libcodeblocks.la \
+ 			$(WX_LIBS)
+ 
++if ! CODEBLOCKS_NT
++libEditorConfig_la_LIBADD += $(CB_TINYXML_LIBS)
++endif
++
+ libEditorConfig_la_SOURCES = \
+ 			EditorConfigUI.cpp \
+ 			EditorConfig.cpp
+Index: src/plugins/contrib/Valgrind/Makefile.am
+===================================================================
+--- a/src/plugins/contrib/Valgrind/Makefile.am	(revision 13854)
++++ b/src/plugins/contrib/Valgrind/Makefile.am	(revision 13855)
+@@ -13,6 +13,10 @@
+ libValgrind_la_LIBADD = ../../../sdk/libcodeblocks.la \
+ 			$(WX_LIBS)
+ 
++if ! CODEBLOCKS_NT
++libValgrind_la_LIBADD += $(CB_TINYXML_LIBS)
++endif
++
+ libValgrind_la_SOURCES = Valgrind.cpp \
+ 			ValgrindListLog.cpp \
+ 			valgrind_config.cpp
+Index: src/plugins/contrib/clangd_client/Makefile.am
+===================================================================
+--- a/src/plugins/contrib/clangd_client/Makefile.am	(revision 13854)
++++ b/src/plugins/contrib/clangd_client/Makefile.am	(revision 13855)
+@@ -36,6 +36,10 @@
+ 			$(WX_LIBS)
+ 
+ if ! CODEBLOCKS_NT
++libclangd_client_la_LIBADD += $(CB_TINYXML_LIBS)
++endif
++
++if ! CODEBLOCKS_NT
+ libclangd_client_la_LIBADD += -lutil
+ endif
+ 
+Index: src/plugins/contrib/codesnippets/Makefile.am
+===================================================================
+--- a/src/plugins/contrib/codesnippets/Makefile.am	(revision 13854)
++++ b/src/plugins/contrib/codesnippets/Makefile.am	(revision 13855)
+@@ -18,6 +18,10 @@
+ 		$(WX_GTK_LIBS) \
+ 		$(WX_X11_LIBS)
+ 
++if ! CODEBLOCKS_NT
++libcodesnippets_la_LIBADD += $(CB_TINYXML_LIBS)
++endif
++
+ libcodesnippets_la_SOURCES = codesnippets.cpp \
+ 		codesnippetstreectrl.cpp \
+ 		codesnippetswindow.cpp \
+Index: src/plugins/contrib/envvars/Makefile.am
+===================================================================
+--- a/src/plugins/contrib/envvars/Makefile.am	(revision 13854)
++++ b/src/plugins/contrib/envvars/Makefile.am	(revision 13855)
+@@ -13,6 +13,10 @@
+ libenvvars_la_LIBADD = ../../../sdk/libcodeblocks.la \
+ 			$(WX_LIBS)
+ 
++if ! CODEBLOCKS_NT
++libenvvars_la_LIBADD += $(CB_TINYXML_LIBS)
++endif
++
+ libenvvars_la_SOURCES = envvars.cpp \
+                         envvars_cfgdlg.cpp \
+                         envvars_common.cpp \
+Index: src/plugins/contrib/lib_finder/Makefile.am
+===================================================================
+--- a/src/plugins/contrib/lib_finder/Makefile.am	(revision 13854)
++++ b/src/plugins/contrib/lib_finder/Makefile.am	(revision 13855)
+@@ -17,6 +17,10 @@
+ 		../wxContribItems/wxFlatNotebook/libwxflatnotebook.la \
+ 		$(WX_LIBS)
+ 
++if ! CODEBLOCKS_NT
++liblib_finder_la_LIBADD += $(CB_TINYXML_LIBS)
++endif
++
+ liblib_finder_la_SOURCES = \
+ 		librariesdlg.cpp \
+ 		dirlistdlg.cpp \
+Index: src/plugins/contrib/wxSmithAui/Makefile.am
+===================================================================
+--- a/src/plugins/contrib/wxSmithAui/Makefile.am	(revision 13854)
++++ b/src/plugins/contrib/wxSmithAui/Makefile.am	(revision 13855)
+@@ -16,6 +16,10 @@
+ 		       ../wxSmith/libwxsmithlib.la \
+ 		       $(WX_LIBS)
+ 
++if ! CODEBLOCKS_NT
++libwxSmithAui_la_LIBADD += $(CB_TINYXML_LIBS)
++endif
++
+ EXTRA_DIST = $(srcdir)/images/*.xpm \
+ 		$(srcdir)/images/*.xcf \
+ 		$(srcdir)/wxsmith/*.wxs \
+Index: src/plugins/contrib/wxSmithContribItems/Makefile.am
+===================================================================
+--- a/src/plugins/contrib/wxSmithContribItems/Makefile.am	(revision 13854)
++++ b/src/plugins/contrib/wxSmithContribItems/Makefile.am	(revision 13855)
+@@ -40,6 +40,10 @@
+ 			../wxContribItems/wxmathplot/libwxmathplot.la \
+ 			$(WX_LIBS)
+ 
++if ! CODEBLOCKS_NT
++libwxsmithcontribitems_la_LIBADD += $(CB_TINYXML_LIBS)
++endif
++
+ EXTRA_DIST = $(srcdir)/wxchart/*.xpm \
+ 		$(srcdir)/wxchart/*.png \
+ 		$(srcdir)/wximagebutton/*.xpm \
+Index: src/plugins/contrib/SpellChecker/Makefile.am
+===================================================================
+--- a/src/plugins/contrib/SpellChecker/Makefile.am	(revision 13854)
++++ b/src/plugins/contrib/SpellChecker/Makefile.am	(revision 13855)
+@@ -17,6 +17,10 @@
+ 							$(WX_LIBS) \
+ 							$(CB_HUNSPELL_LIBS)
+ 
++if ! CODEBLOCKS_NT
++libSpellChecker_la_LIBADD += $(CB_TINYXML_LIBS)
++endif
++
+ libSpellChecker_la_SOURCES = DictionariesNeededDialog.cpp \
+                             MySpellingDialog.cpp \
+                             OnlineSpellChecker.cpp \
+Index: src/plugins/contrib/source_exporter/Makefile.am
+===================================================================
+--- a/src/plugins/contrib/source_exporter/Makefile.am	(revision 13854)
++++ b/src/plugins/contrib/source_exporter/Makefile.am	(revision 13855)
+@@ -18,6 +18,10 @@
+ 				wxPdfDocument/libwxPdfDocument.la \
+ 				$(WX_LIBS) $(CB_FONTCONFIG_LIBS)
+ 
++if ! CODEBLOCKS_NT
++libexporter_la_LIBADD += $(CB_TINYXML_LIBS)
++endif
++
+ libexporter_la_SOURCES = BaseExporter.cpp \
+ 				exporter.cpp \
+ 				HTMLExporter.cpp \
diff --git a/dev-util/gemini-cli/Manifest b/dev-util/gemini-cli/Manifest
index 0a8d3faf0e67..72233664fe77 100644
--- a/dev-util/gemini-cli/Manifest
+++ b/dev-util/gemini-cli/Manifest
@@ -1,2 +1,2 @@
-DIST gemini-cli-0.59.0.zip 21069929 BLAKE2B d43f6aaa7a9431fe00688635e6cfd674fa2065d8451e791b118b2072e9177cbf1931d89357eb7ab9bfb7b53ff4af4c6492dd198d5f6de182ffd16cdebf281f67 SHA512 cac0a93040cf05dacd406f51c0ac3824df0e5c2a49f647afe305cfc9adfb00fc57f9294a168e1367b80479794742ee92db134a75c7530ecb0540f722f3ee0c51
 DIST gemini-cli-0.60.0.zip 21097612 BLAKE2B c09e62107452fb6e73ac9f4cc58f5e63552824e233f4f38955387ef6a4036715db02a2edb060e6a5c0c66a0427d7854e11328cb60ae5326161dcfda75c26ca93 SHA512 6254c42d3e8949501256c4cc9911b25c8e0760da21c0b219e9462f3d33ee822d000199c4e1620d1d79319daf37878b1e762f95aef7673eabf19cc0c92bbb5949
+DIST gemini-cli-0.61.0.zip 21122284 BLAKE2B be7da2702f75527455f1792137f472a4068a18e928a1138dc796a7e11899a3af0fbde60c4c255067ad77a63695c93409fae07585433d56094f42bd38c612f400 SHA512 806bf1fa1a2e0c6d3d971a0bd6e3e15e7af35a0f8ac7c93a3830e8852a83b2f290f017992e0d2cad3ba919f9045ed13b9be309acf75686873cb7d4c489eada43
diff --git a/dev-util/gemini-cli/gemini-cli-0.59.0.ebuild b/dev-util/gemini-cli/gemini-cli-0.61.0.ebuild
index ffdf827492f3..ffdf827492f3 100644
--- a/dev-util/gemini-cli/gemini-cli-0.59.0.ebuild
+++ b/dev-util/gemini-cli/gemini-cli-0.61.0.ebuild
diff --git a/dev-util/google-antigravity-cli/Manifest b/dev-util/google-antigravity-cli/Manifest
index b7dd014516a9..97aced40300e 100644
--- a/dev-util/google-antigravity-cli/Manifest
+++ b/dev-util/google-antigravity-cli/Manifest
@@ -1,6 +1,6 @@
 DIST google-antigravity-cli-1.1.28_amd64.tar.gz 56914961 BLAKE2B ca86372335da5571ecc5f36569359bef127c6838e96528d128bb9849608c22ae56ae1d17585f4451024525d5777c4d7cdd76c0370fd95b7e27a3c06f15c982b9 SHA512 a855c623426fe901088bfe2b4d559b01f5b479a7c5ec0e41acfe129d4fe7deee9fbd9057072cc8e8c19ed65474cafa4f1d10fcdc14fbb85f82f20c3ec94295d4
 DIST google-antigravity-cli-1.1.28_arm64.tar.gz 53365668 BLAKE2B 835278a90473bac5af32ea2a87309579c158fceb4aa19f68a4e9dd7a5c158d924200b89aa4b46d0a30ac47df4363357532fad0adfda18899f813131032260fed SHA512 2cc17c2a2dfe5c7d2f8088ac16ccfef270933c7844c3c717b3e4f4f94873f865ebddc5943508cbe54b4976c0f9dc478ca71b8c26b8c08d6758d9508788235530
-DIST google-antigravity-cli-1.2.10_amd64.tar.gz 60286675 BLAKE2B 8654f8faa5a84c36f0a7ef4e1031dc8e467aa09636a11c2b95a4424c8c47a608317c29148bba33f912965e5cc4da072d4a39145bd3867afbc7c9a39da231f5a8 SHA512 e19aef599aaf47a9225e72f2cd420d5f97d6dd974e698685950557ca23a8bda63effe666773178c82912b98e9c197da29829b92e771eb6f66c82236f17864fee
-DIST google-antigravity-cli-1.2.10_arm64.tar.gz 56659816 BLAKE2B e4063c3e40a91b8684848872d2bcb95aa7d16bcf0d461d426e4916d104ee58ee18eb6716e46543cfe76231e5fa72e7525340b392adf85663d8a2d449f9793ef1 SHA512 105fee8989456e4cccd444bd34a7294c3315fc8e3bd3d94022e90053532be02a84375546da78758d6dcf2f4955c7d333ccbd4cd6f8b86c18e47667493d35179f
 DIST google-antigravity-cli-1.2.11_amd64.tar.gz 60414410 BLAKE2B 6ad5b7fe1a075952e97d91423faa7c9a8e1afb07581602bd4d59dfe40bf0adf763288b98290fe853f2814b80a8ebb08aa5e888a8822e05b97487089075abac6e SHA512 ca12c262343f29a2b87423d1ff1e4244989e936e37fe1f8e56056b0f91cd02f93f133321229ce35c86c2d84b977e919937a3fd9430cfd769a16d6b03ede25081
 DIST google-antigravity-cli-1.2.11_arm64.tar.gz 56789048 BLAKE2B b58d5055151dacf73501803dac2afd859ca15f3444e2a2f4de1f04a5913ee28015ae22cf346e528fa7a1d26816bba125ae4dd4905f776614fa92d0d7f8221a68 SHA512 4fd4f8e1960e000b7803da2365c64a733677f1ed80fedc1c344331978f129171dd1d128e85255a4f2f0d3882cf097b3897cc2704b4faf4d3669f7e3c69cc3012
+DIST google-antigravity-cli-1.2.12_amd64.tar.gz 60578633 BLAKE2B 30d0f9d762dfef4955f02a63a134865fc3ac08f74cde12a9ac66e97b26ddc582d6c43c32a52c32f113df1550eb60897439205e7d091359cc3e74c18aafcb2c19 SHA512 d5f0fe7433cb7c43ea878c07627a4fdb82d218f3bef5e6436266f5d9fdd2df145523453b9be0c4250391a64a007f5f42f7faff797bc2b2d502e7efb4874e383a
+DIST google-antigravity-cli-1.2.12_arm64.tar.gz 56929944 BLAKE2B 4e47c47e05794c4ec1694fc1740ac32591aaf52cfc6f5f27ac0f4bfaf3e0f7fc8c3c83dff73d0b78adcdd575e2637c87c422c4cf79d3aae97ee47874e84df239 SHA512 e2f10960197efbf2455edb1284ae686821e244908367f507bcb6a0d0f616e945d3eec5cdf29b41bbcd7f630826d0e9e233f457184d1696fa91e81d6a7ed440c9
diff --git a/dev-util/google-antigravity-cli/google-antigravity-cli-1.2.10.ebuild b/dev-util/google-antigravity-cli/google-antigravity-cli-1.2.12.ebuild
index 985394af28cb..b9b93442e2a8 100644
--- a/dev-util/google-antigravity-cli/google-antigravity-cli-1.2.10.ebuild
+++ b/dev-util/google-antigravity-cli/google-antigravity-cli-1.2.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-EXECUTION_ID="4751581200121856"
+EXECUTION_ID="5784551402897408"
 
 MY_PN="${PN#google-}"
 DESCRIPTION="Command-line interface for Google's Antigravity agentic development platform"
diff --git a/dev-util/hare-update/hare-update-0.26.0.0-r1.ebuild b/dev-util/hare-update/hare-update-0.26.0.0-r1.ebuild
index ee8ee82d002c..9b622ae7af42 100644
--- a/dev-util/hare-update/hare-update-0.26.0.0-r1.ebuild
+++ b/dev-util/hare-update/hare-update-0.26.0.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit toolchain-funcs
 
-if [[ "${PV}" = "9999" ]]; then
+if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/hare-update"
 	DEPEND="dev-lang/hare:="
diff --git a/dev-util/hare-update/hare-update-9999.ebuild b/dev-util/hare-update/hare-update-9999.ebuild
index cb96a7080520..5d05325e73ee 100644
--- a/dev-util/hare-update/hare-update-9999.ebuild
+++ b/dev-util/hare-update/hare-update-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit toolchain-funcs
 
-if [[ "${PV}" = "9999" ]]; then
+if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/hare-update"
 	DEPEND="dev-lang/hare:="
diff --git a/dev-util/haredo/haredo-1.0.2.ebuild b/dev-util/haredo/haredo-1.0.2.ebuild
index 711700ef0cd4..efaed96e3754 100644
--- a/dev-util/haredo/haredo-1.0.2.ebuild
+++ b/dev-util/haredo/haredo-1.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-if [[ "${PV}" = "9999" ]]; then
+if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.sr.ht/~autumnull/haredo"
 	SLOT="0"
diff --git a/dev-util/haredo/haredo-9999.ebuild b/dev-util/haredo/haredo-9999.ebuild
index 711700ef0cd4..efaed96e3754 100644
--- a/dev-util/haredo/haredo-9999.ebuild
+++ b/dev-util/haredo/haredo-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-if [[ "${PV}" = "9999" ]]; then
+if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.sr.ht/~autumnull/haredo"
 	SLOT="0"
diff --git a/dev-util/kimi-code-bin/Manifest b/dev-util/kimi-code-bin/Manifest
index a57a2931f432..71dfda4260e2 100644
--- a/dev-util/kimi-code-bin/Manifest
+++ b/dev-util/kimi-code-bin/Manifest
@@ -1,4 +1,4 @@
-DIST kimi-code-bin-2.0.1-amd64.zip 63189450 BLAKE2B f8ae3c19966394d5a3221864dc6c13b932f0e6253908b9291c6aa8328bb5e433e1df389c569ea2f120312eba6d585d99a50bb7003703d68a8750a2a4ea5bef1c SHA512 873010ae749f37d61c0eb2610d5771417475e782ff69b4ab63633abc38c6c2b0aeede8663618337f32f463501d4d12e9036609f5563b606e19ef491880a53828
-DIST kimi-code-bin-2.0.1-arm64.zip 63131474 BLAKE2B 80b6c0fd45b035126a18da3b17441f12f277728d99e9ee0a739c89024321957b9aa66aa422370281bf037ee8fae64fc0654c14c898b194a26cf1a26541dddf78 SHA512 1ff3b21d930f78df895cec280005e63d61bd7fd9f63eb8f0c5682f7199c5b97b2fce0957bb96d76f0fbeb0df7923cca39924b5dcac80d2a39a04aba7eda54092
 DIST kimi-code-bin-2.0.2-amd64.zip 63188176 BLAKE2B 781fcf27c6d988cb895802be8ea94300048667165a278cd093de9d40ae5e94ef01fa55941c8c474b247e9010fcffa48052ed2da063d87173d89f6e482d1c8970 SHA512 ee0fe30857a6f2ebf0db31702753e278bc0c66233db0c43767b094960d84dd272768866200594a56ba13c67add7ecc6805042dc9093461762a5275179a64f28f
 DIST kimi-code-bin-2.0.2-arm64.zip 63136093 BLAKE2B d73d2d604000e9f080583b4e814037710eed4bc78bfe1ad65cd7b8dc7283e8d9a9a237ae55d5bd7473097bec1c2e1184e4b744ae5edb290146711f505b8b2978 SHA512 e063dac526f06f321335b605848832de97623d553f04abe8e4eef4f5907dba03e9cecb744614a8585d4f15beaf2e1072a6090634a14849c49b79f98ffc865cd7
+DIST kimi-code-bin-2.1.1-amd64.zip 66811081 BLAKE2B 181941131e010764aab52f134d127a1e9b755f47b64e00cbb6774b4b8868261fad8ef57464cd53a0e06ede2c4a63790dfb284683d00e39177fdaca15b0eb2be9 SHA512 db9e258436a32731e5bd17ebaedfe8e2276bf9c3cf97b9417ee9641626199061454bc1e0d8a938e55363a6a1a1c47f321033a8fceef318785d8fc4ea2abca963
+DIST kimi-code-bin-2.1.1-arm64.zip 66766371 BLAKE2B 0a014dfb4c835621c6e828ef2f3a862e831f53d463e01fb20034147fb74a7736c3285a4a2399bf1092aa30b40ffb58c334c4cdb6bb1079506b27400232aa7614 SHA512 b5253a5df35f091b48512b7dd9cc5bcea6012b91c648725a84b6699504ff104a8a9d7fdbe1792a949d3dfe435ff02dd481b4f1a117f90ab5d17b01169e60b170
diff --git a/dev-util/kimi-code-bin/kimi-code-bin-2.0.1.ebuild b/dev-util/kimi-code-bin/kimi-code-bin-2.1.1.ebuild
index 5f1a05412c4b..5f1a05412c4b 100644
--- a/dev-util/kimi-code-bin/kimi-code-bin-2.0.1.ebuild
+++ b/dev-util/kimi-code-bin/kimi-code-bin-2.1.1.ebuild
diff --git a/dev-util/shellspec/shellspec-0.28.1-r3.ebuild b/dev-util/shellspec/shellspec-0.28.1-r3.ebuild
index a78ba53ca249..60cb7f50bc0d 100644
--- a/dev-util/shellspec/shellspec-0.28.1-r3.ebuild
+++ b/dev-util/shellspec/shellspec-0.28.1-r3.ebuild
@@ -8,7 +8,7 @@ inherit prefix
 DESCRIPTION="A full-featured BDD unit testing framework for all POSIX shells"
 HOMEPAGE="https://shellspec.info/"
 
-if [[ "${PV}" = 9999 ]]; then
+if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/shellspec/shellspec.git"
 else
diff --git a/dev-util/shellspec/shellspec-9999.ebuild b/dev-util/shellspec/shellspec-9999.ebuild
index 54b8100cb347..90816ed7c53a 100644
--- a/dev-util/shellspec/shellspec-9999.ebuild
+++ b/dev-util/shellspec/shellspec-9999.ebuild
@@ -8,7 +8,7 @@ inherit prefix
 DESCRIPTION="A full-featured BDD unit testing framework for all POSIX shells"
 HOMEPAGE="https://shellspec.info/"
 
-if [[ "${PV}" = 9999 ]]; then
+if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/shellspec/shellspec.git"
 else
diff --git a/dev-util/watchman/watchman-2024.11.04.00.ebuild b/dev-util/watchman/watchman-2024.11.04.00.ebuild
index 2b9160476964..ab9943884751 100644
--- a/dev-util/watchman/watchman-2024.11.04.00.ebuild
+++ b/dev-util/watchman/watchman-2024.11.04.00.ebuild
@@ -230,6 +230,7 @@ CRATES="
 "
 
 DISTUTILS_EXT=1
+DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{13..14} )
 
@@ -271,6 +272,7 @@ DEPEND="
 	${RDEPEND}
 	dev-cpp/gtest
 "
+BDEPEND="python? ( ${DISTUTILS_DEPS} )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2022.02.28.00-libatomic.patch
diff --git a/dev-util/watchman/watchman-2025.04.14.00.ebuild b/dev-util/watchman/watchman-2025.04.14.00.ebuild
index 1d6a0ffef9ad..3ea7a1d863b4 100644
--- a/dev-util/watchman/watchman-2025.04.14.00.ebuild
+++ b/dev-util/watchman/watchman-2025.04.14.00.ebuild
@@ -239,6 +239,7 @@ CRATES="
 "
 
 DISTUTILS_EXT=1
+DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{13..14} )
 
@@ -278,6 +279,7 @@ DEPEND="
 	${RDEPEND}
 	dev-cpp/gtest
 "
+BDEPEND="python? ( ${DISTUTILS_DEPS} )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2022.02.28.00-libatomic.patch
diff --git a/dev-util/xdelta/Manifest b/dev-util/xdelta/Manifest
index 10bea576622c..d696b88169c7 100644
--- a/dev-util/xdelta/Manifest
+++ b/dev-util/xdelta/Manifest
@@ -1,4 +1,5 @@
 DIST xdelta-1.1.4.tar.gz 423529 BLAKE2B b565f82ba0504118b74127096939e5699ea312be5c6c8a345abfcf0fb01b45e759abe595b33619b2714671e2f0307d603366a1f7a6b1fb5a786378716a51df6b SHA512 eef45f7977e9a7f490b881f33ab8a948cc5eff9300ea850cc30062905c8e883c104961f075f56f7ce8e385142c35de168aef1e0b8169bda66786ea4bee33168b
 DIST xdelta-1.2.0.tar.gz 118223 BLAKE2B 9551636462d73908624d39d07a29e701dd0e3dee6ae2f5bfb42008e0d5154cc9f7dc8ab6b9f574e4e8bb590e8e468311c66ce4e465dcba37deff0dd18bde6ef0 SHA512 44206de6fe7e9f16b1ea6ec1dacf93a2d8bc98fb4b5b994911596beb17e4e410eb24b33e54d6509ff97376bdea82b47db79bde8d1a6a262f434794bdb2e7014c
-DIST xdelta3-3.0.11.tar.gz 683605 BLAKE2B bc33c9d6a3bb21bc52d72bba54f5e2b1058ea8d7cd7474aaf6dbdc27e165e0fbea644c584402f5bbc8ace7cd6a3aefae18588a659418f93eb041168545363bf4 SHA512 41c48e28f92ad50a737cf0acac150fe17d1132e9a652c482d751c8c4e745c6922d576a183eeabae343a1a238ed8c53353e537977628c86eb599ab3d1c01e7c52
+DIST xdelta-1.2.1.tar.gz 118393 BLAKE2B 3d9657dc811951f3019e085e5d30d0e20c8f977a703ae0e025be6981dc8c3bb5466112168912d8d0105c38e135f355087e7aca99e6708e9de48c2369c92c8fc0 SHA512 aa7cb9fb0702c1c3625590ceec16990e3dfc475692d3e7aa7c934f13a50e62a47431459174b45b83426c46642b6662c008b7a704a4f5bad7e9146af5fd9ef3f6
 DIST xdelta3-3.2.0.tar.gz 348621 BLAKE2B 67cfa907028df06aafc48e313a786cef626d3320cb97e3b07c3bff3832f64a3fda5339e562524ef791fa5fdce2db5fa04cca32999eb805edf0da21658cff178a SHA512 9112511b2db53eb8ed61dc8ecb41ef6eefa52cf3397b7add407865cbc20cb084e29fcbf6d93df2282f8a3a157fdcf53a14b4eac6521fccb782e5845352c3e9b1
+DIST xdelta3-3.2.1.tar.gz 225056 BLAKE2B 75306184bc43e823f13258912761f59be5887072c86bf59b65c5e0d8508de1afa7440651e30ab6c28c424c7b53ffb66696d69420169120ef08460131e4ba765e SHA512 e9efdfc6408b7da73c3765d416e5729089a2573b5fc6e8ac26bf7ca0199423b5811b5a2842c2fea49fe0d0633fd07bbe9900618d4fe1df25fdb73fb3ef09e443
diff --git a/dev-util/xdelta/xdelta-1.2.1.ebuild b/dev-util/xdelta/xdelta-1.2.1.ebuild
new file mode 100644
index 000000000000..3dbe9e360cc6
--- /dev/null
+++ b/dev-util/xdelta/xdelta-1.2.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Computes changes between binary or text files and creates deltas"
+HOMEPAGE="https://github.com/jmacd/xdelta/"
+SRC_URI="https://github.com/jmacd/xdelta/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/glib-2
+	>=virtual/zlib-1.1.4:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+	)
+	append-flags -fPIC
+	cmake_src_configure
+}
diff --git a/dev-util/xdelta/xdelta-3.0.11-r1.ebuild b/dev-util/xdelta/xdelta-3.0.11-r1.ebuild
deleted file mode 100644
index cab0d91ab67d..000000000000
--- a/dev-util/xdelta/xdelta-3.0.11-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2002-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P=xdelta3-${PV}
-
-DESCRIPTION="Computes changes between binary or text files and creates deltas"
-HOMEPAGE="http://xdelta.org/"
-SRC_URI="https://github.com/jmacd/xdelta-gpl/releases/download/v${PV}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-IUSE="examples lzma"
-
-RDEPEND="lzma? ( app-arch/xz-utils:= )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf $(use_with lzma liblzma)
-}
-
-src_compile() {
-	# avoid building tests
-	emake xdelta3
-}
-
-src_test() {
-	emake xdelta3regtest
-	./xdelta3regtest || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-binPROGRAMS install-man1
-	dodoc draft-korn-vcdiff.txt README.md
-	use examples && dodoc -r examples
-}
diff --git a/dev-util/xdelta/xdelta-3.2.1.ebuild b/dev-util/xdelta/xdelta-3.2.1.ebuild
new file mode 100644
index 000000000000..ded733eb732a
--- /dev/null
+++ b/dev-util/xdelta/xdelta-3.2.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2002-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_P=xdelta3-${PV}
+DESCRIPTION="Computes changes between binary or text files and creates deltas"
+HOMEPAGE="https://github.com/jmacd/xdelta/"
+SRC_URI="https://github.com/jmacd/xdelta/releases/download/v${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples lzma test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/blake3:=
+	lzma? ( app-arch/xz-utils:= )
+"
+RDEPEND="
+	${DEPEND}
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DXD3_BUILD_TESTS=$(usex test)
+		-DXD3_SECONDARY_FGK=OFF
+		# link dynamically to liblzma
+		-DXD3_LIB_LZMA=ON
+		-DXD3_LZMA_MODE=$(usex lzma on off)
+		-DXD3_LARGESIZET=ON
+		-DXD3_ARMOR=ON
+		# TODO: for now we're getting away with a CMake warning
+		# and implicit linking to -lblake3
+		-DFETCHCONTENT_FULLY_DISCONNECTED=ON
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dodoc draft-korn-vcdiff.txt
+	use examples && dodoc -r examples
+}