Clean up old revisions. Update libbonobo dependency per bug #254872.

(Portage version: 2.2_rc23/cvs/Linux x86_64)

7 files changed, 15 insertions, 254 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index ba693fa14d0e..99a62ca378a6 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-panel
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.266 2009/01/26 22:48:27 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.267 2009/02/01 11:08:16 eva Exp $
+
+  01 Feb 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-panel-2.20.3.ebuild, -gnome-panel-2.24.1.ebuild,
+  -gnome-panel-2.24.1-r1.ebuild, -gnome-panel-2.24.2.ebuild,
+  gnome-panel-2.24.2-r1.ebuild, gnome-panel-2.24.3.ebuild:
+  Clean up old revisions. Update libbonobo dependency per bug #254872.
 
 *gnome-panel-2.24.3 (26 Jan 2009)
 
diff --git a/gnome-base/gnome-panel/gnome-panel-2.20.3.ebuild b/gnome-base/gnome-panel/gnome-panel-2.20.3.ebuild
index 500570d7c9ae..e0c6738aeb46 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.20.3.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.20.3.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.20.3.ebuild,v 1.9 2008/04/20 01:36:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.20.3.ebuild,v 1.10 2009/02/01 11:08:16 eva Exp $
 
-inherit autotools eutils gnome2
+inherit eutils gnome2
 
 DESCRIPTION="The GNOME panel"
 HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2 FDL-1.1 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="arm sh"
 IUSE="doc eds"
 
 RDEPEND=">=gnome-base/gnome-desktop-2.12
