diff options
author | Davide Pesavento <pesa@gentoo.org> | 2014-10-04 20:54:45 +0000 |
---|---|---|
committer | Davide Pesavento <pesa@gentoo.org> | 2014-10-04 20:54:45 +0000 |
commit | bf379e1efa867fc4fee049508fa680ec4d901c52 (patch) | |
tree | 58b82673b2cd00e4c7a3f5255f8a6a11199fcf00 /razorqt-base | |
parent | Enabled compilation of linux specific code (diff) | |
download | gentoo-2-bf379e1efa867fc4fee049508fa680ec4d901c52.tar.gz gentoo-2-bf379e1efa867fc4fee049508fa680ec4d901c52.tar.bz2 gentoo-2-bf379e1efa867fc4fee049508fa680ec4d901c52.zip |
Rename 'mount' USE flag to 'udisks' wrt bug #517962.
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Diffstat (limited to 'razorqt-base')
-rw-r--r-- | razorqt-base/razorqt-panel/ChangeLog | 8 | ||||
-rw-r--r-- | razorqt-base/razorqt-panel/metadata.xml | 2 | ||||
-rw-r--r-- | razorqt-base/razorqt-panel/razorqt-panel-0.5.1-r1.ebuild | 17 | ||||
-rw-r--r-- | razorqt-base/razorqt-panel/razorqt-panel-0.5.2.ebuild | 17 |
4 files changed, 24 insertions, 20 deletions
diff --git a/razorqt-base/razorqt-panel/ChangeLog b/razorqt-base/razorqt-panel/ChangeLog index 154e13954851..09b33e29e0e5 100644 --- a/razorqt-base/razorqt-panel/ChangeLog +++ b/razorqt-base/razorqt-panel/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for razorqt-base/razorqt-panel -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/razorqt-base/razorqt-panel/ChangeLog,v 1.10 2013/04/05 14:40:56 ago Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/razorqt-base/razorqt-panel/ChangeLog,v 1.11 2014/10/04 20:54:45 pesa Exp $ + + 04 Oct 2014; Davide Pesavento <pesa@gentoo.org> metadata.xml, + razorqt-panel-0.5.1-r1.ebuild, razorqt-panel-0.5.2.ebuild: + Rename 'mount' USE flag to 'udisks' wrt bug #517962. 05 Apr 2013; Agostino Sarubbo <ago@gentoo.org> razorqt-panel-0.5.2.ebuild: Stable for x86, wrt bug #464706 diff --git a/razorqt-base/razorqt-panel/metadata.xml b/razorqt-base/razorqt-panel/metadata.xml index 6826f07aeaf8..98818a860828 100644 --- a/razorqt-base/razorqt-panel/metadata.xml +++ b/razorqt-base/razorqt-panel/metadata.xml @@ -9,8 +9,6 @@ <pkg>sys-libs/libstatgrab</pkg></flag> <flag name='desktopswitch'>Add desktop switch panel applet</flag> <flag name='mainmenu'>Add main menu panel applet</flag> - <flag name='mount'>Add external storage mounting panel applet; depends on - <pkg>sys-fs/udisks</pkg></flag> <flag name='networkmonitor'>Add network monitor panel applet; depends on <pkg>sys-libs/libstatgrab</pkg></flag> <flag name='quicklaunch'>Add quicklaunch panel applet</flag> diff --git a/razorqt-base/razorqt-panel/razorqt-panel-0.5.1-r1.ebuild b/razorqt-base/razorqt-panel/razorqt-panel-0.5.1-r1.ebuild index 51a474a2d0ae..cefcbf30c49e 100644 --- a/razorqt-base/razorqt-panel/razorqt-panel-0.5.1-r1.ebuild +++ b/razorqt-base/razorqt-panel/razorqt-panel-0.5.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/razorqt-base/razorqt-panel/razorqt-panel-0.5.1-r1.ebuild,v 1.5 2013/01/20 19:33:12 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/razorqt-base/razorqt-panel/razorqt-panel-0.5.1-r1.ebuild,v 1.6 2014/10/04 20:54:45 pesa Exp $ EAPI=4 inherit cmake-utils @@ -21,9 +21,8 @@ fi LICENSE="LGPL-2.1+" SLOT="0" -IUSE="+alsa +clock colorpicker cpuload +desktopswitch +mainmenu +mount - networkmonitor pulseaudio +quicklaunch screensaver sensors +showdesktop - +taskbar +tray +volume" +IUSE="+alsa +clock colorpicker cpuload +desktopswitch +mainmenu networkmonitor pulseaudio + +quicklaunch screensaver sensors +showdesktop +taskbar +tray +udisks +volume" REQUIRED_USE="volume? ( || ( alsa pulseaudio ) )" DEPEND="razorqt-base/razorqt-libs @@ -34,7 +33,7 @@ DEPEND="razorqt-base/razorqt-libs pulseaudio? ( media-sound/pulseaudio ) )" RDEPEND="${DEPEND} razorqt-base/razorqt-data - mount? ( sys-fs/udisks )" + udisks? ( sys-fs/udisks )" PATCHES=( "${FILESDIR}/${P}-automagic.patch" ) @@ -45,15 +44,17 @@ src_configure() { ) local i - for i in clock colorpicker cpuload desktopswitch mainmenu mount networkmonitor \ - quicklaunch screensaver sensors showdesktop taskbar tray volume; do + for i in clock colorpicker cpuload desktopswitch mainmenu networkmonitor \ + quicklaunch screensaver sensors showdesktop taskbar tray volume; do use $i || mycmakeargs+=( -D${i^^}_PLUGIN=No ) done + use udisks || mycmakeargs+=( -DMOUNT_PLUGIN=No ) if use volume; then for i in alsa pulseaudio; do use $i || mycmakeargs+=( -DVOLUME_USE_${i^^}=No ) done fi + cmake-utils_src_configure } diff --git a/razorqt-base/razorqt-panel/razorqt-panel-0.5.2.ebuild b/razorqt-base/razorqt-panel/razorqt-panel-0.5.2.ebuild index 9bbe053055ac..9686e7ce01e3 100644 --- a/razorqt-base/razorqt-panel/razorqt-panel-0.5.2.ebuild +++ b/razorqt-base/razorqt-panel/razorqt-panel-0.5.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/razorqt-base/razorqt-panel/razorqt-panel-0.5.2.ebuild,v 1.3 2013/04/05 14:40:56 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/razorqt-base/razorqt-panel/razorqt-panel-0.5.2.ebuild,v 1.4 2014/10/04 20:54:45 pesa Exp $ EAPI=4 inherit cmake-utils @@ -21,9 +21,8 @@ fi LICENSE="LGPL-2.1+" SLOT="0" -IUSE="+alsa +clock colorpicker cpuload +desktopswitch +mainmenu +mount - networkmonitor pulseaudio +quicklaunch screensaver sensors +showdesktop - +taskbar +tray +volume" +IUSE="+alsa +clock colorpicker cpuload +desktopswitch +mainmenu networkmonitor pulseaudio + +quicklaunch screensaver sensors +showdesktop +taskbar +tray +udisks +volume" REQUIRED_USE="volume? ( || ( alsa pulseaudio ) )" DEPEND="razorqt-base/razorqt-libs @@ -34,7 +33,7 @@ DEPEND="razorqt-base/razorqt-libs pulseaudio? ( media-sound/pulseaudio ) )" RDEPEND="${DEPEND} razorqt-base/razorqt-data - mount? ( sys-fs/udisks )" + udisks? ( sys-fs/udisks )" src_configure() { local mycmakeargs=( @@ -43,15 +42,17 @@ src_configure() { ) local i - for i in clock colorpicker cpuload desktopswitch mainmenu mount networkmonitor \ - quicklaunch screensaver sensors showdesktop taskbar tray volume; do + for i in clock colorpicker cpuload desktopswitch mainmenu networkmonitor \ + quicklaunch screensaver sensors showdesktop taskbar tray volume; do use $i || mycmakeargs+=( -D${i^^}_PLUGIN=No ) done + use udisks || mycmakeargs+=( -DMOUNT_PLUGIN=No ) if use volume; then for i in alsa pulseaudio; do use $i || mycmakeargs+=( -DVOLUME_USE_${i^^}=No ) done fi + cmake-utils_src_configure } |