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

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x18F89C67

3 files changed, 123 insertions, 15 deletions

diff --git a/mate-base/mate-session-manager/ChangeLog b/mate-base/mate-session-manager/ChangeLog
index a0721a9ed8eb..2fa1cccec598 100644
--- a/mate-base/mate-session-manager/ChangeLog
+++ b/mate-base/mate-session-manager/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mate-base/mate-session-manager
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/ChangeLog,v 1.18 2015/07/11 23:55:19 np-hardass Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/ChangeLog,v 1.19 2015/07/15 06:06:10 np-hardass 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.
 
   11 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org>
   mate-session-manager-1.8.1-r1.ebuild:
diff --git a/mate-base/mate-session-manager/Manifest b/mate-base/mate-session-manager/Manifest
index 0cdbb6c04b13..2e03fd680ccf 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 2683 SHA256 6a66f43b992b75154b5b00bf1c4daee635f543dfb4234ff6dde8bd990da0beb9 SHA512 42892ef1364646ab267186ad7960c70430064852c7aeb067e65be91199824d8e20842b92d853a8a7399cac1d9d2e5994c5d273eb301728a5e9750dd0fe148c07 WHIRLPOOL de82a1f647b9432572b659e769636c862b89392ec23453e2c7543e3633913dfa8215b5d525179f44b7a0839c3c9387c53946a76ad3b229fcdc9f7a4bb040c991
-MISC ChangeLog 3333 SHA256 70bd84985f6ec84a453fa27b80099a4502519dd02313d1c47a4ed7d64353a7f1 SHA512 ea42f9693acdafd20cfa8386c3b3169158b2877f494d217ea9579704be996d1ef0cd0b97ce1845a3861009a7a49ed2f43105dd2e7135f200c402ff59bce012da WHIRLPOOL 876a5a204a83fd620d885c34d3e497b12bc39f603f7f6a59706da0bc5bae93603572fede883df7e565498ef2925fde4862f54669dc16f3df643997b2c375b0fe
+EBUILD mate-session-manager-1.8.1-r2.ebuild 2720 SHA256 f6009aa90d3c8afd091543fde05bd9924fd193402d130ee6f54afe824945680e SHA512 dd49b93f8e0956f824794c495e0ca4e7425f1c79ebe5051159f362cc82bb3193c2c063e489eb2fa24d0c2b7acc9c01757075bab9a63ccecc4dbff68394e3aeba WHIRLPOOL 0bcbe1ecf472960581a4a52437928750943234ddf723d339e9b9e28f34c28731e1b3a16b41b320fbc8abf18ea99a4ea561e87afa296253b11e57526192819db3
+MISC ChangeLog 3539 SHA256 13a2a80eb2fff83f400e132be72e2ed6714b5379076827396ce005d3584a3d34 SHA512 e59cdaed85431a313e12cc915ea4338940a24df1b1e67b6f7158cc290765adfe993c50549a5a5765feffc9c09daacddd7a3437633ab95ab8f999ffc77a76c3d2 WHIRLPOOL bdd45628f45b71c4ee0d50c40d493faf0c0e805b720963f98a0580afe30d2fb4de1e725721e4b40fb2d4bfebd7f7e078d3ae4a986e8f38b135de4967f5e186e5
 MISC metadata.xml 271 SHA256 7e3d0b8509870eaa0238a46ec383250288382a1733764f2e1be76298a640845e SHA512 1c4be914d1764dae6071e7b25d652275d9eef62d96aa2630dce7298e4b392b89ddde264b9d35c6a020cf82bcdf7948e4240ca864b32b07ffbba27891dd8c2cb3 WHIRLPOOL 3e60f953449a94cc05c20dc0c017e0b06f629d3ae03d7ac442e85ddb3b53271f54a1d27428b2ccfa5c3c2bf835a1eb3c489d507f0e542e1af2753549eed7247c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVoazcAAoJEBzZQR2yrxj7U2QP/ib7ijr7ArWcHKxuKDf1atoK
-QVCC7zIl471TuUeIaIXj+y19Zk2bA7S4KyjvNO2mhycLzjbdGMhQ94ORjGyFS+g6
-qFYoaCKQLt0kFmdajcpO1NS/Yu1iDWigZ13/e/uesqsQD1lxGoS1j9JMKX7SnvaJ
-oRIWaw+VpEAPbKyH3+eEHSAhEGX1yxmLdTI4z1cyJXtkhZePuSePeRG1C4upQ4lI
-ULrMXRlRAIVhKn4nez771++M3f6/xQ/88ZcATxbepe2cgXY7q2f6pF/OJVqkLHwi
-+Xt0dQGYHyZm/K1Hn5sT1T3SCeiLVvhhap6q9N0z00nyg+e0ME2hS4w/09Y9TMf/
-SCfIVCWDeg9BvHuPMiC9tfzgxuOcnIkvtxg6HN0faT+Qd76h9g/tVA68DdrGKTcO
-aviF43BR89UFx72a2Lygc5siFXW9iz1sMR10IY47Sw8mWHVrqV40LKnjONMbpQeS
-f55TPwV946WnTAW+3mASY5J+QmfWSPosNyAYN5kwrWJZNtXJ9eJMNqtJrWK0Xqn1
-2U1gCvnnAprLzzZZkUdmR2jdUEId1Bn1aVnNzDc+97L+JTzeLFkoYbOquU3EOZZ2
-hoR7C3ZZKks4LVs4ijhUxpnU9sPzcOlBOULFI6+Tr7lIMPkXFp/5/Uzh0mbQkgBc
-VTDetB41rKgCs0qfvUP0
-=c1Za
+iQIcBAEBCAAGBQJVpfhQAAoJEBzZQR2yrxj7j30P/jGUIXPrhsPR5RtAudfLLOiT
+wfDbWBHCvyI1BZY5x5OOPHqiZzEhy0+c4wIqf51YJZ9M6O+pZ7c1+REw756+F6M2
+p9dPMK6IriuCBeFnH83YxHlivLiSftPXnCAdSgqrJLGH9VSmVS7ldvOQOaxj5V5/
+ed33UDf2+cSwlroy+cZFPzoNN+pV6bMOQhvFezosWnKfnTtvwBDHRCxc09VLb1rR
+eCw8TPCLTA4lzojwabmhNxwI+V3H8rpdCd0VQx1JNHtrpsKurE9/3ki0g63V+b90
+5IIvGDHAKmf22nyb0jN93GMAwYsz795gKC9ESLxvXBcqjq9wWE8eKNcffkdGVfOl
+5tEnINgT+tXKl+jyELvYxGvFrPvHf+7M7AZZt5DvbVHf0asfzUSVcYhLwJ49R1/r
++NYelRKGws9WqkJjAR94eCgdqLRZenafd05wYYctK/dUzQCwrTRYqecbvGH/v4tE
+0JNZBYgxFYrINlIqtz1YbPvHu7lS1OLbnU72IS+fJqi518ufKUI7fMs7+jrtT8Fa
+kHIbnbhdUILXl3weBZ6DzZdm3+QOSU9oOZWSClV4bAhCtMpY1KVOVoCG0D7JIBvZ
+i/j5N2HEvuOV52iG5JMBGZ6G0f2wW9Xg+8VZEJPqAkeUJu7pSvJ6xlVqIGqZWnBp
+jiv0GCoW6BIXJmGB1cAb
+=afPs
 -----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 000000000000..a81b4135e070
--- /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-r2.ebuild,v 1.1 2015/07/15 06:06:10 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
+}