Version bump. Fixes #485254 and 482028 thanks to Pavel Kazakov <nullishzero@gmail.com>

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

3 files changed, 97 insertions, 16 deletions

diff --git a/lxde-base/lxpanel/ChangeLog b/lxde-base/lxpanel/ChangeLog
index dd7446cd0bb8..4d259932066b 100644
--- a/lxde-base/lxpanel/ChangeLog
+++ b/lxde-base/lxpanel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for lxde-base/lxpanel
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/ChangeLog,v 1.59 2013/05/11 18:52:30 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/ChangeLog,v 1.60 2013/09/18 19:09:38 hwoarang Exp $
+
+*lxpanel-0.6.1 (18 Sep 2013)
+
+  18 Sep 2013; Markos Chandras <hwoarang@gentoo.org> +lxpanel-0.6.1.ebuild:
+  Version bump. Fixes #485254 and 482028 thanks to Pavel Kazakov
+  <nullishzero@gmail.com>
 
   11 May 2013; Markos Chandras <hwoarang@gentoo.org>
   -files/lxpanel-0.5.10-libgmodule-underlinking.patch, -lxpanel-0.5.10.ebuild:
diff --git a/lxde-base/lxpanel/Manifest b/lxde-base/lxpanel/Manifest
index c2844a1c18e2..cfe8b341e940 100644
--- a/lxde-base/lxpanel/Manifest
+++ b/lxde-base/lxpanel/Manifest
@@ -4,23 +4,27 @@ Hash: SHA256
 AUX lxpanel-0.5.9-libwnck-check.patch 413 SHA256 6b3c3d420284eccf0fa14e0a377a4d1f4c9141989bb7b76400081d8e55dd5817 SHA512 e8fef3865f303fb5ae6e76b458690d44b2f5f283da05937fc57caffd6d82997c97d36424acabdf005c22217d6ddb11204dd789f8093256e267348d283b25f5e3 WHIRLPOOL 3f3cc64c7286bdc41c9bfad82749010d60c2f7ea74679250dcca47b3e2cabfa1eaf918925c39b7b834e5a63d76728c1793e0f713fd79dfdf4e28e5bff484f6dc
 AUX lxpanel-0.5.9-sandbox.patch 1104 SHA256 7aeb18548f11910d4db781da219bbcbe36ac5eec0b21a6efc0fa4234221009ff SHA512 6e1287cccf3372ac207a934e45743d5b79292956112ab1a20c6700953c642e7cd4d8f1a62b25bb47c803647eca168122469db07c2aa988acbb906a9ebfaaa9ba WHIRLPOOL 49e35df303b834d1916737797c2cfecc2fa537bd5a922dbe80cd720bdfddec5f00a56e99c081a835ed71162d86de3ce9d3b86e5a9881f81e950616034da2cf7a
 DIST lxpanel-0.5.12.tar.gz 2048801 SHA256 11cfe76f6241bbac556e57a6efc079b6e10dceea76a8bdaf4c749afdb81d15ab SHA512 ef491671d241c87039c402a7d7668f1108aec861a6b421ccdae3549ab576db1f79007b15787153445df4cef0cc86f1f0ddd35d14481d06de884df2bcdfa1d1bc WHIRLPOOL ce149c5f2167bdf1cf94bc04bae4a4b26334dcc8cdd39bbb12174effc34625dc32806f584806e9f2ff8ba65c51c4d137fc9ad1dd19748776c5b55c7333bea88d
+DIST lxpanel-0.6.1.tar.gz 2094946 SHA256 a16a21b2186218c70ed98dc7875c54d6bb12ae7271825ff5060feb8d2a4e86cb SHA512 a0a67cad6899c286d69bc2b10b41bc277217b0452fea4e4be3bb8d68f524c6f4b878594961ad3acd187e90b3e96ff0aa0c97018c7bd5b198df64761c8378daa3 WHIRLPOOL 4ce95825f4cd647e4abeb3852192a1373a42a68cd30d50bde5bd810a48bf574b371d763a3d3a6c91d4a4c945eeec668ec56b42c6c8db5c26a3721eb21193725b
 EBUILD lxpanel-0.5.12.ebuild 1866 SHA256 cf67fa6ec3f9571a79f21e495174a52a7f19e74100bf972132004ea0030a593d SHA512 967f31ed8e38b5d95811c577a5e23403d031750fc43c6cce11221089c7da3e9a595fe4d8fcc4573b5a6f08d373f3dfa4d50bd1d2efd4d55988b845dae650e2dc WHIRLPOOL d340b824e1c8f4e07aaaaefac55f46e67c348e4e956de103cbd82158f9ba246afa47b96deb2b1866227c68bbd4f4219370f4104999663f43901e8eb3f7beb49c
