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

4 files changed, 36 insertions, 9 deletions

diff --git a/libre/linux-libre-manpages/PKGBUILD b/libre/linux-libre-manpages/PKGBUILD
index 92f3778ca..f8ce261db 100644
--- a/libre/linux-libre-manpages/PKGBUILD
+++ b/libre/linux-libre-manpages/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 142395 2011-11-08 23:03:12Z thomas $
+# $Id: PKGBUILD 185172 2013-05-11 17:49:25Z thomas $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=linux-libre-manpages
-pkgver=3.1
-pkgrel=1.3
+pkgver=3.9
+pkgrel=1
 pkgdesc="Kernel hackers manual - Section 9 manpages that comes with the linux-libre kernel"
 arch=('any')
 url="http://linux-libre.fsfla.org/"
@@ -15,7 +15,7 @@ replaces=('kernel26-manpages' 'kernel26-libre-manpages' 'linux-manpages')
 conflicts=('kernel26-manpages' 'kernel26-libre-manpages' 'linux-manpages')
 provides=('kernel26-manpages' 'linux-manpages')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/linux-libre-${pkgver}-gnu.tar.xz")
-md5sums=('38703cdbb0b9107e7220bc094c5e36b1')
+md5sums=('120df29f88622dabf7015a22c7cc8e25')
 
 build() {
   cd "${srcdir}/linux-$pkgver"
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 56434d802..394563806 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 90492 2013-05-12 22:55:40Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
@@ -13,7 +13,7 @@ _basekernel=3.9
 #_sublevel=6
 _pkgver=$_basekernel.$_sublevel
 pkgver=$_basekernel
-pkgrel=1
+pkgrel=2
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
@@ -38,7 +38,7 @@ sha256sums=('62f113b4bd9ee832e8906da970c5bf4585c057af4eab14ec6ad57e9b2fd084ef'
             '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f'
             'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e'
             'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc'
-            '8053a6bcd0776a7fefccc5012f93a1710653529e0eab59afcc39f24361c64869')
+            '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f')
 
 build() {
   # apply stable patching set
@@ -83,7 +83,7 @@ build() {
   # fix missing man page
   sed -i 's/usbip_bind_driver.8//' Makefile.am
   ./autogen.sh
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --sbindir=/usr/bin
   make
   popd
 }
@@ -143,6 +143,7 @@ package_cpupower-libre() {
   pushd linux-$pkgver/tools/power/cpupower
   make \
     DESTDIR="$pkgdir" \
+    sbindir='/usr/bin' \
     mandir='/usr/share/man' \
     docdir='/usr/share/doc/cpupower' \
     install install-man
diff --git a/libre/linux-libre-tools/usbipd.service b/libre/linux-libre-tools/usbipd.service
index 1f3da08db..1807e94b1 100644
--- a/libre/linux-libre-tools/usbipd.service
+++ b/libre/linux-libre-tools/usbipd.service
@@ -3,7 +3,7 @@ Description=USB/IP server
 After=network.target
 
 [Service]
-ExecStart=/usr/sbin/usbipd
+ExecStart=/usr/bin/usbipd
 
 [Install]
 WantedBy=multi-user.target
diff --git a/pcr/amsynth/PKGBUILD b/pcr/amsynth/PKGBUILD
new file mode 100644
index 000000000..58c097cf4
--- /dev/null
+++ b/pcr/amsynth/PKGBUILD
@@ -0,0 +1,26 @@
+# Mantainer: Guest One <theguestone at gmail dot com>
+
+pkgname=amsynth
+pkgver=1.3.2
+pkgrel=1
+pkgdesc="Analogue Modeling SYNTHesizer"
+arch=('i686')
+url="http://code.google.com/p/amsynth/"
+license=('GPL')
+depends=('gtkmm' 'jack')
+source=(http://amsynth.googlecode.com/files/amSynth-${pkgver}.tar.gz)
+md5sums=('991329e433bb8c496f9ca5158faf0bca')
+
+build() {
+  cd ${srcdir}/amSynth-${pkgver}
+
+  sed -i -e 's|/amSynth|/amsynth|' src/main.cc
+
+  autoreconf --force --install
+  ./configure --prefix=/usr
+  make
+
+  install -Dm755 src/amSynth ${pkgdir}/usr/bin/amSynth
+  mkdir -p ${pkgdir}/usr/share/${pkgname}
+  install -m644 skel/{Controllersrc,presets} ${pkgdir}/usr/share/${pkgname}/
+}