Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/apvlv/PKGBUILD
	community/i3-wm/PKGBUILD
	community/jack2/PKGBUILD
	community/perl-list-moreutils/PKGBUILD
	community/qc-usb-messenger/PKGBUILD
	community/sword/PKGBUILD
	community/virtualbox/PKGBUILD
	community/vuze/PKGBUILD
	extra/archboot/PKGBUILD
	extra/ardour/PKGBUILD
	extra/boost/PKGBUILD
	extra/digikam/PKGBUILD
	extra/jack/PKGBUILD
	extra/kdebase-konsole/PKGBUILD
	extra/kdebase-runtime/PKGBUILD
	extra/kdebindings-kimono/PKGBUILD
	extra/kdebindings-korundum/PKGBUILD
	extra/kdebindings-kross/PKGBUILD
	extra/kdebindings-perlkde/PKGBUILD
	extra/kdebindings-perlqt/PKGBUILD
	extra/kdebindings-python/PKGBUILD
	extra/kdebindings-qtruby/PKGBUILD
	extra/kdebindings-qyoto/PKGBUILD
	extra/kdebindings-smokegen/PKGBUILD
	extra/kdebindings-smokekde/PKGBUILD
	extra/kdebindings-smokeqt/PKGBUILD
	extra/kdebindings/PKGBUILD
	extra/kdeedu-blinken/PKGBUILD
	extra/kdeedu-blinken/kdeedu-blinken.install
	extra/kdeedu-cantor/PKGBUILD
	extra/kdeedu-cantor/kdeedu-cantor.install
	extra/kdeedu-kalgebra/PKGBUILD
	extra/kdeedu-kalgebra/kdeedu-kalgebra.install
	extra/kdeedu-kalzium/PKGBUILD
	extra/kdeedu-kalzium/kdeedu-kalzium.install
	extra/kdeedu-kanagram/PKGBUILD
	extra/kdeedu-kanagram/kdeedu-kanagram.install
	extra/kdeedu-kbruch/PKGBUILD
	extra/kdeedu-kbruch/kdeedu-kbruch.install
	extra/kdeedu-kgeography/PKGBUILD
	extra/kdeedu-kgeography/kdeedu-kgeography.install
	extra/kdeedu-khangman/PKGBUILD
	extra/kdeedu-khangman/kdeedu-khangman.install
	extra/kdeedu-kig/PKGBUILD
	extra/kdeedu-kig/kdeedu-kig.install
	extra/kdeedu-kiten/PKGBUILD
	extra/kdeedu-kiten/kdeedu-kiten.install
	extra/kdeedu-klettres/PKGBUILD
	extra/kdeedu-klettres/kdeedu-klettres.install
	extra/kdeedu-kmplot/PKGBUILD
	extra/kdeedu-kmplot/kdeedu-kmplot.install
	extra/kdeedu-kstars/PKGBUILD
	extra/kdeedu-kstars/kdeedu-kstars.install
	extra/kdeedu-ktouch/PKGBUILD
	extra/kdeedu-ktouch/kdeedu-ktouch.install
	extra/kdeedu-kturtle/PKGBUILD
	extra/kdeedu-kturtle/kdeedu-kturtle.install
	extra/kdeedu-kwordquiz/PKGBUILD
	extra/kdeedu-kwordquiz/kdeedu-kwordquiz.install
	extra/kdeedu-marble/PKGBUILD
	extra/kdeedu-marble/gpsd-2.96.patch
	extra/kdeedu-marble/kdeedu-marble.install
	extra/kdeedu-parley/PKGBUILD
	extra/kdeedu-parley/kdeedu-parley.install
	extra/kdeedu-rocs/PKGBUILD
	extra/kdeedu-step/PKGBUILD
	extra/kdeedu-step/kdeedu-step.install
	extra/kdegraphics-gwenview/PKGBUILD
	extra/kdegraphics-gwenview/kdegraphics-gwenview.install
	extra/kdegraphics-kamera/PKGBUILD
	extra/kdegraphics-kcolorchooser/PKGBUILD
	extra/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install
	extra/kdegraphics-kgamma/PKGBUILD
	extra/kdegraphics-kolourpaint/PKGBUILD
	extra/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install
	extra/kdegraphics-kruler/PKGBUILD
	extra/kdegraphics-kruler/kdegraphics-kruler.install
	extra/kdegraphics-ksaneplugin/PKGBUILD
	extra/kdegraphics-ksnapshot/PKGBUILD
	extra/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install
	extra/kdegraphics-okular/PKGBUILD
	extra/kdegraphics-okular/kdegraphics-okular.install
	extra/kdegraphics-strigi-analyzer/PKGBUILD
	extra/kdegraphics-svgpart/PKGBUILD
	extra/kdegraphics-thumbnailers/PKGBUILD
	extra/kdegraphics/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/kdemultimedia/PKGBUILD
	extra/kdepim-runtime/PKGBUILD
	extra/kdeplasma-addons/PKGBUILD
	extra/kdesdk-kate/PKGBUILD
	extra/kdesdk-kate/kdebase-kwrite.install
	extra/kdesdk-kate/kdesdk-kate.install
	extra/kdesdk-kate/pkgbuild-syntax-highlight.patch
	extra/kdeutils/PKGBUILD
	extra/kipi-plugins/PKGBUILD
	extra/koffice/PKGBUILD
	extra/konq-plugins/PKGBUILD
	extra/libkdcraw/PKGBUILD
	extra/libkdcraw/libkdcraw.install
	extra/libkdeedu/PKGBUILD
	extra/libkdeedu/libkdeedu.install
	extra/libkexiv2/PKGBUILD
	extra/libkipi/PKGBUILD
	extra/libkipi/libkipi.install
	extra/libksane/PKGBUILD
	extra/libksane/libksane.install
	extra/liblrdf/PKGBUILD
	extra/maxima/PKGBUILD
	extra/mysql/PKGBUILD
	extra/partitionmanager/PKGBUILD
	extra/pygobject/PKGBUILD
	extra/samba/PKGBUILD
	extra/sbcl/PKGBUILD
	extra/texlive-bin/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	multilib-testing/lib32-mesa/PKGBUILD
	multilib/lib32-freetype2/PKGBUILD
	multilib/lib32-jack/PKGBUILD
	multilib/lib32-libsndfile/PKGBUILD
	testing/mesa/PKGBUILD
	~fauno/notmuch/PKGBUILD

