old

(Portage version: 2.2.13/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 30 insertions, 137 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/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
-}