-MISC ChangeLog 9064 SHA256 ccf3e4f91e06a4300d4ece180346bdb526436df897bc0f69cd73d0dfd8a82979 SHA512 2e77cb018278881a165195a02e88eaee8345de6dcfad9ebb00cf460b29e4e3c2995e6b2bb3270c4489d0a3c134124d61f41d8fd1b2b77ac0f861530fef04db6c WHIRLPOOL aae4d9b392da16b2c9d72c40162ecdc8f4ddbcd8628effc6b007e651f6027bc90e68a78722e3102b779f509a9609e825285027ec7a67745b4e992cb6687930cd
+EBUILD lxpanel-0.6.1.ebuild 1934 SHA256 aaf9c042ed5686f70a14992b9d08ad63a172f1e0015d65dedd692a43f989220c SHA512 a6e43fad1b0836721842336649fb33141a39271b5dd7414b4b00274c3d8ea14d7708c9220732f0e3f813ddfbccfe4bbb99519a21656c7e3ffc2e9fba9d7aae85 WHIRLPOOL 332e9817e2d82310589d3499c600b35975821f5c7573fda6315ab98498f2f7f4cd8dcd937b65b8a5be478cdf191e4f3cadef91a11a20e9f6313c514242a052cf
+MISC ChangeLog 9262 SHA256 0472110c24b08c063a727abf587640e439ef46e86ae70a91ffa7ad10a732405b SHA512 275e5dd403e788aae004922175f78b40dc1b0647ce24d52ce841b022db9eaa24d7c5675e1bec56cd23ad4a3914d8827c42a59b9e84ac1cf4a9878d2b22c346c7 WHIRLPOOL 71d8a4931f0dcf340f6a7adf4c80668121febb676f90e4510c9a654edd32c8d42228982a01630d872131e256b31eb07f1e783aff64fe5a4c419695b319c13cc5
 MISC metadata.xml 159 SHA256 09574ccad15f69d5367ecbb1a491cd636fb88582f69987d2ec217109dfe8befb SHA512 b4d06538d607c5ba81e0070475cd7d0a221b19e2adf740f479398a647c97350eb6d02b7db8bde107b0c369ce0058b8f0639468c0ca519ff585c555a0bfd4a381 WHIRLPOOL f5dfee2db356573e21cdb76ebcd11a61d2dc7f2b2b8458589cdabb1b2fd21f3261d0b40144b1417d433d1078a9c31a6b4562a914068719df66dfd4563714d9ab
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRjpNOAAoJEPqDWhW0r/LC0gYP/1Ru08avWXhHIHMABNz7R5FX
-xSUyiczqVd0B6rF71WZtpeZswELNRHb1AwSy/jO0mHgFrFfOhi5zsDqBefLiaRkQ
-oZ/liks0EUI1M8VJqfbgXHS+dvjMwhMN/WUnHkdNBJhYeb17AN12iEB7QyjnfYoL
-XoKzNKPLY4lyKHV95V1/+HTB08bGp6MlfCFG9bb6A8YLKYwGPQxNHYs1rHqy6yFh
-mYLeV717TwiWIGQH5q9rYa2vLHTrMEwh7zs2npfcxw3MX8XzMYEslYSZfJ8LUtHa
-r9x/cb9RGUTgCosdKd9I26Y6IgZVGmIBQzIdjCFmudoZDkH/STJMF1SsYMDa1OIC
-Xy9DBEzDdqeMeBIaYET7mAdhZeueLWEQvWItfGsAin8sdUECWjLLVpiuvQaqh9kl
-6xsMt2FP4nXXRBEXIiKH7pp54urwSRn823zn0Z5xGhiwklnXdpDkGEb7p1Qe+L1K
-CTZy0VUJ7DIWsChMpZu031ezfGH7/wowxdNhHucGikTzgjZWjKESgWn+E+pujY/4
-gz2/EaOmvwIERCJsW8KOxA2+54zuNyOUHOT4775bwbHe9X6ccsLSMtWW1OUtFV6v
-NH61W540wkgGNtoZILdrhU1/aAd0IUWcumjsNCexx+IWXk/FtQcl44Ch6hmODG6r
-Ah9mrKefR8fWlnLE5U8U
-=dti4
+iQJ8BAEBCABmBQJSOforXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88BFQQAKZ9rN7z41KhTjiK9qHe8cIW
+sGts1+2B7lyPE/n/7yRVzQV8pR94veqt70M9xjRi0f8OrFke13XcN7AmtzoYIcXw
+kzeqE4u09xdJUmPI2Skst8uZFXGULxwQaE08WMknKj+l8pAVop5ePN92lELHZyTy
+ds8SVcDgV5zo0Xwt+LxGAUDKwJgBEWN4xVO+RYlZVB2/34TDm2QMBWK26AZ90qk+
+lAFyDOx+EBGex0cKvfpGC2FAEi8lwa37JeQGkPwV6nQD3UWduj7omdiNTLmBDxRm
+cUf59IrTRdJo9ZvbOYMyZ368pwTbbe0G73CXJgHWlXjozML/bxbq0IzGLc1i7Ur2
+JYcarZEkjFNCmveAfFBHBO7GAd4SAg0gks6CDLNsxLErisz7i+zZ6pF/yBBsfswD
+iWsDYiv9liBNmMWVB/aY4cKSIaVlfMYXt1lxRTB1WKX8U8Z89OBJ/inOUFOG0Y80
+ivgcDPi1ClOXsV1nsVYgh5c3Iodjt63nenjA/81lP35b9xU9TlfrqqV7nW38gr3k
+STx8aeNuiSKYIbRT/K0pqMCDoemB4CY9Q82ER+sVVd2UzZYTXeO0TssirSoItuYf
+R45NL0S1VIAEh/XXbEyur1IXp0g0DuPlwVKnR9gUtiZbDDPmtEyihzXcToKn33ZA
+G5xN4cU3pB8fD2WXJBAZ
+=wJ7y
 -----END PGP SIGNATURE-----
