Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libpcre2/, profiles/targets/desktop/
Date: Thu, 29 Apr 2021 10:50:55
Message-Id: 1619693384.0499899ba8c325104c4ffba59f791b3b0fff3ceb.mgorny@gentoo
1 commit: 0499899ba8c325104c4ffba59f791b3b0fff3ceb
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 29 10:49:31 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 29 10:49:44 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0499899b
7
8 dev-libs/libpcre2: Enable pcre16 by default
9
10 Enable pcre16 by default, as it is required by dev-qt/qtcore. This flag
11 was enforced by the desktop profile before but qtcore is pulled as a dep
12 outside desktop profile sometimes, and the cost of building pcre16
13 variant is relatively low.
14
15 Acked by Chainsaw on IRC.
16
17 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
18
19 dev-libs/libpcre2/libpcre2-10.35.ebuild | 2 +-
20 dev-libs/libpcre2/libpcre2-10.36-r1.ebuild | 2 +-
21 profiles/targets/desktop/package.use | 5 -----
22 3 files changed, 2 insertions(+), 7 deletions(-)
23
24 diff --git a/dev-libs/libpcre2/libpcre2-10.35.ebuild b/dev-libs/libpcre2/libpcre2-10.35.ebuild
25 index 2619bf00b12..1dd456dbaaa 100644
26 --- a/dev-libs/libpcre2/libpcre2-10.35.ebuild
27 +++ b/dev-libs/libpcre2/libpcre2-10.35.ebuild
28 @@ -26,7 +26,7 @@ fi
29 LICENSE="BSD"
30 SLOT="0"
31 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
32 -IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
33 +IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
34 REQUIRED_USE="?? ( libedit readline )"
35
36 BDEPEND="
37
38 diff --git a/dev-libs/libpcre2/libpcre2-10.36-r1.ebuild b/dev-libs/libpcre2/libpcre2-10.36-r1.ebuild
39 index e6cb3ef7b5d..32b1a3ae4c9 100644
40 --- a/dev-libs/libpcre2/libpcre2-10.36-r1.ebuild
41 +++ b/dev-libs/libpcre2/libpcre2-10.36-r1.ebuild
42 @@ -26,7 +26,7 @@ fi
43 LICENSE="BSD"
44 SLOT="0"
45 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
46 -IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
47 +IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
48 REQUIRED_USE="?? ( libedit readline )"
49
50 BDEPEND="
51
52 diff --git a/profiles/targets/desktop/package.use b/profiles/targets/desktop/package.use
53 index 75d4221778e..9a6c9867269 100644
54 --- a/profiles/targets/desktop/package.use
55 +++ b/profiles/targets/desktop/package.use
56 @@ -30,11 +30,6 @@ dev-qt/qtwebkit:5 printsupport
57 # Not required, but makes life easier with Qt; bug #457934
58 app-arch/unzip natspec
59
60 -# Andreas Sturmlechner <asturm@g.o> (2017-11-30)
61 -# Required by dev-qt/qtcore
62 -dev-libs/libpcre pcre16
63 -dev-libs/libpcre2 pcre16
64 -
65 # Andreas Sturmlechner <asturm@g.o> (2017-11-30)
66 # Required by kde-frameworks/kwayland
67 dev-qt/qtgui:5 egl libinput