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 E4BBA138A1A for ; Fri, 13 Feb 2015 13:12:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37D90E092A; Fri, 13 Feb 2015 13:12:43 +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 AED7BE092A for ; Fri, 13 Feb 2015 13:12:42 +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 52F253407E2 for ; Fri, 13 Feb 2015 13:12:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D17B111AAB for ; Fri, 13 Feb 2015 13:12:38 +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: <1423832957.51b19ed10b4f106cf7092926fab496865ab571ea.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-workspace/plasma-workspace-5.2.0-r2.ebuild kde-plasma/plasma-workspace/plasma-workspace-5.2.9999.ebuild X-VCS-Directories: kde-plasma/plasma-workspace/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 51b19ed10b4f106cf7092926fab496865ab571ea X-VCS-Branch: master Date: Fri, 13 Feb 2015 13:12:38 +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: 989573f2-c93a-46f7-82f1-7ed73b6a9005 X-Archives-Hash: bb6e39868c2e91cc517258fc2e0d1a49 commit: 51b19ed10b4f106cf7092926fab496865ab571ea Author: Johannes Huber gentoo org> AuthorDate: Fri Feb 13 13:09:17 2015 +0000 Commit: Johannes Huber gentoo org> CommitDate: Fri Feb 13 13:09:17 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=51b19ed1 [kde-plasma/plasma-workspace] Revision bump, bug #539922 Disables build of kglobalaccel. Package-Manager: portage-2.2.17 --- ...workspace-5.2.9999.ebuild => plasma-workspace-5.2.0-r2.ebuild} | 8 ++++++-- kde-plasma/plasma-workspace/plasma-workspace-5.2.9999.ebuild | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.2.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.2.0-r2.ebuild similarity index 95% copy from kde-plasma/plasma-workspace/plasma-workspace-5.2.9999.ebuild copy to kde-plasma/plasma-workspace/plasma-workspace-5.2.0-r2.ebuild index 8d43cbf..395bf98 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.2.9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.2.0-r2.ebuild @@ -5,10 +5,11 @@ EAPI=5 VIRTUALX_REQUIRED="test" +FRAMEWORKS_MINIMAL="5.7" inherit kde5 multilib DESCRIPTION="KDE Plasma workspace" -KEYWORDS="" +KEYWORDS=" ~amd64" IUSE="dbus gps prison qalculate X" COMMON_DEPEND=" @@ -105,7 +106,7 @@ DEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}/${PN}-startkde-script.patch" - "${FILESDIR}/${PN}-5.2.0-freeze.patch" + "${FILESDIR}/${P}-freeze.patch" ) RESTRICT="test" @@ -114,6 +115,9 @@ src_prepare() { kde5_src_prepare sed -e "s|\`qtpaths|\`/usr/$(get_libdir)/qt5/bin/qtpaths|" -i startkde/startkde.cmake || die + + # bug 539922, moved to frameworks + comment_add_subdirectory kglobalaccel } src_configure() { diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.2.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.2.9999.ebuild index 8d43cbf..2b07ce4 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.2.9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.2.9999.ebuild @@ -5,6 +5,7 @@ EAPI=5 VIRTUALX_REQUIRED="test" +FRAMEWORKS_MINIMAL="5.7" inherit kde5 multilib DESCRIPTION="KDE Plasma workspace" @@ -114,6 +115,9 @@ src_prepare() { kde5_src_prepare sed -e "s|\`qtpaths|\`/usr/$(get_libdir)/qt5/bin/qtpaths|" -i startkde/startkde.cmake || die + + # bug 539922, moved to frameworks + comment_add_subdirectory kglobalaccel } src_configure() {