old

Package-Manager: portage-2.2.13/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 39 insertions, 147 deletions

diff --git a/mate-base/mate-session-manager/ChangeLog b/mate-base/mate-session-manager/ChangeLog
index 053fa04743cb..dc7e0aad2368 100644
--- a/mate-base/mate-session-manager/ChangeLog
+++ b/mate-base/mate-session-manager/ChangeLog
@@ -1,9 +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.14 2014/09/19 17:20:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/ChangeLog,v 1.15 2014/09/19 17:25:19 ssuominen Exp $
 
   19 Sep 2014; Samuli Suominen <ssuominen@gentoo.org>
-  mate-session-manager-1.6.1-r1.ebuild:
+  -mate-session-manager-1.8.1.ebuild:
+  old
+
+  19 Sep 2014; Samuli Suominen <ssuominen@gentoo.org>
+  mate-session-manager-1.6.1-r1.ebuild, mate-session-manager-1.8.1-r1.ebuild:
   Remove dependency of <sys-power/upower-0.99 from || ( ) construct.
 
   24 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> metadata.xml:
diff --git a/mate-base/mate-session-manager/Manifest b/mate-base/mate-session-manager/Manifest
index f7f7ce107486..a7dd03280784 100644
--- a/mate-base/mate-session-manager/Manifest
+++ b/mate-base/mate-session-manager/Manifest
@@ -12,18 +12,17 @@ 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 2849 SHA256 87b0e49b0751a6d6e04b48b1fd2b84054f9cc111df3f6f7237bc02d9e7130166 SHA512 5dcc1ebee4f025010aa93f4426462ad024d1e20a0e27426d2347fd963aa11fdd9366ffe28cb2ce6d1ed576aa9b6edb4452ba917cfe33b05ced3b7dd435fa1754 WHIRLPOOL c879b1f46b98a17db8c06b76e32e89a56ad01e2a52353b17c6b03d213e823ec26c064cc41c19d49ab702cf851c97b726fbf54030cc9db1accc5fb2c99b565afc
-EBUILD mate-session-manager-1.8.1-r1.ebuild 2783 SHA256 c97d65e655ba18624361b61e15e60c5777fdb8a731ab27fb0c55bc9e3509edcb SHA512 9d0db73fbfad4410f8f8f6e989e6ba6b999f8562dd6c633e87c95e2fa3aa2d7ab27c0ca7c4fc17e29772d5bd0668ccf37901378c6d6528df8d0ca730f6fe8ea9 WHIRLPOOL 07b2c46cfd6e33c371905c0ea516ad73d485a537d44a4ce1c544fe3219e8de3697e2db9367ac81a77c9464d56309c7754750982dabc744f8e54dfeffe9bea9c9
-EBUILD mate-session-manager-1.8.1.ebuild 2778 SHA256 009fdbea28cb51c22d7d10f0f30be846dfa7963da3ab21c78feac08a3814e810 SHA512 d4fd871fa3d729c74b324ce34c38ba5b8bc2b063fd88d58611c6523e753b28313a05bfbf09c54f1911a148d8da405f75be733c30796174e9ecbb7c21d7ecef11 WHIRLPOOL 24ab5ae46a738cac01936139679c0f6b2c1b462a69caaf0098ad508481aef0cf44916abeb071bee089f76919bed169cd9a6adf82d56713bec894a17e74f4f664
-MISC ChangeLog 2883 SHA256 d9215b114c2cf4b344a61591fbb2908efc3a0b27ae485bbb7352002e02f7cfe4 SHA512 d0e8afb2df54e6f86c95c718fe3dc96ede24b2e1cf76c7f02a9c62fdfa4fcb049b6bac0226304553c916bdd9e9ccaf4978570f8ca05d8b55826a525576d02e11 WHIRLPOOL 1d08b90b7ae83da0244a7a9bf8393b29f3ae49dfaa3afc83a46a7c6553ab1ebc1d19fcea633621ea39e79fcf3cd86f15a1c326f2a4f816dad3dc5695b6b163a4
+EBUILD mate-session-manager-1.8.1-r1.ebuild 2682 SHA256 ccc4fc216928af01f0c0b493c8d6b1c58d10b662a2c739cb59a012a0dcd9f19a SHA512 a9e7e79c254692b3a97968a85d6d0c3117016f856ed9a4208486aae15ba1701fe2a5ec864f200064672d3a5934b70a4498c6eef1aec0ba013efdd5c354271539 WHIRLPOOL 9e5a408917f9e06ec3f8f313a9dda23bd35a06466e3ea935a7a7b1ebe0c6fa786686e0fdde9b08d3bedf86465fc901c044aa1f93946505612f55ef7c48f3b625
+MISC ChangeLog 3020 SHA256 bc959117a6441ac7803a309bd30b952de89aad13b27e1e757abc83689f67d287 SHA512 8f756f17d8499d892509d5d9eba187ff1349de3ddd985b64cd7c57ffe08978e71fe4dd2ab81b5dd4684271fec5951fed287646eb5209e6514567d21f1e1e76c7 WHIRLPOOL 86d6120a5eb3d5e8191cb9db1261565ead6343651514cb15a97967e4d5bd7c5f965c9d83115c0d907bd511eebf1e557c5a1be427dcf1d274244b977b34041d2f
 MISC metadata.xml 230 SHA256 c188c403bd41d5dfe348e4809c2350a5a2fca98d46f8adae83a36d89af439ecd SHA512 17d13ca08cb96bf73a2c821019fd00677f17579c54b5543c1653c9f6106d7c52ad14b4a7ff72000ab7f59b7031e4471756b96864ca2fedef2e3a047fa0eb71eb WHIRLPOOL 39073c2fd817e3c41775408adf7271656a744ccd967e74770c673506c8c78cd11356b0cd28eeb16fe7350e8708141ad25037c45066263f2ed1b85d5270743986
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUHGXDAAoJEEdUh39IaPFNN4gH/2JInqIj7dXdk3jP5Kw++COQ
-/yIwU0AiAnfFhKAWBWEIKXn0/UQQ4z5Ypm4v+N2mz381ycOJTZ/cwy/Q5i587wax
-RnbphIeZ4NruiX1GTD1ctUYAhrohAsZY4U0xQl/L1RTpPOHsqHYggTLy/dDteKT8
-JIpbofbcL4sFdt1C0FqUEkNVtUavDCpnrgNpGdTHBlcB4MAVep0OdXZ/1qmKycT8
-UFM+1iIEOE4JdmOsL9EkYcyFfhl/O55QQB8Edgf1ji5MntxQqYWYIsDau4YxX8sj
-6HCQMAXxEmB0WqMEP514iNfCoqdN5FgX/vrCw7dCdSsoixUdpaSzsnEB3nRo6vk=
-=BA6Z
+iQEcBAEBCAAGBQJUHGb7AAoJEEdUh39IaPFNcpgH+wdY4gXcAA+cuyFHM/bYAa5f
+iJpzh1CfIR86FieGVRF67JP4kGKsBMh1wjNUWJEf9bxIYO85E4HT+AvZVSJeX45d
+jyhowgLnzFinHDnHQDCdd6u82608AKqRefpCvuEs3eO6588+12AmPOwKvOZjZ0DV
+s8JF+MyntQn6T10F1biH4aWIUPQy4rSmOrTx45VbgOZpPso7zh6RCf+HFlcrFnkt
+Cmfth++pBh1x0S8aSKWH+YDgVCmkpRjyk2aCTYNGrpaKPx0K/+3nMJmQD2vvYSZZ
+81kXmGYUjuaRIhc7p8+G1LP58NwPzTJHGAWzcRtLOPdKx626FBHn86vdvPZqKZU=
+=7sKV
 -----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
