[gentoo-commits] proj/gentoo-mate:master commit in: mate-base/mate-session-manager/

["NP Hardass" <np-hardass@gentoo.org>]

commit:     c33245b90b888ec9edc8f7d736c082d1968deaeb
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 15 06:05:57 2015 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Wed Jul 15 06:05:57 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=c33245b9

Fix upower dependencies. Thanks to sdnick484 for pointing it out.

Package-Manager: portage-2.2.20
Manifest-Sign-Key: 18F89C67

 mate-base/mate-session-manager/ChangeLog           |   6 ++
 mate-base/mate-session-manager/Manifest            |  29 +++---
 .../mate-session-manager-1.8.1-r2.ebuild           | 101 +++++++++++++++++++++
 3 files changed, 122 insertions(+), 14 deletions(-)

diff --git a/mate-base/mate-session-manager/ChangeLog b/mate-base/mate-session-manager/ChangeLog
index c56b688..6b1f787 100644
--- a/mate-base/mate-session-manager/ChangeLog
+++ b/mate-base/mate-session-manager/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/ChangeLog,v 1.16 2014/12/20 17:20:35 tamiko Exp $
 
+*mate-session-manager-1.8.1-r2 (15 Jul 2015)
+
+  15 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org>
+  +mate-session-manager-1.8.1-r2.ebuild:
+  Fix upower dependencies. Thanks to sdnick484 for pointing it out.
+
   06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
   Updated maintainer and add remote IDs.
 

diff --git a/mate-base/mate-session-manager/Manifest b/mate-base/mate-session-manager/Manifest
index 7a9635b..a27debb 100644
--- a/mate-base/mate-session-manager/Manifest
+++ b/mate-base/mate-session-manager/Manifest
@@ -11,22 +11,23 @@ AUX mate-session-manager-1.6-gnome-keyring.patch 8857 SHA256 d0fae72ab5be01d9f07
 AUX mate-session-manager-1.6.1-login1.patch 7819 SHA256 7d0141356e09e00812165b55a0e8a04659decb304a9eebd6737f1bccd83cb80f SHA512 55452c738cbd80b80cfcd1cfda0e23e79a5d1626e34e75a978561ff748787e5283c09531db435333bf2fcd7f06249d738b4a08929ae902da2ef4c11c9baf2bbc WHIRLPOOL 01ff8e0b89cb480b07d2adb5bd2f608da1432ae35028a407776306ec386953785b45fcf75e1cd269558cf8fe27268141629d44679d11ae72ea822305b8b2b863
 DIST mate-session-manager-1.8.1.tar.xz 524204 SHA256 2f85a714704bc475d08809be6ecf24a5d94d2e2d0ea5ac704d67557c349d7b8c SHA512 1b09a471db710193a643ec90c9b153468d9a303957b9c4da4e30cf470aa5f582b6992f5e0ed69129943aa44f7c4e372e2a8554fc6020627817a3c49d656ca5b5 WHIRLPOOL 8c771ac713da92c2ae8bccc173a9cba4fc5bb16a943e588c679624e3e945555f2c37511426e666f38440947ec37139452ee230d07bc3a414a65629c04bfd31a6
 EBUILD mate-session-manager-1.8.1-r1.ebuild 2682 SHA256 425e8fab136a4eb72338595cb81ac6e087fe7b4ef2641587e4563b735db6573a SHA512 3030ec367a36f476ae8d0bef6d31def77bcea91142b865006e6093e86156221950d9e6ed56e748f5c6a79ba0753ed707283dd6d6ebfb4aff2f8fcbeef76c1a55 WHIRLPOOL 94ae18ff3aaf9888c2d59de380a2d3a2773a8f146e9fe98a9b077361114610fab58636d26b45ae82a4e475be1362c1d528b2abe8c84c2451d06ecddba0d83c19
