Diff procps-3.3.17-r2 with a procps-4.0.4

/usr/portage/sys-process/procps/procps-4.0.4.ebuild 2023-10-09 14:52:35.584368504 +0300
1 1
# Copyright 1999-2023 Gentoo Authors
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4
EAPI=7
4
EAPI=8
5 5

  
6
# See https://bugs.gentoo.org/835813 before bumping to 4.x!
7

  
8
inherit flag-o-matic multilib-minimal usr-ldscript
6
inherit autotools flag-o-matic multilib-minimal usr-ldscript
9 7

  
10 8
DESCRIPTION="Standard informational utilities and process-handling tools"
11
HOMEPAGE="http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps"
9
HOMEPAGE="https://gitlab.com/procps-ng/procps"
10
# Per e.g. https://gitlab.com/procps-ng/procps/-/releases/v4.0.4, the dist tarballs
11
# are still hosted on SF.
12 12
SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz"
13
S="${WORKDIR}"/${PN}-ng-${PV}
13 14

  
14
LICENSE="GPL-2"
15
SLOT="0/8" # libprocps.so
16
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
15
# See bug #913210
16
LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+"
17
SLOT="0/0-ng"
18
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
17 19
IUSE="elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode"
18 20
RESTRICT="!test? ( test )"
19 21

  
......
23 25
	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
24 26
	systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] )
25 27
"
28
RDEPEND="
29
	${DEPEND}
30
	!<app-i18n/man-pages-l10n-4.2.0-r1
31
	!<app-i18n/man-pages-de-2.12-r1
32
	!<app-i18n/man-pages-pl-0.7-r1
33
	kill? (
34
		!sys-apps/coreutils[kill]
35
		!sys-apps/util-linux[kill]
36
	)
37
"
26 38
BDEPEND="
27 39
	elogind? ( virtual/pkgconfig )
28 40
	ncurses? ( virtual/pkgconfig )
29 41
	systemd? ( virtual/pkgconfig )
30 42
	test? ( dev-util/dejagnu )
31 43
"
32
RDEPEND="${DEPEND}
33
	kill? (
34
		!sys-apps/coreutils[kill]
35
		!sys-apps/util-linux[kill]
36
	)
37
	!<app-i18n/man-pages-l10n-4.2.0-r1
38
	!<app-i18n/man-pages-de-2.12-r1
39
	!<app-i18n/man-pages-pl-0.7-r1
40
"
41 44

  
42 45
# https://bugs.gentoo.org/898830
43 46
QA_CONFIG_IMPL_DECL_SKIP=( makedev )
44 47

  
45 48
PATCHES=(
46
	"${FILESDIR}"/${PN}-3.3.11-sysctl-manpage.patch # 565304
47
	"${FILESDIR}"/${PN}-3.3.12-proc-tests.patch # 583036
49
	"${FILESDIR}"/${PN}-4.0.4-sysctl-manpage.patch # bug #565304
50
	"${FILESDIR}"/${PN}-4.0.4-fix-tests-multilib.patch
51
	"${FILESDIR}"/${PN}-4.0.4-xfail-pmap-test.patch
52
	"${FILESDIR}"/${P}-fix-systemd-linkage.patch
48 53
)
49 54

  
50 55
src_prepare() {
51 56
	default
52 57

  
53
	# Please drop this after 3.3.17 and instead use --disable-w on musl.
54
	# bug #794997
55
	use elibc_musl && eapply "${FILESDIR}"/${PN}-3.3.17-musl-fix.patch
58
	# Only for fix-tests-multilib.patch and fix-systemd-linkage.patch
59
	eautoreconf
56 60
}
57 61

  
58 62
multilib_src_configure() {
59 63
	# http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support
60
	append-lfs-flags #471102
64
	# bug #471102
65
	append-lfs-flags
61 66

  
62 67
	local myeconfargs=(
63
		$(multilib_native_use_with elogind) # No elogind multilib support
68
		# No elogind multilib support
69
		$(multilib_native_use_with elogind)
64 70
		$(multilib_native_use_enable kill)
65 71
		$(multilib_native_use_enable modern-top)
72
		$(multilib_native_enable pidof)
66 73
		$(multilib_native_use_with ncurses)
74
		# bug #794997
75
		$(multilib_native_use_enable !elibc_musl w)
76
		$(multilib_native_use_enable unicode watch8bit)
67 77
		$(use_enable nls)
68 78
		$(use_enable selinux libselinux)
69 79
		$(use_enable static-libs static)
70 80
		$(use_with systemd)
71
		$(use_enable unicode watch8bit)
72 81
	)
82

  
73 83
	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
74 84
}
75 85

  
76 86
multilib_src_test() {
77
	emake check </dev/null #461302
87
	# bug #461302
88
	emake check </dev/null
78 89
}
79 90

  
80 91
multilib_src_install() {
81 92
	default
93

  
82 94
	dodoc "${S}"/sysctl.conf
83 95

  
84 96
	if multilib_is_native_abi ; then
......
88 100
			mv "${ED}"/usr/bin/kill "${ED}"/bin/ || die
89 101
		fi
90 102

  
91
		gen_usr_ldscript -a procps
103
		gen_usr_ldscript -a proc2
92 104
	fi
93 105
}
94 106

  
Thank you!