summaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-05-22 07:31:18 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-05-22 07:31:18 +0100
commit908778078736bd36f7a60a2d576d415cb8e000fa (patch)
treec6a4796c48b608c14dc7e9674cdbd38f905e3c15 /sys-fs
parent185fa19bbf68a4d4dca534d2b46729207a177f16 (diff)
gentoo resync : 22.05.2021
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/Manifest.gzbin21425 -> 21213 bytes
-rw-r--r--sys-fs/atari-fdisk/Manifest2
-rw-r--r--sys-fs/atari-fdisk/atari-fdisk-0.7.1.5.4.ebuild22
-rw-r--r--sys-fs/bashmount/Manifest2
-rw-r--r--sys-fs/bashmount/bashmount-4.3.2-r1.ebuild (renamed from sys-fs/bashmount/bashmount-4.3.2.ebuild)5
-rw-r--r--sys-fs/btrfs-progs/Manifest6
-rw-r--r--sys-fs/btrfs-progs/btrfs-progs-5.12.1.ebuild130
-rw-r--r--sys-fs/btrfs-progs/btrfs-progs-5.12.ebuild1
-rw-r--r--sys-fs/btrfs-progs/btrfs-progs-9999.ebuild1
-rw-r--r--sys-fs/cramfs/Manifest4
-rw-r--r--sys-fs/cramfs/cramfs-1.1.ebuild32
-rw-r--r--sys-fs/cramfs/cramfs-2.1.ebuild4
-rw-r--r--sys-fs/cryptsetup/Manifest4
-rw-r--r--sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild2
-rw-r--r--sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild2
-rw-r--r--sys-fs/dd-rescue/Manifest3
-rw-r--r--sys-fs/dd-rescue/dd-rescue-1.99.10.ebuild105
-rw-r--r--sys-fs/dd-rescue/files/dd-rescue-1.99.10-musl-r2.patch29
-rw-r--r--sys-fs/dmg2img/Manifest1
-rw-r--r--sys-fs/dmg2img/dmg2img-1.6.7.ebuild35
-rw-r--r--sys-fs/dosfstools/Manifest4
-rw-r--r--sys-fs/dosfstools/dosfstools-4.1.ebuild38
-rw-r--r--sys-fs/dosfstools/dosfstools-4.2.ebuild9
-rw-r--r--sys-fs/e2fsprogs/Manifest2
-rw-r--r--sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild2
-rw-r--r--sys-fs/etcd-fs/Manifest2
-rw-r--r--sys-fs/etcd-fs/etcd-fs-0_p20140620.ebuild34
-rw-r--r--sys-fs/exfatprogs/Manifest4
-rw-r--r--sys-fs/exfatprogs/exfatprogs-1.1.1.ebuild2
-rw-r--r--sys-fs/exfatprogs/exfatprogs-1.1.2.ebuild25
-rw-r--r--sys-fs/fuse-common/Manifest8
-rw-r--r--sys-fs/fuse-common/fuse-common-3.10.1.ebuild4
-rw-r--r--sys-fs/fuse-common/fuse-common-3.10.3.ebuild (renamed from sys-fs/fuse-common/fuse-common-3.9.3.ebuild)2
-rw-r--r--sys-fs/fuse-common/fuse-common-3.9.1.ebuild34
-rw-r--r--sys-fs/fuse/Manifest10
-rw-r--r--sys-fs/fuse/fuse-3.10.1.ebuild79
-rw-r--r--sys-fs/fuse/fuse-3.10.3.ebuild (renamed from sys-fs/fuse/fuse-3.10.2.ebuild)0
-rw-r--r--sys-fs/fuse/fuse-3.9.1.ebuild86
-rw-r--r--sys-fs/fuse/fuse-3.9.3.ebuild4
-rw-r--r--sys-fs/genfstab/Manifest3
-rw-r--r--sys-fs/genfstab/genfstab-24.ebuild16
-rw-r--r--sys-fs/genfstab/metadata.xml12
-rw-r--r--sys-fs/growpart/Manifest2
-rw-r--r--sys-fs/growpart/growpart-0.0.1.ebuild22
-rw-r--r--sys-fs/mac-fdisk/Manifest4
-rw-r--r--sys-fs/mac-fdisk/mac-fdisk-0.1_p18.ebuild5
-rw-r--r--sys-fs/mac-fdisk/metadata.xml4
-rw-r--r--sys-fs/mtools/Manifest8
-rw-r--r--sys-fs/mtools/mtools-4.0.24.ebuild47
-rw-r--r--sys-fs/mtools/mtools-4.0.25.ebuild47
-rw-r--r--sys-fs/mtools/mtools-4.0.26.ebuild4
-rw-r--r--sys-fs/mtools/mtools-4.0.27.ebuild2
-rw-r--r--sys-fs/multipath-tools/Manifest2
-rw-r--r--sys-fs/multipath-tools/multipath-tools-0.8.5.ebuild91
-rw-r--r--sys-fs/nilfs-utils/Manifest2
-rw-r--r--sys-fs/nilfs-utils/nilfs-utils-2.1.6.ebuild36
-rw-r--r--sys-fs/ntfs3g/Manifest12
-rw-r--r--sys-fs/ntfs3g/files/CVE-2019-9755.patch63
-rw-r--r--sys-fs/ntfs3g/files/ntfs3g-2014.2.15-no-split-usr.patch25
-rw-r--r--sys-fs/ntfs3g/files/ntfs3g-2016.2.22-sysmacros.patch43
-rw-r--r--sys-fs/ntfs3g/files/ntfs3g-2017.3.23-big-sectors.patch379
-rw-r--r--sys-fs/ntfs3g/files/ntfs3g-2017.3.23-check-mftmirr.patch12
-rw-r--r--sys-fs/ntfs3g/files/ntfs3g-2017.3.23-full-clusters.patch81
-rw-r--r--sys-fs/ntfs3g/metadata.xml50
-rw-r--r--sys-fs/ntfs3g/ntfs3g-2017.3.23-r3.ebuild106
-rw-r--r--sys-fs/ntfs3g/ntfs3g-2017.3.23.5-r1.ebuild4
-rw-r--r--sys-fs/progsreiserfs/Manifest4
-rw-r--r--sys-fs/progsreiserfs/files/progsreiserfs-0.3.1_rc8-autotools.patch4
-rw-r--r--sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild23
-rw-r--r--sys-fs/quota/Manifest2
-rw-r--r--sys-fs/quota/quota-4.05-r1.ebuild80
-rw-r--r--sys-fs/reiserfsprogs/Manifest2
-rw-r--r--sys-fs/reiserfsprogs/reiserfsprogs-3.6.27-r1.ebuild (renamed from sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild)13
-rw-r--r--sys-fs/static-dev/Manifest2
-rw-r--r--sys-fs/static-dev/static-dev-0.1-r1.ebuild (renamed from sys-fs/static-dev/static-dev-0.1.ebuild)19
-rw-r--r--sys-fs/sysfsutils/Manifest4
-rw-r--r--sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild38
-rw-r--r--sys-fs/sysfsutils/sysfsutils-2.1.1.ebuild9
-rw-r--r--sys-fs/udftools/Manifest6
-rw-r--r--sys-fs/udftools/udftools-2.1.ebuild19
-rw-r--r--sys-fs/udftools/udftools-2.2.ebuild22
-rw-r--r--sys-fs/udftools/udftools-2.3.ebuild5
-rw-r--r--sys-fs/udisks/Manifest4
-rw-r--r--sys-fs/udisks/udisks-2.9.1-r1.ebuild (renamed from sys-fs/udisks/udisks-2.9.1.ebuild)3
-rw-r--r--sys-fs/udisks/udisks-2.9.2-r1.ebuild (renamed from sys-fs/udisks/udisks-2.9.2.ebuild)3
-rw-r--r--sys-fs/vzquota/Manifest2
-rw-r--r--sys-fs/vzquota/vzquota-3.1.ebuild13
-rw-r--r--sys-fs/xfsdump/Manifest2
-rw-r--r--sys-fs/xfsdump/xfsdump-3.1.9.ebuild9
-rw-r--r--sys-fs/zfs-kmod/Manifest8
-rw-r--r--sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild1
-rw-r--r--sys-fs/zfs-kmod/zfs-kmod-2.0.4.ebuild1
-rw-r--r--sys-fs/zfs-kmod/zfs-kmod-2.1.0_rc5.ebuild1
-rw-r--r--sys-fs/zfs-kmod/zfs-kmod-9999.ebuild1
94 files changed, 319 insertions, 1802 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index b339d4e40387..c3d2adea8746 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
Binary files differ
diff --git a/sys-fs/atari-fdisk/Manifest b/sys-fs/atari-fdisk/Manifest
index cc85f9bbc04a..ab662f6762bb 100644
--- a/sys-fs/atari-fdisk/Manifest
+++ b/sys-fs/atari-fdisk/Manifest
@@ -1,5 +1,5 @@
AUX atari-fdisk-0.7.1.5.4-gcc-5-inline.patch 722 BLAKE2B 8c1e0697b77c34aeb90d6d0c1f3cb0fe7f9e22f73bbaa194c158d0cf5f6add1f0932be4808879a0150ea6e25084693813cd93c652638615c1cd6dff969f94b45 SHA512 aeda384a27e6ed408e82ede3e7821976daece0b577b2aa26250b183697387ea39a01ffc1bbe8aa09c570f0897ecf6022477e7a4126c6e90181a5c0a88cbe11c1
AUX atari-fdisk-0.7.1.5.4-prompt-logic.patch 495 BLAKE2B 4c4224850c10cefaa0d85f14f6f12d048808ad75314cff755785bec07d12e123b2f4520533c61c60d5c06d52137309c4e08ae9ccfff2fe9cd0e546611b2aba6b SHA512 7be32b061f2aaea03579282e9df5b78d207b823551ffeb91a20a96bd28fc57969e21b7e54da2af15bd0c74ea346ef904dee798405b61a593bd9149064b9bbec5
DIST atari-fdisk_0.7.1-5.4.tar.gz 47576 BLAKE2B 42154c48399a47aafbbddfe6bacfdb9997b2b6d93f7548c60e8b614fbc3abbef448ea514a168b39590c1c907a5b7d881ce58fa8c25fa41d24680d1786ca4bc15 SHA512 014be9a92b19f81901f814308b0f380df77de712f1e3f69438cf7ae7c57c53111cfc39f60899facd04af8b5457e980fdc689bfbfe2a91e5c2a0de8446a724961
-EBUILD atari-fdisk-0.7.1.5.4.ebuild 1245 BLAKE2B 756c573995900a750305374bed8e43318524030bc9cdbf22fdcfb930dd77f26a0ead92b4dec340eeaad615a9c68da4a7f79b169c61691c215b75e4b73278eabc SHA512 1bebfe3b5ea472e5f9510a00ab404d5ae986c29b55324c78a0f54eed41be095d17625fbc6479151c27e784be8266200ef8dec6ed09dbfbdae3c582e4ad2a71c1
+EBUILD atari-fdisk-0.7.1.5.4.ebuild 1157 BLAKE2B a0d6560c4c5a6514eb82a198e2a79c33fb71114b688939ee26c2a944b308690b4e027550dba3cb2a1921f2514112785e102b397838bec24763607e54c26d82ba SHA512 4dc4c2e2853d8f9584e5cfa1933a8d6eb747a6e95d1e2db60fcc5d4ccf6844fb58affcdea0f4173b0e2d5cbff3c436f4a29b8a51c4da3dfb82a8ac28b746f36e
MISC metadata.xml 213 BLAKE2B 9cfb840971c5a4f3188b32fef19b55e8cc693fa5b17f0a1231a26287f666f27ccaac578946b240f1c93dd7c26e4f2ca8e5a5831547bec8a6caf6153ebfca06d2 SHA512 66584639f70df67edf15360939d73d26f6097167cc24df4713171d34527fc373a3685b6ad531b9cd629a76e861d13b231284c633d863482b59347580e04037c2
diff --git a/sys-fs/atari-fdisk/atari-fdisk-0.7.1.5.4.ebuild b/sys-fs/atari-fdisk/atari-fdisk-0.7.1.5.4.ebuild
index fa3d8b70fb95..d8576f14aceb 100644
--- a/sys-fs/atari-fdisk/atari-fdisk-0.7.1.5.4.ebuild
+++ b/sys-fs/atari-fdisk/atari-fdisk-0.7.1.5.4.ebuild
@@ -1,15 +1,16 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=7
-inherit versionator toolchain-funcs epatch
+inherit toolchain-funcs
-MY_PV=$(get_version_component_range 1-3)
-DEB_PV=$(get_version_component_range 4-5)
-DESCRIPTION="create and edit the partition table of a disk partitioned in Atari format"
+MY_PV=$(ver_cut 1-3)
+DEB_PV=$(ver_cut 4-5)
+DESCRIPTION="Create and edit the partition table of a disk partitioned in Atari format"
HOMEPAGE="https://packages.qa.debian.org/a/atari-fdisk.html"
SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${MY_PV}-${DEB_PV}.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_PV}
LICENSE="GPL-2"
SLOT="0"
@@ -17,14 +18,11 @@ SLOT="0"
# use this on 64bit systems (where sizeof(long) == 8), then misbehavior
# and memory corruption will ensue.
KEYWORDS="-* ~m68k x86"
-IUSE=""
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.7.1.5.4-prompt-logic.patch
- epatch "${FILESDIR}"/${PN}-0.7.1.5.4-gcc-5-inline.patch
-}
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.7.1.5.4-prompt-logic.patch
+ "${FILESDIR}"/${PN}-0.7.1.5.4-gcc-5-inline.patch
+)
src_compile() {
emake \
diff --git a/sys-fs/bashmount/Manifest b/sys-fs/bashmount/Manifest
index 698514b66f41..af53aaf1f822 100644
--- a/sys-fs/bashmount/Manifest
+++ b/sys-fs/bashmount/Manifest
@@ -1,3 +1,3 @@
DIST bashmount-4.3.2.tar.gz 47450 BLAKE2B 0dc45580b62aa55872753de17ee50e77e716e87498193c8dab0998f5a70994ad5cc9434c104bc1d6cc77d75d63688afae8be8e0e8ee4344249ded5f1719051c5 SHA512 ac18d76dc27099524f4051299dc5421e1e5811e943df21d64a1405b5cdf6401189d78571596f27c89c0d76ab40874392c0c90756ef5fa9c036f447ac884ee062
-EBUILD bashmount-4.3.2.ebuild 620 BLAKE2B 8b4527930b036a75b236e1b7621f49426b739e6cf0bbf0461be8f52bad74f4b7f148415455680aa35cb2b77f9f3176af69c935931372d2661636434311942688 SHA512 1c828df7d9f03330daf4621b535061c73796c82d7e98fadc1fbbcfd601c28cbea2144c29fd2d7c0e4de500d8424c71f8aa9c089e4f04c86fdc87011c7fe054c4
+EBUILD bashmount-4.3.2-r1.ebuild 605 BLAKE2B 1cf5529c37809ad767ed3cfd9418612fcd83707f95e231961688a396459c5f00baa4440d7860a74f87eaf76422f0ddc62ffa61ab2169348cacda2afb1c5d543a SHA512 504ef503024239cfd2288ff9c205dacf670bc2f0db067ab94b079d0ccf8574b5775ff1c6d8076d842f7545c6268d5dc1e39005dc2f9933843364b60a32e37f16
MISC metadata.xml 477 BLAKE2B d2d7cda24398df24ad4e4cab9d9df216dc41412b742e6c8466af032b051ef22589e096a52e3a788dee9a068367329ab765bd41897566c25aed21c0300e021198 SHA512 69db8f36ee337f6b3e23921fd6327bb1deb340f728b3aabd17f1834421a7a36ee8b13d8ce0600c2c4b42816b8f6123a4882786866c73bcfa3e43ac990dbe7cce
diff --git a/sys-fs/bashmount/bashmount-4.3.2.ebuild b/sys-fs/bashmount/bashmount-4.3.2-r1.ebuild
index 71c5fb9802b5..3c4c85c7c4ed 100644
--- a/sys-fs/bashmount/bashmount-4.3.2.ebuild
+++ b/sys-fs/bashmount/bashmount-4.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,8 +16,7 @@ RDEPEND="
app-shells/bash:*
sys-apps/dbus
sys-apps/util-linux
- sys-fs/udisks:2
- virtual/eject"
+ sys-fs/udisks:2"
DEPEND="${RDEPEND}"
src_install() {
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index e3f07fb22c30..3008b3a8dea3 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,8 +1,10 @@
DIST btrfs-progs-v5.10.1.tar.xz 2204164 BLAKE2B ed83729754f9abd22d4d2e7ae9a7e90e80be9b63d49a4a9692e20e5939467dbd864834b71495661e1c7a1fca89e253a62fbda37f1d01d2eadecb13f5904f0dd0 SHA512 32e5b8bda1863e34613802db91946f240b2cde21288ff8f95c1807e7afd0a67c5a704aa4d2bc0d7b1ca094de6831adbfec83fe61f74e1caf6d1975be7d972f2d
DIST btrfs-progs-v5.11.1.tar.xz 2213548 BLAKE2B f428e8ffb62f60e6772102f4623b9965edc5d18fa60aa8cb60fd92b4867ee29e3067a6b9d0935c738acce5f0abfc4b88c900121ee233aa881857ed4690e38e3b SHA512 f93a54bd2256851a74fc8e52b26f697bd7bf788cb2481512c92ebf1b9a2f2968b62d680f9f000d6162bd6f22b5d632b2149a88adad8c489e1332f810b439da90
+DIST btrfs-progs-v5.12.1.tar.xz 2220424 BLAKE2B 1e6120609feb37dd2ced04b27d8cba9a28c3b962add6f037927dcb05bdcd46a229f981f7f68231ee58e7e36a65fae4e6041e92c0db11dba56fe63b09bca30cc7 SHA512 a4044ad7e40e232442601f102ea1c64a65aa4d9765be303813d2547a5b730c5f2f84c9b9c652a4218ab16821fdd049dd8573a1f7f6cc27974c2c4389243e20f5
DIST btrfs-progs-v5.12.tar.xz 2220396 BLAKE2B be3eaadca7386ab1348c4bef6cf10270a42ac34c8e7e1cb54b9db600fde6a5958cff9453e6c287fba23f928116eeccca5d90f78f9c042b972a3ac66a31566e3b SHA512 af9ab8bf232e0c62cc093d848b95991924cc3a84020fb9c85765a63a1cc132403e784bf18f81b71b2af9daa0038a7b11e578ee7b50d90481a888f7a967a5b197
EBUILD btrfs-progs-5.10.1.ebuild 3064 BLAKE2B d0bbb45eab6acfe22503d7537d29d40d3182208c57617baa476e993fb105c0057db34132f03391eed7683da07ffe9a059885778553522a434b21717ba50ad822 SHA512 8b24f2934aee146ccd6e9ac06f5a0b12b90263121e2e6a976ac02774bca0c9f4c3d0f2a7d14e79c026c87c6ed6576ec3c07375607d55ccbb2879edc5b5a84d17
EBUILD btrfs-progs-5.11.1.ebuild 3070 BLAKE2B 56289d7f3b80ee4370957694f696b9b3862b7e050d02a1dcda2564eabb68abf20b841fa8259475ffdbe39a1f092a268a79579bcf5526d3dc2a3d35eb7222e41b SHA512 1fe2eaed192f6a96f9eb3adbe41c58e58b282ac120e3ba44a792004ef6d26d5bea05e7c091417461d8d032373f87ecff4bf1a871000e1bc16251b859723d4ced
-EBUILD btrfs-progs-5.12.ebuild 3070 BLAKE2B 56289d7f3b80ee4370957694f696b9b3862b7e050d02a1dcda2564eabb68abf20b841fa8259475ffdbe39a1f092a268a79579bcf5526d3dc2a3d35eb7222e41b SHA512 1fe2eaed192f6a96f9eb3adbe41c58e58b282ac120e3ba44a792004ef6d26d5bea05e7c091417461d8d032373f87ecff4bf1a871000e1bc16251b859723d4ced
-EBUILD btrfs-progs-9999.ebuild 3070 BLAKE2B 56289d7f3b80ee4370957694f696b9b3862b7e050d02a1dcda2564eabb68abf20b841fa8259475ffdbe39a1f092a268a79579bcf5526d3dc2a3d35eb7222e41b SHA512 1fe2eaed192f6a96f9eb3adbe41c58e58b282ac120e3ba44a792004ef6d26d5bea05e7c091417461d8d032373f87ecff4bf1a871000e1bc16251b859723d4ced
+EBUILD btrfs-progs-5.12.1.ebuild 3103 BLAKE2B cfe3377527fb701da2cf02fc6857a828cffa42f3b672854e12dfd355a5c3e52708df6bc74f00abdbe0548220220508a090039ea9107cdaa0dcf14e80eb2d00ee SHA512 feffef7dd3b8be3da822a2fa5d5bcd6465607b6fab93df44630cf3d1b386e80669d88537b433cd6cfdf21ff98a3011393106607b213f89c55b99f7b1570307cf
+EBUILD btrfs-progs-5.12.ebuild 3103 BLAKE2B cfe3377527fb701da2cf02fc6857a828cffa42f3b672854e12dfd355a5c3e52708df6bc74f00abdbe0548220220508a090039ea9107cdaa0dcf14e80eb2d00ee SHA512 feffef7dd3b8be3da822a2fa5d5bcd6465607b6fab93df44630cf3d1b386e80669d88537b433cd6cfdf21ff98a3011393106607b213f89c55b99f7b1570307cf
+EBUILD btrfs-progs-9999.ebuild 3103 BLAKE2B cfe3377527fb701da2cf02fc6857a828cffa42f3b672854e12dfd355a5c3e52708df6bc74f00abdbe0548220220508a090039ea9107cdaa0dcf14e80eb2d00ee SHA512 feffef7dd3b8be3da822a2fa5d5bcd6465607b6fab93df44630cf3d1b386e80669d88537b433cd6cfdf21ff98a3011393106607b213f89c55b99f7b1570307cf
MISC metadata.xml 523 BLAKE2B 7757fa4d4f1400bf08e2975e5214a1dd0c8258b61366c98089ca9c497b8c62e497cdedad605370f7034519b91c266b23e2e42bcafef3bb2bb69cb6b93319fa00 SHA512 3830f8f555ade672eeb52394a5b262e06e69b8b27d947d81dcde9b341fea9f16b77df8101ee5cd3314b6552543431a5f32a2592bf77a7a50e28cc56c95a4b164
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.12.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.12.1.ebuild
new file mode 100644
index 000000000000..90b1aa08f672
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.12.1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 2008-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..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:0=
+ sys-libs/e2fsprogs-libs:0=
+ 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_MULTI_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:0[static-libs(+)]
+ sys-libs/e2fsprogs-libs:0[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} )"
+
+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.12.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.12.ebuild
index e7da9aa59cf0..90b1aa08f672 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.12.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.12.ebuild
@@ -46,6 +46,7 @@ RDEPEND="
zstd? ( app-arch/zstd:0= )
"
DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-5.10
convert? ( sys-apps/acl )
python? (
$(python_gen_cond_dep '
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index e7da9aa59cf0..90b1aa08f672 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -46,6 +46,7 @@ RDEPEND="
zstd? ( app-arch/zstd:0= )
"
DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-5.10
convert? ( sys-apps/acl )
python? (
$(python_gen_cond_dep '
diff --git a/sys-fs/cramfs/Manifest b/sys-fs/cramfs/Manifest
index f5cd189f6402..1ad5408e72a2 100644
--- a/sys-fs/cramfs/Manifest
+++ b/sys-fs/cramfs/Manifest
@@ -1,5 +1,3 @@
-DIST cramfs-1.1.tar.gz 24179 BLAKE2B adb5d1682dbc7405333b735f145cdaffea770c09a60c15a79d1973a365b2f013ebbd728e05f5a20559bace237a6f685c6afba557249ee2049bb6827d5da3e9f8 SHA512 6c18dbe32df57f7d132fb2a59a917ad381156ca1f720c1ad0997ca81c62e82fd43ebb0339c5a66d5b144a72ce5c7ae93596522fe2698259f2b68c31db26e3b63
DIST cramfs-2.1.tar.gz 33595 BLAKE2B 599f9af8f02cb7c17f58b78dde59f162bbcbe9008d2941fb4f8f9accfd4e6d371b9f31ae1a65a3e3d10458b53acd927fdab9049c082a132f139abdddb9f6890c SHA512 76137d1347fa7d1907590cfd7f3c5b48f2422bc2dd95fb2ae5b33561e5d5f179634a98d117f1f1344c15362f4282bce87cf9d527b5512f9badb1a2c024755eee
-EBUILD cramfs-1.1.ebuild 666 BLAKE2B 20588e4c237daae7a3e11b385433e347cd64a20e424c1c227d985ede4514f0f43d46d1a0ea4495ae8c4a9aec5c9b44f4d7bb11576b2a01bdecdfe08a004a33fd SHA512 fbd30c5dc515da8917ae1ebefcb837b0c2a2fefd3894da1b2c2cac64ed4cb24e071317742e596da053fd7a5218128828821d94034666b79618aa3e6e25a0f8d5
-EBUILD cramfs-2.1.ebuild 657 BLAKE2B ebf6a25cce6a6f1466c9b69be67ffe82b0909dd14684fdd30ad1af76be08e1a35eb40b772885f159827bc5d08f32dca52e37f85ef0a5e9c80eef6e3737343cf2 SHA512 3750670a12394e454c2bcb224fbed606e98f4c557f4eb1ed5f54f77b09910345522ac848c3250bb6a160f1fbe6868ea8a23d81801fc6f09732d9d11c8d879e01
+EBUILD cramfs-2.1.ebuild 654 BLAKE2B 467b0b2a36a2534866e758c34c7e7acb166a41ca4b5ff7639e83c881280837c0545125cacae700592f10d917ec4c8389f52e3d61bad7996362835659275c2d16 SHA512 97dd5a21b428f7790b15f22410f4246942d611396bc0cacfcd7cd40aa45721f6348b32a64de698a842e8f3f6ad10b3f3e760416f308a25ff830b6c76458914a0
MISC metadata.xml 326 BLAKE2B 36719a57295c9599b2247c0a4abd21e78261171cb044a1cf4a206fbcfa50fee7c02f22cd0d1cca59a5c3bd9496be762e7fb9888f0e587d0eca8b3c596433e36a SHA512 adb8fa2cf18de2f83d1560eeb8af2b8a8cc81c6f30df05012c3999c1e1f5b0d450c48d81e27db3c01e61a3aced9c580acc06ec3e6a5f127800cae2fbf14872d5
diff --git a/sys-fs/cramfs/cramfs-1.1.ebuild b/sys-fs/cramfs/cramfs-1.1.ebuild
deleted file mode 100644
index 8236cc32ec88..000000000000
--- a/sys-fs/cramfs/cramfs-1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Linux filesystem designed to be simple, small, and to compress things well"
-HOMEPAGE="https://sourceforge.net/projects/cramfs/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86"
-IUSE=""
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- sed -i '1i#include <sys/sysmacros.h>' mkcramfs.c || die #580196
-}
-
-src_compile() {
- emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
-}
-
-src_install() {
- into /
- dosbin mkcramfs cramfsck
- dodoc README NOTES
-}
diff --git a/sys-fs/cramfs/cramfs-2.1.ebuild b/sys-fs/cramfs/cramfs-2.1.ebuild
index 856b3d1d26ae..85d40d3662c8 100644
--- a/sys-fs/cramfs/cramfs-2.1.ebuild
+++ b/sys-fs/cramfs/cramfs-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/npitre/cramfs-tools/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
IUSE=""
DEPEND="sys-libs/zlib:="
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index e1bfb1f0b4d3..0569b7f6714c 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -3,6 +3,6 @@ AUX 1.6.7-dmcrypt.rc 8815 BLAKE2B 9e88475af36f7ab3c7b48672ecf64e885e7be4b1af27c2
AUX cryptsetup-2.0.4-fix-static-pwquality-build.patch 427 BLAKE2B dfdc56c6627084732973254cd52c48f0869aa7b4c58e466840a87f77c1d4fb09ae37295fb54e980abccfdfe51dc63161e188a0be9bb4bf3c69d7731120f84bac SHA512 23b5f9b21ec86c92787bfc8744682ce0777dfa87e1de97afbb8db33c4587f1e2c8e5f8c9d0fa56ca801d7795739f9a66f14633d8a3904ea68ddd58ddc3863adf
DIST cryptsetup-2.3.4.tar.xz 11114004 BLAKE2B 680e6eeb594737aeb8330b0ac8638e94941bdcc56fc3441b6f1bc4f3d209d768096e23a7f840dc1012f9e63fae0fdbc0e72d735d89e92a621cec88ea59560f19 SHA512 db0bfd795343e575acb7a80ea2b9d32acf08ac970037e5b158a1e4381976552dc292107ce79e55913f49fcf643d4ea7104ed73de7c1e8d424b83d471d20ab60d
DIST cryptsetup-2.3.5.tar.xz 11146364 BLAKE2B fb37c1a7308ecb82630f3a50b70bedcc540dab40a5c716a9d1ac218c7b9ed275da1a1a8f7ceffd8f0d2f5779b4e99c09ccd725c7babe7954e1d31226e85f21ae SHA512 60695a445608e2019ffc4f4ea4d7f6819849991bf2862e5648920abccea33990210554fcbf5a512659b513b27d3759fe3c1e64e96f02d9301463a48f2dbf04bf
-EBUILD cryptsetup-2.3.4-r1.ebuild 3861 BLAKE2B 632d222b2677005052a60c602d31164823f032aebd52e3c183e7f8d943d3d8e5f4b07d1b689bf633ecfc15b2cb9d990d81742a01e42f69d38b3d5770bfaae8dd SHA512 990d951e0d9a487f4832c5516a92802b66713973baa50ab69d2076b0e7fa58107c333908d918ac095dc06f8196bbeac8160f9b6d529ceeb50865f85f792cb3f2
-EBUILD cryptsetup-2.3.5-r1.ebuild 3869 BLAKE2B ab904490e878450c41e61125d40a208e9363827ba79bffc1fe1228f7783f94cb495f744f02b4c25d8ddd19bc9cfbadef231e39a9a30ff0d70c8c37cd7d4d7d9d SHA512 aec8c7d712115e116d814c08c50eab75ff0de81d547368910c71978103ddf54fc2dcb9b653bb9e08fe4e3f87c5327fe472c56c1de6883f2537b4d2ac9ad347e7
+EBUILD cryptsetup-2.3.4-r1.ebuild 3853 BLAKE2B d66f995f69cac742d0d1e6c22bccda546c49c74fc495fd43dad6469cb948214923f85119eae86f8d87989a6f689d20113048427d6238f2ee75910274a1fe3512 SHA512 ad6cd0dc0f2ca709ee380046c2d5b5b23f198fd2fff59197f052138b765752ee018b24e76de3ad929ca15fae14d736b25b643f7055f682cc02b61de4083976b6
+EBUILD cryptsetup-2.3.5-r1.ebuild 3861 BLAKE2B ed75ff27bee5a82bf54418413b62a291ed1d62ef41d3dab5830a6c5388f784dfebb42a45967fb5e7e676f3ec1b818dc5e63cfd741ea51d9069b01b6a2d7fefa1 SHA512 d12da1446da7911ee11ec5fc89c406f07890eb6913479fe3cfb0150f3da412dc09e95f1896501181d4e7b68335c41e07822e3d296e616284a455f0dd9d06a589
MISC metadata.xml 974 BLAKE2B 7dc6d2696e918f5a5c195194f70ec053bac4bfc84510234ae63a4bebb8363b72e9b1fcc331312c938839a633c95dae1e88dc24bf8ca0602cefc8bb8ab1c822c0 SHA512 a5c9ab70c75af24d3ffdd076f1eb61c6eec3b388a417f611f8988bf3f2da5daaffaab461b50c995e572d2d800c726ca960e78c3c17dd2a40788fcf48e4158f41
diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild
index 641a9c76c687..e96df12d24be 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit autotools linux-info libtool
+inherit autotools linux-info
DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild
index 30f4962b68e4..72a0baf8cb90 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit autotools linux-info libtool
+inherit autotools linux-info
DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest
index 0274bd8349e6..135b726d46cd 100644
--- a/sys-fs/dd-rescue/Manifest
+++ b/sys-fs/dd-rescue/Manifest
@@ -1,13 +1,10 @@
-AUX dd-rescue-1.99.10-musl-r2.patch 1545 BLAKE2B 827079a693ef1f3d86aa9b7041e441c7c0baacb29f93d56144a3756a6be1a2fbf7373187d30b2a46f8499a5ad810946a1137181e217d90fa57d021288e4b6e85 SHA512 69ed831b52f3a9ee0ab0a149341ff46beaa9c37726e198a0ad014765f11645e390ea8af0d1680576c2902380513dd5cdf285fdd1cbbc4f105a0b404716f007ed
AUX dd-rescue-1.99.11-musl-r2.patch 1556 BLAKE2B 6b71ac5e30c988894a5fe260372e004c48280f4eeea0f1d79ac5a103bfc3ce33f2c2d44b424203c0c58518bbecd374719a7de53d0d2c876336f843fb20eb75e7 SHA512 82ade941b969342b2b91c92667301c18d16da06eed88fae2e43d5e2833dfcd597c17b2842930ec6c5ae0712dbd3768e35499d9c6aaf67d8510bb0b9e469821b8
AUX dd-rescue-1.99.8-sysrandom.patch 1204 BLAKE2B 4ef909c294a9299c93fb0ca793e5815fa6f98a9860de1886d9f8da8584a16c0320d56c6ecb6894cbe7f62be62e290f36b76319ed714ccc085c59f952a03cacc6 SHA512 14020e023ea7cf5b56d78776149933241f7424fb22076686a9541737f2fe887406b94e584c5cf650d754e9ead9bf6f2f96c390a2c1fba49f961955df49445a06
AUX dd-rescue-1.99.8-testhole.patch 1267 BLAKE2B 137961d607cd93ad758c7cf6b8f8ab4b2e54017f43585e277563a5050e9c32ee52567de08af83a048e7e59b2ed05753fc67286d640d3c7998504bd11e9a1286c SHA512 f6a6649a4bce486a07f2eac382db609a47585361ad24ce03bad49da284c0b5485e35fcaec95445c46b74f6dfa5fe09d28c45a33a1b319a03c8cbb15c03a4ee8d
AUX dd-rescue-1.99.8-xattr.patch 9308 BLAKE2B 0874806f5394759edacdc4d937619b4ab568cfa501b14f1b56a48f80f7e9777e8be439fe0f1edbe9eb6232344e850360b504dc81ffd1052067c1f68b2152d78e SHA512 b9a2a0c3c035b89c9ef45f52b48d247bcb56f250e86e39bce905826c83823eb855407aeaeadefbf878c946ac019b4f7ec58a46930f0b3450b191b62bd524690a
AUX dd_rescue-1.99-musl-r2.patch 4035 BLAKE2B cffc620f429db2042a405174a280e44c27dc60f9b3da007969b77d66df599b9c4b9fb02cb2799017c7fb6a0a0f1e8b785c88fb741fb478b6a8f256d0e461bf78 SHA512 a0fe42686852cbdd4ce5a4c55c9dc77cff7165109f3c7d4dfaaec527fa116a17f602ad4fab22410991f05aac6aa8f5b57bb711c05e08f146d532aaa807dbfd66
-DIST dd_rescue-1.99.10.tar.bz2 176603 BLAKE2B 66e9f54274363eb9b66c3fb098d398f7ae6f43812eb1560304c14bbe4b0e8158881f891a80ef2b03a77d205402651c7b9ed8bcdc14b3e6e865f4e713ab9249f4 SHA512 8f7cd4fca09302035f26102ce057a05130dcd808f2e44bd057f776dcd0222f9df6317b9703ab6c3b133a55e4bbbdf0ff58fdcbbbc3f1fc20889b29092b522e06
DIST dd_rescue-1.99.11.tar.bz2 181927 BLAKE2B 8cd4db6cb8d85962e4cea50b0006fdbe5f085fbcf7bdbfe4d0fab1fe33412c1379317f54429c76ed1d905e32d5e791869fa27f2f14917cb1c3842fc6caca2a12 SHA512 e1d32711421ebbafd80fd210718667ff8c2d22b5349945105b3e4c29d54d381385b1fd188b2d8aa1b7a0aaf2cc9d8f7374373cff3992726a3d17549ca50f3904
DIST dd_rescue-1.99.8.tar.bz2 174594 BLAKE2B 51e62989bf6318cb5926f30bc1db746bddd41fb49aab15dc2b1c67e0af079469161d390ba4e1e109d195249b3aace3aa830a3aec14ba534eb47f38c0136f910c SHA512 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac07777d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d
-EBUILD dd-rescue-1.99.10.ebuild 2374 BLAKE2B 24f2bfe4c1ed4cad08be6402ffe7934c30fd6972b6a6eb3ee7dc982626c40d6e4c15105a5b7f0b423400b70b69fc6760bf8ab84303e779c3d3f131a39d7bb01a SHA512 85c623d9651b000ee351bc7a51fd11696e4b1005535cb966eda3887322f11a0d9bc414b613488115e2d48ca6606d05fe4cb80b47bb1f74b3ae3c3ffd57b6df3e
EBUILD dd-rescue-1.99.11.ebuild 2375 BLAKE2B 63d85595e0f095a9e18f754a71e3811a68ca6f8914fe325f8bb1de8e7aa7838a58c1fa88db71ff622e0204b68314fe1fa78384c91bfbe95865c4b34ecc45ca4d SHA512 58146f2a87f6ff6b244a2289f74554f6b48811bce9211ef871a4195bb04593888adbb0b9e25ecab491dee530b39ed41c99933e551a911fcf29764fd6e1d00e81
EBUILD dd-rescue-1.99.8-r1.ebuild 2502 BLAKE2B 8d7f487f02b8c6cbb1ecab1d9226f646a8a6118eb4d90b25128538b1d4a3430d99a1eb2d17f8e70600346e2f3b987e3cf86276c360bc127d90f15dde0c60a099 SHA512 7df6dceb92cdb93f43002cf33f138cdee775ab431e761663cbb6ea4b15c2bec73d73dabb11347d2a3e6cbbb04a2e1feee8f3bff128bdc9c3cc5b6891e00aacd3
MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.10.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.10.ebuild
deleted file mode 100644
index 12cfa7fbbe60..000000000000
--- a/sys-fs/dd-rescue/dd-rescue-1.99.10.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib toolchain-funcs
-
-MY_PN="${PN/-/_}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Similar to dd but can copy from source with errors"
-HOMEPAGE="http://www.garloff.de/kurt/linux/ddrescue/"
-SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr"
-
-RDEPEND="lzo? ( dev-libs/lzo )
- xattr? ( sys-apps/attr )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.99.10-musl-r2.patch
-)
-
-src_prepare() {
- default
-
- if ! use cpu_flags_x86_sse4_2; then
- sed -i \
- -e 's:^CC_FLAGS_CHECK(-msse4.2,SSE42):#&:' \
- configure.ac || die
- fi
-
- if ! use cpu_flags_x86_avx2; then
- sed -i \
- -e 's:^CC_FLAGS_CHECK(-mavx2,AVX2):#&:' \
- configure.ac || die
- fi
-
- eautoreconf
-
- sed -i \
- -e 's:-ldl:$(LDFLAGS) -ldl:' \
- -e 's:-shared:$(CFLAGS) $(LDFLAGS) -shared:' \
- Makefile || die
-}
-
-src_configure() {
- use static && append-ldflags -static
- # OpenSSL is only used by a random helper tool we don't install.
- ac_cv_header_attr_xattr_h=$(usex xattr) \
- ac_cv_header_openssl_evp_h=no \
- ac_cv_lib_crypto_EVP_aes_192_ctr=no \
- ac_cv_lib_lzo2_lzo1x_1_compress=$(usex lzo) \
- ac_cv_header_lzo_lzo1x_h=$(usex lzo) \
- econf
-}
-
-_emake() {
- local arch
- case ${ARCH} in
- x86) arch=i386;;
- amd64) arch=x86_64;;
- arm) arch=arm;;
- arm64) arch=aarch64;;
- esac
-
- local os=$(usex kernel_linux Linux IDK)
-
- # The Makefile is a mess. Override a few vars rather than patch it.
- emake \
- MACH="${arch}" \
- OS="${os}" \
- HAVE_SSE42=$(usex cpu_flags_x86_sse4_2 1 0) \
- HAVE_AVX2=$(usex cpu_flags_x86_avx2 1 0) \
- RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" \
- CFLAGS_OPT='$(CFLAGS)' \
- LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/${PN}" \
- CC="$(tc-getCC)" \
- "$@"
-}
-
-src_compile() {
- _emake
-}
-
-src_test() {
- append-cflags -fcommon # bug 707796
- _emake check
-}
-
-src_install() {
- # easier to install by hand than trying to make sense of the Makefile.
- dobin dd_rescue
- dodir /usr/$(get_libdir)/${PN}
- cp -pPR libddr_*.so "${ED}"/usr/$(get_libdir)/${PN}/ || die
- dodoc README.dd_rescue
- doman dd_rescue.1
- use lzo && doman ddr_lzo.1
-}
diff --git a/sys-fs/dd-rescue/files/dd-rescue-1.99.10-musl-r2.patch b/sys-fs/dd-rescue/files/dd-rescue-1.99.10-musl-r2.patch
deleted file mode 100644
index ae348eadf5c8..000000000000
--- a/sys-fs/dd-rescue/files/dd-rescue-1.99.10-musl-r2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5429b36d186e73695244cee66f98ff9f61378b67 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Wed, 13 Dec 2017 01:02:12 +0100
-Subject: [PATCH] loff_t and __WORDSIZE includes for MUSL
-
-Rewrite of Justin Keogh's patch [Link 1] to fix build problems
-on ARM.
-
-Link 1: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f5abc0f1b036921d6eb5b0f434c960ed280619f
-Fixes: https://bugs.gentoo.org/616364
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 454bbcb..ec3fcc7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -11,7 +11,7 @@ AC_C_INLINE
-
- #AC_PROG_INSTALL
- #CFLAGS="$CFLAGS -DHAVE_CONFIG_H"
--AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h sys/xattr.h attr/xattr.h sys/acl.h sys/ioctl.h endian.h linux/fs.h linux/fiemap.h stdint.h lzo/lzo1x.h openssl/evp.h linux/random.h sys/random.h malloc.h sched.h sys/statvfs.h sys/resource.h])
-+AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h sys/xattr.h attr/xattr.h sys/acl.h sys/ioctl.h sys/reg.h endian.h linux/fs.h linux/fiemap.h stdint.h lzo/lzo1x.h openssl/evp.h linux/random.h sys/random.h malloc.h sched.h sys/statvfs.h sys/resource.h])
- AC_CHECK_FUNCS([ffs ffsl basename fallocate64 splice getopt_long open64 pread pread64 lseek64 stat64 posix_fadvise posix_fadvise64 __builtin_prefetch htobe64 feof_unlocked getline getentropy getrandom posix_memalign valloc sched_yield fstatvfs __builtin_cpu_supports getrlimit])
- AC_CHECK_LIB(dl,dlsym)
- AC_CHECK_LIB(fallocate,linux_fallocate64)
---
-2.31.0.rc2
diff --git a/sys-fs/dmg2img/Manifest b/sys-fs/dmg2img/Manifest
index d396d638f66b..dbc43570f54a 100644
--- a/sys-fs/dmg2img/Manifest
+++ b/sys-fs/dmg2img/Manifest
@@ -1,5 +1,4 @@
AUX dmg2img-1.6.7-openssl11.patch 7080 BLAKE2B 9815c1c0b3c23f2dae7da65e380ee4a2f2c460ddfa1c5e8e153c2b5b1213139d2052957b40f9c15042b750ed2c7318c36acc6de470b9da66a93550eb913964f4 SHA512 1addd0d349ad21c0fae423fe558583d9457aa2bcdf4f8fe16d408e703437faaa5b1324f38dfb66e9f3d811e89181fc0378978ffc852e87675fde0e416fccb136
DIST dmg2img-1.6.7.tar.gz 23238 BLAKE2B d4dc8da2974bc296e8aba21de816413df797322c6194e4ece3d0900d64fcd33084b29be6172a45bdc3f515c2e10544f107be2c7f0e6b7d247cf5d6bc5ad03e2f SHA512 4c42841c5cdbf868b6038648a6c83e78d4b7f2010f7065d7b3f4c2c04d13af9489716c1dfa867aff5f3c3b3eef96dc3fc0610eff13fec139265f37f468e339e6
EBUILD dmg2img-1.6.7-r1.ebuild 713 BLAKE2B 48a8b99a344699c513c4b954c47001bc31cba13f2960c352d53cdf32355aeab5ab9105d4645200cd773f490d5cdaa1aca0b38f54dcc45cfa5942232d80b12dc0 SHA512 37b43e261aa33d919666258f54db26b95805457f13b2f6e33cfebda54323d0ef70f3aec2a5826c771e9ca704cbed6389f601401bffc04519af5635e9960aab56
-EBUILD dmg2img-1.6.7.ebuild 663 BLAKE2B 27da57b4e2e2c63c00352e665853af8fb8def684229348d9492c8bb32e57b52f14df37983737ff65e0b120061509baba3fe8d5eac6a5042501e77d29cce81c1e SHA512 ed1bff42a9b43b941685e88d03144743a20ce5ef00720eff5d0ee2159185dda5101ef40b1755e8ee9c7bb0c0ab727b00ca14eb95290fc3b5ea25856c97895f8d
MISC metadata.xml 446 BLAKE2B 3600c0ef451adcf401547ce76a13372182ea3c40c8670ace741f8a342dfc9cc3be3a6910a5e93883e3d77b55709ac996d8a1380724fae8da5f02efbdea637da0 SHA512 412c28e15abe2581fa29247d58b239a140171b018bcdfd5b437cb1991239eff33ce4bee9ecb14dada6bf74105f13ae230dc6dc46e1906952b81cb7491d3e9449
diff --git a/sys-fs/dmg2img/dmg2img-1.6.7.ebuild b/sys-fs/dmg2img/dmg2img-1.6.7.ebuild
deleted file mode 100644
index a212ddf78d63..000000000000
--- a/sys-fs/dmg2img/dmg2img-1.6.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="Converts Apple DMG files to standard HFS+ images"
-HOMEPAGE="http://vu1tur.eu.org/tools"
-SRC_URI="http://vu1tur.eu.org/tools/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/openssl:0=
- app-arch/bzip2
- sys-libs/zlib"
-DEPEND="${RDEPEND}
- sys-apps/sed"
-
-src_prepare() {
- sed -i -e 's:-s:$(LDFLAGS):g' Makefile || die "sed failed"
-}
-
-src_compile() {
- tc-export CC
- emake CFLAGS="${CFLAGS}"
-}
-
-src_install() {
- dobin dmg2img vfdecrypt
- dodoc README
- doman vfdecrypt.1
-}
diff --git a/sys-fs/dosfstools/Manifest b/sys-fs/dosfstools/Manifest
index 254782575d43..6c6dc68dc0f8 100644
--- a/sys-fs/dosfstools/Manifest
+++ b/sys-fs/dosfstools/Manifest
@@ -1,5 +1,3 @@
-DIST dosfstools-4.1.tar.xz 172936 BLAKE2B d8ef617d9dbdc21318c4f43e2fd6dca1d3452ab46253b055d8fef09aa693bcf63ef58076a49f305bb21de87298bae5be6b626065dfcbd90935af68709e2c3c6a SHA512 e7a8aab34255d15e6865a7b031971352af1255134fab83389673bcc3cbd6ba255241bd2429070aeb4b927f8d7d73ccf1aeafe94566b133e88e7586897c317b78
DIST dosfstools-4.2.tar.gz 320917 BLAKE2B c55c7592aa80f1fe39e838c83e147ad7141ddd0f72c9c000ba7708ecb7287c3a92b4b52f72c8d0d1171b0f9609dfb7861bbbe475c5cbd7011151c93c2b1d3d0d SHA512 3cc0808edb4432428df8a67da4bb314fd1f27adc4a05754c1a492091741a7b6875ebd9f6a509cc4c5ad85643fc40395b6e0cadee548b25cc439cc9b725980156
-EBUILD dosfstools-4.1.ebuild 1027 BLAKE2B 3ccdf37481739069199a76a87881a826fb0ecadb89d4290d210b4ab913a7d07c6c08b40cb5fafb9e61fdb77d48e1dfbb5adfaf7aadc4eac5e33e62f522e22b2b SHA512 b867fd86212063257d5cb6795f3eacc509cd6039ce5448b88b053cbd4836995714b8eb973707255f8305f9900faa160fc04cdbf6b3d32fb660b709355a94326d
-EBUILD dosfstools-4.2.ebuild 957 BLAKE2B 28cf10e50b016c2d373f8c063ac70e8b8148b1402b8b6697ca18e0b720c8b001769d5b543eb246b1b996581165d021679b9e0de507989aac18880047d9785b57 SHA512 a2b7d3ff340080eef38214a670583f125eacb9d3ed9ac6353fcc8a37969a2c126910377127b0a3bbcecc1437a5a65972f7821a259b2f0cd6598431d905fbdf48
+EBUILD dosfstools-4.2.ebuild 924 BLAKE2B d075f85623853b3b862968fae53bfa6e1e09dbdd6607d86ce2b746e85eb38c2eea693253930e5179b73fd3cd19821b0cb6cc43ea380a4fba7ac8e71f1e80379b SHA512 22cfe56a3f267ec5770d2f5669382e09dc60f18b808b8927f25d16290efc9b2076f8bcd894062732bbe841682e313909e0d1139e1c764a96dd416159a229c10e
MISC metadata.xml 496 BLAKE2B 32b7ed76d0385441b8a40fff8ca15d6848fce7cf1ae511a6905d3c12b8a7593bbc11494f7ca720c465f61175d8d84cd9e6d41f084a140fce88513c6b95965615 SHA512 40b886dc36d892d733a6a6528eed5dec3977eecb71a22b5cee2ea6c0417401951b966509c3816ed5a2761eae4b8c5def7ef5e99d9aedab2e09000a3f3de6b354
diff --git a/sys-fs/dosfstools/dosfstools-4.1.ebuild b/sys-fs/dosfstools/dosfstools-4.1.ebuild
deleted file mode 100644
index c4382e2ef1dd..000000000000
--- a/sys-fs/dosfstools/dosfstools-4.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat"
-HOMEPAGE="https://github.com/dosfstools/dosfstools"
-SRC_URI="https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="compat test +udev"
-RESTRICT="!test? ( test )"
-
-CDEPEND="udev? ( virtual/libudev )"
-DEPEND="${CDEPEND}
- test? ( app-editors/vim-core )
- udev? ( virtual/pkgconfig )"
-RDEPEND="${CDEPEND}"
-
-src_configure() {
- econf \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- $(use_enable compat compat-symlinks) \
- $(use_with udev)
-}
-
-src_install() {
- default
- if ! use compat; then
- # Keep fsck -t vfat and mkfs -t vfat working, bug 584980.
- dosym fsck.fat /usr/sbin/fsck.vfat
- dosym mkfs.fat /usr/sbin/mkfs.vfat
- fi
-}
diff --git a/sys-fs/dosfstools/dosfstools-4.2.ebuild b/sys-fs/dosfstools/dosfstools-4.2.ebuild
index 6e824b3a73bb..bfc1083c8d38 100644
--- a/sys-fs/dosfstools/dosfstools-4.2.ebuild
+++ b/sys-fs/dosfstools/dosfstools-4.2.ebuild
@@ -3,8 +3,6 @@
EAPI=7
-inherit toolchain-funcs flag-o-matic
-
DESCRIPTION="DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat"
HOMEPAGE="https://github.com/dosfstools/dosfstools"
SRC_URI="https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${P}.tar.gz"
@@ -16,8 +14,8 @@ IUSE="compat +iconv test"
RESTRICT="!test? ( test )"
BDEPEND="
- test? ( app-editors/vim-core )
iconv? ( virtual/libiconv )
+ test? ( app-editors/vim-core )
"
src_configure() {
@@ -25,13 +23,16 @@ src_configure() {
$(use_enable compat compat-symlinks)
$(use_with iconv)
)
+
econf "${myeconfargs[@]}"
}
src_install() {
default
+
if ! use compat ; then
- # Keep fsck -t vfat and mkfs -t vfat working, bug 584980.
+ # Keep fsck -t vfat and mkfs -t vfat working
+ # bug #584980
dosym fsck.fat /usr/sbin/fsck.vfat
dosym mkfs.fat /usr/sbin/mkfs.vfat
fi
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index b1854255c9a7..de6fbfeaa867 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -11,5 +11,5 @@ DIST e2fsprogs-1.46.2.tar.xz 7020552 BLAKE2B 0eda7428862c13dfd02308f0321d22c1346
EBUILD e2fsprogs-1.45.6.ebuild 3977 BLAKE2B aa340ee1dfe6fa745c5e69e48098e3d0bbde09ac6da4c28fa6a853193414e5236a0eb2f50fbe3b9951afaad1b903247eccc85becf793acbda1d30c262f373a78 SHA512 bdc90d96f2200c1e2217cab8c7e2775d377fae6eee2524b5dd1dac0196d0ab5b1f4adf1d0dc84ea2bb55a67ca45e09ed348db0f5482c79acf69fb22ea3f7df04
EBUILD e2fsprogs-1.45.7.ebuild 3977 BLAKE2B aa340ee1dfe6fa745c5e69e48098e3d0bbde09ac6da4c28fa6a853193414e5236a0eb2f50fbe3b9951afaad1b903247eccc85becf793acbda1d30c262f373a78 SHA512 bdc90d96f2200c1e2217cab8c7e2775d377fae6eee2524b5dd1dac0196d0ab5b1f4adf1d0dc84ea2bb55a67ca45e09ed348db0f5482c79acf69fb22ea3f7df04
EBUILD e2fsprogs-1.46.1.ebuild 4019 BLAKE2B ea12fa2e331be15f3f7c003575ab6369025c28b49a421174ac9559b671c347df954c505c74a4e41b67d18798cf4b4ee8da6595deec11a3e1420990a279fb6454 SHA512 99c1ca7e4780e2716ccddfc03415d31f1f292347d127874335a6219a4afc56bf3c7b2fb8e850d9b6a9bc375536164c8e28dc743c3bdc9afe930ee335f7802136
-EBUILD e2fsprogs-1.46.2.ebuild 4019 BLAKE2B ea12fa2e331be15f3f7c003575ab6369025c28b49a421174ac9559b671c347df954c505c74a4e41b67d18798cf4b4ee8da6595deec11a3e1420990a279fb6454 SHA512 99c1ca7e4780e2716ccddfc03415d31f1f292347d127874335a6219a4afc56bf3c7b2fb8e850d9b6a9bc375536164c8e28dc743c3bdc9afe930ee335f7802136
+EBUILD e2fsprogs-1.46.2.ebuild 4013 BLAKE2B 4ba387f46dc9dac622408c00d24746073aa9d35cef5c7f0ea07e5436c0effa7d81dbf57bd6b0408c867bfec825eeab1f4b98671885a48e1b3875499e4a2b36f8 SHA512 1e1708add89583247ae5a240a8c73f0f58df7604785f60cde5687dbde8accf94b9e65710acb83144d122fc83662ed1a54328546cc7feb71af8dfc03cc0005377
MISC metadata.xml 634 BLAKE2B c11dd95ebf99bba614e96cec545a7b37ec9503105d37ce33bde91601efcae5b535fbb5e73fb908e70e87156ba3c2808037926f52f88205a09f22d1a0f6e6b83c SHA512 7c06b2fdfb370ace38d2c765a37ae1351e8d5316ba5ddc640f625f0f24671a70bdade38cdd58678c2cdaacf05833b735517561426f6658d970874abfd8fb9391
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild
index 963bf42ad0c5..a7700f01e7dd 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild
@@ -12,7 +12,7 @@ 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"
+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 elibc_FreeBSD"
RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-fs/etcd-fs/Manifest b/sys-fs/etcd-fs/Manifest
index da70f059d4ca..6681642f7df1 100644
--- a/sys-fs/etcd-fs/Manifest
+++ b/sys-fs/etcd-fs/Manifest
@@ -1,5 +1,3 @@
-DIST etcd-fs-0_p20140620.zip 12608 BLAKE2B 7a7ae1c2e9b8fc952118eb658f191508350fa674ba0ab21a36cd3420f8d7fbf3c7208758af7274ca4e1b13e93e1c4ea79595773be3e21e4bd43a13d2e7d945c1 SHA512 9f0066ed635bf33812c2ab71d320d42e45684312243bff2e17c0d58eee25723ef980c59d6a7ca751ceacd69e75af7edc691d5595ab06d5de1bdfe244656367e9
DIST etcd-fs-0_p20170517.tar.gz 8575 BLAKE2B ea47b3588efd206cd6632dfdc4210b2b08e566603c0fc72cecaa834f675f95ccb6d4907e9e7b00788e939ab4452494a53f3c9bdef16ef7693e0c38ac071e5aac SHA512 1695eeb70895d316db68fca45b0cdcef6f4bb00b39a443bd85a7d457a1437476562d269226f7cc872fbec22555c4f4b94d48617688294400685e1719224fa92f
-EBUILD etcd-fs-0_p20140620.ebuild 784 BLAKE2B a0075b6bbb2d527f8c79692ca7bda28883a97c02edc5cba9187752bc77b87eb01ae287df701589c93f3157fd08e97c0329af8a9cfd291c2b05d58fe3e548cdfb SHA512 1518560d30f187a4aaaa72fb5b47ecbcaf2d504e1dafdbfa6a50f2f5ee267ab41f8ad9274f6fca8d50e5398c6a1f5b5e7d1ad28ebb04f92ed77797b80b17e395
EBUILD etcd-fs-0_p20170517.ebuild 776 BLAKE2B f3eff70230d0971e020f7ff981d5429cd958214b10487ef54e3f9fddf12626c81cd5bcd4574f16e276c9a3761f4f8251cb0958b5a03c299cfe4667b5ee59f3e5 SHA512 9f4e74804db8bf256b7bf3c68aa64ebd0c3a9995e48d3d44e81c850313a88ddaa1e2afc9bcf2feec7000f20a432feaea5dc6543b0bf2aaba349523c93cd9efc7
MISC metadata.xml 528 BLAKE2B d07e47777010b5a508fe96d9652c22822d6af399c18acf331023e4dd6d20f695df5d75a5122162e12d02ef6d41e614ea7ffec465e7b8db7e4f76655bf0409cca SHA512 42b4837d689032e27dfe9aaaa74c520f710eec8ca9827659c1316aeee4ff9e22bb024df5464f31097db5ab1d89bdcf84abeed74d30b68921023f0501030695f9
diff --git a/sys-fs/etcd-fs/etcd-fs-0_p20140620.ebuild b/sys-fs/etcd-fs/etcd-fs-0_p20140620.ebuild
deleted file mode 100644
index 48382a0c554f..000000000000
--- a/sys-fs/etcd-fs/etcd-fs-0_p20140620.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit golang-base
-
-KEYWORDS="~amd64"
-EGO_PN="github.com/xetorthio/${PN}"
-DESCRIPTION="Use etcd as a FUSE filesystem"
-HOMEPAGE="https://github.com/xetorthio/etcd-fs"
-EGIT_COMMIT="395eacbaebccccc5f03ed11dc887ea2f1af300a0"
-SRC_URI="https://github.com/xetorthio/etcd-fs/archive/${EGIT_COMMIT}.zip -> ${P}.zip"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-DEPEND="app-arch/unzip
- dev-db/go-etcd:=
- dev-libs/go-fuse:="
-RDEPEND=""
-S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-
-src_compile() {
- CGO_CFLAGS=${CFLAGS} GOPATH=${S} \
- go build \
- -x -ldflags="-v -linkmode=external -extldflags '${LDFLAGS}'" \
- etcdfs.go || die
-}
-
-src_install() {
- dobin etcdfs
- dodoc README.md
-}
diff --git a/sys-fs/exfatprogs/Manifest b/sys-fs/exfatprogs/Manifest
index d18126a3c9c8..f8394534beae 100644
--- a/sys-fs/exfatprogs/Manifest
+++ b/sys-fs/exfatprogs/Manifest
@@ -1,6 +1,8 @@
DIST exfatprogs-1.1.0.tar.xz 259716 BLAKE2B 56ead392bc5311352155b03eefcec4f74d333464f6d2d20491c9c9f7dd10abeeaff4bbd1a86808e5af5ad9a5d5423ff82d5e5762d75ef2b19ea1eb3f6213c87e SHA512 6266c10585250d4d4818719f22b7876eec1ba1f8424e966875d207d87d1870a91e05eb066962ab0ad9b750f087db39d9ed7578ec2f1c0e4d03a1b62f01ac6386
DIST exfatprogs-1.1.1.tar.xz 261632 BLAKE2B 92d05cf94b5d7a65cef2b5fd97a25401f130a9e649246ed3c1f2240f33a586787ad17ebc41f476eb1ea1e3441c66ffd53408f4024f397fc2de14d76bf94b3f2b SHA512 faeed51a8292d17e71e2f5061dbc530dced75048380d6ca835f19a4e3845de86a9970598222670c38e452cfd6952f3963d8f84086c79172d3c0058957a549755
+DIST exfatprogs-1.1.2.tar.xz 261572 BLAKE2B 1475086d6fdc79dd128d08ba863e6c3fc58a432929400b0a740f57db492a08fb3779a0a1a7a555efd373a3e796d2066e37575c5003cbd16f829964cfa414a1d0 SHA512 b3589225f3bc4137c49d828923ab43e155f476fccd227b16168d11302e1c150485eb7f61b6463dc9126648fd4a52960657976ebd9f731366c64966c58fb9276e
EBUILD exfatprogs-1.1.0.ebuild 605 BLAKE2B cd769a5353114714ccb85af96d6b10cfb0cdae507e2e44cf2fec60e6f4829979bc41b843ce60458010f60ce1e0babce2a20e243f28d6dbdcbb759262d78d5b60 SHA512 bffa94490b25ea092392caef07a55a486ea0d47443dbb5449ff40ffe2e803ea792dcd52e45332c9812b0cf85132c3b0f4afcaf8649e1715d149945730ef129cc
-EBUILD exfatprogs-1.1.1.ebuild 608 BLAKE2B 6b347868183cc62b4d30de2d80c926131793046705f6d8ff8f952b630b5dada45774b28e2cafa5d5d7b5bcc5092e8cd39f810ef12f3ee0bfff636d06298eebf4 SHA512 1d55217e4cc93ddcd89ef8c985927ea836c86d5d6a627c298e71e449128bd35c56f045645d83e65a42ebffdc2d5cf58922854c43ea7cce00d2b952818e46c22a
+EBUILD exfatprogs-1.1.1.ebuild 605 BLAKE2B cd769a5353114714ccb85af96d6b10cfb0cdae507e2e44cf2fec60e6f4829979bc41b843ce60458010f60ce1e0babce2a20e243f28d6dbdcbb759262d78d5b60 SHA512 bffa94490b25ea092392caef07a55a486ea0d47443dbb5449ff40ffe2e803ea792dcd52e45332c9812b0cf85132c3b0f4afcaf8649e1715d149945730ef129cc
+EBUILD exfatprogs-1.1.2.ebuild 608 BLAKE2B 6b347868183cc62b4d30de2d80c926131793046705f6d8ff8f952b630b5dada45774b28e2cafa5d5d7b5bcc5092e8cd39f810ef12f3ee0bfff636d06298eebf4 SHA512 1d55217e4cc93ddcd89ef8c985927ea836c86d5d6a627c298e71e449128bd35c56f045645d83e65a42ebffdc2d5cf58922854c43ea7cce00d2b952818e46c22a
EBUILD exfatprogs-9999.ebuild 608 BLAKE2B 6b347868183cc62b4d30de2d80c926131793046705f6d8ff8f952b630b5dada45774b28e2cafa5d5d7b5bcc5092e8cd39f810ef12f3ee0bfff636d06298eebf4 SHA512 1d55217e4cc93ddcd89ef8c985927ea836c86d5d6a627c298e71e449128bd35c56f045645d83e65a42ebffdc2d5cf58922854c43ea7cce00d2b952818e46c22a
MISC metadata.xml 343 BLAKE2B 76c85c7abf0d2244304b72aad5f78ab1ed278b01c943b3380ff5fbd5cb104284accbc33b1b620309f1f9034625e98e0424e89ba4d1d13887c07502b6fd8efb63 SHA512 ca7a2f710812f1e5ee73b4faeadf9628274b1130e96f60af6155388746e0d14559a5e18262191ba50fcc1255cddeb88acf6c2d40df2af48548ce676a7a2fb91e
diff --git a/sys-fs/exfatprogs/exfatprogs-1.1.1.ebuild b/sys-fs/exfatprogs/exfatprogs-1.1.1.ebuild
index 29a89c2d1f56..06c03ff968f6 100644
--- a/sys-fs/exfatprogs/exfatprogs-1.1.1.ebuild
+++ b/sys-fs/exfatprogs/exfatprogs-1.1.1.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 ~ppc64 ~x86"
+ KEYWORDS="amd64 ppc64 x86"
fi
LICENSE="GPL-2"
SLOT="0"
diff --git a/sys-fs/exfatprogs/exfatprogs-1.1.2.ebuild b/sys-fs/exfatprogs/exfatprogs-1.1.2.ebuild
new file mode 100644
index 000000000000..29a89c2d1f56
--- /dev/null
+++ b/sys-fs/exfatprogs/exfatprogs-1.1.2.ebuild
@@ -0,0 +1,25 @@
+# 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 ~ppc64 ~x86"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE=""
+
+RDEPEND="!sys-fs/exfat-utils"
+
+src_prepare() {
+ default
+ [[ "${PV}" == *9999 ]] && eautoreconf
+}
diff --git a/sys-fs/fuse-common/Manifest b/sys-fs/fuse-common/Manifest
index d04c5c3a6caf..879761b22470 100644
--- a/sys-fs/fuse-common/Manifest
+++ b/sys-fs/fuse-common/Manifest
@@ -1,9 +1,7 @@
AUX fuse-fbsd.init 468 BLAKE2B 3b84afb0e215064d4944808b87fdc29396e851042a83bb7c031586ec6da49f8f13c0593754ce6f6a92fc35ed4ce2f0f6d9c53089e08bf3ee960df577543bba49 SHA512 c8ae0e1932e34e2078bb8a1ab47c6d2d489f832f7adb118668624d3f0695ebf8b3ac2468a8db98579ef30078eac6989421aae7d7893e30a50e5c35d0a00ad6a9
AUX fuse.init 757 BLAKE2B 802821596154d3dabae5c56367656d46a714c22a284cadf8ca78b2ca01a68fce8cefc37576cd26a14551452ff910a5317544e39b8fc4bddf74d80879fb7a0334 SHA512 7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1
DIST fuse-3.10.1.tar.xz 1898800 BLAKE2B ddccf4dc697547edb6ed48ca76b4379a5f94884fd19118926d82b82316d4b83fa80b9f4bda7edc51eb80ec72c06763fd766ab1216767456db8d6238c725f838b SHA512 7cf16c41060a8aaee2f815f271b4dd410c2e072e7629e55b92faca9b2b47544592704736c7da11a598f18ad4a537f0ba76964fa76e3f1a23b4facfe5c6053302
-DIST fuse-3.9.1.tar.xz 1595308 BLAKE2B 3b1d5c8ac99e96183581d034889d8d6cab8feeee26cafd765dc4ab2cbeb655b3b162836c960ceacf08cd458bec2daaf0474877c9611ef6a6543795e4971ddc12 SHA512 295bb62274264789c977a1fee78c6c122a2f227ae85d750b8519cafbdcf6551499b77cf021d83cc8261831e29761c166d84a4e50bdebb4191c76bcad1d15d329
-DIST fuse-3.9.3.tar.xz 1805676 BLAKE2B 907806f8799ce70f07d65e08a058709901bafa0fbfa098d3e66f9913f08b1d5f3e35a099f84832f221b5aa8681f69d8291f2a20967acdc8f0b7b0b72c2ae414b SHA512 e4a4bfbc276b1d676211d93878b487c5946f54e8811e929fad4ff32de1f64e0c4e762d33c43e3a04afae538f41efe8d29221f45340ccd74f0055f644802f3e26
-EBUILD fuse-common-3.10.1.ebuild 886 BLAKE2B 9c6698ce02f1fcce6e841254d1170460bf25476b70b95c02433216d6906628aeea4e18592e30e05ef730926969199d625954f6c56f8f0dbe6255f6c06d3676d8 SHA512 edd2f53c2dc865a39e7e74f032c2918f81379bbdaed2bf8f559d5a01e232b4883253de06122358a0aeea65d02590f4e86f39614aa2b32e34efb4b74e4598310f
-EBUILD fuse-common-3.9.1.ebuild 878 BLAKE2B 2b36fcad7d4b870240f6d8c25639825bc51c8ceca28488a46708317f72d7e58978fa6c8bbdcc12be211016c256e36408723ce9f042d935fb679f433cf2046956 SHA512 36f14cb465000d7d48ebe0367e2a84af714567cfc28ba4583e9e9b6d8a92808e1acf001a2742d0996bb0ad9875badde088e380e66ccce6eaca851bc3c85fe4e8
-EBUILD fuse-common-3.9.3.ebuild 886 BLAKE2B 9c6698ce02f1fcce6e841254d1170460bf25476b70b95c02433216d6906628aeea4e18592e30e05ef730926969199d625954f6c56f8f0dbe6255f6c06d3676d8 SHA512 edd2f53c2dc865a39e7e74f032c2918f81379bbdaed2bf8f559d5a01e232b4883253de06122358a0aeea65d02590f4e86f39614aa2b32e34efb4b74e4598310f
+DIST fuse-3.10.3.tar.xz 2558792 BLAKE2B 5b730321677e5080148c2ca5db35ed14b6f1919c4233ddd54d3a0613199aa06f45124995c5a56d2e8d4551bf328ff26ae034fae42c39035148361cd2d99600f1 SHA512 7329dd26284a15309eafc2b8b3f29ed431a5ce9c927c5965a51c270718f4915c318b84e4cf4e7f7ee1913831ce943a2e1a378d0bd2a1215eba7b9bc65efb7942
+EBUILD fuse-common-3.10.1.ebuild 878 BLAKE2B a2275fd6482b8aaf40bfab299a6eb33cb1ebe865dd5a01f84582b4801dc9723365220d08897d8def8e118559181c8f60ae1eb80fbf93b44e51c0e19b83b63784 SHA512 6adfb6411779c662921f4c62de70a8d94560d393a6ea6ca4807fdcd0e36d94c4293f5c7019fe0e11ef89865fc8cc47f0013c6a4b984cdd2232d99071240c6d1b
+EBUILD fuse-common-3.10.3.ebuild 886 BLAKE2B bbadd747c68c3e4030450d79edfa527f02b0318cf88c68f39b8c66a7e19d79ba82fcba2383d6bd97b7d15e2f215aa1ee151dc5c164ba4d0063ce433ad599c670 SHA512 29d67cda528d72db976918a179735158ee7131452a8373ae97a074d541cf101a3004c1bc55605720735da6262dafeef41927fdff42cbf39f105cebc6815a94b2
MISC metadata.xml 407 BLAKE2B 037af22bfc4bf2f29d8875a5dd0e9884597553b5a9d6a8853dfb30e69220c310118c6959440d2d619b40c6b14a3077b2e7b19351596af7d2795f37a0522705cb SHA512 5d4c0f0c1fee3610133de2cc7bd075c63de6dfe48782c10a882f8dcc2827ffe7b089b743ae5a5099fa47666f65b9f10cd3a3b41481f3f1090f0e67efd4268991
diff --git a/sys-fs/fuse-common/fuse-common-3.10.1.ebuild b/sys-fs/fuse-common/fuse-common-3.10.1.ebuild
index 1562ff02eb90..8e3aff886fde 100644
--- a/sys-fs/fuse-common/fuse-common-3.10.1.ebuild
+++ b/sys-fs/fuse-common/fuse-common-3.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${
LICENSE="GPL-2 LGPL-2.1"
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"
BDEPEND="virtual/pkgconfig"
RDEPEND="!<sys-fs/fuse-2.9.7-r1:0"
diff --git a/sys-fs/fuse-common/fuse-common-3.9.3.ebuild b/sys-fs/fuse-common/fuse-common-3.10.3.ebuild
index 1562ff02eb90..fc73e95dfc94 100644
--- a/sys-fs/fuse-common/fuse-common-3.9.3.ebuild
+++ b/sys-fs/fuse-common/fuse-common-3.10.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/sys-fs/fuse-common/fuse-common-3.9.1.ebuild b/sys-fs/fuse-common/fuse-common-3.9.1.ebuild
deleted file mode 100644
index 263bcc482772..000000000000
--- a/sys-fs/fuse-common/fuse-common-3.9.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit udev
-
-DESCRIPTION="Common files for multiple slots of sys-fs/fuse"
-HOMEPAGE="https://github.com/libfuse/libfuse"
-SRC_URI="https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="!<sys-fs/fuse-2.9.7-r1:0"
-
-S=${WORKDIR}/fuse-${PV}
-
-src_install() {
- udev_newrules util/udev.rules 99-fuse.rules
-
- if use kernel_linux ; then
- newinitd "${FILESDIR}"/fuse.init fuse
- elif use kernel_FreeBSD ; then
- newinitd "${FILESDIR}"/fuse-fbsd.init fuse
- else
- die "We don't know what init code install for your kernel, please file a bug."
- fi
-
- insinto /etc
- doins util/fuse.conf
-}
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index 8e4dbfd18ed2..aed5019adf82 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -1,12 +1,8 @@
AUX fuse-2.9.3-kernel-types.patch 434 BLAKE2B 501d771217a6131c31982a5cee300d1d6f977308c429858817fce81520291fd49fb58e6c863474a45a2e3a674da33b5678fcd784a7d1e8bc9472bbe0995ae3dc SHA512 909d43fbe190400d4beabd9801bf554e38a5bb5a3545930883976f42a2090c8768e485183949269639ddeae5bae5490b37dc23f031c48d6c4fd4c9facf08b66b
DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
-DIST fuse-3.10.1.tar.xz 1898800 BLAKE2B ddccf4dc697547edb6ed48ca76b4379a5f94884fd19118926d82b82316d4b83fa80b9f4bda7edc51eb80ec72c06763fd766ab1216767456db8d6238c725f838b SHA512 7cf16c41060a8aaee2f815f271b4dd410c2e072e7629e55b92faca9b2b47544592704736c7da11a598f18ad4a537f0ba76964fa76e3f1a23b4facfe5c6053302
-DIST fuse-3.10.2.tar.xz 2071936 BLAKE2B 295c77ba7ffe2f56325bbc4eb8336b0765a8958152142660eca70b3e9b97f853adec917a161dbdd59f30d86ee19eb62f451a8bfca3fc797ba67a6139f0258a6e SHA512 8a306f69662126747321144b9e62fe43496ee2b5e96ba6094b7756a365205aefea477f39407c3d2b27528fae773a0662130de9d41503da630e17df564ce76260
-DIST fuse-3.9.1.tar.xz 1595308 BLAKE2B 3b1d5c8ac99e96183581d034889d8d6cab8feeee26cafd765dc4ab2cbeb655b3b162836c960ceacf08cd458bec2daaf0474877c9611ef6a6543795e4971ddc12 SHA512 295bb62274264789c977a1fee78c6c122a2f227ae85d750b8519cafbdcf6551499b77cf021d83cc8261831e29761c166d84a4e50bdebb4191c76bcad1d15d329
+DIST fuse-3.10.3.tar.xz 2558792 BLAKE2B 5b730321677e5080148c2ca5db35ed14b6f1919c4233ddd54d3a0613199aa06f45124995c5a56d2e8d4551bf328ff26ae034fae42c39035148361cd2d99600f1 SHA512 7329dd26284a15309eafc2b8b3f29ed431a5ce9c927c5965a51c270718f4915c318b84e4cf4e7f7ee1913831ce943a2e1a378d0bd2a1215eba7b9bc65efb7942
DIST fuse-3.9.3.tar.xz 1805676 BLAKE2B 907806f8799ce70f07d65e08a058709901bafa0fbfa098d3e66f9913f08b1d5f3e35a099f84832f221b5aa8681f69d8291f2a20967acdc8f0b7b0b72c2ae414b SHA512 e4a4bfbc276b1d676211d93878b487c5946f54e8811e929fad4ff32de1f64e0c4e762d33c43e3a04afae538f41efe8d29221f45340ccd74f0055f644802f3e26
EBUILD fuse-2.9.9-r1.ebuild 2056 BLAKE2B a62986e92f4deb4993f4c0bd71996c1f2b4be435e396dc869f8fda9d6b0c3e74e397a6388fb66b076cc5bbc441d3122aa8ea7c788d5a96b82386621e1427b882 SHA512 0c65cac78140b2baf6ce8c3342c99cb52a1746b0a7d0a21d4e44955d56d7fd5b334b020ffd2cb1bb982f9652b422e7555d05ab2ff5746b664786e5c2f3c38bf8
-EBUILD fuse-3.10.1.ebuild 1820 BLAKE2B 699d75a28c8adecb7d5005b8e9e1cbeae9e2b1a132baad2b17066ce8c3e09f5055bc77fc34825a70f73da4690ff0f10c4b9ca855ffd05c2a8dfaaf73c3514108 SHA512 18313ba669e9548db8d9145bb641c0b38330f8dcf8b6aa7a3fe6171636d87eb739354f3c1057d2ca5c631b1156161d3096fb4ca6eab821fa9f10c414c6283211
-EBUILD fuse-3.10.2.ebuild 1827 BLAKE2B 8e1e37c8d9b7f80ebb2e4347e79957aab2da8593df1077d6c8e870115fb58704293fd585d255f9ce7887a3975c029f13a85dc9080ae60ed5068eb098a7a02aae SHA512 0e99a19d507815000bd3156f3cd5e679b4f1951becf64963ad970d527f513c639c7cc8f1d5d716a5c7825e1cfbcd3379494d3c996a597ed5f3df226b64f3a8c7
-EBUILD fuse-3.9.1.ebuild 1949 BLAKE2B 0b70e6c806a1b9fa1e8a7aa80743345933f8afa46cbc2fce8b238fef466877485f816e8618be5cdbdd3d7d0d5f8cf4763448db10b38e92e853a74171b9951838 SHA512 f1a1c5772b0c6a023ec7503a92960b4290afc3902cc1ee37a3c0b4cd0d61d9d05a84ee9a037d29e95c64f10a6773adae9afb39858f7f51c2a23c26d5f585c4a2
-EBUILD fuse-3.9.3.ebuild 1957 BLAKE2B 0d5745c3c3e0701b6837336c73d98018f690170f1a95fb39bef9017529ad0a070da5da5fe02d82d1e8c25acd14b2dcaded733a41847420df8de6af548c5fa0e0 SHA512 06b0fece0ece43391052026f53591a20630eeb8318110b96bee13d7dc71c5590f0915ca6f4fb12ba9aa6543ec2bbd1722e04caeee7038200f43764f2a868dfb8
+EBUILD fuse-3.10.3.ebuild 1827 BLAKE2B 8e1e37c8d9b7f80ebb2e4347e79957aab2da8593df1077d6c8e870115fb58704293fd585d255f9ce7887a3975c029f13a85dc9080ae60ed5068eb098a7a02aae SHA512 0e99a19d507815000bd3156f3cd5e679b4f1951becf64963ad970d527f513c639c7cc8f1d5d716a5c7825e1cfbcd3379494d3c996a597ed5f3df226b64f3a8c7
+EBUILD fuse-3.9.3.ebuild 1949 BLAKE2B a2fc08eaed1f03dc4c838b735e493b0389ae8c9f0b6246f4ffd5fe3e4bae4f718fda10e1b9112c41558d441d3b19dc5b978a73a9f34df824976c961683c27b83 SHA512 4e72cec5c86803545305f82cf3541d94673fc7666b3bebbb48eab9dc3c45d4e4047ef7ffd6451a53b706ad2d6fff9c0461c02d110129dbb34fb7add9df6eae96
MISC metadata.xml 460 BLAKE2B a8f51e9fc0148b7bcc163ea5e0f72291f9e36f3dad8c20076495fe32cb8d5fe992579ab069f840bca251164ff646c522ee0b7ad5ffa7b3115effa89d5acfe332 SHA512 e56ba815557e847487dbc76dbec4ae657c7c4ecebc9b3c02c39402daa699c5ff90923bcaf1843747c94d2025f339ca6521f35f48c6c4583d36e9de33e6f3a586
diff --git a/sys-fs/fuse/fuse-3.10.1.ebuild b/sys-fs/fuse/fuse-3.10.1.ebuild
deleted file mode 100644
index 9296c09d0fe1..000000000000
--- a/sys-fs/fuse/fuse-3.10.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit meson multilib-minimal udev python-any-r1
-
-DESCRIPTION="An interface for filesystems implemented in userspace"
-HOMEPAGE="https://github.com/libfuse/libfuse"
-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 ~s390 ~sparc ~x86"
-IUSE="+suid test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig
- test? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
- )"
-RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
-
-DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt )
-
-python_check_deps() {
- has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python_setup
-}
-
-multilib_src_configure() {
- local emesonargs=(
- -Dexamples=$(usex test true false)
- -Duseroot=false
- -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
- )
- meson_src_configure
-}
-
-multilib_src_compile() {
- eninja
-}
-
-src_test() {
- if [[ ${EUID} != 0 ]]; then
- ewarn "Running as non-root user, skipping tests"
- elif has sandbox ${FEATURES}; then
- ewarn "Sandbox enabled, skipping tests"
- else
- multilib-minimal_src_test
- fi
-}
-
-multilib_src_test() {
- ${EPYTHON} -m pytest test || die
-}
-
-multilib_src_install() {
- DESTDIR="${D}" eninja install
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- # installed via fuse-common
- rm -r "${ED}"/{etc,$(get_udevdir)} || die
-
- # useroot=false prevents the build system from doing this.
- use suid && fperms u+s /usr/bin/fusermount3
-
- # manually install man pages to respect compression
- rm -r "${ED}"/usr/share/man || die
- doman doc/{fusermount3.1,mount.fuse3.8}
-}
diff --git a/sys-fs/fuse/fuse-3.10.2.ebuild b/sys-fs/fuse/fuse-3.10.3.ebuild
index 5af77ebc394a..5af77ebc394a 100644
--- a/sys-fs/fuse/fuse-3.10.2.ebuild
+++ b/sys-fs/fuse/fuse-3.10.3.ebuild
diff --git a/sys-fs/fuse/fuse-3.9.1.ebuild b/sys-fs/fuse/fuse-3.9.1.ebuild
deleted file mode 100644
index 20ece00766a1..000000000000
--- a/sys-fs/fuse/fuse-3.9.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit meson multilib-minimal flag-o-matic udev python-any-r1
-
-DESCRIPTION="An interface for filesystems implemented in userspace"
-HOMEPAGE="https://github.com/libfuse/libfuse"
-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 ~s390 sparc x86"
-IUSE="+suid test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig
- test? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
- )"
-RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
-
-DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt )
-
-python_check_deps() {
- has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python_setup
-}
-
-src_prepare() {
- default
-
- # lto not supported yet -- https://github.com/libfuse/libfuse/issues/198
- filter-flags '-flto*'
-}
-
-multilib_src_configure() {
- local emesonargs=(
- -Dexamples=$(usex test true false)
- -Duseroot=false
- -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
- )
- meson_src_configure
-}
-
-multilib_src_compile() {
- eninja
-}
-
-src_test() {
- if [[ ${EUID} != 0 ]]; then
- ewarn "Running as non-root user, skipping tests"
- elif has sandbox ${FEATURES}; then
- ewarn "Sandbox enabled, skipping tests"
- else
- multilib-minimal_src_test
- fi
-}
-
-multilib_src_test() {
- ${EPYTHON} -m pytest test || die
-}
-
-multilib_src_install() {
- DESTDIR="${D}" eninja install
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- # installed via fuse-common
- rm -r "${ED}"/{etc,$(get_udevdir)} || die
-
- # useroot=false prevents the build system from doing this.
- use suid && fperms u+s /usr/bin/fusermount3
-
- # manually install man pages to respect compression
- rm -r "${ED}"/usr/share/man || die
- doman doc/{fusermount3.1,mount.fuse3.8}
-}
diff --git a/sys-fs/fuse/fuse-3.9.3.ebuild b/sys-fs/fuse/fuse-3.9.3.ebuild
index 02612a79f61f..5e10d166e389 100644
--- a/sys-fs/fuse/fuse-3.9.3.ebuild
+++ b/sys-fs/fuse/fuse-3.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="+suid test"
RESTRICT="!test? ( test )"
diff --git a/sys-fs/genfstab/Manifest b/sys-fs/genfstab/Manifest
deleted file mode 100644
index 43f018ede101..000000000000
--- a/sys-fs/genfstab/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST genfstab-24.tar.gz 14281 BLAKE2B 93987794ba12e08daefd20ef596e915a70a11a9e641470b6f93873b738b4c4bb22f808513c63e7675cade43b992f308d26f3a2db0b211e99518a3d3702d6b897 SHA512 8c4d40e98b7a35abcd5fb2bf496722aa65819e4124a37385090fa70b55118ea3590ecb4e16f117bf93118a36bf402c4616ba0cb1837869b11db54a827332c661
-EBUILD genfstab-24.ebuild 462 BLAKE2B 1e804533c2064715b16f7532eec4607cdb2bfb88afc6852cb602c570982e8b6fb8b5bfd0ee749f1f10610a25eac67618821d5b493a03852a3a8dc9fa52baa24d SHA512 f54486801d47ba60ec91a8d95383481597996cd0731d6a40f7e95d5144da3e27622b3ba1ae942fd33c814b583a2636cfe98f3a2007a3bc94f3f40d72c024a657
-MISC metadata.xml 395 BLAKE2B 3ad137c6a9e304d422d2ba144d103bf38282f59e11e062069853c18bdf69a92eb3d797c6983281765ccdb62a99e803ca2af4b761d14dd5bec18b313cae83be2a SHA512 68f8cec25688948425b31a72a62d870626e4a427e9fb6df5f55c83cdd1b6f3dbdddb0a4ff37a2a3a51ba2d1e55ecba0e5697cf67e15641f444b5d1fe69c11a2b
diff --git a/sys-fs/genfstab/genfstab-24.ebuild b/sys-fs/genfstab/genfstab-24.ebuild
deleted file mode 100644
index 0ae2a4346aba..000000000000
--- a/sys-fs/genfstab/genfstab-24.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2021 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.git https://man.archlinux.org/man/genfstab.8"
-SRC_URI="https://github.com/scardracs/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-S="${WORKDIR}"
-
-BDEPEND="app-text/asciidoc"
diff --git a/sys-fs/genfstab/metadata.xml b/sys-fs/genfstab/metadata.xml
deleted file mode 100644
index f8ffe025bba5..000000000000
--- a/sys-fs/genfstab/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>marco@scardovi.com</email>
- <name>Marco Scardovi</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
-</pkgmetadata>
diff --git a/sys-fs/growpart/Manifest b/sys-fs/growpart/Manifest
index 3ded656163ba..bd2c70d08ac2 100644
--- a/sys-fs/growpart/Manifest
+++ b/sys-fs/growpart/Manifest
@@ -1,5 +1,3 @@
-DIST growpart-0.0.1.gz 7731 BLAKE2B 187a532f87a0c5caefb4877e9a629e154e75f857299cb92ecad049d54467b1181d3e2bb348bd70af86d6eb4db518ebeeca6cb7b45fb628ec5dc07e1132a7b361 SHA512 84645e68f8ee913740333d3dca097e1322d74c99020af7205f6f4c2527469a2fbb4cbc3fe69bda7e19b5758897e9e6a09b17a4d1fb1f2934bf7c45186156eae9
DIST growpart-0.0.30.gz 7897 BLAKE2B b8f28615578c1b19a7cd2eff9cb60c37929c2d3767d9f98b07b1040f7f5d2687f41ed051b9899573119b4de9c2e04dcb91d76fc70fcff7a6e6dde0335959681f SHA512 ed6cf92149c0802c4a08427fa025ce2666dd7c32c5d1f362f4d14973f709dfd73124fd85b7eaf179daad5dfb1d126e86d7db0fb1fe7e2d496e17bf0bc1bc9c58
-EBUILD growpart-0.0.1.ebuild 504 BLAKE2B fcc63c7029c1ece4878609248046e5dc82e00427dbdeb885888bee281f6f94a0b9f253e7dbf4ccaeb57652312021767385c856ee21c1d5e8d0610a6f90b509c5 SHA512 3f4bf22da670ed117992c1ae8ea32f54633f4ba5fc1c849b58c1c9fe4abe89c49617102a027d4581214dc96bde2d74c80645836a72e9e3c26a63847d1b5ee3c7
EBUILD growpart-0.0.30.ebuild 512 BLAKE2B b9121f0240fb8b2eee6cf9e2b33ab2e678610a74c1bd295e06096b52b38d654cea9d82212a330cc48a1eafcb6350c546ccaca93f16710b226469fa6e7e28a6f8 SHA512 14148542f813a66c27c9a5b3fe5b2e3cc9a0a2fc1db0b773e9b091d8135a543023acd05a5e173fe43d9c42d0503b6dc2b4ffe667784a030c9c479d33ad6fafea
MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31
diff --git a/sys-fs/growpart/growpart-0.0.1.ebuild b/sys-fs/growpart/growpart-0.0.1.ebuild
deleted file mode 100644
index 3f9e119286a4..000000000000
--- a/sys-fs/growpart/growpart-0.0.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A script that can grow your rootfs on first boot"
-HOMEPAGE="http://manpages.ubuntu.com/manpages/natty/man1/growpart.1.html"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/${PN}/${P}.gz"
-S="${WORKDIR}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=" sys-apps/gptfdisk"
-
-src_install() {
- exeinto /usr/sbin/
- newexe "growpart-${PV}" growpart
-}
diff --git a/sys-fs/mac-fdisk/Manifest b/sys-fs/mac-fdisk/Manifest
index 03fdc66f3835..76f3ab8466db 100644
--- a/sys-fs/mac-fdisk/Manifest
+++ b/sys-fs/mac-fdisk/Manifest
@@ -7,5 +7,5 @@ AUX mac-fdisk-0.1_p18-lseek64.patch 754 BLAKE2B b78d43edba6cf7c1f08eae6e55749c5a
AUX mac-fdisk-amd64.patch 5154 BLAKE2B c8bbc117df448bc4c1181d9c172bc78dd5b1fd021184be73ecdc41568fcaf73e1daec8183d43f355b4bba876a0399f3dfd2c05173d7c9fee6d8d95068f141633 SHA512 241576f64dd334f98e8c9cb9e0b17b6366e208f2d0af47ddb4659cf2d8e25ca8f44a84d1f7fa2e5f6215f4be42668f43f034074ac981a0d87ca8483505a3623c
DIST mac-fdisk_0.1-18.diff.gz 20267 BLAKE2B 111e5b18c1485b33cfb2f653846e901a528e65207d705f024bb4ba1e181881913fc79cc2bf94c536e0bd2f88f9169d25f2a64c0d1464844a2ebb8e24f1554a61 SHA512 5774e86e1770873cbccb80a79941c6bf917ac1df62f722805b1c4eae0a76b318b3df36ed39ac16d8b051e771603cc42a13feeaadd451343f6a21703e07e58c11
DIST mac-fdisk_0.1.orig.tar.gz 55817 BLAKE2B d193be6b06be562bcb3297300dc009ac28adba41ea5d7c1a5bc0d16b8f9ec8275e1ad015c9bc529c3aafd12cbd9012e1af7baef7259ce0c8cef4d6dc62986dec SHA512 1263e60a18111162f5ef439b5f9615cef9de94e7836cb998782a6e6d3bcf92a69e49566b33c7330bdea05de5e6ca83f7920c6707f342ce515440160695f07120
-EBUILD mac-fdisk-0.1_p18.ebuild 1270 BLAKE2B 78e0a235eed6ec2d1b3f842b0a688db8f15f7f2d96ddfefadc1a9b7a242183be6b87d2dc96c8f1aa8475d44a353653e82518a86cdf3f19dc81631a2c5737da8c SHA512 4f930aa9bd653ed7cdc240c63265efad87560bb91cf4ab20c6c84984240c743da336bd21c59607c7595414304bb18d670bbe1a54230d3f3b95d1ea78bbddde56
-MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
+EBUILD mac-fdisk-0.1_p18.ebuild 1333 BLAKE2B 348f5002ac3a37ba4d9e20744d4c5ea90ec2e383a68063625ab554060cefee2bcf0b307fe9f0c912a46d2b771cf873dd06ea029ea45ea2b4e96fe2fa42c3f093 SHA512 c284142c23aff26a07c5efae51869b65a71fa97729f02dd294e84894ddde21fb916b96175109fc19111890b48f5bfc4768e07714885438d8bbac77f119fa6211
+MISC metadata.xml 360 BLAKE2B e5201de708bfe58ac36cc1ab794fef9f8d057f8d162d4ea05ef80e63508b624d33ee11f2d5ff47b139c298665cae40337a3c0d14c21d71f92a2f58bb43cd56d0 SHA512 f5c0f48c0899dc1b78ba04fc28df5400a632a6cdd1d02642aa7518fb6beefc9282e9d9e0d21b1147dc49a21b6ae1ce6705cc372e2d368bab653867021417ad4b
diff --git a/sys-fs/mac-fdisk/mac-fdisk-0.1_p18.ebuild b/sys-fs/mac-fdisk/mac-fdisk-0.1_p18.ebuild
index 263a986f35e1..311145f3667f 100644
--- a/sys-fs/mac-fdisk/mac-fdisk-0.1_p18.ebuild
+++ b/sys-fs/mac-fdisk/mac-fdisk-0.1_p18.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit toolchain-funcs
+inherit toolchain-funcs flag-o-matic
DESCRIPTION="Mac/PowerMac disk partitioning utility"
HOMEPAGE="ftp://ftp.mklinux.apple.com/pub/Other_Tools/"
@@ -33,6 +33,7 @@ PATCHES=(
)
src_compile() {
+ use elibc_musl && append-cppflags -Dloff_t=off_t
emake CC="$(tc-getCC)"
}
diff --git a/sys-fs/mac-fdisk/metadata.xml b/sys-fs/mac-fdisk/metadata.xml
index c5298995d2d4..7228d1190309 100644
--- a/sys-fs/mac-fdisk/metadata.xml
+++ b/sys-fs/mac-fdisk/metadata.xml
@@ -5,4 +5,8 @@
<email>slyfox@gentoo.org</email>
<name>Sergei Trofimovich</name>
</maintainer>
+ <maintainer type="person">
+ <email>grobian@gentoo.org</email>
+ <name>Fabian Groffen</name>
+ </maintainer>
</pkgmetadata>
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index 5f1ab377e1c8..81f46c110979 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -1,9 +1,5 @@
-DIST mtools-4.0.24.tar.bz2 418178 BLAKE2B 96ccbde0e5ed5e304c73c7faaeb495751c43ae37970e5c2329299e0f7bf90f3a810f4ca95faea10a00e5af110be579a3b083043314e980bb0128226caffb5608 SHA512 b74becc4f696315cfabc016d1746e744b43e366de73bf1bffeec4fbab1e4815967594de8acb4af01f89d36a925f93672efbac205b89540161bd53ab7edebcf04
-DIST mtools-4.0.25.tar.bz2 421807 BLAKE2B 54b0de421d5de003c6dff9a524af2a37d7fe0fb88361e195b000b8c8637ed894ec01ca295ea71ed0df781e9503d609f5e21b987a79c7e9d2c2e0c7176d5eb825 SHA512 91b879de6b41bf9fd6d9282d846e21fe58dbcd3461d97d2d6cae752a309a5129091a0e6ffda5b28ef062c33970a1c0a43ff1cf19106232866bdbdb762c64a143
DIST mtools-4.0.26.tar.bz2 420648 BLAKE2B 02f75722e8569c75d09fbee8667b24d8fd5c685940b235de33e268b8a349a49798f50db22470200e9fa30244768c07a568bfe124969f2a34f652c157ddb37e89 SHA512 32303ea16314ca00f33aee103451958f13c71ab1f3975e9a1dd9236c8e775286985ee776c38c64a1f8f5f8d0a66cbf84643182913e4e2c2dcaff384a9acd8633
DIST mtools-4.0.27.tar.bz2 420579 BLAKE2B 3044fff1896427227e4585df81c208f7580302155cf119db426cfc7a24b3d5195b560b8810613f571eed77584d47bb5125007cdcb8551b303db62ce264853776 SHA512 21072e1b6d22ea00913dbc856c5fbe1ecfbfc0207432c7632f0026ae2d9555743eb0710c86e8939a6b3183a03693b8d1297121df9d5702dd5bf6121ad240572c
-EBUILD mtools-4.0.24.ebuild 1045 BLAKE2B 2861833d297fdaf906239a2a52a5c922e0a195116ae73548c6d47212faa682b7b12f7bd20b68a167d86ecebfd2f6561236ff53bffcf093686bbf7c2c1893d6fa SHA512 dcb73024498715f8173c65076fa02a78873d01f22849fa568a6757384fc93e47981f1c95125a56646612f7dc4af39b4995ba0ef1ef41467f51eb60a99ee2b030
-EBUILD mtools-4.0.25.ebuild 1051 BLAKE2B 8bace5704234712bffd3c88ffce51534a6a141caa283501cf6599a96d0e6b99ae7bc40543ea064bb8385900e4bb6623c0005b8bde0b9a3beec510bd9cbbd8f01 SHA512 4ed910c39dd8683b28a2238e46bf015329a36f516761c486f9dfc987c919e8e3780270de173885b97eb9455232639d5dc1d83da5a24bfcffdeedb2bc637700c4
-EBUILD mtools-4.0.26.ebuild 1058 BLAKE2B 8236f510b4711b3d09257cc283075f271e02a704895930590a22ab9d6b9f91780bd4f0e47a6375b8e7dd2a149ba878b54d9df8fef0cc890f08df649044d37812 SHA512 c5330d2e62434e874b80bb13843d33c30a52e73a0ab64a588cd8a97481d413e4b166dcf538218be5e419ffa41515b2e621aa6cb290e42ea7a30636bb438e0815
-EBUILD mtools-4.0.27.ebuild 1058 BLAKE2B 65ee6b4287807ebba32519c220b279fab658dce34591eb969759b65360d0e873c4b13dbdb32d519afbea724be852b3a3424208eb4fbf7d985bb4da198089a4cf SHA512 7ec38355fe34e7121f2226e66d7fce9b6ebded835b74dca317f4664cc9650f57110d115120f2cc692a793bbe712e79a1fd50c167a27876dbdc1b4d551a4fc931
+EBUILD mtools-4.0.26.ebuild 1052 BLAKE2B 2fd0aaf115222aa0cea9858638a4270119c4633b7c7e53078385376bd69fecba2a3c6e9dca624499149cc671542106456a2c7c245f13a982ada70d761c25fdff SHA512 6a76fdf80fcde205b627410939d878db4a5e2b660a7587f6e24f94bcc5b1c4fbb39c5d0fa6a1d66abbae11ccc53b3cfb158cad502ae6ac73f80ce07976062cc1
+EBUILD mtools-4.0.27.ebuild 1053 BLAKE2B ca0e9907199aa28b83b9875a55653ec3a1ab8a9710e016420e509da94d17472a020b9db5370e2fbd0a1a2bebec50047d50a3e62dbcdc5507dfe0d4d5ed5570f6 SHA512 280c393839198ee02476906bb2a038ac2b26794c3fa9e58c2f01886f010d5b76a6b02bc5b35c1be38b925d10fa3f03132346571646ed11b377d76a48d6e97669
MISC metadata.xml 327 BLAKE2B 24ec22d469778c0c13d9bf96aed3214f59598b5ddf6a6bdf7dbe971e014396e8075c62059b1033ccdca6c5acca1af0fa2c1f377b006471358238402b40d7fec5 SHA512 9b9c5a4a88cf046ad30bf9764d7d865d692c73477220cc871e7e727fe3f718302c9ff1a8492b165270a88049e2bdebe68923415e52da1257971d887d8f808f7d
diff --git a/sys-fs/mtools/mtools-4.0.24.ebuild b/sys-fs/mtools/mtools-4.0.24.ebuild
deleted file mode 100644
index 163ada6df317..000000000000
--- a/sys-fs/mtools/mtools-4.0.24.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 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 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos ~x64-solaris"
-IUSE="X elibc_glibc"
-
-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() {
- # 447688
- use !elibc_glibc && use !elibc_musl && append-libs "-liconv"
- 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.25.ebuild b/sys-fs/mtools/mtools-4.0.25.ebuild
deleted file mode 100644
index a10154dee9ba..000000000000
--- a/sys-fs/mtools/mtools-4.0.25.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
-IUSE="X elibc_glibc"
-
-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() {
- # 447688
- use !elibc_glibc && use !elibc_musl && append-libs "-liconv"
- 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.26.ebuild b/sys-fs/mtools/mtools-4.0.26.ebuild
index 9ad4033e88f1..7bf0144b20ff 100644
--- a/sys-fs/mtools/mtools-4.0.26.ebuild
+++ b/sys-fs/mtools/mtools-4.0.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 sparc x86 ~x64-macos ~x64-solaris"
IUSE="X elibc_glibc"
RDEPEND="
diff --git a/sys-fs/mtools/mtools-4.0.27.ebuild b/sys-fs/mtools/mtools-4.0.27.ebuild
index 3ebdd3b6df91..b9882d255aca 100644
--- a/sys-fs/mtools/mtools-4.0.27.ebuild
+++ b/sys-fs/mtools/mtools-4.0.27.ebuild
@@ -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 sparc ~x86 ~x64-macos ~x64-solaris"
IUSE="X elibc_glibc"
RDEPEND="
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 3e2bbf2490c0..12cb8a11203a 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -6,9 +6,7 @@ AUX multipath-tools-0.8.5-respect-flags.patch 542 BLAKE2B b60dda770d8441bfd4026b
AUX multipath.rc 565 BLAKE2B efb26199eddb75c5e87d1ab40aa8cb4fbaf9f7a2bfd7a20add6d55997d25de9a3dbf0d032c977593c2ee8d447539a34be0294ee3a80a80fb004dc2c51c8c64b5 SHA512 f08833fc3c928900f8c29438208b9715581bae426b1f45c246e8c418b210f7f9d35517ef9ad44db3d88944183b34e3411ece909b56892a9f3b7250fed49e43fe
AUX multipathd-r1.rc 264 BLAKE2B f08733746c702da27e002b2cb07bbc1a1925002b1592c2f566aa8d66c71da5fd39fd6389636fc49b602f9051190ee5f7f85ad9ff35b924f51a2698e1a6654f0e SHA512 8cf764b59ed4bb13c3c2143cd83ee39bc87eca85c40acb3ed1dcd7cf4c39ecbdea7974b9705231d48377266c034a8623157648b9a99b6cef73617e4b37ad377e
DIST multipath-tools-0.8.3.tar.gz 465248 BLAKE2B 21a7a18c70150b4422bdd0ae02f26f491845eb06928ab74e631df8c6b3c110d10f43f75b9f8289a7134826c923b7ba58ce54c40497c3b7e6211e53902c8a1b5f SHA512 d9fdc2763f5a1efa15ee07c5d863008c9694623935f62a0e0b56f941df4e0d0ca3f86056fefc9b5ca828b47782127e3d55f2f925b1ed957e02b675bef36f4cae
-DIST multipath-tools-0.8.5.tar.gz 494750 BLAKE2B a42d17a47631107433a1d0a9da69a0bb10d2125cb242d2125d67da18f6bc6231c9233b163dc1d07d88dcba9f912830c047fdee5b42435f59ea2976598a72fd75 SHA512 f62a09107ccb18ffab97139fe2dba3dc22450836d8669c4381a8bce4072672a027a3a1e687f33e374429bffa49b3ba4a54d1e52294044d7bc1f82ed5d5aaf760
DIST multipath-tools-0.8.6.tar.gz 519405 BLAKE2B 5aed36550c76bbde0e874e37356b6c5a80a80b876b56dadb69ce09f0fb049a7097fd1c0aca5076f816848e2c2660f96680d7f16d56918a25299017b39f76f777 SHA512 82e5b7307e599ba6b059679c3987a442fb5be4885f0a27c260a99a07cb336b88d48e314b4ec951944e0200e4731522d8da043d98fa566857ecc6d100791c0e38
EBUILD multipath-tools-0.8.3-r2.ebuild 2198 BLAKE2B a3fecefa7f8f07cb631b281a46bb918af85d5e6981b4244aadedf4e3e3ea18136248a462691e5e05998b56d4acc1b935500aa42859da78e8fb4c80fecfb0d8b7 SHA512 48bd320edd11c0e7fa71883bf9f72d05ea1144fdc9c79dbb1edeb0717c5eb51de408e421707fa80a1b3542ec41dec12b07e20999dbf950a3a7d6c0c9c6f8b11a
-EBUILD multipath-tools-0.8.5.ebuild 2102 BLAKE2B 42ad8f9fe928f0a57ecaf4868d65d3844da06d7de251188996452d9458e061b9462ed7a98785f15c44db94dcebf2840006d6d34a89d55933ec5d2f57d31428f6 SHA512 dc5dadd33046a8bc8c8f90d1f1badf5beae4119ef6d156b07b69dbf463203521a5f5de304ca066a0748d4a5f0dbc13279c4a960d3bdf85af359a9c7eca414156
EBUILD multipath-tools-0.8.6.ebuild 2083 BLAKE2B 81d32b95ee8a89ad5cd2aa5d11d25490c1c66cd14f03ae9bf156b72e96a6da9cec4acf4f794fd20eed76903bf5b5d6163b26141688188088d0b3a21c4698d0f5 SHA512 0b42a0a299c5008ceefb04c6fa8bb52c90b9aadd32cea0df09928ccbd8bf233583f08ea145228098a17c2ccab4762dd8ab3bb4703471bd89d21192839d3a1b34
MISC metadata.xml 364 BLAKE2B d1d285f68ff773055f374ad7f6790708b7fed62a0d9787aff638c6ced762ff34d62a94a90d79426dbf4a81d86cf2447f41947d7650d3f1bc366a9d3338af94ce SHA512 91654145796f3e879d14dc7aab2261099dc0e2cb44e7563bf3c006893b81aa0f84fdd52870aaf317197b87e6c4d9e1341e456daeb2f3b40c926bdaf31c797134
diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.5.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.5.ebuild
deleted file mode 100644
index 963e074a5ac5..000000000000
--- a/sys-fs/multipath-tools/multipath-tools-0.8.5.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit linux-info systemd toolchain-funcs udev vcs-snapshot
-
-DESCRIPTION="Device mapper target autoconfig"
-HOMEPAGE="http://christophe.varoqui.free.fr/"
-SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="systemd rbd"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
- dev-libs/json-c:=
- dev-libs/libaio
- dev-libs/userspace-rcu:=
- >=sys-fs/lvm2-2.02.45
- >=virtual/libudev-232-r3
- sys-libs/readline:0=
- rbd? ( sys-cluster/ceph )
- systemd? ( sys-apps/systemd )
-"
-
-DEPEND="${RDEPEND}"
-
-CONFIG_CHECK="~DM_MULTIPATH"
-
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.8.5-respect-flags.patch
- "${FILESDIR}"/${PN}-0.8.3-no-gziped-docs.patch
-)
-
-get_systemd_pv() {
- use systemd && \
- $(tc-getPKG_CONFIG) --modversion systemd
-}
-
-src_prepare() {
- default
-
- # The upstream lacks any way to configure the build at present
- # and ceph is a huge dependency, so we're using sed to make it
- # optional until the upstream has a proper configure system
- if ! use rbd ; then
- sed \
- -e "s/libcheckrbd.so/# libcheckrbd.so/" \
- -e "s/-lrados//" \
- -i libmultipath/checkers/Makefile \
- || die
- fi
-}
-
-src_compile() {
- # LIBDM_API_FLUSH involves grepping files in /usr/include,
- # so force the test to go the way we want #411337.
- emake \
- CC="$(tc-getCC)" \
- LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
-}
-
-src_install() {
- dodir /sbin /usr/share/man/man{3,5,8}
- emake \
- DESTDIR="${D}" \
- RUN=run \
- SYSTEMD=$(get_systemd_pv) \
- unitdir="$(systemd_get_systemunitdir)" \
- libudevdir='${prefix}'/"$(get_udevdir)" \
- pkgconfdir='${prefix}'/usr/'${LIB}'/pkgconfig \
- install
-
- newinitd "${FILESDIR}"/multipathd-r1.rc multipathd
- newinitd "${FILESDIR}"/multipath.rc multipath
-
- einstalldocs
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- elog "If you need multipath on your system, you must"
- elog "add 'multipath' into your boot runlevel!"
- fi
-}
diff --git a/sys-fs/nilfs-utils/Manifest b/sys-fs/nilfs-utils/Manifest
index 3cc18b21bab8..0c241bb75ab0 100644
--- a/sys-fs/nilfs-utils/Manifest
+++ b/sys-fs/nilfs-utils/Manifest
@@ -1,7 +1,5 @@
DIST nilfs-utils-2.1.5.tar.bz2 389552 BLAKE2B 38de1d2eb2943ec1e4564deb44f8d9c13dd3a99184acb1523cbc61daae7575d0ca9397d0f5fae864616c38a93afe2bc15809dcc0c9f6a175b5bd37e2034921d6 SHA512 a9c0cf6d9df524b9cdb3379bcb8e0c1427aa6e1a792cc649f366a68416374cfc7c9f0db3dd78f3c3165be05a9e8eefb0db30c394ad04c8e3e89ee6ebcbfa42c0
-DIST nilfs-utils-2.1.6.tar.bz2 391303 BLAKE2B 95fd6a1f6ae8af5e8dcbd678170e41e35af2006b5244e09e8f3f7cb810f4ee7145a6c6887fb5268d9439970367a574c4eab6b3277d52e487fd5a7833679ed1ab SHA512 ce0cbaccd6cbf4f7f45cbf0d94cb253c77dafbedac4b71229002ed6c772ad6bb8af598c1e933614f9837901f85b217462ed0dbd5a577b4fbb50528a732a60f83
DIST nilfs-utils-2.2.2.tar.bz2 424097 BLAKE2B d38b40e9b70a17bc957a89f5d1551bcc0eaaf396ac5126d47dc2dd0a9e311033beb1164a916fb369b51794d38cb63793ede7917be2d76b8df02a32de11b0a4fc SHA512 2ac0f1f25472d8900732db9f31e6b824e7e591bf306aa18d8b55c5d93807f4f7ceb65ba7e49540a39c7f285ad63c5f4ab795d34b2a04398d91cd2beb5fc6edce
EBUILD nilfs-utils-2.1.5-r1.ebuild 780 BLAKE2B 703ccc05e0fa62f9a48388fb6cf5caf01f49b5c87f1a82415a80d51a935f1b5f71f4d64e90e53e86b7615145b52b11d8900a297801586a9dad39df1429e4aee5 SHA512 ddbee4f6689767f634436048ca6e45ff690bae1f6e1501056f40b9bc2c367f412402c07dd23d6115dc155f162c140d3d302a1d8b397d04d3168f5cfab80f818a
-EBUILD nilfs-utils-2.1.6.ebuild 787 BLAKE2B 137ab89a4dd7a54b82740b04de6f0d8c2c6fe71b9fb59ee636f73dc8560636463cc920920d8811c1720d805624e8ab530c43573e4388ab7dc09ea6d644d88b3c SHA512 9c660d462fdb3cb1659ec764182382b57f05627daf59c0bc0693689634effd5431a1a9913252c2e7d7db718829077efda9fda21bc423ff17eb0dc35c196203d3
EBUILD nilfs-utils-2.2.2.ebuild 787 BLAKE2B 137ab89a4dd7a54b82740b04de6f0d8c2c6fe71b9fb59ee636f73dc8560636463cc920920d8811c1720d805624e8ab530c43573e4388ab7dc09ea6d644d88b3c SHA512 9c660d462fdb3cb1659ec764182382b57f05627daf59c0bc0693689634effd5431a1a9913252c2e7d7db718829077efda9fda21bc423ff17eb0dc35c196203d3
MISC metadata.xml 1179 BLAKE2B c4cf4672955d063439f41edeea9ef305a5f00589d27bfa7bbcb40ae1bdbfcbb4683836f7a7594aa2fa1297a07cfc8cbf889cdb201b4b38dc26553b82da41dc68 SHA512 7999a459170e86c6ff83043686d80127223175ed43bef2dca57fc296673cf8f1d4644ad47f44dfe0f5bc5d3f7c959c0e801e98b46319cd9c79269a2ac158b475
diff --git a/sys-fs/nilfs-utils/nilfs-utils-2.1.6.ebuild b/sys-fs/nilfs-utils/nilfs-utils-2.1.6.ebuild
deleted file mode 100644
index 67c33efec1d8..000000000000
--- a/sys-fs/nilfs-utils/nilfs-utils-2.1.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib linux-info
-
-DESCRIPTION="A New Implementation of a Log-structured File System for Linux"
-HOMEPAGE="http://nilfs.sourceforge.net/"
-SRC_URI="http://nilfs.sourceforge.net/download/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="static-libs"
-
-RDEPEND="sys-libs/e2fsprogs-libs
- sys-apps/util-linux"
-DEPEND="${RDEPEND}
- sys-kernel/linux-headers"
-
-CONFIG_CHECK="~POSIX_MQUEUE"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_configure() {
- econf \
- $(use_enable static-libs static) \
- --libdir=/$(get_libdir) \
- --enable-libmount
-}
-
-src_install() {
- default
- rm -f "${ED}"/$(get_libdir)/*.la || die
-}
diff --git a/sys-fs/ntfs3g/Manifest b/sys-fs/ntfs3g/Manifest
index deedaac9d9f5..92ead8b54d4e 100644
--- a/sys-fs/ntfs3g/Manifest
+++ b/sys-fs/ntfs3g/Manifest
@@ -1,11 +1,3 @@
-AUX CVE-2019-9755.patch 2111 BLAKE2B 5655cbef5789dc0de3f461f97f41e3c1d87fd64047a80ae5e2b848920afeff6fb464cec70c73ab367bb28bf77e7e73bf699f2fe9f491f380194abf058e96ba3c SHA512 2b08f609cca17740e610dd90f39c6187f5c92f74e66458df784da0fbff8490294ee5a942cb403f101fa446310f43af9d5ad451a7939e0dc84347d07912967f9f
-AUX ntfs3g-2014.2.15-no-split-usr.patch 1322 BLAKE2B efc71e28913d649484c1cf0d51dc34d8515cfba484a6a36a7cf158b142346255d403457ce0418148bbaa9e3e6e2cd494a509aa0c205ae944609844f4b9a04bc1 SHA512 232a1a7b84339c86758365564fce2058c3e652f833c6908245aa5f6f0e91d5c09cedcb978a1ebe62897c7288df4fe8671ba7085af403056742d897181e479e05
-AUX ntfs3g-2016.2.22-sysmacros.patch 911 BLAKE2B a53765dc5cd4ae8320584167fbf202b50827e07f4599ab8572d434cc61110bb190854b24e567b210843002b74245e5a7f271ea4548cc52a0d3d893eb622702b2 SHA512 34768ef1ebf42b125cdc4d86937042f21b7146c4c76c1ed37e66e59a4bfaa863b54f7dbcca14a9d842782113e6ac70b2a96e62022dc2c8f717ec43c9985bf79f
-AUX ntfs3g-2017.3.23-big-sectors.patch 11378 BLAKE2B 47e47a6c1370af864aa7e700e56c8db1c190ae80bd3ed1ceeeb6952a143c2c7d640580d3586a088c7307893f3509884401cf2b7c4395ce8e536246ae3ae923e5 SHA512 e23b1e3eeeb3397e42c1a09afe8b261d5193df3fd521434b64aad80fe0c6fbbf78199b92659cbd76b6c802d77e708a81e86f1d2d97b464a5c854ef821ac722a1
-AUX ntfs3g-2017.3.23-check-mftmirr.patch 554 BLAKE2B 9c7ab2b705df38089dc0413b8132ea08ccfec34001470dfc8fb926ccdaddece6f7047cef29a9073a59f7a63da8f86e01dde9f8c9e482ae932a1dd860b940bffd SHA512 b6b4eb4c6c71b944a8a30b5da69fed97eec3b3e404c180f2c3434c402d3cf5b68aa7a4deaf74b74c11230c02ffd0ce41c96fa49f9874a0105e3219821431647f
-AUX ntfs3g-2017.3.23-full-clusters.patch 2206 BLAKE2B 5e11e3a1f3e51cf46c09c2e83033429d3ca900b4531dee419afe742efa2285793a57f968a042725d06cd139980010f99e2e7e240d892838fb7ea67682fa834dc SHA512 dbcc69018fea460882d644b3c1b794eaf1580ca6e9edbdd9a9590bbb6333dae0fedb50878c010908e3e7c7a08e0d443e95f0f7144aad78f2f89c51e92d777523
-DIST ntfs-3g_ntfsprogs-2017.3.23.tgz 1259054 BLAKE2B 4f12a6061ef0c116f26225eb3fb5cb84e469b63710115fbfb54fa3802ea94192afa973a553742818ff6849b72919069ec92aca2d4d6f58d8cabca1b0fefa3abe SHA512 3a607f0d7be35204c992d8931de0404fbc52032c13b4240d2c5e6f285c318a28eb2a385d7cf5ac4cd445876aee5baa5753bb636ada0d870d84a9d3fdbce794ef
DIST ntfs-3g_ntfsprogs-2017.3.23AR.5.tgz 1278315 BLAKE2B d4f84bf744b12fec7faff82bd3d3048282a3cbcde2ca75e5d3a295206585c4cee68e25dff5fb20b034f516a3f2cd95c489105d9df810f8a9378024ef065b67d3 SHA512 8534970ba9f07999c5ff433144ad3a59640fb9a28fb30b37b5d736101e19f9fec1c222152338be382c894f972fce2b2a83680b85a28cf147cb5500b40a0a25cc
-EBUILD ntfs3g-2017.3.23-r3.ebuild 2930 BLAKE2B ea3cc4778fc6fc4af6d8e15c9c8fa7d2bb5ddda8c3d32202512cdfeca746c2d609147703b4f90fdc5875cd1dcf9d9816c86f02a1f3dd950a94c6f781b8271c4e SHA512 0be319c53b19da4c253d7b8b299a383e277b71ecce45e35f0f68adb0e98d0c5bf6cecf0aa3537b89b2734ce4ea67281f817dd238cad857962496c1cb2f7b58c8
-EBUILD ntfs3g-2017.3.23.5-r1.ebuild 2070 BLAKE2B 3943f547cf3c41d1bb71b68d271e1ad2321d961dff6f9e816382083f0128aff4852f284c45cc377826ccbfd7008d9887b8bae83cee017606b77aea25925c84be SHA512 041d87915b55729b157378c9524c0b5e743fb2707d0744e2123e9b8c752a1852f6b3007966e46d47663971c4b74734d51749ae02057c29ef3f778127d5fb4772
-MISC metadata.xml 1188 BLAKE2B cd693b8b1281d056a5e75baeb04019684a67033607e16479c58830fbf9a19b88ba6e263c5e0637b5501cd5fe2fd000f92e8212354576242fa31c513158b38774 SHA512 6d9aa23202090132c37fe6915aa300597f2c88474065749de36143b8a47090c5bdb2e6449dffbb3843c9b7d30254fdde849b1aa230641910189d00134bd88c85
+EBUILD ntfs3g-2017.3.23.5-r1.ebuild 2064 BLAKE2B e2caefd80f21d7715bb082aecbeb507a8d8f85f227fad64d5f256614f5c714e2bba04f9b90078dfdcac5e800ca74a3026675c068f84697ceeb4ef1e00703fa33 SHA512 bf3b15c47da0f1913e40737dc32cf7b82369adf5eba38b36a23658b5d7b925065d99762024f3005e136d17cad64f8e1db4cd4a26ca7bf16ca3843a74887e1726
+MISC metadata.xml 1071 BLAKE2B 745a88ce8a93612a3658b149ed33acad8bc30e66d65694c8096203a054482d9972798f0bdb7cc707fc35acb33303da37dac2bfcdcc3537ab0e61a307ff0cd152 SHA512 0d8df4e5d4b5e0ed52dc0a35b2fe81355859dfa01ff65b8b63a767bff87d5a4ea1741fd6f1243dc32f9f2d83566967d6aa4bee0b0f3d95997d8873833fc7ac31
diff --git a/sys-fs/ntfs3g/files/CVE-2019-9755.patch b/sys-fs/ntfs3g/files/CVE-2019-9755.patch
deleted file mode 100644
index caa079d607ba..000000000000
--- a/sys-fs/ntfs3g/files/CVE-2019-9755.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 85c1634a26faa572d3c558d4cf8aaaca5202d4e9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jean-Pierre=20Andr=C3=A9?= <jean-pierre.andre@wanadoo.fr>
-Date: Wed, 19 Dec 2018 15:57:50 +0100
-Subject: [PATCH] Fixed reporting an error when failed to build the mountpoint
-
-The size check was inefficient because getcwd() uses an unsigned int
-argument.
----
- src/lowntfs-3g.c | 6 +++++-
- src/ntfs-3g.c | 6 +++++-
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/src/lowntfs-3g.c b/src/lowntfs-3g.c
-index 993867fa..0660439b 100644
---- a/src/lowntfs-3g.c
-+++ b/src/lowntfs-3g.c
-@@ -4411,7 +4411,8 @@ int main(int argc, char *argv[])
- else {
- ctx->abs_mnt_point = (char*)ntfs_malloc(PATH_MAX);
- if (ctx->abs_mnt_point) {
-- if (getcwd(ctx->abs_mnt_point,
-+ if ((strlen(opts.mnt_point) < PATH_MAX)
-+ && getcwd(ctx->abs_mnt_point,
- PATH_MAX - strlen(opts.mnt_point) - 1)) {
- strcat(ctx->abs_mnt_point, "/");
- strcat(ctx->abs_mnt_point, opts.mnt_point);
-@@ -4419,6 +4420,9 @@ int main(int argc, char *argv[])
- /* Solaris also wants the absolute mount point */
- opts.mnt_point = ctx->abs_mnt_point;
- #endif /* defined(__sun) && defined (__SVR4) */
-+ } else {
-+ free(ctx->abs_mnt_point);
-+ ctx->abs_mnt_point = (char*)NULL;
- }
- }
- }
-diff --git a/src/ntfs-3g.c b/src/ntfs-3g.c
-index 6ce89fef..4e0912ae 100644
---- a/src/ntfs-3g.c
-+++ b/src/ntfs-3g.c
-@@ -4148,7 +4148,8 @@ int main(int argc, char *argv[])
- else {
- ctx->abs_mnt_point = (char*)ntfs_malloc(PATH_MAX);
- if (ctx->abs_mnt_point) {
-- if (getcwd(ctx->abs_mnt_point,
-+ if ((strlen(opts.mnt_point) < PATH_MAX)
-+ && getcwd(ctx->abs_mnt_point,
- PATH_MAX - strlen(opts.mnt_point) - 1)) {
- strcat(ctx->abs_mnt_point, "/");
- strcat(ctx->abs_mnt_point, opts.mnt_point);
-@@ -4156,6 +4157,9 @@ int main(int argc, char *argv[])
- /* Solaris also wants the absolute mount point */
- opts.mnt_point = ctx->abs_mnt_point;
- #endif /* defined(__sun) && defined (__SVR4) */
-+ } else {
-+ free(ctx->abs_mnt_point);
-+ ctx->abs_mnt_point = (char*)NULL;
- }
- }
- }
---
-2.26.1
-
diff --git a/sys-fs/ntfs3g/files/ntfs3g-2014.2.15-no-split-usr.patch b/sys-fs/ntfs3g/files/ntfs3g-2014.2.15-no-split-usr.patch
deleted file mode 100644
index 0228bfec330b..000000000000
--- a/sys-fs/ntfs3g/files/ntfs3g-2014.2.15-no-split-usr.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-we handle split /usr logic ourselves. this ends up breaking when building
-for an abi that doesn't exist in / (like cross-compiling) as the tests fail.
-
---- a/libntfs-3g/Makefile.in
-+++ b/libntfs-3g/Makefile.in
-@@ -912,19 +912,6 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-local \
- uninstall-rootlibLTLIBRARIES
-
-
--# We may need to move .so files to root
--# And create ldscript or symbolic link from /usr
--install-exec-hook: install-rootlibLTLIBRARIES
--@INSTALL_LIBRARY_TRUE@ if [ ! "$(rootlibdir)" -ef "$(libdir)" ]; then \
--@INSTALL_LIBRARY_TRUE@ $(MV) -f "$(DESTDIR)/$(libdir)"/libntfs-3g.so* "$(DESTDIR)/$(rootlibdir)"; \
--@INSTALL_LIBRARY_TRUE@ fi
--@GENERATE_LDSCRIPT_TRUE@@INSTALL_LIBRARY_TRUE@ if [ ! "$(rootlibdir)" -ef "$(libdir)" ]; then \
--@GENERATE_LDSCRIPT_TRUE@@INSTALL_LIBRARY_TRUE@ $(install_sh_PROGRAM) "libntfs-3g.script.so" "$(DESTDIR)/$(libdir)/libntfs-3g.so"; \
--@GENERATE_LDSCRIPT_TRUE@@INSTALL_LIBRARY_TRUE@ fi
--@GENERATE_LDSCRIPT_FALSE@@INSTALL_LIBRARY_TRUE@ if [ ! "$(rootlibdir)" -ef "$(libdir)" ]; then \
--@GENERATE_LDSCRIPT_FALSE@@INSTALL_LIBRARY_TRUE@ $(LN_S) "$(rootlibdir)/libntfs-3g.so" "$(DESTDIR)/$(libdir)/libntfs-3g.so"; \
--@GENERATE_LDSCRIPT_FALSE@@INSTALL_LIBRARY_TRUE@ fi
--
- uninstall-local:
- @INSTALL_LIBRARY_TRUE@ $(RM) -f "$(DESTDIR)/$(rootlibdir)"/libntfs-3g.so*
-
diff --git a/sys-fs/ntfs3g/files/ntfs3g-2016.2.22-sysmacros.patch b/sys-fs/ntfs3g/files/ntfs3g-2016.2.22-sysmacros.patch
deleted file mode 100644
index 2fa1f2b34c88..000000000000
--- a/sys-fs/ntfs3g/files/ntfs3g-2016.2.22-sysmacros.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-include the headers that define major/minor/makedev in more places
-
-https://bugs.gentoo.org/580136
-
---- a/libntfs-3g/ioctl.c
-+++ b/libntfs-3g/ioctl.c
-@@ -57,6 +57,12 @@
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
-+#ifdef HAVE_SYS_MKDEV_H
-+#include <sys/mkdev.h>
-+#endif
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include <sys/sysmacros.h>
-+#endif
-
- #ifdef HAVE_SYS_STAT_H
- #include <sys/stat.h>
---- a/src/lowntfs-3g.c
-+++ b/src/lowntfs-3g.c
-@@ -76,6 +76,9 @@
- #ifdef HAVE_SYS_MKDEV_H
- #include <sys/mkdev.h>
- #endif
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include <sys/sysmacros.h>
-+#endif
-
- #if defined(__APPLE__) || defined(__DARWIN__)
- #include <sys/dirent.h>
---- a/src/ntfs-3g.c
-+++ b/src/ntfs-3g.c
-@@ -75,6 +75,9 @@
- #ifdef HAVE_SYS_MKDEV_H
- #include <sys/mkdev.h>
- #endif
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include <sys/sysmacros.h>
-+#endif
-
- #if defined(__APPLE__) || defined(__DARWIN__)
- #include <sys/dirent.h>
diff --git a/sys-fs/ntfs3g/files/ntfs3g-2017.3.23-big-sectors.patch b/sys-fs/ntfs3g/files/ntfs3g-2017.3.23-big-sectors.patch
deleted file mode 100644
index 1cb8bb6c46c0..000000000000
--- a/sys-fs/ntfs3g/files/ntfs3g-2017.3.23-big-sectors.patch
+++ /dev/null
@@ -1,379 +0,0 @@
---- a/libntfs-3g/bootsect.c.ref 2017-03-23 10:42:44.000000000 +0100
-+++ b/libntfs-3g/bootsect.c 2018-05-07 09:11:13.004710800 +0200
-@@ -38,6 +38,7 @@
- #include <errno.h>
- #endif
-
-+#include "param.h"
- #include "compat.h"
- #include "bootsect.h"
- #include "debug.h"
-@@ -61,6 +62,7 @@
- {
- u32 i;
- BOOL ret = FALSE;
-+ u16 sectors_per_cluster;
-
- ntfs_log_debug("Beginning bootsector check.\n");
-
-@@ -83,15 +85,27 @@
- case 1: case 2: case 4: case 8: case 16: case 32: case 64: case 128:
- break;
- default:
-- ntfs_log_error("Unexpected sectors per cluster value (%d).\n",
-- b->bpb.sectors_per_cluster);
-- goto not_ntfs;
-+ if ((b->bpb.sectors_per_cluster < 240)
-+ || (b->bpb.sectors_per_cluster > 249)) {
-+ if (b->bpb.sectors_per_cluster > 128)
-+ ntfs_log_error("Unexpected sectors"
-+ " per cluster value (code 0x%x)\n",
-+ b->bpb.sectors_per_cluster);
-+ else
-+ ntfs_log_error("Unexpected sectors"
-+ " per cluster value (%d).\n",
-+ b->bpb.sectors_per_cluster);
-+ goto not_ntfs;
-+ }
- }
-
- ntfs_log_debug("Checking cluster size.\n");
-- i = (u32)le16_to_cpu(b->bpb.bytes_per_sector) *
-- b->bpb.sectors_per_cluster;
-- if (i > 65536) {
-+ if (b->bpb.sectors_per_cluster > 128)
-+ sectors_per_cluster = 1 << (256 - b->bpb.sectors_per_cluster);
-+ else
-+ sectors_per_cluster = b->bpb.sectors_per_cluster;
-+ i = (u32)le16_to_cpu(b->bpb.bytes_per_sector) * sectors_per_cluster;
-+ if (i > NTFS_MAX_CLUSTER_SIZE) {
- ntfs_log_error("Unexpected cluster size (%d).\n", i);
- goto not_ntfs;
- }
-@@ -171,7 +185,7 @@
- int ntfs_boot_sector_parse(ntfs_volume *vol, const NTFS_BOOT_SECTOR *bs)
- {
- s64 sectors;
-- u8 sectors_per_cluster;
-+ u16 sectors_per_cluster;
- s8 c;
-
- /* We return -1 with errno = EINVAL on error. */
-@@ -186,7 +200,10 @@
- * below or equal the number_of_clusters) really belong in the
- * ntfs_boot_sector_is_ntfs but in this way we can just do this once.
- */
-- sectors_per_cluster = bs->bpb.sectors_per_cluster;
-+ if (bs->bpb.sectors_per_cluster > 128)
-+ sectors_per_cluster = 1 << (256 - bs->bpb.sectors_per_cluster);
-+ else
-+ sectors_per_cluster = bs->bpb.sectors_per_cluster;
- ntfs_log_debug("SectorsPerCluster = 0x%x\n", sectors_per_cluster);
- if (sectors_per_cluster & (sectors_per_cluster - 1)) {
- ntfs_log_error("sectors_per_cluster (%d) is not a power of 2."
---- a/ntfsprogs/mkntfs.8.in.ref 2017-03-23 10:42:44.000000000 +0100
-+++ b/ntfsprogs/mkntfs.8.in 2018-05-07 09:11:13.014132400 +0200
-@@ -132,7 +132,7 @@
- .TP
- \fB\-c\fR, \fB\-\-cluster\-size\fR BYTES
- Specify the size of clusters in bytes. Valid cluster size values are powers of
--two, with at least 256, and at most 65536 bytes per cluster. If omitted,
-+two, with at least 256, and at most 2097152 bytes (2MB) per cluster. If omitted,
- .B mkntfs
- uses 4096 bytes as the default cluster size.
- .sp
---- a/ntfsprogs/mkntfs.c.ref 2017-03-23 10:42:44.000000000 +0100
-+++ b/ntfsprogs/mkntfs.c 2018-05-07 09:11:13.035522300 +0200
-@@ -6,7 +6,7 @@
- * Copyright (c) 2002-2006 Szabolcs Szakacsits
- * Copyright (c) 2005 Erik Sornes
- * Copyright (c) 2007 Yura Pakhuchiy
-- * Copyright (c) 2010-2014 Jean-Pierre Andre
-+ * Copyright (c) 2010-2018 Jean-Pierre Andre
- *
- * This utility will create an NTFS 1.2 or 3.1 volume on a user
- * specified (block) device.
-@@ -119,6 +119,7 @@
- # endif
- #endif
-
-+#include "param.h"
- #include "security.h"
- #include "types.h"
- #include "attrib.h"
-@@ -287,7 +288,7 @@
- ntfs_log_info("Copyright (c) 2002-2006 Szabolcs Szakacsits\n");
- ntfs_log_info("Copyright (c) 2005 Erik Sornes\n");
- ntfs_log_info("Copyright (c) 2007 Yura Pakhuchiy\n");
-- ntfs_log_info("Copyright (c) 2010-2014 Jean-Pierre Andre\n");
-+ ntfs_log_info("Copyright (c) 2010-2018 Jean-Pierre Andre\n");
- ntfs_log_info("\n%s\n%s%s\n", ntfs_gpl, ntfs_bugs, ntfs_home);
- }
-
-@@ -3719,11 +3720,11 @@
- /*
- * For huge volumes, grow the cluster size until the number of
- * clusters fits into 32 bits or the cluster size exceeds the
-- * maximum limit of 64kiB.
-+ * maximum limit of NTFS_MAX_CLUSTER_SIZE.
- */
- while (volume_size >> (ffs(vol->cluster_size) - 1 + 32)) {
- vol->cluster_size <<= 1;
-- if (vol->cluster_size > 65535) {
-+ if (vol->cluster_size >= NTFS_MAX_CLUSTER_SIZE) {
- ntfs_log_error("Device is too large to hold an "
- "NTFS volume (maximum size is "
- "256TiB).\n");
-@@ -3744,15 +3745,18 @@
- "to, or larger than, the sector size.\n");
- return FALSE;
- }
-- if (vol->cluster_size > 128 * (u32)opts.sector_size) {
-+ /* Before Windows 10 Creators, the limit was 128 */
-+ if (vol->cluster_size > 4096 * (u32)opts.sector_size) {
- ntfs_log_error("The cluster size is invalid. It cannot be "
-- "more that 128 times the size of the sector "
-+ "more that 4096 times the size of the sector "
- "size.\n");
- return FALSE;
- }
-- if (vol->cluster_size > 65536) {
-+ if (vol->cluster_size > NTFS_MAX_CLUSTER_SIZE) {
- ntfs_log_error("The cluster size is invalid. The maximum "
-- "cluster size is 65536 bytes (64kiB).\n");
-+ "cluster size is %lu bytes (%lukiB).\n",
-+ (unsigned long)NTFS_MAX_CLUSTER_SIZE,
-+ (unsigned long)(NTFS_MAX_CLUSTER_SIZE >> 10));
- return FALSE;
- }
- vol->cluster_size_bits = ffs(vol->cluster_size) - 1;
-@@ -4387,6 +4391,7 @@
- u8 *sd;
- FILE_ATTR_FLAGS extend_flags;
- VOLUME_FLAGS volume_flags = const_cpu_to_le16(0);
-+ int sectors_per_cluster;
- int nr_sysfiles;
- int buf_sds_first_size;
- char *buf_sds;
-@@ -4639,8 +4644,11 @@
- * already inserted, so no need to worry about these things.
- */
- bs->bpb.bytes_per_sector = cpu_to_le16(opts.sector_size);
-- bs->bpb.sectors_per_cluster = (u8)(g_vol->cluster_size /
-- opts.sector_size);
-+ sectors_per_cluster = g_vol->cluster_size / opts.sector_size;
-+ if (sectors_per_cluster > 128)
-+ bs->bpb.sectors_per_cluster = 257 - ffs(sectors_per_cluster);
-+ else
-+ bs->bpb.sectors_per_cluster = sectors_per_cluster;
- bs->bpb.media_type = 0xf8; /* hard disk */
- bs->bpb.sectors_per_track = cpu_to_le16(opts.sectors_per_track);
- ntfs_log_debug("sectors per track = %ld (0x%lx)\n",
---- a/ntfsprogs/ntfsclone.c.ref 2017-03-23 10:42:44.000000000 +0100
-+++ b/ntfsprogs/ntfsclone.c 2018-05-07 09:11:38.245007100 +0200
-@@ -3,7 +3,7 @@
- *
- * Copyright (c) 2003-2006 Szabolcs Szakacsits
- * Copyright (c) 2004-2006 Anton Altaparmakov
-- * Copyright (c) 2010-2016 Jean-Pierre Andre
-+ * Copyright (c) 2010-2018 Jean-Pierre Andre
- * Special image format support copyright (c) 2004 Per Olofsson
- *
- * Clone NTFS data and/or metadata to a sparse file, image, device or stdout.
-@@ -71,6 +71,7 @@
- */
- #define NTFS_DO_NOT_CHECK_ENDIANS
-
-+#include "param.h"
- #include "debug.h"
- #include "types.h"
- #include "support.h"
-@@ -270,7 +271,6 @@
-
- #define LAST_METADATA_INODE 11
-
--#define NTFS_MAX_CLUSTER_SIZE 65536
- #define NTFS_SECTOR_SIZE 512
-
- #define rounded_up_division(a, b) (((a) + (b - 1)) / (b))
-@@ -393,7 +393,7 @@
- "Efficiently clone, image, restore or rescue an NTFS Volume.\n\n"
- "Copyright (c) 2003-2006 Szabolcs Szakacsits\n"
- "Copyright (c) 2004-2006 Anton Altaparmakov\n"
-- "Copyright (c) 2010-2016 Jean-Pierre Andre\n\n");
-+ "Copyright (c) 2010-2018 Jean-Pierre Andre\n\n");
- fprintf(stderr, "%s\n%s%s", ntfs_gpl, ntfs_bugs, ntfs_home);
- exit(0);
- }
-@@ -756,7 +756,7 @@
-
- static void copy_cluster(int rescue, u64 rescue_lcn, u64 lcn)
- {
-- char buff[NTFS_MAX_CLUSTER_SIZE]; /* overflow checked at mount time */
-+ char *buff;
- /* vol is NULL if opt.restore_image is set */
- s32 csize = le32_to_cpu(image_hdr.cluster_size);
- BOOL backup_bootsector;
-@@ -783,6 +783,10 @@
- }
- }
-
-+ buff = (char*)ntfs_malloc(csize);
-+ if (!buff)
-+ err_exit("Not enough memory");
-+
- // need reading when not about to write ?
- if (read_all(fd, buff, csize) == -1) {
-
-@@ -858,6 +862,7 @@
- perr_printf("Write failed");
- #endif
- }
-+ free(buff);
- }
-
- static s64 lseek_out(int fd, s64 pos, int mode)
-@@ -995,7 +1000,11 @@
- struct progress_bar *progress, u64 *p_counter)
- {
- s64 i;
-- char buff[NTFS_MAX_CLUSTER_SIZE];
-+ char *buff;
-+
-+ buff = (char*)ntfs_malloc(csize);
-+ if (!buff)
-+ err_exit("Not enough memory");
-
- memset(buff, 0, csize);
-
-@@ -1004,6 +1013,7 @@
- perr_exit("write_all");
- progress_update(progress, ++(*p_counter));
- }
-+ free(buff);
- }
-
- static void restore_image(void)
-@@ -1492,7 +1502,7 @@
-
- static void copy_wipe_mft(ntfs_walk_clusters_ctx *image, runlist *rl)
- {
-- char buff[NTFS_MAX_CLUSTER_SIZE]; /* overflow checked at mount time */
-+ char *buff;
- void *fd;
- s64 mft_no;
- u32 mft_record_size;
-@@ -1522,6 +1532,10 @@
- clusters_per_set = mft_record_size/csize;
- records_per_set = 1;
- }
-+ buff = (char*)ntfs_malloc(mft_record_size);
-+ if (!buff)
-+ err_exit("Not enough memory");
-+
- mft_no = 0;
- ri = rj = 0;
- wi = wj = 0;
-@@ -1554,6 +1568,7 @@
- }
- }
- image->current_lcn = current_lcn;
-+ free(buff);
- }
-
- /*
-@@ -1566,7 +1581,7 @@
-
- static void copy_wipe_i30(ntfs_walk_clusters_ctx *image, runlist *rl)
- {
-- char buff[NTFS_MAX_CLUSTER_SIZE]; /* overflow checked at mount time */
-+ char *buff;
- void *fd;
- u32 indx_record_size;
- u32 csize;
-@@ -1595,6 +1610,10 @@
- clusters_per_set = indx_record_size/csize;
- records_per_set = 1;
- }
-+ buff = (char*)ntfs_malloc(indx_record_size);
-+ if (!buff)
-+ err_exit("Not enough memory");
-+
- ri = rj = 0;
- wi = wj = 0;
- if (rl[ri].length)
-@@ -1627,6 +1646,7 @@
- }
- }
- image->current_lcn = current_lcn;
-+ free(buff);
- }
-
- static void dump_clusters(ntfs_walk_clusters_ctx *image, runlist *rl)
---- a/ntfsprogs/ntfsresize.c.ref 2017-03-23 10:42:44.000000000 +0100
-+++ b/ntfsprogs/ntfsresize.c 2018-05-07 09:11:13.076883400 +0200
-@@ -59,6 +59,7 @@
- #include <fcntl.h>
- #endif
-
-+#include "param.h"
- #include "debug.h"
- #include "types.h"
- #include "support.h"
-@@ -243,8 +244,6 @@
- #define DIRTY_INODE (1)
- #define DIRTY_ATTRIB (2)
-
--#define NTFS_MAX_CLUSTER_SIZE (65536)
--
- static s64 rounded_up_division(s64 numer, s64 denom)
- {
- return (numer + (denom - 1)) / denom;
-@@ -404,7 +403,7 @@
- printf("Copyright (c) 2002-2005 Anton Altaparmakov\n");
- printf("Copyright (c) 2002-2003 Richard Russon\n");
- printf("Copyright (c) 2007 Yura Pakhuchiy\n");
-- printf("Copyright (c) 2011-2016 Jean-Pierre Andre\n");
-+ printf("Copyright (c) 2011-2018 Jean-Pierre Andre\n");
- printf("\n%s\n%s%s", ntfs_gpl, ntfs_bugs, ntfs_home);
- }
-
-@@ -1849,9 +1848,13 @@
- static void copy_clusters(ntfs_resize_t *resize, s64 dest, s64 src, s64 len)
- {
- s64 i;
-- char buff[NTFS_MAX_CLUSTER_SIZE]; /* overflow checked at mount time */
-+ char *buff;
- ntfs_volume *vol = resize->vol;
-
-+ buff = (char*)ntfs_malloc(vol->cluster_size);
-+ if (!buff)
-+ perr_exit("ntfs_malloc");
-+
- for (i = 0; i < len; i++) {
-
- lseek_to_cluster(vol, src + i);
-@@ -1875,6 +1878,7 @@
- resize->relocations++;
- progress_update(&resize->progress, resize->relocations);
- }
-+ free(buff);
- }
-
- static void relocate_clusters(ntfs_resize_t *r, runlist *dest_rl, s64 src_lcn)
---- a/include/ntfs-3g/param.h.ref 2017-03-23 10:42:44.000000000 +0100
-+++ b/include/ntfs-3g/param.h 2018-05-07 09:11:13.088302600 +0200
-@@ -40,6 +40,13 @@
- };
-
- /*
-+ * Parameters for formatting
-+ */
-+
-+ /* Up to Windows 10, the cluster size was limited to 64K */
-+#define NTFS_MAX_CLUSTER_SIZE 2097152 /* Windows 10 Creators allows 2MB */
-+
-+/*
- * Parameters for compression
- */
-
diff --git a/sys-fs/ntfs3g/files/ntfs3g-2017.3.23-check-mftmirr.patch b/sys-fs/ntfs3g/files/ntfs3g-2017.3.23-check-mftmirr.patch
deleted file mode 100644
index f56eadc882f9..000000000000
--- a/sys-fs/ntfs3g/files/ntfs3g-2017.3.23-check-mftmirr.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/libntfs-3g/volume.c.ref 2017-03-23 10:42:44.000000000 +0100
-+++ b/libntfs-3g/volume.c 2017-12-20 08:11:51.842424300 +0100
-@@ -959,7 +959,8 @@
- vol->mftmirr_size = l;
- }
- ntfs_log_debug("Comparing $MFTMirr to $MFT...\n");
-- for (i = 0; i < vol->mftmirr_size; ++i) {
-+ /* Windows 10 does not update the full $MFTMirr any more */
-+ for (i = 0; (i < vol->mftmirr_size) && (i < FILE_first_user); ++i) {
- MFT_RECORD *mrec, *mrec2;
- const char *ESTR[12] = { "$MFT", "$MFTMirr", "$LogFile",
- "$Volume", "$AttrDef", "root directory", "$Bitmap",
diff --git a/sys-fs/ntfs3g/files/ntfs3g-2017.3.23-full-clusters.patch b/sys-fs/ntfs3g/files/ntfs3g-2017.3.23-full-clusters.patch
deleted file mode 100644
index 7d2496d372d5..000000000000
--- a/sys-fs/ntfs3g/files/ntfs3g-2017.3.23-full-clusters.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- a/ntfsprogs/ntfsclone.c 2018-05-16 18:46:47.114964000 +0200
-+++ b/ntfsprogs/ntfsclone.c 2018-07-16 14:03:20.273809100 +0200
-@@ -776,6 +776,10 @@
-
- /* possible partial cluster holding the backup boot sector */
- backup_bootsector = (lcn + 1)*csize >= full_device_size;
-+ buff = (char*)ntfs_malloc(csize);
-+ if (!buff)
-+ err_exit("Not enough memory");
-+
- if (backup_bootsector) {
- csize = full_device_size - lcn*csize;
- if (csize < 0) {
-@@ -783,10 +787,6 @@
- }
- }
-
-- buff = (char*)ntfs_malloc(csize);
-- if (!buff)
-- err_exit("Not enough memory");
--
- // need reading when not about to write ?
- if (read_all(fd, buff, csize) == -1) {
-
-@@ -1507,6 +1507,7 @@
- s64 mft_no;
- u32 mft_record_size;
- u32 csize;
-+ u32 buff_size;
- u32 bytes_per_sector;
- u32 records_per_set;
- u32 clusters_per_set;
-@@ -1524,15 +1525,18 @@
- /*
- * Depending on the sizes, there may be several records
- * per cluster, or several clusters per record.
-+ * Anyway, full clusters are needed for rescuing bad ones.
- */
- if (csize >= mft_record_size) {
- records_per_set = csize/mft_record_size;
- clusters_per_set = 1;
-+ buff_size = csize;
- } else {
- clusters_per_set = mft_record_size/csize;
- records_per_set = 1;
-+ buff_size = mft_record_size;
- }
-- buff = (char*)ntfs_malloc(mft_record_size);
-+ buff = (char*)ntfs_malloc(buff_size);
- if (!buff)
- err_exit("Not enough memory");
-
-@@ -1585,6 +1589,7 @@
- void *fd;
- u32 indx_record_size;
- u32 csize;
-+ u32 buff_size;
- u32 bytes_per_sector;
- u32 records_per_set;
- u32 clusters_per_set;
-@@ -1601,16 +1606,19 @@
- /*
- * Depending on the sizes, there may be several records
- * per cluster, or several clusters per record.
-+ * Anyway, full clusters are needed for rescuing bad ones.
- */
- indx_record_size = image->ni->vol->indx_record_size;
- if (csize >= indx_record_size) {
- records_per_set = csize/indx_record_size;
- clusters_per_set = 1;
-+ buff_size = csize;
- } else {
- clusters_per_set = indx_record_size/csize;
- records_per_set = 1;
-+ buff_size = indx_record_size;
- }
-- buff = (char*)ntfs_malloc(indx_record_size);
-+ buff = (char*)ntfs_malloc(buff_size);
- if (!buff)
- err_exit("Not enough memory");
-
diff --git a/sys-fs/ntfs3g/metadata.xml b/sys-fs/ntfs3g/metadata.xml
index 20cef377f9b7..e443af385903 100644
--- a/sys-fs/ntfs3g/metadata.xml
+++ b/sys-fs/ntfs3g/metadata.xml
@@ -1,31 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
- <email>chutzpah@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
-</maintainer>
-<longdescription lang="en">
-The ntfs-3g driver is an open source, GPL licensed, third generation Linux
-NTFS driver for 32-bit, little-endian architectures which was implemented
-by the Linux-NTFS project. It provides full read-write access to NTFS,
-excluding access to encrypted files, writing compressed files, changing
-file ownership, access right.
-</longdescription>
-<use>
- <flag name="external-fuse">
- Use external FUSE library instead of internal one. Must be disabled
- for unprivileged mounting to work.
- </flag>
- <flag name="ntfsdecrypt">Build and install the ntfsdecrypt application.</flag>
- <flag name="ntfsprogs">Include internal version of ntfsprogs.</flag>
-</use>
-<upstream>
- <bugs-to>http://tuxera.com/forum/</bugs-to>
- <remote-id type="cpe">cpe:/a:ntfs-3g:ntfs-3g</remote-id>
- <remote-id type="sourceforge">ntfs-3g</remote-id>
-</upstream>
+ <maintainer type="person">
+ <email>chutzpah@gentoo.org</email>
+ </maintainer>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
+ <longdescription lang="en">
+ The ntfs-3g driver is an open source, GPL licensed, third generation Linux
+ NTFS driver for 32-bit, little-endian architectures which was implemented
+ by the Linux-NTFS project. It provides full read-write access to NTFS,
+ excluding access to encrypted files, writing compressed files, changing
+ file ownership, access right.
+ </longdescription>
+ <use>
+ <flag name="ntfsdecrypt">Build and install the ntfsdecrypt application.</flag>
+ <flag name="ntfsprogs">Include internal version of ntfsprogs.</flag>
+ </use>
+ <upstream>
+ <bugs-to>http://tuxera.com/forum/</bugs-to>
+ <remote-id type="cpe">cpe:/a:ntfs-3g:ntfs-3g</remote-id>
+ <remote-id type="sourceforge">ntfs-3g</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/sys-fs/ntfs3g/ntfs3g-2017.3.23-r3.ebuild b/sys-fs/ntfs3g/ntfs3g-2017.3.23-r3.ebuild
deleted file mode 100644
index 2915df67727f..000000000000
--- a/sys-fs/ntfs3g/ntfs3g-2017.3.23-r3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit linux-info udev toolchain-funcs libtool
-
-MY_PN=${PN/3g/-3g}
-MY_P=${MY_PN}_ntfsprogs-${PV}
-
-DESCRIPTION="Open source read-write NTFS driver that runs under FUSE"
-HOMEPAGE="http://www.tuxera.com/community/ntfs-3g-download/"
-SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-# The subslot matches the SONAME major #.
-SLOT="0/88"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="acl debug +external-fuse ntfsdecrypt +ntfsprogs static-libs suid xattr"
-
-RDEPEND="
- ntfsdecrypt? (
- >=dev-libs/libgcrypt-1.2.2:0
- >=net-libs/gnutls-1.4.4
- )
- external-fuse? (
- >=sys-fs/fuse-2.8.0:0
- )
-"
-DEPEND="${RDEPEND}
- sys-apps/attr
-"
-BDEPEND="
- virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS ChangeLog CREDITS README"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2014.2.15-no-split-usr.patch
- "${FILESDIR}"/${PN}-2016.2.22-sysmacros.patch #580136
- # Fedora fixes
- "${FILESDIR}"/${PN}-2017.3.23-check-mftmirr.patch
- "${FILESDIR}"/${PN}-2017.3.23-big-sectors.patch
- "${FILESDIR}"/${PN}-2017.3.23-full-clusters.patch
- "${FILESDIR}"/CVE-2019-9755.patch
-)
-
-pkg_setup() {
- if use external-fuse && use kernel_linux; then
- if kernel_is lt 2 6 9; then
- die "Your kernel is too old."
- fi
- CONFIG_CHECK="~FUSE_FS"
- FUSE_FS_WARNING="You need to have FUSE module built to use ntfs-3g"
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- default
- # Keep the symlinks in the same place we put the main binaries.
- # Having them in / when all the progs are in /usr is pointless.
- sed -i \
- -e 's:/sbin:$(sbindir):g' \
- {ntfsprogs,src}/Makefile.in || die #578336
- # Note: patches apply to Makefile.in, so don't run autotools here.
- elibtoolize
-}
-
-src_configure() {
- # disable hd library until we have the right library in the tree and
- # don't links to hwinfo one causing issues like bug #602360
- tc-ld-disable-gold
- # 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).
- econf \
- --exec-prefix="${EPREFIX}"/usr \
- $(use_enable debug) \
- --enable-ldscript \
- --disable-ldconfig \
- $(use_enable acl posix-acls) \
- $(use_enable xattr xattr-mappings) \
- $(use_enable ntfsdecrypt crypto) \
- $(use_enable ntfsprogs) \
- $(use_enable ntfsprogs quarantined) \
- --without-uuid \
- --without-hd \
- --enable-extras \
- $(use_enable static-libs static) \
- --with-fuse=$(usex external-fuse external internal)
-}
-
-src_install() {
- default
-
- use suid && fperms u+s /usr/bin/ntfs-3g
- # Not needed with the link of mount.ntfs being created, causes
- # issues like bug #635080
-# udev_dorules "${FILESDIR}"/99-ntfs3g.rules
- dosym mount.ntfs-3g /usr/sbin/mount.ntfs #374197
-
- find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/sys-fs/ntfs3g/ntfs3g-2017.3.23.5-r1.ebuild b/sys-fs/ntfs3g/ntfs3g-2017.3.23.5-r1.ebuild
index e0ede00ae196..75a364e80508 100644
--- a/sys-fs/ntfs3g/ntfs3g-2017.3.23.5-r1.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2017.3.23.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://jp-andre.pagesperso-orange.fr/${MY_P}.tgz"
LICENSE="GPL-2"
# The subslot matches the SONAME major #.
SLOT="0/885"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="acl debug ntfsdecrypt +ntfsprogs static-libs suid xattr"
RDEPEND="
diff --git a/sys-fs/progsreiserfs/Manifest b/sys-fs/progsreiserfs/Manifest
index dc82dffa6a50..e2110f6527b9 100644
--- a/sys-fs/progsreiserfs/Manifest
+++ b/sys-fs/progsreiserfs/Manifest
@@ -1,4 +1,4 @@
-AUX progsreiserfs-0.3.1_rc8-autotools.patch 271 BLAKE2B 5c07213defa727f9e588615483961aa5db5a533ea035d4d1dd898d2316531f357e2129daa2398449d3d4d2355b8b654295e37e470b66766c55f5413c86763af5 SHA512 5db538c3bdcd4463879fc267288f76e50603d8693fa8009ef33247be7d1b89f9cd526a73e47e717f92e1217795a215690263400755ae13de2f636111f67d075f
+AUX progsreiserfs-0.3.1_rc8-autotools.patch 275 BLAKE2B 74893b9f8bb59af8cc6dc38580fea353de69390210b29a01d31a6f17c1b03cc3ac1b4a05f7d99a69cf88ffcc98738cbdbc722a7d8810cbcbd560f663520e2005 SHA512 f1729ab9f61c29da2d94c4d4f8613153e28894e494a58c473ef66697820e0ff0e55b4915c9c8afef36d77dbb17501dcb6606c92ddbf2e7ecdb7c11d735e7a5d4
DIST progsreiserfs-0.3.1-rc8.tar.gz 399279 BLAKE2B 536d18ce186c9a3b796c01cdad5f622befdffcc975a82ad24d0f2dbbc3b3bac8530231bd51d460033f9ab0bf1577d533faf17f4ea5548b175a708ddc924c50f0 SHA512 65266ab5a598b2073e6893da6554bdfe43796be3bd608eb7c4f687c3ef6ed395ce67def49b62d2b3705dfdeb38bd5f5d1c91fec6ad7323788d490058b015c26d
-EBUILD progsreiserfs-0.3.1_rc8.ebuild 1292 BLAKE2B 7493fbfc4bc00298fa24311fda7ea0373a1fe8b8fbb0a4954d1214a96ca3257aae655f2f9db21a5aea00fed2932f446c7039989be696de716089db8796296a72 SHA512 22a0de9390ff0eef0431d236c765203e699f1a0bf21516776eb07862b22233fc039bcee6f6ee19ece88df4fdc59014a08104e251439963ec63ef7878a934a8c8
+EBUILD progsreiserfs-0.3.1_rc8.ebuild 1316 BLAKE2B 6f128baef61c13e8270979262393350df40e6b1be9f73744ec8397449111fd4e9b17a8d5879ea97191a60f1b9bdd3cd2e114b535de830a2594f7d121a96f0059 SHA512 ee08b0aa9d3cc7e48cd80fb16c0be8b415cd1b8b1909dc0f722ea7b4bf3ca4556cfd10d1dd0d95edadf60823de30ea2abe4f80ba4fc0e4bb34c6e24b269d2b5c
MISC metadata.xml 425 BLAKE2B b96ad015f772cf4af772ccbf06e6db5b4ded3c7b5ddc7ac7c8446eabf9325422c649f49ae94fd95f33252aee4f64e1502afb4d5bd16d0591be1624169f9cf6fd SHA512 55c54a7c00dc1440503494b4f5332d2c82e9775ad652f3d3f5a950368fcfb55dc2e00cc6a5a999e8bcdf5ddd2c1c30567934f74be0b82533caed15ccb87ca017
diff --git a/sys-fs/progsreiserfs/files/progsreiserfs-0.3.1_rc8-autotools.patch b/sys-fs/progsreiserfs/files/progsreiserfs-0.3.1_rc8-autotools.patch
index 4a0753f4f09b..dfb1b27af787 100644
--- a/sys-fs/progsreiserfs/files/progsreiserfs-0.3.1_rc8-autotools.patch
+++ b/sys-fs/progsreiserfs/files/progsreiserfs-0.3.1_rc8-autotools.patch
@@ -1,7 +1,7 @@
http://bugs.gentoo.org/442226
---- progsreiserfs.m4
-+++ progsreiserfs.m4
+--- a/progsreiserfs.m4
++++ b/progsreiserfs.m4
@@ -10,7 +10,7 @@
dnl Adds the required libraries to $REISERFS_LIBS and does an
dnl AC_SUBST(REISERFS_LIBS)
diff --git a/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild b/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild
index 86acd4a58411..08d304b3eede 100644
--- a/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild
+++ b/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild
@@ -1,30 +1,36 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit epatch flag-o-matic libtool ltprune
+inherit flag-o-matic libtool
MY_P=${PN}-${PV/_/-}
DESCRIPTION="Library for accessing and manipulating reiserfs partitions"
HOMEPAGE="http://reiserfs.linux.kiev.ua/"
SRC_URI="http://reiserfs.linux.kiev.ua/snapshots/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86"
IUSE="debug examples nls static-libs"
-RDEPEND=""
-DEPEND="${RDEPEND}
+DEPEND="
sys-apps/util-linux
- nls? ( sys-devel/gettext )"
+ nls? (
+ sys-devel/gettext
+ virtual/libintl
+ )
+"
-S=${WORKDIR}/${MY_P}
+PATCHES=(
+ "${FILESDIR}"/${P}-autotools.patch
+)
src_prepare() {
- epatch "${FILESDIR}"/${P}-autotools.patch
+ default
elibtoolize
}
@@ -47,8 +53,9 @@ src_install() {
dodoc demos/*.c
fi
+ find "${ED}" -name '*.la' -delete || die
+
rm -r "${ED}"/usr/{sbin,share/man} || die
- prune_libtool_files
}
pkg_postinst() {
diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest
index f4d9598bdb24..4b83fd9960aa 100644
--- a/sys-fs/quota/Manifest
+++ b/sys-fs/quota/Manifest
@@ -6,8 +6,6 @@ AUX ldap-scripts/setquota-ldap.pl 6039 BLAKE2B 9603c6f7aaf842563af9c1b9a5680be12
AUX quota.confd 359 BLAKE2B 37d0cf75f96ca4ccd2d9be1ac3def62a3ac409873cfad33e1fafc515875e587a3ab3f869fd078994bef3174e70c10ce0311a307a808b3469cac73c7f3e8f1883 SHA512 3253b69932332eff2944753f687d780d651dc2b21b524b7055164b91292c13c346cd46443bd58267b239f72fd8918a7e113eec62871573ee94e33df5eb3c82f8
AUX quota.rc7 688 BLAKE2B 18a3317da5360532d6e6d9051f674a7a8e0495fa08aae8511fc7b77d2b16adb36dcdd9e510cb7bd15444b1ae8b606d607cc1ebaa10afb064b052d31ed780afbd SHA512 6a0536285bb340779cf4989060ed5a10c9c4a24a48d334174cd84cd54938d042f7a4047f837f96fc7a3c88a1d20317f662c984bd88c00b32cbf48302ba82a529
AUX rpc.rquotad.initd 448 BLAKE2B 59dc12ee73ddd0473f8122c780ef94c46dc8cfa0e15bd7a839b2d0360ea08d18d239b17b538b0ff9cd8110b8c29676aa93d06f25cf4acbc7f169ac545ab5248e SHA512 c6ab8d6e0e15032bbbee523c2550e7f23d48fb45035d37181e988f2f96cd1ece316681f1b529b51fd1aeb390c5f27a6911f5de52132e90b4cbcfb4c2dfc95954
-DIST quota-4.05.tar.gz 577313 BLAKE2B ab0adc04a2bee46f5b4f528c3a1b7f1dfbfc93cc153aebef91cf563e0b03344479b4d465f7d91cfee60c533052f27ce54f24a937c0c1ec312a5fff763cb82bd1 SHA512 a13ca93fb6fad032cb032874dda2f5d792e619b41e89b481e6aaa4f06ac5774e2728b09dd625addfbe22efccb1d85892b093736084c72f75675a60df168b92f2
DIST quota-4.06.tar.gz 520448 BLAKE2B 2cbadeade228d0154f3a8d455cc1aa6e85c9ad7854007e3188c9035abe4d5fdbdf97985fd2fa6308f486ffbe60461e0fe1139f1ec0ca415ce08292d74e0ddde1 SHA512 cece46b8e3a82e8afcf8bfc9f6b310ec91afe034102cebc031bc7d7e04287fdbffb21ab1d3e6e1825175cffa4bad0a4ecbefec0efee028d961b14ac626d5c871
-EBUILD quota-4.05-r1.ebuild 1561 BLAKE2B c94f0e1fdb676edefbfdf73fb0a3f35b5d94a656ea85cca69893d76cf99629b07d95687f9707e92c5f26c61e3cf25d8fec307ba15d380c0bdddccfc45d2a17b0 SHA512 97c5b75089743aded281e400c629dc2c09d461fc71d10a4e774d5b051df8d8e33e4e5aa479fd933da0c6ed545e3b3b4b9d7524ec03f3f0b90ea13bcd5ea342aa
EBUILD quota-4.06.ebuild 1570 BLAKE2B 5276d003194a7ca90a8f4377cc335b8f1b67f4c4ba2e006ad4f4fe4686eb8ff5fa93583ec63f95864910b109e16c49f69af4570989ab74ff242925398919404a SHA512 630945920d11e0f217291bff7539ec1ac88494d5e422811913dedad82004b01ae0dabfae3df462551ea512ebcdee2cb034382dea8ed55f09c7697782d4b02375
MISC metadata.xml 482 BLAKE2B 4b2afb537080bc15a4cd9756de6fcbb8df9a19a5a6ea3a7a4e024756be844415d46c07c3321c9dc6bfde8956ec4fb5f3ef87d0dcd090a3f4ed606e724d25fbf4 SHA512 50b2143425f8ab315784fab4d9e569d2f80893c91ba64b4c209947eb79688ed9e8e23955b9f04406d699de6f28e9c10dad78889853d05f84191af65911d7a38e
diff --git a/sys-fs/quota/quota-4.05-r1.ebuild b/sys-fs/quota/quota-4.05-r1.ebuild
deleted file mode 100644
index 25220c8565b6..000000000000
--- a/sys-fs/quota/quota-4.05-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Linux quota tools"
-HOMEPAGE="https://sourceforge.net/projects/linuxquota/"
-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"
-IUSE="ldap netlink nls rpc tcpd"
-
-RDEPEND="
- sys-fs/e2fsprogs
- ldap? ( >=net-nds/openldap-2.3.35 )
- netlink? (
- sys-apps/dbus
- dev-libs/libnl:3
- )
- rpc? (
- elibc_glibc? ( sys-libs/glibc[-rpc(-)] )
- net-libs/libtirpc
- net-libs/rpcsvc-proto
- )
- tcpd? ( sys-apps/tcp-wrappers )
-"
-DEPEND="
- ${RDEPEND}
- nls? ( sys-devel/gettext )
-"
-PDEPEND="
- rpc? ( net-nds/rpcbind )
-"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --enable-ext2direct
- $(use_enable nls)
- $(use_enable ldap ldapmail)
- $(use_enable netlink)
- $(use_enable rpc)
- $(use_enable rpc rpcsetquota)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc doc/* README.* Changelog
-
- insinto /etc
- insopts -m0644
- doins warnquota.conf quotatab
-
- newinitd "${FILESDIR}"/quota.rc7 quota
- newconfd "${FILESDIR}"/quota.confd quota
-
- if use rpc ; then
- newinitd "${FILESDIR}"/rpc.rquotad.initd rpc.rquotad
- fi
-
- if use ldap ; then
- insinto /etc/openldap/schema
- insopts -m0644
- doins "${FILESDIR}"/ldap-scripts/quota.schema
-
- exeinto /usr/share/quota/ldap-scripts
- doexe "${FILESDIR}"/ldap-scripts/*.pl
- doexe "${FILESDIR}"/ldap-scripts/edquota_editor
- fi
-}
diff --git a/sys-fs/reiserfsprogs/Manifest b/sys-fs/reiserfsprogs/Manifest
index 07d60a0e53ed..ab815a8a56a1 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.ebuild 1255 BLAKE2B 733ae69b51cc97a7a18f48e5add6ec854bd48b75232c7242b9839b415e12cc0d08c416efd88b7c6636be0fa8d7b67283c897c584dea94186a422de57d07a106c SHA512 cf818ae77e507987175cc9553252070178a9e288cafaa13b279976acf4e63a92be0b46952693fbe02b6f5a51e4a913c703aa7909c21f1d4cf8ff66d94149877f
+EBUILD reiserfsprogs-3.6.27-r1.ebuild 1337 BLAKE2B 6a58fbbd006d288b7ba695ad158aa080851d326209723c5c0124450243997d13c22d9d14e6d07979e7bb0568d182fb98df4dfa1ad9769e4708d37ee9260c0c05 SHA512 edd539f67b11a90a6b999b575cba16cb426d81b4fc5ef3de4989cbc98ba6a5d7148656563e3433fbc4dd5338604cebb8b8ab8eca5d55f09e178eb62ba68f22dc
MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27-r1.ebuild
index 998ee9006da1..1751f2192730 100644
--- a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild
+++ b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit autotools flag-o-matic usr-ldscript
@@ -20,6 +20,10 @@ PATCHES=(
"${FILESDIR}/${PN}-3.6.27-loff_t.patch"
)
+# Needed for libuuid
+RDEPEND="sys-apps/util-linux"
+DEPEND="${RDEPEND}"
+
src_prepare() {
default
eautoreconf
@@ -27,17 +31,20 @@ src_prepare() {
src_configure() {
append-flags -std=gnu89 #427300
+
local myeconfargs=(
--bindir="${EPREFIX}/bin"
--libdir="${EPREFIX}/$(get_libdir)"
--sbindir="${EPREFIX}/sbin"
$(use_enable static-libs static)
)
+
econf "${myeconfargs[@]}"
}
src_install() {
default
+
dodir /usr/$(get_libdir)
mv "${ED}"/$(get_libdir)/pkgconfig "${ED}"/usr/$(get_libdir) || die
@@ -45,6 +52,6 @@ src_install() {
mv "${ED}"/$(get_libdir)/*a "${ED}"/usr/$(get_libdir) || die
gen_usr_ldscript libreiserfscore.so
else
- find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete
+ find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
fi
}
diff --git a/sys-fs/static-dev/Manifest b/sys-fs/static-dev/Manifest
index 443f25e88ece..501830426d8c 100644
--- a/sys-fs/static-dev/Manifest
+++ b/sys-fs/static-dev/Manifest
@@ -1,2 +1,2 @@
-EBUILD static-dev-0.1.ebuild 1144 BLAKE2B 82122b25e84a1a130b3b00afa45350d4d32b7dd2cc6211b7878dfe147ba00bc3e9cd3fccc75d4c2d881ba572fd4f51c8ae434e052fba869f788e3b020e1a4da7 SHA512 ae26f2c302bea959dbae7ff59bd3e30931f7b871e130aff0f40111a829a7fe972dfb91d4ad810ffa96c1dcaad404af202cc1cc309b92f50fe10c0ce7bf130dcf
+EBUILD static-dev-0.1-r1.ebuild 1103 BLAKE2B ee9a36d0bc1fd9b9c6d3f608b8fff157266f91c0e5283085a51136804d998c72fe010fa097b775cc13e71d6cfabddd6e202e4a55a1eb47f3f256776d9cac396b SHA512 9c6d4f600407f487f537de931aa2371807b9c5ed0c1030d3eeec087fbcb10ca1512fc4490858216a0b08d9db99197f86b4e0a86669c03a36795933d6cc4caaf9
MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/static-dev/static-dev-0.1.ebuild b/sys-fs/static-dev/static-dev-0.1-r1.ebuild
index c1a62712d168..42c60e497de4 100644
--- a/sys-fs/static-dev/static-dev-0.1.ebuild
+++ b/sys-fs/static-dev/static-dev-0.1-r1.ebuild
@@ -1,28 +1,24 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=7
DESCRIPTION="A skeleton, statically managed /dev"
HOMEPAGE="https://bugs.gentoo.org/107875"
-SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
RDEPEND="sys-apps/makedev"
-DEPEND="${RDEPEND}"
-
-abort() {
- echo
- eerror "We have detected that you currently use udev or devfs or devtmpfs"
- eerror "and this ebuild cannot install to the same mount-point."
- die "Cannot install on udev/devfs tmpfs."
-}
pkg_pretend() {
+ abort() {
+ eerror "We have detected that you currently use udev or devfs or devtmpfs"
+ eerror "and this ebuild cannot install to the same mount-point."
+ die "Cannot install on udev/devfs tmpfs."
+ }
+
if [[ ${MERGE_TYPE} == "buildonly" ]] ; then
# User is just compiling which is fine -- all our checks are merge-time.
return
@@ -32,6 +28,7 @@ pkg_pretend() {
if [[ -d ${ROOT}/dev/.udev || -c ${ROOT}/dev/.devfs ]] ; then
abort
fi
+
# We also want to not clobber newer devtmpfs setups.
if [[ ${ROOT} == "/" ]] && \
! awk '$2 == "/dev" && $3 == "devtmpfs" { exit 1 }' /proc/mounts ; then
diff --git a/sys-fs/sysfsutils/Manifest b/sys-fs/sysfsutils/Manifest
index db9791cfd5b3..8b41013795f8 100644
--- a/sys-fs/sysfsutils/Manifest
+++ b/sys-fs/sysfsutils/Manifest
@@ -1,5 +1,3 @@
-DIST sysfsutils-2.1.0.tar.gz 788885 BLAKE2B faaeba9d156e48b98ecc50c28711205dd7b99da4966206493f2b63d8a7a3e730b6564a1dac9304c8af56c516e5a13d6d9cf1ebd8773563617c3acc2387059a09 SHA512 485902d98b41a69343cb037883d0c0a1de8a1a4aed657cd4528fe10bc845ac51629657dff01deef042e57c9bd9243095e23fc931d06d74db31b03c5f0a18cf07
DIST sysfsutils-2.1.1.tar.gz 78823 BLAKE2B 2249a9b7b95bd63be14d60fc3f38d569ee40624885d04391e1fd1d3927abc0695977f456d76214efacaa5149fd860ae1bf4ed0de8d33ea2aa047b446904195bd SHA512 7e1c8535be3c29dec8e23e8b6e8d3ec794bbdc696f161fa38731844c82cc1d37ff04f94c8b0ec0cf8da7147fc696dad0086262641984fa67378ffd2f162dc358
-EBUILD sysfsutils-2.1.0.ebuild 964 BLAKE2B 6a3caf2de37840bfbd18463398699f11c92ae313de22a5b88251ef2751a86d694c91535b87e06b164c2d744e8c56f29856dfb86ec73a11eb785a1e21fb8a8c55 SHA512 9e0f572a3bafcc362f31b9408905d668dbe9aeb05854d150c800470f6c20abdcd4733b9fe762b44ed05eeb96eff987f73face0a6f5ef63dfc5c625ff9cc05901
-EBUILD sysfsutils-2.1.1.ebuild 965 BLAKE2B 05fcc710c3917b24b9c5e78d7b0f8bdb33f6ad2516cd258d6777344e6d4aa7ee0e4e0c27d76539a550a3f896ad661115cb33dd6ea6a8f27dd08b741a4fb93615 SHA512 09e6fd5e466a8849da421611fca06206c8920d0282254f6cc4b776dd0fa9ad35f718fa6fbe27da24b524c52f7bdea928d3b3b3232a03cfff0d3d555cafe564dd
+EBUILD sysfsutils-2.1.1.ebuild 862 BLAKE2B 4d0ac9dc900b1da6f8b0ebbda0398fb3fcd32ba79306c6655c362984a8db2adcd2de7a6118a06a0a7728415a88b216bc9b4ed1262f2ab39723501427a7e7ecda SHA512 982002e077886a6ebc83a8243c08cff121fa65ac16cd5f159962eac4f8d0485f81a60ece244857615de835b8a05bae976b4eada2777d80be62e4e93cc82fffd5
MISC metadata.xml 330 BLAKE2B 704f504eef71b56802b1d24554ea1e4887cbaa3bc859021c9decede47242997906e1e87cf18a9a0a7668000a629c5a48699d09b7ebc4532cb304899d61a5091e SHA512 16dbfcfa75389172827d78272e473ea69b20ac564ae8c17de031599ccbb5166ffdb7e42208b52e6ba53cc5bda75075c980c7954516646cc0fce4fb56e431070c
diff --git a/sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild b/sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild
deleted file mode 100644
index fb7858589804..000000000000
--- a/sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools toolchain-funcs usr-ldscript
-
-DESCRIPTION="System Utilities Based on Sysfs"
-HOMEPAGE="http://linux-diag.sourceforge.net/Sysfsutils.html"
-SRC_URI="mirror://sourceforge/linux-diag/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-src_prepare() {
- sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467642
-
- # workaround maintainer mode
- AT_M4DIR=m4 eautoreconf
-
- # with eautoreconf you get "Useless epunt_cxx usage"
- # without you don't
-# epunt_cxx
-}
-
-src_configure() {
- econf $(use_enable static-libs static)
-}
-
-src_install() {
- default
- dodoc docs/libsysfs.txt
- gen_usr_ldscript -a sysfs
-
- # We do not distribute this
- rm -f "${ED}"/usr/bin/dlist_test "${ED}"/usr/lib*/libsysfs.la || die
-}
diff --git a/sys-fs/sysfsutils/sysfsutils-2.1.1.ebuild b/sys-fs/sysfsutils/sysfsutils-2.1.1.ebuild
index 41ccecdbd60f..aa206f6aada6 100644
--- a/sys-fs/sysfsutils/sysfsutils-2.1.1.ebuild
+++ b/sys-fs/sysfsutils/sysfsutils-2.1.1.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools toolchain-funcs usr-ldscript
+
+inherit autotools usr-ldscript
DESCRIPTION="System Utilities Based on Sysfs"
HOMEPAGE="http://linux-diag.sourceforge.net/Sysfsutils.html https://github.com/linux-ras/sysfsutils"
@@ -16,12 +17,8 @@ IUSE="static-libs"
src_prepare() {
default
- # workaround maintainer mode
+ # Workaround maintainer mode
AT_M4DIR=m4 eautoreconf
-
- # with eautoreconf you get "Useless epunt_cxx usage"
- # without you don't
- #epunt_cxx
}
src_configure() {
diff --git a/sys-fs/udftools/Manifest b/sys-fs/udftools/Manifest
index 311155487393..a357c3606002 100644
--- a/sys-fs/udftools/Manifest
+++ b/sys-fs/udftools/Manifest
@@ -1,7 +1,3 @@
-DIST udftools-2.1.tar.gz 555440 BLAKE2B 09ed67d67a5194aff1611ca40907465cf5d9b83a6a9c1771118c80599be29e8d68fc48c10b38d33a4aed4fa6e7e6dbf0399b5d04bd103153f42a705e17edcf6c SHA512 0bdb3f2e0595200dadb771af4f31ba513d0bf6a0fbd30bc3a1f8aba4ab5f487f61635e65dc155926d2f566cb6e2b2f3a57938071616058cf703692d529971a64
-DIST udftools-2.2.tar.gz 543515 BLAKE2B 8702959e9840415201668255272a7f5bb3b88d1e11a20ea6818c9c031d602ceba25a4892965f77961e265d55a687c6574a9aa7c657610d85e56549550a978d58 SHA512 1d6f7b725053ab8c2092ca07bce07fb075168ba48f7d2580076ee84b2652af3898622746c5a2f0bdb8c0d1d0e09d1f4a3cbaae4f998924652a56561b84690e2b
DIST udftools-2.3.tar.gz 581756 BLAKE2B 48b3681509c755249cfabd29fae9a622bcf104aead15e03196acaaa64ad8cab77b928fec7c08be7b9f5753594e1de1c21c9a9c3e863bcf5388d6e2090d04e9a9 SHA512 17304264388ae53e348d6aa870f0d23c29477344fee848236b46886c086221941872073974f804c0735eafd0cf9f7acdac7988132f03c0a87dba37467b5bda95
-EBUILD udftools-2.1.ebuild 550 BLAKE2B 026a1ff99b0c4cefe88ab802897f98aea94f7711db84a1d40e8b5683fa76e02a2273657ad844482e7aafeb101e408b7c0305f10dc37003682524ce8585c836b8 SHA512 a541cbe3dc4079bf074a3320079035749b4e0e8d812801e25a161de109a678847dee96af60180998d00ab3e6ba497f8e2f54f764538ee82a42dab899ff48d4a8
-EBUILD udftools-2.2.ebuild 583 BLAKE2B 6d95826857e7e9de06d16b68a292d669a67f21a88c1959d1bae1d4cfa638fcb054e62860de019ac4b1bef918e29a659e68eb627574fee21aff62f2f2381a16ac SHA512 9eaac92d924ad075005141c321d1928a15c74970510435dc8f72c52722fcfa8a04ba26e8ec4478f98620f3ce71edb1e8efda1f97e72b38371113bd05cf64fccc
-EBUILD udftools-2.3.ebuild 588 BLAKE2B af0becf95d4bde20e2f5c713d4cd20e9a48f96de6a2938f6cee418095e9825b057fd92014cdaf30edb5d25308686c9dafb2a09297981fff62e20d6dac21484f0 SHA512 d07cb80c835f1d163654db9445f3b393432221ad0471e2c07eb4e7afc13749fd51d8a035e3bf922f215539e4791370d5e54bec74ee98941df168ac34e33bb5ce
+EBUILD udftools-2.3.ebuild 553 BLAKE2B 82cceec792b3c32d351b79ed093bee70bd99adce8ad8ed072cbcd28a39e0c142c729783796aadc759839fcd6d74f0b35db7e98e6dc07b9dab8c19d3c306a284b SHA512 cd3fd750cf88ef890d491ceb87b37f1516faa2641cbae8ff13b4e23354c84de0b96362713cb436e2408c4b4f7e4165c6d346948d8fc4a15b4b2510ff34c2f436
MISC metadata.xml 389 BLAKE2B eb4e50503c55d5ce92fdf396990d26db09c1d0939e6eef53fae3aeb41d1ee7c6a380375b276512d98e4f4bcb0072951bb2fdfbfc754a14473053f3c757a7de7d SHA512 5768e952497a158ffe84652016d7026f0cb9a2336d177e42e6f1a984ab38d3a1ae17498af6d11c210ca50a06b7a6cd1270a0bb4dfa82d5802512513be8d470a6
diff --git a/sys-fs/udftools/udftools-2.1.ebuild b/sys-fs/udftools/udftools-2.1.ebuild
deleted file mode 100644
index eae01557ddb6..000000000000
--- a/sys-fs/udftools/udftools-2.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="Ben Fennema's tools for packet writing and the UDF filesystem"
-HOMEPAGE="https://github.com/pali/udftools/ https://sourceforge.net/projects/linux-udf/"
-SRC_URI="https://github.com/pali/udftools/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="sys-libs/readline:0="
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
diff --git a/sys-fs/udftools/udftools-2.2.ebuild b/sys-fs/udftools/udftools-2.2.ebuild
deleted file mode 100644
index 465de8928243..000000000000
--- a/sys-fs/udftools/udftools-2.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="Ben Fennema's tools for packet writing and the UDF filesystem"
-HOMEPAGE="https://github.com/pali/udftools/ https://sourceforge.net/projects/linux-udf/"
-SRC_URI="https://github.com/pali/udftools/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="sys-libs/readline:0="
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
- virtual/udev
-"
diff --git a/sys-fs/udftools/udftools-2.3.ebuild b/sys-fs/udftools/udftools-2.3.ebuild
index df7278f2df9f..8bd6a21db085 100644
--- a/sys-fs/udftools/udftools-2.3.ebuild
+++ b/sys-fs/udftools/udftools-2.3.ebuild
@@ -3,16 +3,13 @@
EAPI=7
-inherit flag-o-matic
-
DESCRIPTION="Ben Fennema's tools for packet writing and the UDF filesystem"
HOMEPAGE="https://github.com/pali/udftools/ https://sourceforge.net/projects/linux-udf/"
SRC_URI="https://github.com/pali/udftools/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="sys-libs/readline:0="
DEPEND="${RDEPEND}"
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 2c833f2ecd61..98a580a200e1 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,5 +1,5 @@
DIST udisks-2.9.1.tar.bz2 1680327 BLAKE2B 6573dd91decfaece6668a9848fc5ff276190c0d2be272e2d0fa550274a3e20df4038a87dd5fbb7b1b6a33a4c94f5668d01297d583da7df7027353353ef3936f4 SHA512 a360cafc65375153c5de65f817eecbc65d56a9d9167222e1adbc8f57568d15ccf7ed317e8e0b567340f250ca9247196de104442191bd069510f72dfc5ed65eb3
DIST udisks-2.9.2.tar.bz2 1701377 BLAKE2B 402cf2354907acee13230d035c8b22634a70efab0e61939d8ff260391c80a0d166de67f57cc4b78025da027df16deb07c5620ab546d37181681d824ea84d0e8c SHA512 73a162bbb0fd6ec1e6a79af2a01185672712d7e94eacdc1a913f559a87fc620a095fe4c8b4dacbaa12bc816f565fc966d28c2f9299104da18581d4879321aee9
-EBUILD udisks-2.9.1.ebuild 3473 BLAKE2B bacc1690696c7dac9fb2a2d49faa60f15d6478250c1b3a401bdff9ae36fbd9442e1ccc686889bffaf32c7d84f6f7ff03206c82b44f8e3224bedd59f6d152ece3 SHA512 2b962bfcf6c812afcc3e6e9804a1a184e3a85e99747f19829df8c1516ea290254186bac1f57cb63e067dd052d7176d88a5b87dafc6a245ed8928ec724964ec13
-EBUILD udisks-2.9.2.ebuild 3588 BLAKE2B 230cdd8b7180c9b219258f67b057bb22dc8a736a6c34eadd937d8d232c4bcc6f93e3befe9bb748b3b71280b2a3f96976cb722bbadb3af6c97a839aeaa7dbf02a SHA512 08c60003b133d32bb32961d975c4aacde4186fadb5915a9b9ce8218520813e1350a992a9b351c8f9c006d89503a50e3b775807105541a91aac9dfa4c12108954
+EBUILD udisks-2.9.1-r1.ebuild 3446 BLAKE2B d42d0f9cdffdcec6f22ee1d03ed7a6d8b69075586e38adc316e794b67daaadc3fd48da317a813d5c5a02cae6a5f0f1c4399a3caad73175ef178e44380f21badb SHA512 d5a5e129d0f8ffe1a1c7e3e7208f2392d5d5bf9913ae19bb8a2aa5fa413cec96f450041ca54c83e8483279e41d9091d8d4733e67ad37c118d955eef69c744bf4
+EBUILD udisks-2.9.2-r1.ebuild 3561 BLAKE2B 37a385f84760acebaa28fe348c4bb82250a08d11824655ea496681e46670ac5cb4676fa2f7121ad6fd3f3f5138e1794fa67556440c1d1970981c1a07edd74738 SHA512 70b5ad06781be612fe2979a490947b7e41d699d977d6eea37568cdfe0fffb4fe9a2ebaba7ea1b5adbce2d727fd487e0a0ecd82fed9b3176d4765e9fd36cbc0f3
MISC metadata.xml 728 BLAKE2B 4a540e1378d04b04e2b75a531e9df8c13faee4870c8bc3778e9e08dc742eb9e28e2b1134448302e43cbb8815432fa0bbbb402f22722267fa4869fe0c04775c8b SHA512 9f057eb51f5924b53cecf5e495b02bb6fad41e9b23c197b1f24a972e8a25504506e73329a93295e9eb30e62863f7c4454909fba10fdea696be23caa7cf50d8cb
diff --git a/sys-fs/udisks/udisks-2.9.1.ebuild b/sys-fs/udisks/udisks-2.9.1-r1.ebuild
index 213b314c256f..c6aaf0083376 100644
--- a/sys-fs/udisks/udisks-2.9.1.ebuild
+++ b/sys-fs/udisks/udisks-2.9.1-r1.ebuild
@@ -39,8 +39,7 @@ COMMON_DEPEND="
# util-linux -> mount, umount, swapon, swapoff (see also #403073)
RDEPEND="${COMMON_DEPEND}
>=sys-block/parted-3
- virtual/eject
- daemon? ( >=sys-apps/util-linux-2.30 )
+ >=sys-apps/util-linux-2.30
selinux? ( sec-policy/selinux-devicekit )
"
DEPEND="${COMMON_DEPEND}
diff --git a/sys-fs/udisks/udisks-2.9.2.ebuild b/sys-fs/udisks/udisks-2.9.2-r1.ebuild
index 508387e11dbe..97ae6e37c1e9 100644
--- a/sys-fs/udisks/udisks-2.9.2.ebuild
+++ b/sys-fs/udisks/udisks-2.9.2-r1.ebuild
@@ -42,8 +42,7 @@ COMMON_DEPEND="
# util-linux -> mount, umount, swapon, swapoff (see also #403073)
RDEPEND="${COMMON_DEPEND}
>=sys-block/parted-3
- virtual/eject
- daemon? ( >=sys-apps/util-linux-2.30 )
+ >=sys-apps/util-linux-2.30
selinux? ( sec-policy/selinux-devicekit )
"
DEPEND="${COMMON_DEPEND}
diff --git a/sys-fs/vzquota/Manifest b/sys-fs/vzquota/Manifest
index 810f2afea396..46b3daff2a9d 100644
--- a/sys-fs/vzquota/Manifest
+++ b/sys-fs/vzquota/Manifest
@@ -1,3 +1,3 @@
DIST vzquota-3.1.tar.bz2 46848 BLAKE2B ae347ecf3c1d537901b0055f635839e1d65f3801507ffd986aa5c857a1df98336a4ada2065c72e94885266c5a95b070e89cfc2e3da95ab31a6dd0d8deab424b5 SHA512 e2289df9235149c8d511a6b2846f672574622fb39ca5cd8f5780af9a4cc204ce12f1a2ecd0382143c04eca93e64ce6851caab0782e8ad178352954ca599ffaac
-EBUILD vzquota-3.1.ebuild 816 BLAKE2B 8886c17b93f5a6dbdca2e6df5828b9f060f132df0f7afda2ba7baafc7291c4e670f8abf59a282350c7c30ccfe79d7e063c9dc765ac253e493e698c66d107f632 SHA512 097c81909c969662ae637f7e91942ee91df3e4e7a291c085537137adeceaf32d54a66cbb009c1a5e96e55b7e5353cc890cdb958d697c5f3bd594b2789ca973e0
+EBUILD vzquota-3.1.ebuild 816 BLAKE2B 6aaa5ff15a18b8260afbbcd5171d8e4399c8c3ea028332c5d5ab5aa744f16939dcfb2b80206f1d45a1b2e2b4e1ad10d9814518e0d9cb868d26300f6f8ba65436 SHA512 ab2d0a23491a35339ff8876f29cba4dcb269395f31255128dd3f2f89f4a5053060787227af7561a638da143526ced070b6997b682b0e0cb12abae03ade09a945
MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/sys-fs/vzquota/vzquota-3.1.ebuild b/sys-fs/vzquota/vzquota-3.1.ebuild
index 342d9e6b24ef..cddea014503f 100644
--- a/sys-fs/vzquota/vzquota-3.1.ebuild
+++ b/sys-fs/vzquota/vzquota-3.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
inherit toolchain-funcs
@@ -12,19 +12,22 @@ SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~ia64 ~ppc64 ~sparc x86"
-IUSE=""
src_prepare() {
+ default
+
sed -e 's,$(INSTALL) -s -m,$(INSTALL) -m,' \
-e 's:$(CC) $(CFLAGS) -o:$(CC) $(CFLAGS) $(LDFLAGS) -o:' \
-e 's:-Werror ::' \
- -i "${S}/src/Makefile" || die 'sed on src/Makefile failed'
+ -i "${S}/src/Makefile" || die "sed on src/Makefile failed"
+
tc-export CC
}
src_install() {
emake DESTDIR="${ED}" INSTALL="${EPREFIX}/usr/bin/install" install
keepdir /var/vzquota
+
# remove accidentally created man8 dir
- rm -r "${ED}/man8" || die 'remove man8 directory failed'
+ rm -r "${ED}/man8" || die "remove man8 directory failed"
}
diff --git a/sys-fs/xfsdump/Manifest b/sys-fs/xfsdump/Manifest
index dd2c62509cfb..0af6b7f42e52 100644
--- a/sys-fs/xfsdump/Manifest
+++ b/sys-fs/xfsdump/Manifest
@@ -4,5 +4,5 @@ AUX xfsdump-3.1.9-no-symlink.patch 1027 BLAKE2B 35e0a308e9c368448305361e1632a229
AUX xfsdump-3.1.9-prompt-overflow.patch 329 BLAKE2B 58bada935969c61fe9a161e810c6402642a87d0803076c89f1cecf5367037f96ff234d3231c49fa8b450810b21f60ac391bd631400e30738b9b11d3000158bd7 SHA512 dae03fd09ac45c8a974cf1818625cbb07c1bd7c88b28613f855d0a5878c1bf3bcb071c6f8ebd46627b83fd482ff4847a33f8a54f1de5be7595025df9f22d2fdf
AUX xfsdump-3.1.9-skip-inventory-debian-subfolder.patch 468 BLAKE2B 81cf0af8cef61efa4dff6e230b71c0db65c3e7d93fd252035b6b5bf14afe28e65eccaef22bc3fc4419d196b0cca1428bc1697233efcc4f28aa138beaf3a5ccbf SHA512 c94af1c52c95a7617586b64a8936cdbfbd3a264c9580fabc3e1e7d3d5c37ca368b97f730baef2330e796ef7459561fa37b03280601aaa3b79eb2f90d9af5170d
DIST xfsdump-3.1.9.tar.xz 600348 BLAKE2B 9e833acaacd3ad581b4f23731d7d613fcffa3d518f43638cddbc7da7015e582cb9415e00616e5e8586836831b6d5877fa83e8a5fd931fd454731bf2af7072095 SHA512 e8f9811d16fc06ab49fe2c109de0546c989575eca6e68b579c6d219a745f935952020069f58b357c5c87b944c5097ca2894466d328d09f06beb8a55880142351
-EBUILD xfsdump-3.1.9.ebuild 1601 BLAKE2B 34502fc05e19c87e2fdaa74c1d86a4d2f559cc205b307e0e7ab03c53898e05af714196520f6924baab7f11e52199dc065313fe704500bff8bc455728dcfc186f SHA512 5316169fe548cd37570ae99871bdaddf3c6c9cd2bd448cd05465027a903fa75647fe5cb31fcb12b806baed0f34ddd07f040e2cbff80244299f98c36cabace7cd
+EBUILD xfsdump-3.1.9.ebuild 1622 BLAKE2B 57df8009e5170a8bed40d692b9cef03873d3ed42dcbb511045f95436c079d6c299954309de5fe2e9ff969226bf2fb0db6e7164f1be837d19f277a0df036785cf SHA512 d923e6fa659cc89453b3fd44452970b8ddf23a89cbc40414ee6b6e6e6d30934484a97eda3875971a221805e69cce7b6390fc8ddc1539a8c6aabf7249231504e2
MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/xfsdump/xfsdump-3.1.9.ebuild b/sys-fs/xfsdump/xfsdump-3.1.9.ebuild
index 23dff387eab2..57fc455d91cb 100644
--- a/sys-fs/xfsdump/xfsdump-3.1.9.ebuild
+++ b/sys-fs/xfsdump/xfsdump-3.1.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit multilib flag-o-matic toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="xfs dump/restore utilities"
HOMEPAGE="https://xfs.wiki.kernel.org/"
@@ -26,7 +26,9 @@ DEPEND="${RDEPEND}
nls? (
sys-devel/gettext
elibc_uclibc? ( dev-libs/libintl )
- )"
+ )
+"
+BDEPEND="ncurses? ( virtual/pkgconfig )"
PATCHES=(
"${FILESDIR}"/${PN}-3.1.9-prompt-overflow.patch #335115
@@ -41,6 +43,7 @@ src_prepare() {
-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
include/builddefs.in \
|| die
+
sed -i \
-e "s:enable_curses=[a-z]*:enable_curses=$(usex ncurses):" \
-e "s:libcurses=\"[^\"]*\":libcurses='$(use ncurses && $(tc-getPKG_CONFIG) --libs ncurses)':" \
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 5b4c6bf8eda4..57b8a80a8078 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -3,8 +3,8 @@ DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcef
DIST zfs-2.0.4.tar.gz 13123872 BLAKE2B 7e4780092c0a87d5d187cd5734ddc736574db80b500f155287640ef2230e09335cc9b6b26ec1b7d8ab1b7942673ea49a3007a81da372a6d2ac36f3908913045c SHA512 1dda92d424372bce7020f5215545485eae69211b6f0fb6bea3c7c22efac76c6a2662f0dd14a03f723b6a6fe73b1228ecca211a4034b86cf885bcadf38ba0dc6b
DIST zfs-2.1.0-rc5.tar.gz 34811108 BLAKE2B fd785dd9a77a55b734fd96526e5805cd8e90a517cef48bed95fccc4849f7be45210b3cc6f6bdfb30f3ee3a9a9814308eb1599c4df143aca46b23f968dc088a54 SHA512 37dd4f40a8ab8265a4f8c1d67d1a4327b1376bbd2d53b166261d501ffc01521deaa03f8bcce992158d50482def184b840d2596df6d9291697b1fc1938731d6d8
DIST zfs-2.1.0-rc5.tar.gz.asc 195 BLAKE2B 452c211af7ad3b5f7e2b7bc96985305dabcedde0f70825353b18d45e569f2bbd39b717d7e7b790794735295ec5dcc4ed751f5256fffa7b892627056191f02b79 SHA512 85908fbb2cb49965ce015d20182aef035fbd76195a1a72aa36a48af05bd355a95998087ec3b6c73b6de6eebd66e578bef28db6ecbf679274ce6aade303b66cae
-EBUILD zfs-kmod-0.8.6.ebuild 4761 BLAKE2B 03ae7e6c75b1e0b2032758272eeef7ac5ceccb367ba9180aee173bbe322580ca9757915eaa13dcd88781d738341748e338f25c41eec95f6293a066850dfe286b SHA512 9991249746e2f912c6978eb8f771d2f25cb082a31b26c9bd5167985a6f8c11dcbae4851e965053dccfa7fcad323e973d150b0a4963f47be39c6513d614097d0e
-EBUILD zfs-kmod-2.0.4.ebuild 4445 BLAKE2B 34792791c3efbd2a83c023bf5d333a3d2827dde23f892e7826c109b07c5a9138d755fc2026fdebc9ad4dc669b0292548ff8bbf7921b6f6044b4319bafcd78361 SHA512 07482c1f513078e5aa0dffc0ffc98938eccb954da558182e600926175fa0d1f4c5dbf6fd010c557248eb726dbbfa3199188102de5d0859db665969465940b769
-EBUILD zfs-kmod-2.1.0_rc5.ebuild 4768 BLAKE2B d7378f2e8790bae0c11f38263d53efb0c30106c0ffb745b7ba3a04a29a8ff713adb48de920e215bfa1f190b61d71539438e867c3aa141504a59578a80251a39e SHA512 b3b19923f6576cef1d8f4488d61284e9358a73f2357cfcb47e7f9ba2af1f2e96154127c2bc572af4b049dd44a0b310ba871536c82ead11afc59f4baa648c6ab1
-EBUILD zfs-kmod-9999.ebuild 4768 BLAKE2B d7378f2e8790bae0c11f38263d53efb0c30106c0ffb745b7ba3a04a29a8ff713adb48de920e215bfa1f190b61d71539438e867c3aa141504a59578a80251a39e SHA512 b3b19923f6576cef1d8f4488d61284e9358a73f2357cfcb47e7f9ba2af1f2e96154127c2bc572af4b049dd44a0b310ba871536c82ead11afc59f4baa648c6ab1
+EBUILD zfs-kmod-0.8.6.ebuild 4783 BLAKE2B 585765ace5ea6182bb804dd4f7113e1cdac1d6bc9ba092e083645064a0bc38f6d7747afb2fcd290ecc4f0d7957da9c609d4d29288784f6f45327016b19c3f48f SHA512 64a119691b0f5d1c5109e128f2a0802e9f4315f001c013f36f162771df0c51b524494cb7aaf71aabc829ca7ed63374a8ced5cfeec196056c02e712654e07656d
+EBUILD zfs-kmod-2.0.4.ebuild 4467 BLAKE2B ae4c86ac369b171e59a698a134eefb0fcef7019e7b3ca0225de3d444bce88226d1d777480ed06020d6933f3c0155979f9d56210fcb7443a70dd19994d027a94a SHA512 26c4b8beb017f142169f92a1d9475d807bba0dd170ac66976edc9902ffe76b682b9ef57f60caf24bc30c88e5fdad8c9b7017dd7182009c42a10f5bb1fba2fa7d
+EBUILD zfs-kmod-2.1.0_rc5.ebuild 4790 BLAKE2B f4a7c5121e623a0947b2984ffe6c0d042d8689b38738e7dda3afb148d0cab411c234b7da6d49091fedd93c30cc95ada5d6a24f20b8440d54931da2c23ce0d67f SHA512 21a389b30173d8a8e57ad7ad52309a5fa8e5057bc5f0e1cd9ff935bfd777c6d1e31cd6822d7d6fbe6b6e5668482f060f2a5083ff61ee1c7ac534c7d905ea72cb
+EBUILD zfs-kmod-9999.ebuild 4790 BLAKE2B f4a7c5121e623a0947b2984ffe6c0d042d8689b38738e7dda3afb148d0cab411c234b7da6d49091fedd93c30cc95ada5d6a24f20b8440d54931da2c23ce0d67f SHA512 21a389b30173d8a8e57ad7ad52309a5fa8e5057bc5f0e1cd9ff935bfd777c6d1e31cd6822d7d6fbe6b6e5668482f060f2a5083ff61ee1c7ac534c7d905ea72cb
MISC metadata.xml 548 BLAKE2B 0245ac0b73ed129ce2df41358814d46749fab0463a03fceb643010629cd522460e84c5b8c0247f499adf4ed2e781e0d6f6857a3c6be4f4fb206eeabba158e86c SHA512 2b98b289369d875c5ff89825590a98c9764a1b716df1b79c852dbb833f4f02d5c66782f43084a1acde11a0ba2cb9ef2956b35c10881f77ec92d6749566276e6b
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
index 6c07ba52c3ae..aa5c9b935f06 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
@@ -159,6 +159,7 @@ pkg_postinst() {
fi
if [[ -z ${ROOT} ]] && use dist-kernel; then
+ set_arch_to_portage
dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
fi
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.4.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.4.ebuild
index b4fc7559ba13..02c14548586c 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.0.4.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.4.ebuild
@@ -150,6 +150,7 @@ pkg_postinst() {
fi
if [[ -z ${ROOT} ]] && use dist-kernel; then
+ set_arch_to_portage
dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
fi
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.0_rc5.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.0_rc5.ebuild
index d09744c5227c..430fa43eaadb 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.0_rc5.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.0_rc5.ebuild
@@ -159,6 +159,7 @@ pkg_postinst() {
fi
if [[ -z ${ROOT} ]] && use dist-kernel; then
+ set_arch_to_portage
dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
fi
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index d09744c5227c..430fa43eaadb 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -159,6 +159,7 @@ pkg_postinst() {
fi
if [[ -z ${ROOT} ]] && use dist-kernel; then
+ set_arch_to_portage
dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
fi