commit:     80f2242705b9ec6922f24ddd9c776595e82c9a59
Author:     Ettore Di Giacinto <mudler <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 15 15:15:20 2017 +0000
Commit:     Ettore Di Giacinto <mudler <AT> gentoo <DOT> org>
CommitDate: Wed Mar 15 15:15:20 2017 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=80f22427

mate-base/mate-session-manager: sync live ebuild with upstram

* Drop upower support, add consolekit dep for not-systemd systems
* Add xtrans optional support

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../mate-session-manager/mate-session-manager-9999.ebuild  | 14 +++++++-------
 mate-base/mate-session-manager/metadata.xml                |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/mate-base/mate-session-manager/mate-session-manager-9999.ebuild 
b/mate-base/mate-session-manager/mate-session-manager-9999.ebuild
index 3991dbb..dae7992 100644
--- a/mate-base/mate-session-manager/mate-session-manager-9999.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ HOMEPAGE="http://mate-desktop.org/";
 LICENSE="GPL-2 LGPL-2 FDL-1.1"
 SLOT="0"
 
-IUSE="debug elibc_FreeBSD gnome-keyring ipv6 systemd upower"
+IUSE="debug elibc_FreeBSD gnome-keyring ipv6 systemd xtrans"
 
 # x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, 
and
 # create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
@@ -26,6 +26,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.76
        dev-libs/libxslt
        sys-apps/dbus
        x11-libs/gdk-pixbuf:2
+       >=x11-libs/gtk+-3.14:3
        x11-libs/libICE
        x11-libs/libSM
        x11-libs/libX11
@@ -34,12 +35,11 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.76
        x11-libs/libXrender
        x11-libs/libXtst
        x11-libs/pango
-       x11-libs/xtrans
        virtual/libintl
        elibc_FreeBSD? ( dev-libs/libexecinfo )
-       >=x11-libs/gtk+-3.14:3
        systemd? ( sys-apps/systemd )
-       upower? ( || ( >=sys-power/upower-0.9.23 
>=sys-power/upower-pm-utils-0.9.23 ) )"
+       !systemd? ( >=sys-auth/consolekit-0.9.2 )
+       xtrans? ( x11-libs/xtrans )"
 
 RDEPEND="${COMMON_DEPEND}
        x11-apps/xdpyinfo
@@ -60,9 +60,9 @@ src_configure() {
        mate_src_configure \
                --docdir="${EPREFIX}/usr/share/doc/${PF}" \
                $(use_with systemd) \
+               $(use_with xtrans)  \
                $(use_enable debug) \
-               $(use_enable ipv6) \
-               $(use_enable upower)
+               $(use_enable ipv6)
 }
 
 src_install() {

diff --git a/mate-base/mate-session-manager/metadata.xml 
b/mate-base/mate-session-manager/metadata.xml
index 9a1a348..2a87982 100644
--- a/mate-base/mate-session-manager/metadata.xml
+++ b/mate-base/mate-session-manager/metadata.xml
@@ -7,6 +7,7 @@
     </maintainer>
        <use>
                <flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
+               <flag name="xtrans">Build with Xtrans support</flag>
        </use>
     <upstream>
         <remote-id type="github">mate-desktop/mate-session-manager</remote-id>

Reply via email to