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 A9DF7138CA2 for ; Wed, 15 Apr 2015 17:06:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 42036E088A; Wed, 15 Apr 2015 17:06:38 +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 CE5EEE088A for ; Wed, 15 Apr 2015 17:06:37 +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 919D5340A5E for ; Wed, 15 Apr 2015 17:06:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3CF1B15FCE for ; Wed, 15 Apr 2015 17:06:32 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1429117567.f7adec74b8e6c96db6adf3288965fab9faa0f68d.kensington@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.95.ebuild kde-plasma/plasma-workspace/plasma-workspace-5.3.49.9999.ebuild kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild X-VCS-Directories: kde-plasma/plasma-workspace/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: f7adec74b8e6c96db6adf3288965fab9faa0f68d X-VCS-Branch: master Date: Wed, 15 Apr 2015 17:06:32 +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: 204f7408-da33-46a2-a440-211c97cbc20b X-Archives-Hash: 03969f61936a846ab7809a43e43cfd36 commit: f7adec74b8e6c96db6adf3288965fab9faa0f68d Author: Michael Palimaka gentoo org> AuthorDate: Wed Apr 15 17:06:07 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed Apr 15 17:06:07 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f7adec74 [kde-plasma/plasma-workspace] Remove X USE flag. It doesn't build disabled and this is not likely to change soon. Package-Manager: portage-2.2.18 .../plasma-workspace-5.2.95.ebuild | 23 ++++++++++------------ .../plasma-workspace-5.3.49.9999.ebuild | 23 ++++++++++------------ .../plasma-workspace/plasma-workspace-9999.ebuild | 23 ++++++++++------------ 3 files changed, 30 insertions(+), 39 deletions(-) diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.2.95.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.2.95.ebuild index 9d176c6..f9c2782 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.2.95.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.2.95.ebuild @@ -10,7 +10,7 @@ inherit kde5 multilib DESCRIPTION="KDE Plasma workspace" KEYWORDS=" ~amd64" -IUSE="dbus +drkonqi gps prison qalculate +systemmonitor X" +IUSE="dbus +drkonqi gps prison qalculate +systemmonitor" COMMON_DEPEND=" $(add_plasma_dep baloo) @@ -64,10 +64,18 @@ COMMON_DEPEND=" dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] sys-libs/pam sys-libs/zlib + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau + x11-libs/libxcb + x11-libs/libXrender + x11-libs/xcb-util-keysyms dbus? ( dev-libs/libdbusmenu-qt[qt5] ) drkonqi? ( $(add_frameworks_dep kdewebkit) @@ -80,16 +88,6 @@ COMMON_DEPEND=" $(add_plasma_dep libksysguard processui) dev-qt/qtwebkit:5 ) - X? ( - dev-qt/qtx11extras:5 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libxcb - x11-libs/libXrender - x11-libs/xcb-util-keysyms - ) " RDEPEND="${COMMON_DEPEND} $(add_frameworks_dep kded) @@ -110,7 +108,7 @@ RDEPEND="${COMMON_DEPEND} !kde-base/plasma-workspace " DEPEND="${COMMON_DEPEND} - X? ( x11-proto/xproto ) + x11-proto/xproto " PATCHES=( "${FILESDIR}/${PN}-startkde-script.patch" ) @@ -140,7 +138,6 @@ src_configure() { $(cmake-utils_use_find_package gps libgps) $(cmake-utils_use_find_package prison) $(cmake-utils_use_find_package qalculate Qalculate) - $(cmake-utils_use_find_package X X11) ) kde5_src_configure diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.3.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.3.49.9999.ebuild index d9d6380..31240e2 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.3.49.9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.3.49.9999.ebuild @@ -10,7 +10,7 @@ inherit kde5 multilib DESCRIPTION="KDE Plasma workspace" KEYWORDS="" -IUSE="dbus +drkonqi gps prison qalculate +systemmonitor X" +IUSE="dbus +drkonqi gps prison qalculate +systemmonitor" COMMON_DEPEND=" $(add_plasma_dep baloo) @@ -64,10 +64,18 @@ COMMON_DEPEND=" dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] sys-libs/pam sys-libs/zlib + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau + x11-libs/libxcb + x11-libs/libXrender + x11-libs/xcb-util-keysyms dbus? ( dev-libs/libdbusmenu-qt[qt5] ) drkonqi? ( $(add_frameworks_dep kdewebkit) @@ -80,16 +88,6 @@ COMMON_DEPEND=" $(add_plasma_dep libksysguard processui) dev-qt/qtwebkit:5 ) - X? ( - dev-qt/qtx11extras:5 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libxcb - x11-libs/libXrender - x11-libs/xcb-util-keysyms - ) " RDEPEND="${COMMON_DEPEND} $(add_frameworks_dep kded) @@ -110,7 +108,7 @@ RDEPEND="${COMMON_DEPEND} !kde-base/plasma-workspace " DEPEND="${COMMON_DEPEND} - X? ( x11-proto/xproto ) + x11-proto/xproto " PATCHES=( "${FILESDIR}/${PN}-startkde-script.patch" ) @@ -140,7 +138,6 @@ src_configure() { $(cmake-utils_use_find_package gps libgps) $(cmake-utils_use_find_package prison) $(cmake-utils_use_find_package qalculate Qalculate) - $(cmake-utils_use_find_package X X11) ) kde5_src_configure diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild index d9d6380..31240e2 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild @@ -10,7 +10,7 @@ inherit kde5 multilib DESCRIPTION="KDE Plasma workspace" KEYWORDS="" -IUSE="dbus +drkonqi gps prison qalculate +systemmonitor X" +IUSE="dbus +drkonqi gps prison qalculate +systemmonitor" COMMON_DEPEND=" $(add_plasma_dep baloo) @@ -64,10 +64,18 @@ COMMON_DEPEND=" dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] sys-libs/pam sys-libs/zlib + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau + x11-libs/libxcb + x11-libs/libXrender + x11-libs/xcb-util-keysyms dbus? ( dev-libs/libdbusmenu-qt[qt5] ) drkonqi? ( $(add_frameworks_dep kdewebkit) @@ -80,16 +88,6 @@ COMMON_DEPEND=" $(add_plasma_dep libksysguard processui) dev-qt/qtwebkit:5 ) - X? ( - dev-qt/qtx11extras:5 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libxcb - x11-libs/libXrender - x11-libs/xcb-util-keysyms - ) " RDEPEND="${COMMON_DEPEND} $(add_frameworks_dep kded) @@ -110,7 +108,7 @@ RDEPEND="${COMMON_DEPEND} !kde-base/plasma-workspace " DEPEND="${COMMON_DEPEND} - X? ( x11-proto/xproto ) + x11-proto/xproto " PATCHES=( "${FILESDIR}/${PN}-startkde-script.patch" ) @@ -140,7 +138,6 @@ src_configure() { $(cmake-utils_use_find_package gps libgps) $(cmake-utils_use_find_package prison) $(cmake-utils_use_find_package qalculate Qalculate) - $(cmake-utils_use_find_package X X11) ) kde5_src_configure