From eb509e1a15f595f667e8d177ddb73311084af6c0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 21 May 2023 20:55:01 +0100 Subject: gentoo auto-resync : 21:05:2023 - 20:55:01 --- sys-apps/diffutils/Manifest | 6 +-- sys-apps/diffutils/diffutils-3.10.ebuild | 58 +++++++++++++++++++++++ sys-apps/diffutils/diffutils-3.9_p20230514.ebuild | 58 ----------------------- 3 files changed, 61 insertions(+), 61 deletions(-) create mode 100644 sys-apps/diffutils/diffutils-3.10.ebuild delete mode 100644 sys-apps/diffutils/diffutils-3.9_p20230514.ebuild (limited to 'sys-apps/diffutils') diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest index 8cdcbf6866a5..d0b5c88238ac 100644 --- a/sys-apps/diffutils/Manifest +++ b/sys-apps/diffutils/Manifest @@ -2,14 +2,14 @@ AUX diffutils-3.9-diff-D-option-regression.patch 1002 BLAKE2B 58b474797f039f033a AUX diffutils-3.9-make-4.4-test-color.patch 1021 BLAKE2B 54ab07967f48c230292590cfd668ea4f6e6ea0a53850705e6dd9c62da626d5a905946314dfcbbd18c6a34b16b564113cd0c2cd0a3e84e652d8cf1037030df2f3 SHA512 9d6e3463dd29684b58bdd8e2585c0ea597a66cb60f8068f1c06ca7c676b12a51a4d691aa7d31afcedeb9612038560eca40cdf6bd6715e7789e5efd9e72b0c5f3 AUX loong-fix-build.patch 859 BLAKE2B 11e48762d8112d3c56947d0f9db196d84c142775d5abab0dc1a6593a4f0eeecbf7cbf72d589a0db1623d3a4f85559bc95f17260b94041d6eb625401e784852c3 SHA512 1d87a407196ebbfd22b1b14504a5ec61eff9cc8a4d11a4f7d15c1a7aea1ff338c9bc18e6298ea6e29898a0753201cda6bb90023a5dda817e78a0980e846a68d3 AUX ppc-musl.patch 824 BLAKE2B b3476471c27a748a67f237d7f34ede06446417a310737d46686ff8103cb3f5c1c4a1cdd5e9c4adccf4511f667db473086b0ea7fa5242f36e3109f929d70728e7 SHA512 079e50b0f7d99bd7c45a33acd56a2fb000e50f7b4bc73fa18d246315b732550ceb75251ba12daf5fd2948be9252cd40804df3c2c797b47bf8b0cf173a1db4c7e +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.8.tar.xz 1585120 BLAKE2B 573abbfba55c62ba30d2084ca68860e9681cfe92648407f7fb04e1aaed2e4719e2fb5a29cf25bd125d762f4dfd52f85ee91f2ec19b099365bada7fe27a0394af SHA512 279441270987e70d5ecfaf84b6285a4866929c43ec877e50f154a788858d548a8a316f2fc26ad62f7348c8d289cb29a09d06dfadce1806e3d8b4ea88c8b1aa7c DIST diffutils-3.8.tar.xz.sig 833 BLAKE2B 439d331d9839d8b434b7192c52628bc9e8e1c11cada28170f85c9390abc3e5e9ea86aee696a4f9260552133053194680ff54b960ed539fabec85fdff54dee3a2 SHA512 0464ac89209411993800666b45ff90243d22fbda53bf1d71c6870d565b39cc8d9c54c141b9d297a181ce74ad8fb5313953f416bced179ff7728a52a3e9a4f5a5 -DIST diffutils-3.9.17-cc36.tar.xz 1621272 BLAKE2B cf4056c425031bfb5f40c1730f69c2b22601fcbdb60fe2286943d9b0aabfa7e253239b60be0aa04cae7f5b398da408e9fafd1e69e373bd6e4ceb5b398e2af21e SHA512 686273402568c754fdd41f76b8bc6e0d99273ec379ef6b444ea82c0955350d5fcae949250b4b94af5b2f4ad0f5959a0ebcc2d72190f163281fc08e3baa954bc5 -DIST diffutils-3.9.17-cc36.tar.xz.sig 833 BLAKE2B e9fcdecafe5cf1d69932338456ed2d20ab70b4dec781d1811896ed014b6acc15ef1d6c3849e56b0db31c53fd84dbbffffe6d96af508bb4f035362cc42d1b32e3 SHA512 79f9d62722d15b8efaf7edb04a40d636bcb10104450d7f396d0dc3a2a5048cdf5f685ea00132c62677564ca15f9a06845f8d060162b9097c79f3ba8da4e129dd DIST diffutils-3.9.tar.xz 1587916 BLAKE2B d43ed9f1643ac46b69083755974fc9611ad00c3b98b08332c681223d17d762567562233b51342a16f7dad8f28dfc5536999143594e33a64e6624001a71787c8f SHA512 d43280cb1cb2615a8867d971467eb9a3fa037fe9a411028068036f733dab42b10d42767093cea4de71e62b2659a3ec73bd7d1a8f251befd49587e32802682d0f DIST diffutils-3.9.tar.xz.sig 833 BLAKE2B 3bc4aa2b5c73da03dbcfab6edc10f8d5062d5564a6fa2d3a1e0e791d29e189285ff69a3c618685e4471a4c5e37c4f921fe6a12594d7a4b7d7085f9af3ed885d5 SHA512 38e90b7b5708f65f9f3bd04c69d718facbe5109ce3ba55a9bd6aa6becbc69d4b3a8a4e1579ce7ad84514d55ec45fb520b9b22c0cc4a286e6e28714a5c633e9ed +EBUILD diffutils-3.10.ebuild 1745 BLAKE2B 94656812a2e20df847e8d55491b39be917e51be61172bcf4cee162beedcfef960894054571af9d9b45ed190497ea603c4561b8234f10cd10e44e383338f0d266 SHA512 96d0a4b31d08a17b875a3bb367b714ac05fa0d7b3b83819cedf9f34a6eba333712845b63d944f4c442d417e6c3d4eb33f3e8b76a4b1e769e9eba52aeb2df6727 EBUILD diffutils-3.8.ebuild 1686 BLAKE2B bdbf22e16f3791a7a844ac98dc3a64ac56c53e2ba36fee9af0a58314055c324c1a2ecd0cebf005f711483453446b03a9e8313df4050b7819f497d6302b4904f6 SHA512 b3e3b0aa801fc6312416e735111bf73a5aca065f50d054d45eac224bfdd861c26147c540f7e6cfa9755846188805495ca2c10f815c7c80440b13bdc346af072f EBUILD diffutils-3.9-r1.ebuild 1846 BLAKE2B 22f90d335c906054ad5b5678ce00c998d96cb7d83f39d2848a9be625a7d8162a54d28b73a069e7b4e719321a22a1247d3576cfc8998133f62da3c21b4aca1e3c SHA512 92084b50da2b7ecbb44cc681d77be78630cee4e122a2232546de18e6492b984b64ca25cd876d364b5d84e5721e6f8d59a60ed9ca2600921327fa1435274f3d6c EBUILD diffutils-3.9.ebuild 1748 BLAKE2B 03be07947370fd6ae398de28c9bc46977ff96f0e098f93841b3179e08437db265a46b45e1d4352793cde49e868498d636fb0a5fec925fc2c210596898fbac81c SHA512 133ef5d5dc116dbdfccce754256bfc076710dd1eec1e0c330f945c91e0b53ba23c8df90a34da37ecd73ebf28f28776a8ab8bc7e97409c62c6f89b2fd1f8f92f3 -EBUILD diffutils-3.9_p20230514.ebuild 1745 BLAKE2B 94656812a2e20df847e8d55491b39be917e51be61172bcf4cee162beedcfef960894054571af9d9b45ed190497ea603c4561b8234f10cd10e44e383338f0d266 SHA512 96d0a4b31d08a17b875a3bb367b714ac05fa0d7b3b83819cedf9f34a6eba333712845b63d944f4c442d417e6c3d4eb33f3e8b76a4b1e769e9eba52aeb2df6727 MISC metadata.xml 403 BLAKE2B 009b73d59702ec89a6dc4e9ff8886ee77f0390961ea51aa5248d6f2fa3c9de0dd7fc8ba6844b0e38b7bae348dbb3b38cc8447f27371127976a5e5ae37aebbb34 SHA512 c0450fc2991ef0b1b56076a82fe88a8c860ac2a11aa78ac86cbaa29b049fdc6c69e11f9da3e9f90501f0a9567884e0bc47cf2b3b0a486cd173d1060b19f04a25 diff --git a/sys-apps/diffutils/diffutils-3.10.ebuild b/sys-apps/diffutils/diffutils-3.10.ebuild new file mode 100644 index 000000000000..afcdb4c15edf --- /dev/null +++ b/sys-apps/diffutils/diffutils-3.10.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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.9_p20230514.ebuild b/sys-apps/diffutils/diffutils-3.9_p20230514.ebuild deleted file mode 100644 index afcdb4c15edf..000000000000 --- a/sys-apps/diffutils/diffutils-3.9_p20230514.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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