Index: kde/phonon-backend-gstreamer.xml
===================================================================
--- kde/phonon-backend-gstreamer.xml	(revision e9a42d7df267d4e5b206099e5c7d8a41b7580885)
+++ kde/phonon-backend-gstreamer.xml	(revision b291709322dfd60e83984d1c9fa38aceba74dd33)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY phonon-backend-gstreamer-download-http "&kde-download-http;phonon/phonon-backend-gstreamer/&phonon-backend-gstreamer-version;/src/phonon-backend-gstreamer-&phonon-backend-gstreamer-version;.tar.xz">
-  <!ENTITY phonon-backend-gstreamer-download-ftp  "&kde-download-ftp;phonon/phonon-backend-gstreamer/&phonon-backend-gstreamer-version;/src/phonon-backend-gstreamer-&phonon-backend-gstreamer-version;.tar.xz">
-  <!ENTITY phonon-backend-gstreamer-md5sum        "ce441035dc5a00ffaac9a64518ab5c62">
+  <!ENTITY phonon-backend-gstreamer-download-http "&kde-download-http;phonon/phonon-backend-gstreamer/&phonon-backend-gstreamer-version;/phonon-backend-gstreamer-&phonon-backend-gstreamer-version;.tar.xz">
+  <!ENTITY phonon-backend-gstreamer-download-ftp  " ">
+  <!ENTITY phonon-backend-gstreamer-md5sum        "b2b0ca327908948ce8cdba117e31bf80">
   <!ENTITY phonon-backend-gstreamer-size          "76 KB">
-  <!ENTITY phonon-backend-gstreamer-buildsize     "4.1 MB">
-  <!ENTITY phonon-backend-gstreamer-time          "0.2 SBU">
+  <!ENTITY phonon-backend-gstreamer-buildsize     "4.5 MB">
+  <!ENTITY phonon-backend-gstreamer-time          "0.4 SBU">
 ]>
 
@@ -32,7 +32,5 @@
     <para>This package provides a <application>Phonon</application> backend
     which utilizes the <application>GStreamer</application> media framework.
-<!--    Its library is used by both KDE4 and KF5, but they must be linked to <xref
-    linkend="qt4"/> and  <xref linkend="qt5"/> respectively. The two versions
-    do not conflict with each other.--> </para>
+    </para>
 
     &lfs79_checked;
@@ -57,14 +55,4 @@
       <listitem>
         <para>Estimated build time: &phonon-backend-gstreamer-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required download:
-          <ulink url="&patch-root;/phonon-backend-gstreamer-&phonon-backend-gstreamer-version;-compatibility-1.patch"/>
-        </para>
       </listitem>
     </itemizedlist>
@@ -95,30 +83,10 @@
     <title>Installation of Phonon-backend-gstreamer</title>
 
-    <para>Fix the package to work with the latest gstreamer:</para>
+    <note><para>This package unpacks to the directory 
+      phonon-gstreamer-&phonon-backend-gstreamer-version;.
+    </para></note>
 
-<screen><userinput>patch -Np1 -i ../phonon-backend-gstreamer-&phonon-backend-gstreamer-version;-compatibility-1.patch</userinput></screen>
-<!--
-    <para>Install the qt4 based version of
-    <application>Phonon-backend-gstreamer</application> by running the
-    following commands:</para>
-
-<screen><userinput>source /usr/bin/setqt4 &amp;&amp;
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_INSTALL_LIBDIR=lib  \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
--->
-    <para>Install <!--the qt5 based version of-->
-    <application>Phonon-backend-gstreamer</application> by running the
-    following commands:</para>
+    <para>Install <application>Phonon-backend-gstreamer</application> by
+    running the following commands:</para>
 
 <screen><userinput>source /usr/bin/setqt5 &amp;&amp;
@@ -131,5 +99,4 @@
       -DCMAKE_BUILD_TYPE=Release     \
       -DPHONON_BUILD_PHONON4QT5=ON   \
-      -D__KDE_HAVE_GCC_VISIBILITY=NO \
       -Wno-dev .. &amp;&amp;
 make</userinput></screen>
@@ -153,7 +120,4 @@
     <para><option>-DPHONON_BUILD_PHONON4QT5=ON</option>: This switch is used to
     ensure that Qt5 version of the backend is built even if Qt4 is present.</para>
-
-    <para><option>-D__KDE_HAVE_GCC_VISIBILITY=NO</option>: This switch is used to
-    disable a check that would cause cmake to fail when using Qt-5.4.2 or later.</para>
 
   </sect2>
