Version bump

Package-Manager: portage-2.2.0_alpha46/cvs/Linux x86_64

6 files changed, 49 insertions, 125 deletions

diff --git a/lxde-base/lxpanel/ChangeLog b/lxde-base/lxpanel/ChangeLog
index 34edd3d86105..b0cb0718ddf0 100644
--- a/lxde-base/lxpanel/ChangeLog
+++ b/lxde-base/lxpanel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for lxde-base/lxpanel
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/ChangeLog,v 1.29 2011/03/07 20:31:34 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/ChangeLog,v 1.30 2011/07/26 22:34:58 hwoarang Exp $
+
+*lxpanel-0.5.7 (26 Jul 2011)
+
+  26 Jul 2011; Markos Chandras <hwoarang@gentoo.org> -lxpanel-0.5.3.ebuild,
+  -files/lxpanel-0.5.3-battery.patch, -lxpanel-0.5.4.1.ebuild,
+  -lxpanel-0.5.5.ebuild, +lxpanel-0.5.7.ebuild:
+  Version bump
 
   07 Mar 2011; Tobias Klausmann <klausman@gentoo.org> lxpanel-0.5.6.ebuild:
   Keyworded on alpha, bug #330911
diff --git a/lxde-base/lxpanel/Manifest b/lxde-base/lxpanel/Manifest
index a207dbc13112..b4b9a3aedce4 100644
--- a/lxde-base/lxpanel/Manifest
+++ b/lxde-base/lxpanel/Manifest
@@ -1,14 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX lxpanel-0.5.1-sandbox.patch 833 RMD160 83957b8e65104c12c2220027faf24d846fe4b3b9 SHA1 24f5f2c737e56f5bc457fa49426c5115e9d15498 SHA256 1df1574a0faf8d02465f7673f7967b14b2d0bd33f8ac9c5769888ef6c4272489
-AUX lxpanel-0.5.3-battery.patch 347 RMD160 c39c2cff83876216b4876b050456a1efb179c8e0 SHA1 516be1c204212a28521a40c7df9b303d59e31481 SHA256 9b47b25cee0ef6c3fe7d9af11500db6d9e8821a0ddc53cae2f28d722501945e9
 AUX lxpanel-0.5.6-broken-apps.patch 567 RMD160 628f01083f7c06476394447aacdc6fa542359bab SHA1 23ae82f23458596e1bb356cf897e5310cb05c080 SHA256 0b914f680f2dbaafb3a4966a9795e3d154839cb910eca9f58bdf18d41901eb25
 AUX lxpanel-0.5.6-symbol-alarm.patch 1461 RMD160 5ed09d071a349b7554400ea73d16f6aacdc4ad8d SHA1 6b111b32eb1ae9ee869df8ff0ac4c23b8ccbfbb8 SHA256 afafb59ea3e537147ff4d81feb5ec2a3a18eaa628f992c5a44321fa29b85e6af
-DIST lxpanel-0.5.3.tar.gz 929896 RMD160 1ecd5d0d004a1965e0ecdd95531d3743785f8825 SHA1 1ef57049b7d6f699178a6796afb19fec86c107f0 SHA256 69976816ac4ebee8c7dc56df322701e1de9f90ac558a702c12eb3f2e37563ebe
-DIST lxpanel-0.5.4.1.tar.gz 1020003 RMD160 1cd7351fc8add3b7b7336dca4eebbee8f79b9c19 SHA1 c0130528b21e6be22b24eeeb4a525df0c52b2447 SHA256 c0fae92a71f44e0379de4b0f48696756591be2a4688615e877da8bde12889ed9
-DIST lxpanel-0.5.5.tar.gz 1056736 RMD160 18988b6dc8a4dcf476559064aba61480f8143990 SHA1 f3354f13f926226742b65c406988ba7c97009d79 SHA256 729c3dc52e343fe15dfde40475875c2b3670b3b37958c6c1e4c936242cdc2e9b
 DIST lxpanel-0.5.6.tar.gz 1074786 RMD160 5e5ebdd185d06fe0d1965ec2ed12ffecf0984b7e SHA1 fc5483e6016ac52c38b38274cca7661f2aa828ab SHA256 9c04839e2d23feec8b107a1d76899aca645416862b4b6ca01f8db743944348e1
