Remove -r2 due to upower deprecated API issues

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

3 files changed, 18 insertions, 116 deletions

diff --git a/mate-base/mate-session-manager/ChangeLog b/mate-base/mate-session-manager/ChangeLog
index 6b1f787..2af5a80 100644
--- a/mate-base/mate-session-manager/ChangeLog
+++ b/mate-base/mate-session-manager/ChangeLog
@@ -2,6 +2,10 @@
 # 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 $
 
+  15 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org>
+  -mate-session-manager-1.8.1-r2.ebuild:
+  Remove -r2 due to upower deprecated API issues
+
 *mate-session-manager-1.8.1-r2 (15 Jul 2015)
 
   15 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org>
diff --git a/mate-base/mate-session-manager/Manifest b/mate-base/mate-session-manager/Manifest
index a27debb..0eb5ab8 100644
--- a/mate-base/mate-session-manager/Manifest
+++ b/mate-base/mate-session-manager/Manifest
@@ -11,23 +11,22 @@ 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
-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 ChangeLog 3573 SHA256 130f54a091271ad95c5d08b76b92db20d00461f9156ea847e3bb4a222c158e42 SHA512 361e7d062298e5fd04c8af1e34644c666d2e7e8ec2cbfb43b5b2211351c89e53936f275c87730d0cae0b33cc6d965b85d13f826104e68f7aeaeeffafef265cec WHIRLPOOL 029bcc890cdfc5d793065e5d539052c29a0ed7ade313253ffa03d512e2faeb9a955b52d3eccd2531125f4804b28a33a0d7c4338dbea195e16da54a76c5d0bc2b
 MISC metadata.xml 271 SHA256 7e3d0b8509870eaa0238a46ec383250288382a1733764f2e1be76298a640845e SHA512 1c4be914d1764dae6071e7b25d652275d9eef62d96aa2630dce7298e4b392b89ddde264b9d35c6a020cf82bcdf7948e4240ca864b32b07ffbba27891dd8c2cb3 WHIRLPOOL 3e60f953449a94cc05c20dc0c017e0b06f629d3ae03d7ac442e85ddb3b53271f54a1d27428b2ccfa5c3c2bf835a1eb3c489d507f0e542e1af2753549eed7247c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-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+
+iQIcBAEBCAAGBQJVpgRLAAoJEBzZQR2yrxj7+XUP/3sFWlhp1DXPxEmW3JrdWNrf
+41gX441etNDKazkov+2MMsVSZ1R0ci/CFaMpbt5HLUx3ImI3qIMpH/cgqbWidfi3
+AGARUbBCbIVd6yOQ2bPLZ6Ut5yh7uCTRrofIpDnPLC8QIdVHa8BC/uKKKUzk7qgU
+hbxZylY1ki6gbYiWOE0u31LZpvlbuavqfiBJYrAXNpYYvK2+erQoGcUgGpuqW4Te
+iA9KMqY7Yv28UE+f9oe0g4PeH/vmeO/u2IRiZD5AWi5UTIU8Pgwbzhfq19dbj7Gb
+tVovlK2qDsOItbdxRqjR49UKSnLcKi2S5ngcMxmgABfJN89llOOxCU5vzFlXXJUt
+bBtYr/70X0vcDx/3PMGAj99ZWJ8MEp4+cCaFchlJintU4tMFahEmUPzV8/AwfpXE
+cWcLH47wqQ+SpOV8c8R9Pz9WGv8mJJEWHcdd7UNhllsjmR/dFpYZI5YoPWs1ituT
+Cuys7NQanHLZ8TzTxgrfmgnPTFuT5RjfzK2fHMXBBPxg+bAwEKte+7CuJwj4GLvD
+PmLAUhzI43Qs3MzjsSvUqYhB7g5zazi/QcI46dGSQBnIzt/zaJTpBoAkqUxpfbxm
+MMx/O/LUsm2FkDNr7M5IVYLW7ZJqPOXau3w7eKWVk+JuRp3NZ1DYlq2XgVf4ZXr9
+BLKtBFch51L9IwGzSG33
+=DxiY
 -----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
deleted file mode 100644
index 0b4271e..0000000
--- a/mate-base/mate-session-manager/mate-session-manager-1.8.1-r2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# 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
-}