Index: x/lib/webkitgtk.xml
===================================================================
--- x/lib/webkitgtk.xml	(revision e08a501d7a6291a4e322b0ad896d51c9b75b3db7)
+++ x/lib/webkitgtk.xml	(revision d57804decf6c92aef9308a33d414d77ec671340c)
@@ -7,8 +7,8 @@
   <!ENTITY webkitgtk-download-http "http://webkitgtk.org/webkit-&webkitgtk-version;.tar.gz">
   <!ENTITY webkitgtk-download-ftp  " ">
-  <!ENTITY webkitgtk-md5sum        "09f04985665b9abf6f0d9956f86a6a31">
-  <!ENTITY webkitgtk-size          "6.5 MB">
-  <!ENTITY webkitgtk-buildsize     "300 MB">
-  <!ENTITY webkitgtk-time          "18 SBU">
+  <!ENTITY webkitgtk-md5sum        "c11743694b1b71dad287b2e7a9e73b05">
+  <!ENTITY webkitgtk-size          "9.7 MB">
+  <!ENTITY webkitgtk-buildsize     "500 MB (38 MB installed)">
+  <!ENTITY webkitgtk-time          "28 SBU">
 ]>
 
@@ -34,5 +34,5 @@
     <application>GTK+</application> platform.</para>
 
-    &lfs67_checked;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -61,27 +61,18 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="enchant"/>,
-    <xref linkend="gperf"/>,
-    <xref linkend="gst-plugins-base"/>,
-    <xref linkend="gtk2"/>,
-    <xref linkend="icu"/>,
-    <xref linkend="libjpeg"/>,
-    <xref linkend="libsoup"/>,
-    <xref linkend="libxslt"/>,
-    <xref linkend="pcre"/>,
-    <xref linkend="sqlite"/>, and
-    <xref linkend="which"/></para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="gobject-introspection"/> (Required
-    if building <application>epiphany</application>)</para>
-
-
+    <para role="required"><xref linkend="gperf"/>, <xref linkend="libjpeg"/>,
+    <xref linkend="libpng"/>, <xref linkend="icu"/>, <xref linkend="libxslt"/>,
+    <xref linkend="gtk2"/> or <xref linkend="gtk3"/> (if both are installed
+    configure defaults to using gtk+-3), <xref linkend="libsoup"/>,
+    <xref linkend="gst-plugins-base"/>, <xref linkend="which"/>
+    and <xref linkend="sqlite"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="curl"/>,
-    <ulink url="http://www.freedesktop.org/wiki/Software/GeoClue">GeoClue</ulink>,
-    <ulink url="http://xsltml.sourceforge.net/">MathML</ulink>, and
-    <xref linkend="gtk-doc"/></para>
+    <para role="optional"><xref linkend="curl"/>, <xref linkend="enchant"/>,
+    <ulink
+    url="http://www.freedesktop.org/wiki/Software/GeoClue">GeoClue</ulink>,
+    <xref linkend="gobject-introspection"/> (required if building
+    <application>epiphany</application>), <xref linkend="gtk-doc"/> and
+    <ulink url="http://xsltml.sourceforge.net/">MathML</ulink>.</para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -93,8 +84,8 @@
     <title>Installation of WebKitGTK+</title>
 
-    <para>Install <application>WebKitGTK+</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr --enable-introspection &amp;&amp;
+    <para>Install <application>WebKitGTK+</application> by running the
+    following commands:</para>
+
+<screen><userinput>./configure --prefix=/usr --with-gtk=2.0 &amp;&amp;
 make</userinput></screen>
 
@@ -102,5 +93,6 @@
     in an xterm or similar to do this, because it launches some windows).</para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>Now, as the <systemitem class="username">root</systemitem>
+    user:</para>
 
 <screen role="root"><userinput>make install</userinput></screen>
@@ -111,21 +103,16 @@
     <title>Command Explanations</title>
 
