Index: postlfs/security/polkit.xml
===================================================================
--- postlfs/security/polkit.xml	(revision 85580446b2984527f6de0b383a6c0ad5150b3954)
+++ postlfs/security/polkit.xml	(revision 59f6a1f824f6fd2a384adb8f02449ed82e496c76)
@@ -7,8 +7,8 @@
   <!ENTITY polkit-download-http "https://www.freedesktop.org/software/polkit/releases/polkit-&polkit-version;.tar.gz">
   <!ENTITY polkit-download-ftp  " ">
-  <!ENTITY polkit-md5sum        "b945e683eb5d633745864af6c5746726">
-  <!ENTITY polkit-size          "1.3 MB">
-  <!ENTITY polkit-buildsize     "23 MB (add 2 MB for tests)">
-  <!ENTITY polkit-time          "0.2 SBU (Using parallelism=4; add 0.3 SBU for tests)">
+  <!ENTITY polkit-md5sum        "a6efe21d021fafe4191ee30331ef801c">
+  <!ENTITY polkit-size          "1.6 MB">
+  <!ENTITY polkit-buildsize     "12 MB">
+  <!ENTITY polkit-time          "0.1 SBU (Using parallelism=4)">
 ]>
 
@@ -71,4 +71,5 @@
     </itemizedlist>
 
+<!-- With the move to meson, the patch is no longer needed
     <bridgehead renderas="sect3"
                 revision="sysv">Additional Downloads</bridgehead>
@@ -81,4 +82,5 @@
       </listitem>
     </itemizedlist>
+-->
 
     <bridgehead renderas="sect3">Polkit Dependencies</bridgehead>
@@ -92,4 +94,6 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="libxslt"/>,
       <xref linkend="linux-pam"/>
       <phrase revision="sysv">
@@ -111,17 +115,22 @@
 
 
+    <!-- Due to the fact that meson will not autodetect g-i and
+         has it set to required unless you pass an option, and the likelihood
+         of users ignoring a command explanation and then sending in mails
+         regarding KDE or GNOME not working after installing polkit, let's move
+         it to recommended. See #15640 for logic
     <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
     <para role="optional">
       <xref linkend="gobject-introspection"/>
     </para>
