Don't like ads? PRO users don't see any ads ;-)
Guest

Untitled

By: a guest on Sep 7th, 2012  |  syntax: None  |  size: 17.65 KB  |  hits: 9  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. From 3b5169a6793958a11bab784df9cf647da211e4bf Mon Sep 17 00:00:00 2001
  2. From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
  3. Date: Thu, 14 Jun 2012 15:29:45 +0200
  4. Subject: [PATCH 1/8] gnome-desktop: bump to 3.5.2
  5.  
  6. Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
  7. ---
  8.  metadata/repository_mask.conf                                        |    1 +
  9.  .../{gnome-desktop-3.4.2.exheres-0 => gnome-desktop-3.5.2.exheres-0} |    2 ++
  10.  2 files changed, 3 insertions(+)
  11.  copy packages/gnome-desktop/gnome-desktop/{gnome-desktop-3.4.2.exheres-0 => gnome-desktop-3.5.2.exheres-0} (95%)
  12.  
  13. diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf
  14. index 53788fa..c10e2c5 100644
  15. --- a/metadata/repository_mask.conf
  16. +++ b/metadata/repository_mask.conf
  17. @@ -112,6 +112,7 @@
  18.  
  19.  (
  20.      dev-libs/gtk-vnc[>=0.5&<scm]
  21. +    gnome-desktop/gnome-desktop[>=3.5&<scm]
  22.      gnome-desktop/libgdata[>=0.13&<scm]
  23.  ) [[
  24.      *author = [ Saleem Abdulrasool <compnerd@compnerd.org> ]
  25. diff --git a/packages/gnome-desktop/gnome-desktop/gnome-desktop-3.4.2.exheres-0 b/packages/gnome-desktop/gnome-desktop/gnome-desktop-3.5.2.exheres-0
  26. similarity index 95%
  27. copy from packages/gnome-desktop/gnome-desktop/gnome-desktop-3.4.2.exheres-0
  28. copy to packages/gnome-desktop/gnome-desktop/gnome-desktop-3.5.2.exheres-0
  29. index 243dec3..4bebfca 100644
  30. --- a/packages/gnome-desktop/gnome-desktop/gnome-desktop-3.4.2.exheres-0
  31. +++ b/packages/gnome-desktop/gnome-desktop/gnome-desktop-3.5.2.exheres-0
  32. @@ -25,6 +25,8 @@ DEPENDENCIES="
  33.          dev-libs/glib:2[>=2.19.1]
  34.          gnome-desktop/gsettings-desktop-schemas[>=0.1.4]
  35.          x11-libs/libXext[>=1.2]
  36. +        x11-apps/xkeyboard-config
  37. +        x11-libs/libxkbfile
  38.          gobject-introspection? ( gnome-desktop/gobject-introspection:1[>=0.9.7] )
  39.      run:
  40.          sys-apps/pnp-data
  41. --
  42. 1.7.10.4
  43.  
  44.  
  45. From 43185adf8f19c5d9b466cd9531a32c6593c8f09a Mon Sep 17 00:00:00 2001
  46. From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
  47. Date: Thu, 14 Jun 2012 15:43:49 +0200
  48. Subject: [PATCH 2/8] add evolution-data-server scm
  49.  
  50. Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
  51. ---
  52.  metadata/repository_mask.conf                       |    1 +
  53.  ...xheres-0 => evolution-data-server-scm.exheres-0} |   19 +++++++++++++++----
  54.  2 files changed, 16 insertions(+), 4 deletions(-)
  55.  copy packages/gnome-desktop/evolution-data-server/{evolution-data-server-3.5.1.exheres-0 => evolution-data-server-scm.exheres-0} (82%)
  56.  
  57. diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf
  58. index c10e2c5..54ed661 100644
  59. --- a/metadata/repository_mask.conf
  60. +++ b/metadata/repository_mask.conf
  61. @@ -1,6 +1,7 @@
  62.  (
  63.      dev-libs/libpeas[~scm]
  64.      gnome-bindings/gjs[~scm]
  65. +    gnome-desktop/evolution-data-server[~scm]
  66.      gnome-desktop/gcr[~scm]
  67.      gnome-desktop/gdm[~scm]
  68.      gnome-desktop/gnome-keyring[~scm]
  69. diff --git a/packages/gnome-desktop/evolution-data-server/evolution-data-server-3.5.1.exheres-0 b/packages/gnome-desktop/evolution-data-server/evolution-data-server-scm.exheres-0
  70. similarity index 82%
  71. copy from packages/gnome-desktop/evolution-data-server/evolution-data-server-3.5.1.exheres-0
  72. copy to packages/gnome-desktop/evolution-data-server/evolution-data-server-scm.exheres-0
  73. index 18a96b4..27b4aef 100644
  74. --- a/packages/gnome-desktop/evolution-data-server/evolution-data-server-3.5.1.exheres-0
  75. +++ b/packages/gnome-desktop/evolution-data-server/evolution-data-server-scm.exheres-0
  76. @@ -1,7 +1,8 @@
  77.  # Copyright 2008 Saleem Abdulrasool <compnerd@compnerd.org>
  78.  # Distributed under the terms of the GNU General Purpose License v2
  79.  
  80. -require gnome.org [ suffix=.tar.xz ] gsettings
  81. +require gnome.org gsettings
  82. +require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.12 ] ]
  83.  
  84.  SUMMARY="Backend store for contact data"
  85.  HOMEPAGE="http://projects.gnome.org/evolution"
  86. @@ -23,6 +24,7 @@ MYOPTIONS="
  87.  
  88.  DEPENDENCIES="
  89.      build:
  90. +        app-doc/gtk-doc-autotools
  91.          dev-util/intltool[>=0.35.5]
  92.          dev-util/pkg-config[>=0.20]
  93.          gtk-doc? ( dev-doc/gtk-doc[>=1.14] )
  94. @@ -30,14 +32,14 @@ DEPENDENCIES="
  95.      build+run:
  96.          dev-libs/glib:2[>=2.32.0]
  97.          x11-libs/gtk+:3[>=3.2.0]
  98. -        gnome-platform/GConf:2[>=2.0.0]
  99.          dev-libs/libxml2:2.0[>=2.0.0]
  100. -        gnome-desktop/libsoup:2.4[>=2.37.91]
  101. +        gnome-desktop/libsoup:2.4[>=2.38.1]
  102.          gnome-desktop/libgdata[>=0.10]
  103.          dev-libs/dbus-glib:1[>=0.6]
  104.          office-libs/libical[>=0.43]
  105.          dev-libs/liboauth[>=0.9.4]
  106. -        gnome-desktop/gnome-online-accounts[>=3.1.1]
  107. +        gnome-desktop/gnome-online-accounts[>=3.5]
  108. +        gnome-desktop/gcr[>=3.4]
  109.          gnome-desktop/libgnome-keyring:1[>=2.20.1]
  110.          sys-libs/db:=
  111.          dev-libs/nspr
  112. @@ -57,3 +59,12 @@ DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( 'gobject-introspection introspection'
  113.                                         'gtk-doc' 'vapi vala-bindings' 'weather' )
  114.  DEFAULT_SRC_CONFIGURE_OPTION_WITHS=( 'ldap openldap' 'kerberos krb5' )
  115.  
  116. +AT_M4DIR=( m4 )
  117. +
  118. +src_prepare() {
  119. +    edo gtkdocize --copy
  120. +    edo autopoint
  121. +    edo intltoolize --force --copy --automake
  122. +    autotools_src_prepare
  123. +}
  124. +
  125. --
  126. 1.7.10.4
  127.  
  128.  
  129. From bad7f2e69cd5abb1767c1ee3e1a0b80831a95e6a Mon Sep 17 00:00:00 2001
  130. From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
  131. Date: Thu, 14 Jun 2012 15:44:06 +0200
  132. Subject: [PATCH 3/8] update gnome-shell scm
  133.  
  134. Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
  135. ---
  136.  packages/gnome-desktop/gnome-shell/gnome-shell-scm.exheres-0 |    8 ++++----
  137.  1 file changed, 4 insertions(+), 4 deletions(-)
  138.  
  139. diff --git a/packages/gnome-desktop/gnome-shell/gnome-shell-scm.exheres-0 b/packages/gnome-desktop/gnome-shell/gnome-shell-scm.exheres-0
  140. index 612f2ec..122c713 100644
  141. --- a/packages/gnome-desktop/gnome-shell/gnome-shell-scm.exheres-0
  142. +++ b/packages/gnome-desktop/gnome-shell/gnome-shell-scm.exheres-0
  143. @@ -23,7 +23,7 @@ DEPENDENCIES="
  144.          dev-libs/glib[>=2.31.6]
  145.          dev-libs/libcroco[>=0.6.2]
  146.          dev-libs/libxml2
  147. -        gnome-desktop/evolution-data-server[>=2.91.6][calendar(+)][gobject-introspection]
  148. +        gnome-desktop/evolution-data-server[~scm][calendar(+)][gobject-introspection]
  149.          gnome-desktop/gnome-bluetooth:1[>=3.1.0][gobject-introspection] [[
  150.              note = [ automagic and crashes without introspection ]
  151.          ]]
  152. @@ -31,7 +31,7 @@ DEPENDENCIES="
  153.          gnome-desktop/gobject-introspection:1[>=0.10.1]
  154.          gnome-desktop/gsettings-desktop-schemas[~scm]
  155.          gnome-desktop/libsoup:2.4
  156. -        gnome-desktop/mutter[>=3.4.0][gobject-introspection]
  157. +        gnome-desktop/mutter[~scm][gobject-introspection]
  158.          media-libs/gstreamer:0.10[>=0.10.16] [[ note = automagic ]]
  159.          media-libs/libcanberra
  160.          media-plugins/gst-plugins-base:0.10[>=0.10.16] [[ note = automagic ]]
  161. @@ -47,6 +47,7 @@ DEPENDENCIES="
  162.          net-apps/NetworkManager[>=0.8.999][gobject-introspection]
  163.          gnome-desktop/gnome-keyring:1
  164.          gnome-desktop/gcr[>=3.3.90][gobject-introspection]
  165. +        gnome-desktop/gnome-desktop[>=3.5.1]
  166.          x11-libs/startup-notification[>=0.11]
  167.          base/libgee:1.0[gobject-introspection]
  168.          core/json-glib[>=0.13.2]
  169. @@ -81,8 +82,7 @@ DEPENDENCIES="
  170.          ]]
  171.  "
  172.  
  173. -DEFAULT_SRC_CONFIGURE_PARAMS=( '--enable-introspection' '--disable-jhbuild-wrapper-script'
  174. -                               '--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt' )
  175. +DEFAULT_SRC_CONFIGURE_PARAMS=( '--enable-introspection' '--disable-jhbuild-wrapper-script' )
  176.  DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( 'doc gtk-doc' )
  177.  DEFAULT_SRC_CONFIGURE_OPTION_WITHS=( systemd )
  178.  
  179. --
  180. 1.7.10.4
  181.  
  182.  
  183. From 4ac81a816eb21995106e39f2f267e947f2ab572c Mon Sep 17 00:00:00 2001
  184. From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
  185. Date: Thu, 14 Jun 2012 16:00:03 +0200
  186. Subject: [PATCH 4/8] update libpeas scm
  187.  
  188. Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
  189. ---
  190.  packages/dev-libs/libpeas/libpeas-scm.exheres-0 |   24 ++++++++++++++---------
  191.  1 file changed, 15 insertions(+), 9 deletions(-)
  192.  
  193. diff --git a/packages/dev-libs/libpeas/libpeas-scm.exheres-0 b/packages/dev-libs/libpeas/libpeas-scm.exheres-0
  194. index 78d8bca..048ddca 100644
  195. --- a/packages/dev-libs/libpeas/libpeas-scm.exheres-0
  196. +++ b/packages/dev-libs/libpeas/libpeas-scm.exheres-0
  197. @@ -9,28 +9,34 @@ require scm-git
  198.  require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.12 1.11 ] ]
  199.  
  200.  SUMMARY="A GObject plugins library"
  201. -HOMEPAGE="http://git.gnome.org/browse/libpeas"
  202. +HOMEPAGE="http://live.gnome.org/Libpeas"
  203.  DOWNLOADS=""
  204.  
  205.  LICENCES="LGPL-2.1"
  206.  SLOT="1.0"
  207. -PLATFORMS="~amd64"
  208. -MYOPTIONS="doc"
  209. +PLATFORMS="~amd64 ~x86"
  210. +MYOPTIONS="doc gjs python seed"
  211.  
  212.  DEPENDENCIES="
  213.      build:
  214.          app-doc/gtk-doc-autotools
  215. -        dev-util/pkg-config[>=0.20]
  216.          dev-util/intltool[>=0.40.0]
  217. -        gnome-desktop/gobject-introspection:1[>=0.6.7]
  218. +        dev-util/pkg-config[>=0.20]
  219.          doc? ( dev-doc/gtk-doc[>=1.11] )
  220.      build+run:
  221. -        dev-libs/glib:2[>=2.18.0]
  222. -        x11-libs/gtk+:3[gobject-introspection]
  223. +        dev-libs/glib:2[>=2.31.2]
  224. +        gnome-desktop/gobject-introspection:1[>=0.10.1]
  225. +        x11-libs/gtk+:3[>=3.0.0][gobject-introspection]
  226. +        gjs? ( gnome-bindings/gjs:1[>=1.31.11] )
  227. +        python? ( dev-lang/python:*[>=2.5.2]
  228. +                  gnome-bindings/pygobject:3[>=2.90.2] )
  229. +        seed? ( gnome-bindings/seed[>=2.91.91] )
  230.  "
  231.  
  232. -DEFAULT_SRC_CONFIGURE_PARAMS=( '--disable-seed' '--disable-python' )
  233. -DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( 'doc gtk-doc' )
  234. +RESTRICT="test" # requires X
  235. +
  236. +DEFAULT_SRC_CONFIGURE_PARAMS=( '--disable-glade-catalog' '--disable-vala' '--enable-gtk' )
  237. +DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( 'doc gtk-doc' 'gjs' 'python' 'seed' )
  238.  
  239.  src_prepare() {
  240.      edo sed -e 's/GNOME_COMPILE_WARNINGS/dnl &/'        \
  241. --
  242. 1.7.10.4
  243.  
  244.  
  245. From 706ca31db6ca069547fd5d6378a0dfad5a46ba84 Mon Sep 17 00:00:00 2001
  246. From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
  247. Date: Thu, 14 Jun 2012 16:05:02 +0200
  248. Subject: [PATCH 5/8] update gnome-online-accounts scm
  249.  
  250. Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
  251. ---
  252.  .../gnome-online-accounts/gnome-online-accounts-scm.exheres-0        |    2 +-
  253.  1 file changed, 1 insertion(+), 1 deletion(-)
  254.  
  255. diff --git a/packages/gnome-desktop/gnome-online-accounts/gnome-online-accounts-scm.exheres-0 b/packages/gnome-desktop/gnome-online-accounts/gnome-online-accounts-scm.exheres-0
  256. index f2e767e..6f14371 100644
  257. --- a/packages/gnome-desktop/gnome-online-accounts/gnome-online-accounts-scm.exheres-0
  258. +++ b/packages/gnome-desktop/gnome-online-accounts/gnome-online-accounts-scm.exheres-0
  259. @@ -19,7 +19,7 @@ DEPENDENCIES="
  260.          doc? ( dev-doc/gtk-doc[>=1.3] )
  261.      build+run:
  262.          dev-libs/glib:2[>=2.32]
  263. -        x11-libs/gtk+:3[>=3.0.0]
  264. +        x11-libs/gtk+:3[~scm]
  265.          net-libs/webkit:3.0
  266.          gnome-desktop/libsoup:2.4[>=2.38]
  267.          core/json-glib
  268. --
  269. 1.7.10.4
  270.  
  271.  
  272. From ec6c67fb3d73951784e7f205d958ccf2e3ac9f53 Mon Sep 17 00:00:00 2001
  273. From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
  274. Date: Thu, 14 Jun 2012 16:08:07 +0200
  275. Subject: [PATCH 6/8] update network-manager-applet scm
  276.  
  277. Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
  278. ---
  279.  .../network-manager-applet-scm.exheres-0                    |   11 ++++-------
  280.  1 file changed, 4 insertions(+), 7 deletions(-)
  281.  
  282. diff --git a/packages/gnome-desktop/network-manager-applet/network-manager-applet-scm.exheres-0 b/packages/gnome-desktop/network-manager-applet/network-manager-applet-scm.exheres-0
  283. index 3764562..85fff32 100644
  284. --- a/packages/gnome-desktop/network-manager-applet/network-manager-applet-scm.exheres-0
  285. +++ b/packages/gnome-desktop/network-manager-applet/network-manager-applet-scm.exheres-0
  286. @@ -7,10 +7,6 @@ require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.10 1.12 1.
  287.  SUMMARY="A panel applet to configure networking via NetworkManager"
  288.  HOMEPAGE="http://www.gnome.org/projects/NetworkManager"
  289.  DOWNLOADS=""
  290. -SCM_REPOSITORY="git://git.gnome.org/network-manager-applet"
  291. -
  292. -require scm-git
  293. -
  294.  LICENCES="GPL-2"
  295.  SLOT="0"
  296.  PLATFORMS="~amd64 ~x86"
  297. @@ -18,18 +14,19 @@ MYOPTIONS="bluetooth [[ description = [ add support for bluetooth DUN ] ]]"
  298.  
  299.  DEPENDENCIES="
  300.      build:
  301. -        sys-devel/gettext
  302. +        dev-util/pkg-config
  303.          dev-util/intltool[>=0.40.0]
  304. +        sys-devel/gettext
  305.      build+run:
  306. +        app-text/iso-codes
  307.          dev-libs/glib:2[>=2.16]
  308.          dev-libs/dbus-glib:1[>=0.74]
  309. -        net-apps/NetworkManager[>=0.8.992]
  310. +        net-apps/NetworkManager[>=0.9.4]
  311.          x11-libs/gtk+:3[>=2.91.4]
  312.          gnome-platform/GConf:2
  313.          gnome-desktop/libgnome-keyring:1
  314.          x11-libs/libnotify[>=0.7]
  315.          sys-apps/dbus[>=1.2.6]
  316. -        sys-auth/polkit:1[>=0.92]
  317.          bluetooth? ( gnome-desktop/gnome-bluetooth:1[>=2.27.6] )
  318.      recommendation:
  319.          gnome-desktop/gnome-keyring:1
  320. --
  321. 1.7.10.4
  322.  
  323.  
  324. From 27969868c7684eb8fff8745c26c0d48f09bebd1e Mon Sep 17 00:00:00 2001
  325. From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
  326. Date: Thu, 14 Jun 2012 16:15:40 +0200
  327. Subject: [PATCH 7/8] update mutter scm
  328.  
  329. Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
  330. ---
  331.  packages/gnome-desktop/mutter/mutter-scm.exheres-0 |    6 +++---
  332.  1 file changed, 3 insertions(+), 3 deletions(-)
  333.  
  334. diff --git a/packages/gnome-desktop/mutter/mutter-scm.exheres-0 b/packages/gnome-desktop/mutter/mutter-scm.exheres-0
  335. index e336c25..66600f4 100644
  336. --- a/packages/gnome-desktop/mutter/mutter-scm.exheres-0
  337. +++ b/packages/gnome-desktop/mutter/mutter-scm.exheres-0
  338. @@ -9,7 +9,7 @@ SUMMARY="Clutter and metacity based compositing window manager"
  339.  LICENCES="GPL-2"
  340.  SLOT="0"
  341.  PLATFORMS="~amd64"
  342. -MYOPTIONS="gobject-introspection xinerama
  343. +MYOPTIONS="gobject-introspection
  344.      sound [[ description = [ Enable the use of libcanberra for event sounds ] ]]
  345.  "
  346.  
  347. @@ -43,7 +43,7 @@ DEPENDENCIES="
  348.          gnome-desktop/zenity
  349.          gobject-introspection? ( gnome-desktop/gobject-introspection:1[>=0.9.5] )
  350.          sound? ( media-libs/libcanberra[gtk3][>=0.26] )
  351. -        xinerama? ( x11-libs/libXinerama )
  352. +        x11-libs/libXinerama
  353.      recommendation:
  354.          gnome-desktop/gnome-themes-standard [[
  355.              description = [ Provides default GNOME 3 theme (Adwaita) ]
  356. @@ -55,7 +55,7 @@ DEFAULT_SRC_CONFIGURE_PARAMS=( '--enable-sm' '--enable-startup-notification' '--
  357.                                 '--disable-static'
  358.                                 # need to reduce default compiler warnings due to deprecation errors
  359.                                 '--enable-compile-warnings=maximum' )
  360. -DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( 'gobject-introspection introspection' 'xinerama' )
  361. +DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( 'gobject-introspection introspection' )
  362.  DEFAULT_SRC_CONFIGURE_OPTION_WITHS=( 'sound libcanberra' )
  363.  
  364.  src_prepare() {
  365. --
  366. 1.7.10.4
  367.  
  368.  
  369. From 253ca8ec3f122cf7d41d9f74ab140ddef8bcf48b Mon Sep 17 00:00:00 2001
  370. From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
  371. Date: Thu, 14 Jun 2012 16:20:29 +0200
  372. Subject: [PATCH 8/8] update empathy scm
  373.  
  374. Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
  375. ---
  376.  packages/net-im/empathy/empathy-scm.exheres-0 |   17 ++++++++++++-----
  377.  1 file changed, 12 insertions(+), 5 deletions(-)
  378.  
  379. diff --git a/packages/net-im/empathy/empathy-scm.exheres-0 b/packages/net-im/empathy/empathy-scm.exheres-0
  380. index 97857dc..5c9034f 100644
  381. --- a/packages/net-im/empathy/empathy-scm.exheres-0
  382. +++ b/packages/net-im/empathy/empathy-scm.exheres-0
  383. @@ -1,6 +1,10 @@
  384.  # Copyright 2008 Saleem Abdulrasool <compnerd@compnerd.org>
  385.  # Distributed under the terms of the GNU General Purpose License v2
  386.  
  387. +SCM_SECONDARY_REPOSITORIES="egglistbox"
  388. +SCM_egglistbox_REPOSITORY="git://git.gnome.org/egg-list-box"
  389. +SCM_EXTERNAL_REFS="libempathy-gtk/egg-list-box:egglistbox"
  390. +
  391.  require gnome.org [ suffix='.tar.xz' ] gsettings gtk-icon-cache freedesktop-desktop
  392.  require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.12 1.11 ] ]
  393.  
  394. @@ -11,7 +15,6 @@ LICENCES="GPL-2"
  395.  SLOT="0"
  396.  PLATFORMS="~amd64 ~x86"
  397.  MYOPTIONS="
  398. -    eds             [[ description = [ use evolution-data-server for salut ] ]]
  399.      cheese          [[ description = [ enable webcam support for avatars ] ]]
  400.      geolocation     [[ description = [ Displays your buddies on a map and transmit your position, for
  401.                                         now just the display part ] ]]
  402. @@ -22,6 +25,7 @@ MYOPTIONS="
  403.  
  404.  DEPENDENCIES="
  405.      build:
  406. +        dev-lang/vala:*[>=0.16] [[ note = [ for egg-list-box ] ]]
  407.          dev-libs/libxslt
  408.          dev-util/itstool [[ note = [ from YELP_HELP_INIT in configure.ac ] ]]
  409.          dev-lang/python:*[>=2.3]
  410. @@ -45,10 +49,10 @@ DEPENDENCIES="
  411.          x11-libs/clutter:1[>=1.10.0]
  412.          x11-libs/clutter-gtk:1.0[>=1.1.2]
  413.          media-libs/clutter-gst:1.0[>=1.5.2]
  414. -        net-im/telepathy-glib[>=0.19.0]
  415. +        net-im/telepathy-glib[~scm]
  416.          net-im/telepathy-logger:0.2[>=0.2.13]
  417.          x11-libs/libX11
  418. -        x11-libs/gtk+:3[>=3.3.6]
  419. +        x11-libs/gtk+:3[>=3.5.1]
  420.          media-libs/libcanberra[>=0.25][gtk3]
  421.          x11-libs/libnotify[>=0.7.0]
  422.          media-sound/pulseaudio
  423. @@ -56,7 +60,6 @@ DEPENDENCIES="
  424.          gnome-desktop/libsoup:2.4
  425.          gnome-desktop/gnome-online-accounts[>=3.5.1]
  426.          cheese? ( gnome-desktop/cheese[>=3.4.0] )
  427. -        eds? ( gnome-desktop/evolution-data-server:1.2 )
  428.          geolocation? ( x11-libs/libchamplain:0.12[>=0.12.1] )
  429.          nautilus-sendto? ( gnome-desktop/nautilus-sendto[>=2.90] )
  430.          spell? ( app-spell/enchant[>=1.2.0]
  431. @@ -79,10 +82,14 @@ DEPENDENCIES="
  432.  AT_M4DIR=( m4 )
  433.  
  434.  DEFAULT_SRC_CONFIGURE_PARAMS=( --disable-geocode --disable-location --enable-goa )
  435. -DEFAULT_SRC_CONFIGURE_OPTION_WITHS=( 'eds' )
  436.  DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( 'geolocation map' 'nautilus-sendto' spell 'udev gudev' )
  437.  
  438.  src_prepare() {
  439. +    edo pushd libempathy-gtk/egg-list-box
  440. +    mkdir m4
  441. +    eautoreconf
  442. +    edo popd
  443. +
  444.      edo gnome-doc-prepare --automake --force --copy
  445.      autotools_src_prepare
  446.      edo intltoolize --force
  447. --
  448. 1.7.10.4