Version bump, bug #328737.

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

3 files changed, 111 insertions, 1 deletions

diff --git a/gnome-extra/indicator-applet/ChangeLog b/gnome-extra/indicator-applet/ChangeLog
index 1e026d198f3c..d533b4f9ec4c 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-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 $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/indicator-applet/ChangeLog,v 1.5 2010/09/18 19:41:51 eva Exp $
+
+*indicator-applet-0.4.5 (18 Sep 2010)
+
+  18 Sep 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  +indicator-applet-0.4.5.ebuild,
+  +files/indicator-applet-0.4.5-fastuserswitchapplet-collision.patch:
+  Version bump, bug #328737.
 
 *indicator-applet-0.3.6 (04 Apr 2010)
 
diff --git a/gnome-extra/indicator-applet/files/indicator-applet-0.4.5-fastuserswitchapplet-collision.patch b/gnome-extra/indicator-applet/files/indicator-applet-0.4.5-fastuserswitchapplet-collision.patch
new file mode 100644
index 000000000000..921965a4c818
--- /dev/null
+++ b/gnome-extra/indicator-applet/files/indicator-applet-0.4.5-fastuserswitchapplet-collision.patch
@@ -0,0 +1,55 @@
+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_IndicatorAppletSession.server.in.in |    3 +-
+ data/Makefile.am                               |    2 +-
+ src/applet-main.c                              |    2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -10,7 +10,7 @@
+ 	GNOME_IndicatorApplet.server.in \
+ 	GNOME_IndicatorAppletComplete.server.in \
+ 	GNOME_IndicatorAppletAppmenu.server.in \
+-	GNOME_FastUserSwitchApplet.server.in
++	GNOME_IndicatorAppletSession.server.in
+ server_DATA =					\
+ 	$(server_in_files:.server.in=.server)
+ 
+--- 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);
+--- a/data/GNOME_IndicatorAppletSession.server.in.in	2010-09-18 21:30:33.000000000 +0200
++++ b/data/GNOME_IndicatorAppletSession.server.in.in	2010-09-18 21:31:29.000000000 +0200
+@@ -1,5 +1,5 @@
+ <oaf_info>
+-  <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet_Factory" type="exe"
++  <oaf_server iid="OAFIID:GNOME_IndicatorAppletSession_Factory" type="exe"
+               location="@LIBEXECDIR@/indicator-applet-session">
+ 
+     <oaf_attribute name="repo_ids" type="stringv">
+@@ -13,8 +13,8 @@
+     </oaf_attribute>
+   </oaf_server>
+ 
+-  <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet" type="factory"
+-              location="OAFIID:GNOME_FastUserSwitchApplet_Factory">
++  <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"/>
diff --git a/gnome-extra/indicator-applet/indicator-applet-0.4.5.ebuild b/gnome-extra/indicator-applet/indicator-applet-0.4.5.ebuild
new file mode 100644
index 000000000000..6fdbb2a77369
--- /dev/null
+++ b/gnome-extra/indicator-applet/indicator-applet-0.4.5.ebuild
@@ -0,0 +1,48 @@
+# 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.4.5.ebuild,v 1.1 2010/09/18 19:41:51 eva 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"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( >=dev-util/intltool-0.35 )"
+
+pkg_setup() {
+	G2CONF="${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
+	mv data/GNOME_{FastUserSwitchApplet,IndicatorAppletSession}.server.in.in \
+		|| die "Could not move file"
+	epatch "${FILESDIR}/${PN}-0.4.5-fastuserswitchapplet-collision.patch"
+
+	# Note: there are no translations in po/
+	eautoreconf
+}