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 4C3EA138CEC for ; Tue, 16 Jun 2015 20:13:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AAC12E0783; Tue, 16 Jun 2015 20:13:09 +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 45D08E0783 for ; Tue, 16 Jun 2015 20:13:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 11F20340A60 for ; Tue, 16 Jun 2015 20:13:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B8772A2D for ; Tue, 16 Jun 2015 20:13:06 +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: <1434485471.504931cc75df08070039b824e526eb7067348473.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt4-build-multilib.eclass eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 504931cc75df08070039b824e526eb7067348473 X-VCS-Branch: master Date: Tue, 16 Jun 2015 20:13:06 +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: 15b7c482-5bed-49eb-a93f-ea0ef2412b77 X-Archives-Hash: d3b5a0212d63fe333b5d4c0f84924406 commit: 504931cc75df08070039b824e526eb7067348473 Author: Davide Pesavento gentoo org> AuthorDate: Tue Jun 16 20:11:11 2015 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Tue Jun 16 20:11:11 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=504931cc [eclass] Reduce diff between qt4 and qt5 eclasses. eclass/qt4-build-multilib.eclass | 26 +++++++++++++++----------- eclass/qt5-build.eclass | 6 +++--- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass index fe6bccf..baac03c 100644 --- a/eclass/qt4-build-multilib.eclass +++ b/eclass/qt4-build-multilib.eclass @@ -25,16 +25,12 @@ SLOT="4" case ${PV} in 4.?.9999) + # git stable branch QT4_BUILD_TYPE="live" - EGIT_REPO_URI=( - "git://code.qt.io/qt/qt.git" - "https://code.qt.io/git/qt/qt.git" - "https://github.com/qtproject/qt.git" - ) EGIT_BRANCH=${PV%.9999} - inherit git-r3 ;; *) + # official stable release QT4_BUILD_TYPE="release" MY_P=qt-everywhere-opensource-src-${PV/_/-} SRC_URI="http://download.qt.io/official_releases/qt/${PV%.*}/${PV}/${MY_P}.tar.gz" @@ -42,6 +38,13 @@ case ${PV} in ;; esac +EGIT_REPO_URI=( + "git://code.qt.io/qt/qt.git" + "https://code.qt.io/git/qt/qt.git" + "https://github.com/qtproject/qt.git" +) +[[ ${QT4_BUILD_TYPE} == live ]] && inherit git-r3 + if [[ ${PN} != qttranslations ]]; then IUSE="aqua debug pch" [[ ${PN} != qtxmlpatterns ]] && IUSE+=" +exceptions" @@ -507,21 +510,19 @@ qt4_multilib_src_install_all() { find "${S}"/src/${moduledir} -type f -name '*_p.h' -exec doins '{}' + || die fi - # remove .la files since we are building only shared libraries prune_libtool_files } # @FUNCTION: qt4-build-multilib_pkg_postinst # @DESCRIPTION: -# Regenerate configuration, plus throw a message about possible -# breakages and proposed solutions. +# Regenerate configuration after installation or upgrade/downgrade. qt4-build-multilib_pkg_postinst() { qt4_regenerate_global_qconfigs } # @FUNCTION: qt4-build-multilib_pkg_postrm # @DESCRIPTION: -# Regenerate configuration when the package is completely removed. +# Regenerate configuration when a module is completely removed. qt4-build-multilib_pkg_postrm() { qt4_regenerate_global_qconfigs } @@ -590,16 +591,19 @@ qt4_prepare_env() { # @DESCRIPTION: # Executes the given command inside each directory listed in QT4_TARGET_DIRECTORIES. qt4_foreach_target_subdir() { - local subdir + local ret=0 subdir= for subdir in ${QT4_TARGET_DIRECTORIES}; do mkdir -p "${subdir}" || die pushd "${subdir}" >/dev/null || die einfo "Running $* ${subdir:+in ${subdir}}" "$@" + ((ret+=$?)) popd >/dev/null || die done + + return ${ret} } # @FUNCTION: qt4_symlink_tools_to_build_dir diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 5bc5cbd..d0db81f 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -39,19 +39,19 @@ case ${PV} in EGIT_BRANCH="dev" ;; 5.?.9999) - # git stable branches (5.x) + # git stable branch QT5_BUILD_TYPE="live" EGIT_BRANCH=${PV%.9999} ;; *_alpha*|*_beta*|*_rc*) - # development releases + # development release QT5_BUILD_TYPE="release" MY_P=${QT5_MODULE}-opensource-src-${PV/_/-} SRC_URI="http://download.qt.io/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz" S=${WORKDIR}/${MY_P} ;; *) - # official stable releases + # official stable release QT5_BUILD_TYPE="release" MY_P=${QT5_MODULE}-opensource-src-${PV} SRC_URI="http://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz"