Merge updates from master

6 files changed, 83 insertions, 88 deletions

diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest
index 78775a12eb44..45ff6d7f67e1 100644
--- a/dev-util/xxdiff/Manifest
+++ b/dev-util/xxdiff/Manifest
@@ -1 +1 @@
-DIST xxdiff-4.0.1_p20170622.tar.bz2 1983188 BLAKE2B b604c68902defca4caaa342123df165ca5ed4757254e7e696e637ff347298cdfd53324de6c21f65de4e0229ad7adb02434eb59e047590d2c71fb1f7e87e508d6 SHA512 a1b4cb26331b0bcc7ccdf3090ca4f1cf821c6819a189e4148cde0ef40e4377bf2b82627571ff05c066c3796e06cadc7c5ad040af0446c8f5bf48c25547564511
+DIST xxdiff-5.1_p20241118.tar.gz 2057170 BLAKE2B f4d4baff11482a161e74b7722222e5653fe0f9a8be006469e50dff818c59b1bb64811e0cc73e07c4d6a4601dc323604b31ec48ebc250f3061340281044f8f874 SHA512 6518fcc0bd568783f4c3929e9bd1f484372267714046da671a328ab5206d04551123d8d9d26c64ff20187fe383e44b6f18943212204ceb9d0cc164fcec0a995b
diff --git a/dev-util/xxdiff/files/xxdiff-4.0.1-no-throw-in-dtor.patch b/dev-util/xxdiff/files/xxdiff-4.0.1-no-throw-in-dtor.patch
deleted file mode 100644
index 93162cc615b4..000000000000
--- a/dev-util/xxdiff/files/xxdiff-4.0.1-no-throw-in-dtor.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Build failure triggers on CXXFLAGS=-Werror=terminate
-
-  cmdline.cpp: In destructor ‘virtual XxCmdline::~XxCmdline()’:
-  ./defs.h:121:43: error: throw will always call terminate() [-Werror=terminate]
-      { throw XxInternalError( XX_EXC_PARAMS ); }                                           ^
-  cmdline.cpp:369:7: note: in expansion of macro ‘XX_ASSERT’
-
-https://bugs.gentoo.org/601018
-diff --git a/src/cmdline.cpp b/src/cmdline.cpp
-index 8cb0ac9..174b9a4 100644
---- a/src/cmdline.cpp
-+++ b/src/cmdline.cpp
-@@ -368,3 +368,2 @@ XxCmdline::~XxCmdline()
-    for ( int ii = 0; ii < _nbQtOptions; ++ii ) {
--      XX_ASSERT( _qtOptions[ii] != 0 );
- #ifndef WINDOWS
diff --git a/dev-util/xxdiff/files/xxdiff-4.0.1_p20170622-cxx11.patch b/dev-util/xxdiff/files/xxdiff-4.0.1_p20170622-cxx11.patch
deleted file mode 100644
index b16a7c4072f9..000000000000
--- a/dev-util/xxdiff/files/xxdiff-4.0.1_p20170622-cxx11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-In gentoo qt5 already requires c++11 features:
-
-diff --git a/src/xxdiff.pro b/src/xxdiff.pro
-index 32b106b..16fcd1f 100644
---- a/src/xxdiff.pro
-+++ b/src/xxdiff.pro
-@@ -113,3 +113,3 @@ irix-n32:QMAKE_CFLAGS_RELEASE += -OPT:Olimit=4000
- # auto_ptr deprecated in C++11, removed in C++17
--linux: QMAKE_CXXFLAGS += -std=c++03
-+linux: QMAKE_CXXFLAGS += -std=c++11
- 
diff --git a/dev-util/xxdiff/metadata.xml b/dev-util/xxdiff/metadata.xml
index dd2645f2b213..b694e7a29a1f 100644
--- a/dev-util/xxdiff/metadata.xml
+++ b/dev-util/xxdiff/metadata.xml
@@ -2,7 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<use>
+		<flag name="scripts">Install python helper scripts</flag>
+	</use>
 	<upstream>
-		<remote-id type="sourceforge">xxdiff</remote-id>
+		<remote-id type="github">blais/xxdiff</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild b/dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild
deleted file mode 100644
index dbacf92afcba..000000000000
--- a/dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-DESCRIPTION="A graphical file and directories comparator and merge tool"
-HOMEPAGE="http://furius.ca/xxdiff/"
-# generated as 'hg archive xxdiff-${P}.tar'
-# from https://bitbucket.org/blais/xxdiff tree
-#SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
-SRC_URI="https://dev.gentoo.org/~sam/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="
-	${RDEPEND}
-	app-alternatives/yacc
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.1-no-throw-in-dtor.patch
-	"${FILESDIR}"/${P}-cxx11.patch
-)
-
-src_configure() {
-	pushd src >/dev/null || die
-		# mimic src/Makefile.bootstrap
-		eqmake5
-		cat Makefile.extra >> Makefile || die
-	popd
-}
-
-src_compile() {
-	emake -C src MAKEDIR=.
-
-	HTML_DOCS+=(
-		doc/*.{png,html}
-		src/doc.html
-	)
-}
-
-src_install() {
-	dobin bin/xxdiff
-
-	dodoc CHANGES README* TODO doc/*.txt src/doc.txt
-
-	# example tools, use these to build your own ones
-	dodoc -r tools
-}
diff --git a/dev-util/xxdiff/xxdiff-5.1_p20241118.ebuild b/dev-util/xxdiff/xxdiff-5.1_p20241118.ebuild
new file mode 100644
index 000000000000..fbb160217c71
--- /dev/null
+++ b/dev-util/xxdiff/xxdiff-5.1_p20241118.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_OPTIONAL=1
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 qmake-utils
+
+DESCRIPTION="Graphical file and directories comparator and merge tool"
+HOMEPAGE="https://furius.ca/xxdiff/ https://github.com/blais/xxdiff"
+COMMIT="a13d80f3339c5ec39d26b5155f33d0f2907a5629"
+SRC_URI="https://github.com/blais/xxdiff/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="scripts"
+REQUIRED_USE="scripts? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-qt/qtbase:6[gui,widgets]
+	scripts? ( ${PYTHON_DEPS} )
+"
+DEPEND="
+	${RDEPEND}
+	app-alternatives/yacc
+"
+BDEPEND="
+	scripts? (
+		${DISTUTILS_DEPS}
+		${PYTHON_DEPS}
+	)
+"
+
+pkg_setup() {
+	use scripts && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	use scripts && distutils-r1_src_prepare
+}
+
+src_configure() {
+	pushd src >/dev/null || die
+		# mimic src/Makefile.bootstrap
+		eqmake6
+		cat Makefile.extra >> Makefile || die
+	popd || die
+}
+
+src_compile() {
+	emake -C src MAKEDIR=.
+
+	use scripts && distutils-r1_src_compile
+}
+
+src_install() {
+	local DOCS=( CHANGES README* TODO doc/*.txt src/doc.txt tools )
+	local HTML_DOCS=( doc/*.{png,html} src/doc.html )
+
+	dobin bin/xxdiff
+	doman "${S}"/src/xxdiff.1
+
+	if use scripts; then
+		distutils-r1_src_install
+		# no port to py3
+		rm "${ED}"/usr/bin/termdiff || die
+	fi
+
+	einstalldocs
+}