Version bump

(Portage version: 2.2.0_alpha46/cvs/Linux x86_64)

5 files changed, 26 insertions, 117 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/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."
 }