From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3AFE615ACFB for ; Tue, 11 Apr 2023 19:42:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7BD63E08C3; Tue, 11 Apr 2023 19:42:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 671E0E08C3 for ; Tue, 11 Apr 2023 19:42:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 94865340E7F for ; Tue, 11 Apr 2023 19:42:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 365BF9F7 for ; Tue, 11 Apr 2023 19:42:04 +0000 (UTC) From: "Viorel Munteanu" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Viorel Munteanu" Message-ID: <1681242109.bc6bcb6d3daff67348b8f5ec043e55e74d5b030d.ceamac@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/f2fs-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/f2fs-tools/f2fs-tools-9999.ebuild X-VCS-Directories: sys-fs/f2fs-tools/ X-VCS-Committer: ceamac X-VCS-Committer-Name: Viorel Munteanu X-VCS-Revision: bc6bcb6d3daff67348b8f5ec043e55e74d5b030d X-VCS-Branch: master Date: Tue, 11 Apr 2023 19:42:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e37e6dbc-56ce-4c92-8f8a-9b348db2a243 X-Archives-Hash: e8091bd729ae06755a1fdb0823addb4b commit: bc6bcb6d3daff67348b8f5ec043e55e74d5b030d Author: Viorel Munteanu gentoo org> AuthorDate: Tue Apr 11 19:02:17 2023 +0000 Commit: Viorel Munteanu gentoo org> CommitDate: Tue Apr 11 19:41:49 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc6bcb6d sys-fs/f2fs-tools: sync live Closes: https://github.com/gentoo/gentoo/pull/30559 Signed-off-by: Viorel Munteanu gentoo.org> sys-fs/f2fs-tools/f2fs-tools-9999.ebuild | 39 ++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/sys-fs/f2fs-tools/f2fs-tools-9999.ebuild b/sys-fs/f2fs-tools/f2fs-tools-9999.ebuild index bcb10bcc1cb6..3224cc7ec9ff 100644 --- a/sys-fs/f2fs-tools/f2fs-tools-9999.ebuild +++ b/sys-fs/f2fs-tools/f2fs-tools-9999.ebuild @@ -1,22 +1,32 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit git-r3 autotools +inherit autotools DESCRIPTION="Tools for Flash-Friendly File System (F2FS)" -HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/about/" -EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/${PN}.git" -EGIT_BRANCH="dev" +HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/about/" +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/${PN}.git" + EGIT_BRANCH="dev" +else + SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/${PN}.git/snapshot/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86" +fi LICENSE="GPL-2" -SLOT="0/9" +SLOT="0/10" IUSE="selinux" RDEPEND=" + app-arch/lz4:= + dev-libs/lzo:2 + sys-apps/util-linux selinux? ( sys-libs/libselinux ) - elibc_musl? ( sys-libs/queue-standalone )" + elibc_musl? ( sys-libs/queue-standalone ) +" DEPEND="${RDEPEND}" src_prepare() { @@ -25,17 +35,16 @@ src_prepare() { } src_configure() { - # This is required to install to /sbin, bug #481110 - econf \ - --bindir="${EPREFIX}"/sbin \ - --disable-static \ + local myconf=( + # This is required to install to /sbin, bug #481110 + --bindir="${EPREFIX}"/sbin $(use_with selinux) + ) + + econf "${myconf[@]}" } src_install() { default - find "${D}" -name "*.la" -delete || die - # Collides with sg3_utils - # https://bugs.gentoo.org/880899 - rm "${ED}/usr/sbin/sg_write_buffer" || die + find "${ED}" -name "*.la" -delete || die }