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 B2E90138010 for ; Wed, 31 Oct 2012 07:55:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D302C21C006; Wed, 31 Oct 2012 07:54:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4699421C006 for ; Wed, 31 Oct 2012 07:54:49 +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 8C16733D813 for ; Wed, 31 Oct 2012 07:54:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id EE8B2E5436 for ; Wed, 31 Oct 2012 07:54:45 +0000 (UTC) From: "Ben de Groot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ben de Groot" Message-ID: <1351670066.d9db15b17fd720f3c6a0573a4e863bbcc27ce9fc.yngwin@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: razorqt-base/razorqt-panel/ X-VCS-Repository: proj/qt X-VCS-Files: razorqt-base/razorqt-panel/razorqt-panel-9999.ebuild X-VCS-Directories: razorqt-base/razorqt-panel/ X-VCS-Committer: yngwin X-VCS-Committer-Name: Ben de Groot X-VCS-Revision: d9db15b17fd720f3c6a0573a4e863bbcc27ce9fc X-VCS-Branch: master Date: Wed, 31 Oct 2012 07:54:45 +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: 8bbc1460-cc3a-488d-9469-aaf5d32ffee6 X-Archives-Hash: fe2ad497059a5ac8142830b2ea5e3d96 commit: d9db15b17fd720f3c6a0573a4e863bbcc27ce9fc Author: Ben de Groot gmail com> AuthorDate: Wed Oct 31 07:54:26 2012 +0000 Commit: Ben de Groot gentoo org> CommitDate: Wed Oct 31 07:54:26 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=d9db15b1 razorqt-base/razorqt-panel: backport improvements in 0.5.1-r1 from Enlik --- .../razorqt-panel/razorqt-panel-9999.ebuild | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/razorqt-base/razorqt-panel/razorqt-panel-9999.ebuild b/razorqt-base/razorqt-panel/razorqt-panel-9999.ebuild index fe19648..a07544b 100644 --- a/razorqt-base/razorqt-panel/razorqt-panel-9999.ebuild +++ b/razorqt-base/razorqt-panel/razorqt-panel-9999.ebuild @@ -21,14 +21,17 @@ fi LICENSE="LGPL-2.1+" SLOT="0" -IUSE="+clock colorpicker cpuload +desktopswitch +mainmenu +mount networkmonitor - +quicklaunch screensaver sensors +showdesktop +taskbar +tray +volume" +IUSE="+alsa +clock colorpicker cpuload +desktopswitch +mainmenu +mount + networkmonitor pulseaudio +quicklaunch screensaver sensors +showdesktop + +taskbar +tray +volume" +REQUIRED_USE="volume? ( || ( alsa pulseaudio ) )" DEPEND="razorqt-base/razorqt-libs cpuload? ( sys-libs/libstatgrab ) networkmonitor? ( sys-libs/libstatgrab ) sensors? ( sys-apps/lm_sensors ) - volume? ( || ( media-libs/alsa-lib media-sound/pulseaudio ) )" + volume? ( alsa? ( media-libs/alsa-lib ) + pulseaudio? ( media-sound/pulseaudio ) )" RDEPEND="${DEPEND} razorqt-base/razorqt-data mount? ( sys-fs/udisks )" @@ -38,10 +41,17 @@ src_configure() { -DSPLIT_BUILD=On -DMODULE_PANEL=On ) - # probably needs fixing for automagic deps (e.g. alsa / pulse) + + local i for i in clock colorpicker cpuload desktopswitch mainmenu mount networkmonitor \ quicklaunch screensaver sensors showdesktop taskbar tray volume; do use $i || mycmakeargs+=( -D${i^^}_PLUGIN=No ) done + + if use volume; then + for i in alsa pulseaudio; do + use $i || mycmakeargs+=( -DVOLUME_USE_${i^^}=No ) + done + fi cmake-utils_src_configure }