diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-08-23 19:12:06 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-08-23 19:12:06 +0000 |
| commit | 45c2a3308736b2dbbb19293c2b7a7ab4ecd20a9c (patch) | |
| tree | 98b44428c335cca9c8a0f0b91a28e27e531d9637 /lxde-base/lxsession | |
| parent | Add a patch to fix range-checking and array out-of-bounds access issues. (diff) | |
| download | gentoo-2-45c2a3308736b2dbbb19293c2b7a7ab4ecd20a9c.tar.gz gentoo-2-45c2a3308736b2dbbb19293c2b7a7ab4ecd20a9c.tar.bz2 gentoo-2-45c2a3308736b2dbbb19293c2b7a7ab4ecd20a9c.zip | |
Rename USE="udev" to USE="dbus upower" separating restart/shutdown vs. hibernate/suspend into their own flags wrt #438478 by Dominique Michel
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'lxde-base/lxsession')
| -rw-r--r-- | lxde-base/lxsession/ChangeLog | 7 | ||||
| -rw-r--r-- | lxde-base/lxsession/lxsession-0.4.6.1.ebuild | 30 | ||||
| -rw-r--r-- | lxde-base/lxsession/metadata.xml | 3 |
3 files changed, 23 insertions, 17 deletions
diff --git a/lxde-base/lxsession/ChangeLog b/lxde-base/lxsession/ChangeLog index 9b049cb50461..3e7a0e9838ef 100644 --- a/lxde-base/lxsession/ChangeLog +++ b/lxde-base/lxsession/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for lxde-base/lxsession # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/ChangeLog,v 1.40 2013/02/23 02:35:05 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/ChangeLog,v 1.41 2013/08/23 19:12:06 ssuominen Exp $ + + 23 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> lxsession-0.4.6.1.ebuild, + metadata.xml: + Rename USE="udev" to USE="dbus upower" separating restart/shutdown vs. + hibernate/suspend into their own flags wrt #438478 by Dominique Michel 23 Feb 2013; Zac Medico <zmedico@gentoo.org> lxsession-0.4.6.1.ebuild: Add ~arm-linux and ~x86-linux keywords. diff --git a/lxde-base/lxsession/lxsession-0.4.6.1.ebuild b/lxde-base/lxsession/lxsession-0.4.6.1.ebuild index 5e925aefe0a0..744d36bbe516 100644 --- a/lxde-base/lxsession/lxsession-0.4.6.1.ebuild +++ b/lxde-base/lxsession/lxsession-0.4.6.1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/lxsession-0.4.6.1.ebuild,v 1.7 2013/02/23 02:35:05 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/lxsession-0.4.6.1.ebuild,v 1.8 2013/08/23 19:12:06 ssuominen Exp $ -EAPI="4" +EAPI=5 DESCRIPTION="LXDE session manager (lite version)" HOMEPAGE="http://lxde.sf.net/" @@ -11,30 +11,28 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz" LICENSE="GPL-2" KEYWORDS="~alpha amd64 arm ppc x86 ~arm-linux ~x86-linux" SLOT="0" -IUSE="nls udev" +# upower USE flag is enabled by default in the desktop profile +IUSE="+dbus nls upower" COMMON_DEPEND="dev-libs/glib:2 + lxde-base/lxde-common x11-libs/gtk+:2 - >=lxde-base/lxde-common-0.5.0 x11-libs/libX11 - udev? ( >=sys-apps/dbus-1.4.1 )" + dbus? ( sys-apps/dbus )" RDEPEND="${COMMON_DEPEND} - udev? ( >=sys-power/upower-0.9.5 )" + upower? ( sys-power/upower )" DEPEND="${COMMON_DEPEND} dev-util/intltool - virtual/pkgconfig sys-devel/gettext + virtual/pkgconfig x11-proto/xproto" +REQUIRED_USE="upower? ( dbus )" + +DOCS="AUTHORS ChangeLog README" src_configure() { + # dbus is used for restart/shutdown (CK, logind?), and suspend/hibernate (UPower) econf \ - --disable-dependency-tracking \ - $(use_enable udev dbus) \ - $(use_enable nls) \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS ChangeLog README + $(use_enable dbus) \ + $(use_enable nls) } diff --git a/lxde-base/lxsession/metadata.xml b/lxde-base/lxsession/metadata.xml index 34a29015776f..6e9dbe3d800f 100644 --- a/lxde-base/lxsession/metadata.xml +++ b/lxde-base/lxsession/metadata.xml @@ -2,4 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>lxde</herd> + <use> + <flag name='upower'>Pull in <pkg>sys-power/upower</pkg> for hibernate/suspend support</flag> + </use> </pkgmetadata> |