[gentoo-commits] repo/gentoo:master commit in: lxde-base/lxsession/files/, lxde-base/lxsession/

[Pacho Ramos]

commit:     fe2d0626f1b94b0f3597f66a28ffd9e9163a8bc5
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  9 11:59:07 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Jul  9 13:39:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe2d0626

lxde-base/lxsession: Drop old

Package-Manager: portage-2.3.0

 lxde-base/lxsession/Manifest                       |   1 -
 .../files/lxsession-0.4.9.2-configure.patch        |  13 ---
 .../lxsession-0.4.9.2-fix-logind-dbus-calls.patch  | 111 ---------------------
 .../files/lxsession-0.4.9.2-makefile.patch         |  13 ---
 lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild    |  60 -----------
 5 files changed, 198 deletions(-)

diff --git a/lxde-base/lxsession/Manifest b/lxde-base/lxsession/Manifest
index 35eaf96..ca4c86f 100644
--- a/lxde-base/lxsession/Manifest
+++ b/lxde-base/lxsession/Manifest
@@ -1,2 +1 @@
-DIST lxsession-0.4.9.2.tar.gz 745637 SHA256 eff03e573b561cabe81c5d015d825e3d998e98d6621040113d7df471c8b9cfb4 SHA512 cffcd15faab79ad165f969edf65b6b106c5b4405b78e6c102a74ab96da9cf61b781d0be7587849ce56672ae3015e8f63bc1b84465f5ec0084c299ec588992172 WHIRLPOOL 5a5c172cda30a4690d82a4a8acd3b983cbcc60ed71fefdfbfbb97e8b4363f4c26825267a0bd45c71589c2dd180f9699a2d05dd759fe23bcfdd5e9d3a10ccdda2
 DIST lxsession-0.5.2.tar.xz 354092 SHA256 2d55e9ea80057fe5ffd68a91a15bb004ad7bf019e50807a8bb9b342115efaada SHA512 2e08e5263bb4ef9d8051e84997347a12d2f1ba75cf4e70f9e3ba783a509246f0d6efd672ac1cc1d0fffc8707710ddb148298449b5365deb6785623d596bc3da1 WHIRLPOOL 720144b89c7719b283478427d5858ee0de8ca25dce77a19eef1646983c22927b3af079ec24f218b92141b77c414ebf7f85e4f863e47646b29fccb96d94586ce7

diff --git a/lxde-base/lxsession/files/lxsession-0.4.9.2-configure.patch b/lxde-base/lxsession/files/lxsession-0.4.9.2-configure.patch
deleted file mode 100644
index 36c7c5f..0000000
--- a/lxde-base/lxsession/files/lxsession-0.4.9.2-configure.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 66d041c..4d8a370 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2,7 +2,7 @@
- AC_INIT([lxsession],[0.4.9.2],[],[lxsession])
- 
- # Autotols programs
--AM_INIT_AUTOMAKE([1.11.1 -Wall -Werror foreign])
-+AM_INIT_AUTOMAKE([1.11.1 -Wall -Werror foreign subdir-objects])
- AC_PREREQ([2.69])
- IT_PROG_INTLTOOL([0.40.0],[no-xml])
- 

