commit:     c2dbc50ebc859f7805557d79ce4584c06d9f2eb6
Author:     Ettore Di Giacinto <mudler <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 15 16:48:30 2017 +0000
Commit:     Ettore Di Giacinto <mudler <AT> gentoo <DOT> org>
CommitDate: Wed Mar 15 16:54:27 2017 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=c2dbc50e

mate-extra/mate-power-manager: sync live ebuild with upstream

* Drop gtk3 useflag
* Drop man useflag, man pages are not generated anymore
* Add systemd useflag, require consolekit for -systemd

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../mate-power-manager-9999.ebuild                 | 38 +++++-----------------
 1 file changed, 9 insertions(+), 29 deletions(-)

diff --git a/mate-extra/mate-power-manager/mate-power-manager-9999.ebuild 
b/mate-extra/mate-power-manager/mate-power-manager-9999.ebuild
index 5a16f8e..91ede72 100644
--- a/mate-extra/mate-power-manager/mate-power-manager-9999.ebuild
+++ b/mate-extra/mate-power-manager/mate-power-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
@@ -13,35 +13,30 @@ DESCRIPTION="A session daemon for MATE that makes it easy 
to manage your laptop
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="+applet gnome-keyring gtk3 man pm-utils policykit test"
+IUSE="+applet gnome-keyring pm-utils policykit systemd test"
 
 # Interactive testsuite.
 RESTRICT="test"
 
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.70:0
        >=dev-libs/glib-2.36:2
+       >=media-libs/libcanberra-0.10:0[gtk3]
        >=sys-apps/dbus-1:0
        >=x11-apps/xrandr-1.3:0
        >=x11-libs/cairo-1:0
        >=x11-libs/gdk-pixbuf-2.11:2
+       >=x11-libs/gtk+-3.14:3
        x11-libs/libX11:0
        x11-libs/libXext:0
        x11-libs/libXrandr:0
        >=x11-libs/libnotify-0.7:0
        x11-libs/pango:0
-       applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] )
+       applet? ( >=mate-base/mate-panel-1.17.0 )
        gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 )
-       !gtk3? (
-               >=dev-libs/libunique-1:1
-               >=media-libs/libcanberra-0.10:0[gtk]
-               >=x11-libs/gtk+-2.24:2
-       )
-       gtk3? (
-               >=media-libs/libcanberra-0.10:0[gtk3]
-               >=x11-libs/gtk+-3.0:3
-       )
        pm-utils? ( >=sys-power/upower-pm-utils-0.9.23 )
-       !pm-utils? ( >=sys-power/upower-0.9.23:= )"
+       !pm-utils? ( >=sys-power/upower-0.9.23:= )
+       systemd? ( sys-apps/systemd )
+       !systemd? ( >=sys-auth/consolekit-0.9.2 )"
 
 RDEPEND="${COMMON_DEPEND}
        policykit? ( >=mate-extra/mate-polkit-1.6 )"
@@ -55,26 +50,11 @@ DEPEND="${COMMON_DEPEND}
        x11-proto/randrproto:0
        >=x11-proto/xproto-7.0.15:0
        sys-devel/gettext:*
-       virtual/pkgconfig:*
-       man? ( app-text/docbook-sgml-utils:0
-               >=app-text/docbook-sgml-dtd-4.3 )"
-
-src_prepare() {
-       mate_src_prepare
-
-       # This needs to be after eautoreconf to prevent problems like bug 
#356277
-       # Remove the docbook2man rules here since it's not handled by a proper
-       # parameter in configure.in.
-       if ! use man; then
-               sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i man/Makefile.in \
-                       || die "docbook sed failed"
-       fi
-}
+       virtual/pkgconfig:*"
 
 src_configure() {
        mate_src_configure \
                --enable-compile-warnings=minimum \
-               --with-gtk=$(usex gtk3 3.0 2.0) \
                $(use_with gnome-keyring keyring) \
                $(use_enable applet applets) \
                $(use_enable test tests)

Reply via email to