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

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2BA7F3C!

4 files changed, 80 insertions, 8 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/Manifest b/x11-misc/fbpanel/Manifest
index 83366e62e083..0c33d3e0ea0a 100644
--- a/x11-misc/fbpanel/Manifest
+++ b/x11-misc/fbpanel/Manifest
@@ -2,15 +2,29 @@
 Hash: SHA256
 
 AUX fbpanel-6.1-underlinking.patch 789 SHA256 9f2681ef55a323313ed3a96083429762255ef88c23c00c339f8942c6ede4c5b5 SHA512 9c19199bc4f24ffe967b14dbee5165f78dccd120bc73f22e4846f083b4be3b92b60855f5ad08bdcb6d3b55b33a070a54e904cfdcc36786211d7d252dc7faac04 WHIRLPOOL f190ddb3e4efa7cac4732ea24dbca24d8877c49b146d9190926231a2ae5344937b4b107496a4f9aeb1c81f8faebd8045cf4aee351c75ac096f0b7795de9d652e
+AUX fbpanel-6.1-xlogout.patch 368 SHA256 a34095d1c10badff11e36987624ff9e8f2a92dbf46cba38f201c2842762190ae SHA512 9c410d2f79f0112f57e67d319b3cc4f7e05612381fc7efd74f526424f621b55490673671ae9dee52869c02c394752961010476bf9f1a87a91e916b9cbc2477b8 WHIRLPOOL 2742b7d05b02515f8f88186378d5e89f199bb898ec8ffc04fb389a80bfb3c417beca7fb8de58aa0a791de389627e266a2f089c308659939e902547e3c246053f
 DIST fbpanel-6.1.tbz2 190266 SHA256 e14542cc81ea06e64dd4708546f5fd3f5e01884c3e4617885c7ef22af8cf3965 SHA512 10ffa422d811725dff68f43af9735d79c7859114bdf06f49b05e0bc4b0fd5eb8a3ea196cd07753f261d60c0bd0716baa6d5a22c860dde6597c70bfcfb0f7078e WHIRLPOOL 362d4beaa383ad716a851d4fe1a5e583d635c300a0d97ba36d07e2709b8ca09cd6756c7bf8f7fc62508c547dc23c043b6ad0e90787dc629b3dda280d2b55e97e
 EBUILD fbpanel-6.1-r1.ebuild 1062 SHA256 1b4babc1ab18f40fec70fd892b4e8bc1c525c885fa6c7414c18acd112bf94fda SHA512 7a6698e99170ddd8fdab8917e9867fc25f9283a35b9eb42a143a9cd185630e86f30ea0de86154cbbd1d0e3a3ccd6cc45dfca1d5bd2fb340dfc05c6c0214946ec WHIRLPOOL 6248df2549cb4a71c429459949f6aabee05630aeade304ba1e59335bc29b263af4c91d11360b962b1fabb3cc99057eab9669ee8ee396769430caf9c2a5bf58c8
+EBUILD fbpanel-6.1-r2.ebuild 1108 SHA256 71ad494c8bfca472bacb73accf802d3daa601c1021579d59935b038c7a6968d4 SHA512 e9e7232824f06fd8116d3193f515df74315bbbef6a19e817b9791c8fc256d374cc02d35f385ef5ef9d7275fa07cb98687d1976c010ed4cb27f9597642f63dac3 WHIRLPOOL 1feceddb8a4bbe09cc2835c0e717bc080f204cd17d34a1c679a2628864d683504e6e0c578d535b917a1ad2b85b391668aa744fa2f86fcbed2926cd93a94e75d5
 EBUILD fbpanel-6.1.ebuild 591 SHA256 1a72ebb8d56f926ee4078f00ac804014d46f686c2575575cfe2ec1739d1fccbe SHA512 ad5aed5c33cd860c448d21bdf167705bee26e88d627d0e1e37d5929ff6d2b98703b0481a609565c34bf4bef2e6c64ebe4ea2cd5d905465f6aa650d17c86e48df WHIRLPOOL 8c1e4dfdaaf2f27af844399d1af7ed3b3bd40bd79eb91ddd659400171821190f8430b99496484ccb390b321e12b9ce31616bfa5b58ff69c7c6f66d4d7ce8cb1b
