diff options
Diffstat (limited to 'sys-fs')
95 files changed, 600 insertions, 1787 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz Binary files differindex 2ed02ff5f821..9e79e5273ed1 100644 --- a/sys-fs/Manifest.gz +++ b/sys-fs/Manifest.gz diff --git a/sys-fs/archivemount/Manifest b/sys-fs/archivemount/Manifest index 8ba704bd2efb..5592100262f5 100644 --- a/sys-fs/archivemount/Manifest +++ b/sys-fs/archivemount/Manifest @@ -1,5 +1,3 @@ -DIST archivemount-0.8.12.tar.gz 131934 BLAKE2B f4fda78f3f91fa2586795807ef616fd8eb67e224d99bcdfbd80ec59b851770a5c914c25786a183ce0dc9e8cf35b628ecd56bd35b181f2b51b4eb7f0bb727839c SHA512 4ce9e7ec8585b07d5bf48df41cc4a1b4ba7fe2268864ec70c445a6b9c21237f267a19814f00c5ef5a940a90ebaa47c9626aff1dbbff6fbb22e2c260da666ccd9 DIST archivemount-0.9.1.tar.gz 133251 BLAKE2B 18c7a1ceb415524d88c737cd23eba87ca10e057fee64c81d22c7249df4b5a844d767931532bfe51367bc5c4274027dea9582d9403f34802c13e5faa88ce93fae SHA512 ecfa8abc1dcae34c855f9a2943113ddd3eb1b81011f23ef6a8dddd344c1db44b132683a1181f17b5691a783df764523ee0d2b802202d93890dcbdb78bee53522 -EBUILD archivemount-0.8.12.ebuild 630 BLAKE2B bda44e0c24dfcc9a331139e38cef05fbe5f07ad2e862f70a6b32806dfac51b9635722bc583fb043cd4bd361d1041abeb504c716e924fb4d23f4a27adebb87491 SHA512 ea2c54d7842ed30292599fedd57149a860f2e806ed6ab37da4bc1f304de1cc0dc3ab54c8cb95cad92e6f1da8e047701337bb01e122a37b70d07b1bb7dd117ebc EBUILD archivemount-0.9.1.ebuild 548 BLAKE2B 84663e128be91339135b62d12f481afc2a35aa161060814fe79d945dbc8c73a8301912551e903fe59e378d296a6bf087ee642f2edb0882b7e96d51aa5f83db8a SHA512 4d6f2bdc0659b6e65350153b3d15331dcb4e006a1766f9cfaff8bcf790872778eccbb7459fc470d75a9dfce71d580ba457e25e02c13cc2852691f0488a77715b MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/sys-fs/archivemount/archivemount-0.8.12.ebuild b/sys-fs/archivemount/archivemount-0.8.12.ebuild deleted file mode 100644 index 793dfba16b56..000000000000 --- a/sys-fs/archivemount/archivemount-0.8.12.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Mount archives using libarchive and FUSE" -HOMEPAGE="https://www.cybernoia.de/software/archivemount.html https://github.com/cybernoid/archivemount" -SRC_URI="https://www.cybernoia.de/software/archivemount/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - app-arch/libarchive:= - sys-fs/fuse:0" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default - - # https://bugs.gentoo.org/725998 - sed -i -e 's/CFLAGS=//g' configure.ac || die - eautoreconf -} diff --git a/sys-fs/avfs/Manifest b/sys-fs/avfs/Manifest index 6fd2f3b1927e..725d4ce26cb8 100644 --- a/sys-fs/avfs/Manifest +++ b/sys-fs/avfs/Manifest @@ -1,7 +1,5 @@ -DIST avfs-1.1.1.tar.bz2 606819 BLAKE2B 240bb342dc9f993ac8deb60941411b1419c190f9909b5b1bde65777b82f622e121f44f238d2bd8ddc303c86ef376950d4af773c8fae79848b466ec3a3c5aafc1 SHA512 0707f8e746d8d3633755b1a1efb944a400c095b517a7befd75de4d25e2fad1a1b5132b9cf94285b05ad1344bfc138ec75e9cb5f8a5d7775a69595b9b35266f92 DIST avfs-1.1.3.tar.bz2 609901 BLAKE2B 2eea31365533372fc5ea252d57da97a8e0d362b6db5f0a6e10af9255105ccdcadbd7f5157aafd63244da2c7a53dcbc6781d0c4ba5ca231ce2937855d400ea4e5 SHA512 8e87655cbdb64f0cbbcc399142957ea9e04a998953cc64def9c8bb338b46abffc85a35e09b5fa52bb9ddcf56e27c4f62503050d32c8201eaad61c54e22bdd005 DIST avfs-1.1.4.tar.bz2 614657 BLAKE2B a742f2e7fd4f97f2a3207cfe95d9358cfd895e4c047c39bbbf3ac0a35e1702542339f46199ba5f92868ceb48f009736a513431c0467ba49d9aacf73a667956ec SHA512 5caa7050e6b9cdce0b5ccd515af8233dc1e9226a97cdf3a3284ced5edd44fbde426049b4ce500ce1daf020d085f9f0a9f81eff339657e92ff2d09b1dec6e4267 -EBUILD avfs-1.1.1.ebuild 1491 BLAKE2B 4456b482d395814bcc942b915c443593d661284f5d8ac25f6a143b474f00b6bec645af06ffb56f355597195d01213285082bb7288c10f95e238ee9db98100538 SHA512 f983cbc72aaba0a55f88a26d8cb76b34baaa6f0cefd816ab9952eefdb2530dafb2b49ea5790b7281324d27159e37fef63cea9884ce9c6e052f2b5c44e0395e0e EBUILD avfs-1.1.3.ebuild 1612 BLAKE2B a907724e13fa959057992d53b78333d2cffcd6b7de0e2bcbaefe20101206a119280de3b6cfbf6d4f6846c1437bd74a6643e885096be2a98f6da3599f94ddab2a SHA512 44bea1e13bf358c18a261d8bf9142b8597ed3cd5a41c83af11bb03daa091ba79eb1575000b8aa140e19c8e9175984b67236563b68ed7998b9c07c4a3cb5d4e32 -EBUILD avfs-1.1.4.ebuild 1668 BLAKE2B b4340b129967e9f274dc5cc6341695606df0722a7ee94afb18ac35e1d18c757ed3c48c25fb47d36806c58b5f95f10faf34906c0c5911d4cebac8b5ee0a6e33cf SHA512 e3d03034650f97ad8a43fc7958e07a968ec7305ce1f017cd4abadf84ef9f6b7523d49e3383366407fd07a807c1a3171705c930e6a80d2f3b578a04f8c13c9fe0 +EBUILD avfs-1.1.4.ebuild 1664 BLAKE2B 90995cd45ee59d801ecc605fc12878faf7ca5242a65bb19faffd1160fbb028cd521346d1804ad192b659abd6dcf819e5787aa1b70e24f42e5b7e32c8e920f0bd SHA512 7318ec810582490e9b9f766c48de93cd06900928a8142e3181f7c412f3f634c30d4cb0b32ad028bcc02a80c15281c551245eb0a1e1bab328226bd230a5b07b0c MISC metadata.xml 519 BLAKE2B a21b5a5944a06860545d860886095c450059dbcd3bc502d85128cdef189f292af5de9562399736dcfa936befb4e5e46b8e83d8421d8af51c4bb513d6a911b570 SHA512 5c96b5b0fda1295d9433bc1d38660b207363693c3be03f2d7b8baffb20508990e9d582fa71066f99637030dda4c244e1ee005e428d353f10d4198f048c874761 diff --git a/sys-fs/avfs/avfs-1.1.1.ebuild b/sys-fs/avfs/avfs-1.1.1.ebuild deleted file mode 100644 index eea80dedaca1..000000000000 --- a/sys-fs/avfs/avfs-1.1.1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="AVFS is a virtual filesystem that allows browsing of compressed files" -HOMEPAGE="https://sourceforge.net/projects/avf/" -SRC_URI="mirror://sourceforge/avf/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86" -IUSE="static-libs +lzma" - -RDEPEND=">=sys-fs/fuse-2.4:0 - sys-libs/zlib - app-arch/bzip2 - lzma? ( app-arch/xz-utils )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_configure() { - econf \ - --enable-fuse \ - --enable-library \ - --enable-shared \ - --with-system-zlib \ - --with-system-bzlib \ - $(use_enable static-libs static) \ - $(use_with lzma xz) -} - -src_install() { - default - - # remove cruft - rm "${D}"/usr/bin/{davpass,ftppass} || die - - # install docs - dodoc doc/{api-overview,background,FORMAT,INSTALL.*,README.avfs-fuse} - dosym ../../../$(get_libdir)/avfs/extfs/README /usr/share/doc/${PF}/README.extfs - - docinto scripts - dodoc scripts/*pass - - find "${ED}" -name "*.la" -delete || die -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]]; then - einfo "This version of AVFS includes FUSE support. It is user-based." - einfo "To execute:" - einfo "1) as user, mkdir ~/.avfs" - einfo "2) make sure fuse is either compiled into the kernel OR" - einfo " modprobe fuse or add to startup." - einfo "3) run mountavfs" - einfo "To unload daemon, type umountavfs" - einfo - einfo "READ the documentation! Enjoy :)" - fi -} diff --git a/sys-fs/avfs/avfs-1.1.4.ebuild b/sys-fs/avfs/avfs-1.1.4.ebuild index ce013d95c46b..f8c5a0ef0f50 100644 --- a/sys-fs/avfs/avfs-1.1.4.ebuild +++ b/sys-fs/avfs/avfs-1.1.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/avf/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86" IUSE="lzip +lzma webdav +zstd" RDEPEND=" diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest index f1d453ce4bbd..502b89019992 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -1,17 +1,13 @@ -AUX 5.15-filesystem-usage-chunks.patch 2797 BLAKE2B f9f0c709fcef2aa33ba404b14f8b68f8a46d07df489d05a5979c662ea20d7dc0dd7d2c39d305b513a85eaa296061f455fa33b6cce9afbd704077f385c3772e0f SHA512 9dfff219943e7d223795e24aeaf9c3f82a1530b5fe7a7b74df27176e3e52f8a3ee30af74f9b1f59689cd0e5acf274b5eeb2e2c14d0d49e23e716fd7042a5beba -AUX 5.15-filesystem-usage-data.patch 1381 BLAKE2B cf9f6b87eb75f61ce79441227d7a55e0b3b2e4317a244469f8d1e0d92e1c06b5aebeb867d2d032c5230a47a7737b1d06c58a9d753c1dc0f0537f713ae51c16e6 SHA512 f0216410964f9d15a74fa787ee01c5b7ddd6266626bbeac6e6560cdac7043c5b091dbaf054e4112639d2819744b02fd51a95ac6394702ec1602a49e29c653588 AUX 5.16-linux-headers-before-5.11.patch 1545 BLAKE2B 2e0f333d8ba42a45cde8089070e7c020d34ccff0ceb80d9ef9caf0db46a9021e61fa97013960d21c3a74a4e5ea6542571f4ab2ac87d67486bab4d4a785420986 SHA512 62b816a18a73efca0886a8a7bf817e672d99475d279ef060cb89617d54975122aaa67e618635b759132d63541dfdccebca01067650e925723d7730a444de4397 DIST btrfs-progs-v5.10.1.tar.xz 2204164 BLAKE2B ed83729754f9abd22d4d2e7ae9a7e90e80be9b63d49a4a9692e20e5939467dbd864834b71495661e1c7a1fca89e253a62fbda37f1d01d2eadecb13f5904f0dd0 SHA512 32e5b8bda1863e34613802db91946f240b2cde21288ff8f95c1807e7afd0a67c5a704aa4d2bc0d7b1ca094de6831adbfec83fe61f74e1caf6d1975be7d972f2d -DIST btrfs-progs-v5.14.2.tar.xz 2252600 BLAKE2B 74ac21bc9bbc70a4034b6a439afbd0c0ab023ac7815c1cae1e7ac81c4239684d41be06bebe1d015dc2a0ba80cf0975e8f6da7e111b2825eb1a7814d1832914eb SHA512 dc1a73e49dd94ccd8128c197d99f112977b16350d22bc0ca32247211314a3fec66de73827305bf24ef8e0571fc890f00378d0ec3a82988f0ee54f5db10f6578c DIST btrfs-progs-v5.15.1.tar.xz 2280796 BLAKE2B b460254a6261d3d04a2d265a3b4e05a89385888f7ea4f2b16ec5b73922646c7f47a546fc78ba7c009e65914125435cf38157eabffc74f5d00df2c21c844922e3 SHA512 68ed89e337ae857fdaf077eaa889e259e9f162ea2222bdaa03f4187783a8682c24d45c91b0559b901d81429ba2cd3f84087d032d354092d5512fb226bdf91549 -DIST btrfs-progs-v5.15.tar.xz 2275480 BLAKE2B 45fa1e20d14bdd92b1a7761771c7b6c2795d885f91fb44c9c5cf9c735c0c6c0f319e701ca2f6bf19191c50552459287042b56d4308fcc2da5bd566e63c755941 SHA512 5fc182c490733cbe7f2cdb8e131e0c79e5cc374ae32427d5f9ee2251e00e6e1d8ba0fdbbe31d50230f2bded08a9b9c652a4288998a427643a2d738f57ce72f90 DIST btrfs-progs-v5.16.2.tar.xz 2334464 BLAKE2B a21809a840107c370f1598e19f8b07d8bdd704e8ff3ce4cb78431000e7560802e1047d8200c523a45a761d59a311f1ec384946bd585826a129b05a1a5fd0250e SHA512 c89a763e8b099e0e9d04ff239dfee156a15fc783c515bbd48597f5645f720c377dbb4f2dfe9065971a65d3ade9d8fcb24cf37d527811bf4204153a06f7c8c3a7 DIST btrfs-progs-v5.16.tar.xz 2327376 BLAKE2B 3bb3b630d465068373bf39776389f733e734cb39801b389a4e94ba2bb325e9625e2cd767c783e4a05e1e18fed92c06190c5d3fbb476b57689a16482357c86b61 SHA512 3ba557134b19f1abb6c63bf3e2092852f92e988677c4bcf9421c824824b87565ae5cc0e5bca0370be81766a8c8fbda21dfb443dcd159f705f31e70b6bf19aa63 +DIST btrfs-progs-v5.17.tar.xz 2286016 BLAKE2B 013acc4f9ec294d8d88b04e9f0ee33c450bfa6621b029005d18885add7c0a1da7e645c1f984931749ebd8f3166e8d849ec128a0f95cc189c15878d45acc0901b SHA512 4c2bfafe0fcae47f01bad41910c2e2b3d48a12b88ca1891a9ea63ac1e65699c2e22f481492c7dd11fbea546647ab78718ab9b6997bb257fc29d1482fde9b08d1 EBUILD btrfs-progs-5.10.1-r1.ebuild 2981 BLAKE2B 0c1e13d87b5119c171447e3eebc0fe9439da77a7d05ae0b1130eb8904c24081716e6f15dcb39f700abbe68a0431331c78c18a9253cb631998e61a842bbbe9791 SHA512 715d72ae20791fa701e3116ae7540be89c6761cbee1b42589881482e3abab6d5f9621fcba2b22166ac858466fe821b1af32284a0eea0a25ec8d9b3f63518a7c7 -EBUILD btrfs-progs-5.14.2.ebuild 3020 BLAKE2B cc9ea2671ef95528d17529556c6ae00cda5d2386c35c93e1bd07909775393dd208df0b28269935fdab8d049611dcb3b1ec4e1561346058e94166703cdf8f0a84 SHA512 c063048685057d687f99516f770789a3919e6354d7279999ffab70c05511b08ab632f888ed4a9b1d7870acd2a8bdccda9b9e4e1abec0b3c83fda3d8578eda374 -EBUILD btrfs-progs-5.15-r1.ebuild 3183 BLAKE2B fc00b7541d5f2e34cb7934e689ad07f6acc9a1543dfe9f236bb34e216f2afcb8cb38660ccf0804ffc9f2e558ab5a761945dbe16a9d2241f2941f5a38cfb39016 SHA512 523711eeec516e8d2c2e10b79c8cc2c10b5a06e730338e2a2176e0ac8de82c625dfbe19985c8cc81d8a0c46ae11425fb86082d826de9cb977d435795918c0705 EBUILD btrfs-progs-5.15.1.ebuild 3019 BLAKE2B 2617d6d8b08f71e28b94243d75b6110a147edca8f73a097a01986c3e9b771a899bd94bef34d1037cd372fb18226e26e8d8a1587aa7dc44799cf19a4b4f1c0c21 SHA512 e2e75f4d2670faff35310a776cc375e64d1a967fb879bc0e37ecb48d13673be6e19da392855ba1d9c6c7ecbef30e887ad951705c986fb71eaf0c1abae6c4e922 -EBUILD btrfs-progs-5.16.2.ebuild 3067 BLAKE2B a90f38e3dbb10a1cf93810220d41a5892ac7d0438ed253257ecd454b566bdcad362cc3414efca938e44da1c0faf76531edcba9cef32c8ac3a4eaf7dbe952e021 SHA512 19b1c75abd55142c9eb367673af7b45b1d86fd0985951402e6cae66e5b482af2157e6a26d25e3ea2ba23bb2c5e8c58e1f7af416e7cdf8ce148824c468bb1cf3b +EBUILD btrfs-progs-5.16.2.ebuild 3074 BLAKE2B 55a72f9fbc7d61bed468e1a2d545c18ab9f9cf88a4880e508a75ab25673adfda3d9f376b203e62d93da6164782fc4d17c29e62385736d5252e74531c3cc7fd60 SHA512 19ba56e736a3f390e722b915c2b50f40657dbdf69e9e613b787721ab727ae5e025d0a076e1f94c3791aa0f91659399edc10f3eb1c7551163811c0d992eea9799 EBUILD btrfs-progs-5.16.ebuild 3090 BLAKE2B 210cf293d434288818fcd88116ddc2ece4254ab6b6f0d027d0f7e5d777448ae01fe81dd5b1cb31a6690bd6909a29a763d573a49c5ebdca191ebbb7ea84bf986b SHA512 5d2b24a3b9878ac6b51d7f84f6630357f56e6b42f27ef8877df953778fef28ebd6aa693023bfdb1bbfbf1f3146dc13b3c52a9763612138e79140a3288bd0bbc9 -EBUILD btrfs-progs-9999.ebuild 3067 BLAKE2B a90f38e3dbb10a1cf93810220d41a5892ac7d0438ed253257ecd454b566bdcad362cc3414efca938e44da1c0faf76531edcba9cef32c8ac3a4eaf7dbe952e021 SHA512 19b1c75abd55142c9eb367673af7b45b1d86fd0985951402e6cae66e5b482af2157e6a26d25e3ea2ba23bb2c5e8c58e1f7af416e7cdf8ce148824c468bb1cf3b +EBUILD btrfs-progs-5.17.ebuild 3048 BLAKE2B 0e98e5faaed1f27b9c9dea9de8c0d267c531a034713f5f53654d18482de4af21491ddec6f8ff6ca75dc631abb0ba8457ee9e05749868de6f70dad4c4e4212b0d SHA512 44c6e94c8ea05033ca8c60a2b9e42876c47bb5de5b46c0ecea087257e78e47d7e462b932fee3294258c213edc38927ced944000e5d4090e5915cafaffab0ea44 +EBUILD btrfs-progs-9999.ebuild 3074 BLAKE2B 55a72f9fbc7d61bed468e1a2d545c18ab9f9cf88a4880e508a75ab25673adfda3d9f376b203e62d93da6164782fc4d17c29e62385736d5252e74531c3cc7fd60 SHA512 19ba56e736a3f390e722b915c2b50f40657dbdf69e9e613b787721ab727ae5e025d0a076e1f94c3791aa0f91659399edc10f3eb1c7551163811c0d992eea9799 MISC metadata.xml 524 BLAKE2B 4e27833128aeb064271af7a4f3c05699b4603b1d993b32bef3d9d973182d3d0c88ac799c95f0f35495e9a99e645627afd96049273c08c3e1334d8fe1ccf0debe SHA512 471014a98bc3feb75e7930485e89daf6cb3390c37a330b8373d5c3b0b764b9180cbff133839ce4742a3c76f63e6f18895060d5906e6a113d2cd43af0df3b0d5a diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.15-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.15-r1.ebuild deleted file mode 100644 index ec22d07e7854..000000000000 --- a/sys-fs/btrfs-progs/btrfs-progs-5.15-r1.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 2008-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..9} ) - -inherit bash-completion-r1 python-single-r1 - -libbtrfs_soname=0 - -if [[ ${PV} != 9999 ]]; then - MY_PV="v${PV/_/-}" - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" - SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" - S="${WORKDIR}/${PN}-${MY_PV}" -else - WANT_LIBTOOL=none - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" - EGIT_BRANCH="devel" -fi - -DESCRIPTION="Btrfs filesystem utilities" -HOMEPAGE="https://btrfs.wiki.kernel.org" - -LICENSE="GPL-2" -SLOT="0/${libbtrfs_soname}" -IUSE="+convert doc python reiserfs static static-libs +zstd" - -RESTRICT=test # tries to mount repared filesystems - -RDEPEND=" - dev-libs/lzo:2= - sys-apps/util-linux:0=[static-libs(+)?] - sys-libs/zlib:0= - convert? ( - sys-fs/e2fsprogs:= - reiserfs? ( - >=sys-fs/reiserfsprogs-3.6.27 - ) - ) - python? ( ${PYTHON_DEPS} ) - zstd? ( app-arch/zstd:0= ) -" -DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-5.10 - convert? ( sys-apps/acl ) - python? ( - $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_USEDEP}] - ') - ) - static? ( - dev-libs/lzo:2[static-libs(+)] - sys-apps/util-linux:0[static-libs(+)] - sys-libs/zlib:0[static-libs(+)] - convert? ( - sys-fs/e2fsprogs[static-libs(+)] - reiserfs? ( - >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] - ) - ) - zstd? ( app-arch/zstd:0[static-libs(+)] ) - ) -" -BDEPEND=" - doc? ( - || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) - app-text/docbook-xml-dtd:4.5 - app-text/xmlto - ) -" - -if [[ ${PV} == 9999 ]]; then - DEPEND+=" sys-devel/gnuconfig" -fi - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# https://github.com/kdave/btrfs-progs/issues/422 -PATCHES=( - "${FILESDIR}/${PV}-filesystem-usage-data.patch" - "${FILESDIR}/${PV}-filesystem-usage-chunks.patch" -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - if [[ ${PV} == 9999 ]]; then - AT_M4DIR=m4 eautoreconf - mkdir config || die - local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" - [[ -e ${automakedir} ]] || die "Could not locate automake directory" - ln -s "${automakedir}"/install-sh config/install-sh || die - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die - fi -} - -src_configure() { - local myeconfargs=( - --bindir="${EPREFIX}"/sbin - $(use_enable convert) - $(use_enable doc documentation) - $(use_enable elibc_glibc backtrace) - $(use_enable python) - $(use_enable static-libs static) - $(use_enable zstd) - --with-convert=ext2$(usex reiserfs ',reiserfs' '') - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - emake V=1 all $(usev static) -} - -src_install() { - local makeargs=( - $(usex python install_python '') - $(usex static install-static '') - ) - emake V=1 DESTDIR="${D}" install "${makeargs[@]}" - newbashcomp btrfs-completion btrfs - use python && python_optimize - - # install prebuilt subset of manuals - use doc || doman Documentation/*.[58] -} diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.16.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.16.2.ebuild index 1b6912e602ee..b9b56b46d14f 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-5.16.2.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-5.16.2.ebuild @@ -13,7 +13,7 @@ libbtrfs_soname=0 if [[ ${PV} != 9999 ]]; then MY_PV="v${PV/_/-}" [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" S="${WORKDIR}/${PN}-${MY_PV}" else diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.14.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.17.ebuild index 36548f98db8a..70f276f2ea37 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-5.14.2.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-5.17.ebuild @@ -1,25 +1,28 @@ -# Copyright 2008-2021 Gentoo Authors +# Copyright 2008-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8..9} ) +PYTHON_COMPAT=( python3_{8..10} ) -inherit bash-completion-r1 python-single-r1 +inherit bash-completion-r1 python-single-r1 udev libbtrfs_soname=0 if [[ ${PV} != 9999 ]]; then MY_PV="v${PV/_/-}" - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" - S="${WORKDIR}/${PN}-${MY_PV}" + + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + fi + + S="${WORKDIR}"/${PN}-${MY_PV} else - WANT_LIBTOOL=none - inherit autotools git-r3 EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" EGIT_BRANCH="devel" + WANT_LIBTOOL="none" + inherit autotools git-r3 fi DESCRIPTION="Btrfs filesystem utilities" @@ -29,12 +32,13 @@ LICENSE="GPL-2" SLOT="0/${libbtrfs_soname}" IUSE="+convert doc python reiserfs static static-libs +zstd" -RESTRICT=test # tries to mount repared filesystems +# Tries to mount repaired filesystems +RESTRICT="test" RDEPEND=" dev-libs/lzo:2= - sys-apps/util-linux:0=[static-libs(+)?] - sys-libs/zlib:0= + sys-apps/util-linux:=[static-libs(+)?] + sys-libs/zlib:= convert? ( sys-fs/e2fsprogs:= reiserfs? ( @@ -42,7 +46,7 @@ RDEPEND=" ) ) python? ( ${PYTHON_DEPS} ) - zstd? ( app-arch/zstd:0= ) + zstd? ( app-arch/zstd:= ) " DEPEND="${RDEPEND} >=sys-kernel/linux-headers-5.10 @@ -62,19 +66,19 @@ DEPEND="${RDEPEND} >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) - zstd? ( app-arch/zstd:0[static-libs(+)] ) + zstd? ( app-arch/zstd[static-libs(+)] ) ) " BDEPEND=" doc? ( - || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) app-text/docbook-xml-dtd:4.5 app-text/xmlto + dev-python/sphinx ) " if [[ ${PV} == 9999 ]]; then - DEPEND+=" sys-devel/gnuconfig" + BDEPEND+=" sys-devel/gnuconfig" fi REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -86,27 +90,32 @@ pkg_setup() { src_prepare() { default if [[ ${PV} == 9999 ]]; then - AT_M4DIR=m4 eautoreconf + AT_M4DIR="m4" eautoreconf + mkdir config || die local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" [[ -e ${automakedir} ]] || die "Could not locate automake directory" + ln -s "${automakedir}"/install-sh config/install-sh || die - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die + ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die + ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die fi } src_configure() { local myeconfargs=( --bindir="${EPREFIX}"/sbin + $(use_enable convert) $(use_enable doc documentation) $(use_enable elibc_glibc backtrace) $(use_enable python) $(use_enable static-libs static) $(use_enable zstd) + --with-convert=ext2$(usex reiserfs ',reiserfs' '') ) + econf "${myeconfargs[@]}" } @@ -119,10 +128,17 @@ src_install() { $(usex python install_python '') $(usex static install-static '') ) + emake V=1 DESTDIR="${D}" install "${makeargs[@]}" + newbashcomp btrfs-completion btrfs + use python && python_optimize - # install prebuilt subset of manuals + # Install prebuilt subset of manuals use doc || doman Documentation/*.[58] } + +pkg_postinst() { + udev_reload +} diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild index 1b6912e602ee..b9b56b46d14f 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild @@ -13,7 +13,7 @@ libbtrfs_soname=0 if [[ ${PV} != 9999 ]]; then MY_PV="v${PV/_/-}" [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" S="${WORKDIR}/${PN}-${MY_PV}" else diff --git a/sys-fs/btrfs-progs/files/5.15-filesystem-usage-chunks.patch b/sys-fs/btrfs-progs/files/5.15-filesystem-usage-chunks.patch deleted file mode 100644 index be58afc8712c..000000000000 --- a/sys-fs/btrfs-progs/files/5.15-filesystem-usage-chunks.patch +++ /dev/null @@ -1,94 +0,0 @@ -From: Nikolay Borisov <nborisov@suse.com> -To: linux-btrfs@vger.kernel.org -Cc: Nikolay Borisov <nborisov@suse.com> -Subject: [PATCH] Fix calculation of chunk size for RAID1/DUP profiles -Date: Tue, 16 Nov 2021 16:02:06 +0200 -Message-Id: <20211116140206.291252-1-nborisov@suse.com> -List-ID: <linux-btrfs.vger.kernel.org> - -Current formula calculates the stripe size, however that's not what we want -in the case of RAID1/DUP profiles. In those cases since chunkc are mirrored -across devices we want the full size of the chunk. Without this patch the -'btrfs fi usage' output from an fs which is using RAID1 is: - - <snip> - - Data,RAID1: Size:2.00GiB, Used:1.00GiB (50.03%) - /dev/vdc 1.00GiB - /dev/vdf 1.00GiB - - Metadata,RAID1: Size:256.00MiB, Used:1.34MiB (0.52%) - /dev/vdc 128.00MiB - /dev/vdf 128.00MiB - - System,RAID1: Size:8.00MiB, Used:16.00KiB (0.20%) - /dev/vdc 4.00MiB - /dev/vdf 4.00MiB - - Unallocated: - /dev/vdc 8.87GiB - /dev/vdf 8.87GiB - - -So a 2 gigabyte RAID1 chunk actually will take up 4 gigabytes on the actual disks -2 each. In this case this is being miscalculated as taking up 1gb on each device. - -This also leads to erroneously calculated unallocated space. The correct output -in this case is: - - <snip> - - Data,RAID1: Size:2.00GiB, Used:1.00GiB (50.03%) - /dev/vdc 2.00GiB - /dev/vdf 2.00GiB - - Metadata,RAID1: Size:256.00MiB, Used:1.34MiB (0.52%) - /dev/vdc 256.00MiB - /dev/vdf 256.00MiB - - System,RAID1: Size:8.00MiB, Used:16.00KiB (0.20%) - /dev/vdc 8.00MiB - /dev/vdf 8.00MiB - - Unallocated: - /dev/vdc 7.74GiB - /dev/vdf 7.74GiB - - -Fix it by only utilising the chunk formula for profiles which are not RAID1/DUP. - -Signed-off-by: Nikolay Borisov <nborisov@suse.com> ---- - cmds/filesystem-usage.c | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/cmds/filesystem-usage.c b/cmds/filesystem-usage.c -index 6195f633da44..5f2289a9b40d 100644 ---- a/cmds/filesystem-usage.c -+++ b/cmds/filesystem-usage.c -@@ -805,11 +805,17 @@ int load_chunk_and_device_info(int fd, struct chunk_info **chunkinfo, - */ - static u64 calc_chunk_size(struct chunk_info *ci) - { -- u32 div; -+ u32 div = 1; - -- /* No parity + sub_stripes, so order of "-" and "/" does not matter */ -- div = (ci->num_stripes - btrfs_bg_type_to_nparity(ci->type)) / -- btrfs_bg_type_to_sub_stripes(ci->type); -+ /* -+ * The formula doesn't work for RAID1/DUP types, we should just return the -+ * chunk size -+ */ -+ if (!(ci->type & (BTRFS_BLOCK_GROUP_RAID1_MASK|BTRFS_BLOCK_GROUP_DUP))) { -+ /* No parity + sub_stripes, so order of "-" and "/" does not matter */ -+ div = (ci->num_stripes - btrfs_bg_type_to_nparity(ci->type)) / -+ btrfs_bg_type_to_sub_stripes(ci->type); -+ } - - return ci->size / div; - } --- -2.17.1 - - diff --git a/sys-fs/btrfs-progs/files/5.15-filesystem-usage-data.patch b/sys-fs/btrfs-progs/files/5.15-filesystem-usage-data.patch deleted file mode 100644 index f3b43d5c594d..000000000000 --- a/sys-fs/btrfs-progs/files/5.15-filesystem-usage-data.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 2f3950c8304fec2aed9bf11b52d073683b137330 Mon Sep 17 00:00:00 2001 -From: Nikolay Borisov <nborisov@suse.com> -Date: Mon, 15 Nov 2021 11:15:42 +0200 -Subject: [PATCH] btrfs-progs: fi usage: don't reset ratio to 1 if we don't - have RAID56 profile - -Commit 80714610f36e ("btrfs-progs: use raid table for ncopies") -slightly broke how raid ratio are being calculated since the resulting -code would always reset ratio to be 1 in case we didn't have RAID56 -profile. The correct behavior is to simply set it to 0 if we have RAID56 -as the calculation is different in this case and leave it intact -otherwise. - -This bug manifests by doing all size-related calculation for 'btrfs -filesystem usage' command as if all block groups are of type SINGLE. Fix -this by only resetting ratio 0 in case of RAID56. - -Issue: #422 -Signed-off-by: Nikolay Borisov <nborisov@suse.com> -Signed-off-by: David Sterba <dsterba@suse.com> ---- - cmds/filesystem-usage.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/cmds/filesystem-usage.c b/cmds/filesystem-usage.c -index e22efe3a4..bac0f0fd5 100644 ---- a/cmds/filesystem-usage.c -+++ b/cmds/filesystem-usage.c -@@ -508,8 +508,6 @@ static int print_filesystem_usage_overall(int fd, struct chunk_info *chunkinfo, - */ - if (flags & BTRFS_BLOCK_GROUP_RAID56_MASK) - ratio = 0; -- else -- ratio = 1; - - if (ratio > max_data_ratio) - max_data_ratio = ratio; diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest index 2f4d8beaa176..ab31b13d83ab 100644 --- a/sys-fs/cryfs/Manifest +++ b/sys-fs/cryfs/Manifest @@ -3,5 +3,5 @@ AUX cryfs-0.10.2-unbundle-libs.patch 15634 BLAKE2B dc484cc722cf80e605f52f3b193b1 AUX cryfs-0.10.3-fix-build-with-boost-1-77.patch 639 BLAKE2B c03de4feed91e4182bcc9e68c294b15bf5715f06e38e21ced9e27a0bb96f9cb4546ec2eca5b0ae106724e797cbe0f734fb311bd13361248043f590e5a2c61c8f SHA512 e67f0dd1c0b08c062db75ff354124cc2f346efd0141439af78c9ade1019937af91ccd5c5c06ade89889d9b2a9ac5d01afbcec33a22ec454120918329a9ee60e2 AUX cryfs-0.10.3-gcc11.patch 14590 BLAKE2B c6541d1e211c9ae503ee83be18dd2283f2ac5785f5a975fcd155b02759f6180eb96b8673d98c71e20c101ac4afa4ceaab4c6ece14c6605e32f5c020f260568bc SHA512 4fa2817c9f10df4e371deb7fb4acc423dd8260277216cf959ace47d64bebe394db71c79cd72098c6b11ac27b88d98eab8b5cde5af5095a63d57dc88d7dea7085 DIST cryfs-0.10.3.tar.xz 7908228 BLAKE2B e1c816bd2ceb125573f5385c6ddb316a600275f0b907d89d3ab32f2050f1a0874ebbfd3db7b452b41d20dcbdd01bf59210a0a96c5bfee079ce222307d4c55596 SHA512 a1325c79cb253219bb092fd68399d6ec68aaf3d78bc95608582ab0c239dfaa0361416531cd1051661e4699b1e79867547710ea55d23e5697ebd4421c937d5b87 -EBUILD cryfs-0.10.3-r1.ebuild 2320 BLAKE2B 503a13941bd1fabc274921702634bd575d08615a3a9749921f068bc12d03afc6ef66f15515f2807a80d6a2544fef79f3bb69532ecf1422d894833844e8a4e95a SHA512 30cbb54d4a7f1323d8330937e81149e6e0e9c0f8b7b46c8e8688b51427dd40192830e0dd252c77ace2b196a9739ed2cb610dab85acbf6d39c9eaa5688880e097 +EBUILD cryfs-0.10.3-r1.ebuild 2321 BLAKE2B 8d16389c2d55aa809cc584a84f1dc7e31673ec87bd55906a595d77522436eee2a351fb27b184d7992e20fb0326839e82f740f823d0d6f521f6d8dae13eda0710 SHA512 40fc4a40b39a0eb8ebce13be9baf5691fcc2dea281c0e3644ec7177c54b44d7b798364befe48517bbb66d5b5544fbd2e75a6ebf820a40e8b86bccaa85e5aba85 MISC metadata.xml 416 BLAKE2B b741d80131fbeac4c8659847bc206aad10c2ade82bb63bf1233542b0d9d6a2a0d3aee2b09aad9d7ef0f5dfb0ef1f9d065ae51c0884ef9a89479fcb99df912650 SHA512 4d38d4f4d0f5870d4cf6b1f86fbafe7327b6b799c8fe32d37fcd00d47b3d02f39f4725aa1bd205d2e141fa287427fb1a8f47206c25d2b8973135b6cd44735395 diff --git a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild index 199c5a6badd1..f209908d30e4 100644 --- a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild +++ b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit cmake flag-o-matic linux-info python-any-r1 if [[ ${PV} == 9999 ]] ; then diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest index 2956f1196aa7..25c5e9b63e21 100644 --- a/sys-fs/cryptsetup/Manifest +++ b/sys-fs/cryptsetup/Manifest @@ -3,6 +3,6 @@ AUX 2.4.0-dmcrypt.rc 9059 BLAKE2B 622320bd69a9e2d2779bd0eb97034635335125d2def73f AUX 2.4.3-dmcrypt.confd 4306 BLAKE2B 107697c85548a8c5f1f4ffc1ae6ec785bcb9c63a55e52a97fd24c1a3c5e7867d031f494030a27be1efb8eab448a94e466c186c964b2638fd4d95250005fbf31d SHA512 d80701d1507c682d619e2ec433bebab2d64cc3e27c5ddc2e7c8408e07dcd353b4d66e9b8505719fa88fa734d7a7930fc90f5b8279e185580c3c038ac7ef7a02a AUX 2.4.3-dmcrypt.rc 9693 BLAKE2B a426ad90c9e4540a82873cd3a1594def778063c97278b2f82cfefd79cedecda97f1b6038775ce34433ba25519e3fb565bc0b79eedb39b46080a2fec68d564a99 SHA512 9f2ff42e0ef1ab3046b545c550153e13ae7d2446560b4154c23e32ca2dd8c2871e68b07bf8cc273c18730ad6e13b50b07aadb91ae7f43077ab08bdce01db5323 DIST cryptsetup-2.4.3.tar.xz 11242152 BLAKE2B f5859d794d626cb19426a2c9afc4655fac3a1bae462daa42b37b925882804d5146aadff8733799dea89dcfdc311e628e5b806754495824705709ba105f91682f SHA512 2d52498497be37a837126d9cdc9b6331236eccf857c3482fe3347eb88fccc3cd0fd3d8b4490569603e18cfaa462431ae194bce0328f3eafa8bfe3e02e135a26e -EBUILD cryptsetup-2.4.3-r1.ebuild 4212 BLAKE2B b79ac99dd69703e8d4587f71a14007189705c007d8d17c339d5595d00918eeebcef12c833c50e9975c1ec738acee4ec29d4b5d1266103c705715b674690d5eee SHA512 78310bffcfb1c3007481ebf47d556c46e78c046c58130368b5f3090df4c1f5d643299e8204ca0b5823ce01634f7147c4132acba86c78f003fdaa7ff9124221fe +EBUILD cryptsetup-2.4.3-r1.ebuild 4219 BLAKE2B f2f0194dc69ad7ae321023e4d06a489ec6fefbb9acba1bf967fd0f153aa5cad568722caa53a717bceca47e7ab36d23454eb8af1e03e1a35627477759238006a6 SHA512 e057ea860c061034a94d341b906cef74cdf4efc323484631ff70d5947cfd6c4d563b30a5c5eb07cbdc5350d2f8cc8bd3445d5bbd08f8ffa410755b845712ef89 EBUILD cryptsetup-2.4.3.ebuild 4172 BLAKE2B 769f38ca8f374b8e08916ab3d7baa4a5bbb250d8fd4dc7f58b8f6a00a062b7def3e033a89781227f1edb15111da7b005dce2e5fe012d747f56d2e995f313baeb SHA512 d671d6d91158d2233b85b026f82fcfb79bf72d8bc0434bfe18cd803d974310c9962bcb4c98bd1bec23590fae7d073fea48bfbf2516322815a08a375679cec5fe MISC metadata.xml 1132 BLAKE2B 4e7b9a495fa1208119744ad84a75117ea3010e5ca2c55bc542017d280b35e8a2b7f3b5f38e45373660c11ffe58e8bc2243e704513f1f80c2f32b7d33e032fb04 SHA512 5cb04665b058d4895969510f5ffd5bc4bf7d6c753a4c6a78b0be0b4468fc67d2aa2eec700ceb434d757721b0b9dc5a1f258806cbaf11bff5ba4ff40ebd576f86 diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild index f2ac3491ef69..339d9d761672 100644 --- a/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild +++ b/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t LICENSE="GPL-2+" SLOT="0/12" # libcryptsetup.so version [[ ${PV} != *_rc* ]] && \ -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" CRYPTO_BACKENDS="gcrypt kernel nettle +openssl" # we don't support nss since it doesn't allow cryptsetup to be built statically # and it's missing ripemd160 support so it can't provide full backward compatibility diff --git a/sys-fs/dosfstools/Manifest b/sys-fs/dosfstools/Manifest index 282c40e029e3..3ca874504015 100644 --- a/sys-fs/dosfstools/Manifest +++ b/sys-fs/dosfstools/Manifest @@ -1,3 +1,3 @@ DIST dosfstools-4.2.tar.gz 320917 BLAKE2B c55c7592aa80f1fe39e838c83e147ad7141ddd0f72c9c000ba7708ecb7287c3a92b4b52f72c8d0d1171b0f9609dfb7861bbbe475c5cbd7011151c93c2b1d3d0d SHA512 3cc0808edb4432428df8a67da4bb314fd1f27adc4a05754c1a492091741a7b6875ebd9f6a509cc4c5ad85643fc40395b6e0cadee548b25cc439cc9b725980156 -EBUILD dosfstools-4.2.ebuild 923 BLAKE2B ab06e47ad58b6fd88bd200c7a4ab408b1d15aea936ca6e2120f535ee8b2e50019ca5a0c2af6c0a81aa18865a7b439ed613eadae38cd1427ab6d44894057dcb6d SHA512 4830af78f5b1e7c017505b19d22115b0e31acec31ef1c8939fecba2f1399425657538b0079755e8418fe6cf28d34a3d9a40f6ecb89a1968a6bc8312e8c638457 +EBUILD dosfstools-4.2.ebuild 930 BLAKE2B 1ea42c850cbbd29b66f1069bb48f072c5c4329040e0b8c33b8d9a30c26504dd8b8fb96ddb70ff82d76bfa66369a0f44ed53007daab4fe0808804e70eae937f3d SHA512 8d6ab0320f4cf0a077b282f549d8d6a4297f7804faeb90d59800e18b05a16c2b05ef35b0440a660a8a1ec8909b9d1dbfacc2d91473323e6514b0f8fb3661dde2 MISC metadata.xml 497 BLAKE2B c2133e8e9cacc48ae4cad373a4414ab5b3884b640eac5ffd7bf88b08ee8c741c43dcfd9a8c339cbdeb37354e424580beb058b79c58440ce85d1b1ce53a94b57b SHA512 b8e2647a85edd7cffbe3fd91560ad8c0c6f4aaf66b67db9d41268ec17001ded8da4a9e7aefdcae00737e7ece5f7cd1e47f9101dc3323d4679d059043c1d686d4 diff --git a/sys-fs/dosfstools/dosfstools-4.2.ebuild b/sys-fs/dosfstools/dosfstools-4.2.ebuild index b26ba281f342..7cb014173b17 100644 --- a/sys-fs/dosfstools/dosfstools-4.2.ebuild +++ b/sys-fs/dosfstools/dosfstools-4.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${P}. LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="compat +iconv test" RESTRICT="!test? ( test )" diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest index a754e47b6f78..8a856b11fd95 100644 --- a/sys-fs/e2fsprogs/Manifest +++ b/sys-fs/e2fsprogs/Manifest @@ -1,9 +1,6 @@ AUX e2fsck.conf 138 BLAKE2B b97a754b6aebf1f7fcd4001b720eead61d183eaf5a2c9eb86e8304f5958b034697ac52f4c40b0225c9c404ca7b9fe5bd3f130d9ebf8faf38815050d945524d3c SHA512 d10a8ef566a60815b6f65414d84d23f3ec535c2a93cd780d4425488465f4eff6910c20d0163d1b7d334e9f4c707beab35bf63078b9ec3a5602763ea219bddbef -AUX e2fsprogs-1.40-fbsd.patch 352 BLAKE2B efef09c11bdf6ebeb89819dfefec241919afa17ddee65610332bcd3edbacad4fa501def1d224de39fd6a9979a35e63699b0a2d5e9a2242517122339b68edf6af SHA512 86374e641f958d7c4b53eb44abf7933af064b55a38fef6ca26f848bb63f0c6bf2966852c7cf0770337aef95ff965de95ef282205771e86be36e7ad74e8f81146 AUX e2fsprogs-1.42.13-fix-build-cflags.patch 290 BLAKE2B b37f9fd204bd35631776d68dda5cc9defb5e2bc54e0061778e5bea4886820829605cb092bb40a7f65cd0626d8ffe689bd1c8aad7d29f7c67e5166dd578925ddb SHA512 fed2a8502fafb56a21c88d680a42848bdc8921b228f74842ce3f702279917b6e6c0d1204ee060ea0d2d5ebb02465fc1f3d1a4304068a59b45bf1ddfbdfd46507 AUX e2fsprogs-1.46.5-parallel-make.patch 1646 BLAKE2B f3e0158afa723e436a5b4004a6e331c4ad2405f9d4e25ab4a11baaa7ac88d120362d004a69067850ae1ebdc437eef586e381101f9e96736a4e707cf2d18fe6f6 SHA512 c5cb7d01293465621e90e0807b6dad32b2f0105686d91bb886935967eb184463036d34dfc716da1a92c75bfe99300d07a84a7770499b6f38ecee15fbc0f9905b -DIST e2fsprogs-1.46.4.tar.xz 7035200 BLAKE2B 473f7fd3f521b94cdaa68e37784a518fc1919387dd114f31b5338f1b4c472f86b150229ec3dcae8b73eac95330c0dea729befc8cea08bcf1e455c0b6652d6d2b SHA512 7d9cfdf00ed58e66049585e8382fe4977088956421a0fb8155900c69afd8857309ad2b9301b3f74c9c0afa7287a0ddba2fd1538fcf57858b37a9ab712390016d DIST e2fsprogs-1.46.5.tar.xz 7040672 BLAKE2B 8d8c02e891c464782a7cff518c41d793fc73366b57e17d80ffc5afd96e6144e354290e667e9710509a9dde4e5dab7e7185c5bf084c5bfd26219f05e5e92e0830 SHA512 53282e1c524f62a95012b1aceef296d494f5238c82c9b08b29fbe6a803dbf7ccfdcd9124eb2f11fe2ff9de26387c78751a92c3217ca414f6db6242098a72d3fa -EBUILD e2fsprogs-1.46.4.ebuild 3435 BLAKE2B dbb124b159cd882564968c664ee91d2c5db14b814e5baba75cb4f923ec041b4826d280c0b7f633dd11c1bfcc92850182ea7aa3ac63a79d76cdba201bff7bbe7e SHA512 c091444159c4795ae180c966de199016b7cf2de484a95f6123ae11070d72aaa05cb523aa4b28536ba975f3c672a430476269a319843c593c567ba06d7de81671 -EBUILD e2fsprogs-1.46.5.ebuild 4212 BLAKE2B 5846066a51da6226a8269184e49fb0786347c9687c19454dddc9b06cd5bcae864ea304b3e7f8521ab823cf64b919b323988d211d5c01302f5516a574dc360ada SHA512 25756c2892a8ca9199ffafa7678a01ed57858ba3ea8fce6be65b0950368fe9bb65b1649bf4ca3d934cc4037e27f511a3f8b7865aee4d091536c6cc3b62f1dadf +EBUILD e2fsprogs-1.46.5-r1.ebuild 4356 BLAKE2B 83e304c0f1f189b3b746258fcfc77e72d307371655342e18d2eb888f9510ce256b9d6a791130a0cb18a10bf292f78f03ae5e3c417c6318b8757357144ddc6f19 SHA512 3d729a51e3bf3dc3bceda82240af399a601f6932b4746955d0f56e441c89e963d83d569b2a769b98abcb46eea5a476a2d0d26153a39adfc63c9fa563e580f63c MISC metadata.xml 782 BLAKE2B 6010ef2af50bc0ec4f7511d28e47cd6f0fc76e3ef88afed222f5a6775e3a1ac51940b2272c37713c0f594b10202391073776f1f8330bc9f45ce0c3a03548f135 SHA512 3a18335967f411f387ecdd066db068d05c90abd1af4a91b226d52a6b9507932528d006ef5e463a423bb635d88b12d81ca1e2d403bd9de2dd12c04a50abc94474 diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild deleted file mode 100644 index 225c1d41eb95..000000000000 --- a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript - -DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" -HOMEPAGE="http://e2fsprogs.sourceforge.net/" -SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz" - -LICENSE="GPL-2 BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="cron fuse lto nls static-libs +threads" - -RDEPEND="~sys-libs/${PN}-libs-${PV} - >=sys-apps/util-linux-2.16 - cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) - fuse? ( sys-fs/fuse:0 ) - nls? ( virtual/libintl )" -DEPEND="${RDEPEND}" -BDEPEND=" - nls? ( sys-devel/gettext ) - virtual/pkgconfig - sys-apps/texinfo -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.40-fbsd.patch - "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854 - - # Upstream patches (can usually removed with next version bump) -) - -src_prepare() { - default - - cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes" - - # Get rid of doc -- we don't use them. This also prevents a sandbox - # violation due to mktexfmt invocation - rm -r doc || die "Failed to remove doc dir" - - # blargh ... trick e2fsprogs into using e2fsprogs-libs - sed -i -r \ - -e 's:@LIBINTL@:@LTLIBINTL@:' \ - -e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \ - -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \ - MCONFIG.in || die "muck libs" #122368 - sed -i -r \ - -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \ - Makefile.in || die "remove subdirs" - ln -s $(which mk_cmds) lib/ss/ || die - - # Avoid rebuild - echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h -} - -src_configure() { - # Keep the package from doing silly things #261411 - export VARTEXFONTS="${T}/fonts" - - # needs open64() prototypes and friends - append-cppflags -D_GNU_SOURCE - - local myeconfargs=( - --with-root-prefix="${EPREFIX}" - $(use_with cron crond-dir "${EPREFIX}/etc/cron.d") - --with-systemd-unit-dir="$(systemd_get_systemunitdir)" - --with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d" - --enable-symlink-install - --enable-elf-shlibs - $(tc-has-tls || echo --disable-tls) - $(use_enable fuse fuse2fs) - $(use_enable nls) - --disable-libblkid - --disable-libuuid - --disable-fsck - --disable-uuidd - $(use_enable lto) - $(use_with threads pthread) - ) - ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}" - - if grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then - eerror "INTL sanity check failed, aborting build." - eerror "Please post your ${S}/config.log file as an" - eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096" - die "Preventing included intl cruft from building" - fi -} - -src_compile() { - emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds -} - -src_install() { - # need to set root_libdir= manually as any --libdir options in the - # econf above (i.e. multilib) will screw up the default #276465 - emake \ - STRIP=: \ - root_libdir="${EPREFIX}/usr/$(get_libdir)" \ - DESTDIR="${D}" \ - install - - einstalldocs - - insinto /etc - doins "${FILESDIR}"/e2fsck.conf - - # Move shared libraries to /lib/, install static libraries to - # /usr/lib/, and install linker scripts to /usr/lib/. - gen_usr_ldscript -a e2p ext2fs - - # configure doesn't have an option to disable static libs :/ - if ! use static-libs ; then - find "${ED}" -name '*.a' -delete || die - fi -} diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r1.ebuild index 1ba2b391588e..26512e0a9bf7 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r1.ebuild @@ -11,35 +11,36 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$ LICENSE="GPL-2 BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="cron fuse lto nls static-libs +threads +tools" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="cron fuse lto nls static-libs test +threads +tools" +RESTRICT="!test? ( test )" RDEPEND=" !sys-libs/${PN}-libs cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl ) - tools? ( >=sys-apps/util-linux-2.16 )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig + tools? ( sys-apps/util-linux )" +# For testing lib/ext2fs, lib/support/libsupport.a is required, which +# unconditionally includes '<blkid/blkid.h>' from sys-apps/util-linux. +DEPEND=" + ${RDEPEND} + test? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )" +BDEPEND=" + virtual/pkgconfig sys-apps/texinfo nls? ( sys-devel/gettext )" PATCHES=( - "${FILESDIR}"/${PN}-1.40-fbsd.patch "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854 # Upstream patches (can usually removed with next version bump) "${FILESDIR}"/${P}-parallel-make.patch ) -pkg_setup() { - if use tools ; then - MULTILIB_WRAPPED_HEADERS=( - /usr/include/ext2fs/ext2_types.h - ) - fi -} +MULTILIB_WRAPPED_HEADERS=( + /usr/include/ext2fs/ext2_types.h +) src_prepare() { default @@ -102,50 +103,44 @@ multilib_src_configure() { } multilib_src_compile() { - if ! multilib_is_native_abi || ! use tools ; then + if multilib_is_native_abi && use tools ; then + emake V=1 + else emake -C lib/et V=1 emake -C lib/ss V=1 - if use tools ; then - emake -C lib/ext2fs V=1 - emake -C lib/e2p V=1 - fi - return 0 + emake -C lib/ext2fs V=1 + emake -C lib/e2p V=1 fi - - emake V=1 } multilib_src_test() { - if multilib_is_native_abi ; then + if multilib_is_native_abi && use tools ; then emake V=1 check else + # required by lib/ext2fs's check target + emake -C lib/support V=1 + # For non-native, there's no binaries to test. Just libraries. emake -C lib/et V=1 check emake -C lib/ss V=1 check + emake -C lib/ext2fs V=1 check + emake -C lib/e2p V=1 check fi } multilib_src_install() { - if ! multilib_is_native_abi || ! use tools ; then + if multilib_is_native_abi && use tools ; then + emake STRIP=':' V=1 DESTDIR="${D}" install + else emake -C lib/et V=1 DESTDIR="${D}" install emake -C lib/ss V=1 DESTDIR="${D}" install - - if use tools ; then - emake -C lib/ext2fs V=1 DESTDIR="${D}" install - emake -C lib/e2p V=1 DESTDIR="${D}" install - fi - else - emake \ - STRIP=: \ - DESTDIR="${D}" \ - install - - # Move shared libraries to /lib/, install static libraries to - # /usr/lib/, and install linker scripts to /usr/lib/. - gen_usr_ldscript -a e2p ext2fs + emake -C lib/ext2fs V=1 DESTDIR="${D}" install + emake -C lib/e2p V=1 DESTDIR="${D}" install fi - gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid') + # Move shared libraries to /lib/, install static libraries to + # /usr/lib/, and install linker scripts to /usr/lib/. + gen_usr_ldscript -a com_err ss ext2fs e2p # configure doesn't have an option to disable static libs :/ if ! use static-libs ; then diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.40-fbsd.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.40-fbsd.patch deleted file mode 100644 index 7d0919600d05..000000000000 --- a/sys-fs/e2fsprogs/files/e2fsprogs-1.40-fbsd.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/lib/ext2fs/ext2_fs.h -+++ b/lib/ext2fs/ext2_fs.h -@@ -414,7 +414,7 @@ - - #define i_size_high i_dir_acl - --#if defined(__KERNEL__) || defined(__linux__) -+#if defined(__KERNEL__) || defined(__linux__) || defined(__FreeBSD__) - #define i_reserved1 osd1.linux1.l_i_reserved1 - #define i_frag osd2.linux2.l_i_frag - #define i_fsize osd2.linux2.l_i_fsize diff --git a/sys-fs/erofs-utils/Manifest b/sys-fs/erofs-utils/Manifest index 39108ea77cd7..731558140c20 100644 --- a/sys-fs/erofs-utils/Manifest +++ b/sys-fs/erofs-utils/Manifest @@ -2,5 +2,5 @@ AUX 1.4-dump-fix-de-nid-issues.patch 4849 BLAKE2B 48e29859955f5e7b13af7657a2411b AUX 1.4-fsck-add-missing-include.patch 878 BLAKE2B e7d32eced8199a6c282d7398cea068cf560d9715caf035c67127f25fdf7055492fe25c56703e166a683f40cbb7d6ed6723c5d97467bec22f67418bb9b3bcfc5b SHA512 4cffb6faf7e1bb8150347ba8e47e0b05ad1b7d5dd4eb265330a33d6054dc6157e780a38b80a17cb61d3ab1fb2b41f36fcf65c39846f30003bc6013d23028c1fa AUX 1.4-werror.patch 2523 BLAKE2B e794e82eb2bbc2bdc76cefb054e37a8e07a3ce1abb3d94dcbcbf115189e719677fbe18b965f1d84353853b0963ab188638634f6ebc5c32d4790ebbf0850a94a1 SHA512 3856b297ba273389e5db9ce859291ee1bbdacbeda4cdf560250f1721af81fa2037a9e3b06d955ed4caab795fec15428397cc6b03d81e79269ae963dbd0e7d51a DIST erofs-utils-1.4.tar.gz 93979 BLAKE2B aef1dca8cb95e6104d73a84590319d3c55aba1a4ef5dbdbf470662cb86ee1b66a5707dc1c453470115ec6f2bf1246ee4b6b28aa1cb83b4cb9c8eed45e88668d4 SHA512 ab95d6a7b2d278ee443d1e378c62354db66ce7ab5ce03b3a8d9004cf498c4e43e3e8ced6524444d2ea4871c4db0195489f033180c8a2082c2cba69c46c09692f -EBUILD erofs-utils-1.4.ebuild 1105 BLAKE2B 009f4ba623ae13fc62a6f7df85ec16c89997e3807be166641253f296d3a21d6905ee1cd53b12eb4cf6189fd2d52435d5cad699ffb9990137ea6195dc13b5231f SHA512 e461cac2cfebfd246566311949f4bd21179d390d6fda6a19555fd3d06871c06d52d61035163436e54a78c938e8e69bcf1e7b6dbd8ddb9dae48bbaecec2c14e93 +EBUILD erofs-utils-1.4.ebuild 1112 BLAKE2B b6309a68000ef76ce396cc4b73d9731d39005618cffd8ffedd2b54e300e0149d861e568cf7eae6d0cc890be0343635721429ef26b8c27dbed6279268999336df SHA512 71103201d5483b3cebf6f90f4eaeb80b19a4a0204ad24f0d2fe48936debcbdceb99c76f60329b9f63a5e23a1067fe75feb7fd14bdeb05e8a75f770ac0865d1a1 MISC metadata.xml 422 BLAKE2B 9c580f677db0b02904c12e023efd2c1abf0dca9d5dd84776ea55551e3997a968bf23c092b9bfa98e941f7d16009c6e56cdd0120a075872c8e3f84a77899ba556 SHA512 bb5def8dcfe0ecfdc8ce9e6fec61b7c707114abef8e79f2c0f27736341e9c3cca48c053b613d85db762c1632194e76d3ab33386bf0be7ba669a6aaee652b64c1 diff --git a/sys-fs/erofs-utils/erofs-utils-1.4.ebuild b/sys-fs/erofs-utils/erofs-utils-1.4.ebuild index 69d61af36d5b..b12a9a233e0d 100644 --- a/sys-fs/erofs-utils/erofs-utils-1.4.ebuild +++ b/sys-fs/erofs-utils/erofs-utils-1.4.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git" LICENSE="GPL-2+" SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/${PN}.git/snapshot/${P}.tar.gz" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~loong" SLOT="0" IUSE="fuse +lz4 selinux +uuid" diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest index ead6f699203c..1cc20f9d4455 100644 --- a/sys-fs/eudev/Manifest +++ b/sys-fs/eudev/Manifest @@ -1,6 +1,6 @@ AUX 40-gentoo.rules 167 BLAKE2B 07116c6e5aab7de9fa8a88c6cdd9ad76a09d797d6f7bc3d0535c93ccf83486bbdae8f68d682714576b072a174df070505cce9c6f4b729e91a6f61ed89da72e8e SHA512 92e2be610839432f46cefab4d128825199dc9f2c5ef33119f9ff84dfe635ef56a4f7aaed64ba52ea2798868b00c3a1b7955caa33219aa298c6a2b8290181f94b AUX udev-postmount 1208 BLAKE2B bcfbaee26ea666304091092deabcc068c533c7707252917a0d8617812f26744c0454f10f5f829031f8668a345c35034ec68396cbf07792a4a83a87e3816001bb SHA512 8ef1b911843ab13acb1c1b9b7a0a5cd76659f395c3db9e579429556f23eacebb414507dc0231e2455e7589bc70054fa1e6b6dd93dd833f7101c0da0597aabf88 DIST eudev-3.2.11.tar.gz 2254373 BLAKE2B cfa6235d6509b751fde93ff2b0961b93c3741458e561a7ad9b07b49a57779627532cff25ad3519e5f79320854fcedfcdc23642ef542505cebcd6b2803067389a SHA512 17b328365913af3e434abe667dd0498c3702a41c6cb66f3793ca2c195b05ac06397b0a401077f81df7dd25193e4eeea13657a221ca6cb3d237c4d91e31e30b33 -EBUILD eudev-3.2.11-r1.ebuild 6856 BLAKE2B 88bf5e0f826ccddf58593fc9bc5e362808e69fa1ceb2600572425f00f02c0af21de0cf98717bfe9e923bdcec81b2997c6fcef02428a8beca3f46cc4c92334b48 SHA512 dc5e36e2073fd363a9582a52dab0f9c84fd16458622020a08a64e73ec81df241f73789d9fe51d35a0bf05992d15c5bbb5183afdc26a5f57b67e25fea24054324 -EBUILD eudev-9999.ebuild 6863 BLAKE2B 8cc05463b8c914bf3b460cc929df84961d8c27f63a18aef95bb6680de247a947e7dd6f01e047fa3052f4fc75be693ee14b0a8692052c284fe4bf709c80abca29 SHA512 380bfb084e4836a71a138225a77b33ab5da6b78db96dad14a78a3eedbdea585fca7fd7f9ac2a0513d55d3bfa5c29ed6b8672635e2c743cc04630b45bd8115971 +EBUILD eudev-3.2.11-r2.ebuild 6886 BLAKE2B 94227204719bde1e703882979a32202510de947c3581e6e1e7bfe59e9b0e39182685bc56e3c8b2ad2fd009ced10ee9b4668324c882cf04a2a9463ccb3b3e2dbe SHA512 faadb9ca00bbd9b7d8cafc4446fa7c9399c49455d63bcaf0f94a59f7c8d31ff220c5409d94de101c538c4b849f8823c176b8616c0347b7fcdbdb2fe02d8b3080 +EBUILD eudev-9999.ebuild 6894 BLAKE2B b28cfa3485ada40b226a248f87ee2b56df00b83bbf0df1a6860a323e15cba5e9c9421efc2c513c39716d224ce0fa71df6115de73a34fcb3aacac9a87332d2821 SHA512 c428baf33d7cb86b3d4cdcdadc50be75f86177adcb11d185fdbc65182fb09ab8ffece38f0ab283ef6f5451e2ce1ed721ac20e368969c1b73a6a137734669945e MISC metadata.xml 629 BLAKE2B c67407dd805c6e8d4fb0c5152e897263ca56649d1d5c7692c74a69a751e7824a2b6084fe1ce0f8cd1b13dbdd0ae3f082430d6552807690a9d52d83c907f43f64 SHA512 204a04a68ee53fe8fec226ad82fdbb3f2ee478f538379466343bbf55fd0146a71889ac11742d59261ef954bb9b8e09e8d2b9416079da63cc78ab400efd2ba49b diff --git a/sys-fs/eudev/eudev-3.2.11-r1.ebuild b/sys-fs/eudev/eudev-3.2.11-r2.ebuild index 0ad41a30ab58..2b259de878f5 100644 --- a/sys-fs/eudev/eudev-3.2.11-r1.ebuild +++ b/sys-fs/eudev/eudev-3.2.11-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/eudev-project/eudev/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" @@ -35,6 +35,7 @@ RDEPEND="${DEPEND} acct-group/input acct-group/kvm acct-group/render + !sys-apps/systemd-utils[udev] !sys-fs/udev !sys-apps/systemd !sys-apps/hwids[udev]" diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild index b830fc310bc6..a4edb4657be9 100644 --- a/sys-fs/eudev/eudev-9999.ebuild +++ b/sys-fs/eudev/eudev-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -35,6 +35,7 @@ RDEPEND="${DEPEND} acct-group/input acct-group/kvm acct-group/render + !sys-apps/systemd-utils[udev] !sys-fs/udev !sys-apps/systemd !sys-apps/hwids[udev]" diff --git a/sys-fs/exfat-utils/Manifest b/sys-fs/exfat-utils/Manifest index 3bd5d4de7950..5291b4cf0221 100644 --- a/sys-fs/exfat-utils/Manifest +++ b/sys-fs/exfat-utils/Manifest @@ -1,3 +1,3 @@ DIST exfat-utils-1.3.0.tar.gz 188943 BLAKE2B 07af437fc21ae2f7d99db778069135c7391554f964a05eb6df715bcb5135003ecdc1257c541a61e0c140bfcffbc0802dd4118413f8d11a175be3f8adf5f5b83f SHA512 e1c5b708f22e878d7521e3299866bba127145757e3620696ff11b18c8c7d4830522974e8ee4771234b70aa9718295d3433779cf34ca990e28ccc06cbf9325f7e EBUILD exfat-utils-1.3.0.ebuild 623 BLAKE2B 5605a3bf5b40bd0af6faa8335b49813f0aac71ea03a6f08724731171758f7513728aee99df55b1b989731e74d086978f15e1b2ad7106d711ee308908e79728d0 SHA512 6fcb2679f9edde16ca26d0fea80d6eeff5939e13d2c902145b981429a4318e1dbed3412b78b6fe0a6c4813d436975dd4b5e58291ecfb55ca0b8e01d5fc3c6473 -MISC metadata.xml 514 BLAKE2B ece21f809fed311427b04251ceb35d7c2d290c47402a6f02720ebb01d763071fec0691d7490e56130d104393bb3ed05c94613d55f7b23048d0e7f10f202ee955 SHA512 ea008a36ce2c7f84f5093b17c3f2f8c1a3cf84acfc4baa3f2c7b39a52359495ed52633861fa42fcadf70dd1cfbd730239c367c498d8ce0374767a8d0b6208b4e +MISC metadata.xml 438 BLAKE2B 8e9a08139e7f5fe750dd1360945dfb0f8862a6829759cbed3123fe7ca6e2719fed051a766139510742c3f651dd397e4a07a2f0a1bf412c87cdbba8bd0e3b5c48 SHA512 73bb5c084e7a0a63e68977826256acfb18777ff987b8568a64eedd78f7888e90ccde8fb42d9d352182460d5ae9c08dd9fd5838f93b10df1aceb1ce2a01d7fc21 diff --git a/sys-fs/exfat-utils/metadata.xml b/sys-fs/exfat-utils/metadata.xml index 69cf8f2172a6..f9ff4f860cea 100644 --- a/sys-fs/exfat-utils/metadata.xml +++ b/sys-fs/exfat-utils/metadata.xml @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>floppym@gentoo.org</email> -</maintainer> <maintainer type="project"> <email>base-system@gentoo.org</email> <name>Gentoo Base System</name> diff --git a/sys-fs/exfatprogs/Manifest b/sys-fs/exfatprogs/Manifest index c0fae2687afd..2d242f494572 100644 --- a/sys-fs/exfatprogs/Manifest +++ b/sys-fs/exfatprogs/Manifest @@ -1,6 +1,4 @@ -DIST exfatprogs-1.1.2.tar.xz 261572 BLAKE2B 1475086d6fdc79dd128d08ba863e6c3fc58a432929400b0a740f57db492a08fb3779a0a1a7a555efd373a3e796d2066e37575c5003cbd16f829964cfa414a1d0 SHA512 b3589225f3bc4137c49d828923ab43e155f476fccd227b16168d11302e1c150485eb7f61b6463dc9126648fd4a52960657976ebd9f731366c64966c58fb9276e DIST exfatprogs-1.1.3.tar.xz 261936 BLAKE2B 7d1e471eb24f408999efd7fd6e8e2b60f0ef4efbceca9780de5a52c0b0bcad18a25648b7e669e805a40f382541406c01ea75cd40b4660f44281848bf38f9d1c0 SHA512 d23bfe4d0233d944b0d5a484e1167746db77ea9b7fbacdbfac2dd4d37a8a1d747f2445b09baced9fd7b5d3dbfc7664bdc1efe16326d7e678d05294eee124efa3 -EBUILD exfatprogs-1.1.2.ebuild 617 BLAKE2B a1a86d9e39e1fd4dafb16f7a2c0ba0aa368d36ee343e10d39f0001de8cd2c5b8067835ea9da556b30ed8b9a414ef093d034f59e0b423910200bc1ae353308183 SHA512 a55c4bd6113876be8ab39330bd3e50736a69165728b941359b984853b1ae06f49ba93b0b872a2a6dde16a5997f0abf747154d4f41b2c0e9e53a95745f8e07ec5 -EBUILD exfatprogs-1.1.3.ebuild 617 BLAKE2B 07bace354da2f4e93593126df6b95a5ea0a87f349d7997cc435b2f01433afcef917bfc45d722c265fbf0e12539f83bc6fbc0af44d77344118fdc2d1bbda7da64 SHA512 90f77e5c5ff0beff72f28c5e772c1494ad08314497ae0e2c28988dcf785d048f9cbb10fe9b79e78037f90531bc7134a99c6f268794014a0f1165bf7ded5787a4 -EBUILD exfatprogs-9999.ebuild 620 BLAKE2B 50d59db1d0365445dc6a1bfff9905e6ccbd7947baaa8d9e6ed4b9587a85816a487ed90afaa3c205a5cf414b891dc9c64d3edb9929985c75d77c90acb5dd54211 SHA512 6afee5e9027be8cc0b9548218dea3c58ab7e674031c8c55a1039c60231510623242f1a379644e446cd36ca3983a7354d7e0d634c63113da4f6547aabb4db218c +EBUILD exfatprogs-1.1.3.ebuild 624 BLAKE2B 3ae7f2f1de024b4dd054a9947aff9006e3713e6c4230195f60b1546d5352be04989cf1060c6580bf14d06910156917c4b5b5804e970d86c250e0ab69555ab80b SHA512 82a1b233c44f50c44689b3864da87ed9e6139839016f2bd3adcbbc5acc418a69da5d911345bc5dfd6ca4ffc34a0397774b31cb8e011cd4b5cfc20a83e272a219 +EBUILD exfatprogs-9999.ebuild 627 BLAKE2B d3b0215501ec60e66b917ad551444ed9ef68bc53393cb5f34918ba33952be687945139f5f6ebd1c40588e4e9b4ca8d5e5b6cdde8ef22281db54686f7cef90691 SHA512 8e912bda0ec2086d1fa40e7969638e61f28323cd848f51abbd3ad1a564e6af3880f5eb02e884bf5cca35a74d2ff9b098efa094d907b15a4a1d2755e397263e03 MISC metadata.xml 344 BLAKE2B 6f45e027a37eb3d01018cfd5b1d07691129367cb969896e42303b38ca81bbdc8aef68f1dc542b2a5aefa793d2f28c60c8c5dc2261b75b817973302dd7e817541 SHA512 5ce136106ee694a1a8725e3498189a1162aa249a91b4597a3cd6f87c202b6a30fd1bd6daa13e9f80fe108f3e024ca995502b9b18b30bbad47722b18fa325fa1d diff --git a/sys-fs/exfatprogs/exfatprogs-1.1.2.ebuild b/sys-fs/exfatprogs/exfatprogs-1.1.2.ebuild deleted file mode 100644 index 2746d008abdc..000000000000 --- a/sys-fs/exfatprogs/exfatprogs-1.1.2.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Userspace utilities for new exfat filesystem (kernel 5.7+)" -HOMEPAGE="https://github.com/exfatprogs/exfatprogs" -if [[ "${PV}" == *9999 ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/exfatprogs/exfatprogs.git" -else - SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~ppc ppc64 ~riscv x86" -fi -LICENSE="GPL-2" -SLOT="0" - -IUSE="" - -RDEPEND="!sys-fs/exfat-utils" - -src_prepare() { - default - [[ "${PV}" == *9999 ]] && eautoreconf -} diff --git a/sys-fs/exfatprogs/exfatprogs-1.1.3.ebuild b/sys-fs/exfatprogs/exfatprogs-1.1.3.ebuild index 56639025e6b4..691798509eb0 100644 --- a/sys-fs/exfatprogs/exfatprogs-1.1.3.ebuild +++ b/sys-fs/exfatprogs/exfatprogs-1.1.3.ebuild @@ -10,7 +10,7 @@ if [[ "${PV}" == *9999 ]] ; then EGIT_REPO_URI="https://github.com/exfatprogs/exfatprogs.git" else SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~ppc ppc64 ~riscv x86" + KEYWORDS="amd64 ~loong ~ppc ppc64 ~riscv x86" fi LICENSE="GPL-2" SLOT="0" diff --git a/sys-fs/exfatprogs/exfatprogs-9999.ebuild b/sys-fs/exfatprogs/exfatprogs-9999.ebuild index bfc512380c67..e9fc0d2e9745 100644 --- a/sys-fs/exfatprogs/exfatprogs-9999.ebuild +++ b/sys-fs/exfatprogs/exfatprogs-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ if [[ "${PV}" == *9999 ]] ; then EGIT_REPO_URI="https://github.com/exfatprogs/exfatprogs.git" else SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="~amd64 ~loong ~ppc ~ppc64 ~riscv ~x86" fi LICENSE="GPL-2" SLOT="0" diff --git a/sys-fs/fuse-exfat/Manifest b/sys-fs/fuse-exfat/Manifest index 0ef758580fc2..0518ffbbaa6a 100644 --- a/sys-fs/fuse-exfat/Manifest +++ b/sys-fs/fuse-exfat/Manifest @@ -1,3 +1,3 @@ DIST fuse-exfat-1.3.0.tar.gz 161278 BLAKE2B 864eed57d5ae70eac03464899ac7c63f5d55254b61b69064592bb7ae04f6c164b8113c568946103c407867c1b53511bf2b88bd6b25cf75aa3a1a9a2a7d4f12ae SHA512 90d2b89322590199012b035b88ae01559f1824172793d9e7845603940e2807e788c687e4958f1ef76678bd214bb03671b91fd2537901b6d6acf2e8c525a3f1f3 EBUILD fuse-exfat-1.3.0.ebuild 717 BLAKE2B 25ad3696126ecb59889b5435b742796008f9a36f7e2df82c9c6aafae3896d2834abc26131d691bdd2778d0378e2afb65ecb65d2e914183cadd72bc3c5248152e SHA512 d4f5ddce19d6b3bf3ad4060051df85bcf76f189fc12f0a8741f9b293836f2025b0d6445340c532299296e0e7ed99b67a5929a56cc6f8d959f4a44098567c9920 -MISC metadata.xml 452 BLAKE2B 732e98008de6a9a56cf180645a47c4c17df8af53ca8b3f0840d1ab9cbd74e910baf3445b6fdfe6503e638ccd147d9bc2bde872d4392412f3dfbb82ce1d36165d SHA512 66101a85d733d256950dbcc3a5a6c3973584e0b6adb37979e2ac12a95d127313311a05e5b166eb047e0ca0641cb988cc86a1feed05f2dc45431cbeeee6be5457 +MISC metadata.xml 376 BLAKE2B 46a5e00037e6ccff0891d6e80d52037ff17903a7ebd46f98694a94af076eb4f049eec3b13b9bc6abc8f660ec4b08cd3157515b894f7127fb8ca95bfd0a2701ad SHA512 2ae5fefbe898baa37c64f59ab60e84b4bc7d93b6aa2c7248d59c1776a808b85b02fc105928adeaadb23adb3c8479a5fa074ffb8ab3f16a1da1f3ed5d47bdbfed diff --git a/sys-fs/fuse-exfat/metadata.xml b/sys-fs/fuse-exfat/metadata.xml index acba87cdba49..9b3ae497122e 100644 --- a/sys-fs/fuse-exfat/metadata.xml +++ b/sys-fs/fuse-exfat/metadata.xml @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>floppym@gentoo.org</email> -</maintainer> <maintainer type="project"> <email>base-system@gentoo.org</email> <name>Gentoo Base System</name> diff --git a/sys-fs/fuse-zip/Manifest b/sys-fs/fuse-zip/Manifest index 3d171d708ba3..0f29a997e288 100644 --- a/sys-fs/fuse-zip/Manifest +++ b/sys-fs/fuse-zip/Manifest @@ -1,6 +1,4 @@ AUX fuse-zip-0.4.5-makefile.patch 820 BLAKE2B cf6bbce2be6d9da05ab6974759b1fde5f05f0ab1f4fbda79dc0dd439409480a183d6e3c116dc488c9f8e098be47dfad7ea1adb1c4b0d07daef854c70d655763f SHA512 64eb06111deaa858558de068a331c0b086983390c13be39857b38a87e5d24ddb9efe652e4612a3cd50c45dc052dc2f147743c898a5933aa6828fc0810d47d9b6 -DIST fuse-zip-0.7.0.tar.gz 712853 BLAKE2B fd8bdaf30321bfbf897598de0291b1b285171b9b254e21acc1ca9f9d5af2b3a199dcb05696e92983a9b7491b4993b59defa53ec37d0a958d4fb80d2baf322194 SHA512 ea08bee4a7d0e7a0584237c6e9560d0fd2665bea59e87bc020697c3fc6bdc3c4c5c5d4dcdb454eed8cb735c176dd54d7c9bf879a04ac2d5b38bc271cc3128b69 DIST fuse-zip-0.7.2.tar.gz 713290 BLAKE2B b7cd0ad3dc605434e40f1914424d3da681308ef758d2aa613323eb0e3ca5c32a9f10377e67f8e4577f670ca80ca039963f8a8ffd4166819584fafce9d3cbe9f1 SHA512 9abc34bd75caca125542f7d8ad7356901b25679779926515070650a5167eac28cc88b4545a4f05f5ee8a0ec58205258d33d190942a0e568fb72d02f3c469783e -EBUILD fuse-zip-0.7.0.ebuild 691 BLAKE2B ee9f37d3ea5ba2c1f6dcb67dd4d770d1d10ba725675afaee4bb39c0404ea2da396b79f1583ca1c8b396cefd6aae62ba82a158997ca49c843a87cbd0dc1afacd9 SHA512 1b5eb8da3474e28d01cea7b3c988ac4497fd44bb1e1df8a032719cae011932de7468312787440a2ca9c7ce2d9365ce76658675396938f5d5d6d69659b1535255 EBUILD fuse-zip-0.7.2.ebuild 682 BLAKE2B 6179024e2b84e3dc9974f97de481b6354236113ba977e3f701d0e93bff23ec39fb4dfd0538e36dff28d8a73071c6f2b01ba27e4c34fedd6d76e5489f4f7bf717 SHA512 48323f0248695223c89d198134f7485d3a402f6167f9b436ed6610c43a4883bcf06d40999e4ef5e939f56ef1c46f1395acca5048c577b3d3447c598eb3fe61a2 MISC metadata.xml 306 BLAKE2B 6430b8d23ab5b4108fa9f2dbb1e2732c6c3d03c9b23d7daa0cfe25213f79f364573c95ad01ea93a842b44794c9d53dee320a4dc4b4c401fce0a65224643cdd9e SHA512 60016befbb6e1691bd1f1c8f471b3374e51d02aad68db4a83164f5850c2961903803b03c4553aa10a36524f155271323617976bb3815f36dd61266966395cc06 diff --git a/sys-fs/fuse-zip/fuse-zip-0.7.0.ebuild b/sys-fs/fuse-zip/fuse-zip-0.7.0.ebuild deleted file mode 100644 index 1fefa7a93ca4..000000000000 --- a/sys-fs/fuse-zip/fuse-zip-0.7.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="FUSE file system to navigate, extract, create and modify ZIP archives" -HOMEPAGE="https://bitbucket.org/agalanin/fuse-zip" -SRC_URI="https://bitbucket.org/agalanin/${PN}/downloads/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=" - dev-libs/libzip:= - sys-fs/fuse:0 -" -RDEPEND="${DEPEND}" - -RESTRICT="test" - -DOCS=( changelog README.md ) - -PATCHES=( "${FILESDIR}/${PN}-0.4.5-makefile.patch" ) - -src_compile() { - emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} ${LDFLAGS}" -} - -src_install() { - default - doman fuse-zip.1 -} diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest index ab406e4a5155..98d0faa67939 100644 --- a/sys-fs/fuse/Manifest +++ b/sys-fs/fuse/Manifest @@ -2,10 +2,10 @@ AUX fuse-2.9.3-kernel-types.patch 434 BLAKE2B 501d771217a6131c31982a5cee300d1d6f AUX fuse-2.9.9-avoid-calling-umount.patch 1264 BLAKE2B f02bb80aab844f90638ed291891d819169946e3e4e58318bf370f5f3721aa80ba8ecd7cb127e387780e5ed8336875e3eca2d776ecde29a85e40821ee89c8264d SHA512 24f6c7ccf8b3d291e0e477685532854a21aeb65a90f7c428db039e6c7ba8a4cdb5435f2effba3a397448c0f6a44e056f2580eb55357a0b29c6c78bf5b364830c AUX fuse-2.9.9-closefrom-glibc-2-34.patch 1649 BLAKE2B 6697ecfd16ca8a71ec10c0caadee97c84fe412056c04124cf501a30df1dd7cb5bbbfd8a761692f2396755dda156fd94b86278d78f1a2bd2d7a41b9fd87f20fee SHA512 77bca6a67c235d7d22b156a9c3a8b906de59029d28fa0c985cb15e30d306b0dd6b9437d75eabe307aca7e159ecd90e47bd8fb723a582e95d0c491a6cb308e8a5 DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2 -DIST fuse-3.10.4.tar.xz 2787472 BLAKE2B 174b51bf55544bbc08e04089a4d8685b371d3f584e337ed0d8d82c62e10c14b6ef14a964d6627e8a121036db1ab4c6c1ccd413c08f8685d3d91893874427e46f SHA512 1cb7600dc04f148b15ec3183d0348320dd946cf15d4077798e7e34fe7e8202837718c8b8bd1f190b7dddda2453ee2b0433d77e18f142ecb7affec1cae29520f6 DIST fuse-3.10.5.tar.xz 2931828 BLAKE2B 72de5e5867dc0934912248e1e626e2753c0f654626ba9d397753a7fbbf21dde877e6c528a44950ae1c828583f36a49c39f44a587544e44f8e749bd4c604b33b4 SHA512 da17788acc3fabef3dc7b736b7319c1638d7de27e163699f7dbc0fe9159aeba35964af6afa77a7654f1f321e2fc03ee167909f21516cbb585ead33cad95620fe +DIST fuse-3.11.0.tar.xz 3515332 BLAKE2B 30d2dfee25a34b5f84f0a6b13523a6183fde7989b3ac908b68b8b9e4c327da51678453918c3009712ff1f3aaa79c4b0a29f22bcb712ee550563b23fd9ac64a09 SHA512 033324de7ea4c7e91fb21c453211c01e53771ec5805c2126e13ef2d4334119a51f5c783b6249e888e28888c753aa04b48ed33cefb6d486d8d526546565f6ae50 DIST iconv.m4.bz2 3057 BLAKE2B 9d8f7637d87bfcea1b60f3ea11e162aecf391b3f4579a3b85afb01735f56bfbae363a7e781279f3b2bed0d1dd3336f7d0678d3b1d59004824d7d0ca848dceb6e SHA512 9899368b8acc06e216a7a548b83a894f780e152a02612cd52af02b5c3f2ff38e2c36e77bda300587f81c3d74c90addec8066885216fa0e74f3f3280a383d2b55 EBUILD fuse-2.9.9-r1.ebuild 2091 BLAKE2B d49c1ce7621768c924b5fcfccee48928256f4f6f8a207c94a4aa87edf4bf83ffd39a91a37346635373609e05a2ecec7dcfa24cac6bc2fa168af5318ed7671002 SHA512 fe5804964ddd9c6c9d2c1db0a666740cb1be726fbcd2e45226de49aba513b7da431bd2c17ff0549c24bdd7c95da569f1bf215ebeeb01ca37e8f7c92883258480 -EBUILD fuse-3.10.4.ebuild 1779 BLAKE2B c6b51c0cb628354f575d7428a6fd1db86a9a8db3c400f425170334c74409599f079bb5195338b9f1b8325cf7eaeb4a6e52672eec253e7ddf018c84c5687c0930 SHA512 3f52e1f3b2fee5b8704c01d7309c4f0864a48c688731bc54662c7eb96107ea0468f3402df22ff71409311311736f114c6f6c76e43b5ca6f06687cbaf6e7f38cb EBUILD fuse-3.10.5.ebuild 1806 BLAKE2B fc21f9e50c0f3c9de23ff2157c3c12d48e64a1e49ed955f1b28e30a14d855eb12fb16ada86f04f8256bbdbd34b8c7ea3c7ab511720d369cc48e86607b0115748 SHA512 54eec78493c8b365c9b7576cc7bf5f8947e52e359a24e8f044fd7785bf548b648d34437d4e6020509f05b529ba6cdb846576ec0e77f78294ccbbe4cd6588c6dc +EBUILD fuse-3.11.0.ebuild 1814 BLAKE2B 092c4ebb408ab0ecfb2114df904f570d219077724e6dd886f7f8e774fca3dc17bb7bca0a3c3fc96bd1783ac5adf18d5018253a896104b5f6e22028e380ae8b2b SHA512 66bd81b58fd4afc4006d1740c779d2e74d1e54444330ea3a421aa3778d572e81ecae723ea2a175975acb3a1222ee2c4a7028a878b8a87225c0dd8977f5f1ff69 MISC metadata.xml 357 BLAKE2B 49ff08baa6cc3cb3d58f892f8d1db18f2d8fd184945c4fe7fc75f0db265bf9b6ee8861b421c8ab1070a51e2b03b94eb77133991d71208a51a30d1f286d3a9ea6 SHA512 1c5b658c85cb13904843e1b0746019cca9dba7ec0cc61d4ba0c13378b32b4d3eaf016fbc7805637113c5285909c22f16d8ad3cdc23fec69775b12057f4146a0e diff --git a/sys-fs/fuse/fuse-3.10.4.ebuild b/sys-fs/fuse/fuse-3.11.0.ebuild index 80905c5ccb83..6577e8df01b0 100644 --- a/sys-fs/fuse/fuse-3.10.4.ebuild +++ b/sys-fs/fuse/fuse-3.11.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{8,9,10} ) inherit meson-multilib udev python-any-r1 DESCRIPTION="An interface for filesystems implemented in userspace" @@ -12,7 +12,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz" LICENSE="GPL-2 LGPL-2.1" SLOT="3" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="+suid test" RESTRICT="!test? ( test )" @@ -36,6 +36,7 @@ pkg_setup() { multilib_src_configure() { local emesonargs=( $(meson_use test examples) + $(meson_use test tests) -Duseroot=false -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" ) diff --git a/sys-fs/genfstab/Manifest b/sys-fs/genfstab/Manifest index 41fa05eb1dfe..1f50da8e8265 100644 --- a/sys-fs/genfstab/Manifest +++ b/sys-fs/genfstab/Manifest @@ -1,3 +1,3 @@ DIST genfstab-24.tar.gz 14281 BLAKE2B 93987794ba12e08daefd20ef596e915a70a11a9e641470b6f93873b738b4c4bb22f808513c63e7675cade43b992f308d26f3a2db0b211e99518a3d3702d6b897 SHA512 8c4d40e98b7a35abcd5fb2bf496722aa65819e4124a37385090fa70b55118ea3590ecb4e16f117bf93118a36bf402c4616ba0cb1837869b11db54a827332c661 -EBUILD genfstab-24.ebuild 464 BLAKE2B 8157fc8b781e77cab58918e6fc4b5092c14e432809f57a35f2630a1d8312231f536f3bb1592af71688da9363cb5c13b0a02deb61f24fb4f85adedbd87834de13 SHA512 f722595cddfec818b06ded7f353d63d64f2233574b2626b0a3f9d1cf64395294f4ab04e9075b178fa5d6228db362f11438035990cc3f5a352021aec916dc3f3a +EBUILD genfstab-24.ebuild 464 BLAKE2B d88cfbb02a3f3059dac6b118cd99dfc8e2b1c8c98933ac2d7e7fc1f44b043c1f2907ba6f9e2039c48235bc77122e94ddcd7fd52ce9591567ee3cda1892d1ce5f SHA512 7f8333eb8d53a67dfd753d5393d1b88adfe6b53466dfaaa677da7959b25842b267c92e1d4201f3fa00ae26b66ad3980392880f8fc71fbbde3770cf1621b47e9b MISC metadata.xml 251 BLAKE2B 996d717a2bde6bf8ad5d7adb70bd9535ff45f837b07eb2ab2dd9d3f14fd372fe6dc0a739972af0536a335148b1fde19a80dbcd806b4909ff9fdf5701628c0d64 SHA512 1abfedfb934187618b92cb2353b85edd4d0d3a047c61c8b8fad8611b97b0b4e817855308849515bbd96da8a60b52b4835ed77593f78d4f1521da36008c77968e diff --git a/sys-fs/genfstab/genfstab-24.ebuild b/sys-fs/genfstab/genfstab-24.ebuild index b0dcb0a50058..2981f73bb2c5 100644 --- a/sys-fs/genfstab/genfstab-24.ebuild +++ b/sys-fs/genfstab/genfstab-24.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Genfstab - generate output suitable for addition to an fstab file" -HOMEPAGE="https://github.com/scardracs/genfstab https://man.archlinux.org/man/genfstab.8" -SRC_URI="https://github.com/scardracs/genfstab/releases/download/${PV}/${P}.tar.gz" +HOMEPAGE="https://github.com/mscardovi/genfstab https://man.archlinux.org/man/genfstab.8" +SRC_URI="https://github.com/mscardovi/genfstab/releases/download/${PV}/${P}.tar.gz" S="${WORKDIR}" LICENSE="GPL-2" diff --git a/sys-fs/libeatmydata/Manifest b/sys-fs/libeatmydata/Manifest index 22fa67a4a3d8..fc776e066ff5 100644 --- a/sys-fs/libeatmydata/Manifest +++ b/sys-fs/libeatmydata/Manifest @@ -1,3 +1,6 @@ +AUX libeatmydata-130-implicit-function-decl-test.patch 611 BLAKE2B cd8fa997d0dd36d0414cd8b1bec9fc82616444a2db0e61ff5fd1e773c1800bb1294b0ae8134d67061b0baded60a1ec890f31ecc6791ea87c811a14338be9d64c SHA512 a4e5e13b8a66723ef813328ef67b62ee33bcb84173eed76ada886c2a5c1d316552ed089a404d19effa765f159bae03772738eeaa5a4bddbe000c740d83382ba2 DIST libeatmydata-129.tar.gz 358437 BLAKE2B 448cff19629fa1a07443a52ebe16a7bf9a8ac7d0c2688e89555ed6c9c2369695a70ae2abf1b74152b3c305e6bc019e2e9808af6642122cd10a73deb7dfb580f2 SHA512 dbd0ea4df77034ecbb75955394b15aec6f1331205a5c7aa4a6e0595e3e486bbcc81c28a264bf5441c660563f74bfb06630da98373d481a2ebd9e9b1538c109d1 +DIST libeatmydata-130.tar.gz 375627 BLAKE2B a1f65050572e8a7fc8345082a12e2831a8fb1e68e1d198ae507752375b2081a79fa6e5e589028104cd9d767d86b4d453c0eac0ad7f366c90d6734f5868f8e0cd SHA512 80edeee1b39e14d10e7d04d7fff63a233119c6e13216e92ec786cc41ecd79eb58937da0e621aaef697490e9fb285f3e1109b786ee6967fa1736bb4879e100f18 EBUILD libeatmydata-129-r1.ebuild 860 BLAKE2B 2af86348726b6c475bc521f76376e87813aca3ed754c6ac88b180a36319c4c4f8914615ff3d04788e865bbaa176dfcf796c971666fbf2529c0df66792e1da3c5 SHA512 7242b38f1639746603464699383bdad70f90661661f213cf3f78582c54619c2bf5de2e32e858948271b87c1f6a37d0b40dcbd480a3e7ebe24c0a8beb926cbf14 -MISC metadata.xml 429 BLAKE2B 32b42d894377bd2663efb8e6a896d8e60abf7ff80cae78806d3de0e6ccdb3ad3ca2336754b65a3cade50cb15625dcecce894c48475383c289ddbd277bbcb0830 SHA512 c0f488caaaeaf482961d3b84eda772d9a3283b72b58dda5b9704a5754cd4091943a84b6c5324e86ae3f96de1cc8fd087ebdf46912c3a3d07daa9c660573a9d63 +EBUILD libeatmydata-130.ebuild 946 BLAKE2B 2f7722041a5d67a58d1a31b8cfb9004f9984b509a5204c14df66ba8e01acafa0dfb0044d5e6644630ae096dadab6168e21528040f26738f187328fe846360a59 SHA512 a694be4e8b2172c38b3152183c8ec4c1f01745d2edbf5fd7d7242f8efae0bb01a7f28656447261766e9789927c765fd15def146702fbdad7a9d9f37d93637bc2 +MISC metadata.xml 511 BLAKE2B 34fcc6f9c449e64c078f8e77d41afed2d5acc2ef4f7eb298f1dd35241520c28452d610b216a5811de0dc6bdc79efef7d8ee31d680547674b5e8fd9f2eb47bb17 SHA512 c58ddfef161abdf2775d9e2f8f7eb4850088bd1a8ddbc2cc6a43c26154b48bb571695f6c439275e66b84af8bff7922aecfeabd8a55839260633de530c4a9205c diff --git a/sys-fs/libeatmydata/files/libeatmydata-130-implicit-function-decl-test.patch b/sys-fs/libeatmydata/files/libeatmydata-130-implicit-function-decl-test.patch new file mode 100644 index 000000000000..da8403ca2c11 --- /dev/null +++ b/sys-fs/libeatmydata/files/libeatmydata-130-implicit-function-decl-test.patch @@ -0,0 +1,18 @@ +/var/tmp/portage/sys-fs/libeatmydata-130/work/libeatmydata-130/libeatmydata/test/tst-invalidfd.c:31:13: error: implicit declaration of function ‘sync_file_range’; did you mean ‘copy_file_range’? [-Werror=implicit-function-declaration] + 31 | r = sync_file_range(fd, 0, 0, 0); + | ^~~~~~~~~~~~~~~ + | copy_file_range +--- a/libeatmydata/test/tst-invalidfd.c ++++ b/libeatmydata/test/tst-invalidfd.c +@@ -17,6 +17,11 @@ + + #include <stdio.h> + #include <errno.h> ++ ++#ifdef HAVE_SYNC_FILE_RANGE ++#include <fcntl.h> ++#endif ++ + #include <unistd.h> + #include <assert.h> + diff --git a/sys-fs/libeatmydata/libeatmydata-130.ebuild b/sys-fs/libeatmydata/libeatmydata-130.ebuild new file mode 100644 index 000000000000..75db11525a1e --- /dev/null +++ b/sys-fs/libeatmydata/libeatmydata-130.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Multilib because "handy to inject into wine" +inherit multilib-minimal + +DESCRIPTION="LD_PRELOAD hack to convert sync()/msync() and the like to NO-OP" +HOMEPAGE="https://www.flamingspork.com/projects/libeatmydata/" +SRC_URI="https://github.com/stewartsmith/${PN}/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND="test? ( dev-util/strace )" + +PATCHES=( + "${FILESDIR}"/${PN}-130-implicit-function-decl-test.patch +) + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf +} + +multilib_src_test() { + # Sandbox fools LD_PRELOAD and libeatmydata does not get control + # feature of sandbox + SANDBOX_ON=0 LD_PRELOAD= emake -k check +} + +multilib_src_install_all() { + find "${ED}" -name '*.la' -type f -delete || die + + dodoc AUTHORS README.md +} diff --git a/sys-fs/libeatmydata/metadata.xml b/sys-fs/libeatmydata/metadata.xml index d0fa84d5992b..f23ca842d876 100644 --- a/sys-fs/libeatmydata/metadata.xml +++ b/sys-fs/libeatmydata/metadata.xml @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> <longdescription> eatmydata: library and utilities designed to disable fsync and friends. Used as LD_PRELOAD hack to hijack fsync() and open(O_SYNC) calls. </longdescription> <upstream> - <remote-id type="launchpad">libeatmydata</remote-id> + <remote-id type="github">stewartsmith/libeatmydata</remote-id> </upstream> </pkgmetadata> diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest index 652f6dd2a89c..0f636bf8b5ef 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -33,6 +33,6 @@ AUX lvmlockd.initd-2.02.166-r1 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c9725 AUX lvmpolld.initd-2.02.183 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b566284a4ec42002fbb5331a7173fc8b4b39be7198426fe4bbdcd3ad94b69fc3d8950705b6331c5f3f4cda4ad66 SHA512 b9b8376cbc8b6703868afab18e5baa4ef5354569e57f0596d38a8005fa725299f6858ac86b39fcca10e5a0f1adbd3a4cfa6cc6b62405e78916cc1287d8b36d0d DIST LVM2.2.02.188.tgz 2421550 BLAKE2B bed90c8454cd4b20fdeec6dcbf5a9f97c9310671aea3b2252f8069cfa439fcb050f5ad95f928a7125a1734a4dc5ac985da99a4a570538e377a7205191a505476 SHA512 8c9db17c49dc8ebcab6c7f246ab85870a80658be811cf7f4d8f36abbebafa355b030bfc1e3bcbad73ccccb7fcd06d4a95ac547ca15d18d33715126da92703dca DIST LVM2.2.03.14.tgz 2639538 BLAKE2B 806f5e9cb76a05febef6f8ce8cfc42c92927b9538f62a21029c5ffc426a4fd7c3f32709be08dbd8028b53891b1075d1d13cb3b0d7b1815071ee8eb927d8f3ed3 SHA512 6a93bed1d5cf36f0f48d4d413d028b0e480cd4fc20e25d173770a892f265d2a0cc68d01a720b1513469953649e989532cd0c45f9538f92a4190eb3dc4555857d -EBUILD lvm2-2.02.188-r2.ebuild 10131 BLAKE2B 1fb4372993e615678e9f5f1a44bcb530ad959ec727a9db5e78bad15bdc32aba31825e75539780987cbede765f16d655d09d1d3cde1e88892fd3b7fa7794056fc SHA512 cb60df19a2ed209c0b47fd50637b1ab18788ac63c865b50e175e6e48b842a8ffa00f53a460305f6554f7a732763c705ba27b1e21e4a2f5a8cb81dbee32946374 -EBUILD lvm2-2.03.14-r1.ebuild 9920 BLAKE2B 8d82b5e72034e6139e035027ec5eb035ed3916904b71ac9048f90e206e2e86f53efd6e541532e06fdf07787455da4c08f99d279d18d4f51962f0c33d7de1616e SHA512 cca36a4f626b2efdac9cf657f5b5a742a3e3add82e6ab0d4e75741175b2a135d5ea97f49d295d257f3e41889ac85e4c94b400f73ee22e0223578bd95423f3628 +EBUILD lvm2-2.02.188-r2.ebuild 10131 BLAKE2B b0e8167b45500bfe2e59b8ebedf1de36a12b897776b64e9945084f77049174a7006414072a14ba69738d9dae11ccd8335ca5ed4c7072127380290d4e58c0f8ec SHA512 b3d8fd243c6f00cb89e3e992fdeee7a614512422e07da9c84d4baeb27186d302678334105fb0ef25501a8c8d47e6f76b7ff1f00c77ff3b417a739ba7d8f920d9 +EBUILD lvm2-2.03.14-r1.ebuild 9927 BLAKE2B c4fbf2a105638effcc0f203f31fdfff23f41d7a6ad6754bfdefefaef13595acc1f2262a18fe5f47a35939e9f538e4b3ffb9c0105e39368e980edc1995a92eaea SHA512 0c2da826d111d0331fb096d785f57886bca0517a23dc66f707279a62ab30ab4cd5bdc852bdb0ae52eda04d6967f1b749e33604be70665276ecc26e22e9e5ba66 MISC metadata.xml 1035 BLAKE2B b9a3162e72e1ea09c7530edca817046434186c3948ef763c1a4efedb45aa8f842b7819efdbb09fb40897368e61b26a43896ef28a4a9d1ae554ea3cdb81f88dc7 SHA512 a16653a343d66eab8bd790eb974cc95d75f48321051ebb37eef87b3c7ad9903b2be1f0c70aff4b711b4469fa2715a5fb0c8566c46e6a83173bf998cf182ce964 diff --git a/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild index 60cc0d980580..a3e76755f1d5 100644 --- a/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -207,14 +207,12 @@ src_compile() { } src_install() { - local inst INSTALL_TARGETS - INSTALL_TARGETS=( install install_tmpfiles_configuration ) + local inst + local INSTALL_TARGETS=( install install_tmpfiles_configuration ) # install systemd related files only when requested, bug #522430 - use systemd && INSTALL_TARGETS+=( install_systemd_units install_systemd_generators ) + use systemd && INSTALL_TARGETS+=( systemdutildir="$(systemd_get_utildir)" install_systemd_units install_systemd_generators ) use device-mapper-only && INSTALL_TARGETS=( install_device-mapper ) - for inst in ${INSTALL_TARGETS[@]}; do - emake V=1 DESTDIR="${D}" ${inst} - done + emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}" newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper diff --git a/sys-fs/lvm2/lvm2-2.03.14-r1.ebuild b/sys-fs/lvm2/lvm2-2.03.14-r1.ebuild index 2ea2eaea55a6..f3bc54eebc36 100644 --- a/sys-fs/lvm2/lvm2-2.03.14-r1.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.14-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="readline static static-libs systemd lvm2create-initrd sanlock selinux +udev +thin device-mapper-only" REQUIRED_USE="device-mapper-only? ( !lvm2create-initrd !sanlock !thin ) static? ( !systemd !udev ) @@ -206,14 +206,12 @@ src_compile() { } src_install() { - local inst INSTALL_TARGETS - INSTALL_TARGETS=( install install_tmpfiles_configuration ) + local inst + local INSTALL_TARGETS=( install install_tmpfiles_configuration ) # install systemd related files only when requested, bug #522430 - use systemd && INSTALL_TARGETS+=( install_systemd_units install_systemd_generators ) + use systemd && INSTALL_TARGETS+=( systemdutildir="$(systemd_get_utildir)" install_systemd_units install_systemd_generators ) use device-mapper-only && INSTALL_TARGETS=( install_device-mapper ) - for inst in ${INSTALL_TARGETS[@]}; do - emake V=1 DESTDIR="${D}" ${inst} - done + emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}" newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest index ed7d7174d878..963aea71aa5e 100644 --- a/sys-fs/mdadm/Manifest +++ b/sys-fs/mdadm/Manifest @@ -12,5 +12,4 @@ DIST mdadm_4.1-3.debian.tar.xz 89640 BLAKE2B 3cb5e42dcbd218a71e55127cecda6f2594a DIST mdadm_4.2~rc2-7.debian.tar.xz 89904 BLAKE2B dd04f2dd044d0bca85920eaf5c79a288d69c47a7ad7e36509a126c01ef63bd045d7e0530450650028de39d74ad852995ca080c3a73dbcb1cf1b3783118109f35 SHA512 3d36533d2713b663606919b2bfec18b15e18a6a0194e333e38e4a58f175da96af7b1fe16f0c36ee148e14492a4e0710b9fad6ac7856495b63c0176ebb7333be6 EBUILD mdadm-4.1.ebuild 2390 BLAKE2B f087e92607145b9e9235a4da6571d2a691a5f69072cfd40b183422411f4b1c8a41049b8350ff0761c79527afef6ca759e7dcdde42cd7c7bb6620795aef69da7d SHA512 b80d6eec601955155730be28e81fe8b260eeedb3eedc20edd677d5c56fd416ac5b8fac93ecad7047e3e28441437bd3f3b0359de0735933dc9454c31e961d56ea EBUILD mdadm-4.2-r1.ebuild 2890 BLAKE2B 047a149bf142139bd87c9d1d4a8814c16e1c924424a24964e895784d2bde0ae5f7a2090f0d936900c485e0bce000bd142df6256ba01ce52b0c58754a49b4d847 SHA512 e39329c3358b3c861d91b46eeebccf3af16f4614557bc2fd48abbd53889c1939deee79506176a8498376e57728f24d421580e6d833d980760e0713a27914c449 -EBUILD mdadm-4.2.ebuild 2402 BLAKE2B d621206ab85486fd0fe5498834b3089a404054741dfc9ad9f089cc6243bc3300597429f9847bfcd6158019ecfcdf148f4b684a07f27863b91327fb8d5ffffa24 SHA512 8e1b50fd67d7d2a7761c2ece15ddc240318b20ebd4ebbb236b6ff78554fc6fac403104177384b681b54108de71771be2bf75ec4304741ce3319ef7765bc42d7f MISC metadata.xml 339 BLAKE2B 68b5c6f497a2396786b76d8cb10a076933ebff54b319ccaba2d8c5af18fb62a56519c5a42b248d7a92624514f3de635be5ff1180ef0b0a7deb8d391324680560 SHA512 3aba8c92057ff5dc92e2a9455f986bea0fcfb84d4c7ecbca2782d983cbd6ca11c1ee4443a217cbaea87d2903659390b04b26adc156782a2672d249254925071b diff --git a/sys-fs/mdadm/mdadm-4.2.ebuild b/sys-fs/mdadm/mdadm-4.2.ebuild deleted file mode 100644 index 645299b2022e..000000000000 --- a/sys-fs/mdadm/mdadm-4.2.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit flag-o-matic multilib systemd toolchain-funcs udev - -DESCRIPTION="Tool for running RAID systems - replacement for the raidtools" -HOMEPAGE="https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/" -DEB_PF="4.2~rc2-7" -SRC_URI="https://www.kernel.org/pub/linux/utils/raid/mdadm/${P/_/-}.tar.xz - mirror://debian/pool/main/m/mdadm/${PN}_${DEB_PF}.debian.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -[[ "${PV}" = *_rc* ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="static" - -BDEPEND="virtual/pkgconfig - app-arch/xz-utils" -RDEPEND=">=sys-apps/util-linux-2.16" -DEPEND="${RDEPEND}" - -# The tests edit values in /proc and run tests on software raid devices. -# Thus, they shouldn't be run on systems with active software RAID devices. -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/${PN}-3.4-sysmacros.patch #580188 -) - -mdadm_emake() { - # We should probably make corosync & libdlm into USE flags. #573782 - local args=( - PKG_CONFIG="$(tc-getPKG_CONFIG)" - CC="$(tc-getCC)" - CWFLAGS="-Wall" - CXFLAGS="${CFLAGS}" - UDEVDIR="$(get_udevdir)" - SYSTEMD_DIR="$(systemd_get_systemunitdir)" - COROSYNC="-DNO_COROSYNC" - DLM="-DNO_DLM" - - # https://bugs.gentoo.org/732276 - STRIP= - - "$@" - ) - emake "${args[@]}" -} - -src_compile() { - use static && append-ldflags -static - mdadm_emake all -} - -src_test() { - mdadm_emake test - - sh ./test || die -} - -src_install() { - mdadm_emake DESTDIR="${D}" install install-systemd - dodoc ChangeLog INSTALL TODO README* ANNOUNCE-* - - insinto /etc - newins mdadm.conf-example mdadm.conf - newinitd "${FILESDIR}"/mdadm.rc mdadm - newconfd "${FILESDIR}"/mdadm.confd mdadm - newinitd "${FILESDIR}"/mdraid.rc mdraid - newconfd "${FILESDIR}"/mdraid.confd mdraid - - # From the Debian patchset - into /usr - dodoc "${WORKDIR}"/debian/README.checkarray - dosbin "${WORKDIR}"/debian/checkarray - insinto /etc/default - newins "${FILESDIR}"/etc-default-mdadm mdadm - - exeinto /etc/cron.weekly - newexe "${FILESDIR}"/mdadm.weekly mdadm -} - -pkg_postinst() { - if ! systemd_is_booted; then - if [[ -z ${REPLACING_VERSIONS} ]] ; then - # Only inform people the first time they install. - elog "If you're not relying on kernel auto-detect of your RAID" - elog "devices, you need to add 'mdraid' to your 'boot' runlevel:" - elog " rc-update add mdraid boot" - fi - fi -} diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest index f5d476eada45..6503a8deefd7 100644 --- a/sys-fs/mtools/Manifest +++ b/sys-fs/mtools/Manifest @@ -1,10 +1,5 @@ -AUX mtools-4.0.38-strtoi-definition.patch 3484 BLAKE2B 85ef88843620e9d467382ad5323eb9f4f02fd1dd9c766ac451454c0bae24a0f490b62d17b3cf6c0fe7e67d85f148e8304e979d66a2cd09827fee7a2aa2c0b2c2 SHA512 ee56002b7beda7adeb59fee7a9f98400e78abebc6d15d2c70ddc5b99c3efa6dec3c0f12f08c0941ea7befa11532062bcf014b7189e1e5cb1d191de49b722bace -DIST mtools-4.0.35.tar.bz2 455988 BLAKE2B 9c1ac7f3ad3f9f13a572d0e1ea3c3a9d79bd08f0ae963c7357a19a687b74536cd8442eb167a9e50f7d22398c56736753b0d98bccdaa4c7d8427d1c09e1dd786c SHA512 ef563b3319285667993c82d819e08cb819a6bcd71c466fc252568996b4218cfb3731107ffcd6150ba33c0837e012e02057def41e2b011f751eaf550bfa366a10 DIST mtools-4.0.37.tar.bz2 441076 BLAKE2B a84ff9e532a1896706589dfe7e62b1e400baf0ab9b86cc3d4a09bd4a0a24d1e86f504b9005c98765f62d735d227d0a1d5ab78354c587c88e2d42a4146d127dc1 SHA512 5ff4da9050dd5d5c0929dd9977866086085bd8fef577f3c6ce2ed6fb958eec2304db612c0766e6be1a048819e29f62023cb0f0a9464a84ed7cc21de9561fadce -DIST mtools-4.0.38.tar.bz2 440491 BLAKE2B 4d486b9bcbf31c9056ed6460d3d7ccb160f2d3d68e2b9a87590821251513a299ab321df825821722c41e13f608250eecad52e828c901ab956e471cd56871a50c SHA512 045e7dba159699c53abefd69e2065c116e2e360e7ec537df1e4d38309fb03587c600bb930363ecffef48cef1c8c118146691cf9a35c36abbb40e4546e532ce4a DIST mtools-4.0.39.tar.bz2 429751 BLAKE2B b1b04fa1614cf36245c60c3ef35de1869e53786dbc9a7e864278a51c9519c63b59fff9dffbd761fbc59782161ba201908b4a5b6792a7231fff6f27be2bea1d67 SHA512 6f84ce57a7c088b526e3e4fa7c509f1869a55b87951134d6257533d311b4a97496c44fa374de6f8cb15c645d60b9f9745ccbdf405d0d77a30a86e31ed8d54ce4 -EBUILD mtools-4.0.35.ebuild 1039 BLAKE2B 589196fa40f2b431f37fd57202bcafeff5b9983c39ea7af707657909105e7a45976628db2ff42be2f8636902b6cc20e4d59399063a02eeba7637a25cbbef4e88 SHA512 24d053a6446ab3d1752fd9fd07bc378f0f7e69a596b088a5a690dcb065aaf146e895223ef9141beaa5c3461382ebb94025cb5aa9e653c5da9d9643250d247a05 EBUILD mtools-4.0.37.ebuild 1060 BLAKE2B caeed9304847d8a1d33982f3a406a9e089885df0b726ec0b87059e691548126f2aceabf518d6819c7c7ed56fe654f7b8ebd39b4962bcfadcc900afda233a9b3f SHA512 06ad2c7dd3ad0de7758a96e20fca19987f96e1d1dab02bcda2654d0a429c4f48614eaa911167fa3ee2c8fbcac8d66f0f822a0bc18b9177c1704573c64a299558 -EBUILD mtools-4.0.38.ebuild 1216 BLAKE2B 0d5355381636bfebb11efb427ec1c5c24af74096e84e8da78d8b2bb1ca2c0b8d4fd4947ec3ab7ec9d08eab53975d87cfa7f41f567d2a6aa1f0080e292bdfdd99 SHA512 0a930e771a7a5a3bf7835369293eebaa67e639f6bfeca309793ff3227ae3e781886e370f9f744a4fbce8231a898e25a4ffc059c80ca07dc95b4f7148ceccb909 -EBUILD mtools-4.0.39.ebuild 1151 BLAKE2B dc122b8ca162ad9ef0f7ad7e046242d6f2535f2388e47e5b8a6c620428bc82475b86c350fb917cd2667fa75e35df2d6582da517459579a3180b88c4295d18974 SHA512 9b0a182402f9f6d2c55eabd3e89070c192166eb2b82f83fcdfc694b7792934708aeb6ba7d0ffead641b17563546033433fc95bfd2371847564e7e829c2534027 +EBUILD mtools-4.0.39.ebuild 1074 BLAKE2B e64c1d524462048edc6b11988a04c937620758ae4210492c4f709670dc0ce198d18937e7e129b4c4fb1dd3e980d6e5ca0dda62cf4f5fa2899029782691051f89 SHA512 8e60f098760b665d884f091b91a7cee31f774cfe86b0288d2a1f454f9f1fc34b65c79d7c14ecb0370ff9f3c6c5c3f7f640a7621fa5af8d04efe67e7e793401ec MISC metadata.xml 328 BLAKE2B c30c5c458fda474023b5e314ce53311d21a0f15b69463f18a32126f409a034153b8c5b65009584ac0f20666ec9780f7cf518b7207f8550a950dbd2e82da3e138 SHA512 43d7d1e26abf6567746dcab87215aa69faea5308f951348ae82bf9c6bd5e414a69898eb4a23a46ef84ee5be0aab2d019beb8287d2ed2195b6a1b56f25edc2316 diff --git a/sys-fs/mtools/files/mtools-4.0.38-strtoi-definition.patch b/sys-fs/mtools/files/mtools-4.0.38-strtoi-definition.patch deleted file mode 100644 index 637e9193f43f..000000000000 --- a/sys-fs/mtools/files/mtools-4.0.38-strtoi-definition.patch +++ /dev/null @@ -1,94 +0,0 @@ -https://lists.gnu.org/archive/html/info-mtools/2022-03/msg00001.html - -From d36dea2ea7f246f28719dcb01b7a8ad7ad8ed1f6 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Sun, 6 Mar 2022 02:36:03 +0000 -Subject: [PATCH] Use own definition of strtoi -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Before this change, build resulted in implicit function declarations like: -``` -* config.c:269:57: warning: implicit declaration of function ‘strtoi’; did you mean ‘strtoui’? [-Wimplicit-function-declaration] -* floppyd_io.c:473:20: warning: implicit declaration of function ‘strtoi’; did you mean ‘strtoui’? [-Wimplicit-function-declaration] -``` - -The include(s) for inttypes.h are guarded by HAVE_INTTYPES_H -(normal autoconf pattern) but we're not checking for inttypes.h -in configure. But adding this doesn't solve the issue. - -If libbsd is installed, configure discovers the strtoi -provided by libbsd although the included version may still -end up being glibc's as the include path doesn't change -(glibc has its own which doesn't feature strtoi). - -If trying to use libbsd's, we end up with a build failure: -``` -config.c: In function ‘get_env_conf’: -config.c:269:57: error: too few arguments to function ‘strtoi’ - 269 | * ((int *)global_switches[i].address) = strtoi(s,0,0); - | ^~~~~~ -In file included from sysincludes.h:174, - from config.c:18: -/usr/include/bsd/inttypes.h:43:10: note: declared here - 43 | intmax_t strtoi(const char *__restrict nptr, char **__restrict endptr, - | ^~~~~~ -``` - -So, it seems best to just always use our own definition of strtoi, -given our definition doesn't match libbsd's anyway. This avoids -the build failure as well as the implicit declaration warnings. - -Signed-off-by: Sam James <sam@gentoo.org> ---- - configure.in | 2 +- - mtools.h | 2 -- - sysincludes.h | 4 ---- - 3 files changed, 1 insertions(+), 7 deletions(-) - -diff --git a/configure.in b/configure.in -index 72cf205..eb1c754 100644 ---- a/configure.in -+++ b/configure.in -@@ -218,7 +218,7 @@ dnl Checks for library functions. - AC_TYPE_SIGNAL - AC_CHECK_FUNCS(strerror random srandom strchr strrchr lockf flock \ - strcasecmp strncasecmp strnlen atexit on_exit getpass memmove \ --strdup strndup strcspn strspn strtoul strtol strtoll strtoi strtoui \ -+strdup strndup strcspn strspn strtoul strtol strtoll strtoui \ - memcpy strpbrk memset setenv seteuid setresuid setpgrp \ - tcsetattr tcflush basename fchdir media_oldaliases \ - snprintf setlocale toupper_l strncasecmp_l \ -diff --git a/mtools.h b/mtools.h -index b3fd3c8..190ddf8 100644 ---- a/mtools.h -+++ b/mtools.h -@@ -188,9 +188,7 @@ off_t str_to_offset(char *str); - uint32_t parseSize(char *sizeStr); - unsigned int strtoui(const char *nptr, char **endptr, int base); - unsigned int atoui(const char *nptr); --#ifndef HAVE_STRTOI - int strtoi(const char *nptr, char **endptr, int base); --#endif - unsigned long atoul(const char *nptr); - uint8_t strtou8(const char *nptr, char **endptr, int base); - uint8_t atou8(const char *str); -diff --git a/sysincludes.h b/sysincludes.h -index 6dccded..0c17fb5 100644 ---- a/sysincludes.h -+++ b/sysincludes.h -@@ -169,10 +169,6 @@ typedef unsigned char _Bool; - # define __bool_true_false_are_defined 1 - #endif - --#ifdef HAVE_INTTYPES_H --# include <inttypes.h> --#endif -- - #ifdef HAVE_STDLIB_H - # include <stdlib.h> - #endif --- -2.35.1 - diff --git a/sys-fs/mtools/mtools-4.0.35.ebuild b/sys-fs/mtools/mtools-4.0.35.ebuild deleted file mode 100644 index 74e3d8fd4a01..000000000000 --- a/sys-fs/mtools/mtools-4.0.35.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit flag-o-matic - -DESCRIPTION="utilities to access MS-DOS disks from Unix without mounting them" -HOMEPAGE="https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools" -SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos ~x64-solaris" -IUSE="X" - -RDEPEND=" - !elibc_glibc? ( virtual/libiconv ) - X? ( - x11-libs/libICE - x11-libs/libXau - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXt - )" -DEPEND="${RDEPEND}" - -src_configure() { - use !elibc_glibc && use !elibc_musl && append-libs "-liconv" #447688 - local myeconfargs=( - --sysconfdir="${EPREFIX}"/etc/mtools - $(use_with X x) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - local -a DOCS=( README* Release.notes ) - default - - insinto /etc/mtools - doins mtools.conf - - # default is fine - sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED}"/etc/mtools/mtools.conf || die -} diff --git a/sys-fs/mtools/mtools-4.0.38.ebuild b/sys-fs/mtools/mtools-4.0.38.ebuild deleted file mode 100644 index 18ce60a45f39..000000000000 --- a/sys-fs/mtools/mtools-4.0.38.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic - -DESCRIPTION="Utilities to access MS-DOS disks from Unix without mounting them" -HOMEPAGE="https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools" -SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris" -IUSE="X" - -RDEPEND="!elibc_glibc? ( virtual/libiconv ) - X? ( - x11-libs/libICE - x11-libs/libXau - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXt - )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-4.0.38-strtoi-definition.patch -) - -src_prepare() { - default - - # Only needed for strtoi patch - eautoreconf -} - -src_configure() { - if ! use elibc_glibc && ! use elibc_musl ; then - # bug #447688 - append-libs "-liconv" - fi - - local myeconfargs=( - --sysconfdir="${EPREFIX}"/etc/mtools - $(use_with X x) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - local -a DOCS=( README* Release.notes ) - default - - insinto /etc/mtools - doins mtools.conf - - # Default is fine - sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED}"/etc/mtools/mtools.conf || die -} diff --git a/sys-fs/mtools/mtools-4.0.39.ebuild b/sys-fs/mtools/mtools-4.0.39.ebuild index 78c11df773a0..dc740ca0249c 100644 --- a/sys-fs/mtools/mtools-4.0.39.ebuild +++ b/sys-fs/mtools/mtools-4.0.39.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools flag-o-matic +inherit flag-o-matic DESCRIPTION="Utilities to access MS-DOS disks from Unix without mounting them" HOMEPAGE="https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools" @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris" IUSE="X" RDEPEND="!elibc_glibc? ( virtual/libiconv ) @@ -24,13 +24,6 @@ RDEPEND="!elibc_glibc? ( virtual/libiconv ) )" DEPEND="${RDEPEND}" -src_prepare() { - default - - # Only needed for strtoi patch - eautoreconf -} - src_configure() { if ! use elibc_glibc && ! use elibc_musl ; then # bug #447688 diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest index f60b5314b49e..6cc08c447838 100644 --- a/sys-fs/multipath-tools/Manifest +++ b/sys-fs/multipath-tools/Manifest @@ -11,5 +11,5 @@ DIST multipath-tools-0.8.9.tar.gz 534866 BLAKE2B b5ebf3c393f6b60e85678ac07378ae0 EBUILD multipath-tools-0.8.6-r1.ebuild 2138 BLAKE2B e6be272ce638c903e22abe6dddc932b2b52a52293ff2719e4a56dea2d782592ae034171f100379ee0239d7b2e0c8254d02396e50ed0c51d357dfb3118ea21be7 SHA512 66e6adbfbda1b831333a4e2dcd928f78e9aa89aa3415a803c716b9700e8247c822be2094ce5780718da879546738d344b012d4cf495aabf7c885b865367aa805 EBUILD multipath-tools-0.8.7.ebuild 2132 BLAKE2B a42ce3be0b507c66af3690b81593f9d18a5d3a70dc77ee323cf816fce04628b07dd12acd12b624ea7f2fb3d0e7468d80d2ea0c4200dc17b848d5f68333870268 SHA512 3231f180433566de5eff4b7398db745dea00ecee4ca64de35dd5d32921686a4543982068c894c86dcd3741e83488ef6c821461de80f33e32f9fd4f50162c8904 EBUILD multipath-tools-0.8.8.ebuild 2255 BLAKE2B 37fede21aa5acc7ccb2bb0a30b1643b5961a50d729cdaee83a3c335d4f25c4f67cd9c5d7f2953eac2b58e529aee1e5f35276570e33f33c9b9fc99838bd8787eb SHA512 7f0c5d91cd0a7826d34292d5015fa9dc6423062a4bdf7e90667cbe33ad6ece7c47c6bd543a96bc511466adf3ab10906268b4d5a0f78925f02764a03b6dea2188 -EBUILD multipath-tools-0.8.9.ebuild 2089 BLAKE2B eb64bbcac55df3a285c99c8c8120632772c37b374d720c1b481e79d7abbd200414b55b442e4088f9be942cbbda9ad778945691f66f24653c149f1b6242d19d22 SHA512 fa04dc51808a1be4d2359cb1613efd75c01e60fbe0cacc34bf78c79b884291d3258acfc78cd0415fe4b5e1364b4b77037a39b1f9fc81681f3cbfda2dc77a2659 +EBUILD multipath-tools-0.8.9.ebuild 2084 BLAKE2B aa64be707501daeab5f89a41aa807ea948ca7ddf1b3d5d4a11d164f3566059552085815cc1485c7d42e90bd12a80754f91763839bb820944f92a7348da12f2b0 SHA512 929dad1d29765a0971ae69dd528fb6f042447231a2e421638d229869cd081f42b1b5b907c3e5c958df7a0711e6f402839e63d3279a14204f73b2937b0ad3e459 MISC metadata.xml 453 BLAKE2B 2f2a56731716bfb47dee061219c80834aa382daf9e6ce937cef2237fc1bbb05e988672cc178ad471d68e9ab4f9292677be71ef9198a163f85a7f3b8658f5d698 SHA512 e8df3db70f5d919789ff0512409365fc80dfbb31ede6079c49910e8acffc6b5289290a48acef8230bc59899262801255048d1a730f81c3642945f8c872ac5428 diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild index 232f231a81dd..55bb66af418a 100644 --- a/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild +++ b/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv x86" IUSE="systemd rbd test" RESTRICT="!test? ( test )" diff --git a/sys-fs/ntfs3g/Manifest b/sys-fs/ntfs3g/Manifest index df63a46a0b8b..5aae06ad9cd1 100644 --- a/sys-fs/ntfs3g/Manifest +++ b/sys-fs/ntfs3g/Manifest @@ -1,4 +1,3 @@ DIST ntfs-3g_ntfsprogs-2021.8.22.tgz 1317499 BLAKE2B 403036c68a37ba83873b5faadbb2088deb25e0ff31deb1958d4f869a198d830caa44edea879492a7894f5e7a5ad6205a6fda57bf8de722ce49bf3187239ad993 SHA512 e0544df78a6c352999e1206d7b5d71c56e39396b7a0936a261d728c2ac9d61c6b95ef297f8529ac2a5146f31c1c9e43066d3e281064d4f5d781a04eba51f536d -EBUILD ntfs3g-2021.8.22-r3.ebuild 2037 BLAKE2B 9f22dab696e83d70b4c3a599763c1c4cc8e8f8492577b5d5210fa969e69b60cf28afd9a5d09f1bec6d101ce95589472da640c4792a9ad827ac3d2a89bba1a224 SHA512 fa12216ba8e5ca0134b93856ec29e36b3e75b643f7566a9aadeac5af90626ccc733f618b6ddf7e2991d875faa1fa81572d32d85d456c0a732037a679791260e1 -EBUILD ntfs3g-2021.8.22.ebuild 2078 BLAKE2B 236f32ff2a280c8c42d84cb66b5a9aea465e0d9ef4095991406d40edd59a98b396598698318098762be665bb62c4c917abac68015a01a2183b28066acb24c25d SHA512 7bf7851726792dcadf394cb7278723a4a9a59f425c362bde4a2128e60e0c5677a286a4c02596c15f05b29830074891166b774a58f4c9c566c6272da29b04c1ae +EBUILD ntfs3g-2021.8.22-r4.ebuild 1999 BLAKE2B 32a26db6f373104aef8efe5a33e03bc997ef4b99143c2f1d8a196765b598454387c116aa8c63dd62597e2cc47f50a837f64c3e3f57044eb0b61906250bf80714 SHA512 194ea31463922cd64a96cd6f424f39d19859452c31a4ae0557fadf0a301a021e279dc68113f7a10cee547ec3c9b91e2778188201bbdba26827296110f9d69ff7 MISC metadata.xml 1164 BLAKE2B 276dcf2d0cccad4b91a84390949ff8a81b76e54c22d7bfbe4b778c97917224f3d0603079fb74e4b3ff0e058580f4ac6540aef3bae4fdc6ae9b2fb54b831e22ea SHA512 63391014c4dc8ba722c8f90d6fe1952b5f4386d44b1bb2af195e907e5027ede0f4063e4390679b6b521b892fcc12194914b4f40a09c6bc08a300a90bdd250390 diff --git a/sys-fs/ntfs3g/ntfs3g-2021.8.22-r3.ebuild b/sys-fs/ntfs3g/ntfs3g-2021.8.22-r4.ebuild index 8e3bee187cef..3ee5db1efeb5 100644 --- a/sys-fs/ntfs3g/ntfs3g-2021.8.22-r3.ebuild +++ b/sys-fs/ntfs3g/ntfs3g-2021.8.22-r4.ebuild @@ -51,7 +51,6 @@ src_configure() { $(use_enable xattr xattr-mappings) $(use_enable ntfsdecrypt crypto) $(use_enable ntfsprogs) - $(use_enable ntfsprogs quarantined) $(use_enable static-libs static) --with-uuid diff --git a/sys-fs/ntfs3g/ntfs3g-2021.8.22.ebuild b/sys-fs/ntfs3g/ntfs3g-2021.8.22.ebuild deleted file mode 100644 index 64a938dc180b..000000000000 --- a/sys-fs/ntfs3g/ntfs3g-2021.8.22.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit linux-info toolchain-funcs - -MY_P="ntfs-3g_ntfsprogs-${PV}" - -DESCRIPTION="Open source read-write NTFS driver that runs under FUSE" -HOMEPAGE="http://www.tuxera.com/community/ntfs-3g-download/" -HOMEPAGE="https://jp-andre.pagesperso-orange.fr/advanced-ntfs-3g.html" -SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz" -#SRC_URI="https://jp-andre.pagesperso-orange.fr/${MY_P}.tgz" - -LICENSE="GPL-2" -# The subslot matches the SONAME major #. -SLOT="0/89" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -IUSE="acl debug +mount-ntfs ntfsdecrypt +ntfsprogs static-libs xattr" - -RDEPEND=" - sys-apps/util-linux:0= - sys-fs/fuse:0 - ntfsdecrypt? ( - >=dev-libs/libgcrypt-1.2.2:0 - >=net-libs/gnutls-1.4.4 - ) -" -DEPEND="${RDEPEND} - sys-apps/attr -" -BDEPEND=" - virtual/pkgconfig -" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - CONFIG_CHECK="~FUSE_FS" - FUSE_FS_WARNING="You need to have FUSE module built to use ntfs-3g" - linux-info_pkg_setup -} - -src_configure() { - tc-ld-disable-gold - - local myconf=( - # passing --exec-prefix is needed as the build system is trying to be clever - # and install itself into / instead of /usr in order to be compatible with - # separate-/usr setups (which we don't support without an initrd). - --exec-prefix="${EPREFIX}"/usr - - --disable-ldconfig - --enable-extras - $(use_enable debug) - $(use_enable acl posix-acls) - $(use_enable xattr xattr-mappings) - $(use_enable ntfsdecrypt crypto) - $(use_enable ntfsprogs) - $(use_enable ntfsprogs quarantined) - $(use_enable static-libs static) - - --with-uuid - - # disable hd library until we have the right library in the tree and - # don't links to hwinfo one causing issues like bug #602360 - --without-hd - - --with-fuse=external - ) - - econf "${myconf[@]}" -} - -src_install() { - default - use mount-ntfs && dosym mount.ntfs-3g /sbin/mount.ntfs - find "${ED}" -name '*.la' -type f -delete || die - # https://bugs.gentoo.org/760780 - keepdir "/usr/$(get_libdir)/ntfs-3g" -} diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest index 8fced846b700..a0c5a42a089d 100644 --- a/sys-fs/quota/Manifest +++ b/sys-fs/quota/Manifest @@ -8,5 +8,5 @@ AUX quota.confd 359 BLAKE2B 37d0cf75f96ca4ccd2d9be1ac3def62a3ac409873cfad33e1faf AUX quota.rc7 688 BLAKE2B 18a3317da5360532d6e6d9051f674a7a8e0495fa08aae8511fc7b77d2b16adb36dcdd9e510cb7bd15444b1ae8b606d607cc1ebaa10afb064b052d31ed780afbd SHA512 6a0536285bb340779cf4989060ed5a10c9c4a24a48d334174cd84cd54938d042f7a4047f837f96fc7a3c88a1d20317f662c984bd88c00b32cbf48302ba82a529 AUX rpc.rquotad.initd 448 BLAKE2B 59dc12ee73ddd0473f8122c780ef94c46dc8cfa0e15bd7a839b2d0360ea08d18d239b17b538b0ff9cd8110b8c29676aa93d06f25cf4acbc7f169ac545ab5248e SHA512 c6ab8d6e0e15032bbbee523c2550e7f23d48fb45035d37181e988f2f96cd1ece316681f1b529b51fd1aeb390c5f27a6911f5de52132e90b4cbcfb4c2dfc95954 DIST quota-4.06.tar.gz 520448 BLAKE2B 2cbadeade228d0154f3a8d455cc1aa6e85c9ad7854007e3188c9035abe4d5fdbdf97985fd2fa6308f486ffbe60461e0fe1139f1ec0ca415ce08292d74e0ddde1 SHA512 cece46b8e3a82e8afcf8bfc9f6b310ec91afe034102cebc031bc7d7e04287fdbffb21ab1d3e6e1825175cffa4bad0a4ecbefec0efee028d961b14ac626d5c871 -EBUILD quota-4.06-r1.ebuild 1620 BLAKE2B af22ce41ad07fce67a7d1795f40965a2fbab6a6445e40f7f22e3d310a48da694646da2332e2a2ff77cdbefc334ec6a96ee1e80fb91f65901c3299edf3f01acd6 SHA512 064cf7cff51f4af75eaa070a38a7a825d268767e0f61ea42f145bb7249f42b660938bc260be7fb188f4911bfd218e19d1e011eda96279214c3c10e04ac3df40c +EBUILD quota-4.06-r1.ebuild 1627 BLAKE2B ba0a9b8392257e82d5a4f7ae4a1a6221d678fa64a115e36ffe58187cdf7bac6a865e116492b09a6ce567542b4684da0fc8dd82bca6dee8a993ac2be7f4e0aeca SHA512 960149c40dc927488b90ce33cec112f8e2c12c6d2346bacedc2729b9bd299f27937afeac8f9fe1dbb4fed3c05c72b659359f6d33ddc717cdf8974e13e711fade MISC metadata.xml 483 BLAKE2B a66c5218d5879916eb8d1158e838644b600c79c0285236bb622d4c71d977593c4c95c2e35f52d2be34a3990a0e6ac3a9f6461c541cdf0d704c303ec242a77656 SHA512 0fe78ffe3560e8518ee02f71b7ce3b0ef4963f8d87fd16daac911e42acf269f7f652cd5efa5a498c0e50efa9854c1ba10cd79382b82972aea682510433804614 diff --git a/sys-fs/quota/quota-4.06-r1.ebuild b/sys-fs/quota/quota-4.06-r1.ebuild index c60ede4d7067..60b635e13264 100644 --- a/sys-fs/quota/quota-4.06-r1.ebuild +++ b/sys-fs/quota/quota-4.06-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" IUSE="ldap netlink nls rpc tcpd" RDEPEND=" diff --git a/sys-fs/reiser4progs/Manifest b/sys-fs/reiser4progs/Manifest index a0ed97cd74a4..f3b50834376d 100644 --- a/sys-fs/reiser4progs/Manifest +++ b/sys-fs/reiser4progs/Manifest @@ -1,8 +1,6 @@ AUX reiser4progs-1.0.7-readline-6.3.patch 472 BLAKE2B 88f0489b88691e72a8813145428e949b0ace21b15dc01f18da4292524e3601adfbe30e3b6cb3d1f12174bc5241fa7732bf36856025c7af5c678f3ca53d24497e SHA512 0162505148699f8e5270314be586d8db7d42f9ea5fc8517b5475aa59f54b47eb626349c36820cc34c0490e0c3df1597a230c27abf316226cc7d261e986963788 DIST reiser4progs-1.2.1.tar.gz 980203 BLAKE2B 8c9cb77458c083c50f34c17bddf4747b755b52b911a63835152ad584494c2738a5317c28e5b3f1e6bfdc49416f3715ca4fbbd9c8a428b5b484b54f8f4a861a58 SHA512 2caac5a98d672d68910c6df3e694a42365fa6273ae367c26126778c1fbe956aa502dac236d36c3302a5bf109468ad3447e645a6eab89c83f122dd1afe2aeda21 -DIST reiser4progs-2.0.4.tar.gz 997361 BLAKE2B 3d083c2c702f6c469403447bd2bb59257c22a6f87e062b83227c97147c37e69f93f1ffb6a1ea2c9f23f94a5ac8fcb834da475893c9bd268fc8902e6af2af4c10 SHA512 222eaa69f89fa1cfad2b5791af028560fb6e57e44fbb5e025122c25b50dd4aea28a8fd362818a884fa6b3d6164e5b0c78ab63f0649e2e65780f1aee2c0d26375 DIST reiser4progs-2.0.5.tar.gz 997516 BLAKE2B 38799bd2161ac3ad631b3f11f4f01f647fa8210786fa4aeb290a84dac95080cdf979be1cb4526abf08567e88f25aad54a3d776be85900e702a7325e674ddd0e1 SHA512 1e1f263828bd5f44837bcbdde072a94b2cc5a099dbf52d3e0f7f6851812fb2e8b77a3edcf5448f678304e23240c63919547a9671d36b816f97f989b17b494d27 EBUILD reiser4progs-1.2.1.ebuild 1288 BLAKE2B 0b7ca382987ce89c562872041157c2cd3eeffee56efb8fb7ee0cb1ba895caeb0e9421e4e071f10dd46f453fefe0a1be21661bc13ea3e5e28d9d26d87b1e8b575 SHA512 425f5935fae4b159a56717e611df6bb2abcab657058ed96326d7858370554aafe37bc1c4b0744e7dd368aaa6423b1e2f481917d6bf5735b5a7adabb1cd7d4975 -EBUILD reiser4progs-2.0.4.ebuild 1348 BLAKE2B 309eb37179f526c8eb55d848c5da2de5288ea3df88dcdb09e3155151eb6b0e2a1efd5190886b58a910c912b4e992a08b035264dccc12ca0ef5692a7d9928e77b SHA512 1a9f042cdb874e0a207774d62a7b804ae8980d7b09920cb05b6ed1439583d8aff4164e51b511b2cbbb172df6f9800435aa9a65570ca8348d617d1793e0af3246 -EBUILD reiser4progs-2.0.5.ebuild 1343 BLAKE2B 096b9fb491117f98c6e4026b00f1e29037c526913d0c24ed8c6fcb8b45f532652b6338bf0f0e6440c3e4be9d869812c985be6956381228fad8140ac468010340 SHA512 5069c930aadb2de9cbe4e59c4905c876f1bfc9d1114f1dfd3150b9decedb58d6a75326317a56da292a381c04b33adb8fe9dfbf68e88a9ae4f7048fd13f978497 +EBUILD reiser4progs-2.0.5.ebuild 1350 BLAKE2B f4925fdf9a48e9d9c1dc671182cf05475ea25836db6b6f92548ce7c16dba647f01bad0ac3a9bc869fdc2e5876a18f934d05479bd27f475fbe40dfb42808c0264 SHA512 ff0b38999e892643afed5afe80f72297d808d15bb5715d77dd6925b84fffa0fedcfeb346167f3b5710e199952ca1a3629e3b42297558799c5041edb2d5aa99a5 MISC metadata.xml 241 BLAKE2B 69c2c526450c3fac8db61a9c83fa92e17f984bccdba1aab9c459dbe33a73482285305799efc2a544d5abee60e89f837bc5ebe431c39fd4acf4864bd5c0803f2d SHA512 11398472089e202d23a52ed08057c7f896a18818ded02333969613b3d6733377b1b5062b690518af2924f1e9c4347522da66994f8de72f0ca9192d0f90ebda16 diff --git a/sys-fs/reiser4progs/reiser4progs-2.0.4.ebuild b/sys-fs/reiser4progs/reiser4progs-2.0.4.ebuild deleted file mode 100644 index 45ddbfaabf1c..000000000000 --- a/sys-fs/reiser4progs/reiser4progs-2.0.4.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib toolchain-funcs usr-ldscript - -DESCRIPTION="reiser4progs: mkfs, fsck, etc..." -HOMEPAGE="https://sourceforge.net/projects/reiser4/" -SRC_URI="mirror://sourceforge/reiser4/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86" -IUSE="debug readline static static-libs" - -LIB_DEPEND=">=sys-libs/libaal-1.0.7:=[static-libs(+)] - readline? ( sys-libs/readline:0=[static-libs(+)] )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - static-libs? ( >=sys-libs/libaal-1.0.7:=[static-libs(+)] )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} )" - -PATCHES=( "${FILESDIR}"/${PN}-1.0.7-readline-6.3.patch ) - -src_prepare() { - printf '#!/bin/sh\ntrue\n' > run-ldconfig - # Delete hardcoded link/compile flags. - sed -i -r \ - -e '/CFLAGS=/s: -static":":' \ - -e '/CFLAGS/s: (-O[123s]|-g)\>::g' \ - configure || die - - default -} - -src_configure() { - local myeconfargs=( - $(use_enable static full-static) - $(use_enable static-libs static) - $(use_enable debug) - $(use_with readline) - --disable-Werror - --enable-libminimal - --sbindir=/sbin - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - gen_usr_ldscript -a reiser4{,-minimal} repair - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/sys-fs/reiser4progs/reiser4progs-2.0.5.ebuild b/sys-fs/reiser4progs/reiser4progs-2.0.5.ebuild index bc2336496e29..88d7ce5023c9 100644 --- a/sys-fs/reiser4progs/reiser4progs-2.0.5.ebuild +++ b/sys-fs/reiser4progs/reiser4progs-2.0.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/reiser4/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 arm ~arm64 ppc ppc64 -sparc x86" +KEYWORDS="amd64 arm ~arm64 ~loong ppc ppc64 -sparc x86" IUSE="debug readline static static-libs" LIB_DEPEND=">=sys-libs/libaal-1.0.7:=[static-libs(+)] diff --git a/sys-fs/reiserfsprogs/Manifest b/sys-fs/reiserfsprogs/Manifest index 31ad34f6d8a3..58a5d54f6aaf 100644 --- a/sys-fs/reiserfsprogs/Manifest +++ b/sys-fs/reiserfsprogs/Manifest @@ -1,5 +1,5 @@ AUX reiserfsprogs-3.6.25-no_acl.patch 274 BLAKE2B 1b49c0c98d935c1bfcb0191882a7e8e21aecd042dc8a8ba5d3a807dc59534b9b47e727ca668741fd8a82c811a744706348c3ea88c39837af891a2c711437f5c3 SHA512 29419b64f7749612ab2883da91ac97831a2ba8aee819b6e0e8b781b34594541e59b6b7a3841e9967e4623fb9772e4be81b13970c86d61497222789ffa8b4e20e AUX reiserfsprogs-3.6.27-loff_t.patch 504 BLAKE2B 6c38ac24d9d8e0bc665557303b5cc299fdd3a4529bc29370ffa8129499ac9d6e1f0a7ed66c93fefa1a647a304ae77309dc87deeeb8b29961398e509f30d0cb27 SHA512 74332f8acd84a3d0374d6ff9803e63bc78ceb18ec130fef213bf326a6b146b8e4951ac8aee5b7349239716627889febd1c832862ae058a822cc71b0a75333d2f DIST reiserfsprogs-3.6.27.tar.xz 449176 BLAKE2B cd22120faa4d6d11ab545349fde5304f41cf3ca88b2c988255b7ca0e87961c9ccaa3095cad086e479a2b50627ad9bf3e90b2af46ddda64abc119e2a6755b8341 SHA512 bc524aa1ad7f8502238761fd185bfb8473048947bd579e2803c73371928c6b245e0d90bd9d458f4bebcbf163892dbc9f4bae65aec68ebbaa436be7451c13f50c -EBUILD reiserfsprogs-3.6.27-r1.ebuild 1335 BLAKE2B 2ad72fb3f39902cf5c7fb337f254ac24e605b46f2faa806d6bd435bbe93a7d96b8cf3b2c4a591aaab0065587b37c5d4062565f609d6152a0e2b0d954fcd0c8f4 SHA512 266e6e80d45059f0525a2fcf49a2b6bb4de282884c4c7799415d871b5d6710f024633b3df663632b057b193b2fa7d99f31a514792a16f6f4c59325bfc20849a5 +EBUILD reiserfsprogs-3.6.27-r1.ebuild 1342 BLAKE2B 305898c226e23c704fe3c97c8f4f51ac0d3d3c56dae1226e468988d0f16d7bcc51a79ab16cc3f4e53fac0feaf47123327ec528d9edba5d121f469a572bdc0b7c SHA512 4fdb88700c5201412965a2d91319f2d6efb60b97d41ddf5afb260cd1fcb27ee7d518114516b09f343ee88e21004d5728e56ffaa38ae9eff79046f906822b46dd MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27-r1.ebuild b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27-r1.ebuild index 12a3e2149381..1dee26cee9b8 100644 --- a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27-r1.ebuild +++ b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/reiserfs/${P}.tar.xz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux" IUSE="static-libs" PATCHES=( diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest index bf139c3d1d13..97af031ef1b9 100644 --- a/sys-fs/squashfs-tools/Manifest +++ b/sys-fs/squashfs-tools/Manifest @@ -1,5 +1,3 @@ DIST squashfs-tools-4.5.1.tar.gz 270112 BLAKE2B cbd35daf582d284b021911bb754ed548763f2773e1bc02516ca18bab7034e352780c11eb7dfed1f047b70974dcfb716bb1a1d3729e5b25662203cfbf93553b73 SHA512 b3934ea1e26c7508110312711465644a6d9674b6b5332a7d011e191fa3c1d4b8be694214794a0f6005263d0f4e18bab96af2f7ed66a178f8e3bb3a781cd44896 -DIST squashfs-tools-4.5_p20210914.tar.gz 252104 BLAKE2B f3e2e281c30464b3c2e9b2a3520979f90ccb83665ac61a2f68513b402d8ef658621fc75c782c2f42da20ddf51f884e2ccc6217df941790fd45b41f3f4e3ec970 SHA512 a814092be787bbcbd4115f87493a63b67caa364ad88fe5a3c82808083343cbcbc22b4617bd5c72d65d8abe2b11eb77853bcc55c11f5cd5dc3edf24bd27cbd135 -EBUILD squashfs-tools-4.5.1.ebuild 1270 BLAKE2B ce5e6b149260a4bd9a75cc03b247c003315694b1be767e39d390bc1b747f67b143c968f5ec4709f765e72c2f27a98b91c350964a91ddb6d73555e9181e851966 SHA512 ff3e7a7949e0566c64a8aa57e6e7850488e8a4dc387c8193ba9f6fe66a117a08765f3dfc0348f27f8919c65fb60f5e1ad75464e587ea9a22aa53cf2a27680c88 -EBUILD squashfs-tools-4.5_p20210914.ebuild 1501 BLAKE2B e909ffbb86ef8a7dc103f6436a101e31c70d2a1fedca07c697bff192ecba3e42afe9b51272ad9dad9722b78392da1d06a9834240f9747a830abb23dd0962a6ea SHA512 e301da8e5ec3201f27a5847dd876aca3d594390de2b849827260c50435c12b4b34f57f5a7b5c5e1f03815d7184ed689f279db5940a9ad65a99baa6b53e9dd328 +EBUILD squashfs-tools-4.5.1.ebuild 1263 BLAKE2B 5eff6295550f8f004c894083bca9862d4e0d83234422a7fed136fa5a2d2add410fa73659da966f7f41500b87cdd43dda7901e799ef0f16347d33411e6a870c44 SHA512 ae4b46dede58eb800d376b68bcac80e702767e8e15a02325a515b190924d3c22628fee1883642e6b0e4dfbbc1feb63c376404b3ada43e1818af1db83392cda67 MISC metadata.xml 326 BLAKE2B b34f627cbc911d0e31c84e29ab196767d6618ae95909466efe663abdc54f76325b24e1d6a95ff5e7fa9d33f19b848dec1bfa95dc1b5f0b260839cf7337ce2c0f SHA512 354a34decfc9aa79c434275283e805423f2bcbbcb788e09236cd7b4e67a7bfbbc413e3874a45fe618f0e601036372e94c5965665483566cb651edea0728d5117 diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.5.1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.5.1.ebuild index 27d1c3f642c7..c8e5c9198e74 100644 --- a/sys-fs/squashfs-tools/squashfs-tools-4.5.1.ebuild +++ b/sys-fs/squashfs-tools/squashfs-tools-4.5.1.ebuild @@ -12,7 +12,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="debug lz4 lzma lzo xattr zstd" RDEPEND=" diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.5_p20210914.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.5_p20210914.ebuild deleted file mode 100644 index fdbb67149677..000000000000 --- a/sys-fs/squashfs-tools/squashfs-tools-4.5_p20210914.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit flag-o-matic toolchain-funcs - -MY_COMMIT="19fcc9365dcdb2c22d232d42d11012940df64b7c" -MY_P=${P/_p/-git.} -DESCRIPTION="tools to create and extract Squashfs filesystems" -HOMEPAGE="https://github.com/plougher/squashfs-tools/" -SRC_URI="https://github.com/plougher/squashfs-tools/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" -S=${WORKDIR}/${PN}-${MY_COMMIT} - -#SRC_URI=" -# https://github.com/plougher/squashfs-tools/archive/${PV/_p/-git.}.tar.gz -# -> ${MY_P}.tar.gz" -#S=${WORKDIR}/${MY_P} - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="debug lz4 lzma lzo xattr zstd" - -RDEPEND=" - sys-libs/zlib - lz4? ( app-arch/lz4 ) - lzma? ( app-arch/xz-utils ) - lzo? ( dev-libs/lzo ) - xattr? ( sys-apps/attr ) - zstd? ( app-arch/zstd ) -" -DEPEND=${RDEPEND} - -use10() { usex "${1}" 1 0; } - -src_configure() { - # set up make command line variables in EMAKE_SQUASHFS_CONF - EMAKE_SQUASHFS_CONF=( - LZMA_XZ_SUPPORT=$(use10 lzma) - LZO_SUPPORT=$(use10 lzo) - LZ4_SUPPORT=$(use10 lz4) - XATTR_SUPPORT=$(use10 xattr) - XZ_SUPPORT=$(use10 lzma) - ZSTD_SUPPORT=$(use10 zstd) - ) - - tc-export CC - use debug && append-cppflags -DSQUASHFS_TRACE -} - -src_compile() { - emake "${EMAKE_SQUASHFS_CONF[@]}" -C squashfs-tools -} - -src_install() { - dobin squashfs-tools/{mksquashfs,unsquashfs} - dodoc ACKNOWLEDGEMENTS CHANGES README* - dodoc -r RELEASE-READMEs -} diff --git a/sys-fs/ubi_reader/Manifest b/sys-fs/ubi_reader/Manifest index e454a11152e9..65768b400f9f 100644 --- a/sys-fs/ubi_reader/Manifest +++ b/sys-fs/ubi_reader/Manifest @@ -1,3 +1,3 @@ -DIST ubi_reader-0.7.2.tar.gz 42882 BLAKE2B c3ec72ab9642b7ece61611824f1052c5db1a2e12744c2bb6347f3682c3292dfe78f55c37403c9539556745d308891d0d03eb9f4f329461d2de864f40a941f011 SHA512 fa9193b897f0daf6d8879c8613ad1111137e2e4fcb92043df2f67c820d0da6723da3cece36705ead6afc622a24448a924b5758ed63804acfe703331a0dce60af -EBUILD ubi_reader-0.7.2.ebuild 559 BLAKE2B a387c80b03d9fc3fc8579374a209e0757feb35dc4ca2d8366ba54ee69da4e0c4953d9bd87e6379e56c3f9f064c2b7ffd51260bec79ace88dee079e921b2de319 SHA512 9f871707278295584a645fed91d918cb2d6d057cbcffc6ecaa1c27a8ba1e4240826a26e6392223a1a6106c788eab8db1c6e6ac8380cd87381de3069c6fa20628 +DIST ubi_reader-0.8.0.tar.gz 42913 BLAKE2B e802833fcc633739da6cb3cfffb8f398ad27261df55301b6322ea7303aeccbc57f6a685cefa4005ecf80e2a968139d091a8b5c6a9783dd613a5016ba56d55425 SHA512 c22a0b056a2ce74c16683dafd8e2592ba3c73df32ca49cce19fe14f60d254249849769364993cabff5ce03c8049e1758f7bdb77583d745ed21efa0c62be20532 +EBUILD ubi_reader-0.8.0.ebuild 559 BLAKE2B a387c80b03d9fc3fc8579374a209e0757feb35dc4ca2d8366ba54ee69da4e0c4953d9bd87e6379e56c3f9f064c2b7ffd51260bec79ace88dee079e921b2de319 SHA512 9f871707278295584a645fed91d918cb2d6d057cbcffc6ecaa1c27a8ba1e4240826a26e6392223a1a6106c788eab8db1c6e6ac8380cd87381de3069c6fa20628 MISC metadata.xml 418 BLAKE2B 42a180fe245386ada906cab96f96962dc2f26517eee70a3f6bd0cfa5fba8cd382dd12c3624ae5bd7a949d030a935467d37a164db4d69dffbff87a4aa2b3521cf SHA512 cf62a833bb427fb8435ca5a02d41f9766d8a482da4a9338cd171a302d5181f452ed23d37039364a4d61c0c57c9f1c9c62df09c519094807efa14ac8b10eb6d03 diff --git a/sys-fs/ubi_reader/ubi_reader-0.7.2.ebuild b/sys-fs/ubi_reader/ubi_reader-0.8.0.ebuild index 88f0ab7805aa..88f0ab7805aa 100644 --- a/sys-fs/ubi_reader/ubi_reader-0.7.2.ebuild +++ b/sys-fs/ubi_reader/ubi_reader-0.8.0.ebuild diff --git a/sys-fs/udev-init-scripts/Manifest b/sys-fs/udev-init-scripts/Manifest index 65a66e87e49f..9d2db14fc434 100644 --- a/sys-fs/udev-init-scripts/Manifest +++ b/sys-fs/udev-init-scripts/Manifest @@ -1,6 +1,6 @@ DIST udev-init-scripts-34.tar.gz 3660 BLAKE2B 954b003c78b31649fef69213a5424098f40e17e7ed11f4ec1443247950ea60db8536f37ca603caa06e5c9f8bab07b5ac3cb8c9435144532a97ff04836c24da49 SHA512 ed48bcd0815e235b2b3fa38f857cd97f164aac7c6ea805be87890eb06a0d52064bd733da240c6e2a34c8c73e10fd047b5e53096de06f17bc81d8266d70c0cc9d DIST udev-init-scripts-35.tar.gz 3666 BLAKE2B fddae466428605ea930519e8a47e0ea91f89f9eacc1fd97c137d175142125b12c3d045aec68db35a463de444ac6d8c037cca55f9628f10576c968259d566a9e4 SHA512 da9d2093149967e2e1b9bc7190ddfd55a87c9ae2177e3216f7cb2694fc9b64037eb6f2599ad8a4b7594ef32ced88fbb319c92904bc72a81ea5404945f8a8378a EBUILD udev-init-scripts-34.ebuild 1495 BLAKE2B 0f17a5bb8b9fe6d0f1655a4434d110e13c9a2d0fb70295bc01fc63aac4ccb8ea062dee1a170220f04bc96f0ea677bd2d0611afe542dbead741a85e5f25093607 SHA512 1441b5f3de48aa861ad7e106d15e7ef334ea4d0d284bb9226b8121e6ba7722f05f67b405500319ea494a7c89c944d9f512277b7125d15d89b0d57494db114fba -EBUILD udev-init-scripts-35.ebuild 1505 BLAKE2B 80968b7298041d3812f1b205e8e34b76e8ad567ac4a09e94e843a67b10af1723e9c48949341d6d959fe401c1209729f3b7f39fc40f1ebb4ed406e5f29c04a34d SHA512 01ec1d7985c111ccf4fc386f774352edd4740d6cbfdd173b1294140cd1c381e9ca844c4daaf491815bcb720d14b4725a981e760839bed22c6585e9305acecf8f +EBUILD udev-init-scripts-35.ebuild 1512 BLAKE2B ad2e49f8b77fda601a62b86fc826b47cfb4c0aab29f11cd1dcff692ff7a77ef6ab51a341b798476726a6e945dff175b9709ea485aba7cebd54ac4d0017485c67 SHA512 93fab0913157dc371dc3c28db56ffed515244f54f89a97a6fc147322ec6dcc0604a44edc479a0809958d0382a20a7eebc5ab44f6d97679dae85aff93cebd727b EBUILD udev-init-scripts-9999.ebuild 1505 BLAKE2B 80968b7298041d3812f1b205e8e34b76e8ad567ac4a09e94e843a67b10af1723e9c48949341d6d959fe401c1209729f3b7f39fc40f1ebb4ed406e5f29c04a34d SHA512 01ec1d7985c111ccf4fc386f774352edd4740d6cbfdd173b1294140cd1c381e9ca844c4daaf491815bcb720d14b4725a981e760839bed22c6585e9305acecf8f MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-35.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-35.ebuild index 7c9229bd7691..dc799ad0baf2 100644 --- a/sys-fs/udev-init-scripts/udev-init-scripts-35.ebuild +++ b/sys-fs/udev-init-scripts/udev-init-scripts-35.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ if [ "${PV}" = "9999" ]; then else SRC_URI="https://gitweb.gentoo.org/proj/${OLD_PN}.git/snapshot/${OLD_P}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${OLD_P}" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi DESCRIPTION="udev startup scripts for openrc" diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index aae74f795e9a..bdcf0ad463f0 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -5,5 +5,6 @@ DIST systemd-stable-249.6.tar.gz 10599611 BLAKE2B 9c0cbaa4319f2ce9a78dbe820d1b6d DIST systemd-stable-249.9.tar.gz 10613893 BLAKE2B fc7a14fa3b0cc3d05fa9f20fde2efedd3ef0f011d9dce53b0a418994b4257cf753b228cf98f749fb2028d81db55ef30a6e3d9b138d86239cad4fc730d845f9e2 SHA512 ce57bc6c522082e55649fc1886c4dc818c89607e175df2c92feffe288dbd38757f36b30abeebe153f5be6b664a49d729405040a952473cb2133a2e39cf9cc164 EBUILD udev-249.6-r2.ebuild 7917 BLAKE2B 8b48f9aa00ca2eddd0aa921d4adda3e8e506d0a895753ca9e6c64037f3cefb7b0a65c62e370a9064e3f2668524e21ac89bec18907b7e575cdab16791ca997726 SHA512 238b0daa2283b89b0b6c970e53c677073b851c1672fea1734393cd00e7a30af6ac0084583f41af733cf848101a3c091b1d0cfaff375d9a4910896177100fab0f EBUILD udev-249.9.ebuild 7967 BLAKE2B a614c5ca69ad160379683911434291bb6ffa8e1ff57d965e33564a1d8f8ee3093af5ea59c5fc393faa0c352d275b3025f14a6ff557d55aa22d377f4e2642ebb4 SHA512 e78178c206def095cd392c5952b74cc3f4d869cc8683dc8ee6fb09a188d8c3cda370a968113a3ea9a89591ff729e622acabefd78574703caf0ff29cc568a05ee +EBUILD udev-250.ebuild 418 BLAKE2B 2eaf0219c33be1eed4c4e9117130a9e1058c503f7c25f610e29461128a6bc39790910339c0a265dc4476a59e2a4aa2a7601ff9badbacf7f0e52b2e147d0a945b SHA512 017a8bd1f702ec6df58b1ed16121a0120b10bd0f636e62cc3bbf7a2376e3912545f31e815a7c6b0da9acbb487430237a6ca669bed58de15dfed58aab63af87e6 EBUILD udev-9999.ebuild 7921 BLAKE2B 6005fae7b9012a23f0a6c398d0381f725bf9afdb7469397ba887b37b290f3686c0f6dd5f9925b221d3d3fc333efd37fe5fa7d069c0635c1eb630ce78903b9ccc SHA512 8d55530628495ff6566575d0942380db6512cf307d74141c3af8a1738b30d8f34a20fc1d56161779a5654045929984d76b233aa499ac5e583ef93bc5c69ccdfc MISC metadata.xml 475 BLAKE2B 51db3fcfdcb7942e2bfa6e3e9fac08f9a0de6018e08a04da65920d1c1e83af6620ef73dfff201f1feff31580a0a6341814a8182e43b2c07f9da7577252010ad1 SHA512 65c1345e9c0707248f12bbf436f9b0ccb6160eb86d6c22f3e62b34791879621df59eb195e4c4c95b5cf9440b052bdc7c2b5847789a44cc9fb13b6cd4867f580e diff --git a/sys-fs/udev/udev-250.ebuild b/sys-fs/udev/udev-250.ebuild new file mode 100644 index 000000000000..0a984b4284a1 --- /dev/null +++ b/sys-fs/udev/udev-250.ebuild @@ -0,0 +1,15 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib-build + +DESCRIPTION="Virtual package to depend on sys-apps/systemd-utils" +HOMEPAGE="https://systemd.io/" + +LICENSE="metapackage" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + +RDEPEND="sys-apps/systemd-utils[udev,${MULTILIB_USEDEP}]" diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest index 4a19d9486874..ace68ee5038a 100644 --- a/sys-fs/udisks/Manifest +++ b/sys-fs/udisks/Manifest @@ -1,5 +1,6 @@ +AUX udisks-2.9.4-undefined.patch 1330 BLAKE2B b8ac0d5b7944f9ef6312472009720fa096209bcd912ddf8d43b6fc8ba9b0c6ae5e93701fd320fd008d73ae0f4cd348ffbded76d9c63c356230a440792191e60b SHA512 c4ab8c083d95fa1f3d6dfa8f1dddb7dd1ce04c42d40314d1ef32148aaf3f8454c9a09b9c3bfd000a07af9a692d4a95ede43e9c650d7b28134debe62570e772f6 DIST udisks-2.9.3.tar.bz2 1778637 BLAKE2B 77352e2beb081486586587e3d7bdc5047662b27a246424bb995188c9da784e464681d9307dd0c4ca22a21da66d04dbdc9c945cc926b219a80682acfa60de04fe SHA512 1ee6e982e599c6872183068dd64f9259a522dea7a91ddc3119f9bc436c9c6bf2911e61f7ae339d67d4851cb6f55ec05b6d9a4cc8c1a9f7c5d35c66b80d5ada42 DIST udisks-2.9.4.tar.bz2 1699288 BLAKE2B 913f6dd02988c0bded13ae15a5f05e5b3c6404f0b0d58a493601a0762c7534403f89e9fb46ec6a536b85d5f9ca1f788c7a308f5563a897b324d212da0e7bab4b SHA512 35f5429bc2a7092aa659cba9296837d127e2b17c23ab23111d0d9b230d15ef5a6965e112b1f3829748a69a52fb5b09722153f86f1ef70977b3ad7b7a4ec40ec5 EBUILD udisks-2.9.3.ebuild 3645 BLAKE2B 580c9a49011e943f5a43f192fc40e6198149b90e19d2afe332163d6f932e90b25e4f8753fed3bbbc1dcacef956cf51eb35ffab376ad03e40476fc60ffba0af1c SHA512 e017cf2556064678567cf4556baeb56bbfbc5b3d9d3ce070c6f3ecf3ff6672029053f6ae48e6bd8193e9557901327b428a00b1b1ed9f6449e3ca337e9602638a -EBUILD udisks-2.9.4.ebuild 3645 BLAKE2B 580c9a49011e943f5a43f192fc40e6198149b90e19d2afe332163d6f932e90b25e4f8753fed3bbbc1dcacef956cf51eb35ffab376ad03e40476fc60ffba0af1c SHA512 e017cf2556064678567cf4556baeb56bbfbc5b3d9d3ce070c6f3ecf3ff6672029053f6ae48e6bd8193e9557901327b428a00b1b1ed9f6449e3ca337e9602638a +EBUILD udisks-2.9.4.ebuild 3753 BLAKE2B 361c1d5a03298570a4abf9c324ac667c1a890d514482cb8271cfb5e21ad7b9b8b4eb6d6a625dd77569e47ffc10bc3c64da4efd0759a578761a0fe8f102cca7b2 SHA512 dd93ba3c032fd1a527535c8329b221bfa4870f7fb8f1dbf299b58bbb97e9ba1ba84fa0f68829e1cd481d8502ddeb44f860695b5ed6edab633b67db6fb9f29d0c MISC metadata.xml 729 BLAKE2B 21d1e33721c8a7abd2975d78821962dbc8c94f5f51458e02d405a44951ca76571bc37122ca996c52dbeada744cb660920a5d8205b1d3085dbc2d7c3966afb22e SHA512 020c530139c38d3d984a49a3aae799fb417e84523b3d927792844bcc11471e7d23a694db6cc75b6b6f6682a36c996cb3b011da5228c54cc0cf8b62e65c1f6671 diff --git a/sys-fs/udisks/files/udisks-2.9.4-undefined.patch b/sys-fs/udisks/files/udisks-2.9.4-undefined.patch new file mode 100644 index 000000000000..f87e145e82aa --- /dev/null +++ b/sys-fs/udisks/files/udisks-2.9.4-undefined.patch @@ -0,0 +1,30 @@ +Upstream-PR: https://github.com/storaged-project/udisks/pull/978 +From 362cc8f1613193f8e68d13a416421bb36fd7f713 Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Tue, 10 May 2022 09:29:10 -0700 +Subject: [PATCH] modules/btrfs: Add missing dependency + +When building udisks with --enable-btrfs using slibtool instead of GNU +libtool the build will fail with undefined references. + +This is because of a missing dependency for libudisks2_btrfs_la_LIBADD +and GNU libtool will hide this issue by silently ignoring -no-undefined +while slibtool does not. + +Gentoo Bug: https://bugs.gentoo.org/782061 +--- + modules/btrfs/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/modules/btrfs/Makefile.am b/modules/btrfs/Makefile.am +index ac8c941849..f96cd16186 100644 +--- a/modules/btrfs/Makefile.am ++++ b/modules/btrfs/Makefile.am +@@ -73,6 +73,7 @@ libudisks2_btrfs_la_LDFLAGS = \ + $(NULL) + + libudisks2_btrfs_la_LIBADD = \ ++ $(top_builddir)/src/libudisks-daemon.la \ + $(GLIB_LIBS) \ + $(GIO_LIBS) \ + $(GUDEV_LIBS) \ diff --git a/sys-fs/udisks/udisks-2.9.4.ebuild b/sys-fs/udisks/udisks-2.9.4.ebuild index 3112d930e977..1de00194813c 100644 --- a/sys-fs/udisks/udisks-2.9.4.ebuild +++ b/sys-fs/udisks/udisks-2.9.4.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils +inherit autotools bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils DESCRIPTION="Daemon providing interfaces to work with storage devices" HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks" @@ -61,6 +61,10 @@ BDEPEND=" DOCS=( AUTHORS HACKING NEWS README.md ) +PATCHES=( + "${FILESDIR}/${P}-undefined.patch" # 782061 +) + pkg_setup() { # Listing only major arch's here to avoid tracking kernel's defconfig if use amd64 || use arm || use ppc || use ppc64 || use x86; then @@ -79,6 +83,9 @@ src_prepare() { if ! use systemd ; then sed -i -e 's:libsystemd-login:&disable:' configure || die fi + + # Added for bug # 782061 + eautoreconf } src_configure() { diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest index 3d5659209d2e..70c36201f59f 100644 --- a/sys-fs/xfsprogs/Manifest +++ b/sys-fs/xfsprogs/Manifest @@ -1,11 +1,11 @@ AUX xfsprogs-4.15.0-docdir.patch 299 BLAKE2B 1ef9dd458806f33ca989dd977ae3b62fb5b1953ded3cd211ca7fc4235cfc59c2eeb6cf2474e79378782696a9feb324a5c32e541873d8493ff019adfe1ff006c2 SHA512 f6492ab8b4f8a417752a0b38538e0fdc06808968df07ecc5d752261cbc11d683acdd0e83ebf2744ea0068a5216f817a3816029cbf74da91c8eccf391574b931e AUX xfsprogs-5.3.0-libdir.patch 1137 BLAKE2B 7e455b8b82c553a819155fb4c1fee3d5c31bef0fa4c7ab0bf4ad4558a9a5b0b2f408138558c3601deb3ba85d465ab2dae5248bc20a4ba83f08cf733b27a796a1 SHA512 eaec31b6dab500c2e9c4fe7d5d82e60a40f3073cff99af0ae2aa817f6e4541f6a3de0a48f9151a274c6dd97e99ca26192b95b920aea1c5227d75232b808c98fa DIST xfsprogs-5.10.0.tar.xz 1273332 BLAKE2B 8caaa0ca8a94480f131d36b383afcf732b3a5a7a3c7927b4b4da4855fc5a0fb97a56fcebb98391a4dd0f02465868a4bd857e57eeba053a419df47d42f74bc958 SHA512 da09e687c87c4b133888dba7b4458017ec028020637ea5066be0232bf5c7da18239cc33eadd02d9b99d1c835aab38cab1ec9d45ae8b83897f9157cfcb0271fbd -DIST xfsprogs-5.14.1.tar.xz 1308968 BLAKE2B fda20f824a030113717cc46de1920696dc8f9eed13b54809e6b21275cf4f8673385e8bbb1c1c668ba2592ab43fb230c9d46edf4c0e5abe59a9572cc9a90ae5da SHA512 5bb79fff45048bebee2fde85ec788658dd8dc8d5ddac222b1f74c6cd525e1239d920814e8e713f045e38398a785321bf0a7421ff1c690cd0be5dbb224f8dafea DIST xfsprogs-5.14.2.tar.xz 1308912 BLAKE2B 04083bf7952015d64f16e1aec0fa74be1957543e2264914f69defe45a3dc9f2524d941abc064a25a2fd760ebd6dcdcdc2404fd305e08fff7f6be6c5fc11d4d2f SHA512 cb9794247a2eed8bd9f10ff811d38f97e4adbed97bad334b0fa8a26503ec224237eddd92fd78892584a153967417ab2009fb2fc8bab6ef12cd53fd20bdba1b4e DIST xfsprogs-5.15.0.tar.xz 1303080 BLAKE2B e2d60eb554d206b2d2910d07e20051fb0abd71723186bcdfa07f1ebd2c10c0a7ae387ea5f41e1be008d8e8cede97371581da06505e1675aa210fc3ac242d0782 SHA512 be7ee319fd13c103d88c7fc939277594a386d88d65349594a33eea2899ec4f28115b4ea53b64176cacbd52f3c801e103a085388e3539fc445a4ecd2775766438 +DIST xfsprogs-5.16.0.tar.xz 1306100 BLAKE2B da328fe0c146a7b8ba866c5872f26ce95010939e05da51c73ed6374f00474605a81f4a822d65b60a132a4de47fff286e9f5f1ac809c1aa29420633f573b61aef SHA512 949ddb42d37523d6494aa33d1f73757a6379ee661147b9bb84372bdc3ccf60cdf07580f5337b2f0aebdc5d9c2b7de37cc05d010a2b094d1119d900225fc5b711 EBUILD xfsprogs-5.10.0-r1.ebuild 2259 BLAKE2B 8a3a5d59bb1985b0b6ae1d12a6b4ab4083837ff8931547cabb87acb40574b50786ed1e9c8c7f1a7ce07c235164f670d6a5aef4b336537389951e11628d47deb1 SHA512 6ec3293027fcafe8ae56ad5329a0e617a879ef89cff14d9e2ef306f77443b7f45e4377e1eefdc175078195581d5766324284a737e759ab0db9a6d4bc1a1de431 -EBUILD xfsprogs-5.14.1.ebuild 2282 BLAKE2B 5f7c6db0bf9b64cc5ce50bad5069c1317aae97d78e22e568e1d5f97dd2f2cd8da3db1050ce4627e97c8693f5b4363f5c4eafb88807b366adea366344c06df05a SHA512 da77fc4b1c58db2a4efb0c9bfa66b6405244aaa5a7e04d5c4437ca884599e5330247a81941f8c3884a666db24577e091fc0145d479331e3dd5c6f43ba3870dcb EBUILD xfsprogs-5.14.2.ebuild 2274 BLAKE2B 7c5cd884f8cb6283d7ab70094c0d50ef7eade177ae250110fce0d8180aca1b90d4b540cbdd8fff3f8ee3e8264d836bba5c85eec3878f02fd49f7ea7a36512ac7 SHA512 e90ba8d24e23e3a6ea057e050a1c9cf0426954e335bd95b8b826259ac145e6fd080e0a8fe2f9eb90d6c47c215ac5ef62baf764e9dee6326474220f7aafd5415e EBUILD xfsprogs-5.15.0.ebuild 2281 BLAKE2B fa5bd52e32c96195aec3473ab64ff4a022d2b6641a10ede9dec23d54e0b22b13bf469c7dff66537ee3a93507e7290159aa082eb0e358a9a7c5aa401604be1aa4 SHA512 50bdefc559d2b59bac64ef7b7fc4c2af0c803685bbdac1563144c4ef21eeed6196505f6ba2a89868fceb6683df36e0d74a6427cd1df30d2ff1dfa7745108cdc5 +EBUILD xfsprogs-5.16.0.ebuild 2286 BLAKE2B 5bb87182052869e0864178e98f1f3ba491671cd81e7975b31271e7629e91892ce96a821247251f82aaccb7955b8797d69fc385de2ec7cebcbde1cd0398ef828e SHA512 69e9d33e72610c476699815d2b684fd2a10fb9ad05bd23dfe0f2456b971c24bc27d822ef3276583ef64e469c4f6cc487e726b3d702dc3e867098483973b901fb MISC metadata.xml 339 BLAKE2B b7d67fc8bcf854e7a2453c23e5d5d8c193525ccd16a643e80415a103d2d22c892458ea6ada32653d04b3d471c780f07b2b0537a317d9e64468130e065c6f5ab1 SHA512 445b4f6d853a272cc6bf8fde42745adf226512fa310f9af4bbabad4cfa5a6888b2c2215dfc0896c07b800820b69417c6d408bb21ed17a5224b5c9e3412c5f62d diff --git a/sys-fs/xfsprogs/xfsprogs-5.14.1.ebuild b/sys-fs/xfsprogs/xfsprogs-5.16.0.ebuild index f1ec2e50d05c..0253d8cfb586 100644 --- a/sys-fs/xfsprogs/xfsprogs-5.14.1.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-5.16.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,14 +16,11 @@ IUSE="icu libedit nls selinux" RDEPEND=">=sys-apps/util-linux-2.17.2 dev-libs/inih - dev-libs/userspace-rcu + dev-libs/userspace-rcu:= icu? ( dev-libs/icu:= ) - libedit? ( dev-libs/libedit ) -" + libedit? ( dev-libs/libedit )" DEPEND="${RDEPEND}" -BDEPEND=" - nls? ( sys-devel/gettext ) -" +BDEPEND="nls? ( sys-devel/gettext )" RDEPEND+=" selinux? ( sec-policy/selinux-xfs )" PATCHES=( @@ -48,6 +45,9 @@ src_configure() { # unnecessarily clutter CFLAGS (and fortran isn't used) unset FCFLAGS + # If set in user env, this breaks configure + unset PLATFORM + export DEBUG=-DNDEBUG # Package is honoring CFLAGS; No need to use OPTIMIZER anymore. @@ -55,9 +55,7 @@ src_configure() { # flags. export OPTIMIZER=" " - unset PLATFORM # if set in user env, this breaks configure - - # Avoid automagic on libdevmapper, #709694 + # Avoid automagic on libdevmapper (bug #709694) export ac_cv_search_dm_task_create=no # Build fails with -O3 (bug #712698) diff --git a/sys-fs/xwmfs/Manifest b/sys-fs/xwmfs/Manifest index fdd967a47d8b..7cadbde13483 100644 --- a/sys-fs/xwmfs/Manifest +++ b/sys-fs/xwmfs/Manifest @@ -1,3 +1,3 @@ -DIST xwmfs-0.90.tar.gz 199555 BLAKE2B b2223edb1befad1055d103c03ba8092ea6319eb7299ec9e74338567aef9e45071f056ebfaddd41bcca3722f2ad96122d5009890847b6a485ea700e1e43d2893b SHA512 70805bc509cd8ab11d75b0f9b303f76c6e7c0af7664eca4f9f1dc14c6d59d34a1bcf3e1ffde427b7f11740f1b52e7838c44a28de44fd96ca0bacb45c8b160a67 -EBUILD xwmfs-0.90.ebuild 616 BLAKE2B f630310a717239884218f3157011f36a7c6401f1d2ef14548beeb26973f07da4f4b37d35a8018cd1ee195d3e7bb08ca97f6a6933d4d669e1c35490802cfaf60a SHA512 6d453074bdfac44ee5127aeb94eb7f66ad2b56f1c508a493306b6b6ea50f5814163da255593562dc97cdeae7a2b0c64264825404eb482b944f21da0d7a797ea3 +DIST xwmfs-0.91.tar.gz 205380 BLAKE2B fe16fb42c255c8aa3f3a89c494ee9a0d89a4ec1f7d09299374b8891ecc03fe41bb676e2a65112d60abf7ea7e7c2b173aa1333969b445814b07f5c972c001969b SHA512 a2f86b614364c1ffd5fa591bdabd8940f9f317f07e5c4ddc45e8da44de1ae434cbe0336fd1ef7f25027c390388943a8cd03991546ffa640ffe5800a66792ac17 +EBUILD xwmfs-0.91.ebuild 616 BLAKE2B ccfc65eac426a8bcc7b964fc3c7898d9e8c2ab608e9610c677a0d953794fbd724f4688ec1e82eaa2da19bb2adad18847a9dc4bd4958500a20cbb76ff805a5497 SHA512 176b29a3b629d6e7a8c1d1f90c4cf3ba7e2ce94e6e16586692522a89995046c875358b41d862126adfe56759bc74ef2bc6a44d58ec8912c39d2a00eb23075f76 MISC metadata.xml 1424 BLAKE2B 5420162977ac47dcf267b69d32c04c5e38f03b654afaf3a4af86fbc16e5dafda5c1855cba18612ed71161f153a4d55da1ee11b2cf6e3eb3a1eca5095828bf34c SHA512 e128f8bf372a60019c5be9e608506148f4d86db55ff484ee28748f54a10518c5555f9d217077e3de3b817e52de6b9308acfa4a6faed8c48bfc69119ee00e0196 diff --git a/sys-fs/xwmfs/xwmfs-0.90.ebuild b/sys-fs/xwmfs/xwmfs-0.91.ebuild index 6f9d03e0f508..deecfb925e6a 100644 --- a/sys-fs/xwmfs/xwmfs-0.90.ebuild +++ b/sys-fs/xwmfs/xwmfs-0.91.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/sys-fs/zfs-auto-snapshot/Manifest b/sys-fs/zfs-auto-snapshot/Manifest index 0c300c2536fd..94dfdbc58c33 100644 --- a/sys-fs/zfs-auto-snapshot/Manifest +++ b/sys-fs/zfs-auto-snapshot/Manifest @@ -11,6 +11,6 @@ AUX zfs-auto-snapshot-weekly.service 217 BLAKE2B 715f8f8da6272b9ea782dbe77dbafa6 AUX zfs-auto-snapshot-weekly.timer 150 BLAKE2B 655187add790017f8328edae33e88eb0a4b88774999e67a5fb9c990f5bae9a13ac1e64c290c7e0a218cdcf05dd7bbe320369d1741da036c54994371eecfc50d7 SHA512 49357f15660900b344eba04f8d4bab7e153b728b4665e285b2f9320a287c15b62c426d568d2ba9a43daf69c6f1a6fbccff8b68417f8991dd5f8c3368d562b73c AUX zfs-auto-snapshot.target 360 BLAKE2B 17be6ab113a8849d5244fd36140d1165c4e919df2a04f4b16aa591c1c92b29243b1be4f2243bcc6a8ef015b0cc1fb53b183da1c83668e4e7e0b609f7301a3372 SHA512 f607dada27e4be409184152b93e2079eecf12f5eba76f2dbe42bdbf4793603063c23813e752bfd829a081eeb6d09c86bc18ab75d65bff87b2c1d4f998abac516 DIST zfs-auto-snapshot-upstream-1.2.4.tar.gz 13375 BLAKE2B 2a44cdecb7c4bb432c1804dba9a6674289aced9664ae0fcc6a33b604b128d852fce459367316f11961747594516916da51072ed10f84d0c01ea8cca553ce7eec SHA512 26382303fce8b90dfb40f69fcab92308e88c17c147b4a566c5d32f2e9aa241d64f5da56ad82b4becb824ba01a470037a724460d35676a1d46de9c578c02a57d9 -EBUILD zfs-auto-snapshot-1.2.4-r1.ebuild 2566 BLAKE2B 15343e88686145958d825f2885d10106ab80b8ee066960d8d733c3fb897670f3eb5edd0a67181381253dfd67241c2f290f663228b71415c7f4ec7840734aa715 SHA512 59a057ccbe82dc42faa2fbafee754c706b900760e68b9e7f558656067668621130503928031d5d0d491ff9850460213764253726ddb82b772f012b39ba0b23bd -EBUILD zfs-auto-snapshot-9999.ebuild 2569 BLAKE2B f263b09a100de5847cd23761b53f123e61f4ab8e9c4f98bb7a0dd8854e3e70e41fd4e4df730b2c265e5a18a636c479bbf7a689309b6a8bd7fe8ae011801a8732 SHA512 ecbcdd796820464725ecab22bd8fd5049c46cd1a3f45bef305e1910f14dddbc3ca9973afe623423c409b71ff8459b22a5eda201b2e0b08235b728dd6fbf74301 +EBUILD zfs-auto-snapshot-1.2.4-r1.ebuild 2573 BLAKE2B d71efca9270300aed57faf477e02013f5f0a171436417fc60e8d05de3f2945e728a797f9f52db10b5c7504989b61177030d5858d390801b7f92514807ef1f449 SHA512 9d20533e843bbe41117c7ce801bb602069a9e369c5bea042348b1f194624865086c3d1392161f076f212cb84eb480c7778f589c27546b98f3e2a7641f082a45c +EBUILD zfs-auto-snapshot-9999.ebuild 2576 BLAKE2B b229742f8c7b9e09be3c2891887d49b5abc3d24f20b75cdb4fa951d383f74e97855bf7b9e68de0291284c018bc8f4239bf62054f1050dbf42a91106a5e141c83 SHA512 3f5dca47d29357e4e12492f3cfad66a5f674599cdb86b6a4817c8622471f4abc8a4be43eb70143c3b7f30f5907759cfc59757d724635d5ae492947f31207d7ef MISC metadata.xml 965 BLAKE2B 4f9cc98f893bcaab842d31a7fe9d3db7d24e34a5cb612137830298bce8450a82636970ba20d69ad31bd36d121cf253deaea7ce3e9435df656a768b9922d2b2ff SHA512 0a816ae56452f48cfc286ae8f0c0ff17ba8e174ec6312ba97c09614568fbad07b4024722e3466406f590579bc614ab85731f6dcd3f873a7256d64f8c7054658e diff --git a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r1.ebuild b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r1.ebuild index e5ec98d94089..30221867b133 100644 --- a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r1.ebuild +++ b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then else MY_P="${PN}-upstream-${PV}" SRC_URI="https://github.com/zfsonlinux/${PN}/archive/upstream/${PV}.tar.gz -> ${MY_P}.tar.gz" - KEYWORDS="amd64 arm64 ppc64" + KEYWORDS="amd64 arm64 ppc64 ~riscv" S="${WORKDIR}/${MY_P}" fi diff --git a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-9999.ebuild b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-9999.ebuild index 4096503e2fff..18a922257dbc 100644 --- a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-9999.ebuild +++ b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then else MY_P="${PN}-upstream-${PV}" SRC_URI="https://github.com/zfsonlinux/${PN}/archive/upstream/${PV}.tar.gz -> ${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~ppc64" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" S="${WORKDIR}/${MY_P}" fi diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest index a589a7a4fd56..47c92b43933c 100644 --- a/sys-fs/zfs-kmod/Manifest +++ b/sys-fs/zfs-kmod/Manifest @@ -1,18 +1,15 @@ AUX 0.8.6-copy-builtin.patch 988 BLAKE2B f79add4b341075e3cd98b6aee4bb74b8fadd28b5ee1062f9260c0418909d380cdd2d637b52d4959ec19cafec1e55b1d05cd6bc358fdffbd6dc1b159e9935083d SHA512 af6b73a2d9d1b4e028c9b959950934798f4d048211d6e4a7e94595982ad2dc8bb4befd52122e3fa0890548e192f2f2ae41d877cad057543e940a7c2710c81a23 -AUX 2.1.3-werror.patch 1008 BLAKE2B 612c91254cef19ef05fd35e5a458f28d22a8d9f51656b8ffdf3be0b07c7c72668c954c0caa2b8eb215060df1c190cb77248baed41568aded6076a048dfee0f6e SHA512 075a3ff6800420e56662c6453a0d4ccf9ea63c8f1e76e690d46f7a3cb0eff3b392caa6a050e306e7b8b14e20ed925cbb6381d442b4845f6178f5026667ae9081 +AUX 2.1.4-ZERO_RANGE.patch 9454 BLAKE2B 5baaef961eb75ee0b46ccb89a514612795b829fe410da1587330f81c2d9550c3fc049f32952e3d67d06a80a3fcc69fe9121fc9f44c1f467570f2d81f1f3a5386 SHA512 95558f6de1b901cdcd7aaa0cc704bf75375a39a5d89da02a0665494a84646f9974e0bc8ff869b622a3a7031db279ff76029ebc33ec1f5f8a129b560ffa565349 DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce DIST zfs-2.0.7.tar.gz 14550055 BLAKE2B 80f7297f04a21cd8f3f2043d895b0325512ba0cea3bb9223561237754495c8233d29af5a9418a3c06a87510100240a45ef3d59c7ce776fffb5aafdcd18167c21 SHA512 1135abf74bf74685439018f7cd65fc52088f179d113bdd2e6481689bb0f4a016716a07d859107b74501fda00689e80b2488c7c2c53d5f058d6b659909ed85f6f DIST zfs-2.0.7.tar.gz.asc 836 BLAKE2B 65e7df58c33ccadc4e0ca9dbc1e8c006abbec8442e2da50872a1ab0cbb841fc45152298e8d3b93ee4320ddae6416e3a856caf80d8efb21b19db53dfedbf00e38 SHA512 b901d8e92faa6cfe6010bd54de88c7d18057f434cb07f8a89672d6c446a0a97b23209ee8f02cfd3b2a8f431c68ec977e7dc9f95fe5d385dba0bb6d37338ba682 DIST zfs-2.1.2.tar.gz 34829045 BLAKE2B ab4e2d85200438373c7eeeaa5256a712dbfb2862b85de1fb7554ad0cc2b9f8e1255ab4564bca62f65a81a823adb8c112957e6e8771b8e5e6944c3731bc894584 SHA512 3e3932259da2a27f1c4cca8da62b909edc43bf51ab0229d2d5d0234d9a7eaa7b63b67c06a98cbe2d29ba1eb5cbcaab16e5062c2a2bc8e84cab770be10ebf2102 DIST zfs-2.1.2.tar.gz.asc 836 BLAKE2B 8f5666f5c3d7016a4d79191f42d0a220fe8c654a0d64e3da3b575644fe52c83dcb9f9ef49ba0553771a127bba44e2802f1d366a7a38f670e73612deef76755c3 SHA512 da6bfccd19a249a6891f5e1de6c4b332e98ce4f125f638c046b9cedac3fd79c56a99dd9a620105a40741e5f04b382f5d5996b56cbe576fb268b31e57e0fed6eb -DIST zfs-2.1.3.tar.gz 34898999 BLAKE2B b4fc59ae97c74661f1303e4ce6efd5304842d382e278633debc4475c32074b9d272379d5d4caf8155f7a8cb1cb2b871b8c61fc36e14a612220757c5703a4c50b SHA512 26525bff7d0a831de780883c11eec5b3a142bded269c1dce95a4c466e753feb851cbbc001f0fe40f40209801192f9094fe179570fd117f90931cf11116439aeb -DIST zfs-2.1.3.tar.gz.asc 836 BLAKE2B 305d44ae02a28bc1dc24bb429a0454fdffe19a21e4a5f45ed924e81f8f1972638166a0cf64f99e92e53a50161886935a86c7d42d8fd9533b6b46c6c16c316d9a SHA512 6cdc92bc834f0b6bff9c0939224f1898729f2ae9b865f84906abb2a6b44a75f6aed6c256f03f81fe888d4edc7c421073b9b2f730b804fe532fd43cd127fdc505 DIST zfs-2.1.4.tar.gz 34896310 BLAKE2B be303f1181f604770536aa4aa61d5319ec408abbd04964cedadd15b3101a15deba6539bb5d833f4fed357f323d74f622d035305df699b213df41ae45bffdd200 SHA512 c7b57c43fc287b22905067ab022df4133d32e1a5dc335f7baf743b4ef88f64c2bf9d41318c2083230d077dd49e68f7d9e6172266e13d4b1eee29d359860f969e DIST zfs-2.1.4.tar.gz.asc 836 BLAKE2B b311730f72d534c87a782515f35a354bfbefba0513dc0cee5b0b497cf742590f13be6a49ff8a70d7d6503d0ba06b0266e7d290d718337add614812c3d1b0731a SHA512 53880cd5369f468551bab685eb83739ed76aa286886fdd2cbad4270755fe809da730082a91bba61011f59594fac297ce05645ae32c2c73b4a9aa835f2991a1ee EBUILD zfs-kmod-0.8.6.ebuild 5746 BLAKE2B b8d5cfa1c83f6ae0b565a0469f0c69def97fd536dc2645b623fe31cd2ca6d802976b3aacd05023ede636abb45c5a968256270809e4c080ace95993d640646f4b SHA512 758cbe8be086ade139b4559684e4cfd6b8b1c61273c88f15b7bb612ae49b89b59f05b8f843a8a4993833406769ca017c582e7dadeef41fc70732bac7d1aa944c EBUILD zfs-kmod-2.0.7.ebuild 5624 BLAKE2B ec04bc269acb6ea08e202b2a52e9883bd7b16d436c9c0fea54247e73c163664a449997bf06058c24602aba7718c49a224f4e1adc74228a5837290b02bacabf37 SHA512 31b39f7a831e034fe6aeecb169dc46e1641c6844f74c4d74127b30cb691bb4fe4a52a998008c2a16b860398192508727cc3b87f9325d30b6e45f2d0d48ea2ee8 EBUILD zfs-kmod-2.1.2.ebuild 5260 BLAKE2B 4b518043257f793b8f3ec0e4aee6f758ae6cd7ab9ea587507e4517c9431c305fd82da279eceee860869677f52e93ac589507d4fedb200687d20d6cb6508c08d1 SHA512 ae320718801a32eec16f37d9937e6f0aebf31a362b04bc830642d510992a4810147980bf9826e747930e7b6c0ed885169436251aaffcabc796e535f0bfb3ebba -EBUILD zfs-kmod-2.1.3.ebuild 5292 BLAKE2B 80d9d7cb25cf56286e6808a313a5033af257c5dbaaea8c29ad33c62f8ffb9372cfb50e1217435ab8eac57adac297f5f1b701412201229891e7cae05e16a48d16 SHA512 d26725a3274346917775a21e51b77ada79f025c00d477a9c8a888fca74fd2dedcb8d36af58616678cda7f48ed43da6fa5f2b157c4572b8dcde426831e31cf029 -EBUILD zfs-kmod-2.1.4.ebuild 5245 BLAKE2B 8614756dc32cca2fd5cf61048385b94b646f2d2b35fe5f20029afc5c3faf1e8fc1b1b2ec3e5abe4f9b120dd8c25af689911f130e9771626e2fae7b9fe14191e2 SHA512 96d80fa36f7c55aa6e8fd1ddd62be1ac5b4f5db16446729d82ccc15d6c18c803ccecc49355558bc779b0916d4832e7d24e367a6295a289268911863cce7bfa3f +EBUILD zfs-kmod-2.1.4-r1.ebuild 5293 BLAKE2B 5ad5104f06e5ab2d64451ed47cd2ad49670faa68a69ad2837605bbe08cd68d7dcbf74fd3b0f0c78b758e8f003fc7d47dd8cf25867fedf75b24f5926a7c392e8d SHA512 a487c35ac982ab4b1a735e0d47b263eb89a8541732d21f7e3ad96816427e7193f52eec62ffab26fdd452e732c01140eb2a1baa569d7533df62be103538cfa814 EBUILD zfs-kmod-9999.ebuild 5245 BLAKE2B 8614756dc32cca2fd5cf61048385b94b646f2d2b35fe5f20029afc5c3faf1e8fc1b1b2ec3e5abe4f9b120dd8c25af689911f130e9771626e2fae7b9fe14191e2 SHA512 96d80fa36f7c55aa6e8fd1ddd62be1ac5b4f5db16446729d82ccc15d6c18c803ccecc49355558bc779b0916d4832e7d24e367a6295a289268911863cce7bfa3f MISC metadata.xml 651 BLAKE2B 477c5d768a2eddab7bc0c14d0845801e25bfd9298fe229a132d7ff11a8560988d0230ec5d4b1447df32f58b9754df0cbe989f2a5600cd3fa99124ea4edc45cdd SHA512 d9bf0598c87bcdaab7d81dd5502caf1400f3c8d3834a6770630d85ed365cd4ebb3beeebae72d2d4d49bcdd0aa6cd709aa57cb2af4195dfc04a9c0cef89cfd724 diff --git a/sys-fs/zfs-kmod/files/2.1.3-werror.patch b/sys-fs/zfs-kmod/files/2.1.3-werror.patch deleted file mode 100644 index b4aba47d8324..000000000000 --- a/sys-fs/zfs-kmod/files/2.1.3-werror.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://bugs.gentoo.org/835646 -https://github.com/openzfs/zfs/commit/7b215d93bcc0a72d7020ccc050c64f39aa7f2be8.patch - -From: Ryan Moeller <freqlabs@FreeBSD.org> -Date: Thu, 17 Mar 2022 13:18:23 -0400 -Subject: [PATCH] Fix module build with -Werror - -This is a direct commit to zfs-2.1-release to fix release builds that -error out on an unused variable. The issue is avoided on master by a -huge series of commits that change how the ASSERT macros work, but that -is not feasible to backport. - -Reviewed-by: Tony Hutter <hutter2@llnl.gov> -Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> -Reviewed-by: Igor Kozhukhov <igor@dilos.org> -Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org> -Closes #13194 -Closes #13196 ---- a/module/zfs/arc.c -+++ b/module/zfs/arc.c -@@ -1205,7 +1205,7 @@ static void - hdr_l2only_dest(void *vbuf, void *unused) - { - (void) unused; -- arc_buf_hdr_t *hdr = vbuf; -+ arc_buf_hdr_t *hdr __maybe_unused = vbuf; - - ASSERT(HDR_EMPTY(hdr)); - arc_space_return(HDR_L2ONLY_SIZE, ARC_SPACE_L2HDRS); - diff --git a/sys-fs/zfs-kmod/files/2.1.4-ZERO_RANGE.patch b/sys-fs/zfs-kmod/files/2.1.4-ZERO_RANGE.patch new file mode 100644 index 000000000000..338b14208dab --- /dev/null +++ b/sys-fs/zfs-kmod/files/2.1.4-ZERO_RANGE.patch @@ -0,0 +1,304 @@ +https://github.com/openzfs/zfs/commit/c220771a47e4206fb43e6849957657c9504b1b14 +https://github.com/openzfs/zfs/issues/13329 + +From c220771a47e4206fb43e6849957657c9504b1b14 Mon Sep 17 00:00:00 2001 +From: Rich Ercolani <214141+rincebrain@users.noreply.github.com> +Date: Wed, 20 Apr 2022 19:07:03 -0400 +Subject: [PATCH] Corrected oversight in ZERO_RANGE behavior + +It turns out, no, in fact, ZERO_RANGE and PUNCH_HOLE do +have differing semantics in some ways - in particular, +one requires KEEP_SIZE, and the other does not. + +Also added a zero-range test to catch this, corrected a flaw +that made the punch-hole test succeed vacuously, and a typo +in file_write. + +Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> +Signed-off-by: Rich Ercolani <rincebrain@gmail.com> +Closes #13329 +Closes #13338 +--- a/module/os/linux/zfs/zpl_file.c ++++ b/module/os/linux/zfs/zpl_file.c +@@ -781,11 +781,13 @@ zpl_fallocate_common(struct inode *ip, int mode, loff_t offset, loff_t len) + if (mode & (test_mode)) { + flock64_t bf; + +- if (offset > olen) +- goto out_unmark; ++ if (mode & FALLOC_FL_KEEP_SIZE) { ++ if (offset > olen) ++ goto out_unmark; + +- if (offset + len > olen) +- len = olen - offset; ++ if (offset + len > olen) ++ len = olen - offset; ++ } + bf.l_type = F_WRLCK; + bf.l_whence = SEEK_SET; + bf.l_start = offset; +--- a/tests/runfiles/linux.run ++++ b/tests/runfiles/linux.run +@@ -94,7 +94,7 @@ tests = ['events_001_pos', 'events_002_pos', 'zed_rc_filter', 'zed_fd_spill'] + tags = ['functional', 'events'] + + [tests/functional/fallocate:Linux] +-tests = ['fallocate_prealloc'] ++tests = ['fallocate_prealloc', 'fallocate_zero-range'] + tags = ['functional', 'fallocate'] + + [tests/functional/fault:Linux] +--- a/tests/zfs-tests/cmd/file_write/file_write.c ++++ b/tests/zfs-tests/cmd/file_write/file_write.c +@@ -251,7 +251,7 @@ usage(char *prog) + "\t[-s offset] [-c write_count] [-d data]\n\n" + "Where [data] equal to zero causes chars " + "0->%d to be repeated throughout, or [data]\n" +- "equal to 'R' for psudorandom data.\n", ++ "equal to 'R' for pseudorandom data.\n", + prog, DATA_RANGE); + + exit(1); +--- a/tests/zfs-tests/include/libtest.shlib ++++ b/tests/zfs-tests/include/libtest.shlib +@@ -4236,6 +4236,22 @@ function punch_hole # offset length file + esac + } + ++function zero_range # offset length file ++{ ++ typeset offset=$1 ++ typeset length=$2 ++ typeset file=$3 ++ ++ case "$UNAME" in ++ Linux) ++ fallocate --zero-range --offset $offset --length $length "$file" ++ ;; ++ *) ++ false ++ ;; ++ esac ++} ++ + # + # Wait for the specified arcstat to reach non-zero quiescence. + # If echo is 1 echo the value after reaching quiescence, otherwise +--- a/tests/zfs-tests/tests/functional/fallocate/Makefile.am ++++ b/tests/zfs-tests/tests/functional/fallocate/Makefile.am +@@ -3,4 +3,5 @@ dist_pkgdata_SCRIPTS = \ + setup.ksh \ + cleanup.ksh \ + fallocate_prealloc.ksh \ +- fallocate_punch-hole.ksh ++ fallocate_punch-hole.ksh \ ++ fallocate_zero-range.ksh +--- a/tests/zfs-tests/tests/functional/fallocate/fallocate_punch-hole.ksh ++++ b/tests/zfs-tests/tests/functional/fallocate/fallocate_punch-hole.ksh +@@ -60,13 +60,17 @@ function cleanup + [[ -e $TESTDIR ]] && log_must rm -f $FILE + } + +-function check_disk_size ++function check_reported_size + { + typeset expected_size=$1 + +- disk_size=$(du $TESTDIR/file | awk '{print $1}') +- if [ $disk_size -ne $expected_size ]; then +- log_fail "Incorrect size: $disk_size != $expected_size" ++ if ! [ -e "${FILE}" ]; then ++ log_fail "$FILE does not exist" ++ fi ++ ++ reported_size=$(du "${FILE}" | awk '{print $1}') ++ if [ "$reported_size" != "$expected_size" ]; then ++ log_fail "Incorrect reported size: $reported_size != $expected_size" + fi + } + +@@ -74,9 +78,9 @@ function check_apparent_size + { + typeset expected_size=$1 + +- apparent_size=$(stat_size) +- if [ $apparent_size -ne $expected_size ]; then +- log_fail "Incorrect size: $apparent_size != $expected_size" ++ apparent_size=$(stat_size "${FILE}") ++ if [ "$apparent_size" != "$expected_size" ]; then ++ log_fail "Incorrect apparent size: $apparent_size != $expected_size" + fi + } + +@@ -86,25 +90,30 @@ log_onexit cleanup + + # Create a dense file and check it is the correct size. + log_must file_write -o create -f $FILE -b $BLKSZ -c 8 +-log_must check_disk_size $((131072 * 8)) ++sync_pool $TESTPOOL ++log_must check_reported_size 1027 + + # Punch a hole for the first full block. + log_must punch_hole 0 $BLKSZ $FILE +-log_must check_disk_size $((131072 * 7)) ++sync_pool $TESTPOOL ++log_must check_reported_size 899 + + # Partially punch a hole in the second block. + log_must punch_hole $BLKSZ $((BLKSZ / 2)) $FILE +-log_must check_disk_size $((131072 * 7)) ++sync_pool $TESTPOOL ++log_must check_reported_size 899 + +-# Punch a hole which overlaps the third and forth block. ++# Punch a hole which overlaps the third and fourth block. + log_must punch_hole $(((BLKSZ * 2) + (BLKSZ / 2))) $((BLKSZ)) $FILE +-log_must check_disk_size $((131072 * 7)) ++sync_pool $TESTPOOL ++log_must check_reported_size 899 + + # Punch a hole from the fifth block past the end of file. The apparent + # file size should not change since --keep-size is implied. + apparent_size=$(stat_size $FILE) + log_must punch_hole $((BLKSZ * 4)) $((BLKSZ * 10)) $FILE +-log_must check_disk_size $((131072 * 4)) ++sync_pool $TESTPOOL ++log_must check_reported_size 387 + log_must check_apparent_size $apparent_size + + log_pass "Ensure holes can be punched in files making them sparse" +--- /dev/null ++++ b/tests/zfs-tests/tests/functional/fallocate/fallocate_zero-range.ksh +@@ -0,0 +1,119 @@ ++#!/bin/ksh -p ++# ++# CDDL HEADER START ++# ++# The contents of this file are subject to the terms of the ++# Common Development and Distribution License (the "License"). ++# You may not use this file except in compliance with the License. ++# ++# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE ++# or http://www.opensolaris.org/os/licensing. ++# See the License for the specific language governing permissions ++# and limitations under the License. ++# ++# When distributing Covered Code, include this CDDL HEADER in each ++# file and include the License file at usr/src/OPENSOLARIS.LICENSE. ++# If applicable, add the following below this CDDL HEADER, with the ++# fields enclosed by brackets "[]" replaced with your own identifying ++# information: Portions Copyright [yyyy] [name of copyright owner] ++# ++# CDDL HEADER END ++# ++ ++# ++# Copyright (c) 2020 by Lawrence Livermore National Security, LLC. ++# Copyright (c) 2021 by The FreeBSD Foundation. ++# ++ ++. $STF_SUITE/include/libtest.shlib ++ ++# ++# DESCRIPTION: ++# Test FALLOC_FL_ZERO_RANGE functionality ++# ++# STRATEGY: ++# 1. Create a dense file ++# 2. Zero various ranges in the file and verify the result. ++# ++ ++verify_runnable "global" ++ ++if is_freebsd; then ++ log_unsupported "FreeBSD does not implement an analogue to ZERO_RANGE." ++fi ++ ++FILE=$TESTDIR/$TESTFILE0 ++BLKSZ=$(get_prop recordsize $TESTPOOL) ++ ++function cleanup ++{ ++ [[ -e $TESTDIR ]] && log_must rm -f $FILE ++} ++ ++# Helpfully, this function expects kilobytes, and check_apparent_size expects bytes. ++function check_reported_size ++{ ++ typeset expected_size=$1 ++ ++ if ! [ -e "${FILE}" ]; then ++ log_fail "$FILE does not exist" ++ fi ++ ++ reported_size=$(du "${FILE}" | awk '{print $1}') ++ if [ "$reported_size" != "$expected_size" ]; then ++ log_fail "Incorrect reported size: $reported_size != $expected_size" ++ fi ++} ++ ++function check_apparent_size ++{ ++ typeset expected_size=$1 ++ ++ apparent_size=$(stat_size "${FILE}") ++ if [ "$apparent_size" != "$expected_size" ]; then ++ log_fail "Incorrect apparent size: $apparent_size != $expected_size" ++ fi ++} ++ ++log_assert "Ensure ranges can be zeroed in files" ++ ++log_onexit cleanup ++ ++# Create a dense file and check it is the correct size. ++log_must file_write -o create -f $FILE -b $BLKSZ -c 8 ++sync_pool $TESTPOOL ++log_must check_reported_size 1027 ++ ++# Zero a range covering the first full block. ++log_must zero_range 0 $BLKSZ $FILE ++sync_pool $TESTPOOL ++log_must check_reported_size 899 ++ ++# Partially zero a range in the second block. ++log_must zero_range $BLKSZ $((BLKSZ / 2)) $FILE ++sync_pool $TESTPOOL ++log_must check_reported_size 899 ++ ++# Zero range which overlaps the third and fourth block. ++log_must zero_range $(((BLKSZ * 2) + (BLKSZ / 2))) $((BLKSZ)) $FILE ++sync_pool $TESTPOOL ++log_must check_reported_size 899 ++ ++# Zero range from the fifth block past the end of file, with --keep-size. ++# The apparent file size must not change, since we did specify --keep-size. ++apparent_size=$(stat_size $FILE) ++log_must fallocate --keep-size --zero-range --offset $((BLKSZ * 4)) --length $((BLKSZ * 10)) "$FILE" ++sync_pool $TESTPOOL ++log_must check_reported_size 387 ++log_must check_apparent_size $apparent_size ++ ++# Zero range from the fifth block past the end of file. The apparent ++# file size should change since --keep-size is not implied, unlike ++# with PUNCH_HOLE. ++apparent_size=$(stat_size $FILE) ++log_must zero_range $((BLKSZ * 4)) $((BLKSZ * 10)) $FILE ++sync_pool $TESTPOOL ++log_must check_reported_size 387 ++log_must check_apparent_size $((BLKSZ * 14)) ++ ++log_pass "Ensure ranges can be zeroed in files" +--- a/tests/zfs-tests/tests/functional/fallocate/setup.ksh ++++ b/tests/zfs-tests/tests/functional/fallocate/setup.ksh +@@ -26,4 +26,7 @@ + . $STF_SUITE/include/libtest.shlib + + DISK=${DISKS%% *} +-default_setup $DISK ++default_setup_noexit $DISK ++log_must zfs set compression=off $TESTPOOL ++log_pass ++ + diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.3.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.3.ebuild deleted file mode 100644 index 39f9cc590a1a..000000000000 --- a/sys-fs/zfs-kmod/zfs-kmod-2.1.3.ebuild +++ /dev/null @@ -1,209 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs - -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" -HOMEPAGE="https://github.com/openzfs/zfs" - -if [[ ${PV} == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/openzfs/zfs.git" -else - VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc - inherit verify-sig - - MY_PV="${PV/_rc/-rc}" - SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz" - SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )" - S="${WORKDIR}/zfs-${PV%_rc?}" - ZFS_KERNEL_COMPAT="5.16" - - # increments minor eg 5.14 -> 5.15, and still supports override. - ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}" - ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))" - - if [[ ${PV} != *_rc* ]]; then - KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" - fi -fi - -LICENSE="CDDL MIT debug? ( GPL-2+ )" -SLOT="0/${PVR}" -IUSE="custom-cflags debug +rootfs" - -RDEPEND="${DEPEND} - !sys-kernel/spl -" - -BDEPEND=" - dev-lang/perl - virtual/awk -" - -# we want dist-kernel block in BDEPEND because of portage resolver. -# since linux-mod.eclass already sets version-unbounded dep, portage -# will pull new versions. So we set it in BDEPEND which takes priority. -# and we don't need in in git ebuild. -if [[ ${PV} != "9999" ]] ; then - BDEPEND+=" - verify-sig? ( sec-keys/openpgp-keys-openzfs ) - dist-kernel? ( <virtual/dist-kernel-${ZFS_KERNEL_DEP}:= ) - " -fi - -# PDEPEND in this form is needed to trick portage suggest -# enabling dist-kernel if only 1 package have it set -PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )" - -RESTRICT="debug? ( strip ) test" - -DOCS=( AUTHORS COPYRIGHT META README.md ) - -PATCHES=( - "${FILESDIR}"/${PV}-werror.patch -) - -pkg_pretend() { - use rootfs || return 0 - - if has_version virtual/dist-kernel && ! use dist-kernel; then - ewarn "You have virtual/dist-kernel installed, but" - ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}" - ewarn "It's recommended to globally enable dist-kernel USE flag" - ewarn "to auto-trigger initrd rebuilds with kernel updates" - fi -} - -pkg_setup() { - CONFIG_CHECK=" - !DEBUG_LOCK_ALLOC - EFI_PARTITION - MODULES - !PAX_KERNEXEC_PLUGIN_METHOD_OR - !TRIM_UNUSED_KSYMS - ZLIB_DEFLATE - ZLIB_INFLATE - " - - use debug && CONFIG_CHECK="${CONFIG_CHECK} - FRAME_POINTER - DEBUG_INFO - !DEBUG_INFO_REDUCED - " - - use rootfs && \ - CONFIG_CHECK="${CONFIG_CHECK} - BLK_DEV_INITRD - DEVTMPFS - " - - kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP" - - if [[ ${PV} != "9999" ]]; then - local kv_major_max kv_minor_max zcompat - zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}" - kv_major_max="${zcompat%%.*}" - zcompat="${zcompat#*.}" - kv_minor_max="${zcompat%%.*}" - kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \ - "Linux ${kv_major_max}.${kv_minor_max} is the latest supported version" - - fi - - kernel_is -ge 3 10 || die "Linux 3.10 or newer required" - - linux-mod_pkg_setup -} - -src_prepare() { - default - - # Run unconditionally (bug #792627) - eautoreconf - - if [[ ${PV} != "9999" ]]; then - # Set module revision number - sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" - fi -} - -src_configure() { - set_arch_to_kernel - - use custom-cflags || strip-flags - - filter-ldflags -Wl,* - - # Set CROSS_COMPILE in the environment. - # This allows the user to override it via make.conf or via a local Makefile. - # https://bugs.gentoo.org/811600 - export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-} - - local myconf=( - HOSTCC="$(tc-getBUILD_CC)" - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=kernel - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - $(use_enable debug) - ) - - econf "${myconf[@]}" -} - -src_compile() { - set_arch_to_kernel - - myemakeargs=( - HOSTCC="$(tc-getBUILD_CC)" - V=1 - ) - - emake "${myemakeargs[@]}" -} - -src_install() { - set_arch_to_kernel - - myemakeargs+=( - DEPMOD=: - # INSTALL_MOD_PATH ?= $(DESTDIR) in module/Makefile - DESTDIR="${D}" - ) - - emake "${myemakeargs[@]}" install - - einstalldocs -} - -pkg_postinst() { - linux-mod_pkg_postinst - - if [[ -z ${ROOT} ]] && use dist-kernel; then - set_arch_to_portage - dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" - fi - - if use x86 || use arm; then - ewarn "32-bit kernels will likely require increasing vmalloc to" - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." - fi - - if has_version sys-boot/grub; then - ewarn "This version of OpenZFS includes support for new feature flags" - ewarn "that are incompatible with previous versions. GRUB2 support for" - ewarn "/boot with the new feature flags is not yet available." - ewarn "Do *NOT* upgrade root pools to use the new feature flags." - ewarn "Any new pools will be created with the new feature flags by default" - ewarn "and will not be compatible with older versions of OpenZFS. To" - ewarn "create a newpool that is backward compatible wih GRUB2, use " - ewarn - ewarn "zpool create -o compatibility=grub2 ..." - ewarn - ewarn "Refer to /usr/share/zfs/compatibility.d/grub2 for list of features." - fi -} diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.4.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.4-r1.ebuild index 415a0f781f18..79e017a77935 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-2.1.4.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.4-r1.ebuild @@ -26,7 +26,7 @@ else ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))" if [[ ${PV} != *_rc* ]]; then - KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" + KEYWORDS="amd64 arm64 ppc64 ~riscv" fi fi @@ -62,6 +62,10 @@ RESTRICT="debug? ( strip ) test" DOCS=( AUTHORS COPYRIGHT META README.md ) +PATCHES=( + "${FILESDIR}"/${PV}-ZERO_RANGE.patch +) + pkg_pretend() { use rootfs || return 0 diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest index e6dc0e2a194a..be1ded722866 100644 --- a/sys-fs/zfs/Manifest +++ b/sys-fs/zfs/Manifest @@ -8,14 +8,11 @@ DIST zfs-2.0.7.tar.gz 14550055 BLAKE2B 80f7297f04a21cd8f3f2043d895b0325512ba0cea DIST zfs-2.0.7.tar.gz.asc 836 BLAKE2B 65e7df58c33ccadc4e0ca9dbc1e8c006abbec8442e2da50872a1ab0cbb841fc45152298e8d3b93ee4320ddae6416e3a856caf80d8efb21b19db53dfedbf00e38 SHA512 b901d8e92faa6cfe6010bd54de88c7d18057f434cb07f8a89672d6c446a0a97b23209ee8f02cfd3b2a8f431c68ec977e7dc9f95fe5d385dba0bb6d37338ba682 DIST zfs-2.1.2.tar.gz 34829045 BLAKE2B ab4e2d85200438373c7eeeaa5256a712dbfb2862b85de1fb7554ad0cc2b9f8e1255ab4564bca62f65a81a823adb8c112957e6e8771b8e5e6944c3731bc894584 SHA512 3e3932259da2a27f1c4cca8da62b909edc43bf51ab0229d2d5d0234d9a7eaa7b63b67c06a98cbe2d29ba1eb5cbcaab16e5062c2a2bc8e84cab770be10ebf2102 DIST zfs-2.1.2.tar.gz.asc 836 BLAKE2B 8f5666f5c3d7016a4d79191f42d0a220fe8c654a0d64e3da3b575644fe52c83dcb9f9ef49ba0553771a127bba44e2802f1d366a7a38f670e73612deef76755c3 SHA512 da6bfccd19a249a6891f5e1de6c4b332e98ce4f125f638c046b9cedac3fd79c56a99dd9a620105a40741e5f04b382f5d5996b56cbe576fb268b31e57e0fed6eb -DIST zfs-2.1.3.tar.gz 34898999 BLAKE2B b4fc59ae97c74661f1303e4ce6efd5304842d382e278633debc4475c32074b9d272379d5d4caf8155f7a8cb1cb2b871b8c61fc36e14a612220757c5703a4c50b SHA512 26525bff7d0a831de780883c11eec5b3a142bded269c1dce95a4c466e753feb851cbbc001f0fe40f40209801192f9094fe179570fd117f90931cf11116439aeb -DIST zfs-2.1.3.tar.gz.asc 836 BLAKE2B 305d44ae02a28bc1dc24bb429a0454fdffe19a21e4a5f45ed924e81f8f1972638166a0cf64f99e92e53a50161886935a86c7d42d8fd9533b6b46c6c16c316d9a SHA512 6cdc92bc834f0b6bff9c0939224f1898729f2ae9b865f84906abb2a6b44a75f6aed6c256f03f81fe888d4edc7c421073b9b2f730b804fe532fd43cd127fdc505 DIST zfs-2.1.4.tar.gz 34896310 BLAKE2B be303f1181f604770536aa4aa61d5319ec408abbd04964cedadd15b3101a15deba6539bb5d833f4fed357f323d74f622d035305df699b213df41ae45bffdd200 SHA512 c7b57c43fc287b22905067ab022df4133d32e1a5dc335f7baf743b4ef88f64c2bf9d41318c2083230d077dd49e68f7d9e6172266e13d4b1eee29d359860f969e DIST zfs-2.1.4.tar.gz.asc 836 BLAKE2B b311730f72d534c87a782515f35a354bfbefba0513dc0cee5b0b497cf742590f13be6a49ff8a70d7d6503d0ba06b0266e7d290d718337add614812c3d1b0731a SHA512 53880cd5369f468551bab685eb83739ed76aa286886fdd2cbad4270755fe809da730082a91bba61011f59594fac297ce05645ae32c2c73b4a9aa835f2991a1ee EBUILD zfs-0.8.6-r2.ebuild 6527 BLAKE2B ac889061cc532d89d87705f610fa3220d1f0d8ef08a8e948a61c1eeab616ebb4815c1a5abf9bcc2a662a89a2a43cc1d659183b06fc170bf1f7bb716a2fa1dc4e SHA512 b21b4e0ca160a17f7fb3729cebdfc4efcd83898265445ef5cc4dfc1a6fcaf692552a8300f8465bad3b07fda73e78a212a5c868bae702d1896448945f22d4588d EBUILD zfs-2.0.7.ebuild 8435 BLAKE2B ecb10942cd6d51d0c5cb9c0e8ad5beef3afb580507514478b10dc3d59355262e87b2714c5f641e497bb2b351355400acb31b3aee81b98912c9a4753d7bcf55da SHA512 caeba0a22fefd58d0f7675c50d11d9a71f006e802960bdd810ff1799219526ab73e4d6993e8428af9823629a99d95932494911fcba8e0e6578c0cf697b0ad4e6 EBUILD zfs-2.1.2-r1.ebuild 8611 BLAKE2B 65f5e13bdf9ed34e248b9d0e6245fb76ee5b829398e0ee40a790b2f049042ea851ef4b35244264ddc899f31b5511e14c8bf9bc6ad77e2e11c811ccd4d8e2290f SHA512 03274ba778d38678cbf818f79b7ed124cd25af8071a00233d9d01fb86d8d8907a3a53a032dd464558fec196245a75dec95f6117a99371900fa4a6fb6fec2bd90 -EBUILD zfs-2.1.3.ebuild 8648 BLAKE2B f9f1cb8ae59d0c3266ea62a421e1e49cdfd971640cec9dd1305fef8917c1739fd18833d7bfb3df8de6fc4cd3b332163385dd1044e5be228d591c27b252aa35f8 SHA512 6c88726fad3f86168446de959d5719719d731d23c19786decdd3ebc75c806b96991702f45a500c127c7ccd3a8ce7afd215087a3293e289b5541beba26e0f227c -EBUILD zfs-2.1.4.ebuild 8648 BLAKE2B f9f1cb8ae59d0c3266ea62a421e1e49cdfd971640cec9dd1305fef8917c1739fd18833d7bfb3df8de6fc4cd3b332163385dd1044e5be228d591c27b252aa35f8 SHA512 6c88726fad3f86168446de959d5719719d731d23c19786decdd3ebc75c806b96991702f45a500c127c7ccd3a8ce7afd215087a3293e289b5541beba26e0f227c +EBUILD zfs-2.1.4.ebuild 8645 BLAKE2B 480e950c3daaeeb4bc12f2df38f8ca828d9e0e67ef5244e8d36783444ba1390e13be8a68cd67fe85470c5d7a76fd0edbeba6c92f1ef3fdb09bb8c36882008f17 SHA512 cbf6e54dd05f63b84a3a4560131a7ad75fe423ef61b607ce0c1274b3a4b0129cc8bf952e0ff32a6fbee17c20e6cdd37b3f0a9dfadc684f2f23a65c8fc7b3dca6 EBUILD zfs-9999.ebuild 8602 BLAKE2B c3154af855d5e81642f6dd39a846e19c96a9bb7879217a00c675d5b689fd2574ae486bec0682be921374ff20456f4dadc1f88129c185eb0fb095a0d7eeecc5dd SHA512 172c44e8c88613e0713d3647a8ed2e8b0d552a57c5d16c4e34cf0ccaaa7bf438b8cb54953519d1885b46000ba21448973881e3730c6fa1d7e4a0a3634c461f39 MISC metadata.xml 2194 BLAKE2B 57b0d1bcbcd78039d0cfd20f087bdfc339eefebbec3150af3c06d2e1a6dee882c4f8f97a9e470f63d4d628441a10650bda8b1843e33240dcc8d3e2ad55d104ec SHA512 fac8750d64d844b397fbbdcca9b7aea671f7642c64da92b89480439919ced80b9b6292ee3a2cc55e412e3c55dd02c418ef7c056f2973b7eb0f53ee763e099098 diff --git a/sys-fs/zfs/zfs-2.1.3.ebuild b/sys-fs/zfs/zfs-2.1.3.ebuild deleted file mode 100644 index 17e749df605d..000000000000 --- a/sys-fs/zfs/zfs-2.1.3.ebuild +++ /dev/null @@ -1,300 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{8,9,10} ) - -inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="https://github.com/openzfs/zfs" - -if [[ ${PV} == "9999" ]]; then - inherit git-r3 linux-mod - EGIT_REPO_URI="https://github.com/openzfs/zfs.git" -else - VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc - inherit verify-sig - - MY_P="${P/_rc/-rc}" - SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz" - SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )" - S="${WORKDIR}/${P%_rc?}" - - # 2.1.3 unkeyworded briefly for some testing - if [[ ${PV} != *_rc* ]]; then - KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" - fi -fi - -LICENSE="BSD-2 CDDL MIT" -# just libzfs soname major for now. -# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered. -# see libsoversion_check() below as well -SLOT="0/5" -IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite" - -DEPEND=" - net-libs/libtirpc:= - sys-apps/util-linux - sys-libs/zlib - virtual/libudev:= - dev-libs/openssl:0= - !minimal? ( ${PYTHON_DEPS} ) - pam? ( sys-libs/pam ) - python? ( - virtual/python-cffi[${PYTHON_USEDEP}] - ) -" - -BDEPEND="virtual/awk - virtual/pkgconfig - nls? ( sys-devel/gettext ) - python? ( - dev-python/setuptools[${PYTHON_USEDEP}] - || ( - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/distlib[${PYTHON_USEDEP}] - ) - ) -" - -if [[ ${PV} != "9999" ]] ; then - BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )" -fi - -# awk is used for some scripts, completions, and the Dracut module -RDEPEND="${DEPEND} - !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= ) - !prefix? ( virtual/udev ) - sys-fs/udev-init-scripts - virtual/awk - dist-kernel? ( virtual/dist-kernel:= ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !<sys-kernel/genkernel-3.5.1.1 - ) - test-suite? ( - app-shells/ksh - sys-apps/kmod[tools] - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - ) -" - -# PDEPEND in this form is needed to trick portage suggest -# enabling dist-kernel if only 1 package have it set, without suggesting to disable -PDEPEND="dist-kernel? ( ~sys-fs/zfs-kmod-${PV}[dist-kernel] )" - -REQUIRED_USE=" - !minimal? ( ${PYTHON_REQUIRED_USE} ) - python? ( !minimal ) - test-suite? ( !minimal ) -" - -RESTRICT="test" - -pkg_pretend() { - use rootfs || return 0 - - if has_version virtual/dist-kernel && ! use dist-kernel; then - ewarn "You have virtual/dist-kernel installed, but" - ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}" - ewarn "It's recommended to globally enable dist-kernel USE flag" - ewarn "to auto-trigger initrd rebuilds with kernel updates" - fi -} - -pkg_setup() { - if use kernel_linux; then - linux-info_pkg_setup - - if ! linux_config_exists; then - ewarn "Cannot check the linux kernel configuration." - else - if use test-suite; then - if linux_chkconfig_present BLK_DEV_LOOP; then - eerror "The ZFS test suite requires loop device support enabled." - eerror "Please enable it:" - eerror " CONFIG_BLK_DEV_LOOP=y" - eerror "in /usr/src/linux/.config or" - eerror " Device Drivers --->" - eerror " Block devices --->" - eerror " [X] Loopback device support" - fi - fi - fi - fi -} - -libsoversion_check() { - local bugurl libzfs_sover - bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages" - - libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \ - | grep -Eo '[0-9]+:[0-9]+:[0-9]+')" - libzfs_sover="${libzfs_sover%%:*}" - - if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then - echo - eerror "BUG BUG BUG BUG BUG BUG BUG BUG" - eerror "ebuild subslot does not match libzfs soversion!" - eerror "libzfs soversion: ${libzfs_sover}" - eerror "ebuild value: $(ver_cut 2 ${SLOT})" - eerror "This is a bug in the ebuild, please use the following URL to report it" - eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot" - echo - # we want to abort for releases, but just print a warning for live ebuild - # to keep package installable - [[ ${PV} == "9999" ]] || die - fi -} - -src_prepare() { - default - libsoversion_check - - # Run unconditionally (bug #792627) - eautoreconf - - if [[ ${PV} != "9999" ]]; then - # Set revision number - sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" - fi - - if use python; then - pushd contrib/pyzfs >/dev/null || die - distutils-r1_src_prepare - popd >/dev/null || die - fi - - # prevent errors showing up on zfs-mount stop, #647688 - # openrc will unmount all filesystems anyway. - sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die -} - -src_configure() { - use custom-cflags || strip-flags - use minimal || python_setup - - local myconf=( - --bindir="${EPREFIX}/bin" - --enable-shared - --enable-sysvinit - --localstatedir="${EPREFIX}/var" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-dracutdir="${EPREFIX}/usr/lib/dracut" - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - --with-pamconfigsdir="${EPREFIX}/unwanted_files" - --with-pammoduledir="$(getpam_mod_dir)" - --with-systemdunitdir="$(systemd_get_systemunitdir)" - --with-systemdpresetdir="$(systemd_get_systempresetdir)" - --with-vendor=gentoo - # Building zfs-mount-generator.c on musl breaks as strndupa - # isn't available. But systemd doesn't support musl anyway, so - # just disable building it. - $(use_enable !elibc_musl systemd) - $(use_enable debug) - $(use_enable nls) - $(use_enable pam) - $(use_enable python pyzfs) - --disable-static - $(usex minimal --without-python --with-python="${EPYTHON}") - ) - - econf "${myconf[@]}" -} - -src_compile() { - default - if use python; then - pushd contrib/pyzfs >/dev/null || die - distutils-r1_src_compile - popd >/dev/null || die - fi -} - -src_install() { - default - - gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool - - use pam && { rm -rv "${ED}/unwanted_files" || die ; } - - use test-suite || { rm -r "${ED}"/usr/share/zfs/{test-runner,zfs-tests,runfiles,*sh} || die ; } - - find "${ED}" -name '*.la' -delete || die - - dobashcomp contrib/bash_completion.d/zfs - bashcomp_alias zfs zpool - - # strip executable bit from conf.d file - fperms 0644 /etc/conf.d/zfs - - if use python; then - pushd contrib/pyzfs >/dev/null || die - distutils-r1_src_install - popd >/dev/null || die - fi - - # enforce best available python implementation - use minimal || python_fix_shebang "${ED}/bin" -} - -pkg_postinst() { - # we always need userspace utils in sync with zfs-kmod - # so force initrd update for userspace as well, to avoid - # situation when zfs-kmod trigger initrd rebuild before - # userspace component is rebuilt - # KV_* variables are provided by linux-info.eclass - if [[ -z ${ROOT} ]] && use dist-kernel; then - dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" - fi - - if use rootfs; then - if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then - elog "Root on zfs requires an initramfs to boot" - elog "The following packages provide one and are tested on a regular basis:" - elog " sys-kernel/dracut ( preferred, module maintained by zfs developers )" - elog " sys-kernel/genkernel" - fi - fi - - if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then - einfo "Adding ${P} to the module database to ensure that the" - einfo "kernel modules and userland utilities stay in sync." - update_moduledb - fi - - if systemd_is_booted || has_version sys-apps/systemd; then - einfo "Please refer to ${EROOT}/$(systemd_get_systempresetdir)/50-zfs.preset" - einfo "for default zfs systemd service configuration" - else - [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \ - einfo "You should add zfs-import to the boot runlevel." - [[ -e "${EROOT}/etc/runlevels/boot/zfs-load-key" ]] || \ - einfo "You should add zfs-load-key to the boot runlevel." - [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \ - einfo "You should add zfs-mount to the boot runlevel." - [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \ - einfo "You should add zfs-share to the default runlevel." - [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \ - einfo "You should add zfs-zed to the default runlevel." - fi -} - -pkg_postrm() { - if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then - remove_moduledb - fi -} diff --git a/sys-fs/zfs/zfs-2.1.4.ebuild b/sys-fs/zfs/zfs-2.1.4.ebuild index 17e749df605d..7d1292a10c0a 100644 --- a/sys-fs/zfs/zfs-2.1.4.ebuild +++ b/sys-fs/zfs/zfs-2.1.4.ebuild @@ -25,7 +25,7 @@ else # 2.1.3 unkeyworded briefly for some testing if [[ ${PV} != *_rc* ]]; then - KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" + KEYWORDS="amd64 arm64 ppc64 ~riscv" fi fi |