diff --git a/lxde-base/lxsession/files/lxsession-0.4.9.2-fix-logind-dbus-calls.patch b/lxde-base/lxsession/files/lxsession-0.4.9.2-fix-logind-dbus-calls.patch
deleted file mode 100644
index 91d1583..0000000
--- a/lxde-base/lxsession/files/lxsession-0.4.9.2-fix-logind-dbus-calls.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-Taken from: 
-http://svnweb.mageia.org/packages/cauldron/lxsession/current/SOURCES/lxsession-0.4.9.2-fix-logind-dbus-calls.patch?revision=549605&view=co&pathrev=549606
-
---- lxsession-0.4.9.2/lxsession-logout/dbus-interface.c.0000	2013-04-12 22:02:19.000000000 +0100
-+++ lxsession-0.4.9.2/lxsession-logout/dbus-interface.c	2013-11-05 11:00:34.038965063 +0000
-@@ -244,10 +244,11 @@
-     return function_result;
- }
- 
--static void
--logind_call_function (const gchar *function, gboolean value, GError **error)
-+static char *
-+logind_call_function (const gchar *function)
- {
-     GVariant *result;
-+    GError *err = NULL;
- 
-     if (!logind_proxy)
-     {
-@@ -258,20 +259,28 @@
-                                                       "/org/freedesktop/login1",
-                                                       "org.freedesktop.login1.Manager",
-                                                       NULL,
--                                                      error);
-+                                                      &err);
-+        if (err != NULL)
-+            g_error_free(err);
-         if (!logind_proxy)
--            return;
-+            return NULL;
-     }
- 
-     result = g_dbus_proxy_call_sync (logind_proxy,
-                                      function,
--                                     g_variant_new ("(b)", value),
-+                                     g_variant_new ("(b)", TRUE),
-                                      G_DBUS_CALL_FLAGS_NONE,
-                                      -1,
-                                      NULL,
--                                     error);
--    g_variant_unref (result);
--    return;
-+                                     &err);
-+    if (result)
-+        g_variant_unref (result);
-+    if (err != NULL) {
-+        char *r = strdup(err->message);
-+        g_error_free(err);
-+        return r;
-+    }
-+    return NULL;
- }
- 
- gboolean
-@@ -280,10 +289,10 @@
-     return logind_query ("CanPowerOff", FALSE, NULL);
- }
- 
--void
--dbus_logind_PowerOff (GError **error)
-+char *
-+dbus_logind_PowerOff (void)
- {
--    logind_call_function ("PowerOff", TRUE, error);
-+    return logind_call_function ("PowerOff");
- }
- 
- gboolean
-@@ -292,10 +301,10 @@
-     return logind_query ("CanReboot", FALSE, NULL);
- }
- 
--void
--dbus_logind_Reboot (GError **error)
-+char *
-+dbus_logind_Reboot (void)
- {
--    logind_call_function ("Reboot", TRUE, error);
-+    return logind_call_function ("Reboot");
- }
- 
- gboolean
-@@ -304,10 +313,10 @@
-     return logind_query ("CanSuspend", FALSE, NULL);
- }
- 
--void
--dbus_logind_Suspend (GError **error)
-+char *
-+dbus_logind_Suspend (void)
- {
--    logind_call_function ("Suspend", TRUE, error);
-+    return logind_call_function ("Suspend");
- }
- 
- gboolean
-@@ -316,10 +325,10 @@
-     return logind_query ("CanHibernate", FALSE, NULL);
- }
- 
--void
--dbus_logind_Hibernate (GError **error)
-+char *
-+dbus_logind_Hibernate (void)
- {
--    logind_call_function ("Hibernate", TRUE, error);
-+    return logind_call_function ("Hibernate");
- }
- 
- /*** ConsoleKit mechanism ***/
-

diff --git a/lxde-base/lxsession/files/lxsession-0.4.9.2-makefile.patch b/lxde-base/lxsession/files/lxsession-0.4.9.2-makefile.patch
deleted file mode 100644
index 8a51f03..0000000
--- a/lxde-base/lxsession/files/lxsession-0.4.9.2-makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# upstream issue: https://sourceforge.net/tracker/?func=detail&aid=3615092&group_id=180858&atid=894869
-
---- a/lxsession-edit/Makefile.am	2012-10-25 14:20:04.000000000 -0400
-+++ b/lxsession-edit/Makefile.am	2013-10-14 21:30:56.627684026 -0400
-@@ -5,7 +5,7 @@
- bin_PROGRAMS = lxsession-edit
- 
- lxsession_edit_CFLAGS = \
--	-I$(topsrcdir) \
-+	-I$(top_srcdir) \
- 	$(GTK_CFLAGS) \
- 	$(ADDITIONAL_FLAGS) \
- 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \

diff --git a/lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild b/lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild
deleted file mode 100644
index 27270a0..0000000
--- a/lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VALA_MIN_API_VERSION="0.14"
-VALA_MAX_API_VERSION="0.22"
-
-inherit vala autotools eutils
-
-DESCRIPTION="LXDE session manager (lite version)"
-HOMEPAGE="http://lxde.sf.net/"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ppc x86 ~arm-linux ~x86-linux"
-SLOT="0"
-# upower USE flag is enabled by default in the desktop profile
-IUSE="nls upower"
-
-COMMON_DEPEND="dev-libs/glib:2
-	dev-libs/libgee:0
-	dev-libs/dbus-glib
-	lxde-base/lxde-common
-	sys-auth/polkit
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	sys-apps/dbus"
-RDEPEND="${COMMON_DEPEND}
-	!lxde-base/lxsession-edit
-	sys-apps/lsb-release
-	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
-DEPEND="${COMMON_DEPEND}
-	$(vala_depend)
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/xproto"
-
-DOCS="AUTHORS ChangeLog README"
-
-src_prepare() {
-	# bug #488082
-	epatch "${FILESDIR}"/${P}-makefile.patch
-
-	# bug #497100
-	epatch "${FILESDIR}"/${P}-configure.patch
-
-	# bug #496880
-	epatch "${FILESDIR}"/${P}-fix-logind-dbus-calls.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	# dbus is used for restart/shutdown (CK, logind?), and suspend/hibernate (UPower)
-	econf \
-		$(use_enable nls)
-}