[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2024-09-02 Thread Mike Gilbert
commit: fe128bcd6e3f2b834e804a13360ed297ad60f5ab
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Sep  2 17:51:42 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Sep  2 17:53:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe128bcd

sys-fs/e2fsprogs: work around broken Makefile

Bug: https://bugs.gentoo.org/936493
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
index 4853a3a74bf5..9f3aa8fd7864 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
@@ -113,6 +113,10 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
+   # Parallel make issue #936493
+   emake -C lib/et V=1 compile_et
+   emake -C lib/ext2fs V=1 ext2_err.h
+
if multilib_is_native_abi && use tools ; then
emake V=1
else



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2024-07-16 Thread Sam James
commit: 4e6fe6f0e809429e1b551e59948d64d7614feb5f
Author: Sam James  gentoo  org>
AuthorDate: Wed Jul 17 05:09:58 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul 17 05:09:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e6fe6f0

sys-fs/e2fsprogs: Stabilize 1.47.1 ppc, #936181

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
index 36ec347a0d15..4853a3a74bf5 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="archive cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2024-07-16 Thread Sam James
commit: c2ea29505baac83d694fb017bf04e3b7a4cccb7d
Author: Sam James  gentoo  org>
AuthorDate: Wed Jul 17 04:57:03 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul 17 04:57:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2ea2950

sys-fs/e2fsprogs: Stabilize 1.47.1 ppc64, #936181

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
index c401aa674b21..36ec347a0d15 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="archive cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2024-07-16 Thread Sam James
commit: 2b58bb42ec621db296fc424fced6ee8804168a4f
Author: Sam James  gentoo  org>
AuthorDate: Wed Jul 17 04:55:01 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul 17 04:55:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b58bb42

sys-fs/e2fsprogs: Stabilize 1.47.1 sparc, #936181

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
index 4ed757a09b84..c401aa674b21 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="archive cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2024-07-16 Thread Sam James
commit: e6bd243508badfde398ba6d5aa7fbfc773b1bbee
Author: Sam James  gentoo  org>
AuthorDate: Wed Jul 17 04:45:37 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul 17 04:45:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6bd2435

sys-fs/e2fsprogs: Stabilize 1.47.1 amd64, #936181

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
index 4e813be9b1d1..4ed757a09b84 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="archive cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2024-07-16 Thread Sam James
commit: 6166184ce334c0d431e715b199d29051a5414aca
Author: Sam James  gentoo  org>
AuthorDate: Wed Jul 17 04:43:45 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul 17 04:43:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6166184c

sys-fs/e2fsprogs: Stabilize 1.47.1 arm64, #936181

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
index 697d3c2685d4..4e813be9b1d1 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="archive cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2024-07-16 Thread Sam James
commit: c4c8fb1e1069306810e423dfd1b608e6daa97bb2
Author: Sam James  gentoo  org>
AuthorDate: Wed Jul 17 04:36:16 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul 17 04:36:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4c8fb1e

sys-fs/e2fsprogs: Stabilize 1.47.1 arm, #936181

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
index cf1144fcc76d..697d3c2685d4 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="archive cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2024-07-16 Thread Sam James
commit: 00357af670243990a4e62e7b2c1b5f9f3a810862
Author: Sam James  gentoo  org>
AuthorDate: Wed Jul 17 04:36:15 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul 17 04:36:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00357af6

sys-fs/e2fsprogs: Stabilize 1.47.1 x86, #936181

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
index 2ccc0b3b1d41..cf1144fcc76d 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="archive cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2024-06-09 Thread Sam James
commit: b7d60b0116edae43df34fb4ba3a1fbfdf1b3e91a
Author: Sam James  gentoo  org>
AuthorDate: Sun Jun  9 15:07:46 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun  9 15:20:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7d60b01

sys-fs/e2fsprogs: skip m_rootdir_acl test (fails on btrfs)

Bug: https://github.com/tytso/e2fsprogs/issues/158
Closes: https://bugs.gentoo.org/905221
Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild | 5 +
 1 file changed, 5 insertions(+)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
index 300fe7548c64..2ccc0b3b1d41 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
@@ -57,6 +57,11 @@ src_prepare() {
# violation due to mktexfmt invocation
rm -r doc || die "Failed to remove doc dir"
 
+   cat <<-'EOF' > tests/m_rootdir_acl/script || die
+   echo "$test_name: $test_description: skipped (bgo#905221, fails on 
btrfs)"
+   return 0
+   EOF
+
# Prevent included intl cruft from building, bug #81096
sed -i -r \
-e 's:@LIBINTL@:@LTLIBINTL@:' \



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2024-06-07 Thread Sam James
commit: 6788373d9c16f58622351c2ee91e9f4f3d07a7cb
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun  7 16:20:57 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun  7 16:26:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6788373d

sys-fs/e2fsprogs: add 1.47.1

Adds libarchive support, see 7e3a4f0a33e9859af2bf44e8e1e278c8b10313cc upstream.

Closes: https://bugs.gentoo.org/908892
Closes: https://bugs.gentoo.org/916029
Bug: https://bugs.gentoo.org/896340
Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/Manifest|   1 +
 sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild | 167 +++
 sys-fs/e2fsprogs/metadata.xml|   1 +
 3 files changed, 169 insertions(+)

diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 5e61ba790588..158350ccca80 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1 +1,2 @@
 DIST e2fsprogs-1.47.0.tar.xz 7059372 BLAKE2B 
84f58b05a9f0e14e1a66c6e5171ff23b022f51c4e9a02d4d6d1d26c91909f3c7ec9c9f0462663a4457b4479043774502b8891f691e58a61f4ef6bf9ba33f33aa
 SHA512 
0e6d64c565b455becb84166b6a5c7090724bac5cfe69098657a31bf0481b4e2cace3de1363121b7d84820fbae85b7c83ac5f2a2b02bb36280f0e3ae83a934cec
+DIST e2fsprogs-1.47.1.tar.xz 7271444 BLAKE2B 
67924c38a6b688e0db5ee77b0e11a8b34ec602a729d48516668e9fdf7f36964c8a9369295f0313bfacdc8e5f3f5a27d79a8d99a1aca3b4fe0ced98a4db4884ea
 SHA512 
2ac51f7654a44adf3ee5a5e32cecd7f129e423bdf3074c60b22a7acdba131e7dd0bb2964c107a06ae133f51836272be166f5da1f996f67ceb6c22e2636117beb

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
new file mode 100644
index ..300fe7548c64
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal systemd toolchain-funcs udev
+
+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="archive cron fuse nls static-libs test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   !sys-libs/${PN}-libs
+   archive? ( app-arch/libarchive:= )
+   cron? ( sys-fs/lvm2[lvm] )
+   fuse? ( sys-fs/fuse:3 )
+   nls? ( virtual/libintl )
+   tools? ( sys-apps/util-linux )
+"
+# For testing lib/ext2fs, lib/support/libsupport.a is required, which
+# unconditionally includes '' 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
+   # We can drop this metadata patch after 6 months or so to let 
initramfses
+   # upgrade. See bug #904093 and bug #904048.
+   
"${FILESDIR}"/${PN}-1.47.0-disable-metadata_csum_seed-and-orphan_file-by-default.patch
+
+   # 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"
+
+   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_with archive libarchive direct)
+   $(multilib_native_use_enable fuse fuse2fs)
+   $(use_enable nls)
+   $(multilib_native_use_enable tools e2initrd-helper)
+   --disable-fsck
+   --disable-uuidd
+   --disable-lto
+   --with-pthread
+   --enable-largefile
+   )
+
+   # We use blkid/uuid from util-linux now
+   if use kernel_linux ; then
+   export ac_cv_lib_

