upower support relies on old upower, systemd setups are supposed to rely on systemd to do all the stuff now (#508920#c15)

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 114 insertions, 15 deletions

diff --git a/mate-base/mate-session-manager/ChangeLog b/mate-base/mate-session-manager/ChangeLog
index 0cde5376bb56..4b8b16e2ceb1 100644
--- a/mate-base/mate-session-manager/ChangeLog
+++ b/mate-base/mate-session-manager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mate-base/mate-session-manager
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/ChangeLog,v 1.7 2014/05/04 14:54:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/ChangeLog,v 1.8 2014/05/29 18:48:21 pacho Exp $
+
+*mate-session-manager-1.8.1-r1 (29 May 2014)
+
+  29 May 2014; Pacho Ramos <pacho@gentoo.org>
+  +mate-session-manager-1.8.1-r1.ebuild:
+  upower support relies on old upower, systemd setups are supposed to rely on
+  systemd to do all the stuff now (#508920#c15)
 
   04 May 2014; Agostino Sarubbo <ago@gentoo.org>
   mate-session-manager-1.6.1-r1.ebuild:
diff --git a/mate-base/mate-session-manager/Manifest b/mate-base/mate-session-manager/Manifest
index 6e2bbbc1a45a..904ed9282e71 100644
--- a/mate-base/mate-session-manager/Manifest
+++ b/mate-base/mate-session-manager/Manifest
@@ -12,23 +12,14 @@ AUX mate-session-manager-1.6.1-login1.patch 7819 SHA256 7d0141356e09e00812165b55
 DIST mate-session-manager-1.6.1.tar.xz 641524 SHA256 4ee7b4ae18df5becd986b05634428edf0ad8de150a14dc29848b6d34ab312ce9 SHA512 dfbfc782cd09b401565ed6021687cfb11f66cd0a05609c3f344b9b1059215f1717054b021166ca5956162794398905f36e51d13b6720e8005a923843af10129d WHIRLPOOL da47bc33b96a646e29f2bc3d957473c892b660c268a966487bb5f31beeacb1720ec8277e87d24afce99c8a8529fb0539d809705e26c9684d31c6ac7d6b599dbd
 DIST mate-session-manager-1.8.1.tar.xz 524204 SHA256 2f85a714704bc475d08809be6ecf24a5d94d2e2d0ea5ac704d67557c349d7b8c SHA512 1b09a471db710193a643ec90c9b153468d9a303957b9c4da4e30cf470aa5f582b6992f5e0ed69129943aa44f7c4e372e2a8554fc6020627817a3c49d656ca5b5 WHIRLPOOL 8c771ac713da92c2ae8bccc173a9cba4fc5bb16a943e588c679624e3e945555f2c37511426e666f38440947ec37139452ee230d07bc3a414a65629c04bfd31a6
 EBUILD mate-session-manager-1.6.1-r1.ebuild 2879 SHA256 62763beac4e0fa073f688818e054cafddb0c9602a45c3152f5a5bd1edbf3564f SHA512 45d9f60df28fac0833ae62d0be4245bab01054eddcaf8d4af885f8490220d6d8719f7c48166245a8ed91b14cefd518662659826cc88c9f6940a88e5e1983fde2 WHIRLPOOL a67c86716e3f0b5b1c7f522214bf9d32b7c5676fa6d3ac724048b930c0d0c83fe7d019d3a5753b39c42a95c74aaf7f002b939392923489318b987e67e5372689
+EBUILD mate-session-manager-1.8.1-r1.ebuild 2740 SHA256 d2169f09fc3a74dcb7f4915be6f6ee1cbdef47ddf995f2454ac1b41be96ec03a SHA512 ed064d45128d8ebc14ab9647ed3a73dba5a5f647f5ecd8f2fe3d46d74931e82ae14e0642fd8b6b12b9c0f67d9d0925ba96146488ad572ec8a1ad55826103275e WHIRLPOOL effdfc6fe20baebe3171999ec04d2366521d725416e707c7af0837662aa5834bbc17be9308da34a8d08344b9b272b65b8a562d83004ffb2719fbc35e3d2320ec
 EBUILD mate-session-manager-1.8.1.ebuild 2709 SHA256 3eeb1b97e9998042f4994558f1e040577be6776279b44fec6017b2417709994c SHA512 7b3074ec1efc341a9bad4ecc2674756add19508bddeedfbedb2f506075bf16c34666adbe96cb80f00e0b8c4ed638a7625cf4b5fcb3de57765ebc6f6dd6be7ae1 WHIRLPOOL d5e2d871edfc40c8d216efa54d017a5c9ff89a78cf95d621e424e0fd637d4fa554fb712a7c59317059318ebc05415998933d4881fe5908810e40dde4729dbe20
-MISC ChangeLog 1723 SHA256 be48a1d2e20c12e1c82c71f647d18dd5cd237c0b87da06047d1a8599a54693ed SHA512 c41eb2d3c63f318f23ac7a2ff6553378cf39a32eba5af56c30be154977cb28920ef97291bfd6c1ff8df674fab70fe4f617f3e6f94c2a1edafdf905e23e203b12 WHIRLPOOL 3fccf069657a9175350c6d8b39122d4cf47b87b61e0a35cbcb361a4a66403d0d1cf969a180093be9c9a24fcc0111d7c1a53fc4033d519ffffdc5b3c9e32438ef
+MISC ChangeLog 1985 SHA256 13c4c783651be9e0ba288813443f3a9c6d8f1db18d9e2517b8f50287b20f12f5 SHA512 9d61f87a656f6afe9e273deab0d3ef2108a444f36d39c3711a950003470390bfe9c782b09b49154a0f97aedcaf269ce54d6556e164c976dcbfa6f2e7577f591c WHIRLPOOL 56e1e49cdd7396ab929ea4360f99d071797b6a46bac0799c59791cc3192d707e030881f687320db4936c6491fac1ca18ef237e28fa594370313d5b2df8d92dfa
 MISC metadata.xml 335 SHA256 5270f4b1b9c1a59490b6310739fb64b25003887733d5efb593e3815696b9f451 SHA512 7e89895f4ccc1bffc61127e007da000c124a23a80e636d9f3eaffdcc212f5b7e29c4498f00bc63b1a15267086ae2e6f9e53ee8dbf5ae3ef96a425a9bba0ce1e8 WHIRLPOOL 5d355796255850ea932e08650f0d9ea54fbb121a74a1ee916f885909b2e1331dbd305b58cc448be6eee8e0ee710c242daf18db1e1d868dd2e50654bcba681fcc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTZlSQAAoJELp701BxlEWfGLUP/iw0zAr9DZL/ssyTdyN9f7Lr
-ovn8Po23Rmrk3YyNaV8MGWMkWHq50dBay2inBCdw2GLiLfMKy3M3B56i6/ypdsmF
-CvxIuhBZO3p/35AhRegQxrmMpc4ihsXTZBn/S0YKTRnLtRNlg87eWj8W8sZuw0Fw
-2mL2EpxzdECpBOaqsW4EAoFgCNrPABRkOVhH9m7cZj6WjDuHD0TH0L+GcGFalgHs
-UTkQAtwMsEI/mQVs/uPRKUbwCNV5KvGIvpFhb60WHjs3n48GLeinznzqbrNdd0xK
-i4ae6rQgtcJVFFgz4VW7sOc+RaZa3R9MYMFtS6RHeSqAOWEOU0oMSTt8edjaoiot
-h/T0xkfwelaShA/iELGnY/OzJapyl5hJ7T/9cdbpNivl9bAuW6ImO/fYNqeeX8E+
-NWR288+p5J3Q980UWjtIRVEOQ4+FdAATTx44Dpb3vCUXxzlL7isdvchnKUh0SsDk
-G49H1yQt39Dzep/4dKcwDeLB2GRHYJwN4BeHs4fRqHYfKc6dp7HymM2E3YUKLFxU
-9fFBxP6/ymA3hMfmQvxt0Bscv5LV4YBJESH6/7yQPaZ1zpORG7gG1pgibd0LO63C
-1T8ycX2Oh+ydnbYNbYbvQar+A/u8lZmOAHNfj8s691jTpTFxcZ9Be2P/3/cdl4bQ
-xakKIqRpWv7bYtljr24g
-=sLKB
+iEYEAREIAAYFAlOHgPYACgkQCaWpQKGI+9QNLgCgh39OwcCBQzpzCaMkhQBT85fy
+S44An1k4KXfATHy82eBuDc0XmxQtge9n
+=/wGH
 -----END PGP SIGNATURE-----
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.8.1-r1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.8.1-r1.ebuild
new file mode 100644
index 000000000000..6ef101228adb
--- /dev/null
+++ b/mate-base/mate-session-manager/mate-session-manager-1.8.1-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2014 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.1 2014/05/29 18:48:21 pacho 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"
+
+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:0
+	>=dev-libs/glib-2.25:2
+	dev-libs/libxslt:0
+	sys-apps/dbus:0
+	x11-apps/xdpyinfo:0
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.14:2
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	x11-libs/libX11:0
+	x11-libs/libXau:0
+	x11-libs/libXext:0
+	x11-libs/libXrender:0
+	x11-libs/libXtst:0
+	x11-libs/pango:0
+	x11-libs/xtrans:0
+	x11-misc/xdg-user-dirs:0
+	x11-misc/xdg-user-dirs-gtk:0
+	virtual/libintl:0
+	elibc_FreeBSD? ( dev-libs/libexecinfo:0 )
+	gnome-keyring? ( gnome-base/gnome-keyring:0 )
+	systemd? ( sys-apps/systemd:0 )
+	upower? ( || ( <sys-power/upower-0.99 sys-power/upower-pm-utils ) )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40:*
+	>=dev-lang/perl-5:0
+	>=mate-base/mate-common-1.6:0
+	>=sys-devel/gettext-0.10.40:*
+	virtual/pkgconfig:*
+	!<gnome-base/gdm-2.20.4:0"
+
+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
+}