From 0cc0d7503ea73c810d2814db8b1572aa5a997102 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sat, 19 Nov 2011 18:34:47 +0000 Subject: [PATCH] old Package-Manager: portage-2.2.0_alpha73/cvs/Linux x86_64 --- gnome-extra/indicator-applet/ChangeLog | 10 +- gnome-extra/indicator-applet/Manifest | 26 ++--- ...0.3.6-fastuserswitchapplet-collision.patch | 109 ------------------ ...0.4.5-fastuserswitchapplet-collision.patch | 55 --------- .../indicator-applet-0.1.6.ebuild | 33 ------ .../indicator-applet-0.2.0.ebuild | 43 ------- .../indicator-applet-0.3.6.ebuild | 45 -------- .../indicator-applet-0.4.5.ebuild | 48 -------- 8 files changed, 17 insertions(+), 352 deletions(-) delete mode 100644 gnome-extra/indicator-applet/files/indicator-applet-0.3.6-fastuserswitchapplet-collision.patch delete mode 100644 gnome-extra/indicator-applet/files/indicator-applet-0.4.5-fastuserswitchapplet-collision.patch delete mode 100644 gnome-extra/indicator-applet/indicator-applet-0.1.6.ebuild delete mode 100644 gnome-extra/indicator-applet/indicator-applet-0.2.0.ebuild delete mode 100644 gnome-extra/indicator-applet/indicator-applet-0.3.6.ebuild delete mode 100644 gnome-extra/indicator-applet/indicator-applet-0.4.5.ebuild diff --git a/gnome-extra/indicator-applet/ChangeLog b/gnome-extra/indicator-applet/ChangeLog index 3c7dc53f32ff..58c1c3bf3a46 100644 --- a/gnome-extra/indicator-applet/ChangeLog +++ b/gnome-extra/indicator-applet/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for gnome-extra/indicator-applet # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/indicator-applet/ChangeLog,v 1.7 2011/11/19 18:33:59 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/indicator-applet/ChangeLog,v 1.8 2011/11/19 18:34:47 ssuominen Exp $ + + 19 Nov 2011; Samuli Suominen + -indicator-applet-0.1.6.ebuild, -indicator-applet-0.2.0.ebuild, + -indicator-applet-0.3.6.ebuild, + -files/indicator-applet-0.3.6-fastuserswitchapplet-collision.patch, + -indicator-applet-0.4.5.ebuild, + -files/indicator-applet-0.4.5-fastuserswitchapplet-collision.patch: + old *indicator-applet-0.4.12 (19 Nov 2011) diff --git a/gnome-extra/indicator-applet/Manifest b/gnome-extra/indicator-applet/Manifest index 1c068152b03f..fc2815272868 100644 --- a/gnome-extra/indicator-applet/Manifest +++ b/gnome-extra/indicator-applet/Manifest @@ -1,28 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX indicator-applet-0.3.6-fastuserswitchapplet-collision.patch 4735 RMD160 e2c2e2cb8efd2059dadee2735e5f0dc4e9422fa0 SHA1 bc55c8ea453373efbc715a62f5e19dbd148ceb66 SHA256 00d8733c81b9bd6ca88358beebb790a9ddf308343d7f45ba4dac536315b2328b -AUX indicator-applet-0.4.5-fastuserswitchapplet-collision.patch 2305 RMD160 84beac9fe42e164a91f8f7bc0fd44ae7b9268f52 SHA1 2322d7788b8e1e006fc24f8ec83e825857e6ff54 SHA256 21350e56d7dbcc407dc69d2bb8b2aec4c4baec59e7f7c44c5ef2e033762dc8a2 -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 DIST indicator-applet-0.4.12.tar.gz 434462 RMD160 d83c131a6e40f826473d2583a58b2c894fe03065 SHA1 716f74b633660b6b82c71080014e4bf1258e2e21 SHA256 c8cc28b1542850873a29c2270af944392c2938407929e01407029cfd0670771e -DIST indicator-applet-0.4.5.tar.gz 345146 RMD160 addc46308fb84cc7a85a5243d6c20df9fe8b5a60 SHA1 cefbec7462f680a4ac7e44f066dc0c63db87e184 SHA256 1388fc04dcd76ba949f12b2ce4262346acc74e994be9da317455fedb17cda808 -EBUILD indicator-applet-0.1.6.ebuild 969 RMD160 80bad6fe0a5ee3981542254ba1201130faac2926 SHA1 f130a6515d0c888d5c11b53cf9725b3a8147585a SHA256 0a99601923591c86cc6e6633b1e7985374ce688cb9216e98ac3f66bd981eb5e7 -EBUILD indicator-applet-0.2.0.ebuild 1211 RMD160 3f74ed946811a3dbaabbb3ac9d6356ea82b75d32 SHA1 f12002de994c89e4d64017f4890555f779bbca77 SHA256 366296e9a00e42633e28643e44029299efcffd1b395df4d007b46728a8ed4492 -EBUILD indicator-applet-0.3.6.ebuild 1324 RMD160 2a9b39578766f4f92da85ab5fa7f370cf38db530 SHA1 8c5849d01b73079deff4b2fa07fa580aad46904b SHA256 1ad9f5ca74601a12d822f01d0b50d96ecb125c0cbc2b9242da3b1368f61ab0e5 EBUILD indicator-applet-0.4.12.ebuild 989 RMD160 c4aa4b571fb5f1408a3129f38a759469b5446faa SHA1 5fec0464258dcb7d9d921bac15de2d779950ed67 SHA256 441d81ee7ac576482e61352e414997a49cd6be7f50203796dd72ebe50c919a5a -EBUILD indicator-applet-0.4.5.ebuild 1455 RMD160 23712dc4c4a2358e7f6fd0ca2fe625859aa16594 SHA1 a7888e03141cbe19c507ded921f80c725ca0c0b1 SHA256 89dfeaa292194e1aac02deecb40e89ce12161db78d03b25eb4778f14ebe459fb -MISC ChangeLog 1475 RMD160 212c24c8cd6ff5b99359e76c86d0e620add10d71 SHA1 5071e506d5f792750e4824395eb4d9b5c996dd03 SHA256 9d0619e50463f13b918fe6a79de02222b808beb354ab76cde0349f03558d1da4 +MISC ChangeLog 1810 RMD160 b23d57ecc4c0c2346eab8ad014e9d8fdcfd31079 SHA1 2f8b29ecd61751c5a871c9b5e194910884371d41 SHA256 5324b4ff3c622decf33f65a01fc96b716a2c472ec6beb810de2c801398e12c0b MISC metadata.xml 160 RMD160 2b0d347221b384d4765ecdcccefbc74b0ae502ef SHA1 ae1b892a3e72888c5b66b520f15f740576f607ec SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJOx/YzAAoJEEdUh39IaPFN/FYH/jBRNt3W56x8S/qbh+uKSYJ8 -QZJBzepVN+UsC3NvN8WHwyFVdH5ONlksNzTyV9Znd2433dXn09O6l04rD7l0oIfL -0jRnkl11ahMntp7VrIqfq0oxVJqOVEpRX4SlTqD1JxA0FXNtRLF7jYH+Et1K8xem -B70KiNHiU6C0Bd4I2R8QhIdl6UIYgq4maSQQelB/+SELTT04Y5mFgfG1iYwbItJv -mYvV12WDxEKqZ06kZEW0g6/ic0sycVHZ9lvCpAWlW+gYwKeqlJp4mULIMlsSlfin -SLZcIqkpp3OgEw2/xxfQ0lCfM0A81WZuF6ArTCFY5gqStS/nH8f1YPWdC8GSxBM= -=09Ca +iQEcBAEBAgAGBQJOx/ZjAAoJEEdUh39IaPFNiUAIAIrSyf2vwuXp8zZrXwC3eO3P +0d4l9mfPU7BcG0QV+Qzy30WiT6UQXdSsOQJpjE9Ja29ySrJMvjQKqTH/lCUIqVU0 ++WIGDECVLRGEVwUMxWh0+CPnY9oXgcpLt0Dpfqh0RLtPDlj+GX1ojSL+/UvvaLTR +f5sm4ZGYG6JuJIZEnWKSCgUVeeM+vMxv9zhewq9yrPOp9sQWyWHhYovWf2/Ofvn3 +gi+0QBDNjSLYDuul5mMVdy063mecMNWsQrVL6is9mVyI/vbPkOhxvu09KpVpe85N ++mPQLmsGHl/3JqkxfNUsqYzDKv5laiL9igz1nKJbY68JZIw3pV8U41MSmpbdr3k= +=Ma56 -----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 deleted file mode 100644 index 8f617a839c28..000000000000 --- a/gnome-extra/indicator-applet/files/indicator-applet-0.3.6-fastuserswitchapplet-collision.patch +++ /dev/null @@ -1,109 +0,0 @@ -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/files/indicator-applet-0.4.5-fastuserswitchapplet-collision.patch b/gnome-extra/indicator-applet/files/indicator-applet-0.4.5-fastuserswitchapplet-collision.patch deleted file mode 100644 index 921965a4c818..000000000000 --- a/gnome-extra/indicator-applet/files/indicator-applet-0.4.5-fastuserswitchapplet-collision.patch +++ /dev/null @@ -1,55 +0,0 @@ -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_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 @@ - -- - - -@@ -13,8 +13,8 @@ - - - -- -+ - - - diff --git a/gnome-extra/indicator-applet/indicator-applet-0.1.6.ebuild b/gnome-extra/indicator-applet/indicator-applet-0.1.6.ebuild deleted file mode 100644 index 8f5525c16514..000000000000 --- a/gnome-extra/indicator-applet/indicator-applet-0.1.6.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# 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.1.6.ebuild,v 1.3 2010/12/08 17:28:03 pacho Exp $ - -EAPI=2 -GCONF_DEBUG=no -inherit gnome2 - -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}/0.1/${PV}/+download/${P}.tar.gz" - -LICENSE="GPL-3 LGPL-2.1 LGPL-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[bonobo] =gnome-base/libgnomeui-2 - >=gnome-base/gconf-2" -DEPEND="${RDEPEND} - dev-util/pkgconfig - nls? ( dev-util/intltool )" - -pkg_setup() { - G2CONF="$(use_enable nls) - --disable-dependency-tracking - --disable-gobject-introspection" - DOCS="AUTHORS" -} diff --git a/gnome-extra/indicator-applet/indicator-applet-0.2.0.ebuild b/gnome-extra/indicator-applet/indicator-applet-0.2.0.ebuild deleted file mode 100644 index 809aee922485..000000000000 --- a/gnome-extra/indicator-applet/indicator-applet-0.2.0.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# 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.2.0.ebuild,v 1.4 2010/12/08 17:28:03 pacho Exp $ - -EAPI="2" -GCONF_DEBUG="no" - -inherit gnome2 - -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}/0.2/0.2/+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[bonobo] =gnome-base/libgnomeui-2 - >=gnome-base/gconf-2 - >=dev-libs/libindicator-0.1" -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 - - # Remove useless applet, bug #286143 - sed 's/src-session//' -i Makefile.am Makefile.in || die "sed failed" - sed 's/GNOME_FastUserSwitchApplet.server.in//' \ - -i data/Makefile.am data/Makefile.in || die "sed 2 failed" -} diff --git a/gnome-extra/indicator-applet/indicator-applet-0.3.6.ebuild b/gnome-extra/indicator-applet/indicator-applet-0.3.6.ebuild deleted file mode 100644 index 86cf9b32275f..000000000000 --- a/gnome-extra/indicator-applet/indicator-applet-0.3.6.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# 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.2 2010/12/08 17:28:03 pacho 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[bonobo] =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 -} diff --git a/gnome-extra/indicator-applet/indicator-applet-0.4.5.ebuild b/gnome-extra/indicator-applet/indicator-applet-0.4.5.ebuild deleted file mode 100644 index c459d0471f3d..000000000000 --- a/gnome-extra/indicator-applet/indicator-applet-0.4.5.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# 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.2 2010/12/08 17:28:03 pacho 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[bonobo] =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 -} -- 2.26.2