-MISC ChangeLog 7224 SHA256 08bcd8741cd72f8c6a1327ea50a7009a46386050e3615b9d4550efc315b0055b SHA512 170d6e5738bfc3a7aa71a806d9b00d8a5ef1d5048285771422152b356304efbf7416c5f54d4a740b2ada7454bfe3dfdf2d33e3c16b61e2218bf7add6cd74700e WHIRLPOOL f4b08cb8b00127dfad49f4f63bdc78fb95075ea1cd7f8be73adc805456ddf8304adf80a8da0560070bc5d0eb38ef7850841feb905465ea188e45aa431792ef5b
+MISC ChangeLog 7505 SHA256 8e5670a229bb707c3b2038024bce4b4315851cf51a049906bc140736c2634a34 SHA512 66a00167035de6f7cfe032464dfe414400ea58c8d5f7f9dba7787f2d9a596c957307850c94d10584a5d74ea810be882d500f54bdca00779091506fbc33bf25ee WHIRLPOOL 0111229bdabf41ddbeefa01c9370c454fad5d5c566760391111af24d416beba6179fb4c5c5ed68fb393ba7783d20ea6e0f0b2216f01e1cf7266447c0fc6ff0a2
 MISC metadata.xml 167 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241 SHA512 381c3c70deed443ca617d0535541542579acffb8dde5f577acf789380f0cdec6d395fa6a45483978648fa2d4e9dab13a441ebdc95664f5f414efbcc812705754 WHIRLPOOL f4a9e5a69adee7e8ee1e5e7ba1b4b860c5060a80db845e0c7f12c96ab44a86dc81adb6aff76c5130b4ab2ffe5ea18f0a5afc9d87a61177d99a8fc9f49d7e9d6f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlIbqbAACgkQVWmRsqeSphM/7ACePGl9XpFGs6Mwk2FJtOCWDOOD
-s3gAn1VB2J5XrPgIvrLvrSON8NahB1H1
-=FK7D
+iQJ8BAEBCABmBQJTBQWhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88h58P/17ZiiVOSLLk4X/ArDEdDJvc
+1485r66BbTOqLmBQTiAOKBxFnenW/1fEsJe/0T8HrsYXfcp3C+ETZvBJbHD13orc
+2kwQ0qXZxscTBpnz7sWqj4jpk/NM9TidEhJvwfG8xouKKQOJapJcWKmGadwY/UFl
+fpxhTcl0MMcxeUIZAnhV5VM4uZk1W7z1U7nvd1WQHTbbevQMd+8tt5aArtXx2S38
+nCI0DyKL3CysE5MtZS0T9/MxsdQBBMRh6I6rFIO8e5EtbdVZJCdc7bwyi+BWvY4K
+IPnoh0yEuWbQncB1BJV4POBWn0kskNNDwXR//OyLxms8eLV3ijzI1vdYMtdDD9Cz
+nAdb64J12RMXAij5FRVF8Oj/cxzB4LlUBPn8n/JdWRQ6mzJxumeuvfcLdFQJC9q4
+k1XJe7B01UmANnbL2EmSvRBrIqBbqEz2DY/Gcpl3sGuph11rWO8f5OMCYZAkuX89
+hnoXFvMcoPwlKINFRFEgNXloijEsQ8UiVZcdH8bAZJOro667Huct9NuaWrwYvTeb
+TsViL/+4ZbfsbljsXi4RTUwmQVrhHHbCjiwYxuXJtY1kUb6bM7R9qnH449XovItY
+a+vEVc+hjiiyik+mS8UobYjtWCdvzD3RcLy9UWGZ2UdTuzG5UJTkt7q6+LVIDIpL
+TDRuoviNxBGSTVQWhk/9
+=Fn9h
 -----END PGP SIGNATURE-----
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