Gentoo Archives: gentoo-commits

From: Alexandre Restovtsev <tetromino@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:gnome-next commit in: net-im/empathy/
Date: Tue, 27 Sep 2011 05:59:23
Message-Id: 69502b79c8cb3615d1401570c02d508c62399329.tetromino@gentoo
1 commit: 69502b79c8cb3615d1401570c02d508c62399329
2 Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
3 AuthorDate: Tue Sep 27 05:22:26 2011 +0000
4 Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
5 CommitDate: Tue Sep 27 05:23:19 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=69502b79
7
8 net-im/empathy: 3.1.91 → 3.2.0
9
10 Bump with assorted changes and update dependencies. Gnome control center
11 "support" has finally been removed by upstream.
12
13 ---
14 ...{empathy-3.1.91.ebuild => empathy-3.2.0.ebuild} | 14 +++++---------
15 net-im/empathy/empathy-9999.ebuild | 14 +++++---------
16 2 files changed, 10 insertions(+), 18 deletions(-)
17
18 diff --git a/net-im/empathy/empathy-3.1.91.ebuild b/net-im/empathy/empathy-3.2.0.ebuild
19 similarity index 90%
20 rename from net-im/empathy/empathy-3.1.91.ebuild
21 rename to net-im/empathy/empathy-3.2.0.ebuild
22 index 747ec53..2579f00 100644
23 --- a/net-im/empathy/empathy-3.1.91.ebuild
24 +++ b/net-im/empathy/empathy-3.2.0.ebuild
25 @@ -24,7 +24,7 @@ else
26 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
27 fi
28 # FIXME: Add location support once geoclue stops being idiotic with automagic deps
29 -IUSE="debug eds +map +geoloc gnome-online-accounts +networkmanager sendto spell test +video" # gnome
30 +IUSE="debug eds +map +geoloc gnome-online-accounts +networkmanager sendto spell test +video"
31
32 # FIXME: gst-plugins-bad is required for the valve plugin. This should move to good
33 # eventually at which point the dep can be dropped
34 @@ -35,7 +35,7 @@ RDEPEND=">=dev-libs/glib-2.28:2
35 >=x11-libs/gtk+-3.0.2:3
36 x11-libs/pango
37 >=dev-libs/dbus-glib-0.51
38 - >=dev-libs/folks-0.6.0
39 + >=dev-libs/folks-0.6.2
40 dev-libs/libgee:0
41 >=gnome-base/gnome-keyring-2.91.4-r300
42 >=media-libs/libcanberra-0.25[gtk3]
43 @@ -47,7 +47,7 @@ RDEPEND=">=dev-libs/glib-2.28:2
44
45 dev-libs/libxml2:2
46 gnome-base/gsettings-desktop-schemas
47 - media-libs/clutter:1.0
48 + >=media-libs/clutter-1.7.14:1.0
49 >=media-libs/clutter-gtk-0.90.3:1.0
50 media-libs/clutter-gst:1.0
51 media-libs/gstreamer:0.10
52 @@ -63,7 +63,7 @@ RDEPEND=">=dev-libs/glib-2.28:2
53 eds? ( >=gnome-extra/evolution-data-server-1.2 )
54 geoloc? ( >=app-misc/geoclue-0.11 )
55 gnome-online-accounts? ( net-libs/gnome-online-accounts )
56 - map? ( media-libs/libchamplain:0.10[gtk] )
57 + map? ( media-libs/libchamplain:0.12[gtk] )
58 networkmanager? ( >=net-misc/networkmanager-0.7 )
59 sendto? ( >=gnome-extra/nautilus-sendto-2.90.0 )
60 spell? (
61 @@ -73,7 +73,6 @@ RDEPEND=">=dev-libs/glib-2.28:2
62 || ( sys-fs/udev[gudev] sys-fs/udev[extras] )
63 >=media-video/cheese-2.91.91.1 )
64 "
65 - # gnome? ( >=gnome-base/gnome-control-center-2.31.4 )
66 DEPEND="${RDEPEND}
67 app-text/scrollkeeper
68 >=app-text/gnome-doc-utils-0.17.3
69 @@ -106,10 +105,7 @@ pkg_setup() {
70 $(use_enable sendto nautilus-sendto)
71 $(use_enable spell)
72 $(use_with video cheese)
73 - $(use_enable video gudev)
74 - --disable-control-center-embedding"
75 - # $(use_enable gnome control-center-embedding)
76 - # gnome-control-center-3.1.4 dropped support for third-party panels
77 + $(use_enable video gudev)"
78
79 # Build time python tools needs python2
80 python_set_active_version 2
81
82 diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-9999.ebuild
83 index 747ec53..2579f00 100644
84 --- a/net-im/empathy/empathy-9999.ebuild
85 +++ b/net-im/empathy/empathy-9999.ebuild
86 @@ -24,7 +24,7 @@ else
87 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
88 fi
89 # FIXME: Add location support once geoclue stops being idiotic with automagic deps
90 -IUSE="debug eds +map +geoloc gnome-online-accounts +networkmanager sendto spell test +video" # gnome
91 +IUSE="debug eds +map +geoloc gnome-online-accounts +networkmanager sendto spell test +video"
92
93 # FIXME: gst-plugins-bad is required for the valve plugin. This should move to good
94 # eventually at which point the dep can be dropped
95 @@ -35,7 +35,7 @@ RDEPEND=">=dev-libs/glib-2.28:2
96 >=x11-libs/gtk+-3.0.2:3
97 x11-libs/pango
98 >=dev-libs/dbus-glib-0.51
99 - >=dev-libs/folks-0.6.0
100 + >=dev-libs/folks-0.6.2
101 dev-libs/libgee:0
102 >=gnome-base/gnome-keyring-2.91.4-r300
103 >=media-libs/libcanberra-0.25[gtk3]
104 @@ -47,7 +47,7 @@ RDEPEND=">=dev-libs/glib-2.28:2
105
106 dev-libs/libxml2:2
107 gnome-base/gsettings-desktop-schemas
108 - media-libs/clutter:1.0
109 + >=media-libs/clutter-1.7.14:1.0
110 >=media-libs/clutter-gtk-0.90.3:1.0
111 media-libs/clutter-gst:1.0
112 media-libs/gstreamer:0.10
113 @@ -63,7 +63,7 @@ RDEPEND=">=dev-libs/glib-2.28:2
114 eds? ( >=gnome-extra/evolution-data-server-1.2 )
115 geoloc? ( >=app-misc/geoclue-0.11 )
116 gnome-online-accounts? ( net-libs/gnome-online-accounts )
117 - map? ( media-libs/libchamplain:0.10[gtk] )
118 + map? ( media-libs/libchamplain:0.12[gtk] )
119 networkmanager? ( >=net-misc/networkmanager-0.7 )
120 sendto? ( >=gnome-extra/nautilus-sendto-2.90.0 )
121 spell? (
122 @@ -73,7 +73,6 @@ RDEPEND=">=dev-libs/glib-2.28:2
123 || ( sys-fs/udev[gudev] sys-fs/udev[extras] )
124 >=media-video/cheese-2.91.91.1 )
125 "
126 - # gnome? ( >=gnome-base/gnome-control-center-2.31.4 )
127 DEPEND="${RDEPEND}
128 app-text/scrollkeeper
129 >=app-text/gnome-doc-utils-0.17.3
130 @@ -106,10 +105,7 @@ pkg_setup() {
131 $(use_enable sendto nautilus-sendto)
132 $(use_enable spell)
133 $(use_with video cheese)
134 - $(use_enable video gudev)
135 - --disable-control-center-embedding"
136 - # $(use_enable gnome control-center-embedding)
137 - # gnome-control-center-3.1.4 dropped support for third-party panels
138 + $(use_enable video gudev)"
139
140 # Build time python tools needs python2
141 python_set_active_version 2