Version bump.

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

3 files changed, 163 insertions, 2 deletions

diff --git a/gnome-extra/indicator-applet/ChangeLog b/gnome-extra/indicator-applet/ChangeLog
index dc89f7e435ad..1e026d198f3c 100644
--- a/gnome-extra/indicator-applet/ChangeLog
+++ b/gnome-extra/indicator-applet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/indicator-applet
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/indicator-applet/ChangeLog,v 1.3 2009/09/27 23:20:10 eva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/indicator-applet/ChangeLog,v 1.4 2010/04/04 10:32:32 mrpouet Exp $
+
+*indicator-applet-0.3.6 (04 Apr 2010)
+
+  04 Apr 2010; Romain Perier <mrpouet@gentoo.org>
+  +indicator-applet-0.3.6.ebuild,
+  +files/indicator-applet-0.3.6-fastuserswitchapplet-collision.patch:
+  Version bump.
 
   27 Sep 2009; Gilles Dartiguelongue <eva@gentoo.org>
   indicator-applet-0.2.0.ebuild:
diff --git a/gnome-extra/indicator-applet/files/indicator-applet-0.3.6-fastuserswitchapplet-collision.patch b/gnome-extra/indicator-applet/files/indicator-applet-0.3.6-fastuserswitchapplet-collision.patch
new file mode 100644
index 000000000000..8f617a839c28
--- /dev/null
+++ b/gnome-extra/indicator-applet/files/indicator-applet-0.3.6-fastuserswitchapplet-collision.patch
@@ -0,0 +1,109 @@
+From: Romain Perier <mrpouet@gentoo.org>
+Date: Sun, 4 Apr 2010 11:24:07 +0200
+Subject: Do not collide with GNOME_FastUserSwicthApplet.server
+
+This file is already installed by gdm, however it's also required by indicator-applet-session
+(gdm-user-switch-applet-like but a little different) that's why I renamed it properly.
+
+---
+ data/GNOME_FastUserSwitchApplet.server.in.in   |   28 ------------------------
+ data/GNOME_IndicatorAppletSession.server.in.in |   28 ++++++++++++++++++++++++
+ data/Makefile.am                               |    4 +-
+ src/applet-main.c                              |    2 +-
+ 4 files changed, 31 insertions(+), 31 deletions(-)
+ delete mode 100644 data/GNOME_FastUserSwitchApplet.server.in.in
+ create mode 100644 data/GNOME_IndicatorAppletSession.server.in.in
+
+--- a/data/GNOME_FastUserSwitchApplet.server.in.in
++++ /dev/null
+@@ -1,28 +0,0 @@
+-<oaf_info>
+-  <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet_Factory" type="exe"
+-              location="@LIBEXECDIR@/indicator-applet-session">
+-
+-    <oaf_attribute name="repo_ids" type="stringv">
+-      <item value="IDL:Bonobo/GenericFactory:1.0"/>
+-      <item value="IDL:Bonobo/Unknown:1.0"/>
+-    </oaf_attribute>
+-    <oaf_attribute name="name" type="string" value="Indicator Applet Factory"/>
+-    <oaf_attribute name="description" type="string" value="Indicator Applet Factory"/>
+-    <oaf_attribute name="bonobo:environment" type="stringv">
+-       <item value="DBUS_SESSION_BUS_ADDRESS"/>
+-    </oaf_attribute>
+-  </oaf_server>
+-
+-  <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet" type="factory"
+-              location="OAFIID:GNOME_FastUserSwitchApplet_Factory">
+-
+-    <oaf_attribute name="repo_ids" type="stringv">
+-      <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
+-      <item value="IDL:Bonobo/Control:1.0"/>
+-      <item value="IDL:Bonobo/Unknown:1.0"/>
+-    </oaf_attribute>
+-    <oaf_attribute name="name" type="string" _value="Indicator Applet Session"/>
+-    <oaf_attribute name="description" type="string" _value="A place to adjust your status, change users or exit your session."/>
+-    <oaf_attribute name="panel:icon" type="string" value="indicator-applet"/>
+-  </oaf_server>
+-</oaf_info>
+--- /dev/null
++++ b/data/GNOME_IndicatorAppletSession.server.in.in
+@@ -0,0 +1,28 @@
++<oaf_info>
++  <oaf_server iid="OAFIID:GNOME_IndicatorAppletSession_Factory" type="exe"
++              location="@LIBEXECDIR@/indicator-applet-session">
++
++    <oaf_attribute name="repo_ids" type="stringv">
++      <item value="IDL:Bonobo/GenericFactory:1.0"/>
++      <item value="IDL:Bonobo/Unknown:1.0"/>
++    </oaf_attribute>
++    <oaf_attribute name="name" type="string" value="Indicator Applet Factory"/>
++    <oaf_attribute name="description" type="string" value="Indicator Applet Factory"/>
++    <oaf_attribute name="bonobo:environment" type="stringv">
++       <item value="DBUS_SESSION_BUS_ADDRESS"/>
++    </oaf_attribute>
++  </oaf_server>
++
++  <oaf_server iid="OAFIID:GNOME_IndicatorAppletSession" type="factory"
++              location="OAFIID:GNOME_IndicatorAppletSession_Factory">
++
++    <oaf_attribute name="repo_ids" type="stringv">
++      <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
++      <item value="IDL:Bonobo/Control:1.0"/>
++      <item value="IDL:Bonobo/Unknown:1.0"/>
++    </oaf_attribute>
++    <oaf_attribute name="name" type="string" _value="Indicator Applet Session"/>
++    <oaf_attribute name="description" type="string" _value="A place to adjust your status, change users or exit your session."/>
++    <oaf_attribute name="panel:icon" type="string" value="indicator-applet"/>
++  </oaf_server>
++</oaf_info>
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -9,7 +9,7 @@ serverdir =					\
+ server_in_files =				\
+ 	GNOME_IndicatorApplet.server.in \
+ 	GNOME_IndicatorAppletComplete.server.in \
+-	GNOME_FastUserSwitchApplet.server.in
++	GNOME_IndicatorAppletSession.server.in
+ server_DATA =					\
+ 	$(server_in_files:.server.in=.server)
+ 
+@@ -70,7 +70,7 @@ EXTRA_DIST =					\
+ 	$(icons_DATA) \
+ 	GNOME_IndicatorApplet.server.in.in	\
+ 	GNOME_IndicatorAppletComplete.server.in.in	\
+-	GNOME_FastUserSwitchApplet.server.in.in	\
++	GNOME_IndicatorAppletSession.server.in.in	\
+ 	$(schema_in_files)
+ 
+ MAINTAINERCLEANFILES =				\
+--- a/src/applet-main.c
++++ b/src/applet-main.c
+@@ -63,7 +63,7 @@ PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_IndicatorApplet_Factory",
+                applet_fill_cb, NULL);
+ #endif
+ #ifdef INDICATOR_APPLET_SESSION
+-PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_FastUserSwitchApplet_Factory",
++PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_IndicatorAppletSession_Factory",
+                PANEL_TYPE_APPLET,
+                "indicator-applet-session", "0",
+                applet_fill_cb, NULL);
diff --git a/gnome-extra/indicator-applet/indicator-applet-0.3.6.ebuild b/gnome-extra/indicator-applet/indicator-applet-0.3.6.ebuild
new file mode 100644
index 000000000000..be3c28ea0f13
--- /dev/null
+++ b/gnome-extra/indicator-applet/indicator-applet-0.3.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/indicator-applet/indicator-applet-0.3.6.ebuild,v 1.1 2010/04/04 10:32:32 mrpouet Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2 versionator
+
+DESCRIPTION="A small applet to display information from various applications consistently in the panel"
+HOMEPAGE="http://launchpad.net/indicator-applet/"
+SRC_URI="http://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="nls"
+
+RDEPEND=">=dev-libs/glib-2.18:2
+	>=x11-libs/gtk+-2.12:2
+	>=dev-libs/dbus-glib-0.76
+	>=gnome-base/gnome-panel-2
+	>=gnome-base/gconf-2
+	>=dev-libs/libindicator-0.3.0"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( dev-util/intltool )"
+
+pkg_setup() {
+	G2CONF="$(use_enable nls)
+		--disable-dependency-tracking"
+	DOCS="AUTHORS"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Don't collide with gdm-user-switch-applet's bonobo file
+	# Note: in this dev-cycle src-session/ was dropped (on upstream)
+	# and is a part from src/ now, without copy paste
+	epatch "${FILESDIR}"/${P}-fastuserswitchapplet-collision.patch
+
+	# Note: there are no translations in po/
+	eautoreconf
+}