From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1523604-garchives=archives.gentoo.org@lists.gentoo.org>
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 B295D15810D
for <garchives@archives.gentoo.org>; Wed, 31 May 2023 02:30:42 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D7239E09ED;
Wed, 31 May 2023 02:30:41 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(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 B65B7E09ED
for <gentoo-commits@lists.gentoo.org>; Wed, 31 May 2023 02:30:41 +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) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id BBA73340F96
for <gentoo-commits@lists.gentoo.org>; Wed, 31 May 2023 02:30:40 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 231C2A82
for <gentoo-commits@lists.gentoo.org>; Wed, 31 May 2023 02:30:39 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1685500213.224a5359b006b74a2e1fb948adb931e89e25e59d.sam@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.5-r3.ebuild sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild sys-fs/e2fsprogs/metadata.xml
X-VCS-Directories: sys-fs/e2fsprogs/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 224a5359b006b74a2e1fb948adb931e89e25e59d
X-VCS-Branch: master
Date: Wed, 31 May 2023 02:30:39 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 5ac7f976-e85c-4d08-8441-805666d9ae6b
X-Archives-Hash: 0632ee40e4384783128bc6a7e4314850
commit: 224a5359b006b74a2e1fb948adb931e89e25e59d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 31 02:29:48 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 31 02:30:13 2023 +0000
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 <sam <AT> 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..000000000000
--- 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 '<blkid/blkid.h>' 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 lib/ext2fs's check target
- emake -C lib/support V=1
-
- # For non-native, there's no binaries to test. Just libraries.
- emake -C lib/et V=1 check
- emake -C lib/ss V=1 check
- emake -C lib/ext2fs V=1 check
- emake -C lib/e2p V=1 check
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi && use tools ; then
- emake STRIP=':' V=1 DESTDIR="${D}" install
- else
- emake -C lib/et V=1 DESTDIR="${D}" install
- emake -C lib/ss V=1 DESTDIR="${D}" install
- emake -C lib/ext2fs V=1 DESTDIR="${D}" install
- emake -C lib/e2p V=1 DESTDIR="${D}" install
- fi
-
- # Move shared libraries to /lib/, install static libraries to
- # /usr/lib/, and install linker scripts to /usr/lib/.
- gen_usr_ldscript -a com_err ss ext2fs e2p
-
- # configure doesn't have an option to disable static libs :/
- if ! use static-libs ; then
- find "${ED}" -name '*.a' -delete || die
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- if use tools ; then
- insinto /etc
- doins "${FILESDIR}"/e2fsck.conf
- fi
-}
-
-pkg_postinst() {
- udev_reload
-}
-
-pkg_postrm() {
- udev_reload
-}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild
deleted file mode 100644
index 07ab6fecf136..000000000000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild
+++ /dev/null
@@ -1,169 +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 '<blkid/blkid.h>' from sys-apps/util-linux.
-DEPEND="
- ${RDEPEND}
- test? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
-"
-BDEPEND="
- sys-apps/texinfo
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
-"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/ext2fs/ext2_types.h
-)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch # bug #516854
-
- # Upstream patches (can usually removed with next version bump)
-)
-
-src_prepare() {
- default
-
- cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
-
- # Get rid of doc -- we don't use them. This also prevents a sandbox
- # violation due to mktexfmt invocation
- rm -r doc || die "Failed to remove doc dir"
-
- # Prevent included intl cruft from building, bug #81096
- sed -i -r \
- -e 's:@LIBINTL@:@LTLIBINTL@:' \
- MCONFIG.in || die 'intl cruft'
-}
-
-multilib_src_configure() {
- # Keep the package from doing silly things, bug #261411
- export VARTEXFONTS="${T}/fonts"
-
- # Needs open64() prototypes and friends
- append-cppflags -D_GNU_SOURCE
-
- local myeconfargs=(
- --with-root-prefix="${EPREFIX}"
- $(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
- --with-systemd-unit-dir="$(systemd_get_systemunitdir)"
- --with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d"
- --enable-symlink-install
- --enable-elf-shlibs
- $(tc-has-tls || echo --disable-tls)
- $(multilib_native_use_enable fuse fuse2fs)
- $(use_enable nls)
- $(multilib_native_use_enable tools e2initrd-helper)
- --disable-fsck
- --disable-uuidd
- --disable-lto
- --disable-largefile # need to check effect on ABI
- --with-pthread
- )
-
- # We use blkid/uuid from util-linux now
- if use kernel_linux ; then
- export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes
- myeconfargs+=( --disable-lib{blkid,uuid} )
- fi
-
- ac_cv_path_LDCONFIG=: \
- ECONF_SOURCE="${S}" \
- CC="$(tc-getCC)" \
- BUILD_CC="$(tc-getBUILD_CC)" \
- BUILD_LD="$(tc-getBUILD_LD)" \
- econf "${myeconfargs[@]}"
-
- if grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
- eerror "INTL sanity check failed, aborting build."
- eerror "Please post your ${S}/config.log file as an"
- eerror "attachment to https://bugs.gentoo.org/81096"
- die "Preventing included intl cruft from building"
- fi
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi && use tools ; then
- emake V=1
- else
- emake -C lib/et V=1
- emake -C lib/ss V=1
- emake -C lib/ext2fs V=1
- emake -C lib/e2p V=1
- fi
-}
-
-multilib_src_test() {
- if multilib_is_native_abi && use tools ; then
- emake V=1 check
- else
- # Required by lib/ext2fs's check target
- emake -C lib/support V=1
-
- # For non-native, there's no binaries to test. Just libraries.
- emake -C lib/et V=1 check
- emake -C lib/ss V=1 check
- emake -C lib/ext2fs V=1 check
- emake -C lib/e2p V=1 check
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi && use tools ; then
- emake STRIP=':' V=1 DESTDIR="${D}" install
- else
- emake -C lib/et V=1 DESTDIR="${D}" install
- emake -C lib/ss V=1 DESTDIR="${D}" install
- emake -C lib/ext2fs V=1 DESTDIR="${D}" install
- emake -C lib/e2p V=1 DESTDIR="${D}" install
- fi
-
- # Move shared libraries to /lib/, install static libraries to
- # /usr/lib/, and install linker scripts to /usr/lib/.
- gen_usr_ldscript -a com_err ss ext2fs e2p
-
- # configure doesn't have an option to disable static libs
- if ! use static-libs ; then
- find "${ED}" -name '*.a' -delete || die
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- if use tools ; then
- insinto /etc
- doins "${FILESDIR}"/e2fsck.conf
- fi
-}
-
-pkg_postinst() {
- udev_reload
-}
-
-pkg_postrm() {
- udev_reload
-}
diff --git a/sys-fs/e2fsprogs/metadata.xml b/sys-fs/e2fsprogs/metadata.xml
index a7ce0f49f403..3030299059ee 100644
--- a/sys-fs/e2fsprogs/metadata.xml
+++ b/sys-fs/e2fsprogs/metadata.xml
@@ -8,7 +8,6 @@
<use>
<flag name="cron">Install e2scrub_all cron script</flag>
<flag name="fuse">Build fuse2fs, a FUSE file system client for ext2/ext3/ext4 file systems</flag>
- <flag name="lto">Build with link time optimization (LTO)</flag>
<flag name="tools">Build extfs tools (mke2fs, e2fsck, tune2fs, etc.)</flag>
</use>
<upstream>