summaryrefslogtreecommitdiff
path: root/sys-apps/diffutils
diff options
context:
space:
mode:
authorroot <root@alpha.trunkmasters.com>2026-06-04 05:35:26 -0500
committerroot <root@alpha.trunkmasters.com>2026-06-04 05:35:26 -0500
commitf716a9fe6455d39eef01e718aae68dae61c19704 (patch)
tree0c52bbae1c242fbc296bd650fcd1167685f81492 /sys-apps/diffutils
parent3f9cf298e89cd5037b982abba06091224ee76daf (diff)
downloadbaldeagleos-repo-f716a9fe6455d39eef01e718aae68dae61c19704.tar.gz
baldeagleos-repo-f716a9fe6455d39eef01e718aae68dae61c19704.tar.xz
baldeagleos-repo-f716a9fe6455d39eef01e718aae68dae61c19704.zip
Adding metadata
Diffstat (limited to 'sys-apps/diffutils')
-rw-r--r--sys-apps/diffutils/Manifest6
-rw-r--r--sys-apps/diffutils/diffutils-3.10.ebuild58
-rw-r--r--sys-apps/diffutils/diffutils-3.11-r2.ebuild67
-rw-r--r--sys-apps/diffutils/diffutils-3.12.ebuild58
-rw-r--r--sys-apps/diffutils/files/diffutils-3.11-allocation-crash.patch29
-rw-r--r--sys-apps/diffutils/files/diffutils-3.11-empty-files.patch83
-rw-r--r--sys-apps/diffutils/files/diffutils-3.11-tests-seq.patch64
-rw-r--r--sys-apps/diffutils/metadata.xml12
8 files changed, 0 insertions, 377 deletions
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
deleted file mode 100644
index 42aab71d2114..000000000000
--- a/sys-apps/diffutils/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-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.tar.xz 1926052 BLAKE2B e3d78548d1fbee060a9e0a7ee93f4aebaa80a9ff15867f13e2f1d09672e2b1e8dcf01f264d5184c441bc81b0b1a797210cbf4a1f9b8ba061994066e710e79fc1 SHA512 a381ee6bcbbead155ab6ea1aecc167ab1077c6d95133a876e26284b60bcaae26f01c62eaee400c86302b74fa8ab0c5239b7860ea86478b739ddc304367a35960
-DIST diffutils-3.11.tar.xz.sig 833 BLAKE2B 5b7f8d8b0ec2f1443270f9291acfd6ec7833268c5287d98225fb997efcfbbbec2e27f565226ae7d350576765689d7efd352b83c5a3ffca113963d9ec86b6a467 SHA512 81ac0cff6b9015758182e41688df70244f1ceac77835e0b06cb2c6c8ca89d93d1567010fed9b216bd65ebde8fcb89f162cc3112aa01f05b5b05f4a26f6fe69d7
-DIST diffutils-3.12.tar.xz 1938800 BLAKE2B 5b4593b39da71578d7f975603abe9359be215b9ac76548a6ab0d6e3838bb103c7ffcddf7fa01abcd5c6289db9a2f16b43aa3d5e846a9aa4b8db866763c2660de SHA512 10b17cf1dcdfa9ca0e5db91d62c4a079ebe9fd7eafa3aaebd4eb7e6206e4d753f348496622aa281e1bd7f7fcde65ce4a886dcc4acbb59332ef980f224197b4e4
-DIST diffutils-3.12.tar.xz.sig 833 BLAKE2B 611b56a88b950e8dcd803dac082b42c3a516c90e62ff979b73b1e6d078e55328e9861ff630c98755426e9b7793d9ada7eee3ede1ab23ebaecd3f861ce879ccf5 SHA512 8eb59b40156741fbfcac947f29f76aa0eefb9c8f819206cab9474da0ffe0154c6aa8b38435eccdd82ceb8c3565a6c548e8d2a0f771f1e8e1af15635854ec9c62
diff --git a/sys-apps/diffutils/diffutils-3.10.ebuild b/sys-apps/diffutils/diffutils-3.10.ebuild
deleted file mode 100644
index 53956ebd344d..000000000000
--- a/sys-apps/diffutils/diffutils-3.10.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="17-cc36"
- 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 ~arm64-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[@]}"
-}
diff --git a/sys-apps/diffutils/diffutils-3.11-r2.ebuild b/sys-apps/diffutils/diffutils-3.11-r2.ebuild
deleted file mode 100644
index 404c4b57f05a..000000000000
--- a/sys-apps/diffutils/diffutils-3.11-r2.ebuild
+++ /dev/null
@@ -1,67 +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 ~arm64-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 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-empty-files.patch
- "${FILESDIR}"/${P}-tests-seq.patch
- "${FILESDIR}"/${P}-allocation-crash.patch
-)
-
-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[@]}"
-}
diff --git a/sys-apps/diffutils/diffutils-3.12.ebuild b/sys-apps/diffutils/diffutils-3.12.ebuild
deleted file mode 100644
index 0a0437872bc8..000000000000
--- a/sys-apps/diffutils/diffutils-3.12.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2026 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 branding 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 ~arm64-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
- $(use_enable nls)
- )
- econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/diffutils/files/diffutils-3.11-allocation-crash.patch b/sys-apps/diffutils/files/diffutils-3.11-allocation-crash.patch
deleted file mode 100644
index 3f80cd7e7c69..000000000000
--- a/sys-apps/diffutils/files/diffutils-3.11-allocation-crash.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://git.savannah.gnu.org/cgit/diffutils.git/commit/?id=e9f8e6a439fd607adbdd846ab93267dc367b5c79
-
-From e9f8e6a439fd607adbdd846ab93267dc367b5c79 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Fri, 28 Feb 2025 22:53:28 -0800
-Subject: diff: fix allocation typo leading to crashes
-
-But reported by Nick Smallbone, with one-line fix by
-Collin Funk <https://bugs.gnu.org/76613>.
-* src/io.c (find_and_hash_each_line): Fix size computation.
----
- src/io.c | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
---- a/src/io.c
-+++ b/src/io.c
-@@ -1012,7 +1012,7 @@ find_and_hash_each_line (struct file_data *current)
- linbuf += linbuf_base;
- linbuf = xpalloc (linbuf, &n, 1, -1, sizeof *linbuf);
- linbuf -= linbuf_base;
-- alloc_lines = n - linbuf_base;
-+ alloc_lines = linbuf_base + n;
- }
- linbuf[line] = p;
-
---
-cgit v1.1
-
-
diff --git a/sys-apps/diffutils/files/diffutils-3.11-empty-files.patch b/sys-apps/diffutils/files/diffutils-3.11-empty-files.patch
deleted file mode 100644
index 1f78bce8d972..000000000000
--- a/sys-apps/diffutils/files/diffutils-3.11-empty-files.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-https://git.savannah.gnu.org/cgit/diffutils.git/commit/?id=6ce0ebd033c395265c262ae3aab6477a49d4c2f1
-
-From 6ce0ebd033c395265c262ae3aab6477a49d4c2f1 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Thu, 20 Feb 2025 21:59:55 -0800
-Subject: diff: don't treat empty files as a different file type
-
-Reported by Kate Deplaix <kit-ty-kate@outlook.com> in
-<https://lists.gnu.org/r/bug-diffutils/2025-02/msg00005.html>.
-
-* src/diff.c (compare_prepped_files): Don't rely on string
-file type, as that might not agree with our idea of a file type.
----
- src/diff.c | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/src/diff.c b/src/diff.c
-index fa6100e..6e1bbc5 100644
---- a/src/diff.c
-+++ b/src/diff.c
-@@ -1223,14 +1223,14 @@ compare_prepped_files (struct comparison const *parent,
- the type is unusual, then simply report their type.
- However, at the top level do this only if one file is a symlink
- and the other is not. */
-- if (toplevel
-- ? (!S_ISLNK (cmp->file[0].stat.st_mode)
-- != !S_ISLNK (cmp->file[1].stat.st_mode))
-- : (cmp->file[0].filetype != cmp->file[1].filetype
-- || ! (S_ISREG (cmp->file[0].stat.st_mode)
-- || S_ISLNK (cmp->file[0].stat.st_mode)
-- || S_ISCHR (cmp->file[0].stat.st_mode)
-- || S_ISBLK (cmp->file[0].stat.st_mode))))
-+ mode_t mode0 = cmp->file[0].stat.st_mode;
-+ mode_t mode1 = cmp->file[1].stat.st_mode;
-+ if (toplevel ? !S_ISLNK (mode0) != !S_ISLNK (mode1)
-+ : S_ISREG (mode0) ? !S_ISREG (mode1)
-+ : S_ISLNK (mode0) ? !S_ISLNK (mode1)
-+ : S_ISCHR (mode0) ? !S_ISCHR (mode1)
-+ : S_ISBLK (mode0) ? !S_ISBLK (mode1)
-+ : true)
- {
- /* POSIX 1003.1-2017 says any message will do, so long as it
- contains the file names. */
-@@ -1244,7 +1244,7 @@ compare_prepped_files (struct comparison const *parent,
- }
-
- /* If both files are symlinks, compare symlink contents. */
-- if (S_ISLNK (cmp->file[0].stat.st_mode))
-+ if (S_ISLNK (mode0))
- {
- /* We get here only if we are not dereferencing symlinks. */
- dassert (no_dereference_symlinks);
-@@ -1295,7 +1295,7 @@ compare_prepped_files (struct comparison const *parent,
- and report file types of all other non-regular files.
- POSIX 1003.1-2017 says any message will do,
- so long as it contains the file names. */
-- if (!toplevel && !S_ISREG (cmp->file[0].stat.st_mode))
-+ if (!toplevel && !S_ISREG (mode0))
- {
- if (cmp->file[0].stat.st_rdev == cmp->file[1].stat.st_rdev)
- return EXIT_SUCCESS;
-@@ -1311,7 +1311,7 @@ compare_prepped_files (struct comparison const *parent,
- for (int i = 0; i < n_num; i++)
- sprintf (numbuf[i], "%"PRIdMAX, num[i]);
-
-- message ((S_ISCHR (cmp->file[0].stat.st_mode)
-+ message ((S_ISCHR (mode0)
- ? ("Character special files %s (%s, %s)"
- " and %s (%s, %s) differ\n")
- : ("Block special files %s (%s, %s)"
-@@ -1323,8 +1323,8 @@ compare_prepped_files (struct comparison const *parent,
- }
-
- if (files_can_be_treated_as_binary
-- && S_ISREG (cmp->file[0].stat.st_mode)
-- && S_ISREG (cmp->file[1].stat.st_mode)
-+ && S_ISREG (mode0)
-+ && S_ISREG (mode1)
- && cmp->file[0].stat.st_size != cmp->file[1].stat.st_size
- && 0 <= cmp->file[0].stat.st_size
- && 0 <= cmp->file[1].stat.st_size)
---
-cgit v1.1
diff --git a/sys-apps/diffutils/files/diffutils-3.11-tests-seq.patch b/sys-apps/diffutils/files/diffutils-3.11-tests-seq.patch
deleted file mode 100644
index 407b76ac05f7..000000000000
--- a/sys-apps/diffutils/files/diffutils-3.11-tests-seq.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-https://git.savannah.gnu.org/cgit/diffutils.git/commit/?id=58e734dedd2ed84b559c313b4fbe8e2a1b987a1d
-
-From 58e734dedd2ed84b559c313b4fbe8e2a1b987a1d Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Fri, 28 Feb 2025 14:32:44 -0800
-Subject: tests: make seq replacement more available
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This refactoring should let other future tests use ‘seq’.
-* tests/diff3 (seq): Move from here ...
-* tests/init.cfg: ... to here.
----
- tests/diff3 | 12 ------------
- tests/init.cfg | 12 ++++++++++++
- 2 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/tests/diff3 b/tests/diff3
-index e468243..c2079ec 100644
---- a/tests/diff3
-+++ b/tests/diff3
-@@ -3,18 +3,6 @@
-
- . "${srcdir=.}/init.sh"; path_prepend_ ../src
-
--# Some systems lack seq.
--# A limited replacement for seq: handle 1 or 2 args; increment must be 1
--seq()
--{
-- case $# in
-- 1) start=1 final=$1;;
-- 2) start=$1 final=$2;;
-- *) echo you lose 1>&2; exit 1;;
-- esac
-- awk 'BEGIN{for(i='$start';i<='$final';i++) print i}' < /dev/null
--}
--
- echo a > a || framework_failure_
- echo b > b || framework_failure_
- echo c > c || framework_failure_
-diff --git a/tests/init.cfg b/tests/init.cfg
-index 8b3b107..66c26d6 100644
---- a/tests/init.cfg
-+++ b/tests/init.cfg
-@@ -120,4 +120,16 @@ require_utf8_locale_()
- test $found_working_tr = 1 || skip_ "failed to find a working tr program"
- }
-
-+# Some systems lack seq.
-+# A limited replacement for seq: handle 1 or 2 args; increment must be 1
-+seq()
-+{
-+ case $# in
-+ 1) start=1 final=$1;;
-+ 2) start=$1 final=$2;;
-+ *) echo you lose 1>&2; exit 1;;
-+ esac
-+ awk 'BEGIN{for(i='$start';i<='$final';i++) print i}' < /dev/null
-+}
-+
- sanitize_path_
---
-cgit v1.1
diff --git a/sys-apps/diffutils/metadata.xml b/sys-apps/diffutils/metadata.xml
deleted file mode 100644
index 8963b14ac40d..000000000000
--- a/sys-apps/diffutils/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
- </maintainer>
- <upstream>
- <remote-id type="cpe">cpe:/a:gnu:diffutils</remote-id>
- <remote-id type="savannah">diffutils</remote-id>
- </upstream>
-</pkgmetadata>