commit:     17b35f065ec5ce11435fd56a38dfc5788486b34a
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  2 16:39:49 2018 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Feb  2 16:40:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17b35f06

sys-apps/systemd: fix automagic dep on libpcre2

Package-Manager: Portage-2.3.19_p11, Repoman-2.3.6_p45

 sys-apps/systemd/{systemd-237.ebuild => systemd-237-r1.ebuild} | 4 +++-
 sys-apps/systemd/systemd-9999.ebuild                           | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sys-apps/systemd/systemd-237.ebuild 
b/sys-apps/systemd/systemd-237-r1.ebuild
similarity index 98%
rename from sys-apps/systemd/systemd-237.ebuild
rename to sys-apps/systemd/systemd-237-r1.ebuild
index 92f249d35c1..97ed32eebe7 100644
--- a/sys-apps/systemd/systemd-237.ebuild
+++ b/sys-apps/systemd/systemd-237-r1.ebuild
@@ -20,7 +20,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 )"
@@ -54,6 +54,7 @@ 
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= )
        selinux? ( sys-libs/libselinux:0= )
@@ -228,6 +229,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)

diff --git a/sys-apps/systemd/systemd-9999.ebuild 
b/sys-apps/systemd/systemd-9999.ebuild
index 92f249d35c1..97ed32eebe7 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -20,7 +20,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 )"
@@ -54,6 +54,7 @@ 
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= )
        selinux? ( sys-libs/libselinux:0= )
@@ -228,6 +229,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)

Reply via email to