Merge branch 'master' of vparabola:abslibre

Conflicts: libre/pacman/PKGBUILD
author: Nicolás Reynolds <fauno@endefensadelsl.org> 2014-06-04 16:03:12 -0300
committer: Nicolás Reynolds <fauno@endefensadelsl.org> 2014-06-04 16:03:12 -0300
commit: 6320403e34f67650b789aa2f0909c1671fe29d45 (patch)
tree: 6b34d83542e08a434122d51bee5bd53c76d5f7d2
parent: e6d75a76602a8d1f1022589c77b5ba754f62975a (diff)
parent: 5a53dfa50322787f5a4d8af16743c83cab48f0fa (diff)
34 files changed, 407 insertions, 499 deletions
diff --git a/java/byaccj/PKGBUILD b/java/byaccj/PKGBUILD
new file mode 100644
index 000000000..6ae2317fd
--- /dev/null
+++ b/java/byaccj/PKGBUILD
@@ -0,0 +1,36 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR): <ying@althonx4>
+
+pkgname=byaccj
+pkgver=1.15
+pkgdesc="Berkeley yacc with Java output"
+url="http://byaccj.sourceforge.net/"
+license=('custom:Public Domain')
+
+pkgrel=1
+arch=('i686' 'x86_64')
+source=(http://downloads.sourceforge.net/project/byaccj/${pkgname}/${pkgver}/${pkgname}${pkgver}_src.tar.gz
+        http://metadata.ftp-master.debian.org/changelogs/main/b/byacc-j/byacc-j_${pkgver}-1_copyright
+        ldflags.patch)
+md5sums=('5ee9959af35f245ac2c4355f85fdf351'
+         'cc9e2ed821e7f2e5ef8f2be0fdc97b46'
+         '76fd678b41d614497cf77c6dba5de63e')
+
+prepare() {
+  cd "$srcdir"/$pkgname$pkgver
+  patch -Np1 -i ../ldflags.patch
+}
+
+build() {
+  cd "$srcdir"/$pkgname$pkgver
+  make -C src linux CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+}
+
+package() {
+  cd "$srcdir"/$pkgname$pkgver
+  install -Dm755 src/yacc.linux "$pkgdir"/usr/bin/byaccj
+  install -Dm644 src/yacc.1     "$pkgdir"/usr/share/man/man1/byaccj.1
+  install -d                    "$pkgdir"/usr/share/doc/$pkgname
+  install  -m644 docs/*      -t "$pkgdir"/usr/share/doc/$pkgname
+  install -Dm644 ../byacc-j_$pkgver-1_copyright "$pkgdir"/usr/share/licenses/$pkgname/copyright
+}
diff --git a/java/byaccj/ldflags.patch b/java/byaccj/ldflags.patch
new file mode 100644
index 000000000..81574d011
--- /dev/null
+++ b/java/byaccj/ldflags.patch
@@ -0,0 +1,12 @@
+diff -ru byaccj1.15.orig/src/Makefile byaccj1.15/src/Makefile
+--- byaccj1.15.orig/src/Makefile	2014-06-04 11:10:43.711980001 -0400
++++ byaccj1.15/src/Makefile	2014-06-04 11:13:00.635987894 -0400
+@@ -75,7 +75,7 @@
+ 	$(CC) -c $(CFLAGS) $(INC) $< -o $@
+ 
+ yacc: $(OBJ)
+-	$(CC) -o yacc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 $(OBJ)
++	$(CC) -o yacc $(LDFLAGS) $(OBJ)
+ 	@echo "done"
+ 
+ clean:
diff --git a/kernels/linux-libre-pae/0004-fs-Don-t-return-0-from-get_anon_bdev.patch b/kernels/linux-libre-pae/0004-fs-Don-t-return-0-from-get_anon_bdev.patch
deleted file mode 100644
index 5e4a27f06..000000000
--- a/kernels/linux-libre-pae/0004-fs-Don-t-return-0-from-get_anon_bdev.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 835a463e190af87a36df681863db7c3ea7ba0d66 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
-Date: Thu, 3 Apr 2014 21:55:37 +0200
-Subject: [PATCH 04/10] fs: Don't return 0 from get_anon_bdev
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 9e30cc9595303b27b48 removed an internal mount. This
-has the side-effect that rootfs now has FSID 0. Many
-userspace utilities assume that st_dev in struct stat
-is never 0, so this change breaks a number of tools in
-early userspace.
-
-Since we don't know how many userspace programs are affected,
-make sure that FSID is at least 1.
-
-References: http://article.gmane.org/gmane.linux.kernel/1666905
-References: http://permalink.gmane.org/gmane.linux.utilities.util-linux-ng/8557
-Cc: 3.14 <stable@vger.kernel.org>
-Signed-off-by: Thomas Bächler <thomas@archlinux.org>
----
- fs/super.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/fs/super.c b/fs/super.c
-index 80d5cf2..7624267 100644
---- a/fs/super.c
-+++ b/fs/super.c
-@@ -802,7 +802,10 @@ void emergency_remount(void)
- 
- static DEFINE_IDA(unnamed_dev_ida);
- static DEFINE_SPINLOCK(unnamed_dev_lock);/* protects the above */
--static int unnamed_dev_start = 0; /* don't bother trying below it */
-+/* Many userspace utilities consider an FSID of 0 invalid.
-+ * Always return at least 1 from get_anon_bdev.
-+ */
-+static int unnamed_dev_start = 1;
- 
- int get_anon_bdev(dev_t *p)
- {
--- 
-1.9.2
-
diff --git a/kernels/linux-libre-pae/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch b/kernels/linux-libre-pae/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch
deleted file mode 100644
index 2840f190c..000000000
--- a/kernels/linux-libre-pae/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/net/core/dev.c b/net/core/dev.c
-index 45fa2f1..6088927 100644
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -2289,7 +2289,7 @@ EXPORT_SYMBOL(skb_checksum_help);
- __be16 skb_network_protocol(struct sk_buff *skb, int *depth)
- {
- 	__be16 type = skb->protocol;
--	int vlan_depth = ETH_HLEN;
-+	int vlan_depth = skb->mac_len;
- 
- 	/* Tunnel gso handlers can set protocol to ethernet. */
- 	if (type == htons(ETH_P_TEB)) {
diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD
index 6b20f933e..73e6a725d 100644
--- a/kernels/linux-libre-pae/PKGBUILD
+++ b/kernels/linux-libre-pae/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 212338 2014-05-13 15:06:31Z tpowa $
+# $Id: PKGBUILD 213942 2014-06-01 05:52:43Z tpowa $
 # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>
 # Contributor (Arch): Thomas Baechler <thomas@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
@@ -6,7 +6,7 @@
 pkgbase=linux-libre-pae     # Build stock -LIBRE-PAE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.14
-pkgver=${_basekernel}.4
+pkgver=${_basekernel}.5
 pkgrel=1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
@@ -24,16 +24,14 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         '0001-Bluetooth-allocate-static-minor-for-vhci.patch'
         '0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch'
         '0003-module-remove-MODULE_GENERIC_TABLE.patch'
-        '0004-fs-Don-t-return-0-from-get_anon_bdev.patch'
         '0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch'
         '0006-genksyms-fix-typeof-handling.patch'
         '0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch'
         '0011-kernfs-fix-removed-error-check.patch'
         '0012-fix-saa7134.patch'
-        '0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch'
         '0015-fix-xsdt-validation.patch')
 sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
-            '01de5e15a2081197859e617c441de5cac9ddf60bed6fcf4dcff7a54e210e7815'
+            '0bc9acbcc6d5fcabcc133a767c55e3040475e950ef80f866038d4ba0033e78d8'
             'fa4a0141d51dd76d6b57980278a95614d53c51af1cdf983789ed546a47302e2c'
             '292d5c553f87246c8dc2d57cadfd2db92a3750173b4588d53c2919743171eca5'
             '8303b426b1a6dce456b2350003558ae312d21cab0ae6c1f0d7b9d21395f4e177'
@@ -41,13 +39,11 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
             '6d72e14552df59e6310f16c176806c408355951724cd5b48a47bf01591b8be02'
             '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29'
             '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d'
-            '1e1ae0f31f722e80da083ecada1f1be57f9ddad133941820c4483b0240e494c1'
             '3fffb01cf97a5a7ab9601cb277d2468c0fb1e1cceba4225915f3ffae3a5694ec'
             'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7'
             'c0af4622f75c89fef62183e18b7d49998228d4eaa906c6accaf4aa4ff0134f85'
             '04f44bf5c181d6dc31905937c1bdccb0f5aecaad3a579e99b302502b9cbe0f7a'
             '79359454c9d8446eb55add2b1cdbf8332bd67dafb01fefb5b1ca090225f64d18'
-            'f2a5e22c1ba6e9b8a32a7bd4a5327ee95538aa10edcee3cd12578f8ff49bf6be'
             '384dd13fd4248fd6809da8c6ae29ced55d4a5cacc33ac2ae7522093ec0fb26d4')
 
 _kernelname=${pkgbase#linux-libre}
@@ -78,10 +74,6 @@ prepare() {
   patch -p1 -i "${srcdir}/0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch"
   patch -p1 -i "${srcdir}/0003-module-remove-MODULE_GENERIC_TABLE.patch"
 
-  # Fix various bugs caused by rootfs having FSID 0
-  # See http://www.spinics.net/lists/kernel/msg1716924.html
-  patch -p1 -i "${srcdir}/0004-fs-Don-t-return-0-from-get_anon_bdev.patch"
-
   # Disable usb autosuspend for intel btusb
   # See http://www.spinics.net/lists/kernel/msg1716461.html
   # Until a solution is found, make sure the driver leaves autosuspend alone
@@ -104,11 +96,6 @@ prepare() {
   # https://bugzilla.kernel.org/show_bug.cgi?id=73361
   patch -Np1 -i "${srcdir}/0012-fix-saa7134.patch"
 
-  # fix tun/openvpn performance
-  # https://bugs.archlinux.org/task/40089
-  # https://bugzilla.kernel.org/show_bug.cgi?id=74051
-  patch -Np1 -i "${srcdir}/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch"
-
   # fix xsdt validation bug
   # https://bugs.archlinux.org/task/39811
   # https://bugzilla.kernel.org/show_bug.cgi?id=73911
@@ -172,7 +159,6 @@ _package() {
   make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install
   cp arch/${KARCH}/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}"
 
-
   # set correct depmod command for install
   cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
   true && install=${install}.pkg
diff --git a/kernels/linux-libre-xen/0004-fs-Don-t-return-0-from-get_anon_bdev.patch b/kernels/linux-libre-xen/0004-fs-Don-t-return-0-from-get_anon_bdev.patch
deleted file mode 100644
index 5e4a27f06..000000000
--- a/kernels/linux-libre-xen/0004-fs-Don-t-return-0-from-get_anon_bdev.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 835a463e190af87a36df681863db7c3ea7ba0d66 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
-Date: Thu, 3 Apr 2014 21:55:37 +0200
-Subject: [PATCH 04/10] fs: Don't return 0 from get_anon_bdev
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 9e30cc9595303b27b48 removed an internal mount. This
-has the side-effect that rootfs now has FSID 0. Many
-userspace utilities assume that st_dev in struct stat
-is never 0, so this change breaks a number of tools in
-early userspace.
-
-Since we don't know how many userspace programs are affected,
-make sure that FSID is at least 1.
-
-References: http://article.gmane.org/gmane.linux.kernel/1666905
-References: http://permalink.gmane.org/gmane.linux.utilities.util-linux-ng/8557
-Cc: 3.14 <stable@vger.kernel.org>
-Signed-off-by: Thomas Bächler <thomas@archlinux.org>
----
- fs/super.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/fs/super.c b/fs/super.c
-index 80d5cf2..7624267 100644
---- a/fs/super.c
-+++ b/fs/super.c
-@@ -802,7 +802,10 @@ void emergency_remount(void)
- 
- static DEFINE_IDA(unnamed_dev_ida);
- static DEFINE_SPINLOCK(unnamed_dev_lock);/* protects the above */
--static int unnamed_dev_start = 0; /* don't bother trying below it */
-+/* Many userspace utilities consider an FSID of 0 invalid.
-+ * Always return at least 1 from get_anon_bdev.
-+ */
-+static int unnamed_dev_start = 1;
- 
- int get_anon_bdev(dev_t *p)
- {
--- 
-1.9.2
-
diff --git a/kernels/linux-libre-xen/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch b/kernels/linux-libre-xen/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch
deleted file mode 100644
index 2840f190c..000000000
--- a/kernels/linux-libre-xen/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/net/core/dev.c b/net/core/dev.c
-index 45fa2f1..6088927 100644
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -2289,7 +2289,7 @@ EXPORT_SYMBOL(skb_checksum_help);
- __be16 skb_network_protocol(struct sk_buff *skb, int *depth)
- {
- 	__be16 type = skb->protocol;
--	int vlan_depth = ETH_HLEN;
-+	int vlan_depth = skb->mac_len;
- 
- 	/* Tunnel gso handlers can set protocol to ethernet. */
- 	if (type == htons(ETH_P_TEB)) {
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index a79d138c7..78a742a33 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 212338 2014-05-13 15:06:31Z tpowa $
+# $Id: PKGBUILD 213942 2014-06-01 05:52:43Z tpowa $
 # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>
 # Contributor (Arch): Thomas Baechler <thomas@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
@@ -6,7 +6,7 @@
 pkgbase=linux-libre-xen     # Build stock -LIBRE-XEN kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.14
-pkgver=${_basekernel}.4
+pkgver=${_basekernel}.5
 pkgrel=1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
@@ -24,13 +24,11 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         '0001-Bluetooth-allocate-static-minor-for-vhci.patch'
         '0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch'
         '0003-module-remove-MODULE_GENERIC_TABLE.patch'
-        '0004-fs-Don-t-return-0-from-get_anon_bdev.patch'
         '0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch'
         '0006-genksyms-fix-typeof-handling.patch'
         '0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch'
         '0011-kernfs-fix-removed-error-check.patch'
         '0012-fix-saa7134.patch'
-        '0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch'
         '0015-fix-xsdt-validation.patch')
 sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
             '01de5e15a2081197859e617c441de5cac9ddf60bed6fcf4dcff7a54e210e7815'
@@ -41,13 +39,11 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
             '6d72e14552df59e6310f16c176806c408355951724cd5b48a47bf01591b8be02'
             '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29'
             '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d'
-            '1e1ae0f31f722e80da083ecada1f1be57f9ddad133941820c4483b0240e494c1'
             '3fffb01cf97a5a7ab9601cb277d2468c0fb1e1cceba4225915f3ffae3a5694ec'
             'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7'
             'c0af4622f75c89fef62183e18b7d49998228d4eaa906c6accaf4aa4ff0134f85'
             '04f44bf5c181d6dc31905937c1bdccb0f5aecaad3a579e99b302502b9cbe0f7a'
             '79359454c9d8446eb55add2b1cdbf8332bd67dafb01fefb5b1ca090225f64d18'
-            'f2a5e22c1ba6e9b8a32a7bd4a5327ee95538aa10edcee3cd12578f8ff49bf6be'
             '384dd13fd4248fd6809da8c6ae29ced55d4a5cacc33ac2ae7522093ec0fb26d4')
 
 _kernelname=${pkgbase#linux-libre}
@@ -78,10 +74,6 @@ prepare() {
   patch -p1 -i "${srcdir}/0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch"
   patch -p1 -i "${srcdir}/0003-module-remove-MODULE_GENERIC_TABLE.patch"
 
-  # Fix various bugs caused by rootfs having FSID 0
-  # See http://www.spinics.net/lists/kernel/msg1716924.html
-  patch -p1 -i "${srcdir}/0004-fs-Don-t-return-0-from-get_anon_bdev.patch"
-
   # Disable usb autosuspend for intel btusb
   # See http://www.spinics.net/lists/kernel/msg1716461.html
   # Until a solution is found, make sure the driver leaves autosuspend alone
@@ -104,11 +96,6 @@ prepare() {
   # https://bugzilla.kernel.org/show_bug.cgi?id=73361
   patch -Np1 -i "${srcdir}/0012-fix-saa7134.patch"
 
-  # fix tun/openvpn performance
-  # https://bugs.archlinux.org/task/40089
-  # https://bugzilla.kernel.org/show_bug.cgi?id=74051
-  patch -Np1 -i "${srcdir}/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch"
-
   # fix xsdt validation bug
   # https://bugs.archlinux.org/task/39811
   # https://bugzilla.kernel.org/show_bug.cgi?id=73911
@@ -172,7 +159,6 @@ _package() {
   make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install
   cp arch/${KARCH}/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}"
 
-
   # set correct depmod command for install
   cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
   true && install=${install}.pkg
diff --git a/libre/acpi_call-libre/PKGBUILD b/libre/acpi_call-libre/PKGBUILD
index 2fd6569a6..84eabd29c 100644
--- a/libre/acpi_call-libre/PKGBUILD
+++ b/libre/acpi_call-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 108706 2014-04-01 22:24:11Z thomas $
+# $Id: PKGBUILD 112482 2014-06-02 19:16:06Z foutrelis $
 # Maintainer (Arch): Maxime Gauduin <alucryd@gmail.com>
 # Contributor (Arch): mortzu <me@mortzu.de>
 # Contributor (Arch): fnord0 <fnord0@riseup.net>
@@ -7,7 +7,7 @@
 _pkgname=acpi_call
 pkgname=acpi_call-libre
 pkgver=1.1.0
-pkgrel=3
+pkgrel=4
 _extramodules=extramodules-3.14-LIBRE
 pkgdesc='A linux kernel module that enables calls to ACPI methods through /proc/acpi/call (built for the linux-libre kernel package)'
 arch=('i686' 'x86_64')
diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD
index e054cb2c7..9964d4e98 100644
--- a/libre/bbswitch-libre/PKGBUILD
+++ b/libre/bbswitch-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 108708 2014-04-01 22:26:43Z thomas $
+# $Id: PKGBUILD 112484 2014-06-02 19:16:18Z foutrelis $
 # Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor (Arch): M0Rf30
 # Contributor (Arch): Samsagax <samsagax@gmail.com>
@@ -8,7 +8,7 @@ _pkgname=bbswitch
 pkgname=bbswitch-libre
 pkgver=0.8
 _extramodules=extramodules-3.14-LIBRE # Don't forget to update bbswitch.install
-pkgrel=7
+pkgrel=8
 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url=("http://github.com/Bumblebee-Project/bbswitch")
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index 5c3f7b52f..74e2d75fb 100644
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 212682 2014-05-14 20:07:22Z svenstaro $
+# $Id: PKGBUILD 214073 2014-06-03 09:46:26Z andrea $
 # Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 _pkgname=kdenetwork-kopete
 pkgname=kdenetwork-kopete-libre
 pkgver=4.13.1
-pkgrel=1
+pkgrel=3
 pkgdesc='Instant Messenger, without nonfree Skype support'
 url='http://kde.org/applications/internet/kopete/'
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,9 +14,9 @@ groups=('kde' 'kdenetwork')
 replaces=($_pkgname)
 conflicts=($_pkgname)
 provides=($_pkgname=$pkgver)
-depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn' 'libidn'
+depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libidn'
          'qimageblitz' 'libgadu' 'mediastreamer' 'jsoncpp')
-makedepends=('cmake' 'automoc4' 'boost')
+makedepends=('cmake' 'automoc4' 'boost' 'kdepim-libkdepim')
 install=${_pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz")
 sha1sums=('99e47bba25606fdccbe1ac04346e9c3acad254d1')
@@ -24,8 +24,7 @@ sha1sums=('99e47bba25606fdccbe1ac04346e9c3acad254d1')
 prepare() {
   cd kopete-${pkgver}
   # Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34.
-  sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' protocols/CMakeLists.txt
-  rm -rf protocols/skype
+  rm -rv protocols/skype
   sed 's/, Skype//' -i doc/index.docbook
   cd ..
   mkdir build
@@ -37,7 +36,9 @@ build() {
     -DCMAKE_BUILD_TYPE=Release \
     -DKDE4_BUILD_TESTS=OFF \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_SKIP_RPATH=ON
+    -DCMAKE_SKIP_RPATH=ON \
+    -DWITH_Libmsn=OFF \
+    -DWITH_skype=OFF
   make
 }
 
diff --git a/libre/linux-libre-grsec/0004-fs-Don-t-return-0-from-get_anon_bdev.patch b/libre/linux-libre-grsec/0004-fs-Don-t-return-0-from-get_anon_bdev.patch
deleted file mode 100644
index 5e4a27f06..000000000
--- a/libre/linux-libre-grsec/0004-fs-Don-t-return-0-from-get_anon_bdev.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 835a463e190af87a36df681863db7c3ea7ba0d66 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
-Date: Thu, 3 Apr 2014 21:55:37 +0200
-Subject: [PATCH 04/10] fs: Don't return 0 from get_anon_bdev
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 9e30cc9595303b27b48 removed an internal mount. This
-has the side-effect that rootfs now has FSID 0. Many
-userspace utilities assume that st_dev in struct stat
-is never 0, so this change breaks a number of tools in
-early userspace.
-
-Since we don't know how many userspace programs are affected,
-make sure that FSID is at least 1.
-
-References: http://article.gmane.org/gmane.linux.kernel/1666905
-References: http://permalink.gmane.org/gmane.linux.utilities.util-linux-ng/8557
-Cc: 3.14 <stable@vger.kernel.org>
-Signed-off-by: Thomas Bächler <thomas@archlinux.org>
----
- fs/super.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/fs/super.c b/fs/super.c
-index 80d5cf2..7624267 100644
---- a/fs/super.c
-+++ b/fs/super.c
-@@ -802,7 +802,10 @@ void emergency_remount(void)
- 
- static DEFINE_IDA(unnamed_dev_ida);
- static DEFINE_SPINLOCK(unnamed_dev_lock);/* protects the above */
--static int unnamed_dev_start = 0; /* don't bother trying below it */
-+/* Many userspace utilities consider an FSID of 0 invalid.
-+ * Always return at least 1 from get_anon_bdev.
-+ */
-+static int unnamed_dev_start = 1;
- 
- int get_anon_bdev(dev_t *p)
- {
--- 
-1.9.2
-
diff --git a/libre/linux-libre-grsec/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch b/libre/linux-libre-grsec/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch
deleted file mode 100644
index 2840f190c..000000000
--- a/libre/linux-libre-grsec/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/net/core/dev.c b/net/core/dev.c
-index 45fa2f1..6088927 100644
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -2289,7 +2289,7 @@ EXPORT_SYMBOL(skb_checksum_help);
- __be16 skb_network_protocol(struct sk_buff *skb, int *depth)
- {
- 	__be16 type = skb->protocol;
--	int vlan_depth = ETH_HLEN;
-+	int vlan_depth = skb->mac_len;
- 
- 	/* Tunnel gso handlers can set protocol to ethernet. */
- 	if (type == htons(ETH_P_TEB)) {
diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD
index 582efe043..154cbc40e 100644
--- a/libre/linux-libre-grsec/PKGBUILD
+++ b/libre/linux-libre-grsec/PKGBUILD
@@ -12,13 +12,13 @@
 pkgbase=linux-libre-grsec   # Build stock -LIBRE-GRSEC kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.14
-_sublevel=4
+_sublevel=5
 _grsecver=3.0
-_timestamp=201405281922
+_timestamp=201406021708
 _pkgver=${_basekernel}.${_sublevel}
 pkgver=${_basekernel}.${_sublevel}.${_timestamp}
 pkgrel=1
-_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.5 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="https://grsecurity.net/"
 license=('GPL2')
@@ -39,19 +39,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         '0001-Bluetooth-allocate-static-minor-for-vhci.patch'
         '0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch'
         '0003-module-remove-MODULE_GENERIC_TABLE.patch'
-        '0004-fs-Don-t-return-0-from-get_anon_bdev.patch'
         '0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch'
         '0006-genksyms-fix-typeof-handling.patch'
         '0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch'
         '0011-kernfs-fix-removed-error-check.patch'
         '0012-fix-saa7134.patch'
-        '0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch'
         '0015-fix-xsdt-validation.patch'
         'sysctl.conf'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz")
 sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
-            '01de5e15a2081197859e617c441de5cac9ddf60bed6fcf4dcff7a54e210e7815'
-            '5b1a2efe49736d3b0417f3b76df779de4166fe5890489491e1d0b99fed653b57'
+            '0bc9acbcc6d5fcabcc133a767c55e3040475e950ef80f866038d4ba0033e78d8'
+            '8695054d1a1bd02acd2a08b1268eb65349f6877b1be1a00251dcbc5dd95a5a00'
             'SKIP'
             'a82a5b673dae3f1aa8124e91c485cb8648623d560b7543da63fffab2606443d6'
             '51e86aeeb4fadbb2ead2b4af115f0bfd04afb83c9959856e3495d704cec55db6'
@@ -63,16 +61,14 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
             '6d72e14552df59e6310f16c176806c408355951724cd5b48a47bf01591b8be02'
             '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29'
             '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d'
-            '1e1ae0f31f722e80da083ecada1f1be57f9ddad133941820c4483b0240e494c1'
             '3fffb01cf97a5a7ab9601cb277d2468c0fb1e1cceba4225915f3ffae3a5694ec'
             'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7'
             'c0af4622f75c89fef62183e18b7d49998228d4eaa906c6accaf4aa4ff0134f85'
             '04f44bf5c181d6dc31905937c1bdccb0f5aecaad3a579e99b302502b9cbe0f7a'
             '79359454c9d8446eb55add2b1cdbf8332bd67dafb01fefb5b1ca090225f64d18'
-            'f2a5e22c1ba6e9b8a32a7bd4a5327ee95538aa10edcee3cd12578f8ff49bf6be'
             '384dd13fd4248fd6809da8c6ae29ced55d4a5cacc33ac2ae7522093ec0fb26d4'
             'e734ac2a6e865b70dbe1e55ce55a5bd1b1e0cedea903c6341b9cfbabe420c763'
-            '3cd53473e049a4809d9dde8ebef73307ce87076d707f3fd5c100844d4a9e8255')
+            '4f1db7c68dbff6d80258de4074af46b989cedcda175776b567cd4658b33c9f99')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -111,10 +107,6 @@ prepare() {
   patch -p1 -i "${srcdir}/0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch"
   patch -p1 -i "${srcdir}/0003-module-remove-MODULE_GENERIC_TABLE.patch"
 
-  # Fix various bugs caused by rootfs having FSID 0
-  # See http://www.spinics.net/lists/kernel/msg1716924.html
-  patch -p1 -i "${srcdir}/0004-fs-Don-t-return-0-from-get_anon_bdev.patch"
-
   # Disable usb autosuspend for intel btusb
   # See http://www.spinics.net/lists/kernel/msg1716461.html
   # Until a solution is found, make sure the driver leaves autosuspend alone
@@ -127,7 +119,7 @@ prepare() {
   # https://git.kernel.org/cgit/linux/kernel/git/iwlwifi/iwlwifi-fixes.git/commit/?id=12f853a89e29f50b17698e17e73c328a35f1498d
   # FS#39815
   patch -p1 -i "${srcdir}/0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch"
-
+  
   # fix Xorg crash with i810 chipset due to wrong removed error check
   # References: http://lkml.kernel.org/g/533D01BD.1010200@googlemail.com
   patch -Np1 -i "${srcdir}/0011-kernfs-fix-removed-error-check.patch"
@@ -137,11 +129,6 @@ prepare() {
   # https://bugzilla.kernel.org/show_bug.cgi?id=73361
   patch -Np1 -i "${srcdir}/0012-fix-saa7134.patch"
 
-  # fix tun/openvpn performance
-  # https://bugs.archlinux.org/task/40089
-  # https://bugzilla.kernel.org/show_bug.cgi?id=74051
-  patch -Np1 -i "${srcdir}/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch"
-
   # fix xsdt validation bug
   # https://bugs.archlinux.org/task/39811
   # https://bugzilla.kernel.org/show_bug.cgi?id=73911
diff --git a/libre/linux-libre/0004-fs-Don-t-return-0-from-get_anon_bdev.patch b/libre/linux-libre/0004-fs-Don-t-return-0-from-get_anon_bdev.patch
deleted file mode 100644
index 5e4a27f06..000000000
--- a/libre/linux-libre/0004-fs-Don-t-return-0-from-get_anon_bdev.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 835a463e190af87a36df681863db7c3ea7ba0d66 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
-Date: Thu, 3 Apr 2014 21:55:37 +0200
-Subject: [PATCH 04/10] fs: Don't return 0 from get_anon_bdev
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 9e30cc9595303b27b48 removed an internal mount. This
-has the side-effect that rootfs now has FSID 0. Many
-userspace utilities assume that st_dev in struct stat
-is never 0, so this change breaks a number of tools in
-early userspace.
-
-Since we don't know how many userspace programs are affected,
-make sure that FSID is at least 1.
-
-References: http://article.gmane.org/gmane.linux.kernel/1666905
-References: http://permalink.gmane.org/gmane.linux.utilities.util-linux-ng/8557
-Cc: 3.14 <stable@vger.kernel.org>
-Signed-off-by: Thomas Bächler <thomas@archlinux.org>
----
- fs/super.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/fs/super.c b/fs/super.c
-index 80d5cf2..7624267 100644
---- a/fs/super.c
-+++ b/fs/super.c
-@@ -802,7 +802,10 @@ void emergency_remount(void)
- 
- static DEFINE_IDA(unnamed_dev_ida);
- static DEFINE_SPINLOCK(unnamed_dev_lock);/* protects the above */
--static int unnamed_dev_start = 0; /* don't bother trying below it */
-+/* Many userspace utilities consider an FSID of 0 invalid.
-+ * Always return at least 1 from get_anon_bdev.
-+ */
-+static int unnamed_dev_start = 1;
- 
- int get_anon_bdev(dev_t *p)
- {
--- 
-1.9.2
-
diff --git a/libre/linux-libre/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch b/libre/linux-libre/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch
deleted file mode 100644
index 2840f190c..000000000
--- a/libre/linux-libre/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/net/core/dev.c b/net/core/dev.c
-index 45fa2f1..6088927 100644
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -2289,7 +2289,7 @@ EXPORT_SYMBOL(skb_checksum_help);
- __be16 skb_network_protocol(struct sk_buff *skb, int *depth)
- {
- 	__be16 type = skb->protocol;
--	int vlan_depth = ETH_HLEN;
-+	int vlan_depth = skb->mac_len;
- 
- 	/* Tunnel gso handlers can set protocol to ethernet. */
- 	if (type == htons(ETH_P_TEB)) {
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index d6b5755dc..9f0dda4ef 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 212338 2014-05-13 15:06:31Z tpowa $
+# $Id: PKGBUILD 213942 2014-06-01 05:52:43Z tpowa $
 # Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer (Arch): Thomas Baechler <thomas@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
@@ -10,10 +10,10 @@
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.14
-_sublevel=4
+_sublevel=5
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.3 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.5 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -32,17 +32,15 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         '0001-Bluetooth-allocate-static-minor-for-vhci.patch'
         '0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch'
         '0003-module-remove-MODULE_GENERIC_TABLE.patch'
-        '0004-fs-Don-t-return-0-from-get_anon_bdev.patch'
         '0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch'
         '0006-genksyms-fix-typeof-handling.patch'
         '0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch'
         '0011-kernfs-fix-removed-error-check.patch'
         '0012-fix-saa7134.patch'
-        '0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch'
         '0015-fix-xsdt-validation.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz")
 sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
-            '01de5e15a2081197859e617c441de5cac9ddf60bed6fcf4dcff7a54e210e7815'
+            '0bc9acbcc6d5fcabcc133a767c55e3040475e950ef80f866038d4ba0033e78d8'
             '71891ae6903598f4686e86fdb0d371ff9e179e8dac1d2cf60ca16c5190916745'
             'fca0060bde385e2c292489087af0aa5f48da594221a6d162fc6f8ba2159571e8'
             'dfe01c93d83cdac9ca502715ceb6ac9502d327c939fec2e3052a5a58422dc176'
@@ -53,15 +51,13 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
             '6d72e14552df59e6310f16c176806c408355951724cd5b48a47bf01591b8be02'
             '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29'
             '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d'
-            '1e1ae0f31f722e80da083ecada1f1be57f9ddad133941820c4483b0240e494c1'
             '3fffb01cf97a5a7ab9601cb277d2468c0fb1e1cceba4225915f3ffae3a5694ec'
             'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7'
             'c0af4622f75c89fef62183e18b7d49998228d4eaa906c6accaf4aa4ff0134f85'
             '04f44bf5c181d6dc31905937c1bdccb0f5aecaad3a579e99b302502b9cbe0f7a'
             '79359454c9d8446eb55add2b1cdbf8332bd67dafb01fefb5b1ca090225f64d18'
-            'f2a5e22c1ba6e9b8a32a7bd4a5327ee95538aa10edcee3cd12578f8ff49bf6be'
             '384dd13fd4248fd6809da8c6ae29ced55d4a5cacc33ac2ae7522093ec0fb26d4'
-            '43d975e9c9c68de131005a87c3c755fadef1eaed6c551bcafd08f2746f9d71fd')
+            '4f1db7c68dbff6d80258de4074af46b989cedcda175776b567cd4658b33c9f99')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -96,10 +92,6 @@ prepare() {
   patch -p1 -i "${srcdir}/0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch"
   patch -p1 -i "${srcdir}/0003-module-remove-MODULE_GENERIC_TABLE.patch"
 
-  # Fix various bugs caused by rootfs having FSID 0
-  # See http://www.spinics.net/lists/kernel/msg1716924.html
-  patch -p1 -i "${srcdir}/0004-fs-Don-t-return-0-from-get_anon_bdev.patch"
-
   # Disable usb autosuspend for intel btusb
   # See http://www.spinics.net/lists/kernel/msg1716461.html
   # Until a solution is found, make sure the driver leaves autosuspend alone
@@ -122,11 +114,6 @@ prepare() {
   # https://bugzilla.kernel.org/show_bug.cgi?id=73361
   patch -Np1 -i "${srcdir}/0012-fix-saa7134.patch"
 
-  # fix tun/openvpn performance
-  # https://bugs.archlinux.org/task/40089
-  # https://bugzilla.kernel.org/show_bug.cgi?id=74051
-  patch -Np1 -i "${srcdir}/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch"
-
   # fix xsdt validation bug
   # https://bugs.archlinux.org/task/39811
   # https://bugzilla.kernel.org/show_bug.cgi?id=73911
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index f446e6e72..774d45321 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=pacman
 pkgver=4.1.2
-pkgrel=6
+pkgrel=6.1
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.archlinux.org/pacman/"
@@ -28,6 +28,15 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
         gpg.conf
         sks-keyservers.netCA.pem
         refresh-pacman-keys)
+md5sums=('063c8b0ff6bdf903dc235445525627cd'
+         'SKIP'
+         '688feb0a552f42643a76f72e7198bfe4'
+         '77c5fd379e73cf86fc08a4bd5c4b1ba1'
+         '9e0c64937ef751ae4273fa4d73381484'
+         'f0f310df411f943dbc4e2dd376c88662'
+         '8c339b2bf027979d1edcfc6ac0e7e81d'
+         '3cfc5d2867a6672f4f629220632948f4'
+         '093f0779ac55ae781ba028ad74b95f84')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index d52136e63..e5db4a11d 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 108712 2014-04-01 22:34:00Z thomas $
+# $Id: PKGBUILD 112490 2014-06-02 19:17:04Z foutrelis $
 # Maintainer (Arch): Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor (Arch): xduugu
 # Contributor (Arch): nh2
@@ -12,7 +12,7 @@
 _pkgname=tp_smapi
 pkgname=tp_smapi-libre
 pkgver=0.41
-pkgrel=45
+pkgrel=46
 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/evgeni/tp_smapi'
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index e94daedc2..aa7417af2 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 108714 2014-04-01 22:36:58Z thomas $
+# $Id: PKGBUILD 112492 2014-06-02 19:17:18Z foutrelis $
 # Maintainer (Arch): Ray Rashif <schiv@archlinux.org>
 # Contributor (Arch): Mateusz Herych <heniekk@gmail.com>
 # Contributor (Arch): Charles Lindsay <charles@chaoslizard.org>
@@ -8,7 +8,7 @@ _pkgname=vhba-module
 pkgname=vhba-module-libre
 pkgver=20130607
 _extramodules=extramodules-3.14-LIBRE
-pkgrel=25
+pkgrel=26
 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cdemu.sourceforge.net/"
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
index 363970604..167f2a659 100644
--- a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 212682 2014-05-14 20:07:22Z svenstaro $
+# $Id: PKGBUILD 214073 2014-06-03 09:46:26Z andrea $
 # Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 _pkgname=kdenetwork-kopete
 pkgname=kdenetwork-kopete-libre-nonprism
 pkgver=4.13.1
-pkgrel=1
+pkgrel=3
 pkgdesc='Instant Messenger, without nonfree Skype support and support for unsafe and dangerous for privacy protocols'
 url='http://kde.org/applications/internet/kopete/'
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ conflicts=($_pkgname)
 provides=($_pkgname=$pkgver)
 depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libidn'
          'qimageblitz' 'mediastreamer' 'jsoncpp')
-makedepends=('cmake' 'automoc4' 'boost')
+makedepends=('cmake' 'automoc4' 'boost' 'kdepim-libkdepim')
 install=${_pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz"
         'libre-nonprism.patch')
@@ -26,25 +26,15 @@ sha1sums=('99e47bba25606fdccbe1ac04346e9c3acad254d1'
 prepare() {
   cd kopete-${pkgver}
   # Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34.
-  sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' protocols/CMakeLists.txt
-  rm -rf protocols/skype
+  rm -rv protocols/skype
   # remove unsafe/dangerous services
-  sed -i 's/Oscar (ICQ and AIM) protocol" ON/Oscar (ICQ and AIM) protocol" OFF/g' protocols/CMakeLists.txt
-  rm -rf protocols/oscar
-  sed -i 's/Yahoo protocol" ON/Yahoo protocol" OFF/g' protocols/CMakeLists.txt
-  rm -rf protocols/yahoo
-  sed -i 's/QQ protocol" ON/QQ protocol" OFF/g' protocols/CMakeLists.txt
-  rm -rf protocols/qq
-  sed -i 's/Novell GroupWise Messenger protocol" ON/Novell GroupWise Messenger protocol" OFF/g' protocols/CMakeLists.txt
-  rm -rf protocols/groupwise
-  sed -i 's/Gadu-Gadu protocol" ON/Gadu-Gadu protocol" OFF/g' protocols/CMakeLists.txt
-  rm -rf protocols/gadu
-  sed -i 's/Google Talk support" ON/Google Talk support" OFF/g' protocols/CMakeLists.txt
-  sed -i 's/Window Live Messenger support" ON/Window Live Messenger support" OFF/g' protocols/CMakeLists.txt
-  rm -rf protocols/wlm
-  sed -i 's/Windows Live Messenger voice clip support" ON/Windows Live Messenger voice clip support" OFF/g' protocols/CMakeLists.txt
-  sed -i 's/meanwhile protocol" ON/meanwhile protocol" OFF/g' protocols/CMakeLists.txt
-  rm -rf protocols/meanwhile
+  rm -rv protocols/oscar
+  rm -rv protocols/yahoo
+  rm -rv protocols/qq
+  rm -rv protocols/groupwise
+  rm -rv protocols/gadu
+  rm -rv protocols/wlm
+  rm -rv protocols/meanwhile
   patch -p1 -i "${srcdir}"/libre-nonprism.patch
   cd ..
   mkdir build
@@ -56,7 +46,19 @@ build() {
     -DCMAKE_BUILD_TYPE=Release \
     -DKDE4_BUILD_TESTS=OFF \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_SKIP_RPATH=ON
+    -DCMAKE_SKIP_RPATH=ON \
+    -DWITH_Libmsn=OFF \
+    -DWITH_Libgadu=OFF \
+    -DWITH_skype=OFF \
+    -DWITH_oscar=OFF \
+    -DWITH_yahoo=OFF \
+    -DWITH_qq=OFF \
+    -DWITH_groupwise=OFF \
+    -DWITH_gadu=OFF \
+    -DWITH_GOOGLETALK=OFF \
+    -DWITH_wlm=OFF \
+    -DWITH_WLM_MEDIASTREAMER=OFF \
+    -DWITH_meanwhile=OFF
   make
 }
 
diff --git a/pcr/libnatpmp/PKGBUILD b/pcr/libnatpmp/PKGBUILD
deleted file mode 100644
index f427dfbfb..000000000
--- a/pcr/libnatpmp/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer (Arch): Pierre Bourdon <delroth@gmail.com>
-# Maintainer: Parabola Gnu / Linux-libre Aurélien Desbrières
-
-pkgname=libnatpmp
-pkgver=20120821
-pkgrel=2
-pkgdesc="A portable and fully compliant implementation of the NAT-PMP protocol"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://miniupnp.free.fr/libnatpmp.html"
-license=('custom:BSD')
-depends=('glibc')
-makedepends=()
-source=(http://miniupnp.free.fr/files/download.php?file=libnatpmp-$pkgver.tar.gz)
-md5sums=('d2b9c2dedba3a00deb0e7589982ceced')
-
-build() {
-    cd "$srcdir/$pkgname-$pkgver"
-    make
-}
-
-package() {
-    cd "$srcdir/$pkgname-$pkgver"
-    make INSTALLPREFIX="$pkgdir/usr" \
-         INSTALLDIRINC="$pkgdir/usr/include/libnatpmp" install
-
-    # Needed by some packages
-    install -m 644 getgateway.h declspec.h "$pkgdir/usr/include/libnatpmp"
-
-    install -Dm 644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/pcr/maruku/PKGBUILD b/pcr/maruku/PKGBUILD
new file mode 100644
index 000000000..bc8400737
--- /dev/null
+++ b/pcr/maruku/PKGBUILD
@@ -0,0 +1,22 @@
+# Contributor: Adam Lloyd <lloyda2 (at) rpi (dot) edu>
+# Maintainer : Parabola GNU / Linux-libre Aurélien DESBIÈRES <aurelien@hackers.camp>
+
+pkgname=maruku
+pkgver=0.6.1
+pkgrel=2
+pkgdesc="A Markdown-superset interpreter"
+arch=(any)
+url="http://maruku.rubyforge.org/"
+license=('GPL2')
+depends=(ruby ruby-syntax)
+makedepends=(rubygems)
+source=(http://gems.rubyforge.org/gems/maruku-$pkgver.gem)
+noextract=(maruku-$pkgver.gem)
+
+build() {
+  cd $srcdir
+  local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
+  gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" maruku-$pkgver.gem
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/mediatomb/PKGBUILD b/pcr/mediatomb/PKGBUILD
index ee2f996e0..562f7fc19 100644
--- a/pcr/mediatomb/PKGBUILD
+++ b/pcr/mediatomb/PKGBUILD
@@ -1,30 +1,33 @@
-# Contributor (Arch): Peter Richard Lewis <plewis@aur.archlinux.org>
-# Contributor (Arch): William Rea <sillywilly@gmail.com>
-# Contributor (Arch): Nikhil Bysani <nikron@gmail.com>
-# Contributor (Arch): Mika HynnÃ¤ <igheax@gmail.com>
-# Contributor (Arch): Jonathan Conder <jonno.conder@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
+# Contributor: Martin Villagra <mvillagra0@gmail.com>
+# Contributor: William Rea <sillywilly@gmail.com>
+# Contributor: Nikhil Bysani <nikron@gmail.com>
+# Contributor: Mika HynnÃ¤ <igheax@gmail.com>
+# Contributor: Jonathan Conder <jonno.conder@gmail.com>
+# Contributor: Peter Richard Lewis <plewis@aur.archlinux.org>
+# Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES <aurelien@hackers.camp>
 
 pkgname=mediatomb
 pkgver=0.12.1
-pkgrel=11
+pkgrel=12
 pkgdesc="Free UPnP/DLNA media server"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'armv6h')
 url="http://mediatomb.cc/"
 license=('GPL')
-depends=('file' 'curl' 'ffmpegthumbnailer' 'js' 'libexif' 'libmp4v2' 'sqlite3' 'taglib' 'libmysqlclient')
-optdepends=('mysql: to store your music database in mysql')
+depends=('file' 'curl' 'ffmpegthumbnailer' 'libexif' 'libmp4v2' 'sqlite3' 'taglib' 'libmariadbclient' 'js185')
+optdepends=('mariadb: to store your music database in mariadb')
 backup=('etc/conf.d/mediatomb')
 install=mediatomb.install
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
-        'mediatomb.rc'
+        'mediatomb.service'
+        'mediatomb-mariadb.service'
         'mediatomb.conf'
         'gcc46.patch'
         'tonewjs.patch'
         'jsparse.patch'
         'libav_0.7_support.patch'
         'libmp4v2_191_p497.patch'
-        'libavformat.patch')
+        'libavformat.patch'
+        'symlinks.patch')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -34,6 +37,7 @@ build() {
   patch -Np1 -i "$srcdir/libav_0.7_support.patch"
   patch -Np1 -i "$srcdir/libmp4v2_191_p497.patch"
   patch -Np1 -i "$srcdir/libavformat.patch"
+  patch -Np1 -i "$srcdir/symlinks.patch"
 
   ./configure --prefix=/usr \
               --enable-mysql \
@@ -48,16 +52,7 @@ package() {
 
   make DESTDIR="$pkgdir/" install
 
-  install -D -m0755 "$srcdir/mediatomb.rc" "$pkgdir/etc/rc.d/mediatomb"
-  install -D -m0755 "$srcdir/mediatomb.conf" "$pkgdir/etc/conf.d/mediatomb"
-  install -d "$pkgdir/var/lib/mediatomb"
+  install -D -m0644 "$srcdir/mediatomb.service" "$pkgdir/usr/lib/systemd/system/mediatomb.service"
+  install -D -m0644 "$srcdir/mediatomb-mariadb.service" "$pkgdir/usr/lib/systemd/system/mediatomb-mariadb.service"
+  install -D -m0644 "$srcdir/mediatomb.conf" "$pkgdir/etc/conf.d/mediatomb"
 }
-sha256sums=('31163c34a7b9d1c9735181737cb31306f29f1f2a0335fb4f53ecccf8f62f11cd'
-            '1a67a1deb8a41467fe9bbf66358a255f0df97b0170a5fc3d48c1f768c8d328b9'
-            'ba9753a4a380d4c717c987efec03a3c6d401d3ff93a6fced28098adbd3a44cc9'
-            '0c02a20032f0c296800b1bb9644638970c2dedbc5ab7141d66a637235e9da6ce'
-            '2cd8f5628c3a38b290526f008bae351b90211825f86e5959bf95f140748de574'
-            'd9a3062858900d32b977f0d50d168fd7d36785b6ecc038c019e661e27f7b1c17'
-            'c6523e8bf5e2da89b7475d6777ef9bffe7d089752ef2f7b27b5e39a4130fb0ff'
-            'd39c2f9aab051c5447461718fd0ec72cf5982f6c920a4a985a50831f34babe84'
-            '76b11706d70ed8f5e157d96ca441c90c46c42176102fcb651b4ab1102b61bfee')
diff --git a/pcr/mediatomb/mediatomb-mariadb.service b/pcr/mediatomb/mediatomb-mariadb.service
new file mode 100644
index 000000000..5b83f1d78
--- /dev/null
+++ b/pcr/mediatomb/mediatomb-mariadb.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=MediaTomb Daemon using MariaDB
+After=mysql.target network.target
+
+[Service]
+EnvironmentFile=/etc/conf.d/mediatomb
+ExecStart=/usr/bin/mediatomb -p $MT_PORT -u $MT_USER -g $MT_GROUP \
+  -P $MT_PIDFILE -l $MT_LOGFILE -m $MT_HOME -f $MT_CFGDIR $MT_OPTIONS
+Restart=on-failure
+RestartSec=5
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/mediatomb/mediatomb.conf b/pcr/mediatomb/mediatomb.conf
index 798018d2a..c2b435f92 100644
--- a/pcr/mediatomb/mediatomb.conf
+++ b/pcr/mediatomb/mediatomb.conf
@@ -6,8 +6,8 @@
 MT_PORT='50500'
 
 # User and group to run as
-MT_USER='nobody'
-MT_GROUP='nobody'
+MT_USER='mediatomb'
+MT_GROUP='mediatomb'
 
 # Location of the PID file
 MT_PIDFILE='/var/run/mediatomb.pid'
diff --git a/pcr/mediatomb/mediatomb.install b/pcr/mediatomb/mediatomb.install
index 56f6ef92c..27f71d5a4 100644
--- a/pcr/mediatomb/mediatomb.install
+++ b/pcr/mediatomb/mediatomb.install
@@ -1,9 +1,20 @@
 post_install() {
+  post_upgrade
+  passwd -l mediatomb &>/dev/null
   echo 'Warning: the MediaTomb web interface exposes your filesystem to the network'
   echo 'For maximum security, set <ui enabled="no"> in your MediaTomb config file'
 }
 
 post_upgrade() {
-  # TODO: disable next update
-  post_install
+  # create user/group that the daemon will run as by default, do not delete this on uninstall, as it will own files
+  getent group mediatomb >/dev/null || groupadd -g 241 mediatomb &>/dev/null
+  getent passwd mediatomb >/dev/null || useradd -c 'Mediatomb DLNA Server' -u 241 -g mediatomb -b '/var/lib' -m -s /bin/false mediatomb &>/dev/null
+
+  echo 'Attention: By default, MediaTomb now runs as its own user: mediatomb.'
+  echo 'Ensuring ownership of /var/lib/mediatomb is mediatomb:mediatomb...'
+  chown -R mediatomb:mediatomb /var/lib/mediatomb &>/dev/null
+  echo
+  echo 'Please note that the old rc script has been replaced with systemd service files.'
+  echo
 }
+
diff --git a/pcr/mediatomb/mediatomb.service b/pcr/mediatomb/mediatomb.service
new file mode 100644
index 000000000..e9869cfb5
--- /dev/null
+++ b/pcr/mediatomb/mediatomb.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=MediaTomb Daemon
+After=network.target
+
+[Service]
+EnvironmentFile=/etc/conf.d/mediatomb
+ExecStart=/usr/bin/mediatomb -p $MT_PORT -u $MT_USER -g $MT_GROUP \
+  -P $MT_PIDFILE -l $MT_LOGFILE -m $MT_HOME -f $MT_CFGDIR $MT_OPTIONS
+Restart=on-failure
+RestartSec=5
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/mediatomb/symlinks.patch b/pcr/mediatomb/symlinks.patch
new file mode 100644
index 000000000..8028f2201
--- /dev/null
+++ b/pcr/mediatomb/symlinks.patch
@@ -0,0 +1,42 @@
+--- mediatomb-0.12.1.orig/src/autoscan_inotify.cc	2010-03-25 10:58:11.000000000 -0400
++++ mediatomb-0.12.1/src/autoscan_inotify.cc	2012-06-18 02:40:11.000000000 -0400
+@@ -281,7 +281,7 @@
+                     }
+                 }
+                 
+-                if (adir != nil && mask & (IN_DELETE | IN_DELETE_SELF | IN_MOVE_SELF | IN_CLOSE_WRITE | IN_MOVED_FROM | IN_MOVED_TO | IN_UNMOUNT))
++                if (adir != nil && mask & (IN_DELETE | IN_DELETE_SELF | IN_MOVE_SELF | IN_CLOSE_WRITE | IN_MOVED_FROM | IN_MOVED_TO | IN_UNMOUNT | IN_CREATE))
+                 {
+                     String fullPath;
+                     if (mask & IN_ISDIR)
+@@ -312,16 +312,17 @@
+                         if (objectID != INVALID_OBJECT_ID)
+                             cm->removeObject(objectID);
+                     }
+-                    if (mask & (IN_CLOSE_WRITE | IN_MOVED_TO))
++                    if (mask & (IN_CLOSE_WRITE | IN_MOVED_TO | IN_CREATE))
+                     {
+                         log_debug("adding %s\n", path.c_str());
+                         // path, recursive, async, hidden, low priority, cancellable
+                         cm->addFile(fullPath, adir->getRecursive(), true, adir->getHidden(), true, false);
+                         
+-                        if (mask & IN_ISDIR)
++                        if (mask & IN_ISDIR && !(mask & IN_CREATE))
+                             monitorUnmonitorRecursive(path, false, adir, watchAs->getNormalizedAutoscanPath(), false);
+                     }
+                 }
++
+                 if (mask & IN_IGNORED)
+                 {
+                     removeWatchMoves(wd);
+--- mediatomb-0.12.1.orig/src/content_manager.cc	2010-03-25 10:58:11.000000000 -0400
++++ mediatomb-0.12.1/src/content_manager.cc	2012-06-18 02:03:55.000000000 -0400
+@@ -202,7 +202,7 @@
+ #ifdef HAVE_MAGIC
+     if (! ignore_unknown_extensions)
+     {
+-        ms = magic_open(MAGIC_MIME);
++        ms = magic_open(MAGIC_MIME|MAGIC_SYMLINK);
+         if (ms == NULL)
+         {
+			 log_error("magic_open failed\n");
diff --git a/pcr/mit-scheme/PKGBUILD b/pcr/mit-scheme/PKGBUILD
index 7ab2e544e..c39cd6353 100644
--- a/pcr/mit-scheme/PKGBUILD
+++ b/pcr/mit-scheme/PKGBUILD
@@ -1,80 +1,33 @@
-# Contributor (Arch): peter feigl <peter.feigl@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
+# Contributor (Arch)   : Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Contributor (Arch)   : peter feigl <peter.feigl@gmail.com>
+# Maintainer (Parabola): Aurélien DESBRIÈRES <aurelien@hackers.camp>
 
 pkgname=mit-scheme
-pkgver=9.1.1
+pkgver=9.2
 pkgrel=1
-pkgdesc="MIT/GNU Scheme"
-arch=('x86_64' i686)
+pkgdesc='MIT/GNU Scheme'
+arch=('i686' 'x86_64')
 license=('GPL')
-url="http://www.gnu.org/software/mit-scheme/"
-groups=
-provides=('mit-scheme')
-depends=('libx11' 'texinfo' 'texlive-core')
-optdepends=('mhash: support for mhash' 'gdbm: support for gdbm'
-  'postgresql-libs: support for postresql' 'openssl: support for openssl'
-  'mcrypt: support for mcrypt' 'db: support for berkeley db')
-_my_arch=$(uname -m)
-if [ ${_my_arch} = "x86_64" ]
-then
-_my_arch="x86-64"
-md5sums=('268cb5ac97646f34742828ebc370586d')
+url='http://www.gnu.org/software/mit-scheme/'
+depends=('glibc' 'ncurses' 'zlib')
+optdepends=('openssl: support for openssl')
+
+if [[ $CARCH == i686 ]]; then
+  _arch=i386
 else
-_my_arch="i386"
-md5sums=('e35590a06549d71edba723a719329070')
+  _arch=x86-64
 fi
-
-source=("http://ftp.gnu.org/gnu/mit-scheme/stable.pkg/${pkgver}/${pkgname}-${pkgver}-${_my_arch}.tar.gz")
+source=(http://ftp.gnu.org/gnu/$pkgname/stable.pkg/$pkgver/$pkgname-$pkgver-$_arch.tar.gz)
 
 build() {
-  cd $startdir/src/${pkgname}-${pkgver}/src
-  ./configure --with-x --enable-native-code --prefix=/usr || return 1
-  make compile-microcode || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  # TODO: add indexer
-  echo Making Documentation
-  cd ../doc && ./configure --prefix=/usr && make -j 1 && make DESTDIR=${pkgdir} install && rm ${pkgdir}/usr/share/info/dir && mv ${pkgdir}/usr/share/man/man1/scheme.1 ${pkgdir}/usr/share/man/man1/mit-scheme.1 || return 0
-}
-
-
-infodir=usr/share/info
-
-filelist=(mit-scheme-ffi.info mit-scheme-imail.info mit-scheme-ref.info mit-scheme-sos.info mit-scheme-user.info)
-
-
-
-post_install() {
-
-  [[ -x usr/bin/install-info ]] || return 0
-
-  for file in "${filelist[@]}"; do
-
-    install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
-
-  done
-
+  cd $pkgname-$pkgver/src
+  ./configure --prefix=/usr \
+    --with-x \
+    --enable-native-code
+  make
 }
 
-
-
-post_upgrade() {
-
-  post_install "$1"
-
-}
-
-
-
-pre_remove() {
-
-  [[ -x usr/bin/install-info ]] || return 1
-
-  for file in "${filelist[@]}"; do
-
-    install-info --delete "$infodir/$file.gz" "$infodir/dir" 2>/dev/null
-
-  done
-
+package() {
+  cd $pkgname-$pkgver/src
+  make DESTDIR="$pkgdir" install
 }
-
-md5sums=('e35590a06549d71edba723a719329070')
diff --git a/pcr/mycron-git/PKGBUILD b/pcr/mycron-git/PKGBUILD
index c80b79b1d..d9eb795b6 100644
--- a/pcr/mycron-git/PKGBUILD
+++ b/pcr/mycron-git/PKGBUILD
@@ -1,12 +1,14 @@
-# Contributor (Arch): Dirk Sohler <spam@0x7be.de>               
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
+# Contributor (Arch)    : Dirk Sohler <spam@0x7be.de>               
+# Contributor (Arch)    : Dirk Sohler <spam@0x7be.de>
+# Maintainer  (Parabola): Aurélien DESBRIÈRES <aurelien@hackers.camp>
 
 pkgname=mycron-git
-pkgver=20121116
-pkgrel=1
+_gitname=mycron
+pkgver=2.0.2
+pkgrel=2
 pkgdesc='A standards compliant and convenient crontab management system.'
 
-url='https://dev.0x7be.de/mycron'
+url='http://dev.0x7be.de/mycron.html'
 arch=('any')
 license=('GPL')
 
@@ -15,35 +17,27 @@ makedepends=('git')
 
 install=mycron.install
 
-source=('mycron.install')
-sha256sums=('a5406ae03412d3a1aaf6aadb902b4dd40bb6eadb21aa2ffb7c21ae95d656f598')
+branch='master'
+source=("git://github.com/dsohler/mycron.git#branch=$branch"
+		'mycron.install'
+        'mycron.1'
+		'mycron.5')
 
-_gitroot='https://github.com/dsohler/mycron'
-_gitname='master'
-
-build() {
-	cd $srcdir
-	msg "Connecting to GIT server...."
-
-	if [[ -d "$_gitname" ]]; then
-		cd "$_gitname" && git pull origin
-		msg "The local files are updated."
-	else
-		git clone "$_gitroot" "$_gitname"
-	fi
-
-	msg "GIT checkout done or server timeout"
-	msg "Starting build..."
-
-	rm -rf "$srcdir/$_gitname-build"
-	git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
+pkgver() {
+	cd "$srcdir/$_gitname"
+	echo $(sed -n "s/^progversion='\(.*\)'/\1/p" mycron.py)
 }
 
 package() {
-	cd "$srcdir/$_gitname-build"
+	cd "$srcdir/$_gitname"
+	_DOCPATH="usr/share/doc/mycron"
+	_MANPATH="usr/share/man"
 	install -Dm 755 mycron.py $pkgdir/usr/bin/mycron
-	install -Dm 644 example-config.cfg \
-		$pkgdir/usr/share/doc/mycron/example-config.cfg
-	install -Dm 644 example.crontab \
-		$pkgdir/usr/share/doc/mycron/example.crontab
+	install -Dm 644 example-config.cfg $pkgdir/$_DOCPATH/example-config.cfg
+	install -Dm 644 example.crontab	$pkgdir/$_DOCPATH/example.crontab
+	install -Dm 644 crontab.vim $pkgdir/$_DOCPATH/crontab.vim
+	install -Dm 644 ../mycron.1 $pkgdir/$_MANPATH/man1/mycron.1
+	install -Dm 644 ../mycron.5 $pkgdir/$_MANPATH/man5/mycron.5
+	gzip $pkgdir/$_MANPATH/man1/mycron.1
+	gzip $pkgdir/$_MANPATH/man5/mycron.5
 }
diff --git a/pcr/mycron-git/mycron.1 b/pcr/mycron-git/mycron.1
new file mode 100644
index 000000000..daef28f6f
--- /dev/null
+++ b/pcr/mycron-git/mycron.1
@@ -0,0 +1,59 @@
+.TH mycron 1 "2013-01-13" 2.0.1
+.SH NAME
+mycron - A standards compliant and convenient crontab management system.
+
+.SH SYNOPSIS
+.B mycron
+.RB [\| -h \|]
+.RB [\| \-u
+.IR C \|]
+.RB [\| -e \|]
+.RB [\| -l \|]
+.RB [\| -s \|]
+.RB [\| -c \|]
+.RB [\| -n \|]
+.RB [\| -p \|]
+.RB [\| -x \|]
+
+.SH DESCRIPTION
+mycron is not a cron service/daemon. You need an already set up cron service for using mycron in a reasonable way. You need to set up your cronie\-, dcron\-, vixie\-, whatever\-crontab to execute mycron every minute for taking full advantage of mycron’s crontabs.
+.PP
+mycron then replaces your regular crontab setup. It allows you to set up cronjobs in a completely new, but very convenient and standards compliant way and becomes your command center for managing, creating, editing and checking (multiple) crontabs.
+
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show inline parameters help
+.TP
+\fB\-u\fR \fIC\fR, \fB\-\-use\fR=\fIC\fR
+use crontab \fIC\fR instead of default crontab. You can combine this with all other parameters.
+.TP
+\fB\-e\fR, \fB\-\-edit\fR
+edit crontab (either the default crontab or the one specified by \fB\-u\fR)
+.TP
+\fB\-s\fR, \fB\-\-show\fR
+output a list showing all available crontabs, except x\- crontabs (see \fB\-x\fR for more details)
+.TP
+\fB\-c\fR, \fB\-\-check\fR
+check the crontab for validity and show all lines that are invalid
+.TP
+\fB\-n\fR, \fB\-\-no\-colors\fR
+don't use colored output
+.TP
+\fB\-e\fR, \fB\-\-print\-examples\fR
+show a list of examples for mycron crontab entries
+.TP
+\fB\-x\fR, \fB\-\-x\-crontabs\fR
+show development crontabs, too. Development crontabs start with \fBx-\fR and are hidden by default when using \fB-s\fR.
+
+.SH BUGS
+Please desist from using non-ASCII characters like German umlauts, other special symbols, etc. It will not break mycron or it's validity check, but fails on mycron actually executed by your cron daemon.
+
+.SH FULL DOCUMENTATION
+The full documentation of \fBmycron\fR is available online at <http://dev.0x7be.de/mycron.html>. In case of differences the documentation available online is to be looked upon as the more current version.
+
+.SH AUTHOR
+Dirk Sohler, <spam@0x7be.de>
+
+.SH SEE ALSO
+mycron(5), crontab(1)
diff --git a/pcr/mycron-git/mycron.5 b/pcr/mycron-git/mycron.5
new file mode 100644
index 000000000..6dbff6a0e
--- /dev/null
+++ b/pcr/mycron-git/mycron.5
@@ -0,0 +1,58 @@
+.TH mycron 5 "" "" "MYCRON FILE FORMAT"
+.SH NAME
+mycron \- special crontab syntax explaination
+
+.SH DESCRIPTION
+\fBmycron\fRs crontab syntax differs from the usual crontab syntax a lot. Of course you have the date/time part and the command, but the definitions are ISO 8601 valid using a dot (\fB.\fR) as wildcard character.
+
+.SH LOCATION
+Crontabs have to be stored at \fB${HOME}/.config/mycron/crontabs\fR with file suffix \fB.crontab\fR for \fBmycron\fR to recognize them. Crontab file names should not contain slashes and should not be longer than 20 characters. The default crontab is \fBdefault.crontab\fR.
+
+.SH SYNTAX
+.TP
+\fBDate/Time format\fR
+ISO 8601 specifies day/time notation with time zone. Because \fBmycron\fR is only exact to the minute (as long as there is no cron deamon that uses seconds as smallest unit), seconds and time zone are omitted. Set the date with \fBYYYY-MM-DD\fRT\fBHH:MM\fR where \fBYYYY\fR is the year, \fBMM\fR is the month, \fBDD\fR is the day, \fBHH\fR is the hour in 24h format and \fBMM\fR is the minute. For every single digit you can input a \fB.\fR (a single colon) as wildcard.
+.TP
+\fBDay of the week\fR
+ISO 8601 specifies Monday as first day of the week and Sunday as last day of the week, therefore \fBMonday is 1\fR, \fBThursday is 2\fR, ..., \fBSunday is 7\fR. If you use \fB.\fR (a single colon), \fBmycron\fR interprets it as "every day".
+.TP
+\fBCommand\fR
+The last of the three blocks is the command block. Here you can use whatever you want. Please desist from using non-ASCII characters like German umlauts, other special symbols, etc. It will not break mycron or it's validity check, but fails on mycron actually executed by your cron daemon.
+.TP
+\fBComments\fR
+Comments are indicated by using \fB#\fR in the beginning of a line. It might work in most cases but you should not rely on comments after some actual crontab entries. (End-of-line comments)
+
+.SH EXAMPLES
+.TP
+\fB....-..-..T..:.. . command\fR
+This line executes the command every minute at every day.
+.TP
+\fB....-..-..T18:57 7 command\fR
+Here the command gets executed every Sunday at 18:57 o'clock.
+.TP
+\fB....-..-..T07:38 1267 command\fR
+When given multiple digits for the day, the command gets executed on all of the days. Here on Mondays, Tuesdays, Saturdays and Sundays at 07:38 o'clock.
+.TP
+\fB2013-05-..T..:00 4 command\fR
+This very specific line results in execution of the given command on every full hour at every Friday in May 2013.
+.TP
+\fB....-12-..T14:.. . command\fR
+The command will be executed every minute from 14:00 to 14:59 o'clock on everyday in every December.
+.TP
+\fB2018-01-14T10:45 2 command\fR
+Because 2018-01-14 is a Sunday (7) this command will \fBnever\fR be executed :)
+
+.SH FILES
+.TP
+\fBExample files\fR
+/usr/share/doc/mycron/example-config.cfg
+/usr/share/doc/mycron/example.crontab
+.TP
+\fBVim syntax file\fR
+/usr/share/doc/mycron/crontab.vim
+
+.SH AUTHOR
+Dirk Sohler, <spam@0x7be.de>
+
+.SH SEE ALSO
+mycron(1)
diff --git a/pcr/note/PKGBUILD b/pcr/note/PKGBUILD
index 044a73c92..4066dc911 100644
--- a/pcr/note/PKGBUILD
+++ b/pcr/note/PKGBUILD
@@ -1,11 +1,11 @@
-# Contributor (Arch): David Pflug <Viaken@Gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
+# Contributor (Arch)     : David Pflug <Viaken@Gmail.com>
+# Maintainer  (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>
 
 _author=TLINDEN
 _perlmod=note
 pkgname=$_perlmod
-pkgver=1.3.12
-pkgrel=2
+pkgver=1.3.18
+pkgrel=1
 pkgdesc="A Perl-based note taking application with multiple backends"
 arch=('i686' 'x86_64')
 url="http://www.daemon.de/NOTE"
author	Nicolás Reynolds <fauno@endefensadelsl.org>	2014-06-04 16:03:12 -0300
committer	Nicolás Reynolds <fauno@endefensadelsl.org>	2014-06-04 16:03:12 -0300
commit	6320403e34f67650b789aa2f0909c1671fe29d45 (patch)
tree	6b34d83542e08a434122d51bee5bd53c76d5f7d2
parent	e6d75a76602a8d1f1022589c77b5ba754f62975a (diff)
parent	5a53dfa50322787f5a4d8af16743c83cab48f0fa (diff)