commit: daee7b2891e51fc218016d7363b654276c15d86e Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Tue Mar 5 12:17:16 2024 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Tue Mar 5 15:40:05 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daee7b28
sys-apps/util-linux: Allow hexdump to be invoked as hd hexdump(1) automatically uses -C when called as "hd". Closes: https://bugs.gentoo.org/926091 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> .../{util-linux-9999.ebuild => util-linux-2.39.3-r3.ebuild} | 13 +++++++++++++ sys-apps/util-linux/util-linux-9999.ebuild | 3 +++ 2 files changed, 16 insertions(+) diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r3.ebuild similarity index 96% copy from sys-apps/util-linux/util-linux-9999.ebuild copy to sys-apps/util-linux/util-linux-2.39.3-r3.ebuild index f0f5f21353c8..3458a795464b 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r3.ebuild @@ -97,6 +97,12 @@ fi REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )" RESTRICT="!test? ( test )" +PATCHES=( + "${FILESDIR}"/${PN}-2.39.2-fincore-test.patch + "${FILESDIR}"/${PN}-2.39.2-backport-pr2251.patch + "${FILESDIR}"/${PN}-2.39.2-backport-1d4456d.patch +) + pkg_pretend() { if use su && ! use suid ; then elog "su will be installed as suid despite USE=-suid (bug #832092)" @@ -205,6 +211,10 @@ multilib_src_configure() { --localstatedir="${EPREFIX}/var" --runstatedir="${EPREFIX}/run" --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" + + # Temporary workaround until ~2.39.2. 2.39.x introduced a big rewrite. + # https://github.com/util-linux/util-linux/issues/2287#issuecomment-1576640373 + --disable-libmount-mountfd-support ) local myeconfargs=( @@ -351,6 +361,9 @@ multilib_src_install() { multilib_src_install_all() { dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} + dosym hexdump /usr/bin/hd + newman - hd.1 <<< '.so man1/hexdump.1' + # e2fsprogs-libs didn't install .la files, and .pc work fine find "${ED}" -name "*.la" -delete || die diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index f0f5f21353c8..19f6a4af62d1 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -351,6 +351,9 @@ multilib_src_install() { multilib_src_install_all() { dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} + dosym hexdump /usr/bin/hd + newman - hd.1 <<< '.so man1/hexdump.1' + # e2fsprogs-libs didn't install .la files, and .pc work fine find "${ED}" -name "*.la" -delete || die