-EBUILD lxpanel-0.5.3.ebuild 1173 RMD160 c201d345299f59587beccf3aa0318599206a4227 SHA1 0358b53d465662fc95842828e88421e9f6fc1b7a SHA256 92f8409e0b2fb6b1fdf37b6435d8cbe5100482fda21a7b092077cbfb6e884297
-EBUILD lxpanel-0.5.4.1.ebuild 1145 RMD160 5804481d311d7659e50d062468f6c1bc91ccf0f8 SHA1 c69950e14acf0a21bc0ab11c4a3c07e7ee3c6035 SHA256 c24bc187d04570f3a75f753fd43e6df762eb2532fdc1bda6d057ebbfbc4832a1
-EBUILD lxpanel-0.5.5.ebuild 1167 RMD160 6d866e255385610cc2ad58e859e6699d8d831f4b SHA1 42024f5aea108f732efa83e0d067683475bbb30c SHA256 339fddae5296096ef9f33f48037388ad7465f52745ae0826add6003d31da294e
+DIST lxpanel-0.5.7.tar.gz 1166355 RMD160 489dc9515ab0f6bac5136a0c4c93fbcb26f48e97 SHA1 276168fb4560899e83a6a340448c961d63333717 SHA256 89d1b55b207e61b7b7433cb51302bdbee644fb78b5b57892d67cb19072f548a1
 EBUILD lxpanel-0.5.6.ebuild 1552 RMD160 cf840c62da5defd98dc1351c4b64b155671de0de SHA1 9b9e3f01b902e84dfbcbb1d347b693fbad4858e7 SHA256 ca22d268d0bc7a9acfdd0a1302f2e54cd6000d5b08baa9ad825318251e478fec
-MISC ChangeLog 4027 RMD160 f0af14a98afe6cd8f88e559ca77ccb9a6b36c3f1 SHA1 1bac01d192891582728f0f4b4d8a7678bf6d459b SHA256 e83b6fa92c86d8d3a0902dbb250d9ce6a9e28d8db10d3c08cd0afb84ca5d3309
+EBUILD lxpanel-0.5.7.ebuild 1466 RMD160 c6d4d9b6b5a2e04adcf3643badcee13835c2452f SHA1 6ad3077f504d8c01210bed8b59fe05410629e8e9 SHA256 d3dd4bee67d9cf8fe35ba28959ab9012f2990cb798fb5f8aa8b58fe561ae6e4c
+MISC ChangeLog 4260 RMD160 ccf597daaf79c8234673856190fe7006ad3d1a51 SHA1 ee3b7fffb360142de64333b93584a343bcaf2e0e SHA256 8e2219b0191cacd4b234da3046daca0dc7903500a629ad6e99402c69395891e8
 MISC metadata.xml 159 RMD160 35036c133a5c9c7edccc3cdfed5789092f884048 SHA1 bdf1b7cc6ffbdd223b6f05aa072e857dfc981c4f SHA256 09574ccad15f69d5367ecbb1a491cd636fb88582f69987d2ec217109dfe8befb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJOL0EQAAoJEPqDWhW0r/LCraMQAJ7RYI/jIl6MF85QZr2i0Bus
