gentoo auto-resync : 09:12:2024 - 02:07:41

4 files changed, 5 insertions, 124 deletions

diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
index 811d511ebf8a..e03488191212 100644
--- a/sys-process/procps/Manifest
+++ b/sys-process/procps/Manifest
@@ -8,6 +8,5 @@ AUX procps-4.0.4-xfail-pmap-test.patch 697 BLAKE2B 22f9ebf50f0a89a804eaeaf9515a4
 DIST procps-ng-3.3.17.tar.xz 1008428 BLAKE2B 43aa1a21d4f0725b1c02457f343cf1fc66bc1771b25c6eaf689c9775c190e90545bfac1729f027abc4d3d13de37ffac4828554b5b25e12bcf6af9540de1695f3 SHA512 59e9a5013430fd9da508c4655d58375dc32e025bb502bb28fb9a92a48e4f2838b3355e92b4648f7384b2050064d17079bf4595d889822ebb5030006bc154a1a7
 DIST procps-ng-4.0.4.tar.xz 1401540 BLAKE2B 63b972666ef9e92042be96739ffa15c787d0346b2d3ffcb0d240b0a4e999dc90024b2c5b058df683dd9d2c436ceb812abd0b115cc877a6ca1023988b86de443f SHA512 94375544e2422fefc23d7634063c49ef1be62394c46039444f85e6d2e87e45cfadc33accba5ca43c96897b4295bfb0f88d55a30204598ddb26ef66f0420cefb4
 EBUILD procps-3.3.17-r2.ebuild 2594 BLAKE2B 59ef0d2c60f0757fa25ace71612ffacc9aa3487c5a0c3c8dcd9eaa40e5431618b86215cea6d09f5d50039ea9e19cba92f78a5564f73e16170971cd30c4f559d1 SHA512 8eba77e408fda9b4f46c1dc15590315af73d006eb56314feedafdc496f71a6302c4ef73cf290de1827356a8c2677d04d7f2c304426e4d84840b4fe268c3689b0
-EBUILD procps-4.0.4-r1.ebuild 3063 BLAKE2B aa4146d0f6f0f415ed715dff70fd13fddc29ab1d8df4a8d6faa040367faa6eb4b8e75be2464dbdf7a4c8e1cb883b6bf92f97f16b48b804f574eaa3087d1bb8f5 SHA512 01bea2d0882d9d6ff67fde2b5f27f8caef51593722964a895f54d347c263eff8bcc68aa0de26930c698b9b4fc7b6ceda601c2c41aebd74e3f8ed9728b875550c
-EBUILD procps-4.0.4.ebuild 3107 BLAKE2B a59b7e4a2a2e9befcc86777d4e033df3df07bab581c596bf8c8dbc7f9b0b854f40181012f427a4a5571a9eee34b3d50c5183bb7faae1643236dea8104d1a36b7 SHA512 f9e0a0319e4d3220ae78971f898930ed6a65eef9dbbdca0a80b2db5bf4550e402ded263756426eab725d200b6b5a4bf3fd0232ce379ba29f8609fc54fca422c0
-MISC metadata.xml 788 BLAKE2B b8352d682de7ad98344997d344783c444f326153bf5ed479d9e3032dac52b5f938c47ec83ca2d284617f98d0fbde2d9357ee7c205f74d7a2b2c586865a1de756 SHA512 cb6ebcf57a2800ae492fed52ad3de2ba7e767b121ccd6c20f8a0fd6c5fbbc97fb42d20e083ee3d3935fa6fa6e318bccd96d557c9b693507e64b22b8d3c92d1fd
+EBUILD procps-4.0.4-r2.ebuild 3091 BLAKE2B ac1b4d434432f86de9acf9a78a305241fcbbcf6b748e980ca3b9fd91d64de31aea9cabb71c49045fc2f0452d47756ccb52230b376f016170ed76e1dcada34da3 SHA512 ceaf8e6e973c6264d32f36216a327717f794c40dc80c8d7e3c47ec0193bcb38f538e0528e1f7fc0a94a9c109fbea8a47ba4bc35cf0b0a493956abfb29b03c859
+MISC metadata.xml 851 BLAKE2B bc4d9bc7e752326507a98bb04b43810300956be5ff3e974b3638a95b6d3d77031311e4b098ccb333ac5aa9b4e8df422ca9f162bc303431e08fbfc17c7ce031b3 SHA512 207879ef91d082c1dde083fa100a97cf95fce9443267e1aa32d7f1ea47a3d43baee2d134feac1a07188c68182a56d66a365cd2769ffaa844d3281f6763cf5f19
diff --git a/sys-process/procps/metadata.xml b/sys-process/procps/metadata.xml
index 7994767907f5..71e073e25d47 100644
--- a/sys-process/procps/metadata.xml
+++ b/sys-process/procps/metadata.xml
@@ -10,6 +10,7 @@
 		<flag name="kill">Build the kill program</flag>
 		<flag name="modern-top">Enables new startup defaults of top. Keeps old defaults if disabled</flag>
 		<flag name="ncurses">Build programs that use ncurses: top, slabtop, watch</flag>