+    <para><option>--with-gtk=2.0</option>: This option forces
+    <application>Webkit</application> to compile against
+    <application>Gtk+-2</application>, even if
+    <application>Gtk+-3</application> is also installed. With
+    <application>Gtk+-2</application>, everything
+    <application>Webkit</application> installs is suffixed with 1.0. When it is
+    compiled against <application>Gtk+-3</application> everything it installs
+    is suffixed with 3.0. Both versions can be installed alongside one another
+    with no namespace conflicts.</para>
+
     <para><option>--enable-introspection</option>: This option enables support
     for gobject-introspection.</para>
-
-    <para><option>--enable-3D-transforms</option>: This option enables support
-    for 3D transforms.</para>
-
-    <para><option>--enable-geolocation</option>: This option enables support for
-    geolocation.</para>
-
-    <para><option>--enable-mathml</option>: This option enables support for
-    MathML.</para>
-
-    <para><option>--enable-wml</option>: This option enables support for
-    WML.</para>
-
-    <para><option>--enable-web-sockets</option>: This option enables support for
-    Web Sockets.</para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -143,8 +130,12 @@
 
       <seglistitem>
-        <seg>jsc</seg>
-        <seg>libwebkit-1.0.so</seg>
-        <seg>/usr/{include/webkit-1.0/{JavaScriptCore,webkit},
-        share/webkit-1.0/{images,resources,webinspector/Images}}</seg>
+        <seg>jsc-1 or jsc-3 (depending on whether you installed the gtk+-2 or
+        gtk+-3 version of webkit)</seg>
+        <seg>libwebkit-1.0.so and libjavascriptcoregtk-1.0.so or
+        libwebkit-3.0.so and libjavascriptcoregtk-3.0.so (depending on whether
+        you installed the gtk+-2 or gtk+-3 version of webkit)</seg>
+        <seg>/usr/include/webkit-1.0 and /usr/share/webkit-1.0 or
+        /usr/include/webkit-3.0 and /usr/share/webkit-3.0 (depending on whether
+        you installed the gtk+-2 or gtk+-3 version of webkit)</seg>
       </seglistitem>
     </segmentedlist>
@@ -156,5 +147,5 @@
 
       <varlistentry id="jsc">
-        <term><command>jsc</command></term>
+        <term><command>jsc-1</command> or <command>jsc-3</command></term>
         <listitem>
           <para>is a command-line utility that allows you to run JavaScript
@@ -167,8 +158,8 @@
 
       <varlistentry id="libwebkit-1.0">
-        <term><filename class='libraryfile'>libwebkit-1.0.so</filename></term>
+        <term><filename class="libraryfile">libwebkit-1.0.so</filename></term>
         <listitem>
           <para>contains the <application>WebKitGTK+</application> API
-          functions.</para>
+          functions for <application>gtk+-2</application>.</para>
           <indexterm zone="webkitgtk libwebkit-1.0">
             <primary sortas="c-libwebkit-1.0">libwebkit-1.0.so</primary>
@@ -177,4 +168,40 @@
       </varlistentry>
 
+      <varlistentry id="libwebkit-3.0">
+        <term><filename class="libraryfile">libwebkit-3.0.so</filename></term>
+        <listitem>
+          <para>contains the <application>WebKitGTK+</application> API
+          functions for <application>gtk+-3</application>.</para>
+          <indexterm zone="webkitgtk libwebkit-3.0">
+            <primary sortas="c-libwebkit-3.0">libwebkit-3.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libjavascriptcoregtk-1.0">
+        <term><filename
+        class="libraryfile">libjavascriptcoregtk-1.0.so</filename></term>
+        <listitem>
+          <para>contains functions that are used by
+          <command>jsc-1</command></para>
+          <indexterm zone="webkitgtk libjavascriptcoregtk-1.0">
+            <primary
+            sortas="c-libjavascriptcoregtk-1.0">libjavascriptcoregtk-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libjavascriptcoregtk-3.0">
+        <term><filename
+        class="libraryfile">libjavascriptcoregtk-3.0.so</filename></term>
+        <listitem>
+          <para>contains functions that are used by
+          <command>jsc-3</command></para>
+          <indexterm zone="webkitgtk libjavascriptcoregtk-3.0">
+            <primary
+            sortas="c-libjavascriptcoregtk-3.0">libjavascriptcoregtk-3.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
     </variablelist>
 
