Index: gnome/applications/eog.xml
===================================================================
--- gnome/applications/eog.xml	(revision 3ffee9199a9cec1c9c34a2aa72b598e2486f6ff6)
+++ gnome/applications/eog.xml	(revision aec056059c12df7fbe253ec902bce7cb18e10fb9)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY eog-download-http "&gnome-download-http;/eog/&gnome-minor-34;/eog-&eog-version;.tar.xz">
-  <!ENTITY eog-download-ftp  "&gnome-download-ftp;/eog/&gnome-minor-34;/eog-&eog-version;.tar.xz">
-  <!ENTITY eog-md5sum        "a0a8577d3d337cfa908fa202ce0ecce0">
-  <!ENTITY eog-size          "3.4 MB">
-  <!ENTITY eog-buildsize     "32 MB">
-  <!ENTITY eog-time          "0.2 SBU">
+  <!ENTITY eog-download-http "&gnome-download-http;/eog/&gnome-minor-36;/eog-&eog-version;.tar.xz">
+  <!ENTITY eog-download-ftp  "&gnome-download-ftp;/eog/&gnome-minor-36;/eog-&eog-version;.tar.xz">
+  <!ENTITY eog-md5sum        "74586323edb723952f32593e8cfc22a0">
+  <!ENTITY eog-size          "3.5 MB">
+  <!ENTITY eog-buildsize     "48 MB">
+  <!ENTITY eog-time          "0.3 SBU">
 ]>
 
Index: gnome/applications/evince.xml
===================================================================
--- gnome/applications/evince.xml	(revision 3ffee9199a9cec1c9c34a2aa72b598e2486f6ff6)
+++ gnome/applications/evince.xml	(revision aec056059c12df7fbe253ec902bce7cb18e10fb9)
@@ -6,10 +6,10 @@
 
   <!ENTITY evince-download-http
-     "&gnome-download-http;/evince/&gnome-minor-34;/evince-&evince-version;.tar.xz">
+     "&gnome-download-http;/evince/&gnome-minor-36;/evince-&evince-version;.tar.xz">
   <!ENTITY evince-download-ftp
-     "&gnome-download-ftp;/evince/&gnome-minor-34;/evince-&evince-version;.tar.xz">
-  <!ENTITY evince-md5sum        "9e9e82fa8f6045ad7817157d9335d185">
-  <!ENTITY evince-size          "2.4 MB">
-  <!ENTITY evince-buildsize     "71 MB">
+     "&gnome-download-ftp;/evince/&gnome-minor-36;/evince-&evince-version;.tar.xz">
+  <!ENTITY evince-md5sum        "06c8078b31616bed3ad1d8c014f066a0">
+  <!ENTITY evince-size          "2.5 MB">
+  <!ENTITY evince-buildsize     "75 MB">
   <!ENTITY evince-time          "0.4 SBU (Using parallelism=4)">
 ]>
Index: gnome/applications/evolution.xml
===================================================================
--- gnome/applications/evolution.xml	(revision 3ffee9199a9cec1c9c34a2aa72b598e2486f6ff6)
+++ gnome/applications/evolution.xml	(revision aec056059c12df7fbe253ec902bce7cb18e10fb9)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY evolution-download-http "&gnome-download-http;/evolution/&gnome-minor-34;/evolution-&evolution-version;.tar.xz">
-  <!ENTITY evolution-download-ftp  "&gnome-download-ftp;/evolution/&gnome-minor-34;/evolution-&evolution-version;.tar.xz">
-  <!ENTITY evolution-md5sum        "a39f2f35113618870d30f65e57f9701b">
+  <!ENTITY evolution-download-http "&gnome-download-http;/evolution/&gnome-minor-36;/evolution-&evolution-version;.tar.xz">
+  <!ENTITY evolution-download-ftp  "&gnome-download-ftp;/evolution/&gnome-minor-36;/evolution-&evolution-version;.tar.xz">
+  <!ENTITY evolution-md5sum        "d1a3795130d415f7f0ed7b6a436c7d5c">
   <!ENTITY evolution-size          "11 MB">
-  <!ENTITY evolution-buildsize     "336 MB">
-  <!ENTITY evolution-time          "1.2 SBU (Using parallelism=4)">
+  <!ENTITY evolution-buildsize     "338 MB">
+  <!ENTITY evolution-time          "1.1 SBU (Using parallelism=4)">
 ]>
 
@@ -200,5 +200,5 @@
           libecontactlisteditor.so,
           libecontactprint.so,
-          libedomutils.so,
+     <!-- libedomutils.so, -->
           libemail-engine.so,
           libessmime.so,
Index: gnome/applications/file-roller.xml
===================================================================
--- gnome/applications/file-roller.xml	(revision 3ffee9199a9cec1c9c34a2aa72b598e2486f6ff6)
+++ gnome/applications/file-roller.xml	(revision aec056059c12df7fbe253ec902bce7cb18e10fb9)
@@ -6,9 +6,9 @@
 
   <!ENTITY file-roller-download-http
-           "&gnome-download-http;/file-roller/&gnome-minor-32;/file-roller-&file-roller-version;.tar.xz">
+           "&gnome-download-http;/file-roller/&gnome-minor-36;/file-roller-&file-roller-version;.tar.xz">
   <!ENTITY file-roller-download-ftp
-           "&gnome-download-ftp;/file-roller/&gnome-minor-32;/file-roller-&file-roller-version;.tar.xz">
-  <!ENTITY file-roller-md5sum        "21982b8d298cb2994a99494399dcb2d5">
-  <!ENTITY file-roller-size          "836 KB">
+           "&gnome-download-ftp;/file-roller/&gnome-minor-36;/file-roller-&file-roller-version;.tar.xz">
+  <!ENTITY file-roller-md5sum        "d48b00634f7fdb87a1c4cf7c781772c3">
+  <!ENTITY file-roller-size          "844 KB">
   <!ENTITY file-roller-buildsize     "25 MB">
   <!ENTITY file-roller-time          "0.1 SBU (Using parallelism=4)">
@@ -35,5 +35,5 @@
       <application>File Roller</application> is an archive manager for
       <application>GNOME</application> with support for tar, bzip2, gzip, zip,
-      jar, compress, lzop and many other archive formats.
+      jar, compress, lzop, zstd, and many other archive formats.
     </para>
 
Index: gnome/applications/gnome-calculator.xml
===================================================================
--- gnome/applications/gnome-calculator.xml	(revision 3ffee9199a9cec1c9c34a2aa72b598e2486f6ff6)
+++ gnome/applications/gnome-calculator.xml	(revision aec056059c12df7fbe253ec902bce7cb18e10fb9)
@@ -6,11 +6,11 @@
 
   <!ENTITY gnome-calculator-download-http
-           "&gnome-download-http;/gnome-calculator/&gnome-minor-34;/gnome-calculator-&gnome-calculator-version;.tar.xz">
+           "&gnome-download-http;/gnome-calculator/&gnome-minor-36;/gnome-calculator-&gnome-calculator-version;.tar.xz">
   <!ENTITY gnome-calculator-download-ftp
-           "&gnome-download-ftp;/gnome-calculator/&gnome-minor-34;/gnome-calculator-&gnome-calculator-version;.tar.xz">
-  <!ENTITY gnome-calculator-md5sum        "9157b93a3f41fdad80df26c062b95c7b">
-  <!ENTITY gnome-calculator-size          "944 KB">
-  <!ENTITY gnome-calculator-buildsize     "40 MB (with tests)">
-  <!ENTITY gnome-calculator-time          "0.2 SBU (with tests)">
+           "&gnome-download-ftp;/gnome-calculator/&gnome-minor-36;/gnome-calculator-&gnome-calculator-version;.tar.xz">
+  <!ENTITY gnome-calculator-md5sum        "71854fb58671b4a88ac990e2f2439e4f">
+  <!ENTITY gnome-calculator-size          "964 KB">
+  <!ENTITY gnome-calculator-buildsize     "53 MB (with tests)">
+  <!ENTITY gnome-calculator-time          "0.3 SBU (with tests)">
 ]>
 
@@ -144,7 +144,9 @@
         </seg>
         <seg>
-          None
+          libgcalc-2.so and libgci-1.so
         </seg>
         <seg>
+          /usr/include/gcalc-2,
+          /usr/include/gci-2, and
           /usr/share/help/*/gnome-calculator
         </seg>
Index: gnome/applications/gnome-disk-utility.xml
===================================================================
--- gnome/applications/gnome-disk-utility.xml	(revision 3ffee9199a9cec1c9c34a2aa72b598e2486f6ff6)
+++ gnome/applications/gnome-disk-utility.xml	(revision aec056059c12df7fbe253ec902bce7cb18e10fb9)
@@ -6,11 +6,11 @@
 
   <!ENTITY gnome-disk-utility-download-http
-           "&gnome-download-http;/gnome-disk-utility/&gnome-minor-34;/gnome-disk-utility-&gnome-disk-utility-version;.tar.xz">
+           "&gnome-download-http;/gnome-disk-utility/&gnome-minor-36;/gnome-disk-utility-&gnome-disk-utility-version;.tar.xz">
   <!ENTITY gnome-disk-utility-download-ftp
-           "&gnome-download-ftp;/gnome-disk-utility/&gnome-minor-34;/gnome-disk-utility-&gnome-disk-utility-version;.tar.xz">
-  <!ENTITY gnome-disk-utility-md5sum        "c0b7fe540957d90d5c88dba33127bbcb">
+           "&gnome-download-ftp;/gnome-disk-utility/&gnome-minor-36;/gnome-disk-utility-&gnome-disk-utility-version;.tar.xz">
+  <!ENTITY gnome-disk-utility-md5sum        "0c35cb9758f2471c6941a0ec833972c4">
   <!ENTITY gnome-disk-utility-size          "1.3 MB">
   <!ENTITY gnome-disk-utility-buildsize     "37 MB">
-  <!ENTITY gnome-disk-utility-time          "less than 0.1 SBU (Using parallelism=4)">
+  <!ENTITY gnome-disk-utility-time          "0.1 SBU (Using parallelism=4)">
 ]>
 
Index: gnome/applications/gnome-maps.xml
===================================================================
--- gnome/applications/gnome-maps.xml	(revision 3ffee9199a9cec1c9c34a2aa72b598e2486f6ff6)
+++ gnome/applications/gnome-maps.xml	(revision aec056059c12df7fbe253ec902bce7cb18e10fb9)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-maps-download-http
-           "&gnome-download-http;/gnome-maps/&gnome-minor-34;/gnome-maps-&gnome-maps-version;.tar.xz">
+           "&gnome-download-http;/gnome-maps/&gnome-minor-36;/gnome-maps-&gnome-maps-version;.tar.xz">
   <!ENTITY gnome-maps-download-ftp
-           "&gnome-download-ftp;/gnome-maps/&gnome-minor-34;/gnome-maps-&gnome-maps-version;.tar.xz">
-  <!ENTITY gnome-maps-md5sum        "51b549242e30886865004093f9081652">
+           "&gnome-download-ftp;/gnome-maps/&gnome-minor-36;/gnome-maps-&gnome-maps-version;.tar.xz">
+  <!ENTITY gnome-maps-md5sum        "7b8b11748e358115e3e50437207951b4">
   <!ENTITY gnome-maps-size          "3.8 MB">
-  <!ENTITY gnome-maps-buildsize     "12 MB">
+  <!ENTITY gnome-maps-buildsize     "16 MB">
   <!ENTITY gnome-maps-time          "less than 0.1 SBU">
 ]>
Index: gnome/applications/gnome-screenshot.xml
===================================================================
--- gnome/applications/gnome-screenshot.xml	(revision 3ffee9199a9cec1c9c34a2aa72b598e2486f6ff6)
+++ gnome/applications/gnome-screenshot.xml	(revision aec056059c12df7fbe253ec902bce7cb18e10fb9)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-screenshot-download-http
-           "&gnome-download-http;/gnome-screenshot/&gnome-minor-34;/gnome-screenshot-&gnome-screenshot-version;.tar.xz">
+           "&gnome-download-http;/gnome-screenshot/&gnome-minor-36;/gnome-screenshot-&gnome-screenshot-version;.tar.xz">
   <!ENTITY gnome-screenshot-download-ftp
-           "&gnome-download-ftp;/gnome-screenshot/&gnome-minor-34;/gnome-screenshot-&gnome-screenshot-version;.tar.xz">
-  <!ENTITY gnome-screenshot-md5sum        "779f12548d72d12a5275d5e8563d9855">
+           "&gnome-download-ftp;/gnome-screenshot/&gnome-minor-36;/gnome-screenshot-&gnome-screenshot-version;.tar.xz">
+  <!ENTITY gnome-screenshot-md5sum        "27fb11f693fa7bd2d10df636f5ba1c5e">
   <!ENTITY gnome-screenshot-size          "228 KB">
-  <!ENTITY gnome-screenshot-buildsize     "4.2 MB">
+  <!ENTITY gnome-screenshot-buildsize     "6.5 MB">
   <!ENTITY gnome-screenshot-time          "less than 0.1 SBU">
 ]>
Index: gnome/applications/gnome-system-monitor.xml
===================================================================
--- gnome/applications/gnome-system-monitor.xml	(revision 3ffee9199a9cec1c9c34a2aa72b598e2486f6ff6)
+++ gnome/applications/gnome-system-monitor.xml	(revision aec056059c12df7fbe253ec902bce7cb18e10fb9)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-system-monitor-download-http
-      "&gnome-download-http;/gnome-system-monitor/&gnome-minor-32;/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
+      "&gnome-download-http;/gnome-system-monitor/&gnome-minor-36;/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
   <!ENTITY gnome-system-monitor-download-ftp
-           "&gnome-download-ftp;/gnome-system-monitor/&gnome-minor-32;/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
-  <!ENTITY gnome-system-monitor-md5sum        "37356a1b8c20939adc6f47f739d2e49a">
-  <!ENTITY gnome-system-monitor-size          "664 KB">
-  <!ENTITY gnome-system-monitor-buildsize     "32 MB">
+           "&gnome-download-ftp;/gnome-system-monitor/&gnome-minor-36;/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
+  <!ENTITY gnome-system-monitor-md5sum        "99f0d46ff2bc45ec407d383c93213acb">
+  <!ENTITY gnome-system-monitor-size          "680 KB">
+  <!ENTITY gnome-system-monitor-buildsize     "33 MB">
   <!ENTITY gnome-system-monitor-time          "0.5 SBU">
 ]>
Index: gnome/applications/gnome-terminal.xml
===================================================================
--- gnome/applications/gnome-terminal.xml	(revision 3ffee9199a9cec1c9c34a2aa72b598e2486f6ff6)
+++ gnome/applications/gnome-terminal.xml	(revision aec056059c12df7fbe253ec902bce7cb18e10fb9)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnome-terminal-download-http
-           "&gnome-download-http;/gnome-terminal/&gnome-minor-34;/gnome-terminal-&gnome-terminal-version;.tar.xz">
+           "&gnome-download-http;/gnome-terminal/&gnome-minor-36;/gnome-terminal-&gnome-terminal-version;.tar.xz">
   <!ENTITY gnome-terminal-download-ftp
-           "&gnome-download-ftp;/gnome-terminal/&gnome-minor-34;/gnome-terminal-&gnome-terminal-version;.tar.xz">
-  <!ENTITY gnome-terminal-md5sum        "13fa9f5f459481c7f05b6964c470ef16">
-  <!ENTITY gnome-terminal-size          "2.0 MB">
-  <!ENTITY gnome-terminal-buildsize     "37 MB">
+           "&gnome-download-ftp;/gnome-terminal/&gnome-minor-36;/gnome-terminal-&gnome-terminal-version;.tar.xz">
+  <!ENTITY gnome-terminal-md5sum        "31381c96bf67279c61cec0a4e2473cfa">
+  <!ENTITY gnome-terminal-size          "2.4 MB">
+  <!ENTITY gnome-terminal-buildsize     "46 MB">
   <!ENTITY gnome-terminal-time          "0.1 SBU (using parallelism=4)">
 ]>
