commit: 25e3563e8e4cd698261e91a81d46fa12dc2cc238 Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Fri Feb 7 00:29:28 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Feb 9 11:05:46 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25e3563e
dev-util/xxdiff: add 5.1_p20241118 update repo to gh update EAPI 7 -> 8 port qt6 add useflag scripts to install python scripts Closes: https://bugs.gentoo.org/941199 Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Closes: https://github.com/gentoo/gentoo/pull/40474 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-util/xxdiff/Manifest | 1 + dev-util/xxdiff/metadata.xml | 3 +- dev-util/xxdiff/xxdiff-5.1_p20241118.ebuild | 78 +++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 1 deletion(-) diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest index 78775a12eb44..a292f45a1e29 100644 --- a/dev-util/xxdiff/Manifest +++ b/dev-util/xxdiff/Manifest @@ -1 +1,2 @@ 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/metadata.xml b/dev-util/xxdiff/metadata.xml index dd2645f2b213..62e3acc1e120 100644 --- a/dev-util/xxdiff/metadata.xml +++ b/dev-util/xxdiff/metadata.xml @@ -2,7 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> <!-- maintainer-needed --> + <use><flag name="scripts">Python scripts that is provided around xxdiff</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-5.1_p20241118.ebuild b/dev-util/xxdiff/xxdiff-5.1_p20241118.ebuild new file mode 100644 index 000000000000..606cdcd7240b --- /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 +}