3 files changed, 32 insertions, 6 deletions

diff --git a/extra/sonata/ChangeLog b/extra/sonata/ChangeLog
index b83211d02..8311a287c 100644
--- a/extra/sonata/ChangeLog
+++ b/extra/sonata/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-26  Angel Velasquez <angvp@archlinux.org>
+  * sonata 1.6.2.1-7:
+  Applied patch to pull lyrics FS#25036
+
 2009-03-30  Alexander Fehr  <pizzapunk gmail com>
 
   * sonata-1.6-1:
diff --git a/extra/sonata/PKGBUILD b/extra/sonata/PKGBUILD
index d8b4e1468..00fff2cbe 100644
--- a/extra/sonata/PKGBUILD
+++ b/extra/sonata/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 112050 2011-03-03 12:31:43Z angvp $
+# $Id: PKGBUILD 132792 2011-07-26 09:02:50Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=sonata
 pkgver=1.6.2.1
-pkgrel=5
+pkgrel=7
 pkgdesc="Elegant GTK+ music client for MPD"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sonata.berlios.de/"
@@ -12,12 +12,19 @@ license=('GPL3')
 depends=('pygtk' 'python-mpd')
 optdepends=('gnome-python-extras: Enhanced system tray support'
             'tagpy: Metadata editing support'
-            'zsi: Lyrics fetching support'
             'dbus-python: Various extra functionality (e.g. multimedia keys support)')
-source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz)
-md5sums=('0b912325e7175abad3bf6c0edc071e05')
+source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz
+        info.py.patch)
+changelog=ChangeLog
+md5sums=('0b912325e7175abad3bf6c0edc071e05'
+         '595fcf7615035829b264afecb5a1beeb')
 
 build() {
   cd "$srcdir/${pkgname}-$pkgver"
-  python2 setup.py install --prefix=/usr --root="$pkgdir"
+  patch -Np0 -i $srcdir/info.py.patch
+}
+
+package() {
+  cd "$srcdir/${pkgname}-$pkgver"
+  python2 setup.py install --prefix=/usr --optimize 1 --root="$pkgdir"
 }
diff --git a/extra/sonata/info.py.patch b/extra/sonata/info.py.patch
new file mode 100644
index 000000000..e95cc3a08
--- /dev/null
+++ b/extra/sonata/info.py.patch
@@ -0,0 +1,15 @@
+--- sonata/info.py	2011-07-05 22:32:08.452556016 -0500
++++ sonata/info.py	2011-07-05 22:45:50.849311466 -0500
+@@ -393,9 +393,9 @@
+ 				if content.startswith("#REDIRECT [["):
+ 					addr = "http://lyricwiki.org/index.php?title=%s&action=edit" % urllib.quote(content.split("[[")[1].split("]]")[0])
+ 					content = urllib.urlopen(addr).read()
+-				lyrics = content.split("&lt;lyrics&gt;")[1].split("&lt;/lyrics&gt;")[0]
+-				if lyrics.strip() != "&lt;!-- PUT LYRICS HERE (and delete this entire line) --&gt;":
+-					lyrics = misc.unescape_html(lyrics)
++				content = misc.unescape_html(content)
++				lyrics = content.split("<lyrics>")[1].split("</lyrics>")[0].strip()
++				if lyrics.strip() != "<!-- PUT LYRICS HERE (and delete this entire line) -->":
+ 					lyrics = misc.wiki_to_html(lyrics)
+ 					lyrics = lyrics.decode("utf-8")
+ # Save lyrics to file: