From 3a81cede4783e464b7485722b2eaac0280dbc570 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 10 Feb 2025 00:12:21 +0000 Subject: gentoo auto-resync : 10:02:2025 - 00:12:20 --- sys-apps/diffutils/Manifest | 2 +- sys-apps/diffutils/diffutils-3.11-r1.ebuild | 61 +++++++++++++++++++++++++++++ sys-apps/diffutils/diffutils-3.11.ebuild | 58 --------------------------- 3 files changed, 62 insertions(+), 59 deletions(-) create mode 100644 sys-apps/diffutils/diffutils-3.11-r1.ebuild delete mode 100644 sys-apps/diffutils/diffutils-3.11.ebuild (limited to 'sys-apps/diffutils') diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest index 8db169f78f24..cd3406ffe1a3 100644 --- a/sys-apps/diffutils/Manifest +++ b/sys-apps/diffutils/Manifest @@ -3,5 +3,5 @@ DIST diffutils-3.10.tar.xz.sig 833 BLAKE2B 06650838d6a3327fda6b2ab09693170ec18b7 DIST diffutils-3.11.tar.xz 1926052 BLAKE2B e3d78548d1fbee060a9e0a7ee93f4aebaa80a9ff15867f13e2f1d09672e2b1e8dcf01f264d5184c441bc81b0b1a797210cbf4a1f9b8ba061994066e710e79fc1 SHA512 a381ee6bcbbead155ab6ea1aecc167ab1077c6d95133a876e26284b60bcaae26f01c62eaee400c86302b74fa8ab0c5239b7860ea86478b739ddc304367a35960 DIST diffutils-3.11.tar.xz.sig 833 BLAKE2B 5b7f8d8b0ec2f1443270f9291acfd6ec7833268c5287d98225fb997efcfbbbec2e27f565226ae7d350576765689d7efd352b83c5a3ffca113963d9ec86b6a467 SHA512 81ac0cff6b9015758182e41688df70244f1ceac77835e0b06cb2c6c8ca89d93d1567010fed9b216bd65ebde8fcb89f162cc3112aa01f05b5b05f4a26f6fe69d7 EBUILD diffutils-3.10.ebuild 1664 BLAKE2B ebbccd0e9c7ebf06a925d30128bd8343cab3a30bc189811ec63fe3a9ab6fe29b015e3c86ded1c81660d502cf600a47fa5f09339bca748702f6db04d67d2aefc9 SHA512 1c51fda1f727bda5f89f3423ed892f7bb3edb1d84e8dcdc6fc95a755770a41c06cd8faa3be015fcb4f719223b295cbb79e789277bcdb74270e88564aa0db3cb4 -EBUILD diffutils-3.11.ebuild 1673 BLAKE2B 740f235691bf16612e95dfed728316c3193f685ba8a13c0504bc3dcd815c55b6aca89675c66f2a4ba4c4867c0eb3a138e708caf3324bd64ab102340a7a6a883a SHA512 657e1524a31f554873fe21ae2ad35c0d5ef0125c083bdcf2687082454c2d385a70daf080d6a0b2f8137b9b24778bd2711d05eacacd6a42db60eb8aeab386aa68 +EBUILD diffutils-3.11-r1.ebuild 1716 BLAKE2B afa228565f5a5acddb14e53f25ddf805802acbaf58836a48c0ac8039969e0ff47bfbef7b75c55d907fcbd21b41041389ad9b612e5f9010b7e6e5ace0f24a12b5 SHA512 c0cec3287b3c39d71e3f76a25b3910c197ab8aa3d4f76987e2dc849f66cf1bf0fd559499cea74d0106e5eadf32b5aeaadce16dbcd4087d6ca186600f42a3fa98 MISC metadata.xml 403 BLAKE2B 009b73d59702ec89a6dc4e9ff8886ee77f0390961ea51aa5248d6f2fa3c9de0dd7fc8ba6844b0e38b7bae348dbb3b38cc8447f27371127976a5e5ae37aebbb34 SHA512 c0450fc2991ef0b1b56076a82fe88a8c860ac2a11aa78ac86cbaa29b049fdc6c69e11f9da3e9f90501f0a9567884e0bc47cf2b3b0a486cd173d1060b19f04a25 diff --git a/sys-apps/diffutils/diffutils-3.11-r1.ebuild b/sys-apps/diffutils/diffutils-3.11-r1.ebuild new file mode 100644 index 000000000000..128dac1face0 --- /dev/null +++ b/sys-apps/diffutils/diffutils-3.11-r1.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="242-d65b" + 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 ${P}-diff-D-option-regression.patch + #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[@]}" +} diff --git a/sys-apps/diffutils/diffutils-3.11.ebuild b/sys-apps/diffutils/diffutils-3.11.ebuild deleted file mode 100644 index 069dd2e31342..000000000000 --- a/sys-apps/diffutils/diffutils-3.11.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# 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="242-d65b" - 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 ) -" - -src_prepare() { - default - - # Needed because of ${P}-diff-D-option-regression.patch - #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[@]}" -} -- cgit v1.2.3