gentoo auto-resync : 12:02:2023 - 09:56:54

9 files changed, 210 insertions, 20 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index d8eea9a32114..7e08cc53687a 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/bees/Manifest b/sys-fs/bees/Manifest
index fe525213377e..9c70639be63f 100644
--- a/sys-fs/bees/Manifest
+++ b/sys-fs/bees/Manifest
@@ -1,6 +1,6 @@
-DIST bees-0.7.tar.gz 164311 BLAKE2B b0b7f1bc24257e385b6201f473bf9377021d542a257b341c5c8ba5372fa604697e717bb65329d57abf2d2ac4311325e3242c481430629c911fcee3e42e1ea55e SHA512 beee7563ae0ea43247465941ef15f7bab2d86d5d164ccb280c378678b0bf61a67a4718881b94a5f3a72d4d0296eda92bfd7464dae0faeaa72b0e2a4ebef39a53
 DIST bees-0.8.tar.gz 166890 BLAKE2B 26c7563ed1433526371d45e5f2f9e4f2a749e18f0d97e7a2ee445ef9d4cdf49210c8a96f756c04d19337497d12eacde28430f9ad64df198ff44c901b1bfc36c2 SHA512 92208ee186de18e764fab42f3de4e518047a21f4ed2429040a706fe7a45e0b2d39d1e468beefc92553659fc4587f4894a33d5a26bfd59278923208db3acc7da0
-EBUILD bees-0.7.ebuild 4042 BLAKE2B 9f3e824533069623fd0dad5020527d0b39ca54d650f5b0cbcc0db4733e700d4388602af88d88c6f38798ff0d62cd224a69728ae166bbe46892c206be1743671b SHA512 1fcf12cb482333977fec6896b486e4434fc663ecb492ff26c4c9941c1cf049d8cd4741388640cc3d3245f61247898df30857ddb1a8c41279f170320f500ce054
-EBUILD bees-0.8.ebuild 4042 BLAKE2B 9f3e824533069623fd0dad5020527d0b39ca54d650f5b0cbcc0db4733e700d4388602af88d88c6f38798ff0d62cd224a69728ae166bbe46892c206be1743671b SHA512 1fcf12cb482333977fec6896b486e4434fc663ecb492ff26c4c9941c1cf049d8cd4741388640cc3d3245f61247898df30857ddb1a8c41279f170320f500ce054
-EBUILD bees-9999.ebuild 4042 BLAKE2B 9f3e824533069623fd0dad5020527d0b39ca54d650f5b0cbcc0db4733e700d4388602af88d88c6f38798ff0d62cd224a69728ae166bbe46892c206be1743671b SHA512 1fcf12cb482333977fec6896b486e4434fc663ecb492ff26c4c9941c1cf049d8cd4741388640cc3d3245f61247898df30857ddb1a8c41279f170320f500ce054
+DIST bees-0.9.tar.gz 176570 BLAKE2B f210afc342debb9fcdaba977ecccee9c07929197ccda942566634ef4d08c8bd11edb67ea50e05b046771faad212a9c3e01fc98c74dc759785afa588ba1d68b06 SHA512 dce90fc6f1741356331cc8c43536ea497c41a702be1b2bc2196f9ad0d5083d7255f15d529cf2804e4f36675ccc4a1d11d25ee266071a984199706ae2cd285c43
+EBUILD bees-0.8.ebuild 4040 BLAKE2B f4a1c0cfc7ad8d9256aeba8c001e6cd3f3d863d92548d8e9152595fb9a20764f3323f1e99835a3de2fbb16d2f8cc1225c75fee4d5e70050ebb6283410efb8341 SHA512 cad1a01cc87c132ca50b6167e2e40e971225d604b041aae30432033ac5dcbdf2ddce1200bae03dee2e5c2ba4050716773ecb190302d06992e62ca84e0bdba65b
+EBUILD bees-0.9.ebuild 3946 BLAKE2B e35281b82660f40e58e8ea9886862fdefc1286c18437525e5dedcd4e455cc76eac15343cfc8f4747e36ae159c60522b601fe7f9cebee06c1a8f94206a4d6614f SHA512 dae9e22f96297d4857b89633a2398ab66db30d859596c544817c9f62e89b7ad35c359e98f80a17afb2fae53cc060d06650efa4d638cf437d501f77149394830c
+EBUILD bees-9999.ebuild 3946 BLAKE2B e35281b82660f40e58e8ea9886862fdefc1286c18437525e5dedcd4e455cc76eac15343cfc8f4747e36ae159c60522b601fe7f9cebee06c1a8f94206a4d6614f SHA512 dae9e22f96297d4857b89633a2398ab66db30d859596c544817c9f62e89b7ad35c359e98f80a17afb2fae53cc060d06650efa4d638cf437d501f77149394830c
 MISC metadata.xml 622 BLAKE2B fc27438101691a12742484547df8b94fc3d22822cc3aefe81468e435a917373c25c5736506bfa2cf637bc265a3686c7f03d7431eaf54e5405f7ad2738390e872 SHA512 382ea31887a310f375bed14aa88d433831964b080faf3c7fb209a0d73b1d0d3da38a8e222ceda267b4ada4e81fa36cad94d4ddf180e7a2f39dfe3e9439b60321