diff --git a/lxde-base/lxpanel/lxpanel-0.6.1.ebuild b/lxde-base/lxpanel/lxpanel-0.6.1.ebuild
new file mode 100644
index 000000000000..3270987c68d8
--- /dev/null
+++ b/lxde-base/lxpanel/lxpanel-0.6.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/lxpanel-0.6.1.ebuild,v 1.1 2013/09/18 19:09:38 hwoarang Exp $
+
+EAPI="4"
+
+inherit autotools eutils readme.gentoo
+
+DESCRIPTION="Lightweight X11 desktop panel for LXDE"
+HOMEPAGE="http://lxde.org/"
+SRC_URI="mirror://sourceforge/lxde/LXPanel%20%28desktop%20panel%29/LXPanel%20${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+SLOT="0"
+IUSE="+alsa wifi"
+RESTRICT="test"  # bug 249598
+
+RDEPEND="x11-libs/gtk+:2
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/libX11
+	lxde-base/lxmenu-data
+	lxde-base/menu-cache
+	alsa? ( media-libs/alsa-lib )
+	wifi? ( net-wireless/wireless-tools )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+DOC_CONTENTS="If you have problems with broken icons shown in the main panel,
+you will have to configure panel settings via its menu.
+This will not be an issue with first time installations."
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.5.9-sandbox.patch
+	#bug #415595
+	epatch "${FILESDIR}"/${PN}-0.5.9-libwnck-check.patch
+	#bug #420583
+	sed -i "s:-Werror::" configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	local plugins="netstatus,volume,cpu,deskno,batt, \
+		kbled,xkb,thermal,cpufreq,monitors"
+
+	# wnckpager disabled per bug #415519
+	use wifi && plugins+=",netstat"
+	use alsa && plugins+=",volumealsa"
+	[[ ${CHOST} == *-interix* ]] && plugins=deskno,kbled,xkb
+
+	econf $(use_enable alsa) --with-x --with-plugins="${plugins}"
+	# the gtk+ dep already pulls in libX11, so we might as well hardcode with-x
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog README
+
+	# Get rid of the .la files.
+	find "${D}" -name '*.la' -delete
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}