diff options
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/Manifest.gz | bin | 48684 -> 48684 bytes | |||
-rw-r--r-- | sys-apps/ipmitool/Manifest | 2 | ||||
-rw-r--r-- | sys-apps/ipmitool/metadata.xml | 1 | ||||
-rw-r--r-- | sys-apps/merge-usr/Manifest | 2 | ||||
-rw-r--r-- | sys-apps/merge-usr/merge-usr-0.ebuild | 2 | ||||
-rw-r--r-- | sys-apps/pcsc-lite/Manifest | 4 | ||||
-rw-r--r-- | sys-apps/pcsc-lite/files/pcsc-lite-1.9.8-systemd-user.patch | 18 | ||||
-rw-r--r-- | sys-apps/pcsc-lite/files/pcscd.conf | 1 | ||||
-rw-r--r-- | sys-apps/pcsc-lite/pcsc-lite-1.9.8-r2.ebuild (renamed from sys-apps/pcsc-lite/pcsc-lite-1.9.8.ebuild) | 39 | ||||
-rw-r--r-- | sys-apps/pcsc-tools/Manifest | 2 | ||||
-rw-r--r-- | sys-apps/pcsc-tools/metadata.xml | 14 | ||||
-rw-r--r-- | sys-apps/systemd-utils/Manifest | 3 | ||||
-rw-r--r-- | sys-apps/systemd-utils/systemd-utils-251.3.ebuild | 2 | ||||
-rw-r--r-- | sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild | 521 | ||||
-rw-r--r-- | sys-apps/systemd/Manifest | 6 | ||||
-rw-r--r-- | sys-apps/systemd/systemd-251.3.ebuild | 2 | ||||
-rw-r--r-- | sys-apps/systemd/systemd-251.4.ebuild | 3 | ||||
-rw-r--r-- | sys-apps/systemd/systemd-9999.ebuild | 3 |
18 files changed, 587 insertions, 38 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz Binary files differindex 0d0584379168..07c4cec80126 100644 --- a/sys-apps/Manifest.gz +++ b/sys-apps/Manifest.gz diff --git a/sys-apps/ipmitool/Manifest b/sys-apps/ipmitool/Manifest index a9f96e263063..38063daeb102 100644 --- a/sys-apps/ipmitool/Manifest +++ b/sys-apps/ipmitool/Manifest @@ -7,4 +7,4 @@ DIST enterprise-numbers.2020-10-21.xz 1426932 BLAKE2B bfe39ceea321ba47cd40eafa67 DIST ipmitool-1.8.18_p20201004.tar.gz 638493 BLAKE2B 52f4ec8c82336b88640d1b91fc17af8f2fe0948a5c48c16067867dcad0852168d48bb21fdd99bde7ed957b66df888fd369c909079d1f81c861acd8c7f8dfa6f2 SHA512 8d72eef3584f4d2c86bfe43f70b5d687f3b7bbdf75b8979f7132c5c98b01baae22c336e540c197652187749fc9bb221a92e546b56e5cf2eb5650fad5094e9433 DIST ipmitool_1.8.18-9.debian-ported-gentoo.tar.xz 3208 BLAKE2B b37a127eff361039b3b810e19dd97f0c395462b658803f56f10f2dd1abbbe92743dc409ce6b83560db15621b7fa7a3c0f989100077893993df18108a082e49d2 SHA512 0f7646a2307ac98425e99dece9d3e3b23026136a97524151efdecc910fb537af41a91702782989046e44163da98610fa05792878473e228b45c16351f6015a45 EBUILD ipmitool-1.8.18_p20201004-r3.ebuild 6249 BLAKE2B 3d5060e5488181de705843c4845ac1c1ff50fb9f2096ab2876b111db2312079cb6111682f34faaa9edb3b2e30fb86db1a2d7359c47f7289d70b2087a3827526d SHA512 ebfc290090a08042a469ed30705c0f16f9b6e6ab15d8a0bf18f244037017b76a0d3299a15eb9ea22abf116d31b1bb74f6ec441b2199ea2fd7ee2694bd3ff3037 -MISC metadata.xml 634 BLAKE2B 8f56c8e88bb4147ce99d881ccc9f3f9fba657be1bd9abdb9d646456e2f7deedd3f7ab484b5db339288021cf692e21ca9a0030cb884869676346dbd22cf60c41f SHA512 b2eb0b961fb7cedb0f293db8974e093a03d8b312123c36ce1d451b8a0b34508ad12a2c8ee0704649c30dfd6a8b1a03c7a021d55cb9da6983648747399982e801 +MISC metadata.xml 693 BLAKE2B 7a0cab3772eb4ebc0529b22ab7fa21eae882da4b652fe67c3abfc8e25b1f5a6d14a52089ec676a17a0a925436675ec80409cde8d2554c4f6dce50c4afc736b14 SHA512 8a2ace6c302db4437e6903899edf87aa005f47c5e84969e4d846f67e97a027bda05fced0ca2b1a8a09f12ed5be3ce9bdabfc1b75643c2a9435ba706a452eb055 diff --git a/sys-apps/ipmitool/metadata.xml b/sys-apps/ipmitool/metadata.xml index dc4d508dec2b..5a7c948d8055 100644 --- a/sys-apps/ipmitool/metadata.xml +++ b/sys-apps/ipmitool/metadata.xml @@ -13,5 +13,6 @@ <upstream> <remote-id type="sourceforge">ipmitool</remote-id> <remote-id type="launchpad">ubuntu</remote-id> + <remote-id type="github">ipmitool/ipmitool</remote-id> </upstream> </pkgmetadata> diff --git a/sys-apps/merge-usr/Manifest b/sys-apps/merge-usr/Manifest index 8fafcb67d623..c3371aca7d30 100644 --- a/sys-apps/merge-usr/Manifest +++ b/sys-apps/merge-usr/Manifest @@ -1,3 +1,3 @@ DIST merge-usr-0.tar.gz 9022 BLAKE2B b8590bbdff92f1297fb0a3335a3a380464661025c1d57e526df1c665966c3732e4cb1b7333d5108aac34b59d70032978cea4b6e93dd4c5e0a9069174e412d8e3 SHA512 3ccba0360cf576f3d2c5fca63a4b8119e85840165f085172d6d3b8fcab212285fc8511c2004e303144870ba7738305d4030360f14196a6b73df40c6842abc40b -EBUILD merge-usr-0.ebuild 576 BLAKE2B 3070a2ea03cd98c9e10aa48a5115f1b29fdf71c945e052cd5dea8f278f57d8063c150f794220eec8a4e2ade174098f699ad76d512f184892318575137658a2a7 SHA512 be1973b2392d4747dcf4f00cc74012a6cd45a95875af87732e75ae404f38dcf21de3770e52397cf2046c7134fc8d6a4384d5ea5ea99676cc84a204077690694f +EBUILD merge-usr-0.ebuild 582 BLAKE2B 2370685a9b69e2e79e9ff9f96e94d17feacd16fb8deb6f74b437b6ec7da058e52135f14b16ec9fff1cda19d32bf2db3fbbe5d0d5ccca70f902523f51c88bf2f3 SHA512 4d10476941d9a389d592ec78d7b06ab86c997d5bd2ac71df0410c437c764196adacfc07aea5f1e60c1a0a76efce476f81f8bacda69c12a2afa803560b6ee244d MISC metadata.xml 329 BLAKE2B fdb965403d89b88b2bb3c1bbb5ae8dd614dfce3f8ebc379aeee60c2d55b529887e3663b3db98a0e1fd078cf62762888bd71685eaa052c73b821d944da16413de SHA512 8a55a22b7e45363c1e2b964cb80324584814a28b6aae34f88e061f6ab137d869905be1bc16590391b082bed98602b69e06def88ea90dde0be92279733fff2890 diff --git a/sys-apps/merge-usr/merge-usr-0.ebuild b/sys-apps/merge-usr/merge-usr-0.ebuild index 501e2c113d07..d64a710e8157 100644 --- a/sys-apps/merge-usr/merge-usr-0.ebuild +++ b/sys-apps/merge-usr/merge-usr-0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/floppym/merge-usr/archive/refs/tags/v${PV}.tar.gz -> LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~s390 ~sparc" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~s390 ~sparc" REQUIRED_USE="${PYTHON_REQUIRED_USE}" BDEPEND="${PYTHON_DEPS}" diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest index 449d399a36f9..90f559f89f63 100644 --- a/sys-apps/pcsc-lite/Manifest +++ b/sys-apps/pcsc-lite/Manifest @@ -1,9 +1,11 @@ AUX 99-pcscd-hotplug-r1.rules 363 BLAKE2B 65049122751de2d50f60449cebaa948ce276680d969ef1a13700a3fc7577c90e24b96b69f2285389361aeb6dfbdd7f0eb49faa953855ba39473270aa530c395f SHA512 45c1d50175844b4f46d0a5a15855bfb929d4848f9570e92c3327a95fce7aeb11fda7cecd1c24338aed96b696134baa1715ab59ac578af7c11e43bbc73b27a990 AUX pcsc-lite-1.8.11-polkit-pcscd.patch 744 BLAKE2B b9a846a989d1708a30bb62e93ab19fbf5cfe4c2c601d435b53a8933117d919a4fbac8835e68b895507840a25a9aab85e35f6b4c2e7461ec3c7893d483e12f759 SHA512 4f8b774ec888d51c0ad82431cb9d041be6b69af0bfa2a535c6b7e47afb0056147c08ab9265d7da2259a74347ceba9dba320ad0892d3a25797efc64b79113f4a5 +AUX pcsc-lite-1.9.8-systemd-user.patch 415 BLAKE2B dd29a0965167cde394e95bb751f6d193935234f15b2eb6ab03a1c70fb5c7fcf43d2c2b81be9c8c9e29d87affca68d1b236ea1db3fbb1ca7ddcd63e4e3da4c35c SHA512 8c1fde18596e1642aef08adb6a23be36930f0f1a6946c6e27b283cff6556afd75f54e6995ca0c62cbf86aa56157961637981cf046a04d17ede93518408ffe65a AUX pcscd-init.7 408 BLAKE2B 54e4995a169b7f816b0de9b409ae94a8328e792b50872d583988cc87ad20b5c2d20559f3702dc4525dcc46c4afabf817c1e76f4a080ca277f9ab01ebcf67441f SHA512 24fbd0fe2847f6c7bb961e4e0d9fa5197d408971fc33fa7652893ce9dbba958d19b02be7688afd4e9617520f93b6544af74968d6fcc3b31ad73b3ac585e87500 AUX pcscd-udev 330 BLAKE2B 50e99953aec238fe98c6aee5219d3978b44d37c90ce74c9cb8e19b37c8677001e9b1b3701df8246bf051c6cf8b5c971f86bf1f580bfcbff270b8937328ca887d SHA512 06b672135fda9f83af4f030ff8078f8e1194ced529334c17c1a93f81ee9a5d4448bcea5ffec398f01d957a6607fbde7f69fbc23d727bb3ffad48a305cefe5c26 +AUX pcscd.conf 32 BLAKE2B 2407e00c654d7e259ebf69ab420800f5605cb3ead23eb4aa07317928c38b6328eae2e566fab84c8844fb80e8a165cd32982fee753498b20c7a750f52fbb1f995 SHA512 ae27cdab8a60201639b9d9aca2d7f760146a5c5238878a0ebb562740385bf58f04bbc37a19cd1a2c8c69ee463f10beecc6531dde733cb6a6d4b06816f54b1569 DIST pcsc-lite-1.9.7.tar.bz2 784685 BLAKE2B 74848b06ce9e497287cc4a8f307a194d766091a35af46300bd1dcdbf730c3f86f14928ff2e576ac83c07a37234b866e0b2cb3afd3d963b8570051c5c4880f4b9 SHA512 0c7f6c0efcfd6f6996e9e751dd0dd9969590b19144099aa6003c089d95d5ffdfddf3a50b82ece31e0f22e8213317dd827e5fbb4cdde614818b81a80c434788dd DIST pcsc-lite-1.9.8.tar.bz2 787198 BLAKE2B ba7297e567e5ad7fdb8041d6cddd61e772795d725d91be7f041493a2404a42acf51b41a4e0e82765f4d2a93517d8d9345abd7520dc03eeb48d2eb83bb6082390 SHA512 6275eee849c5572264f5a1ef1ea2a2db5fec9c4129b348bd6e2c1d4444c46c945b8ecab682c003913e9d06da7034b383199b6e392ae178ffae296017e7c61812 EBUILD pcsc-lite-1.9.7.ebuild 3189 BLAKE2B 08e57b481cd8219db76426a7a147a4394f7f51cc78a590db1bdcc163fda46f82d0af43dabfad5e013f6862f83beb5a7ec1e47d8247a36bd8bcf0f6b47b440ea7 SHA512 274c12d4a46365abe5cf8e971b5c8d5e439fbaaf622d5431491e6c4058d9fcd577928da8e30282a6ca7086e3140dd54b991344a7989bde625d3cb0d833960f41 -EBUILD pcsc-lite-1.9.8.ebuild 3191 BLAKE2B f3d04f51499b3d1d9c34cc3866ec8a2a8a9ccf7a178e3114c5455af5e3dcbc73813cf64a29a3e433e8f89c0f817c56f273b0a260d15c8bcc540047be00f9c73f SHA512 dd8ee12e165975ef2dd5e30085d3aab65e148f95084d9f6515f7574e5f12c2b652299efdfce883d92ce5ba51ea6ed20094a109c3a4acd30e10f89417965111c3 +EBUILD pcsc-lite-1.9.8-r2.ebuild 3342 BLAKE2B c780d5297f180ed52338238bfc6a21ec678ee72217f7b1339b6cb5604b989434f0c875ac56f911ccfe6ad3645e8374c85b6cc9b5c015e55f29cf879d0c3d143b SHA512 876846379bca56a1e4f6d44c3715102876f9aade1c66cbd737647011eb0f32600572a16b2b1b44e77165c57e62eb414e670386ad58d64cdc110125e0bcb788fe MISC metadata.xml 1083 BLAKE2B 8dc3fe1bbd660b4ea9db99fb8f82b905843d96005928f42aa4007e13aa6e0a75af83f1552b434136c8584b98ddae6a0c68776fbb1096da29433864536405fdf3 SHA512 da7d9e3842429795970dd73ffab39e031188e6fd585d144e6348007c55eeb67dcb8e5e04aea1115796f73ff1d455887e0c00301da2b9e689551fef8144c2f388 diff --git a/sys-apps/pcsc-lite/files/pcsc-lite-1.9.8-systemd-user.patch b/sys-apps/pcsc-lite/files/pcsc-lite-1.9.8-systemd-user.patch new file mode 100644 index 000000000000..4d64c5c032f0 --- /dev/null +++ b/sys-apps/pcsc-lite/files/pcsc-lite-1.9.8-systemd-user.patch @@ -0,0 +1,18 @@ +Don't run the daemon as root +https://bugs.gentoo.org/545390 + +--- a/etc/pcscd.service.in ++++ b/etc/pcscd.service.in +@@ -4,9 +4,12 @@ + Documentation=man:pcscd(8) + + [Service] ++PIDFile=/run/pcscd/pcscd.pid + ExecStart=@sbindir_exp@/pcscd --foreground --auto-exit $PCSCD_ARGS + ExecReload=@sbindir_exp@/pcscd --hotplug + EnvironmentFile=-@sysconfdir@/default/pcscd ++User=pcscd ++Group=pcscd + + [Install] + Also=pcscd.socket diff --git a/sys-apps/pcsc-lite/files/pcscd.conf b/sys-apps/pcsc-lite/files/pcscd.conf new file mode 100644 index 000000000000..168c860e88c8 --- /dev/null +++ b/sys-apps/pcsc-lite/files/pcscd.conf @@ -0,0 +1 @@ +d /run/pcscd 0755 pcscd pcscd - diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.9.8.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.9.8-r2.ebuild index 95d5695bbf69..6ec37345d133 100644 --- a/sys-apps/pcsc-lite/pcsc-lite-1.9.8.ebuild +++ b/sys-apps/pcsc-lite/pcsc-lite-1.9.8-r2.ebuild @@ -3,13 +3,12 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) -inherit python-single-r1 systemd udev multilib-minimal +inherit python-single-r1 systemd tmpfiles udev multilib-minimal DESCRIPTION="PC/SC Architecture smartcard middleware library" HOMEPAGE="https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC" - SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2" # GPL-2 is there for the init script; everything else comes from @@ -17,41 +16,38 @@ SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2" LICENSE="BSD ISC MIT GPL-3+ GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" - # This is called libusb so that it doesn't fool people in thinking that # it is _required_ for USB support. Otherwise they'll disable udev and # that's going to be worse. IUSE="doc embedded libusb policykit selinux systemd +udev" - REQUIRED_USE="^^ ( udev libusb ) ${PYTHON_REQUIRED_USE}" # No dependencies need the MULTILIB_DEPS because the libraries are actually # standalone, the deps are only needed for the daemon itself. -DEPEND="libusb? ( virtual/libusb:1 ) +DEPEND=" + libusb? ( virtual/libusb:1 ) udev? ( virtual/libudev:= ) policykit? ( >=sys-auth/polkit-0.111 ) acct-group/openct acct-group/pcscd acct-user/pcscd ${PYTHON_DEPS}" - RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-pcscd )" - -BDEPEND="sys-devel/flex +BDEPEND=" + sys-devel/flex virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch + "${FILESDIR}"/${PN}-1.9.8-systemd-user.patch ) -DOCS=( AUTHORS HELP README SECURITY ChangeLog ) - multilib_src_configure() { ECONF_SOURCE="${S}" econf \ --disable-maintainer-mode \ --disable-strict \ - --enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \ + --enable-usbdropdir="${EPREFIX}"/usr/$(get_libdir)/readers/usb \ --enable-ipcdir=/run/pcscd \ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ $(multilib_native_use_enable doc documentation) \ @@ -64,8 +60,10 @@ multilib_src_configure() { multilib_src_install_all() { einstalldocs + dodoc HELP SECURITY newinitd "${FILESDIR}"/pcscd-init.7 pcscd + dotmpfiles "${FILESDIR}"/pcscd.conf if use udev; then exeinto "$(get_udevdir)" @@ -83,20 +81,29 @@ multilib_src_install_all() { pkg_postinst() { elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in" elog "the pcscd group, to avoid running as root." - elog "" + elog elog "This also means you need the newest drivers available so that the" elog "devices get the proper owner." - elog "" + elog elog "Furthermore, a conf.d file is no longer installed by default, as" elog "the default configuration does not require one. If you need to" elog "pass further options to pcscd, create a file and set the" elog "EXTRA_OPTS variable." - elog "" + elog + if use udev; then elog "Hotplug support is provided by udev rules." elog "When using OpenRC you additionally need to tell it to hotplug" elog "pcscd by setting this variable in /etc/rc.conf:" - elog "" + elog elog " rc_hotplug=\"pcscd\"" fi + + tmpfiles_process pcscd.conf + + use udev && udev_reload +} + +pkg_postrm() { + use udev && udev_reload } diff --git a/sys-apps/pcsc-tools/Manifest b/sys-apps/pcsc-tools/Manifest index 7a7ac171de38..213b6914bf6b 100644 --- a/sys-apps/pcsc-tools/Manifest +++ b/sys-apps/pcsc-tools/Manifest @@ -1,4 +1,4 @@ AUX smartcard.cron 319 BLAKE2B fac8c4360b802de32ff5b0fc5c2ef41aacc28186001ee6f4f3a1cd878ed75cae3f7f78aaad58580d11a695b3fd624fdd412669c743b951818de1aef6d9d4cdf0 SHA512 cb34e75090ff0fde349b81867383ed776b4c89672039f42426e27d2fce77ba0575827d2627b82fc9c435d6091b26e7c2a0e51dbcd1bdd1c883b8c37000ed516e DIST pcsc-tools-1.5.7.tar.bz2 292637 BLAKE2B f0bfa9f680a2f2b348d2baef4b4b4567008163f47d7d7e6cec694cdc424626c5c6f18c475f0e8d4c5cd49111315b3c8a934fecf30afe90bbebc0a15f8d6f4a1d SHA512 58d70f41c5815297def7d8b64807e960db85719996771ecb43a4320d3f3fc82e2deb133d9ca97b3a4e8e76267294b3339d8883ba4770bdd0071566e1ce457501 EBUILD pcsc-tools-1.5.7-r1.ebuild 1380 BLAKE2B 8b965aea287ba16e74f2dc1fa3a2fef992ea8f688c7eab2fac5cd0e875cad7e0627d6e3ba83dbebb9ca6b6c9fd62cbf5c30b13a5952a9ad82978d6f05ada54b7 SHA512 0632d67332bdf81fdc647bbe4dd2f5ca6fb16de9ec7d9539ca3126a211504769f2f15ca31092e447a3cade72d2d745a90d088ef0601071a6357a03a2f21ff1d8 -MISC metadata.xml 357 BLAKE2B 42de2e205846206e147c56d469fd99d34e0e0ae207337223f93089c4d6ff86dfdeeeb65a4d0fb81398afc8d847be8f4e7559dc34ee50b899e8f20bcbea79b606 SHA512 241d96ef35852c80c581c527a9e469043c218cd81a4fa835c36d097e0b128961482d081e879cb99d74694121e35a99fb75ec7b9eba4f30970897c4e2fc3839db +MISC metadata.xml 357 BLAKE2B f11eef0c97a68d73891f21b1d47bf3e5cca15e4e0f7085c64c8d6b8319c87547d58b5b08b82adb8dbe1537fd93095a139ec3eab37ac58254552ceb4d1f16b149 SHA512 62145d52ad3ec0d9f99e356bf9a22537d62a84064a1cdf12d22504a678af3a7282193b91ba9061fe3e2332d3d693402cef7703a3e40280bf3453cfdbe38b5889 diff --git a/sys-apps/pcsc-tools/metadata.xml b/sys-apps/pcsc-tools/metadata.xml index 4798bfc7bf0f..7e929b66fd93 100644 --- a/sys-apps/pcsc-tools/metadata.xml +++ b/sys-apps/pcsc-tools/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>zlogene@gentoo.org</email> - <name>Mikle Kolyada</name> - </maintainer> - <use> - <flag name="network-cron">Monthly cronjob the update-smartcard_list script</flag> - </use> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> + </maintainer> + <use> + <flag name="network-cron">Monthly cronjob the update-smartcard_list script</flag> + </use> </pkgmetadata> diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest index 865dfc006aaa..8c34c71573ed 100644 --- a/sys-apps/systemd-utils/Manifest +++ b/sys-apps/systemd-utils/Manifest @@ -13,6 +13,7 @@ DIST systemd-stable-251.4.tar.gz 11440203 BLAKE2B 58a0ee4adcc9d35b15b9cc98b3da81 EBUILD systemd-utils-250.7.ebuild 11342 BLAKE2B 67a094e130be3b21a647a3db3a66ea0b35b6f4292fa98c3e81d6a2ecd09b291ef08efdbb048e73c5b141b1cf815a4d7a340c6b43c65aa6a3f5b31fa962b60f89 SHA512 2d88c146cebdc0ae5344c80cf807507e343e77ca37af9b0c28cd131ce2f532418e13773ae00a712d54302b8196e4b5696c1a213dbb2472931d79e1f8485b4537 EBUILD systemd-utils-250.8.ebuild 11350 BLAKE2B faf9c2a6685159fe9352e88ecc5855f38c7806f4a2da41e2e5ad1ce6124a4fbb9b42a71c351070297a821b093856a4b75263865b1ffe0d7fe16ebdced0dfdc64 SHA512 6ebec4e3a65f50467bc3b5995acb0ab483723e87dcfef8d4c5a7b4f26d8116049ed2c4c78f3f03f9216af5dc87767e69195f0bbff909644bfa91e688bf602058 EBUILD systemd-utils-251.2-r1.ebuild 11492 BLAKE2B d32e0222842f5981ee2aab1a3a67b1679e409b195503ad9f7ef185150e5fa2b98504c774f4bbcf5260523309d431582dc75fcf3d67818a981dbaffe40add999a SHA512 b2c1c51130c7ac90a98ae8af25167d2dc47dee6ec92342bd83159898f1a2170b4599c984d00430294cd4ac7895996e7b8682d111ff82148d574e613719b00588 -EBUILD systemd-utils-251.3.ebuild 11647 BLAKE2B 10c64a8569f2cc6a386f77e4a159c3dc88020ab1d67f99a6d14a4db7e3522fcd601a82204585c9748f372b3d35b9164d52785c114588b4be9f42747ec8cd7a65 SHA512 d33f2cccb5be1c23701479c59d5c519edef963062541f61b552764c78abd1444e7417d6dc8a97963e1871dc03655e547aa87077e99057b9306774afd6683395b +EBUILD systemd-utils-251.3.ebuild 11646 BLAKE2B 37fe82a6f8666983d40181ad06ba5112f5c1a46e80502997091d9a4447fd96314fb34d8144e436a130736241e4ae53910fc4f3e899eb65347f3515ba758e08b0 SHA512 a1aeb1538d383907b39bf438ec646a809b0ce427846bbc37f1b141badbb711f85c056b36b25aa271db4639e8b1118b463ea04a92911a20b7fa4dc113d77ac188 +EBUILD systemd-utils-251.4-r1.ebuild 11931 BLAKE2B 8c71ddf456b56d4f1b4fb958e7cab57d8b37603ff518bbca503fdd94144affec8293b1275ee0095112ed9e2abd2b8a813658f870a394f9669179bf4caef2f5cd SHA512 1271d4ffeb17a8ffcc11d10f188bf771d1b41dc1289a40c79c596c6d775024a05324dc7f9cb4a14503dbe3c37be7ebdc08e3d9cd2a203e6a7f67376dc268b88f EBUILD systemd-utils-251.4.ebuild 11605 BLAKE2B 05df0fe17d81668674ce544c647a06ad269627d33fd3910e59f57bc96c52aa2aa6228bda07adfc87a6e9bae4086608179af2f4d57920ed79fa9c89cef948cd73 SHA512 a2a7914cac1d8e19b227716d82b09d7de1fc66a4694bdecde85ce977ee7b7038f567f685da6e9343895c6accd97e5640dea9c6595d1120f2635322162b9e1687 MISC metadata.xml 713 BLAKE2B 1dcb5d9949600c9a8c8ac0c005ffa03b2ca91293a932fa96092a24c094e9fb29f2cf063af041432c12daec4aa4e60d11ea77ed0a423e188095f995c68e75b91a SHA512 46d167a6d898abfc56130e373d232c18fb3ef8865755379fa7678c049515458e7354b7a8cab3bf3faa7326932cccceb0b0745b4695ab9bea492bc2344abf9da4 diff --git a/sys-apps/systemd-utils/systemd-utils-251.3.ebuild b/sys-apps/systemd-utils/systemd-utils-251.3.ebuild index 129945493866..7aeb8a9076f5 100644 --- a/sys-apps/systemd-utils/systemd-utils-251.3.ebuild +++ b/sys-apps/systemd-utils/systemd-utils-251.3.ebuild @@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t LICENSE="GPL-2 LGPL-2.1 MIT public-domain" SLOT="0" -KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev" REQUIRED_USE="|| ( boot tmpfiles sysusers udev )" RESTRICT="!test? ( test )" diff --git a/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild new file mode 100644 index 000000000000..0c5976d85e1e --- /dev/null +++ b/sys-apps/systemd-utils/systemd-utils-251.4-r1.ebuild @@ -0,0 +1,521 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{8..11} ) + +QA_PKGCONFIG_VERSION=$(ver_cut 1) + +inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript + +DESCRIPTION="Utilities split out from systemd for OpenRC users" +HOMEPAGE="https://systemd.io/" + +if [[ ${PV} == *.* ]]; then + MY_P="systemd-stable-${PV}" + S="${WORKDIR}/${MY_P}" + SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz" +else + MY_P="systemd-${PV}" + S="${WORKDIR}/${MY_P}" + SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz" +fi + +MUSL_PATCHSET="systemd-musl-patches-251.2" +SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )" + +LICENSE="GPL-2 LGPL-2.1 MIT public-domain" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev" +REQUIRED_USE="|| ( boot tmpfiles sysusers udev )" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + elibc_musl? ( >=sys-libs/musl-1.2.3 ) + selinux? ( sys-libs/libselinux:0= ) + tmpfiles? ( + acl? ( sys-apps/acl:0= ) + ) + udev? ( + >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] + sys-libs/libcap:0=[${MULTILIB_USEDEP}] + virtual/libcrypt:=[${MULTILIB_USEDEP}] + acl? ( sys-apps/acl:0= ) + kmod? ( >=sys-apps/kmod-15:0= ) + ) + !udev? ( + >=sys-apps/util-linux-2.30:0= + sys-libs/libcap:0= + virtual/libcrypt:= + ) +" +DEPEND="${COMMON_DEPEND} + >=sys-kernel/linux-headers-3.11 + boot? ( >=sys-boot/gnu-efi-3.0.2 ) +" +RDEPEND="${COMMON_DEPEND} + boot? ( !<sys-boot/systemd-boot-250 ) + tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 ) + udev? ( + acct-group/audio + acct-group/cdrom + acct-group/dialout + acct-group/disk + acct-group/input + acct-group/kmem + acct-group/kvm + acct-group/lp + acct-group/render + acct-group/sgx + acct-group/tape + acct-group/tty + acct-group/video + !sys-apps/gentoo-systemd-integration + !sys-apps/hwids[udev] + !<sys-fs/udev-250 + !sys-fs/eudev + ) + !sys-apps/systemd +" +PDEPEND=" + udev? ( >=sys-fs/udev-init-scripts-34 ) +" +BDEPEND=" + $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + dev-util/gperf + >=sys-apps/coreutils-8.16 + sys-devel/gettext + virtual/pkgconfig +" + +TMPFILES_OPTIONAL=1 +UDEV_OPTIONAL=1 + +python_check_deps() { + python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" +} + +QA_EXECSTACK="usr/lib/systemd/boot/efi/*" +QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*" + +src_prepare() { + local PATCHES=( + ) + + if use elibc_musl; then + PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" ) + # Applied upstream in 251.3 + rm "${WORKDIR}/${MUSL_PATCHSET}/0001-Add-sys-file.h-for-LOCK_.patch" || die + fi + default + + # Remove install_rpath; we link statically + local rpath_pattern="install_rpath : rootlibexecdir," + grep -q -e "${rpath_pattern}" meson.build || die + sed -i -e "/${rpath_pattern}/d" meson.build || die +} + +multilib_src_configure() { + # When bumping to 251, please keep this, but add the revert patch + # like in sys-apps/systemd! + # + # Broken with FORTIFY_SOURCE=3 without a patch. And the patch + # wasn't backported to 250.x, but it turns out to break Clang + # anyway: bug #841770. + # + # Our toolchain sets F_S=2 by default w/ >= -O2, so we need + # to unset F_S first, then explicitly set 2, to negate any default + # and anything set by the user if they're choosing 3 (or if they've + # modified GCC to set 3). + # + if is-flagq '-O[23]' || is-flagq '-Ofast' ; then + # We can't unconditionally do this b/c we fortify needs + # some level of optimisation. + filter-flags -D_FORTIFY_SOURCE=3 + append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 + fi + + local emesonargs=( + $(meson_use split-usr) + $(meson_use split-usr split-bin) + -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" + -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" + -Dsysvinit-path= + $(meson_native_use_bool boot efi) + $(meson_native_use_bool boot gnu-efi) + $(meson_native_use_bool boot kernel-install) + $(meson_native_use_bool selinux) + $(meson_native_use_bool sysusers) + $(meson_use test tests) + $(meson_native_use_bool tmpfiles) + $(meson_use udev hwdb) + + -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)" + + # Link staticly with libsystemd-shared + -Dlink-boot-shared=false + -Dlink-udev-shared=false + + # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target + -Dstandalone-binaries=true + + # Disable all optional features + -Dadm-group=false + -Danalyze=false + -Dapparmor=false + -Daudit=false + -Dbacklight=false + -Dbinfmt=false + -Dbzip2=false + -Dcoredump=false + -Ddbus=false + -Delfutils=false + -Denvironment-d=false + -Dfdisk=false + -Dgcrypt=false + -Dglib=false + -Dgshadow=false + -Dgnutls=false + -Dhibernate=false + -Dhostnamed=false + -Didn=false + -Dima=false + -Dinitrd=false + -Dfirstboot=false + -Dldconfig=false + -Dlibcryptsetup=false + -Dlibcurl=false + -Dlibfido2=false + -Dlibidn=false + -Dlibidn2=false + -Dlibiptc=false + -Dlocaled=false + -Dlogind=false + -Dlz4=false + -Dmachined=false + -Dmicrohttpd=false + -Dnetworkd=false + -Dnscd=false + -Dnss-myhostname=false + -Dnss-resolve=false + -Dnss-systemd=false + -Doomd=false + -Dopenssl=false + -Dp11kit=false + -Dpam=false + -Dpcre2=false + -Dpolkit=false + -Dportabled=false + -Dpstore=false + -Dpwquality=false + -Drandomseed=false + -Dresolve=false + -Drfkill=false + -Dseccomp=false + -Dsmack=false + -Dsysext=false + -Dtimedated=false + -Dtimesyncd=false + -Dtpm=false + -Dqrencode=false + -Dquotacheck=false + -Duserdb=false + -Dutmp=false + -Dvconsole=false + -Dwheel-group=false + -Dxdg-autostart=false + -Dxkbcommon=false + -Dxz=false + -Dzlib=false + -Dzstd=false + ) + + if use tmpfiles || use udev; then + emesonargs+=( $(meson_native_use_bool acl) ) + else + emesonargs+=( -Dacl=false ) + fi + + if use udev; then + emesonargs+=( $(meson_native_use_bool kmod) ) + else + emesonargs+=( -Dkmod=false ) + fi + + if use elibc_musl; then + # Avoid redefinition of struct ethhdr. + append-cppflags -D__UAPI_DEF_ETHHDR=0 + fi + + if multilib_is_native_abi || use udev; then + meson_src_configure + fi +} + +efi_arch() { + case "$(tc-arch)" in + amd64) echo x64 ;; + arm) echo arm ;; + arm64) echo aa64 ;; + x86) echo x86 ;; + esac +} + +multilib_src_compile() { + local targets=() + if multilib_is_native_abi; then + if use boot; then + targets+=( + bootctl + kernel-install + man/bootctl.1 + man/kernel-install.8 + src/boot/efi/linux$(efi_arch).{efi,elf}.stub + src/boot/efi/systemd-boot$(efi_arch).efi + ) + fi + if use sysusers; then + targets+=( + systemd-sysusers.standalone + man/sysusers.d.5 + man/systemd-sysusers.8 + ) + if use test; then + targets+=( + systemd-runtest.env + ) + fi + fi + if use tmpfiles; then + targets+=( + systemd-tmpfiles.standalone + man/tmpfiles.d.5 + man/systemd-tmpfiles.8 + ) + if use test; then + targets+=( test-tmpfiles ) + fi + fi + if use udev; then + targets+=( + udevadm + systemd-hwdb + src/udev/ata_id + src/udev/cdrom_id + src/udev/fido_id + src/udev/mtd_probe + src/udev/scsi_id + src/udev/udev.pc + src/udev/v4l_id + man/udev.conf.5 + man/systemd.link.5 + man/hwdb.7 + man/udev.7 + man/systemd-hwdb.8 + man/systemd-udevd.service.8 + man/udevadm.8 + hwdb.d/60-autosuspend-chromiumos.hwdb + rules.d/50-udev-default.rules + rules.d/64-btrfs.rules + ) + if use test; then + targets+=( + # Used by udev-test.pl + systemd-detect-virt + test/sys + test-udev + + test-fido-id-desc + test-udev-builtin + test-udev-event + test-udev-netlink + test-udev-node + test-udev-util + ) + fi + fi + fi + if use udev; then + targets+=( + udev:shared_library + src/libudev/libudev.pc + ) + if use test; then + targets+=( + test-libudev + test-libudev-sym + test-udev-device-thread + ) + fi + fi + if multilib_is_native_abi || use udev; then + meson_src_compile "${targets[@]}" + fi +} + +multilib_src_test() { + local tests=() + if multilib_is_native_abi; then + if use sysusers; then + tests+=( + test-sysusers.standalone + ) + fi + if use tmpfiles; then + tests+=( + test-systemd-tmpfiles.standalone + test-tmpfiles + ) + fi + if use udev; then + tests+=( + rule-syntax-check + test-fido-id-desc + test-udev-builtin + test-udev-event + test-udev-netlink + test-udev-node + test-udev-util + ) + if [[ -w /dev ]]; then + tests+=( udev-test ) + else + ewarn "Skipping udev-test (needs write access to /dev)" + fi + fi + fi + if use udev; then + tests+=( + test-libudev + test-libudev-sym + test-udev-device-thread + ) + fi + if [[ ${#tests[@]} -ne 0 ]]; then + meson_src_test "${tests[@]}" + fi +} + +src_install() { + local rootprefix="$(usex split-usr '' /usr)" + meson-multilib_src_install +} + +multilib_src_install() { + if multilib_is_native_abi; then + if use boot; then + into /usr + dobin bootctl kernel-install + doman man/{bootctl.1,kernel-install.8} + insinto usr/lib/systemd/boot/efi + doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi} + fi + if use sysusers; then + into "${rootprefix:-/}" + newbin systemd-sysusers{.standalone,} + doman man/{systemd-sysusers.8,sysusers.d.5} + fi + if use tmpfiles; then + into "${rootprefix:-/}" + newbin systemd-tmpfiles{.standalone,} + doman man/{systemd-tmpfiles.8,tmpfiles.d.5} + fi + if use udev; then + into "${rootprefix:-/}" + dobin udevadm systemd-hwdb + dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd + + exeinto "${rootprefix}"/lib/udev + doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id} + + insinto "${rootprefix}"/lib/udev/rules.d + doins rules.d/*.rules + + insinto "${rootprefix}"/lib/udev/hwdb.d + doins hwdb.d/*.hwdb + + insinto /usr/share/pkgconfig + doins src/udev/udev.pc + + doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8} + newman man/systemd-udevd.service.8 systemd-udevd.8 + fi + fi + if use udev; then + meson_install --no-rebuild --tags libudev + gen_usr_ldscript -a udev + insinto "/usr/$(get_libdir)/pkgconfig" + doins src/libudev/libudev.pc + fi +} + +multilib_src_install_all() { + einstalldocs + if use boot; then + into /usr + exeinto usr/lib/kernel/install.d + doexe src/kernel-install/*.install + dobashcomp shell-completion/bash/bootctl + insinto /usr/share/zsh/site-functions + doins shell-completion/zsh/{_bootctl,_kernel-install} + fi + if use tmpfiles; then + doinitd "${FILESDIR}"/systemd-tmpfiles-setup + doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev + insinto /usr/share/zsh/site-functions + doins shell-completion/zsh/_systemd-tmpfiles + fi + if use udev; then + doheader src/libudev/libudev.h + + insinto /etc/udev + doins src/udev/udev.conf + keepdir /etc/udev/{hwdb.d,rules.d} + + insinto "${rootprefix}"/lib/systemd/network + doins network/99-default.link + + # Remove to avoid conflict with elogind + # https://bugs.gentoo.org/856433 + rm rules.d/70-power-switch.rules || die + insinto /lib/udev/rules.d + doins rules.d/*.rules + doins "${FILESDIR}"/40-gentoo.rules + + insinto /lib/udev/hwdb.d + doins hwdb.d/*.hwdb + + dobashcomp shell-completion/bash/udevadm + + insinto /usr/share/zsh/site-functions + doins shell-completion/zsh/_udevadm + fi +} + +add_service() { + local initd=$1 + local runlevel=$2 + + ebegin "Adding '${initd}' service to the '${runlevel}' runlevel" + mkdir -p "${EROOT}/etc/runlevels/${runlevel}" && + ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}" + eend $? +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]]; then + add_service systemd-tmpfiles-setup-dev sysinit + add_service systemd-tmpfiles-setup boot + fi + if use udev; then + ebegin "Updating hwdb" + systemd-hwdb --root="${ROOT}" update + eend $? + udev_reload + fi +} diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index 93ecd5a2fc36..66d4179270a2 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -10,7 +10,7 @@ DIST systemd-stable-251.2.tar.gz 11434645 BLAKE2B a7e118649a7d27b789206ea9f6f2d0 DIST systemd-stable-251.3.tar.gz 11435458 BLAKE2B 544238536848ab390b2476d5ad95d33998674be50020b8db0627bb9d0c86be6576c404ce786b01ceec86f1c75b174c6fc2d7e0d7fbab802a78f48c9d0915c2b8 SHA512 fb5b8dc1742562ef95469e90d406cfb6dfcb337860ad1208b460414b88ff0565071bde797d195faa62761206abc881829de6b1009e5d727cad2dfe0764310d5f DIST systemd-stable-251.4.tar.gz 11440203 BLAKE2B 58a0ee4adcc9d35b15b9cc98b3da81d1103b61a6c0bee722468a5113cd7d6de1d40c46ef964ba9ecc4746e81b516ae4b2f1d046874d62db066735c652592612e SHA512 7bbfadd80b88a4c3510a5e4e3572e4eab71dafbf6289da038e552988e09ee8da16da3c9bb8a4fbbde6c6236e0e3c352b0a33f9ee0b84f10241f3499383387738 EBUILD systemd-251.2.ebuild 15630 BLAKE2B e107322c07f313e0ec5bffaaace81074c71ad7d8ec33d71382ba9726552b0ebd587b4cd8b3b52093deb38e3d11b115eb41854cc76a43e9794e08eef0d724a30a SHA512 1b9cd6a6dd45185f40272a29a06bcd8eee8de4a0d9a2469aaf487d3bf476dee439170ee089bedce41abbe83bf98bc7f9ed752dcda441eff13bf60c41e2caf005 -EBUILD systemd-251.3.ebuild 15508 BLAKE2B 258fa5518f8010122885cf438705a8dee94b86a470539e82ff5d25ad9500bdf3452932ed3dc14adc66d545ab517bdc5e1e8a1e9310808d4265d54d1845828837 SHA512 dd5222c18de607ca32f9cf309f8c11402d359c7225a1c3e2352abdb558d8fa3bd563af89893dfabd0f9dd8aa5ea9b4da421af5a3625294fd5212183740f7519f -EBUILD systemd-251.4.ebuild 15470 BLAKE2B c40b299789a6e198b93abcbee7c77934c5b7a36de8ddabd8373547102081453022746a812ee984d92bc28717f84dd22eae2425aedd7b341b0aa154c5e7b4b497 SHA512 31a1f63070d27f1ce076825dedda6e382fe70b0726ab99e40510e815990925ed9ec4ef5b44bb2bfde08545f004d366036a115609f842e1c37628e95d096c172c -EBUILD systemd-9999.ebuild 15334 BLAKE2B ac6c030c144740183f952b2d6f122b876536490fb5e2f4d78a19755eb93c4fbb74deb5e74fc051c9bde2561171ecaa67aa26e40c74e2ff516b5e6da91463ce80 SHA512 63956cffbf94ffbc68ff4df6023b925c623bfb287e05fcbfcd87adad85a452164947f2dc3419ca391e34125d0f2b21d325636559d8ce72358be55fc24fc1b01e +EBUILD systemd-251.3.ebuild 15507 BLAKE2B a5b9463fe2f440b01ab987b134fb147f88a811393e8122f2e404ca8163c7805cf42844292da3dbed72140e188958ccd67f11fc000c94b2e76aea0054a7a0606e SHA512 d1cd4e249b30fe9f975c4a70d7efd08b718dab197d84de621ab2e407299de764a1b47dc7d5df60028e3a2a5feedc9824b5d295a71c5583c369cc8283565de281 +EBUILD systemd-251.4.ebuild 15446 BLAKE2B 09d5d0120ee6abde6d58b0095b900a94a8ab18dfb1620be462fca955462e7f42ca048ccc696409b1127139b66e477bc9526968d18ca2d41063d2bc029919c040 SHA512 7e7c3177f75d8125adbbbe7ad1760fa0dea32e8645ef5521bffaefdf1a8caa58bc9f954b51f437cbf227dd3346f626375173d3ef91d7ab2bf168ae909f3c16d3 +EBUILD systemd-9999.ebuild 15310 BLAKE2B 07caf06f5d1934290d36b28c8d02966150c44ac6e5541031873ff50f8d484e40c750d1f7d66bc4fc5725eeb0e003dac7028dea9277a8049d2faeb3eb1ec0ee8b SHA512 dbf0fb2e042f7deaad3c1fd3be5a5d1ce38b88c898b77e1c03754e49961fbb4a04b4a18bdb34167b731b1607f2fadf207b3b1ca085596eb40fad6e91993bf0e4 MISC metadata.xml 2600 BLAKE2B 718d14371e0df2946ec8c21459d51199d7103c40b8457fb685c2e8a0728b4c266718ea9854db46f732a12d176c6c8f34619ed03301f8183f8422c3d99fa705e2 SHA512 03cf65f6f619b90e76fe7837016dd21ea43c992da61ad2bf266a0c3adbbacb9b24e644751bda605cdd4be081c0892e48c00682b9ffe965333e8290d47a851e43 diff --git a/sys-apps/systemd/systemd-251.3.ebuild b/sys-apps/systemd/systemd-251.3.ebuild index c35d0963680c..30f67264f25b 100644 --- a/sys-apps/systemd/systemd-251.3.ebuild +++ b/sys-apps/systemd/systemd-251.3.ebuild @@ -23,7 +23,7 @@ else MY_P=${MY_PN}-${MY_PV} S=${WORKDIR}/${MY_P} SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi inherit bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript diff --git a/sys-apps/systemd/systemd-251.4.ebuild b/sys-apps/systemd/systemd-251.4.ebuild index 064778e7f0c7..ba1fca739b5a 100644 --- a/sys-apps/systemd/systemd-251.4.ebuild +++ b/sys-apps/systemd/systemd-251.4.ebuild @@ -285,9 +285,8 @@ multilib_src_configure() { -Dpamlibdir="$(getpam_mod_dir)" # avoid bash-completion dep -Dbashcompletiondir="$(get_bashcompdir)" - # make sure we get /bin:/sbin in PATH $(meson_use split-usr) - -Dsplit-bin=true + $(meson_use split-usr split-bin) -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" # Avoid infinite exec recursion, bug 642724 diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index c8aea75e5c3e..d317887a899f 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -282,9 +282,8 @@ multilib_src_configure() { -Dpamlibdir="$(getpam_mod_dir)" # avoid bash-completion dep -Dbashcompletiondir="$(get_bashcompdir)" - # make sure we get /bin:/sbin in PATH $(meson_use split-usr) - -Dsplit-bin=true + $(meson_use split-usr split-bin) -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" # Avoid infinite exec recursion, bug 642724 |