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 B7FCF158086 for ; Sun, 2 Jan 2022 17:49:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A5A472BC052; Sun, 2 Jan 2022 17:49:38 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5F15E2BC039 for ; Sun, 2 Jan 2022 17:49:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 8021D343113 for ; Sun, 2 Jan 2022 17:49:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 29E4528E for ; Sun, 2 Jan 2022 17:49:35 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1641145737.2fe8ec9a396003da52aff7d2564f1faaa2830b08.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild X-VCS-Directories: sys-fs/e2fsprogs/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 2fe8ec9a396003da52aff7d2564f1faaa2830b08 X-VCS-Branch: master Date: Sun, 2 Jan 2022 17:49:35 +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: e0c3ad59-9862-4c31-9917-2db30431d451 X-Archives-Hash: 76e668604321b2e9685acd709635ef53 commit: 2fe8ec9a396003da52aff7d2564f1faaa2830b08 Author: David Seifert gentoo org> AuthorDate: Sun Jan 2 17:48:57 2022 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Jan 2 17:48:57 2022 +0000 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 }