@@ -182,5 +146,5 @@
         <term><command>phonon</command></term>
         <listitem>
-          <para>is a testing utility for phonon-backend-gstreamer-generated build trees.</para>
+          <para>is placeholder.</para>
           <indexterm zone="a-phonon phonon">
             <primary sortas="b-phonon">phonon</primary>
Index: kde/phonon-backend-vlc.xml
===================================================================
--- kde/phonon-backend-vlc.xml	(revision e9a42d7df267d4e5b206099e5c7d8a41b7580885)
+++ kde/phonon-backend-vlc.xml	(revision b291709322dfd60e83984d1c9fa38aceba74dd33)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY phonon-backend-vlc-download-http "&kde-download-http;phonon/phonon-backend-vlc/&phonon-backend-vlc-version;/src/phonon-backend-vlc-&phonon-backend-vlc-version;.tar.xz">
-  <!ENTITY phonon-backend-vlc-download-ftp  "&kde-download-ftp;phonon/phonon-backend-vlc/&phonon-backend-vlc-version;/src/phonon-backend-vlc-&phonon-backend-vlc-version;.tar.xz">
-  <!ENTITY phonon-backend-vlc-md5sum        "3937517ce4929dea4398ad9834507f97">
+  <!ENTITY phonon-backend-vlc-download-http "&kde-download-http;phonon/phonon-backend-vlc/&phonon-backend-vlc-version;/phonon-backend-vlc-&phonon-backend-vlc-version;.tar.xz">
+  <!ENTITY phonon-backend-vlc-download-ftp  " ">
+  <!ENTITY phonon-backend-vlc-md5sum        "66615ae8df37408f47f369e64d836746">
   <!ENTITY phonon-backend-vlc-size          "60 KB">
-  <!ENTITY phonon-backend-vlc-buildsize     "3.1 MB">
-  <!ENTITY phonon-backend-vlc-time          "0.1 SBU">
+  <!ENTITY phonon-backend-vlc-buildsize     "3.2 MB">
+  <!ENTITY phonon-backend-vlc-time          "0.3 SBU">
 ]>
 
@@ -31,8 +31,6 @@
 
     <para>This package provides a <application>Phonon</application> backend
-    which utilizes the <application>VLC</application> media framework. <!--Its
-    library is used by both KDE4 and KF5, but they must be linked to <xref
-    linkend='qt4'/> and <xref linkend='qt5'/> respectively. The two versions do
-    not conflict with each other.--></para>
+    which utilizes the <application>VLC</application> media framework.
+    </para>
 
     &lfs79_checked;
@@ -75,25 +73,11 @@
   <sect2 role="installation">
     <title>Installation of Phonon-backend-vlc</title>
-<!--
-    <para>Install the qt4 based version of
-    <application>Phonon-backend-vlc</application> by running the following
-    commands:</para>
 
-<screen><userinput>source /usr/bin/setqt4 &amp;&amp;
 
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
+    <note><para>This package unpacks to the directory 
+      phonon-vlc-&phonon-backend-vlc-version;.
+    </para></note>
 
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_INSTALL_LIBDIR=lib  \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
--->
-    <para>Install i<!--the qt5 based version of-->
+    <para>Install 
     <application>Phonon-backend-vlc</application> by running the following
     commands:</para>
@@ -108,5 +92,4 @@
       -DCMAKE_BUILD_TYPE=Release     \
       -DPHONON_BUILD_PHONON4QT5=ON   \
-      -D__KDE_HAVE_GCC_VISIBILITY=NO \
       -Wno-dev .. &amp;&amp;
 make</userinput></screen>
@@ -130,7 +113,4 @@
     <para><option>-DPHONON_BUILD_PHONON4QT5=ON</option>: This switch is used to
     ensure that Qt5 version of the backend is built even if Qt4 is present.</para>
-
-    <para><option>-D__KDE_HAVE_GCC_VISIBILITY=NO</option>: This switch is used to
-    disable a check that would cause cmake to fail when using Qt-5.4.2 or later.</para>
 
   </sect2>
@@ -159,5 +139,5 @@
         <term><command>phonon</command></term>
         <listitem>
-          <para>is a testing utility for phonon-backend-vlc-generated build trees.</para>
+          <para>placeholder</para>
           <indexterm zone="a-phonon phonon">
             <primary sortas="b-phonon">phonon</primary>
