diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-09-21 23:26:49 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-09-21 23:26:49 +0100 |
commit | ce5c22ea4ab2c848cb8e0fe7be18977d51f5f0bb (patch) | |
tree | cb5b53227bbd48fcb062830d7e94ac9a4fa9e081 /sys-apps/systemd | |
parent | 1c724102ee86c2c9fc156106acc870f69a4764c3 (diff) |
gentoo auto-resync : 21:09:2022 - 23:26:49
Diffstat (limited to 'sys-apps/systemd')
-rw-r--r-- | sys-apps/systemd/Manifest | 4 | ||||
-rw-r--r-- | sys-apps/systemd/systemd-251.4.ebuild | 7 | ||||
-rw-r--r-- | sys-apps/systemd/systemd-9999.ebuild | 7 |
3 files changed, 10 insertions, 8 deletions
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index cc795b817ca7..1487e606e591 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -8,6 +8,6 @@ AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab2821 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.3.ebuild 15507 BLAKE2B a5b9463fe2f440b01ab987b134fb147f88a811393e8122f2e404ca8163c7805cf42844292da3dbed72140e188958ccd67f11fc000c94b2e76aea0054a7a0606e SHA512 d1cd4e249b30fe9f975c4a70d7efd08b718dab197d84de621ab2e407299de764a1b47dc7d5df60028e3a2a5feedc9824b5d295a71c5583c369cc8283565de281 -EBUILD systemd-251.4.ebuild 15443 BLAKE2B 502dd6292361c144bb752841e79b7cef71ce3775d434741e4de1cc3d1570b0bb005a83b0d9ff94ca2b02d68fa6c56d33663418c535bcffe89dfcfa25f58fe949 SHA512 4286e117adfcd6da2d491fda1f628d504680c235e41e7a25e4cd6e1998405afc44fc59e3c05f3e2c1c36dc5f2e9293e4c77c5211b5ad47051fa3ced6d33bec97 -EBUILD systemd-9999.ebuild 15310 BLAKE2B 07caf06f5d1934290d36b28c8d02966150c44ac6e5541031873ff50f8d484e40c750d1f7d66bc4fc5725eeb0e003dac7028dea9277a8049d2faeb3eb1ec0ee8b SHA512 dbf0fb2e042f7deaad3c1fd3be5a5d1ce38b88c898b77e1c03754e49961fbb4a04b4a18bdb34167b731b1607f2fadf207b3b1ca085596eb40fad6e91993bf0e4 +EBUILD systemd-251.4.ebuild 15507 BLAKE2B 029709d318486fec25bebb409fa6a4d57741b5653e77722be5fe306820c0ea0e73036955406e5f1cbfebeb1f8b08fbd6da5a283d195763c6834abf8f0624ead3 SHA512 48e379d8b9a91b662c3400938f622f4f7f47c3a890892cb73a3b77fa21ec849ef7237797a2bca9c702115a51378cd180a4fa7bc33cd2f2c95d27c6cdc7136343 +EBUILD systemd-9999.ebuild 15374 BLAKE2B 932ea3a520d8e5371dc88d6bb474a0068141a9565332652589fc5d944a5e55cc81985ca5e05acb3d2c554da4355bcf3f80c6584469ac2bad41604c5dd8c9a099 SHA512 f26a179ce91729627b7c6c78ea8ca6515696bc330f1f012b2b02d15a5134028fe5066f03b0a4b78cfde77d37eafdda75731a5ff8dec82c694c49547f61c839bf MISC metadata.xml 2545 BLAKE2B fc424b7f9e471860cba69b6f11ea2094c70f125cd55c42ea77e4549a399680c4444119c79424c266828a284b0214001421f760477b1341844dddd2d474d70c33 SHA512 f0b8c4614e3c88d123916bb3399d6025ab30ff839849b136a29e1960bf0c50699b3f09b5307f40b77cc8c5566c20b11de2364a08311adceb15507df3e4bb0565 diff --git a/sys-apps/systemd/systemd-251.4.ebuild b/sys-apps/systemd/systemd-251.4.ebuild index 4a104481e51e..77e48349d5ef 100644 --- a/sys-apps/systemd/systemd-251.4.ebuild +++ b/sys-apps/systemd/systemd-251.4.ebuild @@ -368,6 +368,7 @@ multilib_src_test() { multilib_src_install_all() { local rootprefix=$(usex split-usr '' /usr) + local sbin=$(usex split-usr sbin bin) # meson doesn't know about docdir mv "${ED}"/usr/share/doc/{systemd,${PF}} || die @@ -376,19 +377,19 @@ multilib_src_install_all() { dodoc "${FILESDIR}"/nsswitch.conf if ! use resolvconf; then - rm -f "${ED}${rootprefix}"/sbin/resolvconf || die + rm -f "${ED}${rootprefix}/${sbin}"/resolvconf || die fi rm "${ED}"/etc/init.d/README || die rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die if ! use sysv-utils; then - rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die + rm "${ED}${rootprefix}/${sbin}"/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die rm "${ED}"/usr/share/man/man1/init.1 || die rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die fi - if ! use resolvconf && ! use sysv-utils; then + if ! use resolvconf && ! use sysv-utils && ! use split-usr; then rmdir "${ED}${rootprefix}"/sbin || die fi diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index d317887a899f..733ffd2c153a 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -365,6 +365,7 @@ multilib_src_test() { multilib_src_install_all() { local rootprefix=$(usex split-usr '' /usr) + local sbin=$(usex split-usr sbin bin) # meson doesn't know about docdir mv "${ED}"/usr/share/doc/{systemd,${PF}} || die @@ -373,19 +374,19 @@ multilib_src_install_all() { dodoc "${FILESDIR}"/nsswitch.conf if ! use resolvconf; then - rm -f "${ED}${rootprefix}"/sbin/resolvconf || die + rm -f "${ED}${rootprefix}/${sbin}"/resolvconf || die fi rm "${ED}"/etc/init.d/README || die rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die if ! use sysv-utils; then - rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die + rm "${ED}${rootprefix}/${sbin}"/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die rm "${ED}"/usr/share/man/man1/init.1 || die rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die fi - if ! use resolvconf && ! use sysv-utils; then + if ! use resolvconf && ! use sysv-utils && ! use split-usr; then rmdir "${ED}${rootprefix}"/sbin || die fi |