Revbump to fix logout problem. Bug #501804. Thanks to Vicente Olivert Riera <vincent@gentoo.org> for providing the upstream fix

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key C2BA7F3C!)

3 files changed, 61 insertions, 3 deletions

diff --git a/x11-misc/fbpanel/ChangeLog b/x11-misc/fbpanel/ChangeLog
index e7870326ae4c..d5906bc575ef 100644
--- a/x11-misc/fbpanel/ChangeLog
+++ b/x11-misc/fbpanel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/fbpanel
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbpanel/ChangeLog,v 1.56 2013/08/26 19:17:03 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbpanel/ChangeLog,v 1.57 2014/02/19 19:28:25 hwoarang Exp $
+
+*fbpanel-6.1-r2 (19 Feb 2014)
+
+  19 Feb 2014; Markos Chandras <hwoarang@gentoo.org> +fbpanel-6.1-r2.ebuild,
+  +files/fbpanel-6.1-xlogout.patch:
+  Revbump to fix logout problem. Bug #501804. Thanks to Vicente Olivert Riera
+  <vincent@gentoo.org> for providing the upstream fix
 
   26 Aug 2013; Jeroen Roovers <jer@gentoo.org> fbpanel-6.1-r1.ebuild:
   Use configure features instead of sed.
@@ -223,4 +230,3 @@
   19 Jun 2003; mkeadle <mkeadle@gentoo.org> fbpanel-1.0.ebuild:
   initial import of fbpanel. thanks for the base ebuild goes to Cory McWilliams
   <mcwilc@rpi.edu> in bug #22584.
-
diff --git a/x11-misc/fbpanel/fbpanel-6.1-r2.ebuild b/x11-misc/fbpanel/fbpanel-6.1-r2.ebuild
new file mode 100644
index 000000000000..8e2eb8bf4389
--- /dev/null
+++ b/x11-misc/fbpanel/fbpanel-6.1-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbpanel/fbpanel-6.1-r2.ebuild,v 1.1 2014/02/19 19:28:25 hwoarang Exp $
+
+EAPI=5
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="light-weight X11 desktop panel"
+HOMEPAGE="http://fbpanel.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tbz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( CHANGELOG CREDITS README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-underlinking.patch
+	epatch "${FILESDIR}"/${P}-xlogout.patch
+	tc-export CC
+}
+
+src_configure() {
+	# not autotools based
+	echo "./configure --datadir=/usr/share --libdir=/usr/$(get_libdir)"
+	./configure --datadir=/usr/share --libdir=/usr/$(get_libdir) || die
+}
+
+pkg_postinst() {
+	elog "For the volume plugin to work, you need to configure your kernel"
+	elog "with CONFIG_SND_MIXER_OSS or CONFIG_SOUND_PRIME or some other means"
+	elog "that provide the /dev/mixer device node."
+}
diff --git a/x11-misc/fbpanel/files/fbpanel-6.1-xlogout.patch b/x11-misc/fbpanel/files/fbpanel-6.1-xlogout.patch
new file mode 100644
index 000000000000..a6cd71e75d50
--- /dev/null
+++ b/x11-misc/fbpanel/files/fbpanel-6.1-xlogout.patch
@@ -0,0 +1,13 @@
+Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=501804
+Upstream: http://sourceforge.net/p/fbpanel/code/474/
+
+Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
+
+--- a/exec/xlogout
++++ b/exec/xlogout
+@@ -45,5 +45,5 @@
+ [ -z "$SPID" ] && exit 1
+ echo "Session start up script"
+ ps -o uid,pid,ppid,sess,cmd --pid $SPID
+-kill -SIGTERM -$SPID
++kill -SIGTERM -$SPID $SPID