From 80df7c19177b8333aae4e986a7fffb9d0a657b25 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Mon, 26 Feb 2024 06:57:06 +0100 Subject: sys-apps/debianutils: drop installkernel use flag Random packages requiring some tool from Debian should not cause the kernel installation process to change. The dropping of the debianutils dependency in ca-certificates has already caused some surprises due to installkernel being depcleaned. The origin of the problem lies here in debianutils, users unknowingly use and rely on installkernel but do not have it in their world file because it was implicitly pulled in by some package that happens to use the run-parts command. And also the other way around. If I am one of the users that wants to do everything manually, I should not have my 'make install' unknowingly altered by some package that I installed which pulled debianutils into the depgraph. Drop this unused runtime dependency (which is against policy to begin with) and its accompanying flag. A news item will be posted to notify users of this change and instruct them to add installkernel to their world file. Signed-off-by: Andrew Ammerlaan Closes: https://github.com/gentoo/gentoo/pull/35533 Signed-off-by: Andrew Ammerlaan --- sys-apps/debianutils/debianutils-5.14-r1.ebuild | 43 ++++++++++++++++++++++ sys-apps/debianutils/debianutils-5.14.ebuild | 47 ------------------------- sys-apps/debianutils/metadata.xml | 6 ---- 3 files changed, 43 insertions(+), 53 deletions(-) create mode 100644 sys-apps/debianutils/debianutils-5.14-r1.ebuild delete mode 100644 sys-apps/debianutils/debianutils-5.14.ebuild (limited to 'sys-apps/debianutils') diff --git a/sys-apps/debianutils/debianutils-5.14-r1.ebuild b/sys-apps/debianutils/debianutils-5.14-r1.ebuild new file mode 100644 index 000000000000..fc46992478ea --- /dev/null +++ b/sys-apps/debianutils/debianutils-5.14-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +DESCRIPTION="A selection of tools from Debian" +HOMEPAGE="https://packages.qa.debian.org/d/debianutils.html" +SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz" + +LICENSE="BSD GPL-2 SMAIL" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux" +IUSE="static" + +PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch ) + +src_prepare() { + # Avoid adding po4a dependency, upstream refreshes manpages. + sed -i -e '/SUBDIRS/s|po4a||' Makefile.am || die + + default + eautoreconf +} + +src_configure() { + use static && append-ldflags -static + default +} + +src_install() { + einstalldocs + + into / + dobin run-parts + + into /usr + dobin ischroot + dosbin savelog + + doman ischroot.1 run-parts.8 savelog.8 +} diff --git a/sys-apps/debianutils/debianutils-5.14.ebuild b/sys-apps/debianutils/debianutils-5.14.ebuild deleted file mode 100644 index ade4ad363a49..000000000000 --- a/sys-apps/debianutils/debianutils-5.14.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic - -DESCRIPTION="A selection of tools from Debian" -HOMEPAGE="https://packages.qa.debian.org/d/debianutils.html" -SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz" - -LICENSE="BSD GPL-2 SMAIL" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux" -IUSE="+installkernel static" - -PDEPEND=" - installkernel? ( sys-kernel/installkernel ) -" - -PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch ) - -src_prepare() { - # Avoid adding po4a dependency, upstream refreshes manpages. - sed -i -e '/SUBDIRS/s|po4a||' Makefile.am || die - - default - eautoreconf -} - -src_configure() { - use static && append-ldflags -static - default -} - -src_install() { - einstalldocs - - into / - dobin run-parts - - into /usr - dobin ischroot - dosbin savelog - - doman ischroot.1 run-parts.8 savelog.8 -} diff --git a/sys-apps/debianutils/metadata.xml b/sys-apps/debianutils/metadata.xml index 42573629d611..b0d83aa2e489 100644 --- a/sys-apps/debianutils/metadata.xml +++ b/sys-apps/debianutils/metadata.xml @@ -5,10 +5,4 @@ base-system@gentoo.org Gentoo Base System - - - Install /sbin/installkernel script (for Linux). - installkernel is required whenever a kernel will be installed via make install - - -- cgit v1.2.3-65-gdbad