From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-697610-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (unknown [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 60EDB1381FA
for <garchives@archives.gentoo.org>; Mon, 19 May 2014 18:02:23 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 91310E0B07;
Mon, 19 May 2014 18:02:22 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 26140E0B0C
for <gentoo-commits@lists.gentoo.org>; Mon, 19 May 2014 18:02:22 +0000 (UTC)
Received: from spoonbill.gentoo.org (unknown [81.93.255.5])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id E3B5833FF73
for <gentoo-commits@lists.gentoo.org>; Mon, 19 May 2014 18:02:20 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by spoonbill.gentoo.org (Postfix) with ESMTP id 8DCB01818D
for <gentoo-commits@lists.gentoo.org>; Mon, 19 May 2014 18:02:19 +0000 (UTC)
From: "Davide Pesavento" <pesa@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, "Davide Pesavento" <pesa@gentoo.org>
Message-ID: <1400521461.0f53bfd7eaeeba7617e03e1cffa008243ff176d9.pesa@gentoo>
Subject: [gentoo-commits] proj/qt:master commit in: eclass/
X-VCS-Repository: proj/qt
X-VCS-Files: eclass/qt5-build.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: pesa
X-VCS-Committer-Name: Davide Pesavento
X-VCS-Revision: 0f53bfd7eaeeba7617e03e1cffa008243ff176d9
X-VCS-Branch: master
Date: Mon, 19 May 2014 18:02:19 +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-Archives-Salt: ca11d85b-c61d-44da-8c2f-1306faf25eee
X-Archives-Hash: fe5a3a3f7fc0d4ae6a5bc0ad40e1b615
commit: 0f53bfd7eaeeba7617e03e1cffa008243ff176d9
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon May 19 17:44:21 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon May 19 17:44:21 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=0f53bfd7
[qt5-build.eclass] Delete obsolete comment.
---
eclass/qt5-build.eclass | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 1f1ee24..0765c60 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -17,13 +17,6 @@ case ${EAPI} in
*) die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
esac
-# @ECLASS-VARIABLE: VIRTUALX_REQUIRED
-# @DESCRIPTION:
-# For proper description see virtualx.eclass manpage.
-# Here we redefine default value to be manual, if your package needs virtualx
-# for tests you should proceed with setting VIRTUALX_REQUIRED=test.
-: ${VIRTUALX_REQUIRED:=manual}
-
inherit eutils flag-o-matic multilib toolchain-funcs versionator virtualx
HOMEPAGE="http://qt-project.org/ http://qt.digia.com/"
@@ -132,6 +125,13 @@ EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_
# @DESCRIPTION:
# Array of macros that must be defined in QtCore/qconfig.h
+# @ECLASS-VARIABLE: VIRTUALX_REQUIRED
+# @DESCRIPTION:
+# For proper description see virtualx.eclass man page.
+# Here we redefine default value to be manual, if your package needs virtualx
+# for tests you should proceed with setting VIRTUALX_REQUIRED=test.
+: ${VIRTUALX_REQUIRED:=manual}
+
# @FUNCTION: qt5-build_pkg_setup
# @DESCRIPTION:
# Warns and/or dies if the user is trying to downgrade Qt.
@@ -261,7 +261,6 @@ qt5-build_src_compile() {
# @FUNCTION: qt5-build_src_test
# @DESCRIPTION:
# Runs tests in target directories.
-# TODO: find a way to avoid circular deps with USE=test.
qt5-build_src_test() {
echo ">>> Test phase [QtTest]: ${CATEGORY}/${PF}"
@@ -396,8 +395,6 @@ qt5_prepare_env() {
if [[ ${QT5_MODULE} == "qtbase" ]]; then
# see mkspecs/features/qt_config.prf
- # note: this could be the cause of bug 451456, so do it
- # only when really needed, i.e. for qtbase modules
export QMAKEMODULES="${QT5_BUILD_DIR}/mkspecs/modules:${S}/mkspecs/modules:${QT5_ARCHDATADIR}/mkspecs/modules"
fi
}