From 60b998a875a2f7140a4909825815770af8749449 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Tue, 30 Jul 2013 19:22:16 +0000
Subject: [PATCH] Update to audacious-3.4 Archive musicbrainz3 Tag a2ps

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@11533 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 .../libdriv => archive}/libmusicbrainz3.xml    |  0
 general.ent                                    |  6 +++---
 introduction/welcome/changelog.xml             |  6 ++++++
 multimedia/audioutils/audacious.xml            | 18 ++++++++----------
 multimedia/libdriv/libdriv.xml                 |  1 -
 postlfs/security/gnutls.xml                    |  6 +++---
 pst/ps/a2ps.xml                                |  2 +-
 7 files changed, 21 insertions(+), 18 deletions(-)
 rename {multimedia/libdriv => archive}/libmusicbrainz3.xml (100%)

diff --git a/multimedia/libdriv/libmusicbrainz3.xml b/archive/libmusicbrainz3.xml
similarity index 100%
rename from multimedia/libdriv/libmusicbrainz3.xml
rename to archive/libmusicbrainz3.xml
diff --git a/general.ent b/general.ent
index f7a4bacc85..a56380bee5 100644
--- a/general.ent
+++ b/general.ent
@@ -151,7 +151,7 @@ export -f as_root</userinput></screen>
 <!ENTITY cyrus-sasl-version           "2.1.26">
 <!ENTITY gnupg-version                "1.4.14">
 <!ENTITY gnupg2-version               "2.0.20">
-<!ENTITY gnutls-version               "3.2.2">
+<!ENTITY gnutls-version               "3.2.3">
 <!ENTITY gpgme-version                "1.4.2">
 <!ENTITY iptables-version             "1.4.19.1">
 <!ENTITY libcap2-version              "2.22">
@@ -811,8 +811,8 @@ export -f as_root</userinput></screen>
 <!ENTITY lame-version                 "3.99.5">
 <!ENTITY CDParanoia-version           "III-10.2">
 <!ENTITY freetts-version              "1.2.2">
-<!ENTITY audacious-version            "3.3.3">
-<!ENTITY audacious-plugins-version    "3.3.3">
+<!ENTITY audacious-version            "3.4">
+<!ENTITY audacious-plugins-version    "3.4">
 <!ENTITY amarok-version               "2.7.1">
 <!ENTITY gvolwheel-version            "1.0">
 
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 9991da3ba9..18fdb45cf8 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -46,6 +46,12 @@
     <listitem>
       <para>July 30th, 2013</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to audacious{,-plugins}-3.4.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gnutls-3.2.3.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update to xine-lib-1.2.3.</para>
         </listitem>
diff --git a/multimedia/audioutils/audacious.xml b/multimedia/audioutils/audacious.xml
index 95b8596cdd..bd900d5a90 100644
--- a/multimedia/audioutils/audacious.xml
+++ b/multimedia/audioutils/audacious.xml
@@ -7,18 +7,17 @@
   <!ENTITY audacious-download-http
            "http://distfiles.audacious-media-player.org/audacious-&audacious-version;.tar.bz2">
   <!ENTITY audacious-download-ftp         " ">
-  <!ENTITY audacious-md5sum               "644ef7fa37319d261b933c86b5ab3a95">
-  <!ENTITY audacious-size                 "470 KB">
-  <!ENTITY audacious-buildsize            "13 MB">
+  <!ENTITY audacious-md5sum               "b97b6921eab3eedbd63dcce2c15154e0">
+  <!ENTITY audacious-size                 "464 KB">
+  <!ENTITY audacious-buildsize            "15 MB">
   <!ENTITY audacious-time                 "0.3 SBU">
 
   <!ENTITY audacious-plugins-download
            "http://distfiles.audacious-media-player.org/audacious-plugins-&audacious-plugins-version;.tar.bz2">
-  <!ENTITY audacious-plugins-md5sum       "d77af4d5bff383cc7ab384da21f527f6">
+  <!ENTITY audacious-plugins-md5sum       "ea59b4023f32ca096519d01b8f6f33c0">
   <!ENTITY audacious-plugins-size         "1.7 MB">
-  <!ENTITY audacious-plugins-buildsize    "45 MB">
+  <!ENTITY audacious-plugins-buildsize    "40 MB">
   <!ENTITY audacious-plugins-time         "0.8 SBU">
-
 ]>
 
 <sect1 id="audacious" xreflabel="Audacious-&audacious-version;">
@@ -108,7 +107,7 @@
         </para>
       </listitem>
     </itemizedlist>
-
+<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -119,7 +118,7 @@
         </para>
       </listitem>
     </itemizedlist>
-
+-->
     <bridgehead renderas="sect3">Audacious Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -233,8 +232,7 @@ install -v -m644    doc/html/* \
       commands:
     </para>
 
-<screen><userinput>patch -Np1 -i ../audacious-plugins-&audacious-plugins-version;-libcdio_v0.90_fixes-1.patch &amp;&amp;
-TPUT=/bin/true ./configure --prefix=/usr &amp;&amp;
+<screen><userinput>TPUT=/bin/true ./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
     <para>
diff --git a/multimedia/libdriv/libdriv.xml b/multimedia/libdriv/libdriv.xml
index 816c34515f..62f235cb9c 100644
--- a/multimedia/libdriv/libdriv.xml
+++ b/multimedia/libdriv/libdriv.xml
@@ -58,7 +58,6 @@ $Date$
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmpeg2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmpeg3.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmusicbrainz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmusicbrainz3.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmusicbrainz5.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libogg.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libquicktime.xml"/>
diff --git a/postlfs/security/gnutls.xml b/postlfs/security/gnutls.xml
index 9a2222728a..548a431758 100644
--- a/postlfs/security/gnutls.xml
+++ b/postlfs/security/gnutls.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY gnutls-download-http " ">
   <!ENTITY gnutls-download-ftp  "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/gnutls-&gnutls-version;.tar.xz">
-  <!ENTITY gnutls-md5sum        "9dd691ad1ccdb7386029809afef6b5ea">
-  <!ENTITY gnutls-size          "5.0 MB">
-  <!ENTITY gnutls-buildsize     "111 MB">
+  <!ENTITY gnutls-md5sum        "7c0dd4f77dc70c64d2f385aeb2df4157">
+  <!ENTITY gnutls-size          "4.9 MB">
+  <!ENTITY gnutls-buildsize     "103 MB">
   <!ENTITY gnutls-time          "1.2 SBU (additional 3.6 SBU if running the testsuite)">
 ]>
 
diff --git a/pst/ps/a2ps.xml b/pst/ps/a2ps.xml
index 45780e703c..42349aef6b 100644
--- a/pst/ps/a2ps.xml
+++ b/pst/ps/a2ps.xml
@@ -36,7 +36,7 @@
     every input format into PostScript output. The application's name
     expands appropriately to <quote>all to PostScript</quote>.</para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <caution>
       <para><application>a2ps</application> cannot convert UTF-8 encoded