From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3DAC51381FA for ; Thu, 5 Jun 2014 09:45:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C81CCE092F; Thu, 5 Jun 2014 09:45:53 +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 53A91E092F for ; Thu, 5 Jun 2014 09:45:53 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [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 20A8933FE0B for ; Thu, 5 Jun 2014 09:45:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 7C730181A9 for ; Thu, 5 Jun 2014 09:45:50 +0000 (UTC) From: "Davide Pesavento" 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" Message-ID: <1401961494.0ecb7506f40d391f77911befc04a402a361b342d.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: 0ecb7506f40d391f77911befc04a402a361b342d X-VCS-Branch: master Date: Thu, 5 Jun 2014 09:45:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c157348a-28b7-4db3-8ddf-715c5dde4c0e X-Archives-Hash: 5c2d52962178408b4f7210aee4425619 commit: 0ecb7506f40d391f77911befc04a402a361b342d Author: Davide Pesavento gmail com> AuthorDate: Thu Jun 5 09:44:54 2014 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Thu Jun 5 09:44:54 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=0ecb7506 [qt5-build.eclass] Remove unnecessary quoting. --- eclass/qt5-build.eclass | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 988eea1..0eeb787 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -61,7 +61,7 @@ EGIT_REPO_URI=( "git://gitorious.org/qt/${QT5_MODULE}.git" "https://git.gitorious.org/qt/${QT5_MODULE}.git" ) -[[ ${QT5_BUILD_TYPE} == "live" ]] && inherit git-r3 +[[ ${QT5_BUILD_TYPE} == live ]] && inherit git-r3 IUSE="debug test" @@ -69,8 +69,8 @@ DEPEND=" >=dev-lang/perl-5.14 virtual/pkgconfig " -if [[ ${PN} != "qttest" ]]; then - if [[ ${QT5_MODULE} == "qtbase" ]]; then +if [[ ${PN} != qttest ]]; then + if [[ ${QT5_MODULE} == qtbase ]]; then DEPEND+=" test? ( ~dev-qt/qttest-${PV}[debug=] )" else DEPEND+=" test? ( >=dev-qt/qttest-${PV}:5[debug=] )" @@ -158,7 +158,7 @@ qt5-build_src_unpack() { ewarn fi - if [[ ${PN} == "qtwebkit" ]]; then + if [[ ${PN} == qtwebkit ]]; then eshopts_push -s extglob if is-flagq '-g?(gdb)?([1-9])'; then ewarn @@ -183,7 +183,7 @@ qt5-build_src_unpack() { qt5-build_src_prepare() { qt5_prepare_env - if [[ ${QT5_MODULE} == "qtbase" ]]; then + if [[ ${QT5_MODULE} == qtbase ]]; then # Avoid unnecessary qmake recompilations sed -i -re "s|^if true;.*(\[ '\!').*(\"\\\$outpath/bin/qmake\".*)|if \1 -e \2 then|" \ configure || die "sed failed (skip qmake bootstrap)" @@ -220,7 +220,7 @@ qt5-build_src_prepare() { || die "sed failed (config.tests)" fi - if [[ ${PN} != "qtcore" ]]; then + if [[ ${PN} != qtcore ]]; then qt5_symlink_tools_to_buildtree fi @@ -241,7 +241,7 @@ qt5-build_src_configure() { mkdir -p "${QT5_BUILD_DIR}" || die pushd "${QT5_BUILD_DIR}" > /dev/null || die - if [[ ${QT5_MODULE} == "qtbase" ]]; then + if [[ ${QT5_MODULE} == qtbase ]]; then qt5_base_configure fi @@ -294,7 +294,7 @@ qt5-build_src_test() { qt5-build_src_install() { qt5_foreach_target_subdir emake INSTALL_ROOT="${D}" install - if [[ ${PN} == "qtcore" ]]; then + if [[ ${PN} == qtcore ]]; then pushd "${QT5_BUILD_DIR}" > /dev/null || die einfo "Running emake INSTALL_ROOT=${D} install_{mkspecs,qmake,syncqt}" emake INSTALL_ROOT="${D}" install_{mkspecs,qmake,syncqt} @@ -328,7 +328,7 @@ qt5-build_pkg_postinst() { # @DESCRIPTION: # Regenerate configuration when the package is completely removed. qt5-build_pkg_postrm() { - if [[ -z ${REPLACED_BY_VERSION} && ${PN} != "qtcore" ]]; then + if [[ -z ${REPLACED_BY_VERSION} && ${PN} != qtcore ]]; then qt5_regenerate_global_qconfigs fi } @@ -392,7 +392,7 @@ qt5_prepare_env() { QT5_TESTSDIR=${QT5_DATADIR}/tests QT5_SYSCONFDIR=${EPREFIX}/etc/qt5 - if [[ ${QT5_MODULE} == "qtbase" ]]; then + if [[ ${QT5_MODULE} == qtbase ]]; then # see mkspecs/features/qt_config.prf export QMAKEMODULES="${QT5_BUILD_DIR}/mkspecs/modules:${S}/mkspecs/modules:${QT5_ARCHDATADIR}/mkspecs/modules" fi @@ -524,7 +524,7 @@ qt5_foreach_target_subdir() { local subdir for subdir in "${QT5_TARGET_SUBDIRS[@]}"; do - if [[ ${EBUILD_PHASE} == "test" ]]; then + if [[ ${EBUILD_PHASE} == test ]]; then subdir=tests/auto${subdir#src} [[ -d ${S}/${subdir} ]] || continue fi