[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2024-03-02 Thread Sam James
commit: 1ab84a0a8243583f9274327663a13afb43498ba9
Author: Eli Schwartz  gmail  com>
AuthorDate: Sun Mar  3 01:40:47 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar  3 04:00:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ab84a0a

sys-fs/e2fsprogs: drop 1.47.0-r2

Old ebuild uses usr-ldscript

Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.47.0-r2.ebuild | 174 
 1 file changed, 174 deletions(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r2.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r2.ebuild
deleted file mode 100644
index e4e5eb9135cd..
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r2.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# 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 '' 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
-   # We can drop this metadata patch after 6 months or so to let 
initramfses
-   # upgrade. See bug #904093 and bug #904048.
-   
"${FILESDIR}"/${PN}-1.47.0-disable-metadata_csum_seed-and-orphan_file-by-default.patch
-
-   "${FILESDIR}"/e2fsprogs-1.47.0-parallel-make.patch
-
-   # 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"
-
-   # needed for >=musl-1.2.4, bug 908892
-   use elibc_musl && append-cflags -D_FILE_OFFSET_BITS=64
-
-   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
-   --with-pthread
-   --enable-largefile
-   )
-
-   # 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 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2024-03-02 Thread Arthur Zamarin
commit: 927528e565ff91efb3482a5a54b3aa6763229d2c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  2 12:14:49 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  2 12:14:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=927528e5

sys-fs/e2fsprogs: Stabilize 1.47.0-r3 ppc, #925633

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild
index d9d0efbeea43..a5afa22896ff 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2024-03-02 Thread Arthur Zamarin
commit: 1ec4b8191b36ab115f42e51b5380211f6eba17d1
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  2 12:14:57 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  2 12:14:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ec4b819

sys-fs/e2fsprogs: Stabilize 1.47.0-r3 hppa, #925633

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild
index dfd0ee5a7fa7..3bf3b866da64 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2024-03-02 Thread Arthur Zamarin
commit: dd7fea44a09aa557751da2a7a2e46aa169d3fe92
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  2 12:14:42 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  2 12:14:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd7fea44

sys-fs/e2fsprogs: Stabilize 1.47.0-r3 arm64, #925633

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild
index 3c3f36dc0343..d9d0efbeea43 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2024-03-02 Thread Arthur Zamarin
commit: 671cebafc0668750c079dc97f5296e6b0e9ac61a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  2 12:14:52 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  2 12:14:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=671cebaf

sys-fs/e2fsprogs: Stabilize 1.47.0-r3 ppc64, #925633

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild
index a5afa22896ff..dfd0ee5a7fa7 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2024-02-29 Thread Sam James
commit: 25ecc3c22ab86b33e13865a2d65998c313cf0685
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Thu Feb 29 15:15:52 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 29 22:13:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25ecc3c2

sys-fs/e2fsprogs: stable 1.47.0-r3 for sparc, bug #925633

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild
index a2829ebd1d3e..3c3f36dc0343 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2024-02-27 Thread Sam James
commit: 5bf86804f1ea1731d30aecf13e1cc258092a8601
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 27 23:57:23 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 27 23:57:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bf86804

sys-fs/e2fsprogs: Stabilize 1.47.0-r3 arm, #925633

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild
index 05fe40c2ed58..a2829ebd1d3e 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2024-02-27 Thread Sam James
commit: 715c8a0471fab819bf5c0bee7e63e1e7c02c911b
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 27 23:03:24 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 27 23:03:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=715c8a04

sys-fs/e2fsprogs: Stabilize 1.47.0-r3 amd64, #925633

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild
index 13c3aae85d1c..05fe40c2ed58 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2024-02-27 Thread Sam James
commit: c76d8ad8b55c83b23ddc0c310e5dfccfdd053b19
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 27 23:03:23 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 27 23:03:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c76d8ad8

sys-fs/e2fsprogs: Stabilize 1.47.0-r3 x86, #925633

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild
index 0e8b8f57eaef..13c3aae85d1c 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/files/

2024-02-17 Thread David Seifert
commit: 893106c41d87af86782d6c921d29f5127dfb6fb6
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sat Feb 17 14:35:25 2024 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 17 14:35:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=893106c4

sys-fs/e2fsprogs: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: David Seifert  gentoo.org>

 .../files/e2fsprogs-1.46.5-parallel-make.patch | 29 --
 1 file changed, 29 deletions(-)

diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.46.5-parallel-make.patch 
b/sys-fs/e2fsprogs/files/e2fsprogs-1.46.5-parallel-make.patch
deleted file mode 100644
index 335f6659457d..
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.46.5-parallel-make.patch
+++ /dev/null
@@ -1,29 +0,0 @@
 a/lib/ext2fs/Makefile.in
-+++ b/lib/ext2fs/Makefile.in
-@@ -729,6 +729,12 @@
-  $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \
-  $(srcdir)/hashmap.h $(srcdir)/bitops.h $(srcdir)/bmap64.h $(srcdir)/rbtree.h 
\
-  $(srcdir)/compiler.h
-+blknum.o: $(srcdir)/blknum.c $(top_builddir)/lib/config.h \
-+ $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \
-+ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \
-+ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
-+ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
-+ $(srcdir)/ext2_ext_attr.h $(srcdir)/hashmap.h $(srcdir)/bitops.h
- block.o: $(srcdir)/block.c $(top_builddir)/lib/config.h \
-  $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \
-  $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \
-@@ -837,6 +843,13 @@
-  $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \
-  $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fsP.h \
-  $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \
-+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \
-+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \
-+ $(srcdir)/hashmap.h $(srcdir)/bitops.h $(srcdir)/e2image.h
-+fallocate.o: $(srcdir)/fallocate.c $(top_builddir)/lib/config.h \
-+ $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \
-+ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fsP.h \
-+ $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \
-  $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \
-  $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \
-  $(srcdir)/hashmap.h $(srcdir)/bitops.h $(srcdir)/e2image.h



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2024-02-07 Thread Sam James
commit: b8f392cabe18502df35c89b4baacf0115bd3c9d0
Author: Eli Schwartz  gmail  com>
AuthorDate: Wed Feb  7 06:42:10 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb  7 19:20:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8f392ca

sys-fs/e2fsprogs: drop old

Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/Manifest   |   2 -
 sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild | 166 ---
 sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild| 169 
 3 files changed, 337 deletions(-)

diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 3f9989d0bf4d..5e61ba790588 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,3 +1 @@
-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

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
deleted file mode 100644
index 2dc05ea69a5a..
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript multilib-minimal
-
-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 '' from sys-apps/util-linux.
-DEPEND="
-   ${RDEPEND}
-   test? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )"
-BDEPEND="
-   virtual/pkgconfig
-   sys-apps/texinfo
-   nls? ( sys-devel/gettext )"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
-
-   # Upstream patches (can usually removed with next version bump)
-   "${FILESDIR}"/${P}-parallel-make.patch
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-   /usr/include/ext2fs/ext2_types.h
-)
-
-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 #81096
-   sed -i -r \
-   -e 's:@LIBINTL@:@LTLIBINTL@:' \
-   MCONFIG.in || die 'intl cruft'
-}
-
-multilib_src_configure() {
-   # Keep the package from doing silly things #261411
-   export VARTEXFONTS="${T}/fonts"
-
-   # needs open64() prototypes and friends
-   append-cppflags -D_GNU_SOURCE
-
-   local myeconfargs=(
-   --with-root-prefix="${EPREFIX}"
-   $(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
-   --with-systemd-unit-dir="$(systemd_get_systemunitdir)"
-   --with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d"
-   --enable-symlink-install
-   --enable-elf-shlibs
-   $(tc-has-tls || echo --disable-tls)
-   $(multilib_native_use_enable fuse fuse2fs)
-   $(use_enable nls)
-   $(multilib_native_use_enable tools e2initrd-helper)
-   --disable-fsck
-   --disable-uuidd
-   --disable-lto
-   --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
- 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2024-02-07 Thread Sam James
commit: 1b3f7de706d0c7d34a15d79bacdc8c6d9009e6cc
Author: Eli Schwartz  gmail  com>
AuthorDate: Wed Feb  7 06:41:30 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb  7 19:20:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b3f7de7

sys-fs/e2fsprogs: remove usr-ldscript support

Per news item 2024-01-05-usr-initramfs, we no longer support this use
case. It is fragile and hacky and leads to bizarre forms of load errors.

The functionality is, despite being called "split-usr", not really about
split-usr at all.

Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild | 170 
 1 file changed, 170 insertions(+)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild
new file mode 100644
index ..0e8b8f57eaef
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2024 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
+
+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 '' 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
+   # We can drop this metadata patch after 6 months or so to let 
initramfses
+   # upgrade. See bug #904093 and bug #904048.
+   
"${FILESDIR}"/${PN}-1.47.0-disable-metadata_csum_seed-and-orphan_file-by-default.patch
+
+   "${FILESDIR}"/e2fsprogs-1.47.0-parallel-make.patch
+
+   # 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"
+
+   # needed for >=musl-1.2.4, bug 908892
+   use elibc_musl && append-cflags -D_FILE_OFFSET_BITS=64
+
+   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
+   --with-pthread
+   --enable-largefile
+   )
+
+   # 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_co

[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2023-09-12 Thread Mike Gilbert
commit: 4af7650ee0d53f3c8a6ff2a797b822c718de1af0
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Sep 12 15:04:49 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Sep 12 15:04:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4af7650e

sys-fs/e2fsprogs: stabilize 1.47.0-r2 for ppc, ppc64

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.47.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r2.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r2.ebuild
index 10584f8bc295..e4e5eb9135cd 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r2.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r2.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2023-08-04 Thread Arthur Zamarin
commit: 0b87381a96fe5338b038818288a60876af66deb8
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Aug  4 11:45:19 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Aug  4 11:45:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b87381a

sys-fs/e2fsprogs: Stabilize 1.46.6 ppc, #903540

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild
index 0a6fecdf1adc..f51ab51059ed 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2023-06-26 Thread Mike Gilbert
commit: 999463a3a69fb9e6877c08dea7ffb05554c3de55
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Jun 26 18:17:29 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Jun 26 18:17:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=999463a3

sys-fs/e2fsprogs: enable largefile unconditionally

Bug: https://bugs.gentoo.org/908892
Signed-off-by: Mike Gilbert  gentoo.org>

 .../{e2fsprogs-1.47.0-r1.ebuild => e2fsprogs-1.47.0-r2.ebuild}| 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r2.ebuild
similarity index 97%
rename from sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild
rename to sys-fs/e2fsprogs/e2fsprogs-1.47.0-r2.ebuild
index ed3a2e8d4f31..10584f8bc295 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r2.ebuild
@@ -86,11 +86,9 @@ multilib_src_configure() {
--disable-uuidd
--disable-lto
--with-pthread
+   --enable-largefile
)
 
-   # need to check effect on ABI (???)
-   use elibc_glibc && myeconfargs+=( --disable-largefile )
-
# 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



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2023-06-25 Thread Andreas K. Hüttel
commit: cd8facfff575a005ef0177d2475948d0f08eaf81
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun Jun 25 22:50:48 2023 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sun Jun 25 22:52:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd8facff

sys-fs/e2fsprogs: Fix build with musl-1.2.4 (on mips o32)

* -D_GNU_SOURCE is not needed anymore (the line is from 2012)

* Append -D_FILE_OFFSET_BITS=64 to flags only on musl

* Keep --disable-largefile only on glibc ...

Bug: https://bugs.gentoo.org/908892
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild
index 580ff96d90bc..ed3a2e8d4f31 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild
@@ -68,8 +68,8 @@ 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
+   # needed for >=musl-1.2.4, bug 908892
+   use elibc_musl && append-cflags -D_FILE_OFFSET_BITS=64
 
local myeconfargs=(
--with-root-prefix="${EPREFIX}"
@@ -85,10 +85,12 @@ multilib_src_configure() {
--disable-fsck
--disable-uuidd
--disable-lto
-   --disable-largefile # need to check effect on ABI
--with-pthread
)
 
+   # need to check effect on ABI (???)
+   use elibc_glibc && myeconfargs+=( --disable-largefile )
+
# 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



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2023-05-30 Thread Sam James
commit: 224a5359b006b74a2e1fb948adb931e89e25e59d
Author: Sam James  gentoo  org>
AuthorDate: Wed May 31 02:29:48 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 31 02:30:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=224a5359

sys-fs/e2fsprogs: drop 1.46.5-r3, 1.47.0

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.5-r3.ebuild | 166 ---
 sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild| 169 
 sys-fs/e2fsprogs/metadata.xml   |   1 -
 3 files changed, 336 deletions(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r3.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r3.ebuild
deleted file mode 100644
index 09e9ee84888f..
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r3.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript multilib-minimal
-
-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 lto nls static-libs test +threads +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 '' from sys-apps/util-linux.
-DEPEND="
-   ${RDEPEND}
-   test? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )"
-BDEPEND="
-   virtual/pkgconfig
-   sys-apps/texinfo
-   nls? ( sys-devel/gettext )"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
-
-   # Upstream patches (can usually removed with next version bump)
-   "${FILESDIR}"/${P}-parallel-make.patch
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-   /usr/include/ext2fs/ext2_types.h
-)
-
-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 #81096
-   sed -i -r \
-   -e 's:@LIBINTL@:@LTLIBINTL@:' \
-   MCONFIG.in || die 'intl cruft'
-}
-
-multilib_src_configure() {
-   # Keep the package from doing silly things #261411
-   export VARTEXFONTS="${T}/fonts"
-
-   # needs open64() prototypes and friends
-   append-cppflags -D_GNU_SOURCE
-
-   local myeconfargs=(
-   --with-root-prefix="${EPREFIX}"
-   $(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
-   --with-systemd-unit-dir="$(systemd_get_systemunitdir)"
-   --with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d"
-   --enable-symlink-install
-   --enable-elf-shlibs
-   $(tc-has-tls || echo --disable-tls)
-   $(multilib_native_use_enable fuse fuse2fs)
-   $(use_enable nls)
-   $(multilib_native_use_enable tools e2initrd-helper)
-   --disable-fsck
-   --disable-uuidd
-   $(use_enable lto)
-   $(use_with threads 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/show_bug.cgi?id=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 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2023-04-29 Thread Arthur Zamarin
commit: 1ad3645f97bdb233277744335d9d7fd28794274d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr 29 08:19:16 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr 29 08:19:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ad3645f

sys-fs/e2fsprogs: Stabilize 1.46.5-r4 ppc64, #892998

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
index 1a6835db10ce..63ee799007e2 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2023-04-29 Thread Arthur Zamarin
commit: 36bf4fb57b37c7c8ab7c70b82679ebecb69bff53
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr 29 08:19:19 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr 29 08:19:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36bf4fb5

sys-fs/e2fsprogs: Stabilize 1.46.5-r4 ppc, #892998

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
index 63ee799007e2..2dc05ea69a5a 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/files/, sys-fs/e2fsprogs/

2023-04-25 Thread Mike Gilbert
commit: f731a69b12f77af15f8736426976642d961038d8
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Apr 25 19:57:51 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Apr 25 19:59:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f731a69b

sys-fs/e2fsprogs: fix parallel make issue

Closes: https://bugs.gentoo.org/904338
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild|  2 +
 .../files/e2fsprogs-1.47.0-parallel-make.patch | 68 ++
 2 files changed, 70 insertions(+)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild
index 786735ef4908..580ff96d90bc 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild
@@ -44,6 +44,8 @@ PATCHES=(
# upgrade. See bug #904093 and bug #904048.

"${FILESDIR}"/${PN}-1.47.0-disable-metadata_csum_seed-and-orphan_file-by-default.patch
 
+   "${FILESDIR}"/e2fsprogs-1.47.0-parallel-make.patch
+
# Upstream patches (can usually removed with next version bump)
 )
 

diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.47.0-parallel-make.patch 
b/sys-fs/e2fsprogs/files/e2fsprogs-1.47.0-parallel-make.patch
new file mode 100644
index ..3396aa467db6
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.47.0-parallel-make.patch
@@ -0,0 +1,68 @@
+From 711ed1823c7676533d5f6d5e4d1558a792d43837 Mon Sep 17 00:00:00 2001
+From: David Seifert 
+Date: Tue, 25 Apr 2023 21:53:19 +0200
+Subject: [PATCH] Add missing Makefile dependencies
+
+* With very high -j parallelism, we get failures in Gentoo:
+
+  In file included from lib/ext2fs/blknum.c:15:
+  lib/ext2fs/ext2fs.h:105:10: fatal error: ext2fs/ext2_err.h: No such file or 
directory
+105 | #include 
+|  ^~~
+  compilation terminated.
+  In file included from lib/ext2fs/fallocate.c:19:
+  lib/ext2fs/ext2fs.h:105:10: fatal error: ext2fs/ext2_err.h: No such file or 
directory
+105 | #include 
+|  ^~~
+
+Bug: https://bugs.gentoo.org/806875#c17
+Signed-off-by: David Seifert 
+---
+ lib/ext2fs/Makefile.in | 18 ++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in
+index 798ff609..2c4e0277 100644
+--- a/lib/ext2fs/Makefile.in
 b/lib/ext2fs/Makefile.in
+@@ -731,6 +731,12 @@ blkmap64_rb.o: $(srcdir)/blkmap64_rb.c 
$(top_builddir)/lib/config.h \
+  $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \
+  $(srcdir)/hashmap.h $(srcdir)/bitops.h $(srcdir)/bmap64.h $(srcdir)/rbtree.h 
\
+  $(srcdir)/compiler.h
++blknum.o: $(srcdir)/blknum.c $(top_builddir)/lib/config.h \
++ $(srcdir)/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
++ $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \
++ $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \
++ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \
++ $(srcdir)/hashmap.h $(srcdir)/bitops.h $(srcdir)/bmap64.h
+ block.o: $(srcdir)/block.c $(top_builddir)/lib/config.h \
+  $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \
+  $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \
+@@ -842,6 +848,12 @@ extent.o: $(srcdir)/extent.c $(top_builddir)/lib/config.h 
\
+  $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \
+  $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \
+  $(srcdir)/hashmap.h $(srcdir)/bitops.h $(srcdir)/e2image.h
++fallocate.o: $(srcdir)/fallocate.c $(top_builddir)/lib/config.h \
++ $(srcdir)/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
++ $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \
++ $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \
++ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \
++ $(srcdir)/hashmap.h $(srcdir)/bitops.h $(srcdir)/bmap64.h
+ fileio.o: $(srcdir)/fileio.c $(top_builddir)/lib/config.h \
+  $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \
+  $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \
+@@ -1049,6 +1061,12 @@ openfs.o: $(srcdir)/openfs.c 
$(top_builddir)/lib/config.h \
+  $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+  $(srcdir)/ext2_ext_attr.h $(srcdir)/hashmap.h $(srcdir)/bitops.h \
+  $(srcdir)/e2image.h
++orphan.o: $(srcdir)/orphan.c $(top_builddir)/lib/config.h \
++ $(srcdir)/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
++ $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \
++ $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \
++ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \
++ $(srcdir)/hashmap.h $(srcdir)/bitops.h $(srcdir)/bmap64.h
+ progress.o: $(srcdir)/progress.c $(top_builddir)/lib/config.h \
+  $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2fs.h \
+  $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2_fs.h \
+-- 
+2.40.0



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2023-04-10 Thread Sam James
commit: 559bf0980b4eb1758eb789e17ef86c8dc20609fb
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 10 08:47:46 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 10 08:47:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=559bf098

sys-fs/e2fsprogs: Stabilize 1.47.0-r1 arm, #903717

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild
index 3747ef46456a..786735ef4908 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2023-04-10 Thread Sam James
commit: 777d27d17e47096340971f37764c3080a5d8577c
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 10 08:47:44 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 10 08:47:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=777d27d1

sys-fs/e2fsprogs: Stabilize 1.47.0-r1 sparc, #903717

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild
index ddf176788218..44d6a66fceea 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2023-04-10 Thread Sam James
commit: b444f36434f82a939c53b613f3e92a36c20833a5
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 10 08:47:45 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 10 08:47:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b444f364

sys-fs/e2fsprogs: Stabilize 1.47.0-r1 arm64, #903717

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild
index 44d6a66fceea..3747ef46456a 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/, sys-fs/e2fsprogs/files/

2023-04-10 Thread Sam James
commit: 747be80bc0594b776e233912ce517b38d5726891
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 10 07:28:30 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 10 07:31:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=747be80b

sys-fs/e2fsprogs: disable metadata_csum_seed and orphan_file features for new 
fs by default

This keeps support for metadata_csum_seed and orphan_file but doesn't *enable*
it by default in new filesystems.

Unfortunately, support was added in the same e2fsprogs release which enabled
it by default. By changing the defaults as Debian has, we give people a chance
to upgrade their initramfses, live media, etc, so they can actually mount 
partitions
created by such a new e2fsprogs.

It feels wrong to have to do this but I don't see much other choice. At least 
we're
in good company.

Link: https://lwn.net/Articles/923969/
Bug: https://bugs.gentoo.org/904093
Bug: https://bugs.gentoo.org/904048
Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild| 172 +
 ...data_csum_seed-and-orphan_file-by-default.patch |  30 
 2 files changed, 202 insertions(+)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild
new file mode 100644
index ..ddf176788218
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild
@@ -0,0 +1,172 @@
+# 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 '' 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
+   # We can drop this metadata patch after 6 months or so to let 
initramfses
+   # upgrade. See bug #904093 and bug #904048.
+   
"${FILESDIR}"/${PN}-1.47.0-disable-metadata_csum_seed-and-orphan_file-by-default.patch
+
+   # 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 "${myeco

[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2023-04-09 Thread Viorel Munteanu
commit: 0e9768824f1d28e36a8b94983abb46e0c453845b
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Sun Apr  9 07:48:36 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Sun Apr  9 07:52:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e976882

sys-fs/e2fsprogs: Stabilize x86, #903717

Signed-off-by: Viorel Munteanu  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild
index 54e19e3f629f..07ab6fecf136 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2023-04-08 Thread Sam James
commit: e7bf8972fdb5e94e421647f1caf39364cded00a5
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr  8 21:14:27 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr  8 21:14:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7bf8972

sys-fs/e2fsprogs: Stabilize 1.47.0 amd64, #903717

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild
index 61e26f241880..54e19e3f629f 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2023-04-06 Thread Sam James
commit: ae85b5d1a49f9253b4fa3635e7ee29f4af612268
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Thu Apr  6 18:43:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr  7 01:48:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae85b5d1

sys-fs/e2fsprogs: stable 1.47.0 for hppa, bug #903717

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild
index 89a6b0c65040..61e26f241880 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2023-03-29 Thread Sam James
commit: 9d238cc6f7bc3c1ff50bafbc88d287cb41fda2ed
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 29 20:07:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 29 20:07:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d238cc6

sys-fs/e2fsprogs: Stabilize 1.46.6 x86, #903540

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild
index b6bb19980ea0..0a6fecdf1adc 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2023-03-29 Thread Arthur Zamarin
commit: 5553174285271805ec8b1e66170a4a5c2be89e20
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Mar 29 18:24:09 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Mar 29 18:24:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55531742

sys-fs/e2fsprogs: Stabilize 1.46.6 hppa, #903540

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild
index 828a264e510e..b6bb19980ea0 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2023-03-29 Thread Sam James
commit: 2a483b7a7d4fbd431d487b2ce2e3f2520989d8f8
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 29 14:36:24 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 29 14:36:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a483b7a

sys-fs/e2fsprogs: Stabilize 1.46.6 arm64, #903540

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild
index ec9918064327..4d89040190c3 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2023-03-29 Thread Sam James
commit: 26bcedec8c5b3d73c365f3fc0b1d8abd59fc1f2e
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 29 14:36:25 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 29 14:36:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26bcedec

sys-fs/e2fsprogs: Stabilize 1.46.6 amd64, #903540

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild
index 4d89040190c3..828a264e510e 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2023-03-29 Thread Sam James
commit: e78e7c5f1dd27bb2c8a3a0ef21ecde79bb89e09e
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 29 14:36:23 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 29 14:36:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e78e7c5f

sys-fs/e2fsprogs: Stabilize 1.46.6 sparc, #903540

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild
index d1d03c7afa2e..ec9918064327 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2023-03-29 Thread Sam James
commit: 552d9484db50ec37d6dd33489c10129b40430bea
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 29 14:36:21 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 29 14:36:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=552d9484

sys-fs/e2fsprogs: Stabilize 1.46.6 arm, #903540

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild
index 5022d082118b..d1d03c7afa2e 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2023-03-12 Thread Viorel Munteanu
commit: 54a16359d45b62cd43065419d3e8db87cf05811e
Author: Matoro Mahri  users  noreply  github  
com>
AuthorDate: Sun Mar 12 03:01:00 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Sun Mar 12 09:22:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54a16359

sys-fs/e2fsprogs: Stabilize 1.46.5-r4 sparc, #892998

Signed-off-by: Matoro Mahri  users.noreply.github.com>
Signed-off-by: Viorel Munteanu  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
index 60bf01d30421..1a6835db10ce 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2023-02-07 Thread Sam James
commit: ec82a694933ac15c812e2d0dff9ee58d1d8ee715
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  7 22:52:44 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  7 23:05:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec82a694

sys-fs/e2fsprogs: add 1.47.0

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/Manifest|   1 +
 sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild | 169 +++
 2 files changed, 170 insertions(+)

diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 42a7c7291641..3f9989d0bf4d 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,2 +1,3 @@
 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

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 ..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 '' 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_pat

[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2023-02-03 Thread Sam James
commit: 393b43eeddaa1cc82fcc231edba3995bc3b23349
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  3 10:56:56 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  3 10:56:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=393b43ee

sys-fs/e2fsprogs: Stabilize 1.46.5-r4 arm64, #892998

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
index f0e2dd3c015c..60bf01d30421 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2023-02-03 Thread Sam James
commit: 618641cd4f7fc238f67d6b3401833d21f1da5078
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  3 10:56:53 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  3 10:56:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=618641cd

sys-fs/e2fsprogs: Stabilize 1.46.5-r4 x86, #892998

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
index 7ec594a5bd85..8d4814cefd75 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2023-02-03 Thread Sam James
commit: 9c8878c2a3cc186128097323c25a4154d92c9c12
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  3 10:56:50 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  3 10:56:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c8878c2

sys-fs/e2fsprogs: Stabilize 1.46.5-r4 arm, #892998

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
index a2475153eb26..303cb1320eba 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.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
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2023-02-03 Thread Sam James
commit: 698d989f164d158ef96cfdcba99bfb41442d534a
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  3 10:56:55 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  3 10:56:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=698d989f

sys-fs/e2fsprogs: Stabilize 1.46.5-r4 amd64, #892998

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
index 8d4814cefd75..f0e2dd3c015c 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2023-02-03 Thread Sam James
commit: 567cbc2d4e83bfcec12c7cab7f5df5cc46e56aac
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  3 10:56:52 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  3 10:56:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=567cbc2d

sys-fs/e2fsprogs: Stabilize 1.46.5-r4 hppa, #892998

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
index 303cb1320eba..7ec594a5bd85 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
@@ -11,7 +11,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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2023-02-03 Thread Sam James
commit: d8b8ce2d649d88bde80926310ab8f3f53a1eebba
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  3 08:39:50 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  3 09:30:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8b8ce2d

sys-fs/e2fsprogs: add 1.46.6

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/Manifest|   1 +
 sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild | 169 +++
 2 files changed, 170 insertions(+)

diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 1affd4f6f476..42a7c7291641 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1 +1,2 @@
 DIST e2fsprogs-1.46.5.tar.xz 7040672 BLAKE2B 
8d8c02e891c464782a7cff518c41d793fc73366b57e17d80ffc5afd96e6144e354290e667e9710509a9dde4e5dab7e7185c5bf084c5bfd26219f05e5e92e0830
 SHA512 
53282e1c524f62a95012b1aceef296d494f5238c82c9b08b29fbe6a803dbf7ccfdcd9124eb2f11fe2ff9de26387c78751a92c3217ca414f6db6242098a72d3fa
+DIST e2fsprogs-1.46.6.tar.xz 7051160 BLAKE2B 
683274bf9468a3aaf41e542f22266482e75522b1fd2a255c6d852a28b08f027918d4f09239259d443a243c41eae49b3c27454f7d140da2c361c36a71ff77dcf6
 SHA512 
aca5ef77e36885ce9ce2995d9fae5d278c33e276e74f2a73977380f3e1cf1b3bd115fe6199e44a2f79a2827ba985b5554b8d898e88b7d04387fbba659a08e771

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild
new file mode 100644
index ..5022d082118b
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.6.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 '' from sys-apps/util-linux.
+DEPEND="
+   ${RDEPEND}
+   test? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
+"
+BDEPEND="
+   sys-apps/texinfo
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch # bug #516854
+
+   # Upstream patches (can usually removed with next version bump)
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+   /usr/include/ext2fs/ext2_types.h
+)
+
+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
+  

[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2022-12-29 Thread Sam James
commit: ae0e2d1acac972acdcbbc64789f1f6c6bd4588e9
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 29 22:25:26 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 29 22:26:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae0e2d1a

sys-fs/e2fsprogs: drop USE=lto

Originally reported on reddit at 
https://old.reddit.com/r/Gentoo/comments/zkl6l8/configure_error_lto_not_supported_by_compiler/.

As Ionen points out, this option just adds -flto (which users can
and do normally via *FLAGS or package.env) but, problematically,
forces unprefixed 'gcc-ar' etc. It does nothing else special. Fails
on GCC-less systems.

Users are free to enable LTO in the usual way.

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
index 01be94e1f77e..a2475153eb26 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="cron fuse lto nls static-libs test +tools"
+IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -77,7 +77,7 @@ multilib_src_configure() {
$(multilib_native_use_enable tools e2initrd-helper)
--disable-fsck
--disable-uuidd
-   $(use_enable lto)
+   --disable-lto
--with-pthread
)
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/, app-emulation/libvirt/, sys-cluster/ceph/, sys-fs/lvm2/

2022-10-28 Thread David Seifert
commit: f613f36003b14030478b90d57f908d63e2097a82
Author: David Seifert  gentoo  org>
AuthorDate: Fri Oct 28 17:49:52 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Oct 28 17:49:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f613f360

sys-fs/lvm2: switch to positive USE=lvm logic

Closes: https://github.com/gentoo/gentoo/pull/27994
Closes: https://bugs.gentoo.org/718910
Signed-off-by: David Seifert  gentoo.org>

 ...irt-7.7.0-r2.ebuild => libvirt-7.7.0-r3.ebuild} |   4 +-
 ...ibvirt-8.2.0.ebuild => libvirt-8.2.0-r1.ebuild} |   4 +-
 ...ibvirt-8.7.0.ebuild => libvirt-8.7.0-r1.ebuild} |   4 +-
 ...ibvirt-8.8.0.ebuild => libvirt-8.8.0-r1.ebuild} |   4 +-
 app-emulation/libvirt/libvirt-.ebuild  |   4 +-
 ...{ceph-15.2.17.ebuild => ceph-15.2.17-r1.ebuild} |   2 +-
 ...ph-16.2.10-r2.ebuild => ceph-16.2.10-r3.ebuild} |   2 +-
 ...ceph-16.2.9-r2.ebuild => ceph-16.2.9-r3.ebuild} |   2 +-
 ...ceph-17.2.3-r3.ebuild => ceph-17.2.3-r4.ebuild} |   2 +-
 .../{ceph-17.2.4.ebuild => ceph-17.2.4-r1.ebuild}  |   2 +-
 .../{ceph-17.2.5.ebuild => ceph-17.2.5-r1.ebuild}  |   2 +-
 ...1.46.5-r1.ebuild => e2fsprogs-1.46.5-r3.ebuild} |   2 +-
 ...1.46.5-r2.ebuild => e2fsprogs-1.46.5-r4.ebuild} |   2 +-
 ...m2-2.03.14-r3.ebuild => lvm2-2.03.14-r4.ebuild} |  33 ++---
 ...{lvm2-2.03.16.ebuild => lvm2-2.03.16-r1.ebuild} | 137 +++--
 sys-fs/lvm2/metadata.xml   |   2 +-
 16 files changed, 107 insertions(+), 101 deletions(-)

