summaryrefslogtreecommitdiff
path: root/sys-apps
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/Manifest.gzbin48771 -> 48774 bytes
-rw-r--r--sys-apps/diffutils/Manifest6
-rw-r--r--sys-apps/diffutils/diffutils-3.9.ebuild (renamed from sys-apps/diffutils/diffutils-3.8_p20221230.ebuild)4
-rw-r--r--sys-apps/ed/Manifest2
-rw-r--r--sys-apps/ed/ed-1.19-r1.ebuild (renamed from sys-apps/ed/ed-1.19.ebuild)12
5 files changed, 18 insertions, 6 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 23d7ed992627..ef82d1b42ec8 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
Binary files differ
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index 9263bd3bdec6..f95b5d4e464e 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,9 +1,9 @@
AUX loong-fix-build.patch 859 BLAKE2B 11e48762d8112d3c56947d0f9db196d84c142775d5abab0dc1a6593a4f0eeecbf7cbf72d589a0db1623d3a4f85559bc95f17260b94041d6eb625401e784852c3 SHA512 1d87a407196ebbfd22b1b14504a5ec61eff9cc8a4d11a4f7d15c1a7aea1ff338c9bc18e6298ea6e29898a0753201cda6bb90023a5dda817e78a0980e846a68d3
AUX ppc-musl.patch 824 BLAKE2B b3476471c27a748a67f237d7f34ede06446417a310737d46686ff8103cb3f5c1c4a1cdd5e9c4adccf4511f667db473086b0ea7fa5242f36e3109f929d70728e7 SHA512 079e50b0f7d99bd7c45a33acd56a2fb000e50f7b4bc73fa18d246315b732550ceb75251ba12daf5fd2948be9252cd40804df3c2c797b47bf8b0cf173a1db4c7e
-DIST diffutils-3.8.43-2d50.tar.xz 1585696 BLAKE2B c4b8534ec167721cde4fc33778b69740fa55dc566cf1a1b8b489ad047e67f748290fff617bd44f024fd2995cd83c5d1019bf074ded863b8fb4397208152bf400 SHA512 f348d3588eed7e471851edcf488d32936af1261b0991e8699e056e8696c235444a8a70a8a26f5be52c4406bd3d210106e58e6446a8ce71dc025172a13ab69096
-DIST diffutils-3.8.43-2d50.tar.xz.sig 833 BLAKE2B a300a957da2377ff9c5372789bd57a77f3adcc4f8cea272f4c06395e78b176880ca1e933f3253c4d680d9624798ac0fd21c7cfe31fe56f8ee042f4f527c21cc7 SHA512 0a56ece94f06b6e0f57213f7c311cd5f9eebde65e5664a75b7d7d69772ac06024f1486a1a133f040ecf2af39caa3bca35855fc66bb776a273f663e12cfb00432
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.tar.xz 1587916 BLAKE2B d43ed9f1643ac46b69083755974fc9611ad00c3b98b08332c681223d17d762567562233b51342a16f7dad8f28dfc5536999143594e33a64e6624001a71787c8f SHA512 d43280cb1cb2615a8867d971467eb9a3fa037fe9a411028068036f733dab42b10d42767093cea4de71e62b2659a3ec73bd7d1a8f251befd49587e32802682d0f
+DIST diffutils-3.9.tar.xz.sig 833 BLAKE2B 3bc4aa2b5c73da03dbcfab6edc10f8d5062d5564a6fa2d3a1e0e791d29e189285ff69a3c618685e4471a4c5e37c4f921fe6a12594d7a4b7d7085f9af3ed885d5 SHA512 38e90b7b5708f65f9f3bd04c69d718facbe5109ce3ba55a9bd6aa6becbc69d4b3a8a4e1579ce7ad84514d55ec45fb520b9b22c0cc4a286e6e28714a5c633e9ed
EBUILD diffutils-3.8.ebuild 1673 BLAKE2B e1af83d87e166a3d60f87ed13870240f9216ff72ffb99508780c7020fa466da05b2e3b8eeaaf8dbf244ee873059a004273bfb2e2ab6ddb4cf4f0e16542497f3b SHA512 17925dde918dc25fde6a42891b45c7a8f242aa5a81bf67974b01d03785f16251496912fb5ccfe0927cde4908432cf36532341d7b11f16b2ae5033169f466018f
-EBUILD diffutils-3.8_p20221230.ebuild 1614 BLAKE2B 5a1af393ff0f317214d39e512050c7e5e4e8f119338654133dd3b997a2b365c66d8c6d739f6ba174e48570cf7f41d6bb2690ef8f88e30a302fad6c70b463657a SHA512 2ce899f56dd0b728b2f123ba4637e5f1b10a8c69967cd8bec302b23bc7624443125c28cd3f45bc90fa9262d37f80dfb3e64548b59500555f80eb8d1c2a2d2807
+EBUILD diffutils-3.9.ebuild 1676 BLAKE2B be338eac3966c65685d30be4362ac021c1fbae4a52d8af01d9cdb301cb0e8f7b624ec6f98fdeff74e4e2ea5f37daae272f16aa43b2bbd2002c97fa576e08bbaa SHA512 75cafd5405be701646b5c9e6156d8bb3360c4fe37d6497b0171b7e41079c20e494aed21a0295561c019da173a6203734983d5b2d491385ffcdb811db778361a7
MISC metadata.xml 403 BLAKE2B 009b73d59702ec89a6dc4e9ff8886ee77f0390961ea51aa5248d6f2fa3c9de0dd7fc8ba6844b0e38b7bae348dbb3b38cc8447f27371127976a5e5ae37aebbb34 SHA512 c0450fc2991ef0b1b56076a82fe88a8c860ac2a11aa78ac86cbaa29b049fdc6c69e11f9da3e9f90501f0a9567884e0bc47cf2b3b0a486cd173d1060b19f04a25
diff --git a/sys-apps/diffutils/diffutils-3.8_p20221230.ebuild b/sys-apps/diffutils/diffutils-3.9.ebuild
index f895d84c9b6e..ebbd0424d186 100644
--- a/sys-apps/diffutils/diffutils-3.8_p20221230.ebuild
+++ b/sys-apps/diffutils/diffutils-3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -40,6 +40,8 @@ src_configure() {
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/"
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index 9ddd1b8ed50e..6eaf9ff548b7 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -3,5 +3,5 @@ DIST ed-1.18.tar.lz.sig 72 BLAKE2B 9b498f1604d625c6b32ded636e0841ef384bf59c10ff0
DIST ed-1.19.tar.lz 66448 BLAKE2B 139305a1d64e96f7eadcb462325918e5eee18de229ec8e1b3fac29dc9b8ef58ceea4cd7ffdbd3674fd7f421d90bc0c9e3557318eb57830d7cd46e579828fa95d SHA512 594d5cf895931783110ee1956078f6a77aee022fb67730cbc6f1d30521c120b97820a5eb349278575f85c4c1e17fea0e16a3bc22592edae53c6fd27941ee3d7e
DIST ed-1.19.tar.lz.sig 72 BLAKE2B ada611148a6347d8953c65669b61f69eb0ed8d48f6dc4ffaab8975dd7e28f1d87e434493a77e817ca05874f741e243309529e60e95f2a7636148fa71c711f5e3 SHA512 03ff7cf2f337fdc94efaa1374ce95d37c29c556b2a9a13f7216e05e8e9e9efc95bcbb554bd05000b5283d5f20884f3f50b16f220fba8e6ff318b1b975c6a44c9
EBUILD ed-1.18.ebuild 1183 BLAKE2B 23b5cb591455ad1c1dad946876f8b7b4297bc41ddc0cf7a909c83c8585a0f3144506f25495a043c0ade9f5e0501b4d2c7219b086917953059a92ae9f4f523110 SHA512 75bbec07b179c221e7399f709fca3e430a0c856f9acba11d65c5fe9c740c08526629ae85c3d302f2cedb285a071b54158341d7d63b2d6934fca3fe8bd820d5e2
-EBUILD ed-1.19.ebuild 1329 BLAKE2B 376b92f937cdafae376bc9c259a3b00431e9363c6459a693bdf92a297932d3124c4d9f137889dab64fe90e2302561a4480ae2fc5eb943a05d5e5b552df5ccf08 SHA512 f7f31316c09d8423f57d84063e577be55287482e30adb330f720d49c05d36c1d0c87a6e8e3ccd56b847ceb25ceeba88227d29bb73c966478f3daebd2767eacbd
+EBUILD ed-1.19-r1.ebuild 1720 BLAKE2B 5a5a46de12a7060ecbf4845fc32d71c22f275637ba0764d906d1e5ef5241a6e11c395c47662aa96ee1aef80e27bb40245f28038c02cc638ad9049603a48a6387 SHA512 88f11b0172ec7acef287bdc3239d054f59c07c2c4a9ca3d1cea3f6b2cb1d082a4542c0cf3dd21e4cbe8027ae8d356605cd3c1906380f1b0c57468edb81f184f4
MISC metadata.xml 337 BLAKE2B 40506db26223e7d375b03972929e04e5684f0ee5d722248819d28d424daf9f2f4effd07a7491cdba9d77185712593fe8fd182c058bff2ff0ba4341aff383dc7d SHA512 5709e973094bd7fda825a3a223c04f8ce04ba9e2f609466c7cf56da4f62d4155562669bbfd808acd2f7db17434ca5871cdc50962a6bfdae3c4edeca1bb4736df
diff --git a/sys-apps/ed/ed-1.19.ebuild b/sys-apps/ed/ed-1.19-r1.ebuild
index 65951958803d..8f805d415665 100644
--- a/sys-apps/ed/ed-1.19.ebuild
+++ b/sys-apps/ed/ed-1.19-r1.ebuild
@@ -26,9 +26,19 @@ if [[ ${PV} != *_rc* ]] ; then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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"
fi
+# We don't use unpacker_src_uri_depends here right now because:
+# 1. unpacker_src_uri_depends doesn't flatten the deps (bug #891133) and emits
+# several || ( ... ) blocks (4).
+# 2. Portage doesn't handle several repeated identical || ( ...) blocks correctly
+# and takes ages to resolve (bug #891137). It should merge them together.
BDEPEND="
sys-apps/texinfo
- $(unpacker_src_uri_depends)
+ || (
+ >=app-arch/xz-utils-5.4.0
+ app-arch/plzip
+ app-arch/pdlzip
+ app-arch/lzip
+ )
verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )
"