+		<flag name="skill">Build the skill and snice programs</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:procps_project:procps</remote-id>
diff --git a/sys-process/procps/procps-4.0.4-r1.ebuild b/sys-process/procps/procps-4.0.4-r2.ebuild
index 87476649517d..1bfcf8898bdd 100644
--- a/sys-process/procps/procps-4.0.4-r1.ebuild
+++ b/sys-process/procps/procps-4.0.4-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${PN}-ng-${PV}
 LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+"
 SLOT="0/0-ng"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode"
+IUSE="elogind +kill modern-top +ncurses nls selinux static-libs skill systemd test unicode"
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -77,6 +77,7 @@ multilib_src_configure() {
 		$(use_enable selinux libselinux)
 		$(use_enable static-libs static)
 		$(use_with systemd)
+		$(use_enable skill)
 	)
 
 	if use ncurses; then
diff --git a/sys-process/procps/procps-4.0.4.ebuild b/sys-process/procps/procps-4.0.4.ebuild
deleted file mode 100644
index b33e8d3d2d73..000000000000
--- a/sys-process/procps/procps-4.0.4.ebuild
+++ /dev/null
@@ -1,120 +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 multilib-minimal usr-ldscript
-
-DESCRIPTION="Standard informational utilities and process-handling tools"
-HOMEPAGE="https://gitlab.com/procps-ng/procps"
-# Per e.g. https://gitlab.com/procps-ng/procps/-/releases/v4.0.4, the dist tarballs
-# are still hosted on SF.
-SRC_URI="https://downloads.sourceforge.net/${PN}-ng/${PN}-ng-${PV}.tar.xz"
-S="${WORKDIR}"/${PN}-ng-${PV}
-
-# See bug #913210
-LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+"
-SLOT="0/0-ng"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	elogind? ( sys-auth/elogind )
-	ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode(+)?] )
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	${DEPEND}
-	!<app-i18n/man-pages-l10n-4.2.0-r1
-	!<app-i18n/man-pages-de-2.12-r1
-	!<app-i18n/man-pages-pl-0.7-r1
-	kill? (
-		!sys-apps/coreutils[kill]
-		!sys-apps/util-linux[kill]
-	)
-"
-BDEPEND="
-	elogind? ( virtual/pkgconfig )
-	ncurses? ( virtual/pkgconfig )
-	systemd? ( virtual/pkgconfig )
-	test? ( dev-util/dejagnu )
-"
-
-# https://bugs.gentoo.org/898830
-QA_CONFIG_IMPL_DECL_SKIP=( makedev )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.4-sysctl-manpage.patch # bug #565304
-	"${FILESDIR}"/${PN}-4.0.4-fix-tests-multilib.patch
-	"${FILESDIR}"/${PN}-4.0.4-xfail-pmap-test.patch
-	"${FILESDIR}"/${P}-fix-systemd-linkage.patch
-)
-
-src_prepare() {
-	default
-
-	# Only for fix-tests-multilib.patch and fix-systemd-linkage.patch
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support
-	# bug #471102
-	append-lfs-flags
-
-	local myeconfargs=(
-		# No elogind multilib support
-		$(multilib_native_use_with elogind)
-		$(multilib_native_use_enable kill)
-		$(multilib_native_use_enable modern-top)
-		$(multilib_native_enable pidof)
-		$(multilib_native_use_with ncurses)
-		# bug #794997
-		$(multilib_native_use_enable !elibc_musl w)
-		$(use_enable nls)
-		$(use_enable selinux libselinux)
-		$(use_enable static-libs static)
-		$(use_with systemd)
-	)
-
-	if use ncurses; then
-		# Only pass whis when we are building the 'watch' command
-		myeconfargs+=( $(multilib_native_use_enable unicode watch8bit) )
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	local ps="${BUILD_DIR}/src/ps/pscommand"
-	if [[ $("${ps}" --no-headers -o cls -q $$) == IDL ]]; then
-		# bug 708230
-		ewarn "Skipping tests due to SCHED_IDLE"
-	else
-		# bug #461302
-		emake check </dev/null
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	dodoc "${S}"/sysctl.conf
-
-	if multilib_is_native_abi ; then
-		dodir /bin
-		mv "${ED}"/usr/bin/ps "${ED}"/bin/ || die
-		if use kill ; then
-			mv "${ED}"/usr/bin/kill "${ED}"/bin/ || die
-		fi
-
-		gen_usr_ldscript -a proc2
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-}