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 81AE81381F3 for ; Mon, 14 Oct 2013 17:03:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F418CE0AF3; Mon, 14 Oct 2013 17:03:21 +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 989D0E0AF3 for ; Mon, 14 Oct 2013 17:03:21 +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 A1EF133EF98 for ; Mon, 14 Oct 2013 17:03:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5270BE545D for ; Mon, 14 Oct 2013 17:03:19 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1381777117.bf963caf861968526f8698f3e9f6484212ade192.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde4-base.eclass X-VCS-Directories: eclass/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: bf963caf861968526f8698f3e9f6484212ade192 X-VCS-Branch: master Date: Mon, 14 Oct 2013 17:03:19 +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: 57c31eda-5266-4064-8328-d4adf905a66f X-Archives-Hash: 23ef88d5e58afb20e1b038998eb66722 commit: bf963caf861968526f8698f3e9f6484212ade192 Author: Johannes Huber gentoo org> AuthorDate: Mon Oct 14 18:58:37 2013 +0000 Commit: Johannes Huber gentoo org> CommitDate: Mon Oct 14 18:58:37 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=bf963caf [eclass] Fix used branch for kde-workspace, bug #487990. Patch by Jakub Caban whyblack.pl>. Needed because git upstream master depends now on Qt5/kf5. --- eclass/kde4-base.eclass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 676b00b..54bb9fe 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -547,6 +547,10 @@ _calculate_live_repo() { [[ ${PV} != 9999* && ${KDEBASE} == kde-base ]] && \ EGIT_BRANCH="KDE/$(get_kde_version)" + # kde-workspace master needs Qt5/kf5 + [[ ${PV} == 9999 && ${_kmname} == kde-workspace ]] && \ + EGIT_BRANCH="KDE/4.11" + # default repo uri EGIT_REPO_URI+=( "${EGIT_MIRROR}/${_kmname}" )