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 7F79D138202 for ; Sun, 9 Dec 2012 16:41:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92A22E05E8; Sun, 9 Dec 2012 16:40:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F4059E05E8 for ; Sun, 9 Dec 2012 16:40:58 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 110D933E440 for ; Sun, 9 Dec 2012 16:40:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A3267E5444 for ; Sun, 9 Dec 2012 16:40:56 +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: <1355071225.215d3ddfb648bb37201bbe0aa7d56602462c2950.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: 215d3ddfb648bb37201bbe0aa7d56602462c2950 X-VCS-Branch: master Date: Sun, 9 Dec 2012 16:40:56 +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: ee4daf44-7f87-4245-8b5c-51fd8523e2b8 X-Archives-Hash: 46630460ee51329f8c839f52f1e5f817 commit: 215d3ddfb648bb37201bbe0aa7d56602462c2950 Author: Davide Pesavento gmail com> AuthorDate: Sun Dec 9 16:32:00 2012 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sun Dec 9 16:40:25 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=215d3ddf [qt5-build.eclass] Stop changing EGIT_SOURCEDIR and S in live ebuilds. No longer necessary after previous commit. --- eclass/qt5-build.eclass | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index cf56c85..cc91eb8 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -45,13 +45,12 @@ case ${PV} in QT5_BUILD_TYPE="release" MY_P="${EGIT_PROJECT}-opensource-src-${PV/_/-}" SRC_URI="http://releases.qt-project.org/qt${PV%.*}/${PV#*_}/submodules_tar/${MY_P}.tar.xz" + S=${WORKDIR}/${MY_P} ;; esac EGIT_REPO_URI="git://gitorious.org/qt/${EGIT_PROJECT}.git https://git.gitorious.org/qt/${EGIT_PROJECT}.git" -EGIT_SOURCEDIR=${WORKDIR}/${EGIT_PROJECT} -S=${EGIT_SOURCEDIR} IUSE="+c++11 debug test" @@ -87,7 +86,7 @@ EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_ # @ECLASS-VARIABLE: QT5_BUILD_DIR # @DESCRIPTION: # Build directory for out-of-source builds. -: ${QT5_BUILD_DIR:=${WORKDIR}/${EGIT_PROJECT}_build} +: ${QT5_BUILD_DIR:=${S}_build} # @ECLASS-VARIABLE: QT5_VERBOSE_BUILD # @DESCRIPTION: @@ -149,7 +148,6 @@ qt5-build_src_unpack() { ;; release) default - mv "${MY_P}" "${EGIT_PROJECT}" || die ;; esac }