[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-panel/

[Nirbheek Chauhan]

commit:     55de4743274a1322320280a9ab3e9f0ddcbc2fb1
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 29 08:11:05 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 08:35:25 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=55de4743

gnome-base/gnome-panel: 2.91.92 → 2.91.93

* Holy mother of freeze break batman

---
 gnome-base/gnome-panel/gnome-panel-2.91.6.ebuild   |   80 --------------------
 ...l-2.91.92.ebuild => gnome-panel-2.91.93.ebuild} |    6 +-
 gnome-base/gnome-panel/gnome-panel-9999.ebuild     |    6 +-
 3 files changed, 10 insertions(+), 82 deletions(-)

diff --git a/gnome-base/gnome-panel/gnome-panel-2.91.6.ebuild b/gnome-base/gnome-panel/gnome-panel-2.91.6.ebuild
deleted file mode 100644
index 2e34ac2..0000000
--- a/gnome-base/gnome-panel/gnome-panel-2.91.6.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2011 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.32.1.ebuild,v 1.3 2011/01/15 19:54:59 nirbheek Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-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 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+bonobo doc eds +introspection networkmanager"
-
-RDEPEND=">=gnome-base/gnome-desktop-2.91:3
-	>=x11-libs/pango-1.15.4[introspection?]
-	>=dev-libs/glib-2.25.12:2
-	>=x11-libs/gtk+-2.99:3[introspection?]
-	x11-libs/gdk-pixbuf
-	>=dev-libs/libgweather-2.91:2
-	dev-libs/libxml2
-	>=gnome-base/gconf-2.6.1[introspection?]
-	>=media-libs/libcanberra-0.23[gtk3]
-	>=gnome-base/gnome-menus-2.27.92
-	gnome-base/librsvg
-	>=dev-libs/dbus-glib-0.80
-	>=sys-apps/dbus-1.1.2
-	>=x11-libs/cairo-1
-	x11-libs/libXau
-	>=x11-libs/libXrandr-1.2
-
-	>=x11-libs/libwnck-2.91
-	eds? ( >=gnome-extra/evolution-data-server-2.91.2 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	networkmanager? ( >=net-misc/networkmanager-0.6.7 )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	>=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 )"
-# eautoreconf needs
-#	gnome-base/gnome-common
-#	dev-util/gtk-doc-am
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-deprecation-flags
-		--disable-static
-		--disable-scrollkeeper
-		--disable-schemas-install
-		--with-in-process-applets=clock,notification-area,wncklet
-		$(use_enable networkmanager network-manager)
-		$(use_enable introspection)
-		$(use_enable eds)"
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-}
-
-pkg_postinst() {
-	local entries="${EROOT}etc/gconf/schemas/panel-default-setup.entries"
-	local gconftool="${EROOT}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.91.92.ebuild b/gnome-base/gnome-panel/gnome-panel-2.91.93.ebuild
similarity index 96%
rename from gnome-base/gnome-panel/gnome-panel-2.91.92.ebuild
rename to gnome-base/gnome-panel/gnome-panel-2.91.93.ebuild
index e645e6c..93d0c65 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.91.92.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.91.93.ebuild
@@ -29,13 +29,16 @@ RDEPEND=">=gnome-base/gnome-desktop-2.91:3
 	x11-libs/gdk-pixbuf:2
 	>=dev-libs/libgweather-2.91:2
 	dev-libs/libxml2:2
+	gnome-base/dconf
 	>=gnome-base/gconf-2.6.1:2[introspection?]
 	>=gnome-base/gnome-menus-2.27.92
-	gnome-base/librsvg
+	gnome-base/librsvg:2
 	>=dev-libs/dbus-glib-0.80
 	>=sys-apps/dbus-1.1.2
 	>=x11-libs/cairo-1
 	x11-libs/libXau
+	x11-libs/libICE
+	x11-libs/libSM
 	>=x11-libs/libXrandr-1.2
 	>=x11-libs/libwnck-2.91:3
 
@@ -59,6 +62,7 @@ pkg_setup() {
 		--disable-static
 		--disable-scrollkeeper
 		--disable-schemas-install
+		--disable-schemas-compile
 		--with-in-process-applets=clock,notification-area,wncklet
 		$(use_enable networkmanager network-manager)
 		$(use_enable introspection)

diff --git a/gnome-base/gnome-panel/gnome-panel-9999.ebuild b/gnome-base/gnome-panel/gnome-panel-9999.ebuild
index e645e6c..93d0c65 100644
--- a/gnome-base/gnome-panel/gnome-panel-9999.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-9999.ebuild
@@ -29,13 +29,16 @@ RDEPEND=">=gnome-base/gnome-desktop-2.91:3
 	x11-libs/gdk-pixbuf:2
 	>=dev-libs/libgweather-2.91:2
 	dev-libs/libxml2:2
+	gnome-base/dconf
 	>=gnome-base/gconf-2.6.1:2[introspection?]
 	>=gnome-base/gnome-menus-2.27.92
-	gnome-base/librsvg
+	gnome-base/librsvg:2
 	>=dev-libs/dbus-glib-0.80
 	>=sys-apps/dbus-1.1.2
 	>=x11-libs/cairo-1
 	x11-libs/libXau
+	x11-libs/libICE
+	x11-libs/libSM
 	>=x11-libs/libXrandr-1.2
 	>=x11-libs/libwnck-2.91:3
 
@@ -59,6 +62,7 @@ pkg_setup() {
 		--disable-static
 		--disable-scrollkeeper
 		--disable-schemas-install
+		--disable-schemas-compile
 		--with-in-process-applets=clock,notification-area,wncklet
 		$(use_enable networkmanager network-manager)
 		$(use_enable introspection)