| 1 |
commit: 9e8ebf42a4cfbd4579b0cf5947d139f6f27e8a5b |
| 2 |
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Jul 27 01:57:15 2011 +0000 |
| 4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
| 5 |
CommitDate: Wed Jul 27 02:41:56 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9e8ebf42 |
| 7 |
|
| 8 |
net-im/empathy: 3.1.3 → 3.1.4 |
| 9 |
|
| 10 |
Version bump. Sort the dependency list a bit so it's easier to manage; |
| 11 |
update the telepathy-glib dep; clutter is now required for making |
| 12 |
calls. Add a video USE flag for webcam features (pulls in cheese and |
| 13 |
gudev). Since gnome-control-center upstream has dropped support for |
| 14 |
third-party panels, disable control-center-embedding for now. |
| 15 |
|
| 16 |
--- |
| 17 |
.../{empathy-3.1.3.ebuild => empathy-3.1.4.ebuild} | 34 +++++++++++------- |
| 18 |
net-im/empathy/empathy-9999.ebuild | 38 ++++++++++++------- |
| 19 |
2 files changed, 45 insertions(+), 27 deletions(-) |
| 20 |
|
| 21 |
diff --git a/net-im/empathy/empathy-3.1.3.ebuild b/net-im/empathy/empathy-3.1.4.ebuild |
| 22 |
similarity index 81% |
| 23 |
rename from net-im/empathy/empathy-3.1.3.ebuild |
| 24 |
rename to net-im/empathy/empathy-3.1.4.ebuild |
| 25 |
index fa73205..9d31916 100644 |
| 26 |
--- a/net-im/empathy/empathy-3.1.3.ebuild |
| 27 |
+++ b/net-im/empathy/empathy-3.1.4.ebuild |
| 28 |
@@ -24,44 +24,48 @@ else |
| 29 |
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" |
| 30 |
fi |
| 31 |
# FIXME: Add location support once geoclue stops being idiotic with automagic deps |
| 32 |
-IUSE="debug eds +gnome +map +geoloc +networkmanager sendto spell test webkit" |
| 33 |
+IUSE="debug eds +map +geoloc +networkmanager sendto spell test +video webkit" # gnome |
| 34 |
|
| 35 |
# FIXME: gst-plugins-bad is required for the valve plugin. This should move to good |
| 36 |
# eventually at which point the dep can be dropped |
| 37 |
RDEPEND=">=dev-libs/glib-2.28:2 |
| 38 |
>=x11-libs/gtk+-3.0.2:3 |
| 39 |
>=dev-libs/dbus-glib-0.51 |
| 40 |
- >=net-libs/telepathy-glib-0.15.2 |
| 41 |
+ >=net-libs/telepathy-glib-0.15.3 |
| 42 |
>=media-libs/libcanberra-0.25[gtk3] |
| 43 |
>=x11-libs/libnotify-0.7 |
| 44 |
>=gnome-base/gnome-keyring-2.91.4-r300 |
| 45 |
>=net-libs/gnutls-2.8.5 |
| 46 |
>=dev-libs/folks-0.5.1 |
| 47 |
|
| 48 |
+ dev-libs/libxml2:2 |
| 49 |
gnome-base/gsettings-desktop-schemas |
| 50 |
- net-libs/farsight2 |
| 51 |
+ media-libs/clutter:1.0 |
| 52 |
+ >=media-libs/clutter-gtk-0.90.3:1.0 |
| 53 |
+ media-libs/clutter-gst:1.0 |
| 54 |
media-libs/gstreamer:0.10 |
| 55 |
media-libs/gst-plugins-base:0.10 |
| 56 |
media-libs/gst-plugins-bad |
| 57 |
+ >=net-im/telepathy-logger-0.2.8 |
| 58 |
+ net-libs/farsight2 |
| 59 |
>=net-libs/telepathy-farsight-0.0.14 |
| 60 |
- dev-libs/libxml2:2 |
| 61 |
- x11-libs/libX11 |
| 62 |
net-voip/telepathy-connection-managers |
| 63 |
- >=net-im/telepathy-logger-0.2.8 |
| 64 |
+ x11-libs/libX11 |
| 65 |
|
| 66 |
eds? ( >=gnome-extra/evolution-data-server-1.2 ) |
| 67 |
geoloc? ( >=app-misc/geoclue-0.11 ) |
| 68 |
- gnome? ( >=gnome-base/gnome-control-center-2.31.4 ) |
| 69 |
- map? ( |
| 70 |
- media-libs/libchamplain:0.10[gtk] |
| 71 |
- media-libs/clutter-gtk:1.0 ) |
| 72 |
+ map? ( media-libs/libchamplain:0.10[gtk] ) |
| 73 |
networkmanager? ( >=net-misc/networkmanager-0.7 ) |
| 74 |
sendto? ( >=gnome-extra/nautilus-sendto-2.90.0 ) |
| 75 |
spell? ( |
| 76 |
>=app-text/enchant-1.2 |
| 77 |
>=app-text/iso-codes-0.35 ) |
| 78 |
+ video? ( |
| 79 |
+ || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) |
| 80 |
+ >=media-video/cheese-2.91.91.1 ) |
| 81 |
webkit? ( >=net-libs/webkit-gtk-1.3.2:3 ) |
| 82 |
" |
| 83 |
+ # gnome? ( >=gnome-base/gnome-control-center-2.31.4 ) |
| 84 |
DEPEND="${RDEPEND} |
| 85 |
app-text/scrollkeeper |
| 86 |
>=app-text/gnome-doc-utils-0.17.3 |
| 87 |
@@ -76,7 +80,6 @@ PDEPEND=">=net-im/telepathy-mission-control-5.7.6" |
| 88 |
|
| 89 |
pkg_setup() { |
| 90 |
DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README" |
| 91 |
- |
| 92 |
# TODO: Re-add location support |
| 93 |
G2CONF="${G2CONF} |
| 94 |
--disable-coding-style-checks |
| 95 |
@@ -84,15 +87,20 @@ pkg_setup() { |
| 96 |
--disable-static |
| 97 |
--disable-meego |
| 98 |
--disable-Werror |
| 99 |
+ --enable-call |
| 100 |
$(use_enable debug) |
| 101 |
$(use_with eds) |
| 102 |
$(use_enable geoloc location) |
| 103 |
- $(use_enable gnome control-center-embedding) |
| 104 |
$(use_enable map) |
| 105 |
$(use_with networkmanager connectivity nm) |
| 106 |
$(use_enable sendto nautilus-sendto) |
| 107 |
$(use_enable spell) |
| 108 |
- $(use_enable webkit)" |
| 109 |
+ $(use_with video cheese) |
| 110 |
+ $(use_enable video gudev) |
| 111 |
+ $(use_enable webkit) |
| 112 |
+ --disable-control-center-embedding" |
| 113 |
+ # $(use_enable gnome control-center-embedding) |
| 114 |
+ # gnome-control-center-3.1.4 dropped support for third-party panels |
| 115 |
|
| 116 |
# Build time python tools needs python2 |
| 117 |
python_set_active_version 2 |
| 118 |
|
| 119 |
diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-9999.ebuild |
| 120 |
index cd9dbf8..9d31916 100644 |
| 121 |
--- a/net-im/empathy/empathy-9999.ebuild |
| 122 |
+++ b/net-im/empathy/empathy-9999.ebuild |
| 123 |
@@ -5,6 +5,7 @@ |
| 124 |
EAPI="3" |
| 125 |
GCONF_DEBUG="no" |
| 126 |
GNOME2_LA_PUNT="yes" |
| 127 |
+GNOME_TARBALL_SUFFIX="xz" |
| 128 |
PYTHON_DEPEND="2:2.4" |
| 129 |
|
| 130 |
inherit eutils gnome2 multilib python |
| 131 |
@@ -23,7 +24,7 @@ else |
| 132 |
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" |
| 133 |
fi |
| 134 |
# FIXME: Add location support once geoclue stops being idiotic with automagic deps |
| 135 |
-IUSE="debug eds +gnome +map +networkmanager sendto spell test webkit" |
| 136 |
+IUSE="debug eds +map +geoloc +networkmanager sendto spell test +video webkit" # gnome |
| 137 |
|
| 138 |
# FIXME: gst-plugins-bad is required for the valve plugin. This should move to good |
| 139 |
# eventually at which point the dep can be dropped |
| 140 |
@@ -35,31 +36,36 @@ RDEPEND=">=dev-libs/glib-2.28:2 |
| 141 |
>=x11-libs/libnotify-0.7 |
| 142 |
>=gnome-base/gnome-keyring-2.91.4-r300 |
| 143 |
>=net-libs/gnutls-2.8.5 |
| 144 |
- >=dev-libs/folks-0.5.2 |
| 145 |
+ >=dev-libs/folks-0.5.1 |
| 146 |
|
| 147 |
+ dev-libs/libxml2:2 |
| 148 |
gnome-base/gsettings-desktop-schemas |
| 149 |
- net-libs/farsight2 |
| 150 |
+ media-libs/clutter:1.0 |
| 151 |
+ >=media-libs/clutter-gtk-0.90.3:1.0 |
| 152 |
+ media-libs/clutter-gst:1.0 |
| 153 |
media-libs/gstreamer:0.10 |
| 154 |
media-libs/gst-plugins-base:0.10 |
| 155 |
media-libs/gst-plugins-bad |
| 156 |
+ >=net-im/telepathy-logger-0.2.8 |
| 157 |
+ net-libs/farsight2 |
| 158 |
>=net-libs/telepathy-farsight-0.0.14 |
| 159 |
- dev-libs/libxml2:2 |
| 160 |
- x11-libs/libX11 |
| 161 |
net-voip/telepathy-connection-managers |
| 162 |
- >=net-im/telepathy-logger-0.2.10 |
| 163 |
+ x11-libs/libX11 |
| 164 |
|
| 165 |
eds? ( >=gnome-extra/evolution-data-server-1.2 ) |
| 166 |
- gnome? ( >=gnome-base/gnome-control-center-2.31.4 ) |
| 167 |
- map? ( |
| 168 |
- media-libs/libchamplain:0.10[gtk] |
| 169 |
- media-libs/clutter-gtk:1.0 ) |
| 170 |
+ geoloc? ( >=app-misc/geoclue-0.11 ) |
| 171 |
+ map? ( media-libs/libchamplain:0.10[gtk] ) |
| 172 |
networkmanager? ( >=net-misc/networkmanager-0.7 ) |
| 173 |
sendto? ( >=gnome-extra/nautilus-sendto-2.90.0 ) |
| 174 |
spell? ( |
| 175 |
>=app-text/enchant-1.2 |
| 176 |
>=app-text/iso-codes-0.35 ) |
| 177 |
+ video? ( |
| 178 |
+ || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) |
| 179 |
+ >=media-video/cheese-2.91.91.1 ) |
| 180 |
webkit? ( >=net-libs/webkit-gtk-1.3.2:3 ) |
| 181 |
" |
| 182 |
+ # gnome? ( >=gnome-base/gnome-control-center-2.31.4 ) |
| 183 |
DEPEND="${RDEPEND} |
| 184 |
app-text/scrollkeeper |
| 185 |
>=app-text/gnome-doc-utils-0.17.3 |
| 186 |
@@ -74,23 +80,27 @@ PDEPEND=">=net-im/telepathy-mission-control-5.7.6" |
| 187 |
|
| 188 |
pkg_setup() { |
| 189 |
DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README" |
| 190 |
- |
| 191 |
# TODO: Re-add location support |
| 192 |
G2CONF="${G2CONF} |
| 193 |
--disable-coding-style-checks |
| 194 |
--disable-schemas-compile |
| 195 |
--disable-static |
| 196 |
--disable-meego |
| 197 |
- --disable-location |
| 198 |
--disable-Werror |
| 199 |
+ --enable-call |
| 200 |
$(use_enable debug) |
| 201 |
$(use_with eds) |
| 202 |
- $(use_enable gnome control-center-embedding) |
| 203 |
+ $(use_enable geoloc location) |
| 204 |
$(use_enable map) |
| 205 |
$(use_with networkmanager connectivity nm) |
| 206 |
$(use_enable sendto nautilus-sendto) |
| 207 |
$(use_enable spell) |
| 208 |
- $(use_enable webkit)" |
| 209 |
+ $(use_with video cheese) |
| 210 |
+ $(use_enable video gudev) |
| 211 |
+ $(use_enable webkit) |
| 212 |
+ --disable-control-center-embedding" |
| 213 |
+ # $(use_enable gnome control-center-embedding) |
| 214 |
+ # gnome-control-center-3.1.4 dropped support for third-party panels |
| 215 |
|
| 216 |
# Build time python tools needs python2 |
| 217 |
python_set_active_version 2 |
Archives