[jhbuild] Miscellaneous moduleset cleanups

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 771e2b29493d40fb6a059d5f9ed21dda6ae4c8b7
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Tue Jul 25 09:01:01 2017 -0500

    Miscellaneous moduleset cleanups
    
     * Drop farstream stuff to -world
     * Clean up unused repos
     * Fix recipes name

 modulesets/gnome-apps-3.26.modules |   33 +--------------------------------
 modulesets/gnome-world.modules     |   28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 32 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.26.modules b/modulesets/gnome-apps-3.26.modules
index be7548f..b5e86f6 100644
--- a/modulesets/gnome-apps-3.26.modules
+++ b/modulesets/gnome-apps-3.26.modules
@@ -7,8 +7,6 @@
 <!-- git repos -->
   <repository type="git" name="git.gnome.org" default="yes"
       href="git://git.gnome.org/"/>
-  <repository type="git" name="git.freedesktop.org"
-      href="git://anongit.freedesktop.org/git/"/>
   <repository type="git" name="github.com"
       href="git://github.com/"/>
 
@@ -21,12 +19,6 @@
       href="http://ostermiller.org/qqwing/"/>
   <repository type="tarball" name="tarball.github.com"
     href="https://github.com/"/>
-  <repository type="tarball" name="downloads.sourceforge.net"
-      href="http://downloads.sourceforge.net/"/>
-  <repository type="tarball" name="freedesktop.org"
-      href="http://freedesktop.org/software/"/>
-  <repository type="git" name="telepathy.freedesktop.org"
-      href="git://anongit.freedesktop.org/telepathy/"/>
 
   <include href="gnome-suites-core-3.26.modules"/>
 
@@ -44,21 +36,6 @@
 
 <!-- Dependencies and miscellaneous -->
 
-  <autotools id="farstream" autogenargs="--disable-python" supports-non-srcdir-builds="no">
-    <branch repo="freedesktop.org"
-            module="farstream/releases/farstream/farstream-${version}.tar.gz"
-            version="0.2.7"
-            hash="sha256:dad0ed43cf94e71df558c23825abe57db59d1ee8d970ffaec5e2dbc2e7acbf7d"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="libnice"/>
-    </dependencies>
-    <suggests>
-      <dep package="gupnp-igd"/>
-    </suggests>
-  </autotools>
-
   <autotools id="gnome-code-assistance">
     <branch/>
     <dependencies>
@@ -174,14 +151,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="telepathy-farstream" autogenargs="--disable-python" supports-non-srcdir-builds="no">
-    <branch repo="telepathy.freedesktop.org"/>
-    <dependencies>
-      <dep package="telepathy-glib"/>
-      <dep package="farstream"/>
-    </dependencies>
-  </autotools>
-
   <!-- Apps start here -->
 
   <autotools id="accerciser">
@@ -671,11 +640,11 @@
       <dep package="gnome-devel-docs"/>
       <dep package="gnome-dictionary"/>
       <dep package="gnome-nettool"/>
+      <dep package="gnome-recipes"/>
       <dep package="gnome-sound-recorder"/>
       <dep package="gnome-tweak-tool"/>
       <dep package="nautilus-sendto"/>
       <dep package="polari"/>
-      <dep package="recipes"/>
       <if condition-set="linux">
         <dep package="gnome-multi-writer"/>
       </if>
diff --git a/modulesets/gnome-world.modules b/modulesets/gnome-world.modules
index 4c87829..44b9fb6 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -77,6 +77,8 @@
       href="git://git.ardour.org/"/>
   <repository type="git" name="gitorious.org"
       href="https://gitorious.org/"/>
+  <repository type="git" name="telepathy.freedesktop.org"
+      href="git://anongit.freedesktop.org/telepathy/"/>
   <repository type="tarball" name="samba.org"
       href="https://ftp.samba.org/pub/"/>
   <repository type="tarball" name="sourceforge.net"
@@ -111,6 +113,9 @@
       href="https://github.com/downloads/metabrainz/"/>
   <repository type="tarball" name="downloads.sourceforge.net"
       href="http://downloads.sourceforge.net/"/>
+  <repository type="tarball" name="freedesktop.org"
+      href="http://freedesktop.org/software/"/>
+
 
   <include href="gnome-apps-3.26.modules"/>
 
@@ -3582,4 +3587,27 @@
     </dependencies>
   </autotools>
 
+  <autotools id="telepathy-farstream" autogenargs="--disable-python" supports-non-srcdir-builds="no">
+    <branch repo="telepathy.freedesktop.org"/>
+    <dependencies>
+      <dep package="telepathy-glib"/>
+      <dep package="farstream"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="farstream" autogenargs="--disable-python" supports-non-srcdir-builds="no">
+    <branch repo="freedesktop.org"
+            module="farstream/releases/farstream/farstream-${version}.tar.gz"
+            version="0.2.7"
+            hash="sha256:dad0ed43cf94e71df558c23825abe57db59d1ee8d970ffaec5e2dbc2e7acbf7d"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="libnice"/>
+    </dependencies>
+    <suggests>
+      <dep package="gupnp-igd"/>
+    </suggests>
+  </autotools>
+
 </moduleset>