diff --git a/app-emulation/libvirt/libvirt-7.7.0-r2.ebuild 
b/app-emulation/libvirt/libvirt-7.7.0-r3.ebuild
similarity index 98%
rename from app-emulation/libvirt/libvirt-7.7.0-r2.ebuild
rename to app-emulation/libvirt/libvirt-7.7.0-r3.ebuild
index d796c4c01e60..4b3585f09ce9 100644
--- a/app-emulation/libvirt/libvirt-7.7.0-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-7.7.0-r3.ebuild
@@ -84,7 +84,7 @@ RDEPEND="
iscsi? ( sys-block/open-iscsi )
iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
libssh? ( net-libs/libssh )
-   lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
+   lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
nfs? ( net-fs/nfs-utils )
numa? (
@@ -93,7 +93,7 @@ RDEPEND="
)
parted? (
>=sys-block/parted-1.8[device-mapper]
-   sys-fs/lvm2[-device-mapper-only(-)]
+   sys-fs/lvm2[lvm]
)
pcap? ( >=net-libs/libpcap-1.0.0 )
policykit? (

diff --git a/app-emulation/libvirt/libvirt-8.2.0.ebuild 
b/app-emulation/libvirt/libvirt-8.2.0-r1.ebuild
similarity index 98%
rename from app-emulation/libvirt/libvirt-8.2.0.ebuild
rename to app-emulation/libvirt/libvirt-8.2.0-r1.ebuild
index 6011891826fc..f417caaa7247 100644
--- a/app-emulation/libvirt/libvirt-8.2.0.ebuild
+++ b/app-emulation/libvirt/libvirt-8.2.0-r1.ebuild
@@ -83,7 +83,7 @@ RDEPEND="
iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
libssh? ( >=net-libs/libssh-0.7:= )
libssh2? ( >=net-libs/libssh2-1.3 )
-   lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
+   lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
nfs? ( net-fs/nfs-utils )
numa? (
@@ -92,7 +92,7 @@ RDEPEND="
)
parted? (
>=sys-block/parted-1.8[device-mapper]
-   sys-fs/lvm2[-device-mapper-only(-)]
+   sys-fs/lvm2[lvm]
)
pcap? ( >=net-libs/libpcap-1.8.0 )
policykit? (

diff --git a/app-emulation/libvirt/libvirt-8.7.0.ebuild 
b/app-emulation/libvirt/libvirt-8.7.0-r1.ebuild
similarity index 98%
rename from app-emulation/libvirt/libvirt-8.7.0.ebuild
rename to app-emulation/libvirt/libvirt-8.7.0-r1.ebuild
index 972e3dbc1d25..947a2eab6796 100644
--- a/app-emulation/libvirt/libvirt-8.7.0.ebuild
+++ b/app-emulation/libvirt/libvirt-8.7.0-r1.ebuild
@@ -88,7 +88,7 @@ RDEPEND="
iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
libssh? ( >=net-libs/libssh-0.7:= )
libssh2? ( >=net-libs/libssh2-1.3 )
-   lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
+   lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
nfs? ( net-fs/nfs-utils )
numa? (
@@ -97,7 +97,7 @@ RDEPEND="
)
parted? (
>=sys-block/parted-1.8[device-mapper]
-   sys-fs/lvm2[-device-mapper-only(-)]
+   sys-fs/lvm2[lvm]
)
pcap? ( >=net-libs/libpcap-1.8.0 )
policykit? (

diff --git a/app-emulation/libvirt/libvirt-8.8.0.ebuild 
b/app-emulation/libvirt/libvirt-8.8.0-r1.ebuild
similarity index 98%
rename from app-emulation/libvirt/libvirt-8.8.0.ebuild
rename to app-emulation/libvirt/libvirt-8.8.0-r1.ebuild
index 92cd83c672f7..bc8725e909ff 100644
--- a/app-emulation/libvirt/libvirt-8.8.0.ebuild
+++ b/app-emulation/libvirt/libvirt-8.8.0-r1.ebu

[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2022-10-13 Thread Mike Gilbert
commit: fcaf46aae09cc50a7e2867b841db86f5812bd68a
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Oct 13 18:08:08 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Oct 13 18:09:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcaf46aa

sys-fs/e2fsprogs: call udev_reload

Closes: https://bugs.gentoo.org/843917
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.5-r1.ebuild | 8 
 sys-fs/e2fsprogs/e2fsprogs-1.46.5-r2.ebuild | 8 
 2 files changed, 16 insertions(+)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r1.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r1.ebuild
index 26512e0a9bf7..8da61d9a0ff1 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r1.ebuild
@@ -156,3 +156,11 @@ multilib_src_install_all() {
doins "${FILESDIR}"/e2fsck.conf
fi
 }
+
+pkg_postinst() {
+   udev_reload
+}
+
+pkg_postrm() {
+   udev_reload
+}

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r2.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r2.ebuild
index 45aa0a5d1f11..37e0cf5c7af1 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r2.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r2.ebuild
@@ -156,3 +156,11 @@ multilib_src_install_all() {
doins "${FILESDIR}"/e2fsck.conf
fi
 }
+
+pkg_postinst() {
+   udev_reload
+}
+
+pkg_postrm() {
+   udev_reload
+}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2022-10-12 Thread Sam James
commit: 7ade705084997040922064ac26bed4d79e29f80d
Author: Holger Hoffstätte  applied-asynchrony  com>
AuthorDate: Sun Sep 11 14:25:00 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 12 23:07:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ade7050

sys-fs/e2fsprogs: enable threads by default

Upstream enables pthreads by default, so enable it unconditionally.

Closes: https://bugs.gentoo.org/868501
Signed-off-by: Holger Hoffstätte  applied-asynchrony.com>
Closes: https://github.com/gentoo/gentoo/pull/27207
Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.5-r2.ebuild | 158 
 1 file changed, 158 insertions(+)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r2.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r2.ebuild
new file mode 100644
index ..45aa0a5d1f11
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r2.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript multilib-minimal
+
+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 lto nls static-libs test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   !sys-libs/${PN}-libs
+   cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
+   fuse? ( sys-fs/fuse:0 )
+   nls? ( virtual/libintl )
+   tools? ( sys-apps/util-linux )"
+# For testing lib/ext2fs, lib/support/libsupport.a is required, which
+# unconditionally includes '' from sys-apps/util-linux.
+DEPEND="
+   ${RDEPEND}
+   test? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )"
+BDEPEND="
+   virtual/pkgconfig
+   sys-apps/texinfo
+   nls? ( sys-devel/gettext )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
+
+   # Upstream patches (can usually removed with next version bump)
+   "${FILESDIR}"/${P}-parallel-make.patch
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+   /usr/include/ext2fs/ext2_types.h
+)
+
+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 #81096
+   sed -i -r \
+   -e 's:@LIBINTL@:@LTLIBINTL@:' \
+   MCONFIG.in || die 'intl cruft'
+}
+
+multilib_src_configure() {
+   # Keep the package from doing silly things #261411
+   export VARTEXFONTS="${T}/fonts"
+
+   # needs open64() prototypes and friends
+   append-cppflags -D_GNU_SOURCE
+
+   local myeconfargs=(
+   --with-root-prefix="${EPREFIX}"
+   $(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
+   --with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+   --with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d"
+   --enable-symlink-install
+   --enable-elf-shlibs
+   $(tc-has-tls || echo --disable-tls)
+   $(multilib_native_use_enable fuse fuse2fs)
+   $(use_enable nls)
+   $(multilib_native_use_enable tools e2initrd-helper)
+   --disable-fsck
+   --disable-uuidd
+   $(use_enable lto)
+   --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/show_bug.cgi?id=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

[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2022-07-28 Thread Sam James
commit: 9d342eb743914317778da3901da1e55c87296533
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 28 12:57:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 28 13:19:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d342eb7

sys-fs/e2fsprogs: fix metadata indentation

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/metadata.xml b/sys-fs/e2fsprogs/metadata.xml
index 902c90f4f054..a7ce0f49f403 100644
--- a/sys-fs/e2fsprogs/metadata.xml
+++ b/sys-fs/e2fsprogs/metadata.xml
@@ -6,7 +6,7 @@
Gentoo Base System


-   Install e2scrub_all cron script
+   Install e2scrub_all cron script
Build fuse2fs, a FUSE file system client for 
ext2/ext3/ext4 file systems
Build with link time optimization (LTO)
Build extfs tools (mke2fs, e2fsck, tune2fs, 
etc.)



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2022-04-19 Thread Sam James
commit: f20674a2ffa68abbe6123c78356cc3dffd907171
Author: David Seifert  gentoo  org>
AuthorDate: Tue Apr 19 07:21:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 19 13:11:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f20674a2

sys-fs/e2fsprogs: install all libraries unconditionally

Closes: https://bugs.gentoo.org/837668
Signed-off-by: David Seifert  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/25096
Signed-off-by: Sam James  gentoo.org>

 ...gs-1.46.5.ebuild => e2fsprogs-1.46.5-r1.ebuild} | 68 ++
 1 file changed, 32 insertions(+), 36 deletions(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r1.ebuild
similarity index 75%
rename from sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
rename to sys-fs/e2fsprogs/e2fsprogs-1.46.5-r1.ebuild
index 275b94d17ffd..2949d25768a2 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r1.ebuild
@@ -12,16 +12,22 @@ 
SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux"
-IUSE="cron fuse lto nls static-libs +threads +tools"
+IUSE="cron fuse lto nls static-libs test +threads +tools"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
!sys-libs/${PN}-libs
cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
fuse? ( sys-fs/fuse:0 )
nls? ( virtual/libintl )
-   tools? ( >=sys-apps/util-linux-2.16 )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
+   tools? ( sys-apps/util-linux )"
+# For testing lib/ext2fs, lib/support/libsupport.a is required, which
+# unconditionally includes '' from sys-apps/util-linux.
+DEPEND="
+   ${RDEPEND}
+   test? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )"
+BDEPEND="
+   virtual/pkgconfig
sys-apps/texinfo
nls? ( sys-devel/gettext )"
 
@@ -32,13 +38,9 @@ PATCHES=(
"${FILESDIR}"/${P}-parallel-make.patch
 )
 
-pkg_setup() {
-   if use tools ; then
-   MULTILIB_WRAPPED_HEADERS=(
-   /usr/include/ext2fs/ext2_types.h
-   )
-   fi
-}
+MULTILIB_WRAPPED_HEADERS=(
+   /usr/include/ext2fs/ext2_types.h
+)
 
 src_prepare() {
default
@@ -101,50 +103,44 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
-   if ! multilib_is_native_abi || ! use tools ; then
+   if multilib_is_native_abi && use tools ; then
+   emake V=1
+   else
emake -C lib/et V=1
emake -C lib/ss V=1
-   if use tools ; then
-   emake -C lib/ext2fs V=1
-   emake -C lib/e2p V=1
-   fi
-   return 0
+   emake -C lib/ext2fs V=1
+   emake -C lib/e2p V=1
fi
-
-   emake V=1
 }
 
 multilib_src_test() {
-   if multilib_is_native_abi ; then
+   if multilib_is_native_abi && use tools ; then
emake V=1 check
else
+   # required by lib/ext2fs's check target
+   emake -C lib/support V=1
+
# For non-native, there's no binaries to test. Just libraries.
emake -C lib/et V=1 check
emake -C lib/ss V=1 check
+   emake -C lib/ext2fs V=1 check
+   emake -C lib/e2p V=1 check
fi
 }
 
 multilib_src_install() {
-   if ! multilib_is_native_abi || ! use tools ; then
+   if multilib_is_native_abi && use tools ; then
+   emake STRIP=':' V=1 DESTDIR="${D}" install
+   else
emake -C lib/et V=1 DESTDIR="${D}" install
emake -C lib/ss V=1 DESTDIR="${D}" install
-
-   if use tools ; then
-   emake -C lib/ext2fs V=1 DESTDIR="${D}" install
-   emake -C lib/e2p V=1 DESTDIR="${D}" install
-   fi
-   else
-   emake \
-   STRIP=: \
-   DESTDIR="${D}" \
-   install
-
-   # Move shared libraries to /lib/, install static libraries to
-   # /usr/lib/, and install linker scripts to /usr/lib/.
-   gen_usr_ldscript -a e2p ext2fs
+   emake -C lib/ext2fs V=1 DESTDIR="${D}" install
+   emake -C lib/e2p V=1 DESTDIR="${D}" install
fi
 
-   gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid')
+   # Move shared libraries to /lib/, install static libraries to
+   # /usr/lib/, and install linker scripts to /usr/lib/.
+   gen_usr_ldscript -a com_err ss ext2fs e2p
 
# configure doesn't have an option to disable static libs :/
if ! use static-libs ; then



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/, sys-fs/e2fsprogs/files/

2022-04-17 Thread David Seifert
commit: 5130a03c3d0878aa67c1f4dea698b59d5237e164
Author: David Seifert  gentoo  org>
AuthorDate: Sun Apr 17 15:09:31 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Apr 17 15:09:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5130a03c

sys-fs/e2fsprogs: remove useless FreeBSD patch

* Gentoo/FreeBSD is no longer supported.

Closes: https://github.com/gentoo/gentoo/pull/25065
Signed-off-by: David Seifert  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild |  1 -
 sys-fs/e2fsprogs/files/e2fsprogs-1.40-fbsd.patch | 11 ---
 2 files changed, 12 deletions(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
index a725a1f4a9ef..275b94d17ffd 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
@@ -26,7 +26,6 @@ BDEPEND="virtual/pkgconfig
nls? ( sys-devel/gettext )"
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-1.40-fbsd.patch
"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
 
# Upstream patches (can usually removed with next version bump)

diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.40-fbsd.patch 
b/sys-fs/e2fsprogs/files/e2fsprogs-1.40-fbsd.patch
deleted file mode 100644
index 7d0919600d05..
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.40-fbsd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/lib/ext2fs/ext2_fs.h
-+++ b/lib/ext2fs/ext2_fs.h
-@@ -414,7 +414,7 @@
- 
- #define i_size_high   i_dir_acl
- 
--#if defined(__KERNEL__) || defined(__linux__)
-+#if defined(__KERNEL__) || defined(__linux__) || defined(__FreeBSD__)
- #define i_reserved1   osd1.linux1.l_i_reserved1
- #define i_fragosd2.linux2.l_i_frag
- #define i_fsize   osd2.linux2.l_i_fsize



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2022-04-17 Thread David Seifert
commit: 7e0564c29e3f9f368724da219e747831e5ff6910
Author: David Seifert  gentoo  org>
AuthorDate: Sun Apr 17 15:09:30 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Apr 17 15:09:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e0564c2

sys-fs/e2fsprogs: drop 1.46.4

Signed-off-by: David Seifert  gentoo.org>

 sys-fs/e2fsprogs/Manifest|   1 -
 sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild | 120 ---
 2 files changed, 121 deletions(-)

diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 4a224a4c3d7e..1affd4f6f476 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,2 +1 @@
-DIST e2fsprogs-1.46.4.tar.xz 7035200 BLAKE2B 
473f7fd3f521b94cdaa68e37784a518fc1919387dd114f31b5338f1b4c472f86b150229ec3dcae8b73eac95330c0dea729befc8cea08bcf1e455c0b6652d6d2b
 SHA512 
7d9cfdf00ed58e66049585e8382fe4977088956421a0fb8155900c69afd8857309ad2b9301b3f74c9c0afa7287a0ddba2fd1538fcf57858b37a9ab712390016d
 DIST e2fsprogs-1.46.5.tar.xz 7040672 BLAKE2B 
8d8c02e891c464782a7cff518c41d793fc73366b57e17d80ffc5afd96e6144e354290e667e9710509a9dde4e5dab7e7185c5bf084c5bfd26219f05e5e92e0830
 SHA512 
53282e1c524f62a95012b1aceef296d494f5238c82c9b08b29fbe6a803dbf7ccfdcd9124eb2f11fe2ff9de26387c78751a92c3217ca414f6db6242098a72d3fa

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
deleted file mode 100644
index 225c1d41eb95..
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/";
-SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz";
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux"
-IUSE="cron fuse lto nls static-libs +threads"
-
-RDEPEND="~sys-libs/${PN}-libs-${PV}
-   >=sys-apps/util-linux-2.16
-   cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
-   fuse? ( sys-fs/fuse:0 )
-   nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   nls? ( sys-devel/gettext )
-   virtual/pkgconfig
-   sys-apps/texinfo
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.40-fbsd.patch
-   "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
-
-   # Upstream patches (can usually removed with next version bump)
-)
-
-src_prepare() {
-   default
-
-   cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release 
Notes"
-
-   # Get rid of doc -- we don't use them. This also prevents a sandbox
-   # violation due to mktexfmt invocation
-   rm -r doc || die "Failed to remove doc dir"
-
-   # blargh ... trick e2fsprogs into using e2fsprogs-libs
-   sed -i -r \
-   -e 's:@LIBINTL@:@LTLIBINTL@:' \
-   -e 
'/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:'
 \
-   -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
-   MCONFIG.in || die "muck libs" #122368
-   sed -i -r \
-   -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
-   Makefile.in || die "remove subdirs"
-   ln -s $(which mk_cmds) lib/ss/ || die
-
-   # Avoid rebuild
-   echo '#include_next ' > lib/ss/ss_err.h
-}
-
-src_configure() {
-   # Keep the package from doing silly things #261411
-   export VARTEXFONTS="${T}/fonts"
-
-   # needs open64() prototypes and friends
-   append-cppflags -D_GNU_SOURCE
-
-   local myeconfargs=(
-   --with-root-prefix="${EPREFIX}"
-   $(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
-   --with-systemd-unit-dir="$(systemd_get_systemunitdir)"
-   --with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d"
-   --enable-symlink-install
-   --enable-elf-shlibs
-   $(tc-has-tls || echo --disable-tls)
-   $(use_enable fuse fuse2fs)
-   $(use_enable nls)
-   --disable-libblkid
-   --disable-libuuid
-   --disable-fsck
-   --disable-uuidd
-   $(use_enable lto)
-   $(use_with threads pthread)
-   )
-   ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}"
-
-   if grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
-   eerror "INTL sanity check failed, aborting build."
-   eerror "Please post your ${S}/config.log file as an"
-   eerror "attachment to 
https://bugs.gentoo.org/show_bug.cgi?id=81096";
-   die "Preventing included intl cruft from building"
-   fi
-}
-
-src_compile() {
-   emake V=1 COMPILE_ET=compile_et

[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2022-04-16 Thread Sam James
commit: 8c93d52b6764ef36401c46a875fbfc857a89dc8e
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr 16 19:13:59 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 16 19:13:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c93d52b

sys-fs/e2fsprogs: Stabilize 1.46.5 hppa, #837335

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
index 1ba2b391588e..a725a1f4a9ef 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
@@ -11,7 +11,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 +tools"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2022-04-14 Thread Agostino Sarubbo
commit: f94d9163d12b348747ccb94d973a4c98372c4d7e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Apr 14 08:10:12 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Apr 14 08:10:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f94d9163

sys-fs/e2fsprogs: ppc64 stable wrt bug #837335

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
index b792d8bf1c95..1ba2b391588e 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
@@ -11,7 +11,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 +tools"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2022-04-14 Thread Agostino Sarubbo
commit: b9bfb035f2b10ca5318261e2a11ea259d97477ce
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Apr 14 08:08:56 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Apr 14 08:08:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9bfb035

sys-fs/e2fsprogs: ppc stable wrt bug #837335

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
index 5fe72ddfc805..b792d8bf1c95 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
@@ -11,7 +11,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 +tools"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2022-04-10 Thread Jakov Smolić
commit: e842258329846dde1d7ea66de7848eeebc021c55
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Apr 11 06:34:35 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Apr 11 06:34:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8422583

sys-fs/e2fsprogs: Stabilize 1.46.5 x86, #837335

Signed-off-by: Jakov Smolić  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
index 11560204ef56..5fe72ddfc805 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
@@ -11,7 +11,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 +tools"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2022-04-10 Thread Arthur Zamarin
commit: 8297b2b9e91cf00bef8cdd750f5f6c44c953b2d7
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Apr 10 17:37:56 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Apr 10 17:37:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8297b2b9

sys-fs/e2fsprogs: Stabilize 1.46.5 sparc, #837335

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
index 6ad4460682b9..8fb770bb503b 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
@@ -11,7 +11,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 +tools"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2022-04-10 Thread Arthur Zamarin
commit: 5261b479a45b9f683bfee9af80559657dfa136e1
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Apr 10 17:37:58 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Apr 10 17:37:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5261b479

sys-fs/e2fsprogs: Stabilize 1.46.5 arm, #837335

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
index b40d3b4346a3..11560204ef56 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
@@ -11,7 +11,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 +tools"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2022-04-10 Thread Arthur Zamarin
commit: 9ec5f7b14843de2eb50c289c27e3206746c83629
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Apr 10 17:37:57 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Apr 10 17:37:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ec5f7b1

sys-fs/e2fsprogs: Stabilize 1.46.5 arm64, #837335

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
index 8fb770bb503b..b40d3b4346a3 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
@@ -11,7 +11,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 +tools"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2022-04-10 Thread Agostino Sarubbo
commit: 90917d97d05a2f0eaeeda0a8fefe97428f373db6
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Apr 10 09:03:02 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Apr 10 09:03:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90917d97

sys-fs/e2fsprogs: amd64 stable wrt bug #837335

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
index cf2b79c99bc2..6ad4460682b9 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
@@ -11,7 +11,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 +tools"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/, sys-fs/e2fsprogs/files/

2022-04-06 Thread David Seifert
commit: 6904371a540ac1e75b52b80dd83e4b486bcf609c
Author: David Seifert  gentoo  org>
AuthorDate: Wed Apr  6 21:04:58 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Apr  6 21:04:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6904371a

sys-fs/e2fsprogs: fix parallel make bug

Bug: https://bugs.gentoo.org/806875
Signed-off-by: David Seifert  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild   |  1 +
 .../files/e2fsprogs-1.46.5-parallel-make.patch | 29 ++
 2 files changed, 30 insertions(+)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
index 3e84085d14a9..cf2b79c99bc2 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
@@ -30,6 +30,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
 
# Upstream patches (can usually removed with next version bump)
+   "${FILESDIR}"/${P}-parallel-make.patch
 )
 
 pkg_setup() {

diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.46.5-parallel-make.patch 
b/sys-fs/e2fsprogs/files/e2fsprogs-1.46.5-parallel-make.patch
new file mode 100644
index ..335f6659457d
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.46.5-parallel-make.patch
@@ -0,0 +1,29 @@
+--- a/lib/ext2fs/Makefile.in
 b/lib/ext2fs/Makefile.in
+@@ -729,6 +729,12 @@
+  $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \
+  $(srcdir)/hashmap.h $(srcdir)/bitops.h $(srcdir)/bmap64.h $(srcdir)/rbtree.h 
\
+  $(srcdir)/compiler.h
++blknum.o: $(srcdir)/blknum.c $(top_builddir)/lib/config.h \
++ $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \
++ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \
++ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
++ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
++ $(srcdir)/ext2_ext_attr.h $(srcdir)/hashmap.h $(srcdir)/bitops.h
+ block.o: $(srcdir)/block.c $(top_builddir)/lib/config.h \
+  $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \
+  $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \
+@@ -837,6 +843,13 @@
+  $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \
+  $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fsP.h \
+  $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \
++ $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \
++ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \
++ $(srcdir)/hashmap.h $(srcdir)/bitops.h $(srcdir)/e2image.h
++fallocate.o: $(srcdir)/fallocate.c $(top_builddir)/lib/config.h \
++ $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \
++ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fsP.h \
++ $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \
+  $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \
+  $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \
+  $(srcdir)/hashmap.h $(srcdir)/bitops.h $(srcdir)/e2image.h



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/files/

2022-01-03 Thread David Seifert
commit: 621421fbf693bd16dbcdd414d158f693118a56b1
Author: David Seifert  gentoo  org>
AuthorDate: Mon Jan  3 12:40:02 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Jan  3 12:40:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=621421fb

sys-fs/e2fsprogs: remove unused files

Signed-off-by: David Seifert  gentoo.org>

 sys-fs/e2fsprogs/files/fsck_ext2fs.8 |  96 ---
 sys-fs/e2fsprogs/files/fsck_ext2fs.c | 147 ---
 2 files changed, 243 deletions(-)

diff --git a/sys-fs/e2fsprogs/files/fsck_ext2fs.8 
b/sys-fs/e2fsprogs/files/fsck_ext2fs.8
deleted file mode 100644
index aa31cf1db172..
--- a/sys-fs/e2fsprogs/files/fsck_ext2fs.8
+++ /dev/null
@@ -1,96 +0,0 @@
-.TH fsck_ext2fs 8 2006-07-02 "Matthias Andree" "FreeBSD Ports"
-.\"
-.\" fsck_ext2fs.8 - manual page for fsck_ext2fs wrapper
-.\"
-.\" (C) Copyright 2006 by Matthias Andree 
-.\"
-.\" License: This file may be redistributed in accordance with the terms
-.\" of the GNU General Public License v2.
-.\"
-.\" Upstream $Id: fsck_ext2fs.8,v 1.3 2006/07/02 11:45:21 emma Exp $
-.\" $FreeBSD: ports/sysutils/e2fsprogs/files/fsck_ext2fs.8,v 1.1 2006/07/04 
15:47:51 leeym Exp $
-.\"
-.SH NAME
-.B fsck_ext2fs
-\- compatibility wrapper for e2fsck
-.SH SYNOPSIS
-.P
-.B fsck_ext2fs
-[\fB\-Fpfnyv\fR] [\fB\-b\fR \fIblock\fR]
-.SH DESCRIPTION
-.P
-\fBfsck_ext2fs\fR maps the traditional FreeBSD \fBfsck_ffs\fR options to
-options with the same functionality for \fBe2fsck,\fR runs \fBe2fsck\fR
-and then maps its exit status to values that FreeBSD understands.
-\fBe2fsck\fR is a utility to check and repair ext2 and ext3 file
-systems.
-
-.SH OPTIONS
-.IP \fB\-F\fR
-(check foreground mode required) Immediately exits with status 1 to tell
-\fBfsck\fR that ext2fs cannot be checked in the background. \fBfsck\fR
-usually runs \fBfsck_*\fR programs twice, first with \fB\-F\fR to find
-out if they can do background checking, then either immediately without
-\fB\-F\fR for foreground checking or deferred in the background with
-\fB\-B\fR.
-.IP \fB\-p\fR
-(preen mode) This option suppresses adding the \fB\-f\fR option (unless
-\fB\-f\fR is also given) and adds the \fB\-p\fR option to the
-\fBe2fsck\fR command line. This causes \fBe2fsck\fR to automatically fix
-any filesystem problems that can safely be fixed without operator
-intervention. Without this option given, \fBe2fsck\fR will be run with
-the \fB\-f\fR option to force a check, since interactive scan and repair
-mode is the default on FreeBSD, but not on Linux where \fBe2fsck\fR
-comes from.
-.IP \fB\-f\fR
-(force check) This option forces the check of a clean file system while
-preening and is passed to \fBe2fsck\fR verbatim.
-.IP \fB\-n\fR
-("no" mode) This option causes the file system to be opened in read-only
-mode and assume "no" as answer to all questions. This is the only way to
-safely run \fBfsck\fR on a mounted ext2 or ext3 file system. This option
-is passed to \fBe2fsck\fR verbatim.
-.IP \fB\-y\fR
-("yes" mode) This option is passed verbatim to \fBe2fsck\fR and causes
-it to assume "yes" as answer to all questions. This allows the
-non-interactive use of e2fsck but is rather aggressive. Use with care.
-.IP \fB\-v\fR
-(verbose output) This option is passed verbatim to \fBe2fsck\fR and
-causes it to verbosely report its progress.
-.IP "\fB\-b\fR \fIblock\fR"
-(use alternate super block) This option is passed verbatim to
-\fBe2fsck\fR and selects an alternate super block, for use when the
-primary super block has been damaged. Please see the \fBe2fsck\fR(8)
-manual page for details.
-
-.SH EXIT STATUS
-If errors remain after \fBe2fsck\fR, an invalid option or too many
-options have been specified, \fBe2fsck\fR was killed with a signal or
-the \fIfork\fB system call failed, \fBfsck_ext2fs\fR exits with status
-EXIT_FAILURE (usually 1). If \fBe2fsck\fR cannot be started, exits with
-status 127. If the file system is clean after \fBe2fsck\fR operation,
-exits with status EXIT_SUCCESS (0).
-
-.SH NOTES
-.P
-This utility is merely meant as an adaptor so that \fBe2fsck\fR can be
-run during the boot process, it does not support all options that
-\fBe2fsck\fR offers. If you need one of its advanced options, please run
-\fBe2fsck\fR directly.
-
-.SH FILES
-.TP
-.I /sbin/e2fsck
-is the location of the \fBe2fsck\fR program to run.
-
-.SH AUTHOR
-.P
-Matthias Andree  wrote the program and this
-manual page.
-.SH CONFORMING TO
-The FreeBSD 6.1 command line interface for \fBfsck_ufs\fR(8).
-.SH SEE ALSO
-.BR fsck (8),
-.BR e2fsck (8)
-and
-.BR fsck_ufs (8).

diff --git a/sys-fs/e2fsprogs/files/fsck_ext2fs.c 
b/sys-fs/e2fsprogs/files/fsck_ext2fs.c
deleted file mode 100644
index f5e3e5e9a8c9..
--- a/sys-fs/e2fsprogs/files/fsck_ext2fs.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * fsck_ext2fs - wrapper for e2fsck on FreeBSD
- * Copyright (C) 2004,2006 Matthias Andree 
- * redistributable in accordance with the
- 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2022-01-02 Thread David Seifert
commit: 2fe8ec9a396003da52aff7d2564f1faaa2830b08
Author: David Seifert  gentoo  org>
AuthorDate: Sun Jan  2 17:48:57 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jan  2 17:48:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fe8ec9a

sys-fs/e2fsprogs: remove freebsd-libc

Signed-off-by: David Seifert  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild | 20 +---
 sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild | 24 +---
 2 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
index 7621c508cced..225c1d41eb95 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.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"
-IUSE="cron fuse lto nls static-libs +threads elibc_FreeBSD"
+IUSE="cron fuse lto nls static-libs +threads"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}
>=sys-apps/util-linux-2.16
@@ -93,12 +93,6 @@ src_configure() {
 
 src_compile() {
emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds
-
-   # Build the FreeBSD helper
-   if use elibc_FreeBSD ; then
-   cp "${FILESDIR}"/fsck_ext2fs.c .
-   emake V=1 fsck_ext2fs
-   fi
 }
 
 src_install() {
@@ -123,16 +117,4 @@ src_install() {
if ! use static-libs ; then
find "${ED}" -name '*.a' -delete || die
fi
-
-   if use elibc_FreeBSD ; then
-   # Install helpers for us
-   into /
-   dosbin "${S}"/fsck_ext2fs
-   doman "${FILESDIR}"/fsck_ext2fs.8
-
-   # filefrag is linux only
-   rm \
-   "${ED}"/usr/sbin/filefrag \
-   "${ED}"/usr/share/man/man8/filefrag.8 || die
-   fi
 }

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
index a460cd4a48e1..3e84085d14a9 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.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"
-IUSE="cron fuse lto nls static-libs +threads +tools elibc_FreeBSD"
+IUSE="cron fuse lto nls static-libs +threads +tools"
 
 RDEPEND="
!sys-libs/${PN}-libs
@@ -112,12 +112,6 @@ multilib_src_compile() {
fi
 
emake V=1
-
-   # Build the FreeBSD helper
-   if use elibc_FreeBSD ; then
-   cp "${FILESDIR}"/fsck_ext2fs.c . || die
-   emake V=1 fsck_ext2fs
-   fi
 }
 
 multilib_src_test() {
@@ -148,12 +142,6 @@ multilib_src_install() {
# Move shared libraries to /lib/, install static libraries to
# /usr/lib/, and install linker scripts to /usr/lib/.
gen_usr_ldscript -a e2p ext2fs
-
-   if use elibc_FreeBSD ; then
-   # Install helpers for us
-   into /
-   dosbin "${S}"/fsck_ext2fs
-   fi
fi
 
gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid')
@@ -170,15 +158,5 @@ multilib_src_install_all() {
if use tools ; then
insinto /etc
doins "${FILESDIR}"/e2fsck.conf
-
-   if use elibc_FreeBSD ; then
-   into /
-   doman "${FILESDIR}"/fsck_ext2fs.8
-
-   # filefrag is linux only
-   rm \
-   "${ED}"/usr/sbin/filefrag \
-   "${ED}"/usr/share/man/man8/filefrag.8 || die
-   fi
fi
 }



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2022-01-02 Thread David Seifert
commit: 0c24cd538f38b48883b375f138919d84502d42e6
Author: David Seifert  gentoo  org>
AuthorDate: Sun Jan  2 09:13:23 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jan  2 09:13:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c24cd53

sys-fs/e2fsprogs: remove mintlib

Signed-off-by: David Seifert  gentoo.org>

 sys-fs/e2fsprogs/Manifest| 1 -
 sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild | 7 +--
 sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild | 7 +--
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 6a975975148c..4a224a4c3d7e 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,3 +1,2 @@
-DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B 
ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26
 SHA512 
591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc
 DIST e2fsprogs-1.46.4.tar.xz 7035200 BLAKE2B 
473f7fd3f521b94cdaa68e37784a518fc1919387dd114f31b5338f1b4c472f86b150229ec3dcae8b73eac95330c0dea729befc8cea08bcf1e455c0b6652d6d2b
 SHA512 
7d9cfdf00ed58e66049585e8382fe4977088956421a0fb8155900c69afd8857309ad2b9301b3f74c9c0afa7287a0ddba2fd1538fcf57858b37a9ab712390016d
 DIST e2fsprogs-1.46.5.tar.xz 7040672 BLAKE2B 
8d8c02e891c464782a7cff518c41d793fc73366b57e17d80ffc5afd96e6144e354290e667e9710509a9dde4e5dab7e7185c5bf084c5bfd26219f05e5e92e0830
 SHA512 
53282e1c524f62a95012b1aceef296d494f5238c82c9b08b29fbe6a803dbf7ccfdcd9124eb2f11fe2ff9de26387c78751a92c3217ca414f6db6242098a72d3fa

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
index 32326b7ce451..7621c508cced 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
@@ -7,8 +7,7 @@ inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript
 
 DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/";
-SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz
-   elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
+SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz";
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
@@ -35,10 +34,6 @@ PATCHES=(
 )
 
 src_prepare() {
-   if [[ ${CHOST} == *-mint* ]] ; then
-   PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
-   fi
-
default
 
cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release 
Notes"

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
index 995ff20e1460..a460cd4a48e1 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
@@ -7,8 +7,7 @@ inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript 
multilib-minimal
 
 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
-   elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
+SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz";
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
@@ -42,10 +41,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-   if [[ ${CHOST} == *-mint* ]] ; then
-   PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
-   fi
-
default
 
cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release 
Notes"



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2022-01-01 Thread David Seifert
commit: 8b491d5abc07440c407955156a54a18c0c016132
Author: David Seifert  gentoo  org>
AuthorDate: Sat Jan  1 20:07:28 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jan  1 20:07:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b491d5a

sys-fs/e2fsprogs: remove uclibc

Signed-off-by: David Seifert  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild | 4 ++--
 sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
index 3c09748eee75..32326b7ce451 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -88,7 +88,7 @@ src_configure() {
)
ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}"
 
-   if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' 
config.{log,status} ; then
+   if grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
eerror "INTL sanity check failed, aborting build."
eerror "Please post your ${S}/config.log file as an"
eerror "attachment to 
https://bugs.gentoo.org/show_bug.cgi?id=81096";

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
index 9ae9e56c0922..995ff20e1460 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -97,7 +97,7 @@ multilib_src_configure() {
BUILD_LD="$(tc-getBUILD_LD)" \
econf "${myeconfargs[@]}"
 
-   if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' 
config.{log,status} ; then
+   if grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
eerror "INTL sanity check failed, aborting build."
eerror "Please post your ${S}/config.log file as an"
eerror "attachment to 
https://bugs.gentoo.org/show_bug.cgi?id=81096";



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2021-12-31 Thread David Seifert
commit: 772677495760059946931917020583157e273fb1
Author: David Seifert  gentoo  org>
AuthorDate: Fri Dec 31 17:49:50 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Dec 31 17:49:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77267749

sys-fs/e2fsprogs: drop 1.46.4-r51

Closes: https://github.com/gentoo/gentoo/pull/23594
Signed-off-by: David Seifert  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.4-r51.ebuild | 191 ---
 1 file changed, 191 deletions(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.4-r51.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.4-r51.ebuild
deleted file mode 100644
index c5aa51404248..
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.4-r51.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript multilib-minimal
-
-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
-   elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-# Unkeyworded for testing unsplitting of e2fsprogs-libs, bug #806875
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="cron fuse lto nls static-libs +threads +tools elibc_FreeBSD"
-
-RDEPEND="!sys-libs/com_err
-   !sys-libs/ss
-   !sys-libs/${PN}-libs
-   cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
-   fuse? ( sys-fs/fuse:0 )
-   nls? ( virtual/libintl )
-   tools? ( >=sys-apps/util-linux-2.16 )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-   sys-apps/texinfo
-   nls? ( sys-devel/gettext )"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.40-fbsd.patch
-   "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
-
-   # Upstream patches (can usually removed with next version bump)
-)
-
-pkg_setup() {
-   if use tools ; then
-   MULTILIB_WRAPPED_HEADERS=(
-   /usr/include/ext2fs/ext2_types.h
-   )
-   fi
-}
-
-src_prepare() {
-   if [[ ${CHOST} == *-mint* ]] ; then
-   PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
-   fi
-
-   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 #81096
-   sed -i -r \
-   -e 's:@LIBINTL@:@LTLIBINTL@:' \
-   MCONFIG.in || die 'intl cruft'
-}
-
-multilib_src_configure() {
-   # Keep the package from doing silly things #261411
-   export VARTEXFONTS="${T}/fonts"
-
-   # needs open64() prototypes and friends
-   append-cppflags -D_GNU_SOURCE
-
-   local myeconfargs=(
-   --with-root-prefix="${EPREFIX}"
-   $(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
-   --with-systemd-unit-dir="$(systemd_get_systemunitdir)"
-   --with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d"
-   --enable-symlink-install
-   --enable-elf-shlibs
-   $(tc-has-tls || echo --disable-tls)
-   $(multilib_native_use_enable fuse fuse2fs)
-   $(use_enable nls)
-   $(multilib_native_use_enable tools e2initrd-helper)
-   --disable-fsck
-   --disable-uuidd
-   $(use_enable lto)
-   $(use_with threads 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 [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' 
config.{log,status} ; then
-   eerror "INTL sanity check failed, aborting build."
-   eerror "Please post your ${S}/config.log file as an"
-   eerror "attachment to 
https://bugs.gentoo.org/show_bug.cgi?id=81096";
-   die "Preventing included intl cruft from building"
-   fi
-}
-
-multilib_src_compile() {
-   if ! multilib_is_native_abi || ! use tools ; then
-   emake -C lib/et V=1
-   emake -C lib/ss V=1
-   if use tools ; then
-   emake -C lib/ext2fs V=1
-   ema

[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2021-12-31 Thread David Seifert
commit: 3af0ed49ea0b1b91c50a7180b3a3b307ef8d2fba
Author: David Seifert  gentoo  org>
AuthorDate: Fri Dec 31 17:49:48 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Dec 31 17:49:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3af0ed49

sys-fs/e2fsprogs: add 1.46.5

Signed-off-by: David Seifert  gentoo.org>

 sys-fs/e2fsprogs/Manifest|   1 +
 sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild | 189 +++
 2 files changed, 190 insertions(+)

diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 0fe82b8dc06c..6a975975148c 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,2 +1,3 @@
 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B 
ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26
 SHA512 
591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc
 DIST e2fsprogs-1.46.4.tar.xz 7035200 BLAKE2B 
473f7fd3f521b94cdaa68e37784a518fc1919387dd114f31b5338f1b4c472f86b150229ec3dcae8b73eac95330c0dea729befc8cea08bcf1e455c0b6652d6d2b
 SHA512 
7d9cfdf00ed58e66049585e8382fe4977088956421a0fb8155900c69afd8857309ad2b9301b3f74c9c0afa7287a0ddba2fd1538fcf57858b37a9ab712390016d
+DIST e2fsprogs-1.46.5.tar.xz 7040672 BLAKE2B 
8d8c02e891c464782a7cff518c41d793fc73366b57e17d80ffc5afd96e6144e354290e667e9710509a9dde4e5dab7e7185c5bf084c5bfd26219f05e5e92e0830
 SHA512 
53282e1c524f62a95012b1aceef296d494f5238c82c9b08b29fbe6a803dbf7ccfdcd9124eb2f11fe2ff9de26387c78751a92c3217ca414f6db6242098a72d3fa

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
new file mode 100644
index ..9ae9e56c0922
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript multilib-minimal
+
+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
+   elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cron fuse lto nls static-libs +threads +tools elibc_FreeBSD"
+
+RDEPEND="
+   !sys-libs/${PN}-libs
+   cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
+   fuse? ( sys-fs/fuse:0 )
+   nls? ( virtual/libintl )
+   tools? ( >=sys-apps/util-linux-2.16 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+   sys-apps/texinfo
+   nls? ( sys-devel/gettext )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.40-fbsd.patch
+   "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
+
+   # Upstream patches (can usually removed with next version bump)
+)
+
+pkg_setup() {
+   if use tools ; then
+   MULTILIB_WRAPPED_HEADERS=(
+   /usr/include/ext2fs/ext2_types.h
+   )
+   fi
+}
+
+src_prepare() {
+   if [[ ${CHOST} == *-mint* ]] ; then
+   PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
+   fi
+
+   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 #81096
+   sed -i -r \
+   -e 's:@LIBINTL@:@LTLIBINTL@:' \
+   MCONFIG.in || die 'intl cruft'
+}
+
+multilib_src_configure() {
+   # Keep the package from doing silly things #261411
+   export VARTEXFONTS="${T}/fonts"
+
+   # needs open64() prototypes and friends
+   append-cppflags -D_GNU_SOURCE
+
+   local myeconfargs=(
+   --with-root-prefix="${EPREFIX}"
+   $(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
+   --with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+   --with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d"
+   --enable-symlink-install
+   --enable-elf-shlibs
+   $(tc-has-tls || echo --disable-tls)
+   $(multilib_native_use_enable fuse fuse2fs)
+   $(use_enable nls)
+   $(multilib_native_use_enable tools e2initrd-helper)
+   --disable-fsck
+   --disable-uuidd
+   $(use_enable lto)
+   $(use_with threads pthread)
+   )
+
+   # we use blkid/uuid from util-linux now
+   if use kernel_linux ; then
+   export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_ge

[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2021-12-30 Thread David Seifert
commit: ab289a1fbf96a9688dc88a8bb71e5e5186378488
Author: David Seifert  gentoo  org>
AuthorDate: Thu Dec 30 21:07:28 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Dec 30 21:07:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab289a1f

Reverts: 5d537e13506d3741445cb2f0b5c57c19fcb00a20 "sys-fs/e2fsprogs: Bump to 
version 1.46.5"

Signed-off-by: David Seifert  gentoo.org>

 sys-fs/e2fsprogs/Manifest|   1 -
 sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild | 143 ---
 2 files changed, 144 deletions(-)

diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 6a975975148c..0fe82b8dc06c 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,3 +1,2 @@
 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B 
ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26
 SHA512 
591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc
 DIST e2fsprogs-1.46.4.tar.xz 7035200 BLAKE2B 
473f7fd3f521b94cdaa68e37784a518fc1919387dd114f31b5338f1b4c472f86b150229ec3dcae8b73eac95330c0dea729befc8cea08bcf1e455c0b6652d6d2b
 SHA512 
7d9cfdf00ed58e66049585e8382fe4977088956421a0fb8155900c69afd8857309ad2b9301b3f74c9c0afa7287a0ddba2fd1538fcf57858b37a9ab712390016d
-DIST e2fsprogs-1.46.5.tar.xz 7040672 BLAKE2B 
8d8c02e891c464782a7cff518c41d793fc73366b57e17d80ffc5afd96e6144e354290e667e9710509a9dde4e5dab7e7185c5bf084c5bfd26219f05e5e92e0830
 SHA512 
53282e1c524f62a95012b1aceef296d494f5238c82c9b08b29fbe6a803dbf7ccfdcd9124eb2f11fe2ff9de26387c78751a92c3217ca414f6db6242098a72d3fa

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
deleted file mode 100644
index 963bf42ad0c5..
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/";
-SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz
-   elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="cron fuse lto nls static-libs +threads elibc_FreeBSD"
-
-RDEPEND="~sys-libs/${PN}-libs-${PV}
-   >=sys-apps/util-linux-2.16
-   cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
-   fuse? ( sys-fs/fuse:0 )
-   nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   nls? ( sys-devel/gettext )
-   virtual/pkgconfig
-   sys-apps/texinfo
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.40-fbsd.patch
-   "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
-
-   # Upstream patches (can usually removed with next version bump)
-)
-
-src_prepare() {
-   if [[ ${CHOST} == *-mint* ]] ; then
-   PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
-   fi
-
-   default
-
-   cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release 
Notes"
-
-   # Get rid of doc -- we don't use them. This also prevents a sandbox
-   # violation due to mktexfmt invocation
-   rm -r doc || die "Failed to remove doc dir"
-
-   # blargh ... trick e2fsprogs into using e2fsprogs-libs
-   sed -i -r \
-   -e 's:@LIBINTL@:@LTLIBINTL@:' \
-   -e 
'/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:'
 \
-   -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
-   MCONFIG.in || die "muck libs" #122368
-   sed -i -r \
-   -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
-   Makefile.in || die "remove subdirs"
-   ln -s $(which mk_cmds) lib/ss/ || die
-
-   # Avoid rebuild
-   echo '#include_next ' > lib/ss/ss_err.h
-}
-
-src_configure() {
-   # Keep the package from doing silly things #261411
-   export VARTEXFONTS="${T}/fonts"
-
-   # needs open64() prototypes and friends
-   append-cppflags -D_GNU_SOURCE
-
-   local myeconfargs=(
-   --with-root-prefix="${EPREFIX}"
-   $(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
-   --with-systemd-unit-dir="$(systemd_get_systemunitdir)"
-   --with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d"
-   --enable-symlink-install
-   --enable-elf-shlibs
-   $(tc-has-tls || echo --disable-tls)
-   $(use_enable fuse fuse2fs)
-   $(use_enable nls)
-   --disable-libblkid
-   --disable-libuuid
-   --disable-fsck
-   

[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2021-12-30 Thread Lars Wendler
commit: 5d537e13506d3741445cb2f0b5c57c19fcb00a20
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Dec 30 20:38:17 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Dec 30 20:38:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d537e13

sys-fs/e2fsprogs: Bump to version 1.46.5

Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/e2fsprogs/Manifest|   1 +
 sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild | 143 +++
 2 files changed, 144 insertions(+)

diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 0fe82b8dc06c..6a975975148c 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,2 +1,3 @@
 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B 
ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26
 SHA512 
591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc
 DIST e2fsprogs-1.46.4.tar.xz 7035200 BLAKE2B 
473f7fd3f521b94cdaa68e37784a518fc1919387dd114f31b5338f1b4c472f86b150229ec3dcae8b73eac95330c0dea729befc8cea08bcf1e455c0b6652d6d2b
 SHA512 
7d9cfdf00ed58e66049585e8382fe4977088956421a0fb8155900c69afd8857309ad2b9301b3f74c9c0afa7287a0ddba2fd1538fcf57858b37a9ab712390016d
+DIST e2fsprogs-1.46.5.tar.xz 7040672 BLAKE2B 
8d8c02e891c464782a7cff518c41d793fc73366b57e17d80ffc5afd96e6144e354290e667e9710509a9dde4e5dab7e7185c5bf084c5bfd26219f05e5e92e0830
 SHA512 
53282e1c524f62a95012b1aceef296d494f5238c82c9b08b29fbe6a803dbf7ccfdcd9124eb2f11fe2ff9de26387c78751a92c3217ca414f6db6242098a72d3fa

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
new file mode 100644
index ..963bf42ad0c5
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/";
+SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz
+   elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cron fuse lto nls static-libs +threads elibc_FreeBSD"
+
+RDEPEND="~sys-libs/${PN}-libs-${PV}
+   >=sys-apps/util-linux-2.16
+   cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
+   fuse? ( sys-fs/fuse:0 )
+   nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   nls? ( sys-devel/gettext )
+   virtual/pkgconfig
+   sys-apps/texinfo
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.40-fbsd.patch
+   "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
+
+   # Upstream patches (can usually removed with next version bump)
+)
+
+src_prepare() {
+   if [[ ${CHOST} == *-mint* ]] ; then
+   PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
+   fi
+
+   default
+
+   cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release 
Notes"
+
+   # Get rid of doc -- we don't use them. This also prevents a sandbox
+   # violation due to mktexfmt invocation
+   rm -r doc || die "Failed to remove doc dir"
+
+   # blargh ... trick e2fsprogs into using e2fsprogs-libs
+   sed -i -r \
+   -e 's:@LIBINTL@:@LTLIBINTL@:' \
+   -e 
'/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:'
 \
+   -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
+   MCONFIG.in || die "muck libs" #122368
+   sed -i -r \
+   -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
+   Makefile.in || die "remove subdirs"
+   ln -s $(which mk_cmds) lib/ss/ || die
+
+   # Avoid rebuild
+   echo '#include_next ' > lib/ss/ss_err.h
+}
+
+src_configure() {
+   # Keep the package from doing silly things #261411
+   export VARTEXFONTS="${T}/fonts"
+
+   # needs open64() prototypes and friends
+   append-cppflags -D_GNU_SOURCE
+
+   local myeconfargs=(
+   --with-root-prefix="${EPREFIX}"
+   $(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
+   --with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+   --with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d"
+   --enable-symlink-install
+   --enable-elf-shlibs
+   $(tc-has-tls || echo --disable-tls)
+   $(use_enable fuse fuse2fs)
+   $(use_enable nls)
+   --disable-libblkid
+   --disable-libuuid
+   --disable-fsck
+   --disable-uuidd
+   $(use_enable lto)
+

[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2021-11-12 Thread David Seifert
commit: c7c462e602f466ee7bd1d2be2e6ac6287aae239a
Author: David Seifert  gentoo  org>
AuthorDate: Fri Nov 12 10:22:37 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Nov 12 10:22:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7c462e6

sys-fs/e2fsprogs: drop 1.45.7, 1.46.2, 1.46.3

Signed-off-by: David Seifert  gentoo.org>

 sys-fs/e2fsprogs/Manifest|   3 -
 sys-fs/e2fsprogs/e2fsprogs-1.45.7.ebuild | 142 --
 sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild | 143 ---
 sys-fs/e2fsprogs/e2fsprogs-1.46.3.ebuild | 143 ---
 4 files changed, 431 deletions(-)

diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 00db6634ad8..0fe82b8dc06 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,5 +1,2 @@
 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B 
ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26
 SHA512 
591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc
-DIST e2fsprogs-1.45.7.tar.xz 5570052 BLAKE2B 
237ef068c3899641b5eb908cc302c8c6b454e337bce2de95fc96b9a078a003db0c44bd34391063cc2f30a95dcce57950fe900f59ae7d273786c657b7c190b341
 SHA512 
fcbd66af7b87f2bdec562ddd59c8c5fbd60f32fdd582a5c9d21cb6cfea642d2cdca57b6c29124309798528b2d9ceadf770928a6698f75dc88a47701286128763
-DIST e2fsprogs-1.46.2.tar.xz 7020552 BLAKE2B 
0eda7428862c13dfd02308f0321d22c134679197bad5b247baa6f0ca386433db6749b97529709d43934afa73d8d0801379bb342456a0fd3dab7df01f5a90fd31
 SHA512 
5297a4d7bf944806d8ee77227eac596b5e5efed2c665561d40094c40b9f321616c60975a2716f1499a9f72243df6e3b6e2267b98ec1fdc1dfd646d7be887fc4d
-DIST e2fsprogs-1.46.3.tar.xz 7024896 BLAKE2B 
86f65cf9997f09aa7a27be35b2f38d6385f565de565b1c4cda710dbbea8312312ff77d92beb2b579a3caffa7ce82ee6b2726eb8f97daf41bba46379a94198c8f
 SHA512 
27da6e38d3463e7a283dacfb88a3210dd6d8c63f4d990db879f63bdf503aaa5c447ef0ccc566b71526c12a8ab0a7a6529014b1010be300ad56a6ad5ce9066196
 DIST e2fsprogs-1.46.4.tar.xz 7035200 BLAKE2B 
473f7fd3f521b94cdaa68e37784a518fc1919387dd114f31b5338f1b4c472f86b150229ec3dcae8b73eac95330c0dea729befc8cea08bcf1e455c0b6652d6d2b
 SHA512 
7d9cfdf00ed58e66049585e8382fe4977088956421a0fb8155900c69afd8857309ad2b9301b3f74c9c0afa7287a0ddba2fd1538fcf57858b37a9ab712390016d

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.7.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.45.7.ebuild
deleted file mode 100644
index 9325951632f..000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.45.7.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/";
-SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz
-   elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux"
-IUSE="cron fuse nls static-libs elibc_FreeBSD"
-
-RDEPEND="~sys-libs/${PN}-libs-${PV}
-   >=sys-apps/util-linux-2.16
-   cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
-   fuse? ( sys-fs/fuse:0 )
-   nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   nls? ( sys-devel/gettext )
-   virtual/pkgconfig
-   sys-apps/texinfo
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.40-fbsd.patch
-   "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
-
-   # Upstream patches (can usually removed with next version bump)
-)
-
-src_prepare() {
-   if [[ ${CHOST} == *-mint* ]] ; then
-   PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
-   fi
-
-   default
-
-   cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release 
Notes"
-
-   # Get rid of doc -- we don't use them. This also prevents a sandbox
-   # violation due to mktexfmt invocation
-   rm -r doc || die "Failed to remove doc dir"
-
-   # blargh ... trick e2fsprogs into using e2fsprogs-libs
-   sed -i -r \
-   -e 's:@LIBINTL@:@LTLIBINTL@:' \
-   -e 
'/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:'
 \
-   -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
-   MCONFIG.in || die "muck libs" #122368
-   sed -i -r \
-   -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
-   Makefile.in || die "remove subdirs"
-   ln -s $(which mk_cmds) lib/ss/ || die
-
-   # Avoid rebuild
-   echo '#include_next ' > lib/ss/ss_err.h
-}
-
-src_configure() {
-   # Keep the package from doing silly things #261411
-   export VA

[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2021-11-01 Thread Sam James
commit: 8f7a7d03aadc68c5fa557e2971998e183da8148f
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov  1 17:48:31 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov  1 17:48:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f7a7d03

sys-fs/e2fsprogs: drop unnecessary unconditional util-linux dep in 1.46.4-r51

Closes: https://bugs.gentoo.org/806875
Signed-off-by: Sam James  gentoo.org>

 .../{e2fsprogs-1.46.4-r50.ebuild => e2fsprogs-1.46.4-r51.ebuild} | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.4-r50.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.4-r51.ebuild
similarity index 99%
rename from sys-fs/e2fsprogs/e2fsprogs-1.46.4-r50.ebuild
rename to sys-fs/e2fsprogs/e2fsprogs-1.46.4-r51.ebuild
index d646b58c2e6..c5aa5140424 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.4-r50.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.4-r51.ebuild
@@ -19,7 +19,6 @@ IUSE="cron fuse lto nls static-libs +threads +tools 
elibc_FreeBSD"
 RDEPEND="!sys-libs/com_err
!sys-libs/ss
!sys-libs/${PN}-libs
-   >=sys-apps/util-linux-2.16
cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
fuse? ( sys-fs/fuse:0 )
nls? ( virtual/libintl )



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2021-10-30 Thread Sam James
commit: e1645d02e29cec605a91fd91b63543502e7599ac
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 31 01:33:41 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 31 01:33:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1645d02

sys-fs/e2fsprogs: include dilfridge@'s changes to merged e2fsprogs-libs

>From his overlay at 
>https://gitweb.gentoo.org/dev/dilfridge.git/plain/sys-fs/e2fsprogs/e2fsprogs-1.46.3-r100.ebuild?id=8551292e0a0f847ab7072ffab9626a3003dca1ab.

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.4-r50.ebuild | 13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.4-r50.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.4-r50.ebuild
index 6eb62630726..d646b58c2e6 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.4-r50.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.4-r50.ebuild
@@ -80,8 +80,6 @@ multilib_src_configure() {
$(tc-has-tls || echo --disable-tls)
$(multilib_native_use_enable fuse fuse2fs)
$(use_enable nls)
-   --disable-libblkid
-   --disable-libuuid
$(multilib_native_use_enable tools e2initrd-helper)
--disable-fsck
--disable-uuidd
@@ -92,14 +90,15 @@ multilib_src_configure() {
# 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[@]}"
+   ECONF_SOURCE="${S}" \
+   CC="$(tc-getCC)" \
+   BUILD_CC="$(tc-getBUILD_CC)" \
+   BUILD_LD="$(tc-getBUILD_LD)" \
+   econf "${myeconfargs[@]}"
 
if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' 
config.{log,status} ; then
eerror "INTL sanity check failed, aborting build."



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2021-10-30 Thread Sam James
commit: 4efd4cbe4ce902fdf3cb1d5dba76c93d47e9cbbb
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 31 01:25:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 31 01:28:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4efd4cbe

sys-fs/e2fsprogs: run tests for non-native ABI in new merged -libs ebuild

Bug: https://bugs.gentoo.org/806875
Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.4-r50.ebuild | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.4-r50.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.4-r50.ebuild
index 328bca250b3..6eb62630726 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.4-r50.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.4-r50.ebuild
@@ -129,6 +129,16 @@ multilib_src_compile() {
fi
 }
 
+multilib_src_test() {
+   if multilib_is_native_abi ; then
+   emake V=1 check
+   else
+   # 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
+   fi
+}
+
 multilib_src_install() {
if ! multilib_is_native_abi || ! use tools ; then
emake -C lib/et V=1 DESTDIR="${D}" install



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2021-10-30 Thread Sam James
commit: f93bf60f2cb44d2172dbd546f741c78020780048
Author: Matt Whitlock  mattwhitlock  name>
AuthorDate: Sun Oct 31 01:21:51 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 31 01:26:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f93bf60f

sys-fs/e2fsprogs: merge sys-libs/e2fsprogs-libs back in (unkeyworded)

[sam:
As noted in the bug, we'll need to adjust reverse dependencies to tools(-) if
anything needs libext2fs or libe2p.

In terms of why we're doing this in the first place, the reason is that
for quite some time, e2fsprogs has been using internal copies of
the libraries provided by sys-fs/e2fsprogs-libs anyway, as observed when
applying a patch for a test failure which then re-appeared in progs.

That is, the split has been ineffective/a no-op for quite some time,
and this just makes the ebuilds reflect reality.

Splitting out the packages isn't supported upstream and requires
some ugly work and it's not something we're interested in rebasing
very often.]

Bug: https://bugs.gentoo.org/806875
Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.4-r50.ebuild | 183 +++
 sys-fs/e2fsprogs/metadata.xml|   1 +
 2 files changed, 184 insertions(+)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.4-r50.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.4-r50.ebuild
new file mode 100644
index 000..328bca250b3
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.4-r50.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript multilib-minimal
+
+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
+   elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+# Unkeyworded for testing unsplitting of e2fsprogs-libs, bug #806875
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cron fuse lto nls static-libs +threads +tools elibc_FreeBSD"
+
+RDEPEND="!sys-libs/com_err
+   !sys-libs/ss
+   !sys-libs/${PN}-libs
+   >=sys-apps/util-linux-2.16
+   cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
+   fuse? ( sys-fs/fuse:0 )
+   nls? ( virtual/libintl )
+   tools? ( >=sys-apps/util-linux-2.16 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+   sys-apps/texinfo
+   nls? ( sys-devel/gettext )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.40-fbsd.patch
+   "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
+
+   # Upstream patches (can usually removed with next version bump)
+)
+
+pkg_setup() {
+   if use tools ; then
+   MULTILIB_WRAPPED_HEADERS=(
+   /usr/include/ext2fs/ext2_types.h
+   )
+   fi
+}
+
+src_prepare() {
+   if [[ ${CHOST} == *-mint* ]] ; then
+   PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
+   fi
+
+   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 #81096
+   sed -i -r \
+   -e 's:@LIBINTL@:@LTLIBINTL@:' \
+   MCONFIG.in || die 'intl cruft'
+}
+
+multilib_src_configure() {
+   # Keep the package from doing silly things #261411
+   export VARTEXFONTS="${T}/fonts"
+
+   # needs open64() prototypes and friends
+   append-cppflags -D_GNU_SOURCE
+
+   local myeconfargs=(
+   --with-root-prefix="${EPREFIX}"
+   $(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
+   --with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+   --with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d"
+   --enable-symlink-install
+   --enable-elf-shlibs
+   $(tc-has-tls || echo --disable-tls)
+   $(multilib_native_use_enable fuse fuse2fs)
+   $(use_enable nls)
+   --disable-libblkid
+   --disable-libuuid
+   $(multilib_native_use_enable tools e2initrd-helper)
+   --disable-fsck
+   --disable-uuidd
+   $(use_enable lto)
+   $(use_with threads 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
+   fi
+
+   ac_cv_path_LDCONFIG=: \
+   ECONF_SOURCE="${S}" \
+   CC="$(tc-getCC)" \
+   BUILD_CC="$(tc-getBUILD_CC)" \
+   BUILD_

[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2021-10-02 Thread Sam James
commit: 881034aad7110385cfd84650c208cd59e88344d3
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct  2 17:20:17 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  2 17:20:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=881034aa

sys-fs/e2fsprogs: Stabilize 1.46.4 arm64, #789900

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
index 31c0a571616..3c09748eee7 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.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}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2021-09-27 Thread Sam James
commit: eb714610012e27c52d1abcc1765201df80e865e3
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Sep 27 15:53:31 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Sep 27 18:13:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb714610

sys-fs/e2fsprogs: stable 1.46.4 for hppa, bug #789900

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
index 61a242ec771..31c0a571616 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.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}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2021-09-25 Thread Sam James
commit: c80dedcabae7a85022e6fda4437dc4026e072164
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep 25 23:46:04 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 25 23:46:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c80dedca

sys-fs/e2fsprogs: Stabilize 1.46.4 arm, #789900

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
index 2449fbcf989..61a242ec771 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.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}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2021-09-24 Thread Agostino Sarubbo
commit: c8a1f5cb0dc8ed89d133fb26b772257e5b85c183
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Sep 25 05:15:40 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Sep 25 05:15:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8a1f5cb

sys-fs/e2fsprogs: ppc stable wrt bug #789900

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
index d51b985ae5a..2449fbcf989 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.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}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2021-09-21 Thread Agostino Sarubbo
commit: 2e33520c18507b061930dea9201902a4968ce376
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Sep 22 06:56:59 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Sep 22 06:56:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e33520c

sys-fs/e2fsprogs: x86 stable wrt bug #789900

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
index 441816b5d40..d51b985ae5a 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.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}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2021-09-20 Thread Agostino Sarubbo
commit: 8a25b3718af88b11680261eaef60db59ef2c4061
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Sep 21 06:36:37 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Sep 21 06:36:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a25b371

sys-fs/e2fsprogs: ppc64 stable wrt bug #789900

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
index a19c78f9f18..441816b5d40 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.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}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2021-09-20 Thread Agostino Sarubbo
commit: 1ddc412e0aa8bcaf431f1f5148ebb6605926407a
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Sep 21 06:32:58 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Sep 21 06:35:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ddc412e

sys-fs/e2fsprogs: amd64 stable wrt bug #789900

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
index 126783f8695..a19c78f9f18 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.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}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2021-09-20 Thread Sam James
commit: 7c6462e38b3aa3917262ca86da449dd67a299561
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Sep 20 15:21:08 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Sep 20 15:53:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c6462e3

sys-fs/e2fsprogs: stable 1.46.4 for sparc, bug #789900

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
index 963bf42ad0c..126783f8695 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.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}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2021-08-20 Thread Lars Wendler
commit: fbcfa09e85551d57abd743a31d48ff53b89ab630
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Aug 20 09:02:06 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Aug 20 09:02:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbcfa09e

sys-fs/e2fsprogs: Bump to version 1.46.4

Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/e2fsprogs/Manifest|   1 +
 sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild | 143 +++
 2 files changed, 144 insertions(+)

diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index f2096fcd9d2..00db6634ad8 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -2,3 +2,4 @@ DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B 
ae6421587c3cca2f9b26805c5f8d
 DIST e2fsprogs-1.45.7.tar.xz 5570052 BLAKE2B 
237ef068c3899641b5eb908cc302c8c6b454e337bce2de95fc96b9a078a003db0c44bd34391063cc2f30a95dcce57950fe900f59ae7d273786c657b7c190b341
 SHA512 
fcbd66af7b87f2bdec562ddd59c8c5fbd60f32fdd582a5c9d21cb6cfea642d2cdca57b6c29124309798528b2d9ceadf770928a6698f75dc88a47701286128763
 DIST e2fsprogs-1.46.2.tar.xz 7020552 BLAKE2B 
0eda7428862c13dfd02308f0321d22c134679197bad5b247baa6f0ca386433db6749b97529709d43934afa73d8d0801379bb342456a0fd3dab7df01f5a90fd31
 SHA512 
5297a4d7bf944806d8ee77227eac596b5e5efed2c665561d40094c40b9f321616c60975a2716f1499a9f72243df6e3b6e2267b98ec1fdc1dfd646d7be887fc4d
 DIST e2fsprogs-1.46.3.tar.xz 7024896 BLAKE2B 
86f65cf9997f09aa7a27be35b2f38d6385f565de565b1c4cda710dbbea8312312ff77d92beb2b579a3caffa7ce82ee6b2726eb8f97daf41bba46379a94198c8f
 SHA512 
27da6e38d3463e7a283dacfb88a3210dd6d8c63f4d990db879f63bdf503aaa5c447ef0ccc566b71526c12a8ab0a7a6529014b1010be300ad56a6ad5ce9066196
+DIST e2fsprogs-1.46.4.tar.xz 7035200 BLAKE2B 
473f7fd3f521b94cdaa68e37784a518fc1919387dd114f31b5338f1b4c472f86b150229ec3dcae8b73eac95330c0dea729befc8cea08bcf1e455c0b6652d6d2b
 SHA512 
7d9cfdf00ed58e66049585e8382fe4977088956421a0fb8155900c69afd8857309ad2b9301b3f74c9c0afa7287a0ddba2fd1538fcf57858b37a9ab712390016d

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
new file mode 100644
index 000..963bf42ad0c
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/";
+SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz
+   elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cron fuse lto nls static-libs +threads elibc_FreeBSD"
+
+RDEPEND="~sys-libs/${PN}-libs-${PV}
+   >=sys-apps/util-linux-2.16
+   cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
+   fuse? ( sys-fs/fuse:0 )
+   nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   nls? ( sys-devel/gettext )
+   virtual/pkgconfig
+   sys-apps/texinfo
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.40-fbsd.patch
+   "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
+
+   # Upstream patches (can usually removed with next version bump)
+)
+
+src_prepare() {
+   if [[ ${CHOST} == *-mint* ]] ; then
+   PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
+   fi
+
+   default
+
+   cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release 
Notes"
+
+   # Get rid of doc -- we don't use them. This also prevents a sandbox
+   # violation due to mktexfmt invocation
+   rm -r doc || die "Failed to remove doc dir"
+
+   # blargh ... trick e2fsprogs into using e2fsprogs-libs
+   sed -i -r \
+   -e 's:@LIBINTL@:@LTLIBINTL@:' \
+   -e 
'/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:'
 \
+   -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
+   MCONFIG.in || die "muck libs" #122368
+   sed -i -r \
+   -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
+   Makefile.in || die "remove subdirs"
+   ln -s $(which mk_cmds) lib/ss/ || die
+
+   # Avoid rebuild
+   echo '#include_next ' > lib/ss/ss_err.h
+}
+
+src_configure() {
+   # Keep the package from doing silly things #261411
+   export VARTEXFONTS="${T}/fonts"
+
+   # needs open64() prototypes and friends
+   append-cppflags -D_GNU_SOURCE
+
+   local myeconfargs=(
+   --with-root-prefix="${EPREFIX}"
+   $(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
+   --with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+   --with-udev-rules-dir="${EPREFIX}$(get_udevdi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2021-07-27 Thread Lars Wendler
commit: b018a4f7e6817fa54d3fe6672dd4f48131003ff5
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jul 28 06:30:06 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jul 28 06:31:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b018a4f7

sys-fs/e2fsprogs: Bump to version 1.46.3

Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/e2fsprogs/Manifest|   1 +
 sys-fs/e2fsprogs/e2fsprogs-1.46.3.ebuild | 143 +++
 2 files changed, 144 insertions(+)

diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index bce1a9e8801..d24f0b90c6c 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -3,3 +3,4 @@ DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 
24a44d27a02a1fa178083d5ee6034b20fed
 DIST e2fsprogs-1.45.7.tar.xz 5570052 BLAKE2B 
237ef068c3899641b5eb908cc302c8c6b454e337bce2de95fc96b9a078a003db0c44bd34391063cc2f30a95dcce57950fe900f59ae7d273786c657b7c190b341
 SHA512 
fcbd66af7b87f2bdec562ddd59c8c5fbd60f32fdd582a5c9d21cb6cfea642d2cdca57b6c29124309798528b2d9ceadf770928a6698f75dc88a47701286128763
 DIST e2fsprogs-1.46.1.tar.xz 7019700 BLAKE2B 
2356fcd206de14377a4625a8be2ff94cfd3fb2b911836a3da46499964fc5d7f2a6d03bf5818543d2ead34ac7cab36ef0e18885343d6814a0124b50ab7ea4bb69
 SHA512 
fe6aa55b62f183633872209cd69cf6be0753d5a430542a7c73dbbd428e5fa93b5df7efa7507bb60f9f90a1c61cb8f5cf10665675eea8bd72aad3d04dd2dae15c
 DIST e2fsprogs-1.46.2.tar.xz 7020552 BLAKE2B 
0eda7428862c13dfd02308f0321d22c134679197bad5b247baa6f0ca386433db6749b97529709d43934afa73d8d0801379bb342456a0fd3dab7df01f5a90fd31
 SHA512 
5297a4d7bf944806d8ee77227eac596b5e5efed2c665561d40094c40b9f321616c60975a2716f1499a9f72243df6e3b6e2267b98ec1fdc1dfd646d7be887fc4d
+DIST e2fsprogs-1.46.3.tar.xz 7024896 BLAKE2B 
86f65cf9997f09aa7a27be35b2f38d6385f565de565b1c4cda710dbbea8312312ff77d92beb2b579a3caffa7ce82ee6b2726eb8f97daf41bba46379a94198c8f
 SHA512 
27da6e38d3463e7a283dacfb88a3210dd6d8c63f4d990db879f63bdf503aaa5c447ef0ccc566b71526c12a8ab0a7a6529014b1010be300ad56a6ad5ce9066196

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.3.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.3.ebuild
new file mode 100644
index 000..963bf42ad0c
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.3.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/";
+SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz
+   elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cron fuse lto nls static-libs +threads elibc_FreeBSD"
+
+RDEPEND="~sys-libs/${PN}-libs-${PV}
+   >=sys-apps/util-linux-2.16
+   cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
+   fuse? ( sys-fs/fuse:0 )
+   nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   nls? ( sys-devel/gettext )
+   virtual/pkgconfig
+   sys-apps/texinfo
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.40-fbsd.patch
+   "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
+
+   # Upstream patches (can usually removed with next version bump)
+)
+
+src_prepare() {
+   if [[ ${CHOST} == *-mint* ]] ; then
+   PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
+   fi
+
+   default
+
+   cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release 
Notes"
+
+   # Get rid of doc -- we don't use them. This also prevents a sandbox
+   # violation due to mktexfmt invocation
+   rm -r doc || die "Failed to remove doc dir"
+
+   # blargh ... trick e2fsprogs into using e2fsprogs-libs
+   sed -i -r \
+   -e 's:@LIBINTL@:@LTLIBINTL@:' \
+   -e 
'/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:'
 \
+   -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
+   MCONFIG.in || die "muck libs" #122368
+   sed -i -r \
+   -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
+   Makefile.in || die "remove subdirs"
+   ln -s $(which mk_cmds) lib/ss/ || die
+
+   # Avoid rebuild
+   echo '#include_next ' > lib/ss/ss_err.h
+}
+
+src_configure() {
+   # Keep the package from doing silly things #261411
+   export VARTEXFONTS="${T}/fonts"
+
+   # needs open64() prototypes and friends
+   append-cppflags -D_GNU_SOURCE
+
+   local myeconfargs=(
+   --with-root-prefix="${EPREFIX}"
+   $(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
+   --with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+   --with-udev-rules-dir="${EPREFIX}$(get_udevdi

[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2021-07-27 Thread Lars Wendler
commit: d658f3c488228b660f9ef66f4a94888e97a8c0e4
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jul 28 06:30:45 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jul 28 06:31:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d658f3c4

sys-fs/e2fsprogs: Removed old

Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/e2fsprogs/Manifest|   2 -
 sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild | 142 --
 sys-fs/e2fsprogs/e2fsprogs-1.46.1.ebuild | 143 ---
 3 files changed, 287 deletions(-)

diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index d24f0b90c6c..f2096fcd9d2 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,6 +1,4 @@
 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B 
ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26
 SHA512 
591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc
-DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 
24a44d27a02a1fa178083d5ee6034b20fedcac9faf7cf7f5cfcd4e4cee6d38775bc78949b9b00823cbbdacfab783e8e1e739579b9a7236c5425f51b27600743b
 SHA512 
f3abfb6fe7ef632bb81152e2127d601cadd3fa93162178576a1d5ed82c2286627184b207b85a5b2a1793db0addf0885dfc3b9523bb340443224caf9c6d613b84
 DIST e2fsprogs-1.45.7.tar.xz 5570052 BLAKE2B 
237ef068c3899641b5eb908cc302c8c6b454e337bce2de95fc96b9a078a003db0c44bd34391063cc2f30a95dcce57950fe900f59ae7d273786c657b7c190b341
 SHA512 
fcbd66af7b87f2bdec562ddd59c8c5fbd60f32fdd582a5c9d21cb6cfea642d2cdca57b6c29124309798528b2d9ceadf770928a6698f75dc88a47701286128763
-DIST e2fsprogs-1.46.1.tar.xz 7019700 BLAKE2B 
2356fcd206de14377a4625a8be2ff94cfd3fb2b911836a3da46499964fc5d7f2a6d03bf5818543d2ead34ac7cab36ef0e18885343d6814a0124b50ab7ea4bb69
 SHA512 
fe6aa55b62f183633872209cd69cf6be0753d5a430542a7c73dbbd428e5fa93b5df7efa7507bb60f9f90a1c61cb8f5cf10665675eea8bd72aad3d04dd2dae15c
 DIST e2fsprogs-1.46.2.tar.xz 7020552 BLAKE2B 
0eda7428862c13dfd02308f0321d22c134679197bad5b247baa6f0ca386433db6749b97529709d43934afa73d8d0801379bb342456a0fd3dab7df01f5a90fd31
 SHA512 
5297a4d7bf944806d8ee77227eac596b5e5efed2c665561d40094c40b9f321616c60975a2716f1499a9f72243df6e3b6e2267b98ec1fdc1dfd646d7be887fc4d
 DIST e2fsprogs-1.46.3.tar.xz 7024896 BLAKE2B 
86f65cf9997f09aa7a27be35b2f38d6385f565de565b1c4cda710dbbea8312312ff77d92beb2b579a3caffa7ce82ee6b2726eb8f97daf41bba46379a94198c8f
 SHA512 
27da6e38d3463e7a283dacfb88a3210dd6d8c63f4d990db879f63bdf503aaa5c447ef0ccc566b71526c12a8ab0a7a6529014b1010be300ad56a6ad5ce9066196

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild
deleted file mode 100644
index 9325951632f..000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/";
-SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz
-   elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux"
-IUSE="cron fuse nls static-libs elibc_FreeBSD"
-
-RDEPEND="~sys-libs/${PN}-libs-${PV}
-   >=sys-apps/util-linux-2.16
-   cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
-   fuse? ( sys-fs/fuse:0 )
-   nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   nls? ( sys-devel/gettext )
-   virtual/pkgconfig
-   sys-apps/texinfo
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.40-fbsd.patch
-   "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
-
-   # Upstream patches (can usually removed with next version bump)
-)
-
-src_prepare() {
-   if [[ ${CHOST} == *-mint* ]] ; then
-   PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
-   fi
-
-   default
-
-   cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release 
Notes"
-
-   # Get rid of doc -- we don't use them. This also prevents a sandbox
-   # violation due to mktexfmt invocation
-   rm -r doc || die "Failed to remove doc dir"
-
-   # blargh ... trick e2fsprogs into using e2fsprogs-libs
-   sed -i -r \
-   -e 's:@LIBINTL@:@LTLIBINTL@:' \
-   -e 
'/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:'
 \
-   -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
-   MCONFIG.in || die "muck libs" #122368
-   sed -i -r \
-   -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
-   Makefile.in || die "remove subdirs"
-

[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2021-07-27 Thread Sam James
commit: ac1eefe4ac6ba431db8f84347ed8351764854aed
Author: Sam James  gentoo  org>
AuthorDate: Wed Jul 28 00:24:35 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul 28 00:29:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac1eefe4

sys-fs/e2fsprogs: add github upstream metadata

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/metadata.xml | 27 ++-
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/sys-fs/e2fsprogs/metadata.xml b/sys-fs/e2fsprogs/metadata.xml
index 88556acfb19..8442510a926 100644
--- a/sys-fs/e2fsprogs/metadata.xml
+++ b/sys-fs/e2fsprogs/metadata.xml
@@ -1,17 +1,18 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-
-   base-sys...@gentoo.org
-   Gentoo Base System
-
-
-   Install e2scrub_all cron script
-   Build fuse2fs, a FUSE file system client for 
ext2/ext3/ext4 file systems
-   Build with link time optimization (LTO)
-
-
-   cpe:/a:e2fsprogs_project:e2fsprogs
-   e2fsprogs
-
+   
+   base-sys...@gentoo.org
+   Gentoo Base System
+   
+   
+   Install e2scrub_all cron script
+   Build fuse2fs, a FUSE file system client for 
ext2/ext3/ext4 file systems
+   Build with link time optimization (LTO)
+   
+   
+   cpe:/a:e2fsprogs_project:e2fsprogs
+   tytso/e2fsprogs
+   e2fsprogs
+   
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2021-07-10 Thread Sam James
commit: 2c75bc530d73cf3927b2b15f31b77a1d7fb3f5a4
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 10 16:11:13 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 10 16:12:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c75bc53

sys-fs/e2fsprogs: destabilize 1.46.2 for ~ppc, ~ppc64

Some big-endian breakage. Needs some patches which may be
introduced later.

Bug: https://bugs.gentoo.org/789900
Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild
index a7700f01e7d..35a2562be6d 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}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2021-05-14 Thread Sam James
commit: 707b53e0e899cbf3a92d2d778c80103cad3b3e52
Author: Sam James  gentoo  org>
AuthorDate: Fri May 14 20:52:41 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 14 20:53:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=707b53e0

sys-fs/e2fsprogs: Stabilize 1.46.2 ppc64, #789900

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild
index 20d11803664..a7700f01e7d 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}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2021-05-14 Thread Sam James
commit: 2193af4ee99df72389b605ad206a1980e317d2da
Author: Sam James  gentoo  org>
AuthorDate: Fri May 14 20:52:00 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 14 20:53:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2193af4e

sys-fs/e2fsprogs: Stabilize 1.46.2 ppc, #789900

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild
index 35a2562be6d..20d11803664 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}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2021-05-13 Thread Sam James
commit: fec5a5e7e1cecffe71daacea968dc8f81c2576f7
Author: Sam James  gentoo  org>
AuthorDate: Thu May 13 17:51:53 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 13 17:51:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fec5a5e7

sys-fs/e2fsprogs: Stabilize 1.46.2 x86, #789900

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild
index 48886bbc43c..35a2562be6d 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}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2021-05-13 Thread Sam James
commit: 74d81e8e456fa51ac1a82cbabe44522900d7c405
Author: Sam James  gentoo  org>
AuthorDate: Thu May 13 16:37:15 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 13 16:37:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74d81e8e

sys-fs/e2fsprogs: Stabilize 1.46.2 amd64, #789900

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild
index 30838204df9..48886bbc43c 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}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2021-05-13 Thread Sam James
commit: 6a2b76c725d31cb190db048882270c45be9b62ba
Author: Sam James  gentoo  org>
AuthorDate: Thu May 13 16:21:38 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 13 16:21:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a2b76c7

sys-fs/e2fsprogs: Stabilize 1.46.2 arm, #789900

Signed-off-by: Sam James  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild
index 0fe37eaa834..30838204df9 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}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/

2021-03-26 Thread Agostino Sarubbo
commit: a338cab754a35735e6915fb86b2bd1eeb1208089
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Mar 26 15:45:28 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Mar 26 15:45:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a338cab7

sys-fs/e2fsprogs: s390 stable wrt bug #763147

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="s390"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild
index 9325951632f..a66e5f0def3 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.6.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 nls static-libs elibc_FreeBSD"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}



  1   2   3   >