+    -->
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="dbus-python"/> and
-      <xref linkend="python-dbusmock"/> (for tests),
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/>,
-      <xref linkend="gtk-doc"/>, and
-      <xref linkend="libxslt"/>
+      <xref linkend="python-dbusmock"/> (for tests), and
+      <!--<xref linkend="DocBook"/>, (Part of libxslt's chain)
+      <xref linkend="docbook-xsl"/>,-->
+      <xref linkend="gtk-doc"/>
     </para>
 
@@ -152,5 +161,5 @@
         required. If you have installed <xref linkend="libxslt"/>, but you do
         not want to install any of the DocBook packages mentioned, you will
-        need to use <option>--disable-man-pages</option> in the instructions
+        need to use <option>-Dman=false</option> in the instructions
         below.
       </para>
@@ -176,4 +185,5 @@
         -g polkitd -s /bin/false polkitd</userinput></screen>
 
+<!-- All of this is irrelevant with meson
     <note revision="systemd">
       <para>
@@ -198,5 +208,14 @@
 <screen revision="sysv"><userinput>patch -Np1 -i ../polkit-&polkit-version;-fix_elogind_detection-1.patch &amp;&amp;
 autoreconf -fv</userinput></screen>
-
+-->
+
+    <para>
+      First, fix problems with setting permissions during installation and with
+      meson-0.60.0:
+    </para>
+
+<screen><userinput remap="pre">sed '/0,/s/^/#/' -i meson_post_install.py &amp;&amp;
+sed '/policy,/d' -i actions/meson.build \
+                 -i src/examples/meson.build</userinput></screen>
     <para>
       Install <application>Polkit</application> by running the following
@@ -204,19 +223,26 @@
     </para>
 
-<screen revision="systemd"><userinput>./configure --prefix=/usr        \
-            --sysconfdir=/etc    \
-            --localstatedir=/var \
-            --disable-static     \
-            --with-os-type=LFS   &amp;&amp;
-make</userinput></screen>
-
-<screen revision="sysv"><userinput>./configure --prefix=/usr        \
-            --sysconfdir=/etc    \
-            --localstatedir=/var \
-            --disable-static     \
-            --with-os-type=LFS   \
-            --disable-libsystemd-login &amp;&amp;
-make</userinput></screen>
-
+<screen revision="systemd"><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+meson --prefix=/usr                       \
+      -Dman=true                          \
+      -Dsession_tracking=libsystemd-login \
+      --buildtype=release                 \
+      ..                                  &amp;&amp;
+ninja</userinput></screen>
+
+<screen revision="sysv"><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+meson --prefix=/usr                 \
+      -Dman=true                    \
+      -Dsession_tracking=libelogind \
+      -Dsystemdsystemunitdir=/tmp   \
+      --buildtype=release           \
+      ..                            &amp;&amp;
+ninja</userinput></screen>
+
+<!--
     <para>
       To test the results, first ensure that the system
@@ -224,4 +250,13 @@
       Then run <command>make check</command>.
     </para>
+-->
+
+<!-- The subprojects directory which contains a wrapper for 'mocklibc'
+     is not shipped in the tarball like it should be. Whenever that is
+     fixed, -Dtests=true and ninja test is the ticket. -->
+
+    <para>
+      This package does not ship with a working test suite.
+    </para>
 
     <para>
@@ -229,5 +264,8 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root" revision="systemd"><userinput>ninja install</userinput></screen>
+
+<screen role="root" revision="sysv"><userinput>ninja install &amp;&amp;
+rm -v /tmp/*.service</userinput></screen>
 
   </sect2>
@@ -236,15 +274,18 @@
     <title>Command Explanations</title>
 
+    <!--
     <para revision="sysv">
-      <parameter>--disable-libsystemd-login</parameter>: This switch forces
+      <parameter>- -disable-libsystemd-login</parameter>: This switch forces
       polkit to build with elogind support (if available) rather than
       systemd-logind.
     </para>
 
+    
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>--with-authfw=shadow</option>: This switch enables the
+    -->
+    
+    <para>
+      <option>-Dauthfw=shadow</option>: This switch enables the
       package to use the <application>Shadow</application> rather than the
       <application>Linux PAM</application> Authentication framework. Use it
@@ -252,6 +293,29 @@
     </para>
 
+    <!--
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
+    -->
+
+    <para>
+      <option>-Dintrospection=false</option>: Use this option if you are certain
+      that you do not need gobject-introspection files for polkit, or do not have
+      gobject-introspection installed.
+    </para>
+
+    <para>
+      <option>-Dman=false</option>: Use this option to disable generating and
+      installing manual pages. This is useful if libxslt is not installed.
+    </para>
+
+    <para>
+      <option>-Dexamples=true</option>: Use this option to build the example
+      programs.
+    </para>
+
+    <para>
+      <option>-Dgtk_doc=true</option>: Use this option to enable building and
+      installing the API documentation.
+    </para>
 
   </sect2>
@@ -305,5 +369,5 @@
       <seglistitem>
         <seg>
-          pkaction, pkcheck, pk-example-frobnicate, pkexec,
+          pkaction, pkcheck, <!--pk-example-frobnicate,--> pkexec,
           pkttyagent and polkitd
         </seg>
@@ -351,4 +415,5 @@
       </varlistentry>
 
+<!--
       <varlistentry id="pk-example-frobnicate">
         <term><command>pk-example-frobnicate</command></term>
@@ -363,5 +428,6 @@
         </listitem>
       </varlistentry>
-
+-->
+      
       <varlistentry id="pkexec">
         <term><command>pkexec</command></term>
