From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- sys-apps/diffutils/Manifest | 4 +-- sys-apps/diffutils/diffutils-3.7-r1.ebuild | 43 ------------------------------ sys-apps/diffutils/files/ppc-musl.patch | 3 ++- 3 files changed, 3 insertions(+), 47 deletions(-) delete mode 100644 sys-apps/diffutils/diffutils-3.7-r1.ebuild (limited to 'sys-apps/diffutils') diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest index c5d1375c6dc3..765abd4ea8df 100644 --- a/sys-apps/diffutils/Manifest +++ b/sys-apps/diffutils/Manifest @@ -1,6 +1,4 @@ -AUX ppc-musl.patch 706 BLAKE2B 5b5aff69fa1118ab22179b7cc937aaf1b9c0dd89df957814f68de2c40543ccf12dd8be4eeee29723043b72ac71bce24015986866c10f9ea92704c5e9b1245933 SHA512 c497e10eff10aa0706527438a3218ff5047622ad2c2ce2a2aa807341a352524cb955a3f5fa1f34a051c07a3f24ea395ec1276f11905ac988e5a2f57cb5caf646 -DIST diffutils-3.7.tar.xz 1448828 BLAKE2B d9f115e0ec9b2499545a3bef4e469fb7786d4a95e0a1c8459c885c53e8b1dc797027979e42c53c2a7df4e1e224942bd9ce5214813977af2bcc67f0698ea0c647 SHA512 7b12cf8aea1b9844773748f72272d9c6a38adae9c3c3a8c62048f91fb56c60b76035fa5f51665dceaf2cfbf1d1f4a3efdcc24bf47a5a16ff4350543314b12c9c +AUX ppc-musl.patch 824 BLAKE2B b3476471c27a748a67f237d7f34ede06446417a310737d46686ff8103cb3f5c1c4a1cdd5e9c4adccf4511f667db473086b0ea7fa5242f36e3109f929d70728e7 SHA512 079e50b0f7d99bd7c45a33acd56a2fb000e50f7b4bc73fa18d246315b732550ceb75251ba12daf5fd2948be9252cd40804df3c2c797b47bf8b0cf173a1db4c7e DIST diffutils-3.8.tar.xz 1585120 BLAKE2B 573abbfba55c62ba30d2084ca68860e9681cfe92648407f7fb04e1aaed2e4719e2fb5a29cf25bd125d762f4dfd52f85ee91f2ec19b099365bada7fe27a0394af SHA512 279441270987e70d5ecfaf84b6285a4866929c43ec877e50f154a788858d548a8a316f2fc26ad62f7348c8d289cb29a09d06dfadce1806e3d8b4ea88c8b1aa7c -EBUILD diffutils-3.7-r1.ebuild 1179 BLAKE2B aa0c831588bceba6c855b67d53b51fe853b94659c70f63e829540b46e61be3a87fa2dc3889f81640a819ff4ed1a0db2a8d2903b707f27f59bf5b839916271209 SHA512 3a4287c690502ea4890850726d42ae937f726821a712435eb749e1ef82ef40ab415739dc3981872c541a2007596b22319aea7909e1dabee721c3f076d733599c EBUILD diffutils-3.8.ebuild 1103 BLAKE2B cce9888b6c90edd28dd2e12cce849380c49e7cddf806e655ed9fc9c6fa8aa17f6a7a437c7c7563c973f22580613ca5fc7586206bda568f7bcb092c4b0e5f9c3b SHA512 914cb7da0b0fafd6ffa245051727cc2862052aedfd44ecaa38a6cb6d866380e48814070de3827b05752b688d82e3647714c96e8daa14084d84450f3b6a1bd12a MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c diff --git a/sys-apps/diffutils/diffutils-3.7-r1.ebuild b/sys-apps/diffutils/diffutils-3.7-r1.ebuild deleted file mode 100644 index bf54a0da3b24..000000000000 --- a/sys-apps/diffutils/diffutils-3.7-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic - -DESCRIPTION="Tools to make diffs and compare files" -HOMEPAGE="https://www.gnu.org/software/diffutils/" -SRC_URI="mirror://gnu/diffutils/${P}.tar.xz - https://alpha.gnu.org/gnu/diffutils/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="nls static" - -BDEPEND="nls? ( sys-devel/gettext )" - -DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) - -src_configure() { - use static && append-ldflags -static - - # 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=( - --with-packager="Gentoo" - --with-packager-version="${PVR}" - --with-packager-bug-reports="https://bugs.gentoo.org/" - $(use_enable nls) - ) - econf "${myeconfargs[@]}" -} - -src_test() { - # explicitly allow parallel testing - emake check -} diff --git a/sys-apps/diffutils/files/ppc-musl.patch b/sys-apps/diffutils/files/ppc-musl.patch index d7d8255a444a..4aff0ba1cf5c 100644 --- a/sys-apps/diffutils/files/ppc-musl.patch +++ b/sys-apps/diffutils/files/ppc-musl.patch @@ -1,7 +1,8 @@ -Needed to fix build on ppc + musl. Doesn't seem to yet be in upstream gnulib. +Needed to fix build on ppc + musl. Should pop up in next gnulib sync in release (different patch). https://www.openwall.com/lists/musl/2017/11/05/2 https://github.com/void-linux/void-packages/blob/master/srcpkgs/grep/patches/ppc-musl.patch +https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=2d830e4a792fcd9f614ed08a7f18584b8b21d23b --- a/lib/sigsegv.c +++ b/lib/sigsegv.c @@ -221,8 +221,10 @@ int libsigsegv_version = LIBSIGSEGV_VERSION; -- cgit v1.2.3