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 97A521381F3 for ; Mon, 7 Oct 2013 23:31:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 618D4E0964; Mon, 7 Oct 2013 23:31:07 +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 F1EC7E0964 for ; Mon, 7 Oct 2013 23:31:06 +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 0D00C33EE6E for ; Mon, 7 Oct 2013 23:31:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A77AFE5308 for ; Mon, 7 Oct 2013 23:31:04 +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: <1381188592.782439cfd69d67fad1f50b1e3ca3a68b44100a24.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt4-build.eclass eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 782439cfd69d67fad1f50b1e3ca3a68b44100a24 X-VCS-Branch: master Date: Mon, 7 Oct 2013 23:31:04 +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: f7894de0-7736-4955-af22-c14dbb63ede2 X-Archives-Hash: 79b0260b96cabaf18db03273848a7266 commit: 782439cfd69d67fad1f50b1e3ca3a68b44100a24 Author: Davide Pesavento gmail com> AuthorDate: Mon Oct 7 23:29:52 2013 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Mon Oct 7 23:29:52 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=782439cf [qt{4,5}-build] Switch to git-r3 eclass. --- eclass/qt4-build.eclass | 10 ++++++---- eclass/qt5-build.eclass | 13 ++++++------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index ba0ed38..1fce381 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.eclass @@ -18,7 +18,7 @@ inherit eutils flag-o-matic multilib toolchain-funcs versionator if [[ ${PV} == *9999* ]]; then QT4_BUILD_TYPE="live" - inherit git-2 + inherit git-r3 else QT4_BUILD_TYPE="release" fi @@ -31,8 +31,10 @@ MY_P=qt-everywhere-opensource-src-${MY_PV} case ${QT4_BUILD_TYPE} in live) - EGIT_REPO_URI="git://gitorious.org/qt/qt.git - https://git.gitorious.org/qt/qt.git" + EGIT_REPO_URI=( + "git://gitorious.org/qt/qt.git" + "https://git.gitorious.org/qt/qt.git" + ) EGIT_BRANCH=${PV%.9999} ;; release) @@ -118,7 +120,7 @@ qt4-build_src_unpack() { case ${QT4_BUILD_TYPE} in live) - git-2_src_unpack + git-r3_src_unpack ;; release) local tarball="${MY_P}.tar.gz" target= targets= diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index b55680d..eb511ec 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -56,12 +56,11 @@ case ${PV} in ;; esac -if [[ ${QT5_BUILD_TYPE} == "live" ]]; then - EGIT_PROJECT=${QT5_MODULE} - EGIT_REPO_URI="git://gitorious.org/qt/${EGIT_PROJECT}.git - https://git.gitorious.org/qt/${EGIT_PROJECT}.git" - inherit git-2 -fi +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 IUSE="+c++11 debug test" @@ -161,7 +160,7 @@ qt5-build_src_unpack() { case ${QT5_BUILD_TYPE} in live) - git-2_src_unpack + git-r3_src_unpack ;; release) default