diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2013-08-23 19:12:11 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-08-23 19:12:11 +0000 |
commit | 69e9bc85f459380b6f6ec4bbfa3802288ce2702f (patch) | |
tree | 798cc895c2efd6972fb2b1677b340a45be3acb46 /lxde-base | |
parent | Add a patch to fix range-checking and array out-of-bounds access issues. (diff) | |
download | historical-69e9bc85f459380b6f6ec4bbfa3802288ce2702f.tar.gz historical-69e9bc85f459380b6f6ec4bbfa3802288ce2702f.tar.bz2 historical-69e9bc85f459380b6f6ec4bbfa3802288ce2702f.zip |
Rename USE="udev" to USE="dbus upower" separating restart/shutdown vs. hibernate/suspend into their own flags wrt #438478 by Dominique Michel
Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D
Diffstat (limited to 'lxde-base')
-rw-r--r-- | lxde-base/lxsession/ChangeLog | 7 | ||||
-rw-r--r-- | lxde-base/lxsession/Manifest | 18 | ||||
-rw-r--r-- | lxde-base/lxsession/lxsession-0.4.6.1.ebuild | 30 | ||||
-rw-r--r-- | lxde-base/lxsession/metadata.xml | 3 |
4 files changed, 34 insertions, 24 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/Manifest b/lxde-base/lxsession/Manifest index 5505801b71ec..bfc243314c8c 100644 --- a/lxde-base/lxsession/Manifest +++ b/lxde-base/lxsession/Manifest @@ -2,13 +2,17 @@ Hash: SHA256 DIST lxsession-0.4.6.1.tar.gz 407100 SHA256 bd6a7ef3c0ba4b9eedf3c58624dbce8bbbba3b179abbc552bf10c2830eec3ee1 SHA512 eea554ba70b3fd278b7ce0bb2d278241dff26eaccf74f2a4a0a9846515688fd5dd846c97f29c71139a0c3b95bc5e906efc4673f0cd79d8db427894dff5524f16 WHIRLPOOL 235d6c2e8a622a4460d767d5b6af22710f17060fffea18ac5cedaeb4dc9f70dc77872d486caa9d7256c379f160755ac7b8299e7836fd513675b65d1c979b900a -EBUILD lxsession-0.4.6.1.ebuild 969 SHA256 4596641bc889a0b1ee3509a4fcc4a96fd804a4bcfce132246c05e3a6048256c4 SHA512 07a130c743119e5fafe7963e55f76d0c434399a438e63f29d66dcca37fa1f8a99c2c4c560c2c83bd5854aeca01f06fa35b55e1e3c6bf86068bc8b46f3b54cf86 WHIRLPOOL 295cf56ec614cd4c59196c6df17f0356b2a89656e6f969143c685722f35568a868e0d6091fac488b91dd739837aabed5e7ae449e9586b846f1628c13eaa95cb8 -MISC ChangeLog 5626 SHA256 e3d8586365fa5c873f3e06d3916c7723885613611b73cf103b847b1719fb25ea SHA512 913a4002581ad12c8222ecf71d1554d2ba3cd5247daa446747f02a4b7b74cf81804f05c2ca0771c8fa828064c599ea3f6494de85a8bf015d25687b385feb7549 WHIRLPOOL 327ee9b4fc182078a62d0009ab6069ab47e12a654c1d64cecadce2398ffd374d17f49684e78c02ae375387bca2ee6680a32c89c4ea68291a6de9ec8004ce7d6a -MISC metadata.xml 159 SHA256 09574ccad15f69d5367ecbb1a491cd636fb88582f69987d2ec217109dfe8befb SHA512 b4d06538d607c5ba81e0070475cd7d0a221b19e2adf740f479398a647c97350eb6d02b7db8bde107b0c369ce0058b8f0639468c0ca519ff585c555a0bfd4a381 WHIRLPOOL f5dfee2db356573e21cdb76ebcd11a61d2dc7f2b2b8458589cdabb1b2fd21f3261d0b40144b1417d433d1078a9c31a6b4562a914068719df66dfd4563714d9ab +EBUILD lxsession-0.4.6.1.ebuild 1032 SHA256 f4b370644992af47a61562c1fc0007f7d0e543a3b3f32f23916a63aa90bb6cca SHA512 4fef19b4509d19fd4d40331a34ae374ea1c56f9d0f69f665334b60ec060e9855006408dafaabf908a916afb1457bbc88f174f380d32dfe8283105842819ee9a1 WHIRLPOOL 95fdc47d78bf0f3341003add98fcd9811c594523fa4278685dceb01b7411eafcd02c4eed46cfea7ed5593ae5c3f35eea64fd88872771b27a156a510249543190 +MISC ChangeLog 5871 SHA256 0822e896acd18baa16806b0add0266b9445f3102c53e6cb44c052ebcbfbc67b2 SHA512 35d3326c40aede61e1e3590ffeafdcc7208d966660a3e814701dfb888f597579a3b366afc34d79e372a45ef3d986be2fa2b8ffe1dfaa26e59488934591107c32 WHIRLPOOL 1d02a5386a16939fcac3d27e224968c594cf6c7abb834b2ee5ec65f504e5b4ed517c8fb391f8070b2334deb3c0b9c694ee76d79d08fbdebf6a890fc745059251 +MISC metadata.xml 273 SHA256 81ec974708665ad78687d951d92cc04365d3cc14e29f7bffe7b44a7feae00b0e SHA512 377b077e8df5d96050c07d631ad60535b28a307e40554ff8772e2baf1ac509caadb0a843f33a16ed98b677d547526b2045ee8b8d36ba1324f1b2d8c8be87d382 WHIRLPOOL a93a8996b05319db10902fa49ec30fa605c73e8e93bd6fe02ede29b3b08fa4786d9034729475935fa6b826486c72a7b3504a21255a1b68d2467fc45ab51f8c2c -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.20 (GNU/Linux) -iEYEAREIAAYFAlEoKtsACgkQ/ejvha5XGaMPYwCgrHfhKD2t8yE7I7ysVvPMKx1B -ZwMAn2nGSHJ08CdO5UANrR04XShrJ/YY -=tgmL +iQEcBAEBCAAGBQJSF7QFAAoJEEdUh39IaPFNDYAIAJExt20QWX9MmnPgj4r1+X/t +UloCOuXcr2+O1ChNcsd+zPu5gxmb8+Uae2JR6LkUXAiR1a5T2n9fvzZD0O5MdbTf +nBWObG1Tvqpy958WL86KRL4dXk5wjienYR+svZbh9tPyzq1FUrv5K1aTeNWya2Dn +JZnq9pO7FYS0JMC/+uEFwVGEZlmwgb4LivqRNeAIITyTpoa/Jucoa0AXdvy56shF +6tsWpS63FeJ7bcHUGUCgGd0uNgckrT/CEUYSkpKiJf7WaomHMe5M2/prc/b1iXaW +MVVVP4Sisv4MSx7plNBDR6ZNZZ156lr/YVOFAdOXWrCehfS99RrDRBVC9wzrW/g= +=Pquq -----END PGP SIGNATURE----- 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> |