-MISC ChangeLog 3226 SHA256 1605ed6032aafa66312fbe02ed01004ddf5564f3d5d00cc0dd1a39f07a944427 SHA512 ca6ab7c01625d16719af2d94b633bceec8023117c4286ca596abd67002f87bc260d1ca74cbf24c508c6daf90fd01d8687b5f7cbdf12d6844fb9893352d67a949 WHIRLPOOL 11630955afd2b951e3fc3ca4c820ebfc2e776d592c53d574f19d1cb0516248a71bdcf72f006d8e2cca440de3aa03334582e915b4eaa05b7add8f0581d9dad1fd
+EBUILD mate-session-manager-1.8.1-r2.ebuild 2720 SHA256 a1ff5527aec3c5726cc685959d74bbed0d02c6cd5300eee9bd72519320ed5963 SHA512 2321dd0f4f9bfc6f3315ffa6378ca36ccd14ebec320d8a81fa013a4b639b3596829aa9bbe170f0ed6523ea12c16e8a457f79bf166a0425025c1e5f6f6932cee8 WHIRLPOOL 59310df22942e89f964884ec32f18092652ae3cd4723b20fc989008c1354545922688877b047eb6a64e24f9cb42dd991d50daf333ea997128990aadcb389cf3f
+MISC ChangeLog 3432 SHA256 ed279523c0df6e10b90461d911cdd56039755294635920da98b687aea895b035 SHA512 6ae6e62525cf7fcbcafb215121bb172cda7fccfe7e550a196dd42bcac4cae9d9eafe9554069d0a8b1a710590d769a11e1c6cefb8b6c2c03c06331d68e8e3905e WHIRLPOOL 256ea350b90908be2060ee4aeaa608d9349c3ddff587e8d116016784484785391f1604aeef704d7a5aad991dba7ffd5e29a8e4e6b9b8f40d2ad2bec1cf09d03b
 MISC metadata.xml 271 SHA256 7e3d0b8509870eaa0238a46ec383250288382a1733764f2e1be76298a640845e SHA512 1c4be914d1764dae6071e7b25d652275d9eef62d96aa2630dce7298e4b392b89ddde264b9d35c6a020cf82bcdf7948e4240ca864b32b07ffbba27891dd8c2cb3 WHIRLPOOL 3e60f953449a94cc05c20dc0c017e0b06f629d3ae03d7ac442e85ddb3b53271f54a1d27428b2ccfa5c3c2bf835a1eb3c489d507f0e542e1af2753549eed7247c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVmgYNAAoJEBzZQR2yrxj7h2kP/i/ZUxrt0C81H+o/7+tB9+jj
-fXf1zj6hIkuVi+SlHMDQZInEK8hshW8rzPzijyE+tCYbc6Nn21OWH11r5k8CMt6c
-4OmMaKqH9L0+8EZ9vEnoCOydZIT6Ik6Z4m1jO5CfUwCl8DDcGrE+1kvd9EU3fCam
-qQ6h91ypnOPc74O1DPc1eU9qY6GHVMPARU1n6IecFaFSGoImS3hlqqnU1nW9t4DG
-F/eigZsIzcfpsvtrT9dNOAbJpAotTNFdzEsRQ9DbkA+GhjoZUMezoDTigkash1i7
-suWg/mrx/e/04y34FZPKnas2uxQzMhGxI3i98r0X7X0zBsr69Fl9/F7tmUikWs7Z
-PwIwEC8H8aCloYASMQI/Yge/tQOIgfegS+BLz7sFPXblfUFIZeeWF8D7EL1ogN43
-j4VtRadbCjUR/3tJm4kM4HzavyUAEKrXe+mEtNoemDRp4uLUBuLR+qyN+VA4tXWx
-L47ymMl0se1uNHbhBSTUiyK1EIseh9mCBJ+pRzgnTf4DoSCX5ym+KOFEfjx6ZTOt
-LIWVbZYUPAWnupviQBREuCLSALMPTgTVBxLlluDeJdWl9qEN4JDND6XibQj4WMFd
-kxwTLLonWlyyivHUyz7BXmv56UddIRrfCd3xypgxA5Yxx4PSBpnEjWJKr+byzBKm
-aFSdm2aM/ja8SnWtkvF4
-=z5Zy
+iQIcBAEBCAAGBQJVpfhFAAoJEBzZQR2yrxj7i+MP+gJ7QZxQRYwvGPpfnpfgbo0j
+4Bk2Bb1O2OItdgNoInb3398FLi4cpsklmQqOMSM2wQc5hDBniJPOOcYemtmxDVDE
+/6PDLZ1V4nrzPpKEwcxECNQhQDrxSlaFGYYuuOZW35dvkVIn06oaYs4lKgICTFnI
+QWXVSYz1TIcG6LE8gni7JV7iq8OoTP0bxAGpvRu9wuabPeiu30ckoxYtQN/OK6NF
+2NPvSjZhtHych6P+mk5VEj0wpx+XTbfGPteKL0H4UkFcCgfizJLFwD287lLwaUNw
+3Rk0UDWkrE05x25ACgfxf3cuA6kz+CLknkCN8/D8s0cs1U3YgjB3uyn2fgstPOdv
+YkagW/bKWNvEvdsXI2XmZbbA0/KO+sy4MpSzmmwD2eUSAxaucGShaGeTn74QkDER
+gVcbw7RFD4NLmfdwrgTre7zzid2q6Pr7mgLGK5YIp7WLyim9hcsPopHGFEzrKY6X
+0/Dw8ixe6hsu1ripUJQSGLfWBxB2cA5CGIWjF956s0KVavUXwmcf4d9JO64C8qrA
+TtA9IBu+6iAvmYVuiBDAN4of/92OKOlhLVrk1LRvGSmrdfZfIA8DHtziWPh6jpJj
+6+WaL2tEHZwL4JDDwoOvHY9PsKWJQ0D8h/u0BU0TKJg2j5tcgHMAXIVNYr3xQd0i
+btyCLK/HbEWSevnOw4TX
+=nD4+
 -----END PGP SIGNATURE-----

