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

[David Seifert]

commit:     648d8cc3e049337918ad899faae1e46273619e73
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 13 20:30:24 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Sep 13 20:30:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=648d8cc3

sys-fs/nilfs-utils: e2fsprogs-libs → e2fsprogs

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

 ...-utils-2.1.5-r1.ebuild => nilfs-utils-2.1.5-r2.ebuild} |  5 +++--
 ...lfs-utils-2.2.2.ebuild => nilfs-utils-2.2.2-r1.ebuild} | 15 +++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sys-fs/nilfs-utils/nilfs-utils-2.1.5-r1.ebuild b/sys-fs/nilfs-utils/nilfs-utils-2.1.5-r2.ebuild
similarity index 91%
rename from sys-fs/nilfs-utils/nilfs-utils-2.1.5-r1.ebuild
rename to sys-fs/nilfs-utils/nilfs-utils-2.1.5-r2.ebuild
index 719717ffc96..e9b225835f9 100644
--- a/sys-fs/nilfs-utils/nilfs-utils-2.1.5-r1.ebuild
+++ b/sys-fs/nilfs-utils/nilfs-utils-2.1.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 x86"
 IUSE="static-libs"
 
-RDEPEND="sys-libs/e2fsprogs-libs
+RDEPEND="
+	sys-fs/e2fsprogs
 	sys-apps/util-linux"
 DEPEND="${RDEPEND}
 	sys-kernel/linux-headers"

diff --git a/sys-fs/nilfs-utils/nilfs-utils-2.2.2.ebuild b/sys-fs/nilfs-utils/nilfs-utils-2.2.2-r1.ebuild
similarity index 72%
rename from sys-fs/nilfs-utils/nilfs-utils-2.2.2.ebuild
rename to sys-fs/nilfs-utils/nilfs-utils-2.2.2-r1.ebuild
index 67c33efec1d..1a9f4b558ab 100644
--- a/sys-fs/nilfs-utils/nilfs-utils-2.2.2.ebuild
+++ b/sys-fs/nilfs-utils/nilfs-utils-2.2.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit multilib linux-info
+inherit linux-info
 
 DESCRIPTION="A New Implementation of a Log-structured File System for Linux"
 HOMEPAGE="http://nilfs.sourceforge.net/"
@@ -14,23 +14,22 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE="static-libs"
 
-RDEPEND="sys-libs/e2fsprogs-libs
+RDEPEND="
+	sys-fs/e2fsprogs
 	sys-apps/util-linux"
 DEPEND="${RDEPEND}
 	sys-kernel/linux-headers"
 
 CONFIG_CHECK="~POSIX_MQUEUE"
 
-DOCS=( AUTHORS ChangeLog NEWS README )
-
 src_configure() {
 	econf \
 		$(use_enable static-libs static) \
-		--libdir=/$(get_libdir) \
+		--libdir="${EPREFIX}"/$(get_libdir) \
 		--enable-libmount
 }
 
 src_install() {
 	default
-	rm -f "${ED}"/$(get_libdir)/*.la || die
+	find "${ED}" -name '*.la' -delete || die
 }