diff --git a/gnome-base/gnome-panel/gnome-panel-2.24.1-r1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.24.1-r1.ebuild
deleted file mode 100644
index 6cadd4d1e0eb..000000000000
--- a/gnome-base/gnome-panel/gnome-panel-2.24.1-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.24.1-r1.ebuild,v 1.2 2008/11/24 15:06:40 leio Exp $
-
-inherit autotools gnome2
-
-DESCRIPTION="The GNOME panel"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc eds networkmanager"
-
-RDEPEND=">=gnome-base/gnome-desktop-2.12
-	>=x11-libs/pango-1.15.4
-	>=dev-libs/glib-2.16.0
-	>=x11-libs/gtk+-2.13.1
-	>=dev-libs/libgweather-2.24.1
-	dev-libs/libxml2
-	>=gnome-base/libglade-2.5
-	>=gnome-base/libgnome-2.13
-	>=gnome-base/libgnomeui-2.5.4
-	>=gnome-base/libbonoboui-2.1.1
-	>=gnome-base/orbit-2.4
-	>=x11-libs/libwnck-2.19.5
-	>=gnome-base/gconf-2.6.1
-	>=gnome-base/gnome-menus-2.11.1
-	>=gnome-base/libbonobo-2
-	gnome-base/librsvg
-	>=dev-libs/dbus-glib-0.71
-	>=sys-apps/dbus-1.1.2
-	x11-libs/libXau
-	>=x11-libs/cairo-1.0.0
-	eds? ( >=gnome-extra/evolution-data-server-1.6 )
-	networkmanager? ( >=net-misc/networkmanager-0.6 )"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.3.2
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	~app-text/docbook-xml-dtd-4.1.2
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--disable-schemas-install
-		--with-in-process-applets=clock,notification-area,wncklet
-		--disable-polkit
-		$(use_enable networkmanager network-manager)
-		$(use_enable eds)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Allow logout/shutdown without gnome-session 2.24, bug #246170
-	epatch "${FILESDIR}/${PN}-2.24.1-logout.patch.gz"
-	# Could time-consumingly forward-port translations from 2.22 instead if there are any
-	echo "gnome-panel/panel-logout.c" >> po/POTFILES.skip
-
-	eautomake
-}
-
-pkg_postinst() {
-	local entries="${ROOT}etc/gconf/schemas/panel-default-setup.entries"
-	local gconftool="${ROOT}usr/bin/gconftool-2"
-
-	if [ -e "$entries" ]; then
-		einfo "setting panel gconf defaults..."
-
-		GCONF_CONFIG_SOURCE="$("${gconftool}" --get-default-source | sed "s;:/;:${ROOT};")"
-
-		"${gconftool}" --direct --config-source \
-			"${GCONF_CONFIG_SOURCE}" --load="${entries}"
-	fi
-
-	# Calling this late so it doesn't process the GConf schemas file we already
-	# took care of.
-	gnome2_pkg_postinst
-}
diff --git a/gnome-base/gnome-panel/gnome-panel-2.24.1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.24.1.ebuild
deleted file mode 100644
index 69055a311586..000000000000
--- a/gnome-base/gnome-panel/gnome-panel-2.24.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.24.1.ebuild,v 1.1 2008/11/06 23:44:11 eva Exp $
-
-inherit gnome2
-
-DESCRIPTION="The GNOME panel"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc eds networkmanager"
-
-RDEPEND=">=gnome-base/gnome-desktop-2.12
-	>=x11-libs/pango-1.15.4
-	>=dev-libs/glib-2.16.0
-	>=x11-libs/gtk+-2.13.1
-	>=dev-libs/libgweather-2.24.1
-	dev-libs/libxml2
-	>=gnome-base/libglade-2.5
-	>=gnome-base/libgnome-2.13
-	>=gnome-base/libgnomeui-2.5.4
-	>=gnome-base/libbonoboui-2.1.1
-	>=gnome-base/orbit-2.4
-	>=x11-libs/libwnck-2.19.5
-	>=gnome-base/gconf-2.6.1
-	>=gnome-base/gnome-menus-2.11.1
-	>=gnome-base/libbonobo-2
-	gnome-base/librsvg
-	>=dev-libs/dbus-glib-0.71
-	>=sys-apps/dbus-1.1.2
-	x11-libs/libXau
-	>=x11-libs/cairo-1.0.0
-	eds? ( >=gnome-extra/evolution-data-server-1.6 )
-	networkmanager? ( >=net-misc/networkmanager-0.6 )"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.3.2
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	~app-text/docbook-xml-dtd-4.1.2
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--disable-schemas-install
-		--with-in-process-applets=clock,notification-area,wncklet
-		--disable-polkit
-		$(use_enable networkmanager network-manager)
-		$(use_enable eds)"
-}
-
-pkg_postinst() {
-	local entries="${ROOT}etc/gconf/schemas/panel-default-setup.entries"
-	local gconftool="${ROOT}usr/bin/gconftool-2"
-
-	if [ -e "$entries" ]; then
-		einfo "setting panel gconf defaults..."
-
-		GCONF_CONFIG_SOURCE="$("${gconftool}" --get-default-source | sed "s;:/;:${ROOT};")"
-
-		"${gconftool}" --direct --config-source \
-			"${GCONF_CONFIG_SOURCE}" --load="${entries}"
-	fi
-
-	# Calling this late so it doesn't process the GConf schemas file we already
-	# took care of.
-	gnome2_pkg_postinst
-}
diff --git a/gnome-base/gnome-panel/gnome-panel-2.24.2-r1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.24.2-r1.ebuild
index 59b8bc7c05a0..aa5a0667e1b2 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.24.2-r1.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.24.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.24.2-r1.ebuild,v 1.2 2009/01/24 11:20:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.24.2-r1.ebuild,v 1.3 2009/02/01 11:08:16 eva Exp $
 
 GCONF_DEBUG="no"
 
@@ -30,7 +30,7 @@ RDEPEND=">=gnome-base/gnome-desktop-2.12
 	>=x11-libs/libwnck-2.19.5
 	>=gnome-base/gconf-2.6.1
 	>=gnome-base/gnome-menus-2.11.1
-	>=gnome-base/libbonobo-2
+	>=gnome-base/libbonobo-2.20.4
 	gnome-base/librsvg
 	>=dev-libs/dbus-glib-0.71
 	>=sys-apps/dbus-1.1.2
