Index: multimedia/libdriv/libdvdcss.xml
===================================================================
--- multimedia/libdriv/libdvdcss.xml	(revision 35865a732f201f44ac077da5a6ee058c82c91faa)
+++ multimedia/libdriv/libdvdcss.xml	(revision e355d777c9a647864ca83cf0513877b73e0f39b0)
@@ -7,6 +7,6 @@
   <!ENTITY libdvdcss-download-http "http://www.videolan.org/pub/libdvdcss/&libdvdcss-version;/libdvdcss-&libdvdcss-version;.tar.bz2">
   <!ENTITY libdvdcss-download-ftp  "&gentoo-ftp-repo;/libdvdcss-&libdvdcss-version;.tar.bz2">
-  <!ENTITY libdvdcss-md5sum        "d25d906c3f9007ccd91b1efb909f93e7">
-  <!ENTITY libdvdcss-size          "296 KB">
+  <!ENTITY libdvdcss-md5sum        "2218a193900e3203aa10dc24cdf54275">
+  <!ENTITY libdvdcss-size          "324 KB">
   <!ENTITY libdvdcss-buildsize     "3.5 MB">
   <!ENTITY libdvdcss-time          "less than 0.1 SBU">
@@ -30,7 +30,9 @@
     <title>Introduction to libdvdcss</title>
 
-    <para><application>libdvdcss</application> is a simple library
-    designed for accessing DVDs as a block device without having to
-    bother about the decryption.</para>
+    <para>
+      <application>libdvdcss</application> is a simple library
+      designed for accessing DVDs as a block device without having to
+      bother about the decryption.
+    </para>
 
     &lfs71_checked;
@@ -39,20 +41,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&libdvdcss-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&libdvdcss-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&libdvdcss-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&libdvdcss-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &libdvdcss-md5sum;</para>
+        <para>
+          Download MD5 sum: &libdvdcss-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &libdvdcss-size;</para>
+        <para>
+          Download size: &libdvdcss-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &libdvdcss-buildsize;</para>
+        <para>
+          Estimated disk space required: &libdvdcss-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &libdvdcss-time;</para>
+        <para>
+          Estimated build time: &libdvdcss-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -61,6 +75,8 @@
 
     <bridgehead renderas="sect4">Optional (to Create Documentation)</bridgehead>
-    <para role="optional"><xref linkend="doxygen"/>, and
-    <xref linkend="texlive"/></para>
+    <para role="optional">
+      <xref linkend="doxygen"/> and
+      <xref linkend="texlive"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -73,41 +89,55 @@
 
     <note>
-      <para>In certain circumstances the 'inputenc' package in the
-      <application>LaTeX</application> installation may not work properly
-      during the build, causing it to hang up. If this happens, issue
-      <userinput>quit</userinput> at the <application>LaTeX</application>
-      prompt and then issue the following command at the shell prompt:</para>
+      <para>
+        In certain circumstances the 'inputenc' package in the
+        <application>LaTeX</application> installation may not work properly
+        during the build, causing it to hang up. If this happens, issue
+        <userinput>quit</userinput> at the <application>LaTeX</application>
+        prompt and then issue the following command at the shell prompt:
+      </para>
 
 <screen><userinput>echo "INPUT_ENCODING         = ISO-8859-1" >>doc/doxygen.cfg</userinput></screen>
 
-      <para>Now either resume the build, or start over. Disregard this note
-      if you do not have a <application>LaTeX</application> package or
-      <application>Doxygen</application> installed.</para>
+      <para>
+        Now either resume the build, or start over. Disregard this note
+        if you do not have a <application>LaTeX</application> package or
+        <application>Doxygen</application> installed.
+      </para>
     </note>
 
-    <para>Install <application>libdvdcss</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>libdvdcss</application> by running the
+      following commands:
+    </para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
-    <para>If you have <application>Doxygen</application> and
-    <application>teTeX</application> or <application>TeX Live</application>
-    installed, HTML and Postscript documentation was created during the build.
-    If you also want to install a PDF version of the reference manual, issue
-    the following command:</para>
+    <para>
+      If you have <application>Doxygen</application> and
+      <application>TeX Live</application> installed, HTML and Postscript 
+      documentation was created during the build.
+      If you also want to install a PDF version of the reference manual, issue
+      the following command:
+    </para>
 
 <screen><userinput>make -C doc/latex pdf</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>
+      This package does not come with a test suite.
+    </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>
 
-    <para>If you have <application>Doxygen</application> and
-    <application>teTeX</application> or <application>TeX Live</application>
-    installed, install the documentation using the following commands as the
-    <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      If you have <application>Doxygen</application> and
+      <application>TeX Live</application> installed, install the 
+      documentation using the following commands as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>install -v -m755 -d         /usr/share/doc/libdvdcss-&libdvdcss-version;/html &amp;&amp;
@@ -121,6 +151,6 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--disable-static</parameter>: prevent static library
-    being built and installed.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
 
   </sect2>
@@ -130,12 +160,15 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
-        <seg>libdvdcss.{so,a}</seg>
-        <seg>/usr/include/dvdcss and /usr/share/doc/libdvdcss-&libdvdcss-version;</seg>
+        <seg>
+          libdvdcss.so
+        </seg>
+        <seg>
+          /usr/include/dvdcss and
+          /usr/share/doc/libdvdcss-&libdvdcss-version;
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -147,10 +180,12 @@
 
       <varlistentry id="libdvdcss-lib">
-        <term><filename class='libraryfile'>libdvdcss.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libdvdcss.so</filename></term>
         <listitem>
-          <para>provides the functionality that is required for transparent
-          DVD access with CSS decryption.</para>
+          <para>
+            provides the functionality that is required for transparent
+            DVD access with CSS decryption.
+          </para>
           <indexterm zone="libdvdcss libdvdcss-lib">
-            <primary sortas="c-libdvdcss">libdvdcss.{so,a}</primary>
+            <primary sortas="c-libdvdcss">libdvdcss.so</primary>
           </indexterm>
         </listitem>