diff --git a/mate-base/mate-session-manager/mate-session-manager-1.8.1-r2.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.8.1-r2.ebuild
new file mode 100644
index 0000000..0b4271e
--- /dev/null
+++ b/mate-base/mate-session-manager/mate-session-manager-1.8.1-r2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/mate-session-manager-1.8.1-r1.ebuild,v 1.7 2015/07/11 23:55:19 np-hardass Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="yes"
+
+inherit autotools gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="MATE session manager"
+HOMEPAGE="http://mate-desktop.org/"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="ipv6 elibc_FreeBSD gnome-keyring systemd upower"
+
+# 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_*
+# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
+
+RDEPEND=">=dev-libs/dbus-glib-0.76
+	>=dev-libs/glib-2.25:2
+	dev-libs/libxslt
+	sys-apps/dbus
+	x11-apps/xdpyinfo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.14:2
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango
+	x11-libs/xtrans
+	x11-misc/xdg-user-dirs
+	x11-misc/xdg-user-dirs-gtk
+	virtual/libintl
+	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	gnome-keyring? ( gnome-base/gnome-keyring )
+	systemd? ( sys-apps/systemd )
+	upower? ( || ( >=sys-power/upower-0.9.23:= >=sys-power/upower-pm-utils-0.9.23 ) )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40:*
+	>=dev-lang/perl-5
+	>=mate-base/mate-common-1.8
+	>=sys-devel/gettext-0.10.40:*
+	virtual/pkgconfig:*
+	!<gnome-base/gdm-2.20.4"
+
+src_prepare() {
+	# Add "session saving" button back,
+	# see https://bugzilla.gnome.org/show_bug.cgi?id=575544
+	epatch "${FILESDIR}"/${PN}-1.5.2-save-session-ui.patch
+
+	# Fix race condition in idle monitor, GNOME bug applies to MATE too,
+	# see https://bugzilla.gnome.org/show_bug.cgi?id=627903
+	epatch "${FILESDIR}"/${PN}-1.2.0-idle-transition.patch
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--with-default-wm=mate-wm \
+		--with-gtk=2.0 \
+		$(use_enable ipv6) \
+		$(use_with systemd) \
+		$(use_enable upower)
+}
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_install() {
+	gnome2_src_install
+
+	dodir /etc/X11/Sessions/
+	exeinto /etc/X11/Sessions/
+	doexe "${FILESDIR}"/MATE
+
+	dodir /usr/share/mate/applications/
+	insinto /usr/share/mate/applications/
+	doins "${FILESDIR}"/defaults.list
+
+	dodir /etc/X11/xinit/xinitrc.d/
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe "${FILESDIR}"/15-xdg-data-mate
+
+	# This should be done in MATE too, see Gentoo bug #270852
+	doexe "${FILESDIR}"/10-user-dirs-update-mate
+}