diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-03-18 04:54:42 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-03-18 04:54:42 +0000 |
| commit | 5510d9d7d1c93c2ea71a2bd6f0666168808d5dd6 (patch) | |
| tree | c968fff3108e2b4d88e4e564a56bfd066f170573 /sys-apps/systemd | |
| parent | 1dde4e5c4b92d849bf1abf0a48135b2a0644f7e1 (diff) | |
gentoo resync : 18.03.2018
Diffstat (limited to 'sys-apps/systemd')
| -rw-r--r-- | sys-apps/systemd/Manifest | 4 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-238-r1.ebuild | 5 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-9999.ebuild | 5 |
3 files changed, 8 insertions, 6 deletions
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index da895e67e87d..e072efe1f380 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -20,6 +20,6 @@ EBUILD systemd-233-r6.ebuild 13593 BLAKE2B 82e15d7171054d46049bc9a50a8482bc1ebbe EBUILD systemd-236-r5.ebuild 13008 BLAKE2B e3613cb1aeac22a92ba2f8c6ae47acad59281493ffb044d9dcb2417de9db1f00f29cf197b0fca764911edfc6c39ae7a49c56593770dd4fbba23adc35130ad3ac SHA512 259156a807ca41bc2fe36a87fa1b425ea5cd1b8c9a6f648487fcdeb1d8a8b7f607723b2cbdc2a5bf9b7d59f23716ab17b2032e41b214dd2fe71628c3272c96de EBUILD systemd-237-r2.ebuild 13075 BLAKE2B ff45dd6aa7ff3c27ad18495eb44a8ff04c67d8dddc80546fafa52e3845f1f3ded10f47f9b4e6c46b46786651d3c387f0e86e87ebf09f52045d62054fd9c5f403 SHA512 8bd6fb56e66284ef26f5ad525a38ce67e74d2b48d57dd15a1c67dfd60805da57745b837342d45c96406bef4c7a26aabf0de0db6f60fafb026268a6a154f457b1 EBUILD systemd-237-r3.ebuild 13136 BLAKE2B 78e7a0488497d3fd8be87f640a5f9fb7c7547e4c1c95ae21ff36a42998ef5ca75e16e7421335b5a979ef05c273c9b69e1915afc77637d5f5836ca26579627591 SHA512 61522415b4d25c8d83ab2c598a06df60dbf8d545091f304dc86b42378e62da2c5a7eee3113e11e6b5225aa98f7287ba77917c1a2c3468635d0fc2bdf503d3462 -EBUILD systemd-238-r1.ebuild 13058 BLAKE2B 4d3e9d09c8d62a646df76641ceca518744f067d86b05e6d4dc8768d4814aa55cb223f9bec993e2a3b906caa6c08c85ef42b259376b06acb00bc3592a3efb753c SHA512 653a87575a6f57452104ad8f4ba763063568e2aa03ba5349c6559aba5b0113a615848aed06f963721648ba9d4ce85412e8f0eb1c18e2768fc32c3c0adf95a813 -EBUILD systemd-9999.ebuild 12901 BLAKE2B afcf2037823b319f9841a706f261f07d95037af089b78f4867d4d9d57de4e02c938566988072f66146b069ca7301e0859ed37b3eecae8aba5917abf0ea1abb06 SHA512 6708dc71ef3bd713ab158770fac5129c5da98c5613e6ddcc9b3e3c7755ebfb9541abb019ea0ba966260da674d45f07caacb65c5b119d568ed1f5edee82241857 +EBUILD systemd-238-r1.ebuild 13128 BLAKE2B 53dc9f5f6cae2f19e82db0d70003190a6673d0d5acd1c399b0064e6fde5d555033c358a31c784ad3bbba71e58240fad36a253fd94f7f5246f98ec7dfccac76b7 SHA512 ab797e98d3268fc0d7eaf97fa9ce6e5585f8da689204f46168d5746cee4f60f4f133a0aac777b12c47c035a4c21527d99d06209c5194add1fb57ee1dea7b8700 +EBUILD systemd-9999.ebuild 12971 BLAKE2B c8795664313560342f21b633bbab3ffb2e8fa71ef17a80852f542036ec77d72a3bac3127f9b41234014f4e5378459d5c72a4507bbb6316bcfa6fc8efe0a6f579 SHA512 e04558c65b09dc9303da2d5c8d78b502b992344e4f711548a5d400dd343f09e2ce4c5c072173b5d7616cb63943b8d2cb8176be920985f0be5a923e195ef391fd MISC metadata.xml 2032 BLAKE2B a554cb3dc21d5c5a5a4227f05f4a91054080999d23022051252f3461fb9c4398112fa1c96982205b4e1709de00ae395706ac46b86ae44610ecf85ededc3ceca7 SHA512 1c97f2c573c63a63d2ed78820d891d9593c5d8636574270c4306dc3c8ce739e52f6829e7e219cc2744acd7f3e2362e340b7c2406923f1aaf9adebc785cdb6544 diff --git a/sys-apps/systemd/systemd-238-r1.ebuild b/sys-apps/systemd/systemd-238-r1.ebuild index d32d1e9d3d39..1cfd6153c46a 100644 --- a/sys-apps/systemd/systemd-238-r1.ebuild +++ b/sys-apps/systemd/systemd-238-r1.ebuild @@ -303,8 +303,9 @@ multilib_src_install_all() { dodoc "${FILESDIR}"/nsswitch.conf if ! use sysv-utils; then - rm "${ED%/}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die - rmdir "${ED%/}"/sbin || die + local rootprefix=$(usex usrmerge /usr '') + rm "${ED%/}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die + rmdir "${ED%/}${rootprefix}"/sbin || 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 diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 6c34c1b92a00..44e359bc511b 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -301,8 +301,9 @@ multilib_src_install_all() { dodoc "${FILESDIR}"/nsswitch.conf if ! use sysv-utils; then - rm "${ED%/}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die - rmdir "${ED%/}"/sbin || die + local rootprefix=$(usex usrmerge /usr '') + rm "${ED%/}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die + rmdir "${ED%/}${rootprefix}"/sbin || 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 |