[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

["Sam James" <sam@gentoo.org>]

commit:     8118f217aa4b41f12ede006bd16617c8be145c56
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  6 01:52:07 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr  6 01:52:07 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8118f217

sys-apps/diffutils: add 3.11_p20250405

https://lists.gnu.org/archive/html/platform-testers/2025-04/msg00000.html

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/diffutils/Manifest                        |  2 +
 sys-apps/diffutils/diffutils-3.11_p20250405.ebuild | 61 ++++++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index 0d012a91e841..f36947282a05 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,4 +1,6 @@
 DIST diffutils-3.10.tar.xz 1624240 BLAKE2B 24a90162b3d876e6378243f19a85a1f1bb4cdfe98d130dee684740a902f2987509d5830dd32df4e26678b468b96960f6f9785ffb922e828cb8b4acce0d8587f6 SHA512 219d2c815a120690c6589846271e43aee5c96c61a7ee4abbef97dfcdb3d6416652ed494b417de0ab6688c4322540d48be63b5e617beb6d20530b5d55d723ccbb
 DIST diffutils-3.10.tar.xz.sig 833 BLAKE2B 06650838d6a3327fda6b2ab09693170ec18b730b1f5981c8f3e2180b2c8a553307ae93199e4be0532a534a8a3f95e4a7b4fccbbd9e5f8d1b1cedd0816b0aac90 SHA512 91aa1fcfca224454e292540ea7813f4a0eb348f06a4374017326d524949775359fc833de597cc201c97f357eb6c675800828a6e3332572376f3554f1f2e1aca1
+DIST diffutils-3.11.11-7e53.tar.xz 1937668 BLAKE2B 16ac12d27c68efeb2b01e35e7ff8a98d081f1d67f72688c20d65067730eca6f8d3759bff3dd5fde04c8994ac9e93e685ffb4da4419b7a29f03c778fcb0cb607f SHA512 a99b6105e8d856626cb7f03847a5340b5cccfa951bc332af39f470f1cf75ed73b6bd8da035905f83add0c054a6d8232c1098673a8087974e6aa4acfc1cf669a1
+DIST diffutils-3.11.11-7e53.tar.xz.sig 833 BLAKE2B 9bbc84b91cd89335891bd522a036820f602a43bb268944c899944ecb67288c84938f71598d0b2ffb43cab3fce11c96f70b72bfab0617845f367b01c608e24152 SHA512 6a4ac048828e5bd2ca58d251b2fa8c502540aa08fb04dce2b77f3a4b99388312816c9925e976118cd5bd5d6d3cac12a92c89dd17d709d48a39c30aefe84e824d
 DIST diffutils-3.11.tar.xz 1926052 BLAKE2B e3d78548d1fbee060a9e0a7ee93f4aebaa80a9ff15867f13e2f1d09672e2b1e8dcf01f264d5184c441bc81b0b1a797210cbf4a1f9b8ba061994066e710e79fc1 SHA512 a381ee6bcbbead155ab6ea1aecc167ab1077c6d95133a876e26284b60bcaae26f01c62eaee400c86302b74fa8ab0c5239b7860ea86478b739ddc304367a35960
 DIST diffutils-3.11.tar.xz.sig 833 BLAKE2B 5b7f8d8b0ec2f1443270f9291acfd6ec7833268c5287d98225fb997efcfbbbec2e27f565226ae7d350576765689d7efd352b83c5a3ffca113963d9ec86b6a467 SHA512 81ac0cff6b9015758182e41688df70244f1ceac77835e0b06cb2c6c8ca89d93d1567010fed9b216bd65ebde8fcb89f162cc3112aa01f05b5b05f4a26f6fe69d7

diff --git a/sys-apps/diffutils/diffutils-3.11_p20250405.ebuild b/sys-apps/diffutils/diffutils-3.11_p20250405.ebuild
new file mode 100644
index 000000000000..c589db915649
--- /dev/null
+++ b/sys-apps/diffutils/diffutils-3.11_p20250405.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/diffutils.asc
+inherit verify-sig
+
+DESCRIPTION="Tools to make diffs and compare files"
+HOMEPAGE="https://www.gnu.org/software/diffutils/"
+
+if [[ ${PV} == *_p* ]] ; then
+	# Subscribe to the 'platform-testers' ML to find these.
+	# Useful to test on our especially more niche arches and report issues upstream.
+	MY_COMMIT="11-7e53"
+	MY_P=${PN}-$(ver_cut 1-2).${MY_COMMIT}
+	SRC_URI="https://meyering.net/diff/${MY_P}.tar.xz"
+	SRC_URI+=" verify-sig? ( https://meyering.net/diff/${MY_P}.tar.xz.sig )"
+	S="${WORKDIR}"/${MY_P}
+else
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls"
+
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-diffutils )
+"
+RDEPEND="
+	nls? ( app-i18n/gnulib-l10n )
+"
+
+src_prepare() {
+	default
+
+	# Needed because of patches to avoid perl BDEPEND (affects Prefix too)
+	#touch man/diff.1 || die
+}
+
+src_configure() {
+	# Disable automagic dependency over libsigsegv; see bug #312351.
+	export ac_cv_libsigsegv=no
+
+	# required for >=glibc-2.26, bug #653914
+	use elibc_glibc && export gl_cv_func_getopt_gnu=yes
+
+	local myeconfargs=(
+		# Interferes with F_S (sets F_S=2)
+		--disable-gcc-warnings
+		--with-packager="Gentoo"
+		--with-packager-version="${PVR}"
+		--with-packager-bug-reports="https://bugs.gentoo.org/"
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}