Index: kde/phonon.xml
===================================================================
--- kde/phonon.xml	(revision e9a42d7df267d4e5b206099e5c7d8a41b7580885)
+++ kde/phonon.xml	(revision b291709322dfd60e83984d1c9fa38aceba74dd33)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY phonon-download-http "&kde-download-http;phonon/&phonon-version;/src/phonon-&phonon-version;.tar.xz">
-  <!ENTITY phonon-download-ftp  "&kde-download-ftp;phonon/&phonon-version;/src/phonon-&phonon-version;.tar.xz">
-  <!ENTITY phonon-md5sum        "88bb9867261803eed61ff53a7c026338">
+  <!ENTITY phonon-download-http "&kde-download-http;phonon/&phonon-version;/phonon-&phonon-version;.tar.xz">
+  <!ENTITY phonon-download-ftp  " ">
+  <!ENTITY phonon-md5sum        "8abeb7b1eaf4935668c7fb441fc2491a">
   <!ENTITY phonon-size          "316 KB">
-  <!ENTITY phonon-buildsize     "11.7 MB">
-  <!ENTITY phonon-time          "0.4 SBU">
+  <!ENTITY phonon-buildsize     "8.7 MB">
+  <!ENTITY phonon-time          "0.8 SBU">
 ]>
 
@@ -64,11 +64,10 @@
       <xref linkend="cmake"/>,
       <xref linkend="glib2"/>, and
-      <!--<xref linkend="qt4"/> or --><xref linkend="qt5"/>
+      <xref linkend="qt5"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="pulseaudio"/> and
-      <ulink url="http://projects.kde.org/projects/kdesupport/libqzeitgeist/">QZeitgeist</ulink>
+      <xref linkend="pulseaudio"/>
     </para>
 
@@ -80,49 +79,8 @@
   <sect2 role="installation">
     <title>Installation of Phonon</title>
-<!--
-    <para>The <application>Phonon</application> libraries are used by both KDE4
-    and KF5, but they must be linked to <xref linkend="qt4"/> and <xref
-    linkend="qt5"/> respectively.  The two versions do not conflict with each
-    other.</para>
-
-    <para>If building for KDE4, make sure <xref linkend="qt4"/> has been built
-    without the bundled <application>Phonon</application> library. This package
-    provides a better implementation.</para>
-
-    <para>Install the qt4 based version of <application>Phonon</application> by
-    running the following commands:</para>
-
-<screen><userinput>source /usr/bin/setqt4 &amp;&amp;
-
-sed -i "s:BSD_SOURCE:DEFAULT_SOURCE:g" cmake/FindPhononInternal.cmake &amp;&amp;
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr                                \
-      -DCMAKE_BUILD_TYPE=Release                                 \
-      -DCMAKE_INSTALL_LIBDIR=lib                                 \
-      -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=FALSE        \
-      -DDBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>Install qt5 based version of<application>Phonon</application> by
-    running the following commands:</para>
-
-    <note><para>If the extracted files of the package are still present from a
-    qt4 version of the build, be sure to remove it and extract a fresh copy of
-    the source files.</para></note>
--->
     <para>Install <application>Phonon</application> by
     running the following commands:</para>
 
 <screen><userinput>source /usr/bin/setqt5 &amp;&amp;
-
-sed -i "s:BSD_SOURCE:DEFAULT_SOURCE:g" cmake/FindPhononInternal.cmake &amp;&amp;
 
 mkdir build &amp;&amp;
@@ -133,5 +91,4 @@
       -DCMAKE_INSTALL_LIBDIR=lib     \
       -DPHONON_BUILD_PHONON4QT5=ON   \
-      -D__KDE_HAVE_GCC_VISIBILITY=NO \
       -Wno-dev .. &amp;&amp;
 make</userinput></screen>
@@ -147,9 +104,4 @@
 
     <para>
-      <command>sed ... cmake/FindPhononInternal.cmake</command>: Silence
-      a lot of warnings caused by the latest toolchain.
-    </para>
-
-    <para>
       <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
       to apply higher level of the compiler optimizations.
@@ -161,20 +113,8 @@
       the correct location.
     </para>
-
-    <para>
-     <parameter>-DDBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces</parameter>:
-      This switch sets the correct installation path for the
-      <application>D-Bus</application> interfaces file.
-    </para>
 -->
     <para>
      <parameter>-DPHONON_BUILD_PHONON4QT5=ON</parameter>: This switch is used to
      ensure that Qt5 version of the library is built even if Qt4 is present.
-    </para>
-
-    <para>
-     <parameter>-D__KDE_HAVE_GCC_VISIBILITY=NO</parameter>: This switch is used to
-     disable a check that would cause cmake to fail when using Qt-5.4.2
-     and later.
     </para>
 
