From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1098536-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 7978C138334
for <garchives@archives.gentoo.org>; Sat, 6 Jul 2019 10:25:27 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 8EA1AE086E;
Sat, 6 Jul 2019 10:25:26 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 75E0FE086E
for <gentoo-commits@lists.gentoo.org>; Sat, 6 Jul 2019 10:25:26 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 904AF34728E
for <gentoo-commits@lists.gentoo.org>; Sat, 6 Jul 2019 10:25:25 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 2BCC266B
for <gentoo-commits@lists.gentoo.org>; Sat, 6 Jul 2019 10:25:24 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1562408568.682f4330065bc8a04d79c81cf0af6af34478ad81.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
X-VCS-Repository: repo/gentoo
X-VCS-Files: eclass/qt5-build.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 682f4330065bc8a04d79c81cf0af6af34478ad81
X-VCS-Branch: master
Date: Sat, 6 Jul 2019 10:25:24 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 62dd7ee7-8a20-47fb-90b9-254f2921319e
X-Archives-Hash: 842e52a25d9e83a34722e51466229709
commit: 682f4330065bc8a04d79c81cf0af6af34478ad81
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 6 20:51:01 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 6 10:22:48 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=682f4330
qt5-build.eclass: Drop obsolete <Qt-5.12 conditionals
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
eclass/qt5-build.eclass | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 290a0c40381..0e16983478a 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -178,12 +178,6 @@ qt5-build_src_prepare() {
sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
configure || die "sed failed (QMAKE_CONF_COMPILER)"
- if [[ ${QT5_MINOR_VERSION} -lt 12 ]]; then
- # Don't add -O3 to CXXFLAGS (bug 549140)
- sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
- src/{corelib/corelib,gui/gui}.pro || die "sed failed (optimize_full)"
- fi
-
# Respect build variables in configure tests (bug #639494)
sed -i -e "s|\"\$outpath/bin/qmake\" \"\$relpathMangled\" -- \"\$@\"|& $(qt5_qmake_args) |" configure || die
fi
@@ -256,10 +250,6 @@ qt5-build_src_install() {
popd >/dev/null || die
- if [[ ${QT5_MINOR_VERSION} -lt 12 ]]; then
- docompress -x "${QT5_DOCDIR#${EPREFIX}}"/global
- fi
-
# install an empty Gentoo/gentoo-qconfig.h in ${D}
# so that it's placed under package manager control
> "${T}"/gentoo-qconfig.h
@@ -416,11 +406,7 @@ qt5_prepare_env() {
QT5_IMPORTDIR=${QT5_ARCHDATADIR}/imports
QT5_QMLDIR=${QT5_ARCHDATADIR}/qml
QT5_DATADIR=${QT5_PREFIX}/share/qt5
- if [[ ${QT5_MINOR_VERSION} -lt 12 ]]; then
- QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV}
- else
- QT5_DOCDIR=${QT5_PREFIX}/share/qt5-doc
- fi
+ QT5_DOCDIR=${QT5_PREFIX}/share/qt5-doc
QT5_TRANSLATIONDIR=${QT5_DATADIR}/translations
QT5_EXAMPLESDIR=${QT5_DATADIR}/examples
QT5_TESTSDIR=${QT5_DATADIR}/tests
@@ -579,8 +565,7 @@ qt5_base_configure() {
-no-freetype -no-harfbuzz
-no-openssl -no-libproxy
-no-xcb-xlib
- $([[ ${QT5_MINOR_VERSION} -lt 12 ]] && echo -no-xinput2 -no-xkbcommon-x11 -no-xkbcommon-evdev)
- $([[ ${QT5_MINOR_VERSION} -ge 12 ]] && echo -no-xcb-xinput -no-xkbcommon) # bug 672340
+ -no-xcb-xinput -no-xkbcommon # bug 672340
# cannot use -no-gif because there is no way to override it later
#-no-gif