summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2014-06-02 07:07:44 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2014-06-02 07:07:44 +0000
commitc7e9168e01c04f9d3a6ca0083cfaa7a805d86767 (patch)
tree832ea288c843ff2873153ed4e7290faba24ff026 /xfce-base/xfce4-session
parentVersion bump mercurial to 3.0.1 (diff)
downloadgentoo-2-c7e9168e01c04f9d3a6ca0083cfaa7a805d86767.tar.gz
gentoo-2-c7e9168e01c04f9d3a6ca0083cfaa7a805d86767.tar.bz2
gentoo-2-c7e9168e01c04f9d3a6ca0083cfaa7a805d86767.zip
Temporarily apply -upower-0.99.patch only with USE="udev" wrt #512084
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'xfce-base/xfce4-session')
-rw-r--r--xfce-base/xfce4-session/ChangeLog6
-rw-r--r--xfce-base/xfce4-session/xfce4-session-4.11.0-r1.ebuild10
2 files changed, 10 insertions, 6 deletions
diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog
index 9d03cf73a4dc..1c9deefa2a1d 100644
--- a/xfce-base/xfce4-session/ChangeLog
+++ b/xfce-base/xfce4-session/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for xfce-base/xfce4-session
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.207 2014/05/31 19:19:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.208 2014/06/02 07:07:44 ssuominen Exp $
+
+ 02 Jun 2014; Samuli Suominen <ssuominen@gentoo.org>
+ xfce4-session-4.11.0-r1.ebuild:
+ Temporarily apply -upower-0.99.patch only with USE="udev" wrt #512084
*xfce4-session-4.11.0-r1 (31 May 2014)
diff --git a/xfce-base/xfce4-session/xfce4-session-4.11.0-r1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.11.0-r1.ebuild
index 47f9eafda08d..3f2bc372abbf 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.11.0-r1.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.11.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.11.0-r1.ebuild,v 1.1 2014/05/31 19:19:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.11.0-r1.ebuild,v 1.2 2014/06/02 07:07:44 ssuominen Exp $
EAPI=5
EAUTORECONF=1
@@ -42,10 +42,10 @@ DEPEND="${COMMON_DEPEND}
virtual/pkgconfig"
pkg_setup() {
- PATCHES=(
- "${FILESDIR}"/${PN}-4.10.1-alock_support_to_xflock4.patch
- "${FILESDIR}"/${P}-upower-0.99.patch
- )
+ PATCHES=( "${FILESDIR}"/${PN}-4.10.1-alock_support_to_xflock4.patch )
+
+ # http://bugs.gentoo.org/512084
+ use udev && PATCHES+=( "${FILESDIR}"/${P}-upower-0.99.patch )
XFCONF=(
--docdir="${EPREFIX}"/usr/share/doc/${PF}