diff options
| -rw-r--r-- | media-libs/libvpx/libvpx-scm.ebuild | 2 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-scm.ebuild | 34 |
2 files changed, 17 insertions, 19 deletions
diff --git a/media-libs/libvpx/libvpx-scm.ebuild b/media-libs/libvpx/libvpx-scm.ebuild index 2cb9adf..f78e849 100644 --- a/media-libs/libvpx/libvpx-scm.ebuild +++ b/media-libs/libvpx/libvpx-scm.ebuild @@ -78,7 +78,7 @@ multilib_src_configure() { $(use_enable cpu_flags_x86_sse3 sse3) $(use_enable cpu_flags_x86_sse4_1 sse4_1) $(use_enable cpu_flags_x86_ssse3 ssse3) - $(use_enable svc experimental) $(use_enable svc spatial-svc) + $(use_enable svc experimental) $(use_enable static-libs static) $(use_enable threads multithread) $(use_enable highbitdepth vp9-highbitdepth) diff --git a/sys-apps/systemd/systemd-scm.ebuild b/sys-apps/systemd/systemd-scm.ebuild index 42b361c..4167286 100644 --- a/sys-apps/systemd/systemd-scm.ebuild +++ b/sys-apps/systemd/systemd-scm.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" LICENSE="GPL-2 LGPL-2.1 MIT public-domain" SLOT="0/2" -IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam policykit qrcode +seccomp selinux ssl +sysv-utils test usrmerge vanilla xkb" +IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +seccomp selinux ssl +sysv-utils test usrmerge vanilla xkb" REQUIRED_USE="importd? ( curl gcrypt lzma )" RESTRICT="!test? ( test )" @@ -49,11 +49,10 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[${MULTILIB_USEDEP}] ) + pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) - seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) + seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) - sysv-utils? ( !sys-apps/sysvinit ) - !sysv-utils? ( sys-apps/sysvinit ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" @@ -62,6 +61,8 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] RDEPEND="${COMMON_DEPEND} >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) + sysv-utils? ( !sys-apps/sysvinit ) + !sysv-utils? ( sys-apps/sysvinit ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] @@ -223,6 +224,7 @@ multilib_src_configure() { -Dxz=$(meson_use lzma) -Dlibiptc=$(meson_multilib_native_use nat) -Dpam=$(meson_use pam) + -Dpcre2=$(meson_multilib_native_use pcre) -Dpolkit=$(meson_multilib_native_use policykit) -Dqrencode=$(meson_multilib_native_use qrcode) -Dseccomp=$(meson_multilib_native_use seccomp) @@ -231,7 +233,7 @@ multilib_src_configure() { -Ddbus=$(meson_multilib_native_use test) -Dxkbcommon=$(meson_multilib_native_use xkb) # hardcode a few paths to spare some deps - -Dpath-kill=/bin/kill + -Dkill-path=/bin/kill -Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org" # Breaks screen, tmux, etc. -Ddefault-kill-user-processes=false @@ -293,23 +295,19 @@ multilib_src_install_all() { einstalldocs dodoc "${FILESDIR}"/nsswitch.conf - if use sysv-utils; then - local app - for app in halt poweroff reboot runlevel shutdown telinit; do - dosym ../bin/systemctl /sbin/${app} - done - dosym ../lib/systemd/systemd /sbin/init - else - # we just keep sysvinit tools, so no need for the mans - rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ - || die + if ! use sysv-utils; then + 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 # Preserve empty dirs in /etc & /var, bug #437008 - keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \ - /etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd \ - /var/log/journal/remote + keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d} + keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd + keepdir /etc/udev/{hwdb.d,rules.d} + keepdir /var/log/journal/remote # Symlink /etc/sysctl.conf for easy migration. dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf |