old

(Portage version: 2.2.0_alpha124/cvs/Linux x86_64)

5 files changed, 7 insertions, 244 deletions

diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog
index 03b76196d5fe..49a09c5b80e9 100644
--- a/xfce-base/xfce4-session/ChangeLog
+++ b/xfce-base/xfce4-session/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-base/xfce4-session
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.168 2012/09/09 14:43:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.169 2012/09/09 19:25:36 ssuominen Exp $
+
+  09 Sep 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -xfce4-session-4.8.2.ebuild, -xfce4-session-4.8.3-r1.ebuild,
+  -files/xfce4-session-4.8.3-respect-save-settings-logout-plugin.patch,
+  -xfce4-session-4.9.2.ebuild:
+  old
 
   09 Sep 2012; Raúl Porcel <armin76@gentoo.org> xfce4-session-4.10.0.ebuild:
   alpha/ia64/sparc stable wrt #416233
diff --git a/xfce-base/xfce4-session/files/xfce4-session-4.8.3-respect-save-settings-logout-plugin.patch b/xfce-base/xfce4-session/files/xfce4-session-4.8.3-respect-save-settings-logout-plugin.patch
deleted file mode 100644
index 286af4fee4fe..000000000000
--- a/xfce-base/xfce4-session/files/xfce4-session-4.8.3-respect-save-settings-logout-plugin.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From d7311f2dcedd96f5833acceb27f9d17275893e1e Mon Sep 17 00:00:00 2001
-From: Lionel Le Folgoc <lionel@lefolgoc.net>
-Date: Thu, 25 Aug 2011 14:22:24 +0200
-Subject: Do not always save session with xfce4-logout-plugin (Bug #7915)
-
-Respect the value of the "/general/SaveOnExit" option from xfce4-session in the
-logout panel plugin as well.
----
- panel-plugin/Makefile.am          |    2 ++
- panel-plugin/xfsm-logout-plugin.c |   14 +++++++++++++-
- 2 files changed, 15 insertions(+), 1 deletions(-)
-
-diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
-index 0675e2e..fd0609b 100644
---- a/panel-plugin/Makefile.am
-+++ b/panel-plugin/Makefile.am
-@@ -18,6 +18,7 @@ libxfsm_logout_plugin_la_SOURCES = \
- libxfsm_logout_plugin_la_CFLAGS = \
- 	$(LIBX11_CFLAGS) \
- 	$(LIBXFCE4PANEL_CFLAGS) \
-+	$(XFCONF_CFLAGS) \
- 	$(LIBXFCE4UTIL_CFLAGS) \
- 	$(LIBXFCE4UI_CFLAGS) \
- 	$(GTK_CFLAGS) \
-@@ -26,6 +27,7 @@ libxfsm_logout_plugin_la_CFLAGS = \
- libxfsm_logout_plugin_la_LIBADD = \
- 	$(LIBX11_LIBS) \
- 	$(LIBXFCE4PANEL_LIBS) \
-+	$(XFCONF_LIBS) \
- 	$(LIBXFCE4UTIL_LIBS) \
- 	$(LIBXFCE4UI_LIBS) \
- 	$(GTK_LIBS) \
-diff --git a/panel-plugin/xfsm-logout-plugin.c b/panel-plugin/xfsm-logout-plugin.c
-index b8e25ab..12dec0f 100644
---- a/panel-plugin/xfsm-logout-plugin.c
-+++ b/panel-plugin/xfsm-logout-plugin.c
-@@ -43,6 +43,7 @@
- 
- #include <libxfce4util/libxfce4util.h>
- #include <libxfce4ui/libxfce4ui.h>
-+#include <xfconf/xfconf.h>
- #include <libxfce4panel/libxfce4panel.h>
- 
- #include "xfsm-logout-plugin-ui.h"
-@@ -207,12 +208,23 @@ static void
- xfsm_logout_plugin_show_confirmation_dialog(XfsmLogoutPlugin *logout_plugin,
-                                             XfsmShutdownType type)
- {
-+    GError *error = NULL;
-+    XfconfChannel *channel;
-     gint resp = GTK_RESPONSE_ACCEPT;
- 
-     g_return_if_fail(logout_plugin != NULL);
-     g_return_if_fail(type >= XFSM_SHUTDOWN_LOGOUT && type <= XFSM_SHUTDOWN_HIBERNATE);
- 
--    logout_plugin->allow_save = TRUE;
-+    if (G_UNLIKELY (!xfconf_init (&error))) {
-+        g_warning ("Unable to contact settings server: %s", error->message);
-+        g_error_free (error);
-+        logout_plugin->allow_save = TRUE;
-+    }
-+    else {
-+        channel = xfconf_channel_get ("xfce4-session");
-+        logout_plugin->allow_save = xfconf_channel_get_bool (channel, "/general/SaveOnExit", TRUE);
-+        xfconf_shutdown ();
-+    }
- 
-     if(type != XFSM_SHUTDOWN_SUSPEND && type != XFSM_SHUTDOWN_HIBERNATE) {
-         GtkWidget *dialog, *topvbox, *hbox, *image, *label;
--- 
-1.7.2.5
-
diff --git a/xfce-base/xfce4-session/xfce4-session-4.8.2.ebuild b/xfce-base/xfce4-session/xfce4-session-4.8.2.ebuild
deleted file mode 100644
index d831c5a7ea43..000000000000
--- a/xfce-base/xfce4-session/xfce4-session-4.8.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.8.2.ebuild,v 1.8 2012/05/05 06:56:06 mgorny Exp $
-
-EAPI=4
-inherit xfconf
-
-DESCRIPTION="Xfce's session manager"
-HOMEPAGE="http://www.xfce.org/projects/xfce4-session/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="consolekit debug gnome gnome-keyring policykit udev +xfce_plugins_logout"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.92
-	x11-apps/iceauth
-	x11-libs/libSM
-	>=x11-libs/libwnck-2.22:1
-	x11-libs/libX11
-	>=xfce-base/libxfce4util-4.8
-	>=xfce-base/libxfce4ui-4.8
-	>=xfce-base/xfconf-4.8
-	>=xfce-base/xfce-utils-4.8
-	gnome? ( gnome-base/gconf:2 )
-	gnome-keyring? ( gnome-base/libgnome-keyring )
-	xfce_plugins_logout? ( >=xfce-base/xfce4-panel-4.8 )"
-RDEPEND="${COMMON_DEPEND}
-	consolekit? ( || ( sys-auth/consolekit sys-apps/systemd ) )
-	policykit? ( sys-auth/polkit )
-	udev? ( sys-power/upower )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-pkg_setup() {
-	XFCONF=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		--disable-static
-		$(use_enable xfce_plugins_logout panel-plugin)
-		$(use_enable gnome)
-		$(use_enable gnome-keyring libgnome-keyring)
-		$(xfconf_use_debug)
-		--disable-hal
-		$(use_enable udev upower)
-		$(use_enable consolekit)
-		$(use_enable policykit polkit)
-		)
-
-	DOCS=( AUTHORS BUGS ChangeLog NEWS README TODO )
-}
diff --git a/xfce-base/xfce4-session/xfce4-session-4.8.3-r1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.8.3-r1.ebuild
deleted file mode 100644
index 044a9813e52b..000000000000
--- a/xfce-base/xfce4-session/xfce4-session-4.8.3-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.8.3-r1.ebuild,v 1.3 2012/05/05 06:56:06 mgorny Exp $
-
-EAPI=4
-EAUTORECONF=yes
-inherit xfconf
-
-DESCRIPTION="Xfce's session manager"
-HOMEPAGE="http://www.xfce.org/projects/xfce4-session/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="consolekit debug gnome gnome-keyring policykit udev +xfce_plugins_logout"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.92
-	x11-apps/iceauth
-	x11-libs/libSM
-	>=x11-libs/libwnck-2.22:1
-	x11-libs/libX11
-	>=xfce-base/libxfce4util-4.8
-	>=xfce-base/libxfce4ui-4.8
-	>=xfce-base/xfconf-4.8
-	>=xfce-base/xfce-utils-4.8
-	gnome? ( gnome-base/gconf:2 )
-	gnome-keyring? ( gnome-base/libgnome-keyring )
-	xfce_plugins_logout? ( >=xfce-base/xfce4-panel-4.8 )"
-RDEPEND="${COMMON_DEPEND}
-	consolekit? ( || ( sys-auth/consolekit sys-apps/systemd ) )
-	policykit? ( >=sys-auth/polkit-0.102 )
-	udev? ( sys-power/upower )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-pkg_setup() {
-	PATCHES=( "${FILESDIR}"/${P}-respect-save-settings-logout-plugin.patch )
-
-	XFCONF=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		--disable-static
-		$(use_enable xfce_plugins_logout panel-plugin)
-		$(use_enable gnome)
-		$(use_enable gnome-keyring libgnome-keyring)
-		$(xfconf_use_debug)
-		--disable-hal
-		$(use_enable udev upower)
-		$(use_enable consolekit)
-		$(use_enable policykit polkit)
-		)
-
-	DOCS=( AUTHORS BUGS ChangeLog NEWS README TODO )
-}
diff --git a/xfce-base/xfce4-session/xfce4-session-4.9.2.ebuild b/xfce-base/xfce4-session/xfce4-session-4.9.2.ebuild
deleted file mode 100644
index 1b459cb9a652..000000000000
--- a/xfce-base/xfce4-session/xfce4-session-4.9.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.9.2.ebuild,v 1.2 2012/05/05 06:56:06 mgorny Exp $
-
-EAPI=4
-inherit xfconf
-
-DESCRIPTION="A session manager for the Xfce desktop environment"
-HOMEPAGE="http://docs.xfce.org/xfce/xfce4-session/start"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="consolekit debug gnome-keyring policykit udev +xscreensaver"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.98
-	x11-apps/iceauth
-	x11-libs/libSM
-	>=x11-libs/libwnck-2.22:1
-	x11-libs/libX11
-	>=xfce-base/libxfce4util-4.9.1
-	>=xfce-base/libxfce4ui-4.9.2
-	>=xfce-base/xfconf-4.9.1
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-2.22 )
-	!xfce-base/xfce-utils"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xrdb
-	x11-misc/xdg-user-dirs
-	consolekit? ( || ( sys-auth/consolekit >=sys-apps/systemd-40 ) )
-	policykit? ( >=sys-auth/polkit-0.104-r1 )
-	udev? ( >=sys-power/upower-0.9.15 )
-	xscreensaver? ( || (
-		>=x11-misc/xscreensaver-5.15
-		gnome-extra/gnome-screensaver
-		>=x11-misc/xlockmore-5.38
-		>=x11-misc/slock-1
-		) )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-pkg_setup() {
-	XFCONF=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable gnome-keyring libgnome-keyring)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS BUGS ChangeLog NEWS README TODO )
-}
-
-src_install() {
-	xfconf_src_install
-
-	local sessiondir=/etc/X11/Sessions
-	echo startxfce4 > "${T}"/Xfce4
-	exeinto ${sessiondir}
-	doexe "${T}"/Xfce4
-	dosym Xfce4 ${sessiondir}/Xfce
-}