Diff systemd-utils-253.12-r1 with a systemd-utils-254.5-r1

/usr/portage/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild 2023-10-09 14:52:35.408368499 +0300
6 6

  
7 7
QA_PKGCONFIG_VERSION=$(ver_cut 1)
8 8

  
9
inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
9
inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-single-r1
10 10
inherit secureboot toolchain-funcs udev usr-ldscript
11 11

  
12 12
DESCRIPTION="Utilities split out from systemd for OpenRC users"
......
22 22
	SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
23 23
fi
24 24

  
25
MUSL_PATCHSET="systemd-musl-patches-253.3"
25
MUSL_PATCHSET="systemd-musl-patches-254.3"
26 26
SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
27 27

  
28 28
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
29 29
SLOT="0"
30 30
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
31 31
IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
32
REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
32
REQUIRED_USE="
33
	|| ( boot tmpfiles sysusers udev )
34
	${PYTHON_REQUIRED_USE}
35
"
33 36
RESTRICT="!test? ( test )"
34 37

  
35 38
COMMON_DEPEND="
......
53 56
"
54 57
DEPEND="${COMMON_DEPEND}
55 58
	>=sys-kernel/linux-headers-3.11
56
	boot? ( >=sys-boot/gnu-efi-3.0.2 )
57 59
"
60

  
61
PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
62

  
58 63
RDEPEND="${COMMON_DEPEND}
59
	boot? ( !<sys-boot/systemd-boot-250 )
64
	boot? (
65
		!<sys-boot/systemd-boot-250
66
		${PYTHON_DEPS}
67
		$(python_gen_cond_dep "${PEFILE_DEPEND}")
68
	)
60 69
	tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
61 70
	udev? (
62 71
		acct-group/audio
......
85 94
	udev? ( >=sys-fs/udev-init-scripts-34 )
86 95
"
87 96
BDEPEND="
88
	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
89 97
	app-text/docbook-xml-dtd:4.2
90 98
	app-text/docbook-xml-dtd:4.5
91 99
	app-text/docbook-xsl-stylesheets
......
94 102
	>=sys-apps/coreutils-8.16
95 103
	sys-devel/gettext
96 104
	virtual/pkgconfig
105
	$(python_gen_cond_dep "
106
		dev-python/jinja[\${PYTHON_USEDEP}]
107
		dev-python/lxml[\${PYTHON_USEDEP}]
108
		boot? (
109
			>=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
110
			test? ( ${PEFILE_DEPEND} )
111
		)
112
	")
97 113
"
98 114

  
99 115
TMPFILES_OPTIONAL=1
100 116
UDEV_OPTIONAL=1
101 117

  
102
python_check_deps() {
103
	python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
104
}
105

  
106 118
QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
107 119
QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
108 120

  
......
118 130

  
119 131
src_prepare() {
120 132
	local PATCHES=(
133
		"${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
121 134
	)
122 135

  
123 136
	if use elibc_musl; then
124
		# Applied upstream
125
		rm "${WORKDIR}/${MUSL_PATCHSET}/0015-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch" || die
126 137
		PATCHES+=(
127 138
			"${WORKDIR}/${MUSL_PATCHSET}"
128 139
		)
......
147 158
		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
148 159
		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
149 160
		-Dsysvinit-path=
150
		$(meson_native_use_bool boot efi)
151
		$(meson_native_use_bool boot gnu-efi)
152
		$(meson_native_use_bool boot kernel-install)
161
		$(meson_native_use_bool boot bootloader)
153 162
		$(meson_native_use_bool selinux)
154 163
		$(meson_native_use_bool sysusers)
155 164
		$(meson_use test tests)
156 165
		$(meson_native_use_bool tmpfiles)
157 166
		$(meson_use udev hwdb)
158 167

  
159
		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
160

  
161 168
		# Link staticly with libsystemd-shared
162 169
		-Dlink-boot-shared=false
170
		-Dlink-kernel-install-shared=false
163 171
		-Dlink-udev-shared=false
164 172

  
165 173
		# systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
......
278 286
				man/bootctl.1
279 287
				man/kernel-install.8
280 288
				90-loaderentry.install
281
				src/boot/efi/linux$(efi_arch).{efi,elf}.stub
289
				src/boot/efi/linux$(efi_arch).efi.stub
282 290
				src/boot/efi/systemd-boot$(efi_arch).efi
283 291
			)
284 292
		fi
......
302 310
				tmpfiles.d/{etc,static-nodes-permissions,var}.conf
303 311
			)
304 312
			if use test; then
305
				targets+=( test-tmpfiles )
313
				targets+=( test-tmpfile-util )
306 314
			fi
307 315
		fi
308 316
		if use udev; then
......
337 345
				man/udev_new.3
338 346
				hwdb.d/60-autosuspend-chromiumos.hwdb
339 347
				rules.d/50-udev-default.rules
348
				rules.d/60-persistent-storage.rules
340 349
				rules.d/64-btrfs.rules
341 350
			)
342 351
			if use test; then
343 352
				targets+=(
344
					# Used by udev-test.pl
345
					systemd-detect-virt
346
					test/sys
347
					test-udev
348

  
349 353
					test-fido-id-desc
350 354
					test-udev-builtin
351 355
					test-udev-event
352 356
					test-udev-node
353 357
					test-udev-util
358
					udev-rule-runner
354 359
				)
355 360
			fi
356 361
		fi
......
384 389
		if use tmpfiles; then
385 390
			tests+=(
386 391
				test-systemd-tmpfiles.standalone
387
				test-tmpfiles
392
				test-tmpfile-util
388 393
			)
389 394
		fi
390 395
		if use udev; then
391 396
			tests+=(
392 397
				rule-syntax-check
393 398
				test-fido-id-desc
399
				test-udev
394 400
				test-udev-builtin
395 401
				test-udev-event
396 402
				test-udev-node
397 403
				test-udev-util
398 404
			)
399
			if [[ -w /dev ]]; then
400
				tests+=( udev-test )
401
			else
402
				ewarn "Skipping udev-test (needs write access to /dev)"
403
			fi
404 405
		fi
405 406
	fi
406 407
	if use udev; then
......
452 453
			exeinto "${rootprefix}"/lib/udev
453 454
			doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
454 455

  
456
			rm -f rules.d/99-systemd.rules
455 457
			insinto "${rootprefix}"/lib/udev/rules.d
456 458
			doins rules.d/*.rules
457 459

  
Thank you!