diff --git a/gnome-base/gnome-panel/gnome-panel-2.24.2.ebuild b/gnome-base/gnome-panel/gnome-panel-2.24.2.ebuild
deleted file mode 100644
index c747df3c62f7..000000000000
--- a/gnome-base/gnome-panel/gnome-panel-2.24.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.24.2.ebuild,v 1.1 2008/12/21 22:43:22 eva Exp $
-
-GCONF_DEBUG="no"
-
-inherit autotools gnome2
-
-DESCRIPTION="The GNOME panel"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${PN}-2.24.1-logout+po.tar.bz2"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc eds networkmanager"
-
-RDEPEND=">=gnome-base/gnome-desktop-2.12
-	>=x11-libs/pango-1.15.4
-	>=dev-libs/glib-2.16.0
-	>=x11-libs/gtk+-2.13.1
-	>=dev-libs/libgweather-2.24.1
-	dev-libs/libxml2
-	>=gnome-base/libglade-2.5
-	>=gnome-base/libgnome-2.13
-	>=gnome-base/libgnomeui-2.5.4
-	>=gnome-base/libbonoboui-2.1.1
-	>=gnome-base/orbit-2.4
-	>=x11-libs/libwnck-2.19.5
-	>=gnome-base/gconf-2.6.1
-	>=gnome-base/gnome-menus-2.11.1
-	>=gnome-base/libbonobo-2
-	gnome-base/librsvg
-	>=dev-libs/dbus-glib-0.71
-	>=sys-apps/dbus-1.1.2
-	x11-libs/libXau
-	>=x11-libs/cairo-1.0.0
-	eds? ( >=gnome-extra/evolution-data-server-1.6 )
-	networkmanager? ( >=net-misc/networkmanager-0.6 )"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.3.2
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	~app-text/docbook-xml-dtd-4.1.2
-	>=dev-util/gtk-doc-am-1
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--disable-schemas-install
-		--with-in-process-applets=clock,notification-area,wncklet
-		--disable-polkit
-		$(use_enable networkmanager network-manager)
-		$(use_enable eds)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Allow logout/shutdown without gnome-session 2.24, bug #246170
-	epatch "${WORKDIR}/${PN}-2.24.1-logout.patch"
-	epatch "${WORKDIR}/${PN}-2.24.1-po.patch"
-
-	eautomake
-}
-
-pkg_postinst() {
-	local entries="${ROOT}etc/gconf/schemas/panel-default-setup.entries"
-	local gconftool="${ROOT}usr/bin/gconftool-2"
-
-	if [ -e "$entries" ]; then
-		einfo "setting panel gconf defaults..."
-
-		GCONF_CONFIG_SOURCE="$("${gconftool}" --get-default-source | sed "s;:/;:${ROOT};")"
-
-		"${gconftool}" --direct --config-source \
-			"${GCONF_CONFIG_SOURCE}" --load="${entries}"
-	fi
-
-	# Calling this late so it doesn't process the GConf schemas file we already
-	# took care of.
-	gnome2_pkg_postinst
-}
diff --git a/gnome-base/gnome-panel/gnome-panel-2.24.3.ebuild b/gnome-base/gnome-panel/gnome-panel-2.24.3.ebuild
index 2293a3de8ffd..2576bc91ef29 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.24.3.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.24.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.24.3.ebuild,v 1.1 2009/01/26 22:48:27 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.24.3.ebuild,v 1.2 2009/02/01 11:08:16 eva Exp $
 
 GCONF_DEBUG="no"
 
@@ -31,7 +31,7 @@ RDEPEND=">=gnome-base/gnome-desktop-2.12
 	>=x11-libs/libwnck-2.19.5
 	>=gnome-base/gconf-2.6.1
 	>=gnome-base/gnome-menus-2.11.1
-	>=gnome-base/libbonobo-2
+	>=gnome-base/libbonobo-2.20.4
 	gnome-base/librsvg
 	>=dev-libs/dbus-glib-0.71
 	>=sys-apps/dbus-1.1.2