index 394262c842dc..8ae67dd8f70f 100644
--- 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
@@ -1,6 +1,6 @@
 # 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.5 2014/07/02 09:46:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/mate-session-manager-1.8.1-r1.ebuild,v 1.6 2014/09/19 17:25:19 ssuominen Exp $
 
 EAPI="5"
 
@@ -24,42 +24,37 @@ IUSE="ipv6 elibc_FreeBSD gnome-keyring systemd upower"
 # 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
+RDEPEND=">=dev-libs/dbus-glib-0.76
 	>=dev-libs/glib-2.25:2
-	dev-libs/libxslt:0
-	sys-apps/dbus:0
-	x11-apps/xdpyinfo:0
+	dev-libs/libxslt
+	sys-apps/dbus
+	x11-apps/xdpyinfo
 	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.9.0 <sys-power/upower-0.99 )
-			sys-power/upower-pm-utils
-		)
-	)"
+	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-pm-utils-0.9.23 )"
 
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40:*
-	>=dev-lang/perl-5:0
-	>=mate-base/mate-common-1.6:0
+	>=dev-lang/perl-5
+	>=mate-base/mate-common-1.6
 	>=sys-devel/gettext-0.10.40:*
 	virtual/pkgconfig:*
-	!<gnome-base/gdm-2.20.4:0"
+	!<gnome-base/gdm-2.20.4"
 
 src_prepare() {
 	# Add "session saving" button back,
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.8.1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.8.1.ebuild
deleted file mode 100644
index c5f5235ae9a6..000000000000
--- a/mate-base/mate-session-manager/mate-session-manager-1.8.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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.ebuild,v 1.2 2014/05/31 20:38:31 tomwij 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 )
-	upower? (
-		|| (
-			( >=sys-power/upower-0.9.0 <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
-	systemd? ( sys-apps/systemd: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
-}