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 E13D91381F4 for ; Sat, 8 Dec 2012 12:45:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F232E04BA; Sat, 8 Dec 2012 12:45:33 +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 19E60E04BA for ; Sat, 8 Dec 2012 12:45:33 +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 1F44E33DBB8 for ; Sat, 8 Dec 2012 12:45:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id AFD17E543C for ; Sat, 8 Dec 2012 12:45:30 +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: <1354970690.7beef12b30a3488797f58c0f33ead968a4417bf7.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: 7beef12b30a3488797f58c0f33ead968a4417bf7 X-VCS-Branch: master Date: Sat, 8 Dec 2012 12:45:30 +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: 9b7dc676-ce1b-4a04-b6a2-d59d7764d426 X-Archives-Hash: 82e6b68ee22e0558ae60ee7825e83344 commit: 7beef12b30a3488797f58c0f33ead968a4417bf7 Author: Davide Pesavento gmail com> AuthorDate: Sat Dec 8 12:44:50 2012 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sat Dec 8 12:44:50 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7beef12b [qt5-build.eclass] Adapt to new upstream branching model. --- eclass/qt5-build.eclass | 37 +++++++++++++++++++++---------------- 1 files changed, 21 insertions(+), 16 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 161061f..e14a15a 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -17,15 +17,6 @@ esac inherit eutils flag-o-matic multilib toolchain-funcs versionator -if [[ ${PV} == *9999* ]]; then - QT5_BUILD_TYPE="live" - inherit git-2 -else - QT5_BUILD_TYPE="release" -fi - -EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postinst pkg_postrm - HOMEPAGE="http://qt-project.org/ http://qt.digia.com/" LICENSE="|| ( LGPL-2.1 GPL-3 )" SLOT="5" @@ -38,17 +29,30 @@ case ${PN#qt-} in EGIT_PROJECT="${PN/-}" ;; esac -case ${QT5_BUILD_TYPE} in - live) - EGIT_REPO_URI="git://gitorious.org/qt/${EGIT_PROJECT}.git - https://git.gitorious.org/qt/${EGIT_PROJECT}.git" + +case ${PV} in + 5.9999) + QT5_BUILD_TYPE="live" + EGIT_BRANCH="dev" + inherit git-2 ;; - release) - MY_P=${EGIT_PROJECT}-opensource-src-${PV/_/-} + 5.?.9999) + QT5_BUILD_TYPE="live" + EGIT_BRANCH="stable" + inherit git-2 + ;; + *) + 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" ;; 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" DEPEND=">=dev-lang/perl-5.14 @@ -57,7 +61,7 @@ if [[ ${PN} != "qt-test" ]]; then DEPEND+=" test? ( ~x11-libs/qt-test-${PV}[debug=] )" fi -S=${WORKDIR}/${EGIT_PROJECT} +EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postinst pkg_postrm # @ECLASS-VARIABLE: PATCHES # @DEFAULT_UNSET @@ -335,6 +339,7 @@ qt5_prepare_env() { QT5_TESTSDIR=${QT5_DATADIR}/tests QT5_SYSCONFDIR=${EPREFIX}/etc/qt5 + # see mkspecs/features/qt_config.prf export QMAKEMODULES="${QT5_BUILD_DIR}/mkspecs/modules:${S}/mkspecs/modules:${QT5_ARCHDATADIR}/mkspecs/modules" }