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

[David Seifert]

commit:     ab289a1fbf96a9688dc88a8bb71e5e5186378488
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 30 21:07:28 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Dec 30 21:07:28 2021 +0000
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 <soap <AT> 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..000000000000
--- 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 <ss/ss_err.h>' > 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 [[ ${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
-}
-
-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() {
-	# need to set root_libdir= manually as any --libdir options in the
-	# econf above (i.e. multilib) will screw up the default #276465
-	emake \
-		STRIP=: \
-		root_libdir="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" \
-		install
-
-	einstalldocs
-
-	insinto /etc
-	doins "${FILESDIR}"/e2fsck.conf
-
-	# Move shared libraries to /lib/, install static libraries to
-	# /usr/lib/, and install linker scripts to /usr/lib/.
-	gen_usr_ldscript -a e2p ext2fs
-
-	# configure doesn't have an option to disable static libs :/
-	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
-}