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

6 files changed, 54 insertions, 10 deletions

diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD
index 14af90cc6..517ff84ef 100644
--- a/libre/cups-filters-libre/PKGBUILD
+++ b/libre/cups-filters-libre/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 183882 2013-04-29 10:46:59Z foutrelis $
+# $Id: PKGBUILD 185774 2013-05-18 15:32:58Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=cups-filters-libre
 _pkgname=cups-filters
 pkgver=1.0.34
-pkgrel=3
+pkgrel=4
 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation"
 arch=('i686' 'x86_64')
 url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
 license=('GPL')
-depends=('lcms2' 'poppler>=0.22.3' 'qpdf>=4.0.0')
+depends=('lcms2' 'poppler>=0.22.4' 'qpdf>=4.0.0')
 makedepends=('ghostscript' 'ttf-dejavu') # ttf-dejavu for make check
 optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images'
 	    'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly'
@@ -20,7 +20,7 @@ options=(!libtool)
 source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz
         cups-browsed.service)
 md5sums=('fea9cad6bbb14ab0635243ed5d1d5c77'
-         '4c9f97eae201798000483c4e7109e690')
+         '9ef68d7c2a84713fd421f4e87dec0a6e')
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 provides=("${_pkgname}=${pkgver}")
@@ -29,6 +29,7 @@ build() {
   cd "$srcdir/$_pkgname-$pkgver"
   ./configure --prefix=/usr  \
     --sysconfdir=/etc \
+    --sbindir=/usr/bin \
     --with-rcdir=no \
     --enable-avahi \
     --with-browseremoteprotocols=DNSSD,CUPS \
diff --git a/libre/cups-filters-libre/cups-browsed.service b/libre/cups-filters-libre/cups-browsed.service
index 144956c7f..07b342d62 100644
--- a/libre/cups-filters-libre/cups-browsed.service
+++ b/libre/cups-filters-libre/cups-browsed.service
@@ -4,7 +4,7 @@ After=cups.service avahi-daemon.service
 Wants=cups.service avahi-daemon.service
 
 [Service]
-ExecStart=/usr/sbin/cups-browsed
+ExecStart=/usr/bin/cups-browsed
 
 [Install]
 WantedBy=multi-user.target
diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index c5843d4e7..a002aa3f7 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183993 2013-04-30 14:22:00Z foutrelis $
+# $Id: PKGBUILD 185904 2013-05-19 18:27:14Z remy $
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
 # Contributor: francois <francois.archlinux.org>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
@@ -6,7 +6,7 @@
 
 pkgname=texlive-bin-libre
 pkgver=2012.0
-pkgrel=11
+pkgrel=12
 pkgdesc="TeX Live binaries, without biber binaries (Parabola rebranded)"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/libre/unar/PKGBUILD b/libre/unar/PKGBUILD
index 6aa9ae4fb..8fe6b165c 100644
--- a/libre/unar/PKGBUILD
+++ b/libre/unar/PKGBUILD
@@ -4,15 +4,15 @@
 
 pkgname=unar
 pkgver=1.6
-pkgrel=1
+pkgrel=2
 pkgdesc="An Objective-C application for uncompressing archive files"
 arch=('x86_64' 'i686' 'mips64el')
 url="http://unarchiver.c3.cx/"
 license=('LGPL2.1')
-depends=('gnustep-base' 'openssl' 'bzip2' 'icu=51.1' 'gcc-libs' 'zlib')
+depends=('gnustep-base' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib')
 makedepends=('gcc-objc')
 replaces=("unarchiver")
-conflicts=("unarchiver")
+conflicts=("unarchiver" 'icu<51')
 provides=("unarchiver")
 source=("http://theunarchiver.googlecode.com/files/${pkgname}${pkgver}_src.zip"
         "native_obj_exceptions.patch")
diff --git a/pcr/nekobee/PKGBUILD b/pcr/nekobee/PKGBUILD
new file mode 100644
index 000000000..164b50ac9
--- /dev/null
+++ b/pcr/nekobee/PKGBUILD
@@ -0,0 +1,23 @@
+# Maintainer: Guest One <theguestone at gmail dot com>
+
+pkgname=nekobee
+pkgver=0.1.8
+pkgrel=1
+pkgdesc="A TB303-style synthesizer for DSSI"
+url="https://github.com/gordonjcp/nekobee"
+depends=('liblo' 'gtk2')
+makedepends=('dssi' 'python' 'ladspa')
+arch=('i686')
+license=('GPL')
+source=("https://github.com/gordonjcp/${pkgname}/archive/${pkgver}.tar.gz"
+        "nekobee.patch")
+md5sums=('5954ac49043bc80588be72a9b9a9b28f'
+         '8dde87ad9b2a8500c51d773b25b7984f')
+
+build() {
+cd $startdir/src/$pkgname-$pkgver
+patch -p1 -i $srcdir/$pkgname.patch
+./waf configure --prefix=/usr
+./waf
+DESTDIR=$startdir/pkg ./waf install
+}
diff --git a/pcr/nekobee/nekobee.patch b/pcr/nekobee/nekobee.patch
new file mode 100644
index 000000000..dd995c357
--- /dev/null
+++ b/pcr/nekobee/nekobee.patch
@@ -0,0 +1,20 @@
+diff -aur nekobee-0.1.8/wscript nekobee-0.1.8.new/wscript
+--- nekobee-0.1.8/wscript	2010-09-12 21:34:13.000000000 +0200
++++ nekobee-0.1.8.new/wscript	2013-05-25 22:47:23.923441000 +0200
+@@ -31,7 +31,7 @@
+     # DSSI plugin
+     plugin_dssi = bld.new_task_gen('cc', 'shlib')
+     plugin_dssi.env['shlib_PATTERN'] = '%s.so'
+-    plugin_dssi.env.append_value("LINKFLAGS", "-module -avoid-version -Wc,-nostartfiles")
++    plugin_dssi.env.append_value("LINKFLAGS", "-lm")
+     plugin_dssi.includes = ['.', 'src']
+     plugin_dssi.defines = 'HAVE_CONFIG_H'
+     plugin_dssi.source = [
+@@ -49,6 +49,7 @@
+ 
+     # DSSI UI executable
+     gui_gtk = bld.new_task_gen('cc', 'program')
++    gui_gtk.env.append_value("LINKFLAGS", "-lm")
+     gui_gtk.includes = ['.', 'src']
+     gui_gtk.defines = 'HAVE_CONFIG_H'
+     gui_gtk.source = [