diff --git a/sys-fs/bees/bees-0.8.ebuild b/sys-fs/bees/bees-0.8.ebuild
index 5ceba33ee963..8c6ac6117418 100644
--- a/sys-fs/bees/bees-0.8.ebuild
+++ b/sys-fs/bees/bees-0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -70,7 +70,7 @@ pkg_pretend() {
 			ewarn "With kernel version 5.4 or later, the kernel may hang when multiple threads"
 			ewarn "are running LOGICAL_INO and dedupe ioctl. This is not exclusively triggered"
 			ewarn "by bees but also other software running such operations, bees will just more"
-			ewarn "likely to trigger the bug. You can work around this issue by reducing the"
+			ewarn "likely trigger this bug. You can work around this issue by reducing the"
 			ewarn "thread count of bees to 1."
 			ewarn
 		fi
diff --git a/sys-fs/bees/bees-0.7.ebuild b/sys-fs/bees/bees-0.9.ebuild
index 5ceba33ee963..f84aba717799 100644
--- a/sys-fs/bees/bees-0.7.ebuild
+++ b/sys-fs/bees/bees-0.9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit linux-info systemd toolchain-funcs
 
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="tools"
+IUSE=""
 
 DEPEND="
 	>=sys-apps/util-linux-2.30.2
@@ -70,7 +70,7 @@ pkg_pretend() {
 			ewarn "With kernel version 5.4 or later, the kernel may hang when multiple threads"
 			ewarn "are running LOGICAL_INO and dedupe ioctl. This is not exclusively triggered"
 			ewarn "by bees but also other software running such operations, bees will just more"
-			ewarn "likely to trigger the bug. You can work around this issue by reducing the"
+			ewarn "likely trigger this bug. You can work around this issue by reducing the"
 			ewarn "thread count of bees to 1."
 			ewarn
 		fi
@@ -97,9 +97,6 @@ src_configure() {
 	if [[ ${PV} != "9999" ]] ; then
 		echo BEES_VERSION=v${PV} >>localconf || die
 	fi
-	if use tools; then
-		echo OPTIONAL_INSTALL_TARGETS=install_tools >>localconf || die
-	fi
 }
 
 src_compile() {
diff --git a/sys-fs/bees/bees-9999.ebuild b/sys-fs/bees/bees-9999.ebuild
index 5ceba33ee963..f84aba717799 100644
--- a/sys-fs/bees/bees-9999.ebuild
+++ b/sys-fs/bees/bees-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit linux-info systemd toolchain-funcs
 
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="tools"
+IUSE=""
 
 DEPEND="
 	>=sys-apps/util-linux-2.30.2
@@ -70,7 +70,7 @@ pkg_pretend() {
 			ewarn "With kernel version 5.4 or later, the kernel may hang when multiple threads"
 			ewarn "are running LOGICAL_INO and dedupe ioctl. This is not exclusively triggered"
 			ewarn "by bees but also other software running such operations, bees will just more"
-			ewarn "likely to trigger the bug. You can work around this issue by reducing the"
+			ewarn "likely trigger this bug. You can work around this issue by reducing the"
 			ewarn "thread count of bees to 1."
 			ewarn
 		fi
@@ -97,9 +97,6 @@ src_configure() {
 	if [[ ${PV} != "9999" ]] ; then
 		echo BEES_VERSION=v${PV} >>localconf || die
 	fi
-	if use tools; then
-		echo OPTIONAL_INSTALL_TARGETS=install_tools >>localconf || die
-	fi
 }
 
 src_compile() {
diff --git a/sys-fs/bindfs/Manifest b/sys-fs/bindfs/Manifest
index 38fe373c99a1..a563e7725199 100644
--- a/sys-fs/bindfs/Manifest
+++ b/sys-fs/bindfs/Manifest
@@ -3,9 +3,11 @@ DIST bindfs-1.15.0.tar.gz 415596 BLAKE2B e80bf7e233668ceddb6f57b7b939a68c918f3a6
 DIST bindfs-1.15.1.tar.gz 415676 BLAKE2B 1d18d7a51e60e5ef304cdd13e908ebf5ca3e684b640f6c21678be685c3ff15ed43a20edcecfd6ef13d631974b11c5c7145e4365bf52f7e9280a53772f1377b84 SHA512 da9003f141b7aa2c23651b3b836b1d979bf1b19915f307c05e40ae6906aab738036cc8b5df6caeec158e4fa6b7bca71489ea7884ff1607c6fea72a603a048d59
 DIST bindfs-1.16.1.tar.gz 421240 BLAKE2B 1c33891d7f8f6beed2d18a50e2742c5cf8474f9b27b2afdac593f8a923445d7e2af9027371655845846d4fc67a858f1863a207cb8a78335a179329501a52454f SHA512 6fc6121dc5a9db040f444b432aed4c720250e268087c68e5a0c9a652370a431c94c05fddfa8515ffb86a0f76582bb9a8fa4f9ef66608b82a3b8a5fbb00d2f3dc
 DIST bindfs-1.17.1.tar.gz 422341 BLAKE2B 7a4d83c88d2507fdaa9f7e602b73020be8eebb516742936e569d61894bb053a55a7b13bae8aa8301c0f8df486df2ccb5ea14d8bee7fff62ccfd72c88a1a6358e SHA512 9e7627d6fbb1348136e0716d5729cbc4951cd087efeff884d7ddc86429e3cd6e01b4f0a5b469ffa112421be1213dccc4723ab28f8db4b2f7d19525de705ffc77
+DIST bindfs-1.17.2.tar.gz 422406 BLAKE2B 11908e2c09e0d3b435af93f710441634b0babb98bf46c2c66673bc72d9c53fbf4c39587d0fd0479eb22daa186e1188c0248a4ebfdf3e730db76b474f7d19add1 SHA512 4de38df09df2bddb146a4390d2920c372228019a2a03abb1d4f213597888ff4f8487cbc8b758d8c7e8354272b39cc7435b4e81e4d437e875b5bf23a6b2ca767f
 EBUILD bindfs-1.14.9.ebuild 478 BLAKE2B 2be2fd62b6507cbaf1a5e57a0582f87278bb6f568f000ef805f159bc4e655104d2f18ac9b1f9d164155b7706d6779f13abdb63979fb3e9200be837dd8e715d12 SHA512 c006e5f23ffd417f5a8c77b417f20ca083ba2a4669189806217a73685a8b62ede8bab826bd6ae713af35dda4bce2eee800f5e12e4866d0f3b6cb1dc53e1434b3
 EBUILD bindfs-1.15.0.ebuild 494 BLAKE2B 1c12cfd2b776d5847e5d74517db43081e3bcd915c82e76dda412ff5d278c216543a9c7066470235b2b55ac12e4a6d1c70df8a3ffd2f0ce374dccab8f5f96f201 SHA512 e02feecc34a1b2f43f27f9124a35810609aa047c49642985dbedf693538dc9d778fdca5af9cb16c2fb8012323fea2899aa4df4e4931bc54f2880b2a97f2d04e6
 EBUILD bindfs-1.15.1.ebuild 494 BLAKE2B 1c12cfd2b776d5847e5d74517db43081e3bcd915c82e76dda412ff5d278c216543a9c7066470235b2b55ac12e4a6d1c70df8a3ffd2f0ce374dccab8f5f96f201 SHA512 e02feecc34a1b2f43f27f9124a35810609aa047c49642985dbedf693538dc9d778fdca5af9cb16c2fb8012323fea2899aa4df4e4931bc54f2880b2a97f2d04e6
 EBUILD bindfs-1.16.1.ebuild 494 BLAKE2B df54b3781a6b974360e373bf54771af91ce9c58b31466453788a8850026dd0e2829ee8f5e95c3c48b03c001aa59db43eabde056328916b8ab5d0fed4be3a7e9b SHA512 4ade233d80777d90a586004697567bb8598330ef734d32a4d01da9cc44d76ad416d0398b1d020bd716796755dcecec9ef8ecf3f4c826327aebc97a531c1c6696
 EBUILD bindfs-1.17.1.ebuild 494 BLAKE2B df54b3781a6b974360e373bf54771af91ce9c58b31466453788a8850026dd0e2829ee8f5e95c3c48b03c001aa59db43eabde056328916b8ab5d0fed4be3a7e9b SHA512 4ade233d80777d90a586004697567bb8598330ef734d32a4d01da9cc44d76ad416d0398b1d020bd716796755dcecec9ef8ecf3f4c826327aebc97a531c1c6696
+EBUILD bindfs-1.17.2.ebuild 494 BLAKE2B 1a3521cf7f5648c0c93ea1dd86dfe7658e6ea2c74e9e1f1b5ab410c6452a428ffdc86a35499c1c8d52cc2e56ddacca98b5855ad9f938f10328e9db81cb89f33d SHA512 0312573cce70d09051d1f288b9c2c9913d44bb61cffd8d71301491a5aba3929010b41bcc0a9608a94078b6d2e81a78b1ebf10db72fb5aeae768f89daf9d42bdd
 MISC metadata.xml 326 BLAKE2B 4618fbe2b0a0ec5941e217fe7e22752e275db8a7e8caa55ec8b6a4a7d69727e8a97d06670e3ffddd0a1497fcb8b1e788c2f4b0cb2456b7f7c1bccb4a7c055a33 SHA512 0c040a701da5588f06a94f487591e80000bfa351ba940ab42ea86ffbaa3f77548f4419f03bf104be3ac10fc457692c4100f39aae9142152d7f5f2303a840e591
diff --git a/sys-fs/bindfs/bindfs-1.17.2.ebuild b/sys-fs/bindfs/bindfs-1.17.2.ebuild
new file mode 100644
index 000000000000..2729a0dd8fb3
--- /dev/null
+++ b/sys-fs/bindfs/bindfs-1.17.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="FUSE filesystem for bind mounting with altered permissions"
+HOMEPAGE="https://bindfs.org/"
+SRC_URI="https://bindfs.org/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=sys-fs/fuse-3.10.2:3"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+RESTRICT="test"
+
+src_configure() {
+	econf $(use_enable debug debug-output) --with-fuse3
+}
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 39382c14e6f7..35bd3aa51e7a 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -3,7 +3,9 @@ AUX e2fsprogs-1.42.13-fix-build-cflags.patch 290 BLAKE2B b37f9fd204bd35631776d68
 AUX e2fsprogs-1.46.5-parallel-make.patch 1646 BLAKE2B f3e0158afa723e436a5b4004a6e331c4ad2405f9d4e25ab4a11baaa7ac88d120362d004a69067850ae1ebdc437eef586e381101f9e96736a4e707cf2d18fe6f6 SHA512 c5cb7d01293465621e90e0807b6dad32b2f0105686d91bb886935967eb184463036d34dfc716da1a92c75bfe99300d07a84a7770499b6f38ecee15fbc0f9905b
 DIST e2fsprogs-1.46.5.tar.xz 7040672 BLAKE2B 8d8c02e891c464782a7cff518c41d793fc73366b57e17d80ffc5afd96e6144e354290e667e9710509a9dde4e5dab7e7185c5bf084c5bfd26219f05e5e92e0830 SHA512 53282e1c524f62a95012b1aceef296d494f5238c82c9b08b29fbe6a803dbf7ccfdcd9124eb2f11fe2ff9de26387c78751a92c3217ca414f6db6242098a72d3fa
 DIST e2fsprogs-1.46.6.tar.xz 7051160 BLAKE2B 683274bf9468a3aaf41e542f22266482e75522b1fd2a255c6d852a28b08f027918d4f09239259d443a243c41eae49b3c27454f7d140da2c361c36a71ff77dcf6 SHA512 aca5ef77e36885ce9ce2995d9fae5d278c33e276e74f2a73977380f3e1cf1b3bd115fe6199e44a2f79a2827ba985b5554b8d898e88b7d04387fbba659a08e771
+DIST e2fsprogs-1.47.0.tar.xz 7059372 BLAKE2B 84f58b05a9f0e14e1a66c6e5171ff23b022f51c4e9a02d4d6d1d26c91909f3c7ec9c9f0462663a4457b4479043774502b8891f691e58a61f4ef6bf9ba33f33aa SHA512 0e6d64c565b455becb84166b6a5c7090724bac5cfe69098657a31bf0481b4e2cace3de1363121b7d84820fbae85b7c83ac5f2a2b02bb36280f0e3ae83a934cec
 EBUILD e2fsprogs-1.46.5-r3.ebuild 4401 BLAKE2B 925f540d8b21482abea0b9db6e4c9c0697df29a33b7cabe85159b8cd4354d7453be25b8056957e65ab9bda1f576cd786ff969843f4e23a3611f0101591507f08 SHA512 9f34a974b65c59722afac7328307b32e6bb8aea0cf605c4b0b8c1a78993e7e158211ed0f35d1cfa0b9f71937315243d935e6a930b12a5798e3876cd96023e0bf
 EBUILD e2fsprogs-1.46.5-r4.ebuild 4374 BLAKE2B 35907585133e794a949816ec76e61550fffe00a1164e21cfa38e18fb8d0d27001a57be79e141da8fa816778a583ed9f41b66d39e613d175b1e2e2ba8ba5cee28 SHA512 64563d5c92cae52ab0fd7860c000f779d9423866045166d8ed3262e9b71ea165aee64ef0fdd9119f702a178c3de4c1a83cf177e4898f5944e63a66c8ad169752
 EBUILD e2fsprogs-1.46.6.ebuild 4391 BLAKE2B a18bc8d4d3cc877f0569a79b9045594e5fb7ccc6d8b88f3f633bd40d3a5cc65ceeb232fac18e7b12ccf396398996f62a279418211aad3486c278d0dfd91a290d SHA512 0c138876d0cc574c411b2ed59f173c5a42aefa24b4fe9a6a12b6baffc39fdda7e9a422700a389436aa20b4f1b7157ce4454121fdf59d80085f688bea32d745c5
+EBUILD e2fsprogs-1.47.0.ebuild 4391 BLAKE2B a4ca9d2ca96889055606cd3e2385bde6f28a01efb9ab7ebecd873f69613ec892cb8dc70c8eb990715e43795c9575acb488f4b1b436f173227050553fe605954f SHA512 b8ae5524447114c2a340f665709ce904e99c45a75698e0eafedbea2cefa2cc99662c2c55c810167d7013ef28ac46bdda8b9846c1f3aeb97828629bd69c6b0e0b
 MISC metadata.xml 781 BLAKE2B 966522db6501509fbe12c1f896e6f59ffcb2a9dc0980b6086213383894df169dfdadce5cc6c37de5016bb5e96db6565f937183c5e78fad1bb6c15d6c964aec92 SHA512 5d2a09fb1027344f3ed7c24afa49af06a26c5c813f49e8b5614ce629360d1b0252ad93a360d9bd189fa3aa6027b7afceea8ce9fb0fe67f57546d54c348fed74f
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild
new file mode 100644
index 000000000000..89a6b0c65040
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib-minimal systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/"
+SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cron fuse nls static-libs test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!sys-libs/${PN}-libs
+	cron? ( sys-fs/lvm2[lvm] )
+	fuse? ( sys-fs/fuse:0 )
+	nls? ( virtual/libintl )
+	tools? ( sys-apps/util-linux )
+"
+# For testing lib/ext2fs, lib/support/libsupport.a is required, which
+# unconditionally includes '<blkid/blkid.h>' from sys-apps/util-linux.
+DEPEND="
+	${RDEPEND}
+	test? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
+"
+BDEPEND="
+	sys-apps/texinfo
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/ext2fs/ext2_types.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch # bug #516854
+
+	# Upstream patches (can usually removed with next version bump)
+)
+
+src_prepare() {
+	default
+
+	cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
+
+	# Get rid of doc -- we don't use them. This also prevents a sandbox
+	# violation due to mktexfmt invocation
+	rm -r doc || die "Failed to remove doc dir"
+
+	# Prevent included intl cruft from building, bug #81096
+	sed -i -r \
+		-e 's:@LIBINTL@:@LTLIBINTL@:' \
+		MCONFIG.in || die 'intl cruft'
+}
+
+multilib_src_configure() {
+	# Keep the package from doing silly things, bug #261411
+	export VARTEXFONTS="${T}/fonts"
+
+	# Needs open64() prototypes and friends
+	append-cppflags -D_GNU_SOURCE
+
+	local myeconfargs=(
+		--with-root-prefix="${EPREFIX}"
+		$(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
+		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+		--with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d"
+		--enable-symlink-install
+		--enable-elf-shlibs
+		$(tc-has-tls || echo --disable-tls)
+		$(multilib_native_use_enable fuse fuse2fs)
+		$(use_enable nls)
+		$(multilib_native_use_enable tools e2initrd-helper)
+		--disable-fsck
+		--disable-uuidd
+		--disable-lto
+		--disable-largefile # need to check effect on ABI
+		--with-pthread
+	)
+
+	# We use blkid/uuid from util-linux now
+	if use kernel_linux ; then
+		export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes
+		myeconfargs+=( --disable-lib{blkid,uuid} )
+	fi
+
+	ac_cv_path_LDCONFIG=: \
+		ECONF_SOURCE="${S}" \
+		CC="$(tc-getCC)" \
+		BUILD_CC="$(tc-getBUILD_CC)" \
+		BUILD_LD="$(tc-getBUILD_LD)" \
+		econf "${myeconfargs[@]}"
+
+	if grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
+		eerror "INTL sanity check failed, aborting build."
+		eerror "Please post your ${S}/config.log file as an"
+		eerror "attachment to https://bugs.gentoo.org/81096"
+		die "Preventing included intl cruft from building"
+	fi
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi && use tools ; then
+		emake V=1
+	else
+		emake -C lib/et V=1
+		emake -C lib/ss V=1
+		emake -C lib/ext2fs V=1
+		emake -C lib/e2p V=1
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi && use tools ; then
+		emake V=1 check
+	else
+		# Required by lib/ext2fs's check target
+		emake -C lib/support V=1
+
+		# For non-native, there's no binaries to test. Just libraries.
+		emake -C lib/et V=1 check
+		emake -C lib/ss V=1 check
+		emake -C lib/ext2fs V=1 check
+		emake -C lib/e2p V=1 check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use tools ; then
+		emake STRIP=':' V=1 DESTDIR="${D}" install
+	else
+		emake -C lib/et V=1 DESTDIR="${D}" install
+		emake -C lib/ss V=1 DESTDIR="${D}" install
+		emake -C lib/ext2fs V=1 DESTDIR="${D}" install
+		emake -C lib/e2p V=1 DESTDIR="${D}" install
+	fi
+
+	# Move shared libraries to /lib/, install static libraries to
+	# /usr/lib/, and install linker scripts to /usr/lib/.
+	gen_usr_ldscript -a com_err ss ext2fs e2p
+
+	# configure doesn't have an option to disable static libs
+	if ! use static-libs ; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use tools ; then
+		insinto /etc
+		doins "${FILESDIR}"/e2fsck.conf
+	fi
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}