Index: neral/sysutils/ibus.xml
===================================================================
--- general/sysutils/ibus.xml	(revision 36aff45e606d7493bf24c25a84313c24ef74a151)
+++ 	(revision )
@@ -1,237 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY ibus-download-http "https://github.com/ibus/ibus/releases/download/&ibus-version;/ibus-&ibus-version;.tar.gz">
-  <!ENTITY ibus-download-ftp  " ">
-  <!ENTITY ibus-md5sum        "a6e820db4fe3d82c825398f1ed19c77e">
-  <!ENTITY ibus-size          "2.0 MB">
-  <!ENTITY ibus-buildsize     "38.2 MB">
-  <!ENTITY ibus-time          "1.1 SBU">
-]>
-
-<sect1 id="ibus" xreflabel="IBus-&ibus-version;">
-  <?dbhtml filename="ibus.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>IBus-&ibus-version;</title>
-
-  <indexterm zone="ibus">
-    <primary sortas="a-IBus">IBus</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to IBus</title>
-
-    <para>
-      <application>IBus</application> is an Intelligent Input Bus. It is a new
-      input framework for Linux OS. It provides full featured and user friendly
-      input method user interface.
-    </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&ibus-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&ibus-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &ibus-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &ibus-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &ibus-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &ibus-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">IBus Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dconf"/> and
-      <xref linkend="iso-codes"/>
-    </para>
-      
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="gtk2"/>,
-      <xref linkend="libnotify"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="dbus-python"/> and
-      <xref linkend="pygobject3"/> (both to build the Python support library),
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="python3"/>,
-      <xref linkend="pyxdg"/> (for the <command>ibus-setup</command>), and
-      <xref linkend="libxkbcommon"/> and
-      <xref linkend="wayland"/> (both to build the Wayland support programs)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/ibus"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of IBus</title>
-
-    <para>
-      Install <application>IBus</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make -k check</command>.
-      Some tests may fail for unknown reasons.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--disable-gtk2</option>: This switch disables building
-      of the <application>GTK+ 2</application> immodule. Use it if
-      you have not installed <application>GTK+ 2</application>.
-    </para>
-
-    <para>
-      <option>--enable-python-library</option>: This switch enables
-      building of the <application>Python</application> support
-      library. Use it if have installed the optional dependencies.
-    </para>
-
-    <para>
-      <option>--enable-wayland</option>: This switch enables building
-      of the <application>Wayland</application> support programs.
-      Use it if you have installed the optional dependencies.
-    </para>
-
-    <para>
-      <option>--with-python=python3</option>: This switch makes
-      the <command>configure</command> look for
-      <application>Python 3</application>. Use it if you want
-      to build the <application>Python 3</application> support
-      library alongside the <application>Python 2</application>
-      one.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          ibus, ibus-daemon, and ibus-setup
-        </seg>
-        <seg>
-          libibus-1.0.so and im-ibus.so
-          (<application>GTK+ Immodule</application>)
-        </seg>
-        <seg>
-          /etc/dconf/db/ibus.d,
-          /usr/include/ibus-1.0,
-          /usr/lib/ibus,
-          /usr/share/gtk-doc/html/ibus, and
-          /usr/share/ibus
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ibus-daemon">
-        <term><command>ibus-daemon</command></term>
-        <listitem>
-          <para>
-            is the Intelligent Input Bus Daemon.
-          </para>
-          <indexterm zone="ibus ibus-daemon">
-            <primary sortas="b-ibus-daemon">ibus-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ibus-setup">
-        <term><command>ibus-setup</command></term>
-        <listitem>
-          <para>
-            is the <application>GTK+</application> program used to configure
-            the <command>ibus-daemon</command>.
-          </para>
-          <indexterm zone="ibus ibus-setup">
-            <primary sortas="b-ibus-setup">ibus-setup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libibus-1.0">
-        <term><filename class="libraryfile">libibus-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>IBus</application> API functions.
-          </para>
-          <indexterm zone="ibus libibus-1.0">
-            <primary sortas="c-libibus-1.0">libibus-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: packages.ent
===================================================================
--- packages.ent	(revision 36aff45e606d7493bf24c25a84313c24ef74a151)
+++ packages.ent	(revision 4c7c1d49494f1f03b0877acc4bf4797ca6fa2908)
@@ -215,4 +215,5 @@
 <!ENTITY lsof-version                 "4.89">
 <!ENTITY pinentry-version             "0.9.7">
+<!ENTITY qtchooser-version            "39">
 <!ENTITY rarian-version               "0.8.1">
 <!ENTITY recode-version               "3.6">
@@ -241,4 +242,5 @@
 <!ENTITY logrotate-version            "3.9.1">
 <!ENTITY mc-version                   "4.8.14">
+<!ENTITY ModemManager-version         "1.4.10">
 <!ENTITY obex-data-server-version     "0.4.6">
 <!ENTITY p7zip-version                "9.38.1">
@@ -254,8 +256,10 @@
 <!ENTITY udisks-version               "1.0.5">    <!-- stable lt .90 micro version -->
 <!ENTITY udisks2-version              "2.1.6">    <!-- stable lt .90 micro version -->
+<!ENTITY upower1-version              "0.99.3">
 <!ENTITY unrar-version                "5.3.5">
 <!ENTITY unzip-version                "6.0">
 <!ENTITY upower-version               "0.9.23">
 <!ENTITY usbutils-version             "008">
+<!ENTITY weston-version               "1.8.0">
 <!ENTITY which-version                "2.21">
 <!ENTITY zip-version                  "3.0">
Index: systemd.ent
===================================================================
--- systemd.ent	(revision 36aff45e606d7493bf24c25a84313c24ef74a151)
+++ systemd.ent	(revision 4c7c1d49494f1f03b0877acc4bf4797ca6fa2908)
@@ -19,12 +19,12 @@
 <!ENTITY libva-vdpau-driver-version   "0.7.4">
 <!--<!ENTITY libxkbcommon-version         "0.5.0">-->
-<!ENTITY ModemManager-version         "1.4.10">
+<!--<!ENTITY ModemManager-version         "1.4.10">-->
 <!ENTITY pyatspi2-version             "2.16.0">
-<!ENTITY qtchooser-version            "39">
+<!--<!ENTITY qtchooser-version            "39">-->
 <!ENTITY sound-theme-freedesktop-version "0.8">
 <!ENTITY uhttpmock-version            "0.5.0">
-<!ENTITY upower1-version              "0.99.3">
+<!--<!ENTITY upower1-version              "0.99.3">-->
 <!--<!ENTITY wayland-version              "1.9.0">-->
-<!ENTITY weston-version               "1.8.0">
+<!--<!ENTITY weston-version               "1.8.0">-->
 <!--<!ENTITY yaml-version                 "0.1.6">-->
 
