Fix for bug #497100

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x39E7AB2E)

3 files changed, 78 insertions, 2 deletions

diff --git a/lxde-base/lxsession/ChangeLog b/lxde-base/lxsession/ChangeLog
index 79acfa8255fa..cb0cf6389640 100644
--- a/lxde-base/lxsession/ChangeLog
+++ b/lxde-base/lxsession/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for lxde-base/lxsession
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/ChangeLog,v 1.51 2013/12/29 17:36:33 maekke Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/ChangeLog,v 1.52 2014/01/05 06:27:11 nullishzero Exp $
+
+*lxsession-0.4.9.2-r2 (05 Jan 2014)
+
+  05 Jan 2014; Pavel Kazakov <nullishzero@gentoo.org>
+  +files/lxsession-0.4.9.2-configure.patch, +lxsession-0.4.9.2-r2.ebuild:
+  Fix for bug #497100
 
   29 Dec 2013; Markus Meier <maekke@gentoo.org> lxsession-0.4.9.2-r1.ebuild:
   arm stable, bug #495684
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
new file mode 100644
index 000000000000..36c7c5fabe4e
--- /dev/null
+++ b/lxde-base/lxsession/files/lxsession-0.4.9.2-configure.patch
@@ -0,0 +1,13 @@
+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/lxsession-0.4.9.2-r2.ebuild b/lxde-base/lxsession/lxsession-0.4.9.2-r2.ebuild
new file mode 100644
index 000000000000..ac52e4a37d94
--- /dev/null
+++ b/lxde-base/lxsession/lxsession-0.4.9.2-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/lxsession-0.4.9.2-r2.ebuild,v 1.1 2014/01/05 06:27:11 nullishzero Exp $
+
+EAPI=5
+
+VALA_MIN_API_VERSION="0.14"
+VALA_MAX_API_VERSION="0.20"
+
+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 )"
+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
+
+	eautoreconf
+}
+
+src_configure() {
+	# dbus is used for restart/shutdown (CK, logind?), and suspend/hibernate (UPower)
+	econf \
+		$(use_enable nls)
+}