Version bump for some rare crash fixes and translation updates

(Portage version: 2.1.3_rc9)

6 files changed, 12 insertions, 77 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index 985360d9cc4b..1c5add232fe9 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.219 2007/07/08 04:54:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.220 2007/07/25 00:59:48 leio Exp $
+
+*gnome-panel-2.18.3 (25 Jul 2007)
+
+  25 Jul 2007; Mart Raudsepp <leio@gentoo.org> -gnome-panel-2.16.1.ebuild,
+  -gnome-panel-2.18.1.ebuild, +gnome-panel-2.18.3.ebuild:
+  Version bump for some rare crash fixes and translation updates
 
   08 Jul 2007; Michael Sterrett <mr_bones_@gentoo.org>
   gnome-panel-2.16.1.ebuild, gnome-panel-2.16.2.ebuild,
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.16.1 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.16.1
deleted file mode 100644
index 30bdaa741b02..000000000000
--- a/gnome-base/gnome-panel/files/digest-gnome-panel-2.16.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d0131e0b33a63b17b22b4d78b00291f8 gnome-panel-2.16.1.tar.bz2 2689938
-RMD160 9cff06b11d65b905cab3582747da4e00c56f8029 gnome-panel-2.16.1.tar.bz2 2689938
-SHA256 711d7c19f0cacc5a0d0407065793c50dd7e3a154551602f4768df2da55743b23 gnome-panel-2.16.1.tar.bz2 2689938
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.18.1 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.18.1
deleted file mode 100644
index b0cc53d3aedb..000000000000
--- a/gnome-base/gnome-panel/files/digest-gnome-panel-2.18.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6c325f5b5f9f424faa494665720bcfb9 gnome-panel-2.18.1.tar.bz2 2713127
-RMD160 380a87bb366ed788110eea55803e33a3b519ca93 gnome-panel-2.18.1.tar.bz2 2713127
-SHA256 c04b53bcc0057ed042169baa725ed3769194864e5824643cc0af8c58cf773d2c gnome-panel-2.18.1.tar.bz2 2713127
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.18.3 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.18.3
new file mode 100644
index 000000000000..f415a7ed61a8
--- /dev/null
+++ b/gnome-base/gnome-panel/files/digest-gnome-panel-2.18.3
@@ -0,0 +1,3 @@
+MD5 545348de234fa8222e328fa7f3a5ba71 gnome-panel-2.18.3.tar.bz2 2722555
+RMD160 346c3e981de3af98632d43511545b1877cf9cb5e gnome-panel-2.18.3.tar.bz2 2722555
+SHA256 efb12148ace94612b47add4060dd9ae088b47e09e5c4c223f8ab7e1c7dcc9410 gnome-panel-2.18.3.tar.bz2 2722555
diff --git a/gnome-base/gnome-panel/gnome-panel-2.16.1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.16.1.ebuild
deleted file mode 100644
index 4cf2a5c6ff64..000000000000
--- a/gnome-base/gnome-panel/gnome-panel-2.16.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2007 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.16.1.ebuild,v 1.4 2007/07/08 04:54:05 mr_bones_ 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 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="doc eds"
-
-RDEPEND=">=gnome-base/gnome-desktop-2.11.92
-	>=x11-libs/gtk+-2.10
-	>=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
-	>=gnome-base/gnome-vfs-2.14.2
-	>=x11-libs/libwnck-2.13.5
-	>=gnome-base/gconf-2.6.1
-	>=gnome-base/gnome-menus-2.11.1
-	>=gnome-base/libbonobo-2
-	|| ( >=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-0.60 )
-	>=x11-libs/cairo-1.0.0
-	media-libs/libpng
-	eds? ( >=gnome-extra/evolution-data-server-1.6 )"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.3.2
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-	G2CONF="--disable-scrollkeeper $(use_enable eds)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# FIXME : uh yeah, this is nice
-	# We should patch in a switch here and send it upstream
-	sed -i 's:--load:-v:' ${S}/gnome-panel/Makefile.in || die "sed failed"
-}
-
-pkg_postinst() {
-	local entries="/etc/gconf/schemas/panel-default-setup.entries"
-	if [ -e "$entries" ]; then
-		einfo "setting panel gconf defaults..."
-		GCONF_CONFIG_SOURCE=`${ROOT}/usr/bin/gconftool-2 --get-default-source`
-		${ROOT}/usr/bin/gconftool-2 --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.18.1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.18.3.ebuild
index 829688a18a83..ce2732666b0e 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.18.1.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.18.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.18.1.ebuild,v 1.2 2007/07/08 04:54:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.18.3.ebuild,v 1.1 2007/07/25 00:59:48 leio Exp $
 
 inherit gnome2
 
@@ -24,10 +24,7 @@ RDEPEND=">=gnome-base/gnome-desktop-2.12
 	>=gnome-base/gconf-2.6.1
 	>=gnome-base/gnome-menus-2.11.1
 	>=gnome-base/libbonobo-2
-	||  (
-			>=dev-libs/dbus-glib-0.71
-			>=sys-apps/dbus-0.60
-		)
+	>=dev-libs/dbus-glib-0.71
 	x11-libs/libXau
 	media-libs/libpng
 	>=x11-libs/cairo-1.0.0