Version bump. Remove old

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

6 files changed, 40 insertions, 199 deletions

diff --git a/lxde-base/lxpanel/ChangeLog b/lxde-base/lxpanel/ChangeLog
index da6aef76b252..be4f09795ac2 100644
--- a/lxde-base/lxpanel/ChangeLog
+++ b/lxde-base/lxpanel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for lxde-base/lxpanel
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/ChangeLog,v 1.44 2012/06/11 18:40:13 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/ChangeLog,v 1.45 2012/06/20 20:56:05 hwoarang Exp $
+
+*lxpanel-0.5.10 (20 Jun 2012)
+
+  20 Jun 2012; Markos Chandras <hwoarang@gentoo.org> +lxpanel-0.5.10.ebuild,
+  -lxpanel-0.5.6.ebuild, -lxpanel-0.5.7-r1.ebuild, -lxpanel-0.5.8-r1.ebuild,
+  -lxpanel-0.5.8-r2.ebuild:
+  Version bump. Remove old
 
   11 Jun 2012; Markos Chandras <hwoarang@gentoo.org> lxpanel-0.5.9.ebuild:
   Drop -Werror introduced by new automake-1.12. Bug #420583
diff --git a/lxde-base/lxpanel/Manifest b/lxde-base/lxpanel/Manifest
index 5cd6b3fa12c1..f291e2de8e2c 100644
--- a/lxde-base/lxpanel/Manifest
+++ b/lxde-base/lxpanel/Manifest
@@ -11,33 +11,29 @@ AUX lxpanel-0.5.8-dynamic-width.patch 1616 RMD160 e6c14456ea3451fc530f77d2d90f40
 AUX lxpanel-0.5.8-thermal-plugin.patch 11680 RMD160 5421f7c92d9a3b23c98cbc7626099a37f8d03565 SHA1 b9f54c0d233febb08b7c804457d90f57b2434fda SHA256 959bb8d666a21d3b2aad3e22d7b5ed2d688978d64c74703ba098a9724d4595bd
 AUX lxpanel-0.5.9-libwnck-check.patch 413 RMD160 5d35b975af4b36dcb6a2e5531b857e695362fefa SHA1 26faab06fcb063e9a7f60e26e5d4d72ffa5b4eae SHA256 6b3c3d420284eccf0fa14e0a377a4d1f4c9141989bb7b76400081d8e55dd5817
 AUX lxpanel-0.5.9-sandbox.patch 1104 RMD160 52a0d94073e5138502a969a3811f9feaaf07c3e8 SHA1 c0413cc29f917244ded9b993667b377ffb4633c4 SHA256 7aeb18548f11910d4db781da219bbcbe36ac5eec0b21a6efc0fa4234221009ff
-DIST lxpanel-0.5.6.tar.gz 1074786 RMD160 5e5ebdd185d06fe0d1965ec2ed12ffecf0984b7e SHA1 fc5483e6016ac52c38b38274cca7661f2aa828ab SHA256 9c04839e2d23feec8b107a1d76899aca645416862b4b6ca01f8db743944348e1
-DIST lxpanel-0.5.7.tar.gz 1166355 RMD160 489dc9515ab0f6bac5136a0c4c93fbcb26f48e97 SHA1 276168fb4560899e83a6a340448c961d63333717 SHA256 89d1b55b207e61b7b7433cb51302bdbee644fb78b5b57892d67cb19072f548a1
+DIST lxpanel-0.5.10.tar.gz 1330296 RMD160 41e2e440dd059c82e9ba3eea3fe16046a79008b8 SHA1 867c1beec136d932e4ef15679691ac4bf50d3b29 SHA256 5f003c38035009fbfcdbb1f1ed8d15cbbdd1216310d1d67a843fe632049996d4
 DIST lxpanel-0.5.8.tar.gz 1166241 RMD160 34e3cc6fb9de1c0590f6ec281750061c1098dc1a SHA1 a9d6bd9d15a3588fb959aa32880ad888c58359f7 SHA256 6a3579d6f384c03a33a03e4d32016428c84eb0f2bc421704f724fe2cc015cddd
 DIST lxpanel-0.5.9.tar.gz 1315892 RMD160 c3b1f2036f94d6af4659a12434e6bf5f7bdc8b65 SHA1 c607bf93b7941d21f9b29e6d6429b48fe2f7e388 SHA256 2bde7d68b5a7136b205fcd497f70a67a0610fe04785d4469b3a0f9c7f30b729e
-EBUILD lxpanel-0.5.6.ebuild 1550 RMD160 2239cfd2b7cd7541b18858ce1bfffd768a98d3ed SHA1 8b67c28a37fd314bea47caac18226cb0601c1696 SHA256 767457436c85db9d4addf2054291ef71a883c87a8d7ed96b9faca4b584611d9f
-EBUILD lxpanel-0.5.7-r1.ebuild 1562 RMD160 e60ea470290571021c88ece7bb1cf89c9cfdae5a SHA1 33c0e5f4824662a856514a382c31bffd1a25afda SHA256 7fbdc72943c14ad9ce47efd684ab581f7a7b1892e3be6a1da3251fdb95288cff
-EBUILD lxpanel-0.5.8-r1.ebuild 1513 RMD160 6de6cfe7a008e41e586b6397b5aa1208f1b8df2a SHA1 de7b21f23b93dd473a76a153dd4453d0b749a100 SHA256 180127d67fb96c6482aaae2c3d126564a7b95ab5ee7c7a6623fefe753f048de0
-EBUILD lxpanel-0.5.8-r2.ebuild 1561 RMD160 0b232d211f70acec4a7967c4ed156dddf70e9edc SHA1 a4dc7772ab24b633aa6c25f69e3e5824561e638b SHA256 c56f1f2b13da5975ac6eb49b5d0d06ef08749548271713dd9d280b8c11658803
+EBUILD lxpanel-0.5.10.ebuild 1810 RMD160 031d3077bd8ca04bedefe985ab7690fd3d09aaa0 SHA1 f29d5c41fa7c76719c56b263cb3c0a99032d171d SHA256 940158c837b1ed00074c20f0eca8b4fa97d3a9a8091f8c36ded2c70fd1fc0b02
 EBUILD lxpanel-0.5.8-r3.ebuild 1610 RMD160 0f5a16ce57345ead5aea1360f73f205596b62f16 SHA1 8b860052cb13562dd615934c273d0ae6f765ba4f SHA256 35943affe69f782529cd0bcd4ecac445356488023068e0f9cf9cfd63e7fdbdc1
 EBUILD lxpanel-0.5.8.ebuild 1456 RMD160 adb172c43e654cbd417ddc1fd764af635d693bdf SHA1 0c610fce29a780a35c30d19cb24cf019604770ec SHA256 b64f07e480eceb33a2db8184fce2cf381f001e21773d6273111ffb90d6cb6857
 EBUILD lxpanel-0.5.9.ebuild 1849 RMD160 e0a38de37ce4f4af7eca5342a0af598a5dbd43de SHA1 9430902c82b4ee01241e905613e53b10f3bbd15e SHA256 2955343b6100970494ac7eb2039fb2a7c2cecea7c11048f394fc30f2806ef548
-MISC ChangeLog 6804 RMD160 e565cd28a896ee51b489912a9e69e085df812607 SHA1 53e244052037ac539fa223e42cf6ab217839ecdd SHA256 c9df8b21696537570138e3c22880eab4d835667d0139ea9aca49c094edfbaa7c
+MISC ChangeLog 7045 RMD160 6a56f1138e64953aab5601a0e2df9fe26c77b5b2 SHA1 e5728065a09d395f1e6913362f34acd7efcab783 SHA256 3a09f29e131079db4ff0a69c6ce0ff411a57ce543a4589652c6a932bd6163d66
 MISC metadata.xml 159 RMD160 35036c133a5c9c7edccc3cdfed5789092f884048 SHA1 bdf1b7cc6ffbdd223b6f05aa072e857dfc981c4f SHA256 09574ccad15f69d5367ecbb1a491cd636fb88582f69987d2ec217109dfe8befb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJP1juSAAoJEPqDWhW0r/LCv7QP/RHNIYmAyjeRZ6HF4Ndm7p9v
-BgZtqvLTNtSRxNMOQrkFTiDlYDvipGakDKqAxhMcfCXmsr9iC8C7HaDo8DJQxP2O
-JgqJ+aCqZmT5qf4e9Gt/fE2nC9E/VdmUKT7UeHSJQUD9dv0gHt2PPZc1J+UcyRNl
-yp8MURwrcbJ5SPPTd7uDnWaepXx8R/Dgy53/IVmuF++CkJ+e68nJxUo5mcXye1L7
-mvkH2Q719nkgjI5KfaQNuJNoWZ/ZkB3Y4WVksppNMmUsZBiWVlz+uI+W1y0GuRIH
-4+oBHY16ZreTDLbHxy/30bxn0XDJmaMikt06UW4HEwG7w9oXc6j+Q1NtDUlv8/a6
-e/fboK2bHk+0h+5w6pgFwNsCFCYmUxgY+YBDrRORWwetkn/SH/bC2lCMF8vZaUVW
-dVqNshNR9jCVqLX4wzxmFhZTTy0fD89TS4XUPGPITpAoq3JJSW4DrXDRmW17dxqw
-V/D4UI9nGs69x1Ia1zQAdlNHj51lRoPM1/yb9AoGgU0UZtpEPxR7EtUso0Pkkk1F
-b+akboVND567+Jtr0oT01pkCol940DF1ssRndjrIkfjcouyoTPytLQR8leMMl8aq
-r3/UjdGI/3AR8NhLvTVKTvbFIDxi8PLQ5JzFIGniKUDICbK+Fu2e5wCATtLZpPAb
-LwBXeOdyddaxFdMEICQr
-=ZDmS
+iQIcBAEBCgAGBQJP4jjqAAoJEPqDWhW0r/LCy40QAJ8GJnMM6Lq10Ze1Sd/V6P0g
+uXQAxaF+XrA39sIeZGfTp9U+Zg4BDLFLa8vZUrsI34q+yi0Up6BxHxN23a/3Ir1o
+YeTyCz3kzVgkcY15kX/T9mHwYapdPFgT+rMHZSZn2Ouyr/lMAAg/QJR4aaBz+SR6
+d8OgVtlYyajkwv6Pvp+D4+g4XNyFDFzrEUj+hNASSwUs8+6uryZUgHleLfW4fHVM
+t/Tx/CBnp5UZ7c6pkyYhRC02icxUfW+hlIX+wenQ1WXDS3va6JJz2etV4/ssp1gO
+w3Q5ICKr7qW7OWnVf3+8LbwBrEMha7lhFyAxz34+tfoUS9rbA04AFL5KNxjJZ1LO
+VPqwTTWlkrGrKcwyYUyio98Uj+rabpgN7uRgiA8p8SLxHV17JU2N2N7SxdhMr+/j
+JZ4/aWq5ZQ1v7097UpblBhOzJ+tnUMe0+MQa+6BhW38O7kXkUi6QO6K2jNjdNDJV
+EaOkwvwuapD6Ym0nWyWvIEMFp8Xwi8JjEwTwy/pi1HQLr1EP8Qt2bS/z9PavZLbl
+++jRAgJPVMKx6OunMdwSgs+O2mo8DEnTY4ZXqSWIxjx4pV0k4n7nPoYAMnf40r2h
+wGZIyno5+KqU8G9APtUiZZP9uPk9z5OZoI6/IBaovDy6+9VGIYz6NMDR5mYrtFtI
+pIXLTNAWnpYZ9D+rHh7G
+=i3qU
 -----END PGP SIGNATURE-----
diff --git a/lxde-base/lxpanel/lxpanel-0.5.7-r1.ebuild b/lxde-base/lxpanel/lxpanel-0.5.10.ebuild
index 33451f1b4add..ec10a925a7da 100644
--- a/lxde-base/lxpanel/lxpanel-0.5.7-r1.ebuild
+++ b/lxde-base/lxpanel/lxpanel-0.5.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/lxpanel-0.5.7-r1.ebuild,v 1.2 2012/05/04 05:50:38 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/lxpanel-0.5.10.ebuild,v 1.1 2012/06/20 20:56:05 hwoarang Exp $
 
 EAPI="4"
 
@@ -8,12 +8,12 @@ inherit autotools eutils
 
 DESCRIPTION="Lightweight X11 desktop panel for LXDE"
 HOMEPAGE="http://lxde.org/"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+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 ~x86-linux"
 SLOT="0"
-IUSE="+alsa"
+IUSE="+alsa wifi"
 RESTRICT="test"  # bug 249598
 
 RDEPEND="x11-libs/gtk+:2
@@ -21,24 +21,30 @@ RDEPEND="x11-libs/gtk+:2
 	x11-libs/libXpm
 	lxde-base/lxmenu-data
 	lxde-base/menu-cache
-	alsa? ( media-libs/alsa-lib )"
+	alsa? ( media-libs/alsa-lib )
+	wifi? ( net-wireless/wireless-tools )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	sys-devel/gettext"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.5.1-sandbox.patch
-	epatch "${FILESDIR}"/${PN}-0.5.6-broken-apps.patch
-	epatch "${FILESDIR}"/${P}-requisition.patch
-	epatch "${FILESDIR}"/${P}-tooltip-netstatus.patch
+	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=all
+	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}
+	econf $(use_enable alsa) --with-x --with-plugins="${plugins}"
 	# the gtk+ dep already pulls in libX11, so we might as well hardcode with-x
 }
 
diff --git a/lxde-base/lxpanel/lxpanel-0.5.6.ebuild b/lxde-base/lxpanel/lxpanel-0.5.6.ebuild
deleted file mode 100644
index 51f8f7004fc7..000000000000
--- a/lxde-base/lxpanel/lxpanel-0.5.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/lxpanel-0.5.6.ebuild,v 1.10 2012/05/04 05:50:38 jdhore Exp $
-
-EAPI="2"
-inherit eutils autotools
-
-DESCRIPTION="Lightweight X11 desktop panel for LXDE"
-HOMEPAGE="http://lxde.org/"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ppc x86 ~x86-interix ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="+alsa"
-RESTRICT="test"  # bug 249598
-
-RDEPEND="x11-libs/gtk+:2
-	x11-libs/libXmu
-	x11-libs/libXpm
-	lxde-base/lxmenu-data
-	lxde-base/menu-cache
-	alsa? ( media-libs/alsa-lib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.5.1-sandbox.patch
-	epatch "${FILESDIR}"/${P}-symbol-alarm.patch
-	epatch "${FILESDIR}"/${P}-broken-apps.patch
-	eautoreconf
-}
-
-src_configure() {
-	local plugins=all
-	[[ ${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 || die "emake install failed"
-	dodoc AUTHORS ChangeLog README || die "dodoc failed"
-
-	# Get rid of the .la files.
-	find "${D}" -name '*.la' -delete
-}
-
-pkg_postinst() {
-	elog "If you have problems with broken icons shown in the main panel,"
-	elog "you will have to configure panel settings via its menu."
-	elog "This will not be an issue with first time installations."
-}
diff --git a/lxde-base/lxpanel/lxpanel-0.5.8-r1.ebuild b/lxde-base/lxpanel/lxpanel-0.5.8-r1.ebuild
deleted file mode 100644
index 60d33510eb3c..000000000000
--- a/lxde-base/lxpanel/lxpanel-0.5.8-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/lxpanel-0.5.8-r1.ebuild,v 1.2 2012/05/04 05:50:38 jdhore Exp $
-
-EAPI="4"
-
-inherit autotools eutils
-
-DESCRIPTION="Lightweight X11 desktop panel for LXDE"
-HOMEPAGE="http://lxde.org/"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="+alsa"
-RESTRICT="test"  # bug 249598
-
-RDEPEND="x11-libs/gtk+:2
-	x11-libs/libXmu
-	x11-libs/libXpm
-	lxde-base/lxmenu-data
-	lxde-base/menu-cache
-	alsa? ( media-libs/alsa-lib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.5.1-sandbox.patch
-	epatch "${FILESDIR}"/${PN}-0.5.6-broken-apps.patch
-	epatch "${FILESDIR}"/${P}-battery-meter.patch
-	eautoreconf
-}
-
-src_configure() {
-	local plugins=all
-	[[ ${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
-}
-
-pkg_postinst() {
-	elog "If you have problems with broken icons shown in the main panel,"
-	elog "you will have to configure panel settings via its menu."
-	elog "This will not be an issue with first time installations."
-}
diff --git a/lxde-base/lxpanel/lxpanel-0.5.8-r2.ebuild b/lxde-base/lxpanel/lxpanel-0.5.8-r2.ebuild
deleted file mode 100644
index a8ee07891a2f..000000000000
--- a/lxde-base/lxpanel/lxpanel-0.5.8-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/lxpanel-0.5.8-r2.ebuild,v 1.2 2012/05/04 05:50:38 jdhore Exp $
-
-EAPI="4"
-
-inherit autotools eutils
-
-DESCRIPTION="Lightweight X11 desktop panel for LXDE"
-HOMEPAGE="http://lxde.org/"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="+alsa"
-RESTRICT="test"  # bug 249598
-
-RDEPEND="x11-libs/gtk+:2
-	x11-libs/libXmu
-	x11-libs/libXpm
-	lxde-base/lxmenu-data
-	lxde-base/menu-cache
-	alsa? ( media-libs/alsa-lib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.5.1-sandbox.patch
-	epatch "${FILESDIR}"/${PN}-0.5.6-broken-apps.patch
-	epatch "${FILESDIR}"/${P}-battery-meter.patch
-	epatch "${FILESDIR}"/${P}-thermal-plugin.patch
-	eautoreconf
-}
-
-src_configure() {
-	local plugins=all
-	[[ ${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
-}
-
-pkg_postinst() {
-	elog "If you have problems with broken icons shown in the main panel,"
-	elog "you will have to configure panel settings via its menu."
-	elog "This will not be an issue with first time installations."
-}