From 2784f8d91fface74df4652670813a47c9f22896b Mon Sep 17 00:00:00 2001 From: Romain Perier Date: Sun, 4 Apr 2010 10:32:32 +0000 Subject: [PATCH] Version bump. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- gnome-extra/indicator-applet/ChangeLog | 11 +- gnome-extra/indicator-applet/Manifest | 15 +-- ...0.3.6-fastuserswitchapplet-collision.patch | 109 ++++++++++++++++++ .../indicator-applet-0.3.6.ebuild | 45 ++++++++ 4 files changed, 167 insertions(+), 13 deletions(-) create mode 100644 gnome-extra/indicator-applet/files/indicator-applet-0.3.6-fastuserswitchapplet-collision.patch create mode 100644 gnome-extra/indicator-applet/indicator-applet-0.3.6.ebuild 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 + +indicator-applet-0.3.6.ebuild, + +files/indicator-applet-0.3.6-fastuserswitchapplet-collision.patch: + Version bump. 27 Sep 2009; Gilles Dartiguelongue indicator-applet-0.2.0.ebuild: diff --git a/gnome-extra/indicator-applet/Manifest b/gnome-extra/indicator-applet/Manifest index 89ace045b681..cc9488994502 100644 --- a/gnome-extra/indicator-applet/Manifest +++ b/gnome-extra/indicator-applet/Manifest @@ -1,16 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX indicator-applet-0.3.6-fastuserswitchapplet-collision.patch 4735 RMD160 e2c2e2cb8efd2059dadee2735e5f0dc4e9422fa0 SHA1 bc55c8ea453373efbc715a62f5e19dbd148ceb66 SHA256 00d8733c81b9bd6ca88358beebb790a9ddf308343d7f45ba4dac536315b2328b DIST indicator-applet-0.1.6.tar.gz 430722 RMD160 11fa2b8da25cd858ec8fad04b03e220ad1c810e1 SHA1 c3a5f7ce69a6fe141e157a4e82b77b173a2caed8 SHA256 73721c8589350fab99d586d89aba3e04e8b836058094db4a86fa95fe28149595 DIST indicator-applet-0.2.0.tar.gz 340154 RMD160 aa1b74afca141dc2a74c1d63e182d3f7850df8c8 SHA1 2c084ffc3d36c7c0f4a6a02794599c347a2f1ab4 SHA256 0afe351d1944bde41e092a545a80715b6857f431cc8acc2eb5a7fbb1429d1422 +DIST indicator-applet-0.3.6.tar.gz 343348 RMD160 7e62d48bffc9732b9bc0496b88c8772facba2e90 SHA1 a1fceb7b820c835f2ac0011b2ef0ed4fede95827 SHA256 840fd2ab6fd75271701582fa1ce79179cb34fb2f7fa1f0eeb68e049ac6b16b94 EBUILD indicator-applet-0.1.6.ebuild 933 RMD160 671c58ded040bd763e1e335d426c8fd0fa64709a SHA1 efd53525406cd6238467fe21920a2753ce4a8b60 SHA256 734b863802b027899671331b6f0636d7313cf3cd66e3bef5f007c8d1711db150 EBUILD indicator-applet-0.2.0.ebuild 1169 RMD160 94c71b99d7981fb42d6dec9e45edc42d11029965 SHA1 d0fba89d43974d77b7dc820caac2176b3f759a96 SHA256 e7b9ee41f7ee1a56de1c5bb27de67b8a35a6dcbef3082587a0d684716e3d3913 -MISC ChangeLog 670 RMD160 f7353f93af3e62c8ee3885d1976808afb422e093 SHA1 d52b8983248e402ab278b52c3752e95f75ea1c65 SHA256 0793dd6327f88445b1f6704c41786721c02d43bb2c6bc92985bc8e7ee0f186b6 +EBUILD indicator-applet-0.3.6.ebuild 1286 RMD160 edeec598c370981ed692d07888d13c219b7a3f27 SHA1 60ddbe82354594718441c791b82306fe075c8689 SHA256 fee64fe3adb65e5ee15007a5a974ffe82833002b0b173dc46c10924a2a227cf7 +MISC ChangeLog 884 RMD160 e00afc9dda0a9fcddde92312ef2641cf0f37406d SHA1 f88d4a6ff8142dc7c43e2e95f7ebeef35a22f70b SHA256 3f47752f97f583e3336abba474289f22a84bf0ccffd71b85ccb04cf3748ed4a8 MISC metadata.xml 160 RMD160 2b0d347221b384d4765ecdcccefbc74b0ae502ef SHA1 ae1b892a3e72888c5b66b520f15f740576f607ec SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAkq/8zAACgkQ1fmVwcYIWAYfzgCgmlQkjLzyVpb8tX3Tbv0GcHU3 -OowAniD6bM9KnAr3T/mbL7uy236rwRxV -=XM4j ------END PGP SIGNATURE----- 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 +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 @@ +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +--- /dev/null ++++ b/data/GNOME_IndicatorAppletSession.server.in.in +@@ -0,0 +1,28 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +--- 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 +} -- 2.26.2