Roll out new revbump for new lxpanel

(Portage version: 2.1.10.65/cvs/Linux x86_64)

3 files changed, 13 insertions, 42 deletions

diff --git a/lxde-base/lxde-meta/ChangeLog b/lxde-base/lxde-meta/ChangeLog
index 92a4e109b5ed..412c800b9b83 100644
--- a/lxde-base/lxde-meta/ChangeLog
+++ b/lxde-base/lxde-meta/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for lxde-base/lxde-meta
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxde-meta/ChangeLog,v 1.43 2012/06/05 01:11:05 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxde-meta/ChangeLog,v 1.44 2012/06/21 17:36:26 hwoarang Exp $
+
+*lxde-meta-0.5.5-r2 (21 Jun 2012)
+
+  21 Jun 2012; Markos Chandras <hwoarang@gentoo.org> +lxde-meta-0.5.5-r2.ebuild,
+  -lxde-meta-0.5.0-r6.ebuild, -lxde-meta-0.5.0-r7.ebuild:
+  Roll out new revbump for new lxpanel
 
   05 Jun 2012; Michael Weber <xmw@gentoo.org> lxde-meta-0.5.5.ebuild:
   ppc stable (bug 385189)
diff --git a/lxde-base/lxde-meta/lxde-meta-0.5.0-r6.ebuild b/lxde-base/lxde-meta/lxde-meta-0.5.0-r6.ebuild
deleted file mode 100644
index e4b3c2b52204..000000000000
--- a/lxde-base/lxde-meta/lxde-meta-0.5.0-r6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxde-meta/lxde-meta-0.5.0-r6.ebuild,v 1.1 2011/06/17 17:44:39 hwoarang Exp $
-
-EAPI="2"
-
-DESCRIPTION="Meta ebuild for LXDE, the Lightweight X11 Desktop Environment"
-HOMEPAGE="http://lxde.sf.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ppc x86"
-IUSE=""
-
-RDEPEND="=lxde-base/lxappearance-0.5*
-	=lxde-base/lxde-icon-theme-0.0*
-	=lxde-base/lxde-common-0.5.0*
-	=lxde-base/lxmenu-data-0.1*
-	=lxde-base/lxinput-0.3*
-	=lxde-base/lxpanel-0.5.6*
-	=lxde-base/lxrandr-0.1*
-	>=lxde-base/lxsession-0.4.4
-	=lxde-base/lxsession-edit-0.1*
-	=lxde-base/lxshortcut-0.1*
-	=lxde-base/lxtask-0.1*
-	=lxde-base/lxterminal-0.1.9*
-	media-gfx/gpicview
-	x11-misc/pcmanfm
-	x11-wm/openbox
-	|| ( <=x11-misc/obconf-2.0.3-r1 >x11-misc/obconf-2.0.3-r1[lxde] )"
-
-pkg_postinst() {
-	elog "For your convenience you can review the LXDE Configuration HOWTO at"
-	elog "http://www.gentoo.org/proj/en/desktop/lxde/lxde-howto.xml"
-}
diff --git a/lxde-base/lxde-meta/lxde-meta-0.5.0-r7.ebuild b/lxde-base/lxde-meta/lxde-meta-0.5.5-r2.ebuild
index a946846d0e69..70f771a0f43d 100644
--- a/lxde-base/lxde-meta/lxde-meta-0.5.0-r7.ebuild
+++ b/lxde-base/lxde-meta/lxde-meta-0.5.5-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxde-meta/lxde-meta-0.5.0-r7.ebuild,v 1.2 2011/07/28 18:32:30 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxde-meta/lxde-meta-0.5.5-r2.ebuild,v 1.1 2012/06/21 17:36:26 hwoarang Exp $
 
 EAPI="2"
 
@@ -13,11 +13,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
 IUSE=""
 
 RDEPEND="=lxde-base/lxappearance-0.5*
-	=lxde-base/lxde-icon-theme-0.0*
-	=lxde-base/lxde-common-0.5.0*
+	=lxde-base/lxde-icon-theme-0.5*
+	=lxde-base/lxde-common-0.5.5*
 	=lxde-base/lxmenu-data-0.1*
 	=lxde-base/lxinput-0.3*
-	=lxde-base/lxpanel-0.5.7*
+	=lxde-base/lxpanel-0.5.10*
 	=lxde-base/lxrandr-0.1*
 	>=lxde-base/lxsession-0.4.6.1
 	=lxde-base/lxsession-edit-0.2*
@@ -27,7 +27,7 @@ RDEPEND="=lxde-base/lxappearance-0.5*
 	media-gfx/gpicview
 	x11-misc/pcmanfm
 	x11-wm/openbox
-	|| ( <=x11-misc/obconf-2.0.3-r1 >x11-misc/obconf-2.0.3-r1[lxde] )"
+	>=x11-misc/obconf-2.0.3_p20111019"
 
 pkg_postinst() {
 	elog "For your convenience you can review the LXDE Configuration HOWTO at"