Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

20 files changed, 228 insertions, 73 deletions

diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD
index 2db7dbbc5..00dcb7f7a 100644
--- a/libre/cgminer-libre/PKGBUILD
+++ b/libre/cgminer-libre/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=cgminer-libre
 _pkgflag=libre
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="Multi-threaded multi-pool GPU, FPGA and ASIC miner for bitcoin and derivative coins, without nonfree OpenCL recommendation"
 url='http://forum.bitcoin.org/index.php?topic=28402.0'
@@ -51,6 +51,6 @@ package() {
   install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf
 }
 
-sha512sums=('e96b874fd53c771535098c1077200b5ab88aa628383f7af56f861c952a534283942ce34647f279bf4229bfc3a0114f81a7ae3deca4e8e7931d7551fdb75c68c0'
+sha512sums=('2a311fd93aaf489849021e34de7cb7fb9343d7ff2d05edbdcf86a0346e616384e57d2367173d0a60916d1154b78f4a1a2a458b3047a96e81ee5b757274068a5e'
             '99c38bc395848f9712ce172343d31f5c60f5d8ac1cfe2f48df8f3ec6c488fc275763a79c5ef36b99f32faa465b5a65284b38e8a63ef9b144075ee13971313b41'
             '3317b60c6b1f14c47d8ee636113ef40a4023ab14054129de80a37947b381fd2b647a7053f4e1bb639efa225a514e862fa531908714c34040dda2d6221dde7f5f')
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index 62bca0307..633a0587f 100644
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184487 2013-05-07 13:27:00Z andrea $
+# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
@@ -6,7 +6,7 @@
 
 _pkgname='kdebase-konqueror'
 pkgname='kdebase-konqueror-libre'
-pkgver=4.10.3
+pkgver=4.10.4
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kde.org/applications/internet/konqueror/"
@@ -15,7 +15,7 @@ groups=('kde' 'kdebase')
 makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'nepomuk-widgets')
 source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz"
     	"konq-about-fsdg.diff")
-sha1sums=('c9949ef6dafbc567bb3f088bf9e156c3a5a9ec08'
+sha1sums=('5465fffdaea70a5ca225283f45b9504775d0432d')
           'd6cbb53c04179b8180f9439eca156b7ff2e76b3a')
 pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation'
 depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD
index 6d3291252..4b6f40af9 100644
--- a/libre/kdebase-runtime-libre/PKGBUILD
+++ b/libre/kdebase-runtime-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 184473 2013-05-07 13:26:42Z andrea $
+# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=kdebase-runtime
 pkgname=kdebase-runtime-libre
-pkgver=4.10.3
+pkgver=4.10.4
 pkgrel=1
 pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers"
 arch=('i686' 'x86_64' 'mips64el')
@@ -26,7 +26,7 @@ install="${_pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz"
         'duckduckgo_html.desktop'
         'duckduckgo_lite.desktop')
-sha1sums=('22869b2ee7eb4b5b341a6d596dd904c0b0b812d1'
+sha1sums=('f406c8c9e42c2508a7acf88b9719f5fa5b4683a1'
           'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd'
           'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b')
 
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 96c8530a3..5393ce9d0 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 185044 2013-05-10 17:08:02Z andrea $
+# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=kdelibs
 pkgname=kdelibs-libre
-pkgver=4.10.3
-pkgrel=3
+pkgver=4.10.4
+pkgrel=1
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -23,16 +23,13 @@ conflicts=('kdelibs')
 install=${_pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kde-applications-menu.patch' 'qt4.patch' 
-        'security-fix.patch' 'fix-xfreepixmap-call.patch'
         'khtml-fsdg.diff')
-sha1sums=('aa154998e227121be82f5b04442e908e7dece01b'
+sha1sums=('b5db1b91bd96b44ebd1b5e71019bb95b59775237'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
           'ed1f57ee661e5c7440efcaba7e51d2554709701c'
-          '506562009a667f18481be0d2c5035b181fce38bb'
-          '556c5473219d8208ec920f46c08bf61fda5b60d9'
           'a1502a964081ad583a00cf90c56e74bf60121830')
 
-build() {
+prepare() {
        cd ${_pkgname}-${pkgver}
        # avoid file conflict with gnome-menus
        patch -p1 -i "${srcdir}"/kde-applications-menu.patch
@@ -40,14 +37,10 @@ build() {
        patch -p1 -i "${srcdir}"/qt4.patch
        # Don't ask the user to download a plugin, it's probably nonfree.
        patch -p1 -i "${srcdir}"/khtml-fsdg.diff
+}
 
-       # KDEBUG#319428
-       patch -p1 -i "${srcdir}"/security-fix.patch
-       # KDEBUG#319137
-       patch -p1 -i "${srcdir}"/fix-xfreepixmap-call.patch
-      
+build() {
        cd ../
-
        mkdir build
        cd build
        cmake ../${_pkgname}-${pkgver} \
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index 463f69c88..819bb02ce 100644
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 184589 2013-05-07 13:30:07Z andrea $
+# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgbase=kdenetwork
 pkgname=('kdenetwork-kopete-libre')
-pkgver=4.10.3
+pkgver=4.10.4
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -17,10 +17,10 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp'
     'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
         'use-libotr3.patch')
-sha1sums=('9c5e14b1ebc575777d1e6d09b593f62940a4fd1d'
+sha1sums=('891277c8dcbf231452947e9b4c54324bad35fd1a'
           '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384')
 
-build() {
+prepare() {
     cd ${pkgbase}-${pkgver}
     patch -p1 -i "${srcdir}"/use-libotr3.patch
     cd ../
@@ -28,7 +28,9 @@ build() {
     sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' "${pkgbase}-${pkgver}/kopete/protocols/CMakeLists.txt"
     rm -rf "${pkgbase}-${pkgver}/kopete/protocols/skype"
     sed 's/, Skype//' -i "${pkgbase}-${pkgver}/doc/kopete/index.docbook"
+}
 
+build() {
 	mkdir build
 	cd build
 	cmake ../${pkgbase}-${pkgver} \
diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD
index 7ed1b1a01..007ed7f74 100644
--- a/libre/kdepim-libre/PKGBUILD
+++ b/libre/kdepim-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185074 2013-05-10 20:52:59Z tomegun $
+# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -22,8 +22,8 @@ pkgname=('kdepim-akonadiconsole-libre'
          'kdepim-ktimetracker-libre'
          'kdepim-ktnef-libre'
          'kdepim-libkdepim-libre')
-pkgver=4.10.3
-pkgrel=2
+pkgver=4.10.4
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pim.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -31,7 +31,7 @@ groups=('kde' 'kdepim-libre')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss'
              'kde-agent' 'nepomuk-widgets')
              source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz")
-sha1sums=('78ca9b822f905355ec00142a7de6c08c38b97c08')
+sha1sums=('b1b8bdefd8a7b21c3a4518285ef8fd73890e8cf3')
 
 build() {
 	mkdir build
diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD
index 90921bb7d..6b7a264ae 100644
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ b/libre/kdeutils-ark-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 184594 2013-05-07 13:30:17Z andrea $
+# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=kdeutils-ark
 pkgname=kdeutils-ark-libre
-pkgver=4.10.3
+pkgver=4.10.4
 pkgrel=1
 pkgdesc='Archiving Tool, with unar support'
 url='http://kde.org/applications/utilities/ark/'
@@ -20,7 +20,7 @@ replaces=('kdeutils-ark')
 conflicts=('kdeutils-ark')
 source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz"
         'ark-unar-06.patch')
-sha1sums=('26437751ddf6f466a948a402f253f66bfc19660e'
+sha1sums=('3b98f04817a31b14b8899ddf024b03ff14420ea7'
           'a0a836950f185d9b2245204579f969203036fdec')
 
 build() {
diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD
index d23deae0a..f9907d3f4 100644
--- a/libre/syslinux/PKGBUILD
+++ b/libre/syslinux/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 185894 2013-05-19 17:17:51Z tpowa $
+# $Id: PKGBUILD 187808 2013-06-06 07:51:31Z tpowa $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=syslinux
-pkgver=5.01
-pkgrel=4
+pkgver=5.10
+pkgrel=3
 arch=('i686' 'x86_64')
 pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)"
 url="http://www.syslinux.org"
@@ -25,7 +25,7 @@ source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.t
         syslinux.cfg
         syslinux-install_update
         splash.png)
-md5sums=('6c21244277fa4e444967ba45469de863'
+md5sums=('8f51d6a5d2730f534ba90e71f3347bff'
          '25af85a05e7b212b7fb8b7587175e492'
          'e5a69630e3f7083aad2d14362b6117b3'
          '4450792e13a0270c1b89bb6a66ce2fbc'
diff --git a/libre/syslinux/syslinux-install_update b/libre/syslinux/syslinux-install_update
index 6d52f7703..47d4d88be 100644
--- a/libre/syslinux/syslinux-install_update
+++ b/libre/syslinux/syslinux-install_update
@@ -334,7 +334,7 @@ _install() {
 update() {
     # Update c32 files in /boot, if /boot is not on same fs
     if [[ "$boot" = boot ]]; then
-        for file in "$bootpath"/*.{c32}; do
+        for file in "$bootpath"/*.c32; do
             file=${file##*/}
             cp "$libpath/$file" "$bootpath/$file" &> /dev/null
         done
diff --git a/pcr/drumkv1/PKGBUILD b/pcr/drumkv1/PKGBUILD
new file mode 100644
index 000000000..4a55012f6
--- /dev/null
+++ b/pcr/drumkv1/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Guest One <theguestone at gmail dot com>
+
+pkgname=drumkv1
+pkgver=0.3.3
+pkgrel=1
+pkgdesc="An old-school drum-kit sampler"
+arch=('i686' 'x86_64')
+url="http://$pkgname.sourceforge.net/$pkgname-index.html"
+license=('GPL')
+groups=('lv2-plugins')
+depends=('jack' 'liblo' 'lv2' 'qt4')
+install="$pkgname.install"
+source=("http://download.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('d7c7270fdd01552b74eead36dd638ea4')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # x86_64 lib path fix
+  sed -i "s/lib64/lib/" src/src_lv2.pro
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/drumkv1/drumkv1.install b/pcr/drumkv1/drumkv1.install
new file mode 100644
index 000000000..029294d67
--- /dev/null
+++ b/pcr/drumkv1/drumkv1.install
@@ -0,0 +1,12 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/pcr/lv2-ir/PKGBUILD b/pcr/lv2-ir/PKGBUILD
new file mode 100644
index 000000000..cdeaf7414
--- /dev/null
+++ b/pcr/lv2-ir/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Guest One <theguestone at gmail dot com>
+
+pkgname=lv2-ir
+pkgver=1.3.2
+pkgrel=1
+pkgdesc="zero-latency, realtime, high performance signal convolver especially for creating reverb effects."
+arch=('i686' 'x86_64')
+url="http://factorial.hu/plugins/lv2/ir"
+license=('GPL')
+depends=('zita-convolver' 'libsamplerate' 'gtk2')
+provides=('ir-lv2')
+conflicts=('ir-lv2')
+groups=('lv2-plugins')
+makedepends=('lv2core' )
+
+source=("http://factorial.hu/system/files/ir.lv2-${pkgver}.tar.gz")
+md5sums=('01140e1f70e7f4949f502eafc1958bcd')
+
+build() {
+  cd "$srcdir/ir.lv2-${pkgver}"
+  make
+  make convert4chan
+}
+
+package() {
+  cd "$srcdir/ir.lv2-${pkgver}"
+  make PREFIX="$pkgdir/usr" install
+  install -Dm755 convert4chan "$pkgdir/usr/bin/convert4chan"
+  # fixed location
+  sed -i 's/, but seem like its gone://' README
+  sed -i  's@rhythminmind.net/1313@rhythminmind.net/STN@' README
+  install -Dm644 README "${pkgdir}"/usr/share/doc/$pkgname/README
+}
diff --git a/pcr/monkeysphere/PKGBUILD b/pcr/monkeysphere/PKGBUILD
index d274631eb..f83e05741 100644
--- a/pcr/monkeysphere/PKGBUILD
+++ b/pcr/monkeysphere/PKGBUILD
@@ -4,15 +4,27 @@
 # $Id: PKGBUILD 264 2010-11-10 00:57:53Z shtrom $
 pkgname=monkeysphere
 pkgver=0.35
-pkgrel=4
+pkgrel=5
 pkgdesc="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
 arch=('any')
 url="http://web.monkeysphere.info/"
 license=('GPL3')
 depends=('gnupg' 'lockfile-progs' 'perl-crypt-openssl-rsa' 'perl-digest-sha1')
-source=(http://archive.monkeysphere.info/debian/pool/${pkgname}/m/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz)
+source=(http://archive.monkeysphere.info/debian/pool/${pkgname}/m/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz
+        binmerge.patch)
 install=monkeysphere.install
-md5sums=('481ac14c9fdef0ccd1944c593bd4f517')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  patch -Ni "${srcdir}/binmerge.patch"
+}
+
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make test
+}
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -20,3 +32,5 @@ package() {
   make DESTDIR="$pkgdir/" install
   mkdir -p $pkgdir/var/lib/monkeysphere
 } 
+md5sums=('481ac14c9fdef0ccd1944c593bd4f517'
+         'a8bd35dc7dd58b5952beeecafe5045a7')
diff --git a/pcr/monkeysphere/binmerge.patch b/pcr/monkeysphere/binmerge.patch
new file mode 100644
index 000000000..48d945511
--- /dev/null
+++ b/pcr/monkeysphere/binmerge.patch
@@ -0,0 +1,25 @@
+--- Makefile.orig	2013-06-07 13:02:23.123944233 -0300
++++ Makefile	2013-06-07 13:02:43.351065809 -0300
+@@ -36,17 +36,17 @@
+ # this target is to be called from the tarball, not from the git
+ # working dir!
+ install: all installman
+-	mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/sbin
++	mkdir -p $(DESTDIR)$(PREFIX)/bin
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/monkeysphere/m $(DESTDIR)$(PREFIX)/share/monkeysphere/mh $(DESTDIR)$(PREFIX)/share/monkeysphere/ma $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions
+ 	mkdir -p $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
+ 	printf "Monkeysphere %s\n" $(MONKEYSPHERE_VERSION) > $(DESTDIR)$(PREFIX)/share/monkeysphere/VERSION
+ 	install src/monkeysphere $(DESTDIR)$(PREFIX)/bin
+ 	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere
+-	install src/monkeysphere-host $(DESTDIR)$(PREFIX)/sbin
+-	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-host
+-	install src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin
+-	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication
++	install src/monkeysphere-host $(DESTDIR)$(PREFIX)/bin
++	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere-host
++	install src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/bin
++	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere-authentication
+ 	install src/monkeysphere-authentication-keys-for-user $(DESTDIR)$(PREFIX)/share/monkeysphere
+ 	install -m 0644 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere
+ 	install -m 0644 src/share/defaultenv $(DESTDIR)$(PREFIX)/share/monkeysphere
diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD
index 88f951d03..6fe28cc7c 100644
--- a/pcr/pandoc/PKGBUILD
+++ b/pcr/pandoc/PKGBUILD
@@ -3,19 +3,22 @@
 
 # Run `makepkg -sp SRCBUILD` if you want to update the source tarball
 
-pkgname=pandoc
+pkgname=pandoc-static
+_pkgname=pandoc
 pkgver=1.11.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Conversion between markup formats (no Haskell libs)'
 url='http://johnmacfarlane.net/pandoc/'
 license=('GPL')
 arch=('i686' 'x86_64')
 makedepends=('ghc' 'sh' 'cabal-install')
 options=(strip !makeflags !distcc !emptydirs)
-source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig}
+#source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig}
+source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-1-any.src.tar.xz{,.sig}
         SRCBUILD)
 #        citeproc-hs-pre-0.3.7.patch)
-conflicts=('haskell-pandoc')
+replaces=('pandoc')
+provides=('pandoc')
 optdepends=('texlive-most: for pdf creation')
 md5sums=('74acd042fcd85bee9edb093cc3fe5c2e'
          'SKIP'
@@ -23,13 +26,13 @@ md5sums=('74acd042fcd85bee9edb093cc3fe5c2e'
 
 # PKGBUILD functions
 build() {
-    mkdir -p ${srcdir}/{build,${pkgname}-${pkgver}}
-    cd ${srcdir}/${pkgname}-${pkgver}
+    mkdir -p ${srcdir}/{build,${_pkgname}-${pkgver}}
+    cd ${srcdir}/${_pkgname}-${pkgver}
 
 # Patches from the next citeproc-hs release
 # These are needed because 0.3.6 with embed_data_files is broken
 # darcs diff --from-tag=0.3.6
-#   pushd ${srcdir}/${pkgname}-${pkgver}/citeproc-hs-0.3.6
+#   pushd ${srcdir}/${_pkgname}-${pkgver}/citeproc-hs-0.3.6
 #   patch -Np1 -i ${srcdir}/citeproc-hs-pre-0.3.7.patch
 #   popd
 
@@ -37,29 +40,29 @@ build() {
 # Skip already built
        [ -d ${srcdir}/build/usr/lib/$_hkpkg ] && continue
 
-       pushd ${srcdir}/${pkgname}-${pkgver}/${_hkpkg} >/dev/null
+       pushd ${srcdir}/${_pkgname}-${pkgver}/${_hkpkg} >/dev/null
 
        msg2 "Building $_hkpkg"
 
        case $_hkpkg in
-        $pkgname-$pkgver)
-         HOME=${srcdir}/${pkgname}-${pkgver} \
+        $_pkgname-$pkgver)
+         HOME=${srcdir}/${_pkgname}-${pkgver} \
          cabal configure --flags='-library blaze_html_0_5' \
                          --prefix=/usr \
                          --libdir=${srcdir}/build/usr/lib -v
 
-         HOME=${srcdir}/${pkgname}-${pkgver} \
+         HOME=${srcdir}/${_pkgname}-${pkgver} \
          cabal build
          ;;
 
         citeproc-hs-*)
-         HOME=${srcdir}/${pkgname}-${pkgver} \
+         HOME=${srcdir}/${_pkgname}-${pkgver} \
          cabal install --flags='embed_data_files' \
                        --prefix=${srcdir}/build/usr -v
          ;;
 
         *)
-         HOME=${srcdir}/${pkgname}-${pkgver} \
+         HOME=${srcdir}/${_pkgname}-${pkgver} \
          cabal install --prefix=${srcdir}/build/usr
          ;;
        esac
@@ -70,7 +73,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}/${pkgname}-${pkgver}
+  cd ${srcdir}/${_pkgname}-${pkgver}/${_pkgname}-${pkgver}
 
   runghc Setup.hs copy --destdir=${pkgdir}/
 
@@ -81,7 +84,7 @@ package() {
 
 # EC is unfree and makes Parabola TeXLive cry
 # besides, it's unneeded
-  sed "/fontenc/d" -i ${pkgdir}/usr/share/${pkgname}-${pkgver}/data/templates/default.latex
+  sed "/fontenc/d" -i ${pkgdir}/usr/share/${_pkgname}-${pkgver}/data/templates/default.latex
 
   find ${pkgdir}/usr/share -type f -exec chmod 644 {} \;
   find ${pkgdir}/usr/share -type d -exec chmod 755 {} \;
diff --git a/pcr/setbfree/PKGBUILD b/pcr/setbfree/PKGBUILD
index 41cba9632..1b30f06c2 100644
--- a/pcr/setbfree/PKGBUILD
+++ b/pcr/setbfree/PKGBUILD
@@ -1,10 +1,10 @@
 # Maintainer: Guest One <theguestone at gmail dot com>
 
 pkgname=setbfree
-pkgver=0.5.5
+pkgver=0.7.2
 pkgrel=1
 pkgdesc="A DSP Tonewheel Organ emulator."
-arch=('i686')
+arch=('i686' 'x86_64')
 url="http://setbfree.org/"
 license=('GPL')
 depends=('jack' 'liblo' 'tk' 'desktop-file-utils')
@@ -12,7 +12,7 @@ makedepends=('lv2')
 install="$pkgname.install"
 source=("https://github.com/pantherb/setBfree/tarball/v$pkgver"
         "https://raw.github.com/pantherb/setBfree/master/debian/setbfree.desktop")
-md5sums=('604cc477a6fa76ee936f1d010c815c55'
+md5sums=('7b64947289687cbf71b9e87fdd006f36'
          '8c2a863562f26856dcff0a456cf36dcf')
 
 build() {
@@ -27,6 +27,20 @@ package() {
   # desktop file
   install -Dm644 ../$pkgname.desktop \
     "$pkgdir/usr/share/applications/$pkgname.desktop"
+
+  # icon
+  install -Dm644 doc/setBfree.png \
+    "$pkgdir/usr/share/icons/setBfree.png"
+
+  # man
+  install -d "$pkgdir/usr/share/man/man1"
+  install -Dm644 doc/*.1 \
+    "$pkgdir/usr/share/man/man1"
+
+  # docs
+  install -d "$pkgdir/usr/share/doc/$pkgname"
+  install -Dm644 doc/{midi.txt,signal_flow.png} \
+    "$pkgdir/usr/share/doc/$pkgname"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/pcr/setbfree/setbfree.desktop b/pcr/setbfree/setbfree.desktop
deleted file mode 100644
index 0e9d14452..000000000
--- a/pcr/setbfree/setbfree.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=setBfree
-GenericName=DSP tonewheel organ
-Comment=MIDI-controlled, software synthesizer using JACK
-Icon=setBfree
-Exec=setBfree-start
-Terminal=false
-Categories=AudioVideo;Audio;
diff --git a/pcr/synthv1/PKGBUILD b/pcr/synthv1/PKGBUILD
index a0d858664..1a96b84f8 100644
--- a/pcr/synthv1/PKGBUILD
+++ b/pcr/synthv1/PKGBUILD
@@ -1,16 +1,17 @@
 # Maintainer: Guest One <theguestone at gmail dot com>
 
 pkgname=synthv1
-pkgver=0.3.2
+pkgver=0.3.3
 pkgrel=1
 pkgdesc="An old-school all-digital 4-oscillator subtractive polyphonic synthesizer with stereo fx"
-arch=('i686')
+arch=('i686' 'x86_64')
 url="http://$pkgname.sourceforge.net/$pkgname-index.html"
 license=('GPL')
-depends=('lv2' 'jack' 'qt4')
+groups=('lv2-plugins')
+depends=('jack' 'liblo' 'lv2' 'qt4')
 install="$pkgname.install"
 source=("http://download.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('88fd93df7cd6754de355edb5fe3cb3e7')
+md5sums=('18bd21921ee65b718b2feb1d0ab03ac7')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/pcr/synthv1/synthv1.install b/pcr/synthv1/synthv1.install
index bce670aff..029294d67 100644
--- a/pcr/synthv1/synthv1.install
+++ b/pcr/synthv1/synthv1.install
@@ -1,5 +1,5 @@
 post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
   update-desktop-database -q
 }
 
diff --git a/pcr/zita-convolver/PKGBUILD b/pcr/zita-convolver/PKGBUILD
new file mode 100644
index 000000000..5017f144f
--- /dev/null
+++ b/pcr/zita-convolver/PKGBUILD
@@ -0,0 +1,36 @@
+# Maintainer : Guest One <theguestone at gmail dot com>
+
+pkgname=zita-convolver
+pkgver=3.1.0
+pkgrel=1
+pkgdesc="Convolution library for aeolus and jconvolver"
+arch=('i686' 'x86_64')
+url="http://kokkinizita.linuxaudio.org/linuxaudio"
+license=('GPL')
+depends=('fftw' 'gcc-libs')
+source=("http://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-convolver-$pkgver.tar.bz2")
+md5sums=('7e264d0fb0d8ea277cdb4e33d764c68a')
+
+build() {
+  cd "$srcdir/zita-convolver-$pkgver/libs"
+
+  sed -i 's/usr\/local/usr/' Makefile
+  sed -i 's/ldconfig//' Makefile
+
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver/libs"
+
+  make SUFFIX="" PREFIX="$pkgdir/usr" DESTDIR=${PKGDIR} install 
+
+
+  # Another failed attempt at trying to be clever. A simple call to ldconfig might have worked.
+  #  ln -s lib$pkgname.so.$pkgver \
+  #    "$pkgdir/usr/lib/lib$pkgname.so.${pkgver%%.*}"
+  
+  #  ln -s lib${pkgname}.so.$pkgver ${pkgdir}/usr/lib/lib${pkgname}.so
+}
+
+