+VnGsCXehJlAd48kj8+OdutIDD0JTL/SF/w04VYUEwb4JWiAdWhyoRj25CNnjJYqf
+2pfc4cx7vVpJuJsm3PjeBVuXTGbAGfIwVF6U/5M3V5kcx1lzFdjmezqILUcaTR3s
+Z92L+D7nxtImuoSNHXIZyCgCQGqmMOX/+oAzel2EvA8jp/kuSNGjZFYypOw54xJT
+NqN9Zu6DUIKLjc5SJPw223wKCScsR4J+cDDJ08U/pQRUv4LfsuAtHWafRepWcCys
+RdZ25uWZQPLw7Z8EoX2xhovodjbhLYS5bf2VKjfmGkYwVHLXOEMLo9fco5FGBEJU
+xIZ/pPPcgbiqthiVOfTo0BuxVTwF9kT+yGYp9vnIg6duYcQ0fOn8yEeFB1d+0Ws0
+YVnd6kyo0hAH4JDq/u/03hqcGw/LUsXoJaj6bs6PdZEOGr8byTgBA9bJhmObnWXV
+U/zdEa3h2EstzYtabkz3Kp+S7jUTHhilfsx7boU/CPhInyaswc1cgxhOeD1vJjEF
+jL0Fae+vIRnOTEjzoQBuXhGNV5rJTusTnXgBoDV6DApyTuvLZvXLRqsuiAi8F8Nq
+cH2yRcZ5CWs+CdDBvbrE8H/gYeM2jNEGN01Ej5JaxixJfIcsUKtJqiaZbvdxNsgJ
+6G34S4Vo5t8nAsSsVN+1
+=soHc
+-----END PGP SIGNATURE-----
diff --git a/lxde-base/lxpanel/files/lxpanel-0.5.3-battery.patch b/lxde-base/lxpanel/files/lxpanel-0.5.3-battery.patch
deleted file mode 100644
index 1e6ad47e0dcd..000000000000
--- a/lxde-base/lxpanel/files/lxpanel-0.5.3-battery.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- trunk/lxpanel/src/plugins/batt/batt_sys.c	2009/06/16 22:09:10	1617
-+++ trunk/lxpanel/src/plugins/batt/batt_sys.c	2009/08/19 07:40:45	1950
-@@ -271,8 +271,10 @@
- 	if ( b->type_battery == TRUE ) 
- 	    break;
- 	/* ignore non-batteries */
--	else 			
-+	else { 			
- 	    g_free(b);
-+	    b = NULL;
-+	}
-     }
-     g_dir_close( dir );
-     return b;
diff --git a/lxde-base/lxpanel/lxpanel-0.5.3.ebuild b/lxde-base/lxpanel/lxpanel-0.5.3.ebuild
deleted file mode 100644
index c912aef33c27..000000000000
--- a/lxde-base/lxpanel/lxpanel-0.5.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/lxpanel-0.5.3.ebuild,v 1.5 2010/01/16 00:59:59 abcd Exp $
-
-EAPI="2"
-inherit eutils autotools
-
-DESCRIPTION="Lightweight X11 desktop panel for LXDE"
-HOMEPAGE="http://lxde.sf.net/"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86 ~x86-interix ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="+X +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 )
-	X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.5.1-sandbox.patch
-	epatch "${FILESDIR}"/${P}-battery.patch
-	eautoreconf
-}
-
-src_configure() {
-	local plugins=all
-
-	[[ ${CHOST} == *-interix* ]] && plugins=deskno,kbled,xkb
-
-	econf $(use_enable alsa) \
-		$(use_with X x) \
-		--with-plugins="${plugins}"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README || die "dodoc failed"
-}
diff --git a/lxde-base/lxpanel/lxpanel-0.5.4.1.ebuild b/lxde-base/lxpanel/lxpanel-0.5.4.1.ebuild
deleted file mode 100644
index 5f31344615f1..000000000000
--- a/lxde-base/lxpanel/lxpanel-0.5.4.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/lxpanel-0.5.4.1.ebuild,v 1.2 2010/01/24 18:35:28 armin76 Exp $
-
-EAPI="2"
-inherit eutils autotools
-
-DESCRIPTION="Lightweight X11 desktop panel for LXDE"
-HOMEPAGE="http://lxde.sf.net/"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="+X +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 )
-	X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.5.1-sandbox.patch
-	eautoreconf
-}
-
-src_configure() {
-	local plugins=all
-
-	[[ ${CHOST} == *-interix* ]] && plugins=deskno,kbled,xkb
-
-	econf $(use_enable alsa) \
-		$(use_with X x) \
-		--with-plugins="${plugins}"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README || die "dodoc failed"
-}
diff --git a/lxde-base/lxpanel/lxpanel-0.5.5.ebuild b/lxde-base/lxpanel/lxpanel-0.5.7.ebuild
index efdbbcd87bd7..32e9f64db036 100644
--- a/lxde-base/lxpanel/lxpanel-0.5.5.ebuild
+++ b/lxde-base/lxpanel/lxpanel-0.5.7.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/lxpanel-0.5.5.ebuild,v 1.5 2010/02/28 18:35:47 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/lxpanel-0.5.7.ebuild,v 1.1 2011/07/26 22:34:58 hwoarang Exp $
 
-EAPI="2"
-inherit eutils autotools
+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="amd64 arm ppc x86 ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="+alsa"
 RESTRICT="test"  # bug 249598
@@ -27,6 +28,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.5.1-sandbox.patch
+	epatch "${FILESDIR}"/${PN}-0.5.6-broken-apps.patch
 	eautoreconf
 }
 
@@ -39,6 +41,15 @@ src_configure() {
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README || die "dodoc failed"
+	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."
 }