1 |
commit: 17b35f065ec5ce11435fd56a38dfc5788486b34a |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 2 16:39:49 2018 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Feb 2 16:40:16 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17b35f06 |
7 |
|
8 |
sys-apps/systemd: fix automagic dep on libpcre2 |
9 |
|
10 |
Package-Manager: Portage-2.3.19_p11, Repoman-2.3.6_p45 |
11 |
|
12 |
sys-apps/systemd/{systemd-237.ebuild => systemd-237-r1.ebuild} | 4 +++- |
13 |
sys-apps/systemd/systemd-9999.ebuild | 4 +++- |
14 |
2 files changed, 6 insertions(+), 2 deletions(-) |
15 |
|
16 |
diff --git a/sys-apps/systemd/systemd-237.ebuild b/sys-apps/systemd/systemd-237-r1.ebuild |
17 |
similarity index 98% |
18 |
rename from sys-apps/systemd/systemd-237.ebuild |
19 |
rename to sys-apps/systemd/systemd-237-r1.ebuild |
20 |
index 92f249d35c1..97ed32eebe7 100644 |
21 |
--- a/sys-apps/systemd/systemd-237.ebuild |
22 |
+++ b/sys-apps/systemd/systemd-237-r1.ebuild |
23 |
@@ -20,7 +20,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" |
24 |
|
25 |
LICENSE="GPL-2 LGPL-2.1 MIT public-domain" |
26 |
SLOT="0/2" |
27 |
-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" |
28 |
+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" |
29 |
|
30 |
REQUIRED_USE="importd? ( curl gcrypt lzma )" |
31 |
RESTRICT="!test? ( test )" |
32 |
@@ -54,6 +54,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] |
33 |
lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] ) |
34 |
nat? ( net-firewall/iptables:0= ) |
35 |
pam? ( virtual/pam:=[${MULTILIB_USEDEP}] ) |
36 |
+ pcre? ( dev-libs/libpcre2 ) |
37 |
qrcode? ( media-gfx/qrencode:0= ) |
38 |
seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) |
39 |
selinux? ( sys-libs/libselinux:0= ) |
40 |
@@ -228,6 +229,7 @@ multilib_src_configure() { |
41 |
-Dxz=$(meson_use lzma) |
42 |
-Dlibiptc=$(meson_multilib_native_use nat) |
43 |
-Dpam=$(meson_use pam) |
44 |
+ -Dpcre2=$(meson_multilib_native_use pcre) |
45 |
-Dpolkit=$(meson_multilib_native_use policykit) |
46 |
-Dqrencode=$(meson_multilib_native_use qrcode) |
47 |
-Dseccomp=$(meson_multilib_native_use seccomp) |
48 |
|
49 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild |
50 |
index 92f249d35c1..97ed32eebe7 100644 |
51 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
52 |
+++ b/sys-apps/systemd/systemd-9999.ebuild |
53 |
@@ -20,7 +20,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" |
54 |
|
55 |
LICENSE="GPL-2 LGPL-2.1 MIT public-domain" |
56 |
SLOT="0/2" |
57 |
-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" |
58 |
+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" |
59 |
|
60 |
REQUIRED_USE="importd? ( curl gcrypt lzma )" |
61 |
RESTRICT="!test? ( test )" |
62 |
@@ -54,6 +54,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] |
63 |
lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] ) |
64 |
nat? ( net-firewall/iptables:0= ) |
65 |
pam? ( virtual/pam:=[${MULTILIB_USEDEP}] ) |
66 |
+ pcre? ( dev-libs/libpcre2 ) |
67 |
qrcode? ( media-gfx/qrencode:0= ) |
68 |
seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) |
69 |
selinux? ( sys-libs/libselinux:0= ) |
70 |
@@ -228,6 +229,7 @@ multilib_src_configure() { |
71 |
-Dxz=$(meson_use lzma) |
72 |
-Dlibiptc=$(meson_multilib_native_use nat) |
73 |
-Dpam=$(meson_use pam) |
74 |
+ -Dpcre2=$(meson_multilib_native_use pcre) |
75 |
-Dpolkit=$(meson_multilib_native_use policykit) |
76 |
-Dqrencode=$(meson_multilib_native_use qrcode) |
77 |
-Dseccomp=$(meson_multilib_native_use seccomp) |