commit:     0499899ba8c325104c4ffba59f791b3b0fff3ceb
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 29 10:49:31 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Apr 29 10:49:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0499899b

dev-libs/libpcre2: Enable pcre16 by default

Enable pcre16 by default, as it is required by dev-qt/qtcore.  This flag
was enforced by the desktop profile before but qtcore is pulled as a dep
outside desktop profile sometimes, and the cost of building pcre16
variant is relatively low.

Acked by Chainsaw on IRC.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-libs/libpcre2/libpcre2-10.35.ebuild    | 2 +-
 dev-libs/libpcre2/libpcre2-10.36-r1.ebuild | 2 +-
 profiles/targets/desktop/package.use       | 5 -----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/dev-libs/libpcre2/libpcre2-10.35.ebuild 
b/dev-libs/libpcre2/libpcre2-10.35.ebuild
index 2619bf00b12..1dd456dbaaa 100644
--- a/dev-libs/libpcre2/libpcre2-10.35.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.35.ebuild
@@ -26,7 +26,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 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"
-IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs 
unicode zlib"
+IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline +recursion-limit static-libs 
unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
 BDEPEND="

diff --git a/dev-libs/libpcre2/libpcre2-10.36-r1.ebuild 
b/dev-libs/libpcre2/libpcre2-10.36-r1.ebuild
index e6cb3ef7b5d..32b1a3ae4c9 100644
--- a/dev-libs/libpcre2/libpcre2-10.36-r1.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.36-r1.ebuild
@@ -26,7 +26,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 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"
-IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs 
unicode zlib"
+IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline +recursion-limit static-libs 
unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
 BDEPEND="

diff --git a/profiles/targets/desktop/package.use 
b/profiles/targets/desktop/package.use
index 75d4221778e..9a6c9867269 100644
--- a/profiles/targets/desktop/package.use
+++ b/profiles/targets/desktop/package.use
@@ -30,11 +30,6 @@ dev-qt/qtwebkit:5 printsupport
 # Not required, but makes life easier with Qt; bug #457934
 app-arch/unzip natspec
 
-# Andreas Sturmlechner <ast...@gentoo.org> (2017-11-30)
-# Required by dev-qt/qtcore
-dev-libs/libpcre pcre16
-dev-libs/libpcre2 pcre16
-
 # Andreas Sturmlechner <ast...@gentoo.org> (2017-11-30)
 # Required by kde-frameworks/kwayland
 dev-qt/qtgui:5 egl libinput

Reply via email to