Merge branch 'master' of ssh://parabola-git/srv/git/abslibre/abslibre

15 files changed, 109 insertions, 100 deletions

diff --git a/java/java-cup/PKGBUILD b/java/java-cup/PKGBUILD
new file mode 100644
index 000000000..97b41e20b
--- /dev/null
+++ b/java/java-cup/PKGBUILD
@@ -0,0 +1,41 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=java-cup
+_pkgver=0.10k
+pkgver=0.10.k
+pkgdesc="LALR parser generator for Java"
+url=http://www2.cs.tum.edu/projects/cup/
+license=('custom:MIT')
+
+pkgrel=1
+arch=('any')
+depends=('java-environment')
+
+source=(http://www2.cs.tum.edu/projects/cup/java_cup_v${_pkgver#*.}.tar.gz java-cup.sh)
+md5sums=('8b11edfec13c590ea443d0f0ae0da479'
+         '2ec9859574d479ee27c71e8b7f978eea')
+
+prepare() {
+ cd "$srcdir"
+ find . -name '*.class' -delete
+}
+
+build() {
+  cd "$srcdir"
+  mkdir classes
+  find java_cup -name '*.java' -exec javac -d classes {} +
+  jar cfe java_cup.jar java_cup.Main -C classes .
+}
+
+package() {
+  cd "$srcdir"
+
+  install -Dm644 java_cup.jar   "$pkgdir"/usr/share/java/java_cup-${_pkgver}.jar
+  ln -s java_cup-${_pkgver}.jar "$pkgdir"/usr/share/java/java_cup.jar
+
+  install -Dm755 java-cup.sh "$pkgdir"/usr/bin/java-cup
+  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+
+  install -d "$pkgdir"/usr/share/doc/$pkgname
+  install -m644 manual.html cup_logo.gif -t "$pkgdir"/usr/share/doc/$pkgname
+}
diff --git a/java/java-cup/java-cup.sh b/java/java-cup/java-cup.sh
new file mode 100644
index 000000000..b7bf91d14
--- /dev/null
+++ b/java/java-cup/java-cup.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+java -jar /usr/share/java/java_cup.jar "$@"
diff --git a/kernels/linux-libre-lts-knock/PKGBUILD b/kernels/linux-libre-lts-knock/PKGBUILD
index 55b36cc7a..7614c39e7 100644
--- a/kernels/linux-libre-lts-knock/PKGBUILD
+++ b/kernels/linux-libre-lts-knock/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 214371 2014-06-07 22:20:59Z bpiotrowski $
+# $Id: PKGBUILD 215080 2014-06-13 10:32:35Z bpiotrowski $
 # Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer (Arch): Thomas Baechler <thomas@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
@@ -10,11 +10,11 @@
 pkgbase=linux-libre-lts-knock # Build stock -LIBRE-LTS-KNOCK kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.10
-_sublevel=42
+_sublevel=43
 _knockpatchver=${_basekernel}
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.41 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.42 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="https://gnunet.org/knock"
 license=('GPL2')
@@ -34,9 +34,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'criu-no-expert.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz")
 md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
-         '6efee11f9cb3731db078297ab7ae17d5'
+         '608bae7e9718c3b178c8a6b5594660e3'
          '26380d6f05471ef8e065a77d87588009'
-         'f22e0a6a7634902f5a00eb25ad677c65'
+         '5fd18f6d29279ee8e79176b774214b71'
          '6550ba0e23b7729cd9db2475bde8fac2'
          '02023949955a138c44bb0c46227a6d18'
          '2967cecc3af9f954ccc822fd63dca6ff'
@@ -44,7 +44,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
          '04b21c79df0a952c22d681dd4f4562df'
          'f3def2cefdcbb954c21d8505d23cc83c'
          'd50c1ac47394e9aec637002ef3392bd1'
-         '4741b27f05fd1868eff20457bfa661c3')
+         'fc169cfc460e78637a667465e26493e0')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -124,7 +124,7 @@ build() {
   #make menuconfig # CLI menu for configuration
   #make nconfig # new CLI menu for configuration
   #make xconfig # X-based configuration
-  #make oldconfig # using old config from previous kernel version
+  make oldconfig # using old config from previous kernel version
   # ... or manually edit .config
 
   # rewrite configuration
diff --git a/kernels/linux-libre-lts-knock/config.i686 b/kernels/linux-libre-lts-knock/config.i686
index 05b32b275..928e57d25 100644
--- a/kernels/linux-libre-lts-knock/config.i686
+++ b/kernels/linux-libre-lts-knock/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.10.15-1 Kernel Configuration
+# Linux/x86 3.10.43 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -1719,7 +1719,7 @@ CONFIG_SCSI_ENCLOSURE=m
 CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
-CONFIG_SCSI_SCAN_ASYNC=y 
+CONFIG_SCSI_SCAN_ASYNC=y
 
 #
 # SCSI Transports
@@ -1982,6 +1982,7 @@ CONFIG_BCACHE=m
 # CONFIG_BCACHE_DEBUG is not set
 # CONFIG_BCACHE_EDEBUG is not set
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
+CONFIG_BLK_DEV_DM_BUILTIN=y
 CONFIG_BLK_DEV_DM=m
 # CONFIG_DM_DEBUG is not set
 CONFIG_DM_BUFIO=m
@@ -3400,6 +3401,7 @@ CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_MAX6697=m
 CONFIG_SENSORS_MCP3021=m
 CONFIG_SENSORS_NCT6775=m
+# CONFIG_SENSORS_NTC_THERMISTOR is not set
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
@@ -4817,18 +4819,6 @@ CONFIG_USB_SERIAL_IPW=m
 CONFIG_USB_SERIAL_IUU=m
 CONFIG_USB_SERIAL_KEYSPAN_PDA=m
 CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
 CONFIG_USB_SERIAL_KLSI=m
 CONFIG_USB_SERIAL_KOBIL_SCT=m
 CONFIG_USB_SERIAL_MCT_U232=m
@@ -5188,7 +5178,6 @@ CONFIG_DMA_OF=y
 #
 # DMA Clients
 #
-CONFIG_NET_DMA=y
 CONFIG_ASYNC_TX_DMA=y
 # CONFIG_DMATEST is not set
 CONFIG_DCA=m
diff --git a/libre/antlr2/PKGBUILD b/libre/antlr2/PKGBUILD
index 5d0fd6eb0..49dbd2226 100644
--- a/libre/antlr2/PKGBUILD
+++ b/libre/antlr2/PKGBUILD
@@ -10,17 +10,17 @@ pkgdesc="Another Tool for Language Recognition"
 url="http://www.antlr2.org/"
 license=('custom:Public Domain')
 
-pkgrel=6
+pkgrel=6.1 # newer than Arch's 2.7.7-6
 arch=('i686' 'x86_64')
 options=('staticlibs')
-makedepends=('java-environment' 'python2' 'sh' 'nant' 'jh')
+makedepends=('java-environment' 'python2' 'bash' 'nant' 'jh')
 
 source=("http://www.antlr2.org/download/antlr-${pkgver}.tar.gz"
 	"http://repo.maven.apache.org/maven2/antlr/antlr/$pkgver/antlr-$pkgver.pom"
 	'runantlr2.sh' 'gcc4.4.patch' 'mono.patch')
 md5sums=('01cc9a2a454dd33dcd8c856ec89af090'
          '78af3de823003f6d8dded39c70bc30ae'
-         '78e9bf86bd44722f232f80bc7b04dcfe'
+         '05cb34ec96d85fca430dda91c3200ba4'
          '158677e4c0f357afbb56656231a54815'
          '0d1960d27ff81f2fea0dd35a8290216f')
 
@@ -46,7 +46,7 @@ _install_license() {
 }
 
 package_antlr2() {
-  depends=('sh' 'antlr2-java')
+  depends=('bash' 'antlr2-java')
 
   install -Dm755 "$srcdir"/runantlr2.sh "$pkgdir"/usr/bin/runantlr2
   _install_license
diff --git a/libre/antlr2/runantlr2.sh b/libre/antlr2/runantlr2.sh
index aebc9dfa7..d274e56a9 100644
--- a/libre/antlr2/runantlr2.sh
+++ b/libre/antlr2/runantlr2.sh
@@ -1,5 +1,3 @@
-#!/bin/sh
-echo Running 'java antlr.Tool $*' with /usr/share/java/antlr2.jar appended to the CLASSPATH variable
-export CLASSPATH
-CLASSPATH=$CLASSPATH:/usr/share/java/antlr2.jar
+#!/bin/bash
+export CLASSPATH="/usr/share/java/antlr2.jar${CLASSPATH:+:$CLASSPATH}"
 java antlr.Tool "$@"
diff --git a/libre/bfgminer-libre/PKGBUILD b/libre/bfgminer-libre/PKGBUILD
index e29ba491e..73c635297 100644
--- a/libre/bfgminer-libre/PKGBUILD
+++ b/libre/bfgminer-libre/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 106211 2014-02-25 15:02:06Z bpiotrowski $
+# $Id: PKGBUILD 113111 2014-06-13 18:57:57Z eric $
 # Maintainer (Arch): Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor (Arch): Andy Weidenbaum <archbaum@gmail.com>
 
 _pkgname=bfgminer
 pkgname=bfgminer-libre
-pkgver=3.10.0
+pkgver=4.0.0
 pkgrel=1
-pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and remote management. For FPGA/GPU/CPU Bitcoin mining, without nonfree OpenCL recommendation."
+pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and remote management. For FPGA/GPU/CPU Bitcoin mining, without nonfree OpenCL recommendation"
 arch=('i686' 'x86_64' 'mips64el')
 depends=('curl' 'jansson' 'libevent' 'libmicrohttpd' 'libusbx' 'lm_sensors')
 makedepends=('uthash' 'yasm')
 replaces=($_pkgname)
 conflicts=($_pkgname)
 provides=($_pkgname=$pkgver)
-url='https://bitcointalk.org/index.php?topic=168174.0'
+url='http://bfgminer.org/'
 license=('GPL3')
-source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.tbz2
+source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.txz
         remove-dangerous-rpath.patch)
-sha256sums=('12458aed84abc4a953532fe0645772492701e5d627f56f62d382aa0f458a10d5'
+sha256sums=('feec7d4ada6ceae456656b68188df05d095bbd7fc9839368f65dcd52b04f7539'
             'd26d07ca23ae25798c4db37cfda1a6a76f22d06e73efab1ddf62b3e1a7eef04c')
 
 prepare() {
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index 770e5a224..aee169fd9 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 112255 2014-05-30 17:49:50Z jelle $
+# $Id: PKGBUILD 113113 2014-06-13 19:40:31Z jelle $
 # Maintainer (Arch): Jelle van der Waa <jelle@vdwaa.nl>
 # Maintainer (Arch): Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org>
@@ -9,7 +9,7 @@
 
 _pkgname=calibre
 pkgname=calibre-libre
-pkgver=1.39.0
+pkgver=1.40.0
 pkgrel=1
 pkgdesc="Ebook management application, without nonfree libunrar support"
 arch=('i686' 'x86_64' 'mips64el') 
@@ -32,8 +32,8 @@ source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}
         'desktop_integration.patch'
         'calibre-mount-helper'
         'libre.patch')
-mkmd5sums=('38aa711c11586eb365bc5ff522cf9b58')
-md5sums=('fad9ab43170f284dcb159413093de2e4'
+mkmd5sums=('4fb8c0273e9bf14698fe99a89c9e2a65')
+md5sums=('d4c862b8b1590b116275393512909284'
          'ece36dfd737fa4a346f0a0e59395e949'
          '675cd87d41342119827ef706055491e7'
          '073a36adbb3628d21c2dff8b41e84abe')
diff --git a/libre/icecat-firebug/PKGBUILD b/libre/icecat-firebug/PKGBUILD
index ebe8a4fc9..2a3de297f 100644
--- a/libre/icecat-firebug/PKGBUILD
+++ b/libre/icecat-firebug/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 111003 2014-05-11 21:13:52Z speps $
+# $Id: PKGBUILD 113091 2014-06-13 13:27:58Z speps $
 # Maintainer (Arch): speps <speps at aur dot archlinux dot org>
 
 pkgname=icecat-firebug
-pkgver=1.12.8
+pkgver=2.0
 pkgrel=1
 pkgdesc="IceCat plugin with tools for web development."
 arch=(any)
@@ -11,8 +11,8 @@ license=('custom:BSD')
 groups=('icecat-addons')
 depends=('icecat')
 provides=('firebug' firefox-firebug=$pkgver)
-source=("${url}releases/firebug/${pkgver%.*}/firebug-$pkgver.xpi")
-md5sums=('b93528ff22c76f6c3f63f81fe5e49496')
+source=("${url}releases/firebug/$pkgver/firebug-$pkgver.xpi")
+md5sums=('d628079b2bd28970be02be48608753b3')
 
 package() {
   # extension
diff --git a/libre/iceweasel-firebug/PKGBUILD b/libre/iceweasel-firebug/PKGBUILD
index 2c897ae21..dad19082f 100644
--- a/libre/iceweasel-firebug/PKGBUILD
+++ b/libre/iceweasel-firebug/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 111003 2014-05-11 21:13:52Z speps $
+# $Id: PKGBUILD 113091 2014-06-13 13:27:58Z speps $
 # Maintainer (Arch): speps <speps at aur dot archlinux dot org>
 
 pkgname=iceweasel-firebug
-pkgver=1.12.8
+pkgver=2.0
 pkgrel=1
 pkgdesc="Iceweasel plugin with tools for web development."
 arch=(any)
@@ -11,8 +11,8 @@ license=('custom:BSD')
 groups=('iceweasel-addons')
 depends=('iceweasel-libre')
 provides=('firebug' firefox-firebug=$pkgver)
-source=("${url}releases/firebug/${pkgver%.*}/firebug-$pkgver.xpi")
-md5sums=('b93528ff22c76f6c3f63f81fe5e49496')
+source=("${url}releases/firebug/$pkgver/firebug-$pkgver.xpi")
+md5sums=('d628079b2bd28970be02be48608753b3')
 
 package() {
   # extension
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 95fb16388..a5e256aa6 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 214371 2014-06-07 22:20:59Z bpiotrowski $
+# $Id: PKGBUILD 215080 2014-06-13 10:32:35Z bpiotrowski $
 # 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-lts     # Build stock -LIBRE-LTS kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.10
-_sublevel=42
+_sublevel=43
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.41 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.42 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -32,8 +32,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'criu-no-expert.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz")
 md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
-         '6efee11f9cb3731db078297ab7ae17d5'
-         '85ce008eaacbb2fc54b81116d35cf946'
+         '608bae7e9718c3b178c8a6b5594660e3'
+         'c4c1ffeb312c2a70685fd960cc328e01'
          '16867e648e4b9f89bec949cb643888c2'
          'c072b17032e80debc6a8626299245d46'
          '2967cecc3af9f954ccc822fd63dca6ff'
@@ -41,7 +41,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
          '04b21c79df0a952c22d681dd4f4562df'
          'f3def2cefdcbb954c21d8505d23cc83c'
          'd50c1ac47394e9aec637002ef3392bd1'
-         '4741b27f05fd1868eff20457bfa661c3')
+         'fc169cfc460e78637a667465e26493e0')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -118,7 +118,7 @@ build() {
   #make menuconfig # CLI menu for configuration
   #make nconfig # new CLI menu for configuration
   #make xconfig # X-based configuration
-  #make oldconfig # using old config from previous kernel version
+  make oldconfig # using old config from previous kernel version
   # ... or manually edit .config
 
   # rewrite configuration
diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686
index 942c1a052..11293a2bd 100644
--- a/libre/linux-libre-lts/config.i686
+++ b/libre/linux-libre-lts/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.10.15-1 Kernel Configuration
+# Linux/x86 3.10.43 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -1718,7 +1718,7 @@ CONFIG_SCSI_ENCLOSURE=m
 CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
-CONFIG_SCSI_SCAN_ASYNC=y 
+CONFIG_SCSI_SCAN_ASYNC=y
 
 #
 # SCSI Transports
@@ -1981,6 +1981,7 @@ CONFIG_BCACHE=m
 # CONFIG_BCACHE_DEBUG is not set
 # CONFIG_BCACHE_EDEBUG is not set
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
+CONFIG_BLK_DEV_DM_BUILTIN=y
 CONFIG_BLK_DEV_DM=m
 # CONFIG_DM_DEBUG is not set
 CONFIG_DM_BUFIO=m
@@ -3399,6 +3400,7 @@ CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_MAX6697=m
 CONFIG_SENSORS_MCP3021=m
 CONFIG_SENSORS_NCT6775=m
+# CONFIG_SENSORS_NTC_THERMISTOR is not set
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
@@ -4816,18 +4818,6 @@ CONFIG_USB_SERIAL_IPW=m
 CONFIG_USB_SERIAL_IUU=m
 CONFIG_USB_SERIAL_KEYSPAN_PDA=m
 CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
 CONFIG_USB_SERIAL_KLSI=m
 CONFIG_USB_SERIAL_KOBIL_SCT=m
 CONFIG_USB_SERIAL_MCT_U232=m
@@ -5187,7 +5177,6 @@ CONFIG_DMA_OF=y
 #
 # DMA Clients
 #
-CONFIG_NET_DMA=y
 CONFIG_ASYNC_TX_DMA=y
 # CONFIG_DMATEST is not set
 CONFIG_DCA=m
diff --git a/libre/wings3d-libre/PKGBUILD b/libre/wings3d-libre/PKGBUILD
index 5970c5bcb..1a0380bd7 100644
--- a/libre/wings3d-libre/PKGBUILD
+++ b/libre/wings3d-libre/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 95697 2013-08-15 18:20:27Z arodseth $
+# $Id: PKGBUILD 113127 2014-06-13 22:30:55Z arodseth $
 # Maintainer (Arch): Alexander Rødseth <rodseth@gmail.com>
 # Contributor (Arch): kappa <kappacurve@gmail.com>
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 
+_pkgname=wings3d
 _name=wings
-_pkgname=${_name}3d
-pkgname=$_pkgname-libre
-pkgver=1.5.2
-pkgrel=1.1
+pkgname=wings3d-libre
+pkgver=1.5.3
+pkgrel=1
 pkgdesc='3D modeling program, without nonfree kerkythea render support'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.wings3d.com/'
@@ -19,47 +19,38 @@ provides=("$_pkgname")
 conflicts=("$_pkgname")
 replaces=("$_pkgname")
 install=$_pkgname.install
-source=("$_pkgname-$pkgver.tar.gz::https://github.com/dgud/wings/archive/v$pkgver.tar.gz"
+source=("http://downloads.sourceforge.net/project/wings/wings/$pkgver/wings-$pkgver.tar.bz2"
         "$_pkgname.sh"
         "$_pkgname.png::http://img299.imageshack.us/img299/2538/wingsiconblackshiningew5.png")
-sha256sums=('d86980e4fa91a04ca96b989b0dcba53a37c8cfda4e6d98accb8e7bd9a289094b'
+sha256sums=('c08060016f83679ce08947942d31af0e3b5d105525d0df5e993ec6f1a81fdd8e'
             '46513cd05f8b6e778120af4a87b239c5250799c17b591592893d98cbf082359e'
             '6658977cc3bc8db2c9358edf3a2d6cb6bb8084c9a1d96ca573a83dd4e8781f1a')
 
 prepare() {
-  gendesk --pkgname "$_pkgname" --pkgdesc "$pkgdesc" \
+  gendesk -f --pkgname "$_pkgname" --pkgdesc "$pkgdesc" --name 'Wings3D' \
     --genericname '3D Modeler' --categories 'Graphics;3DGraphics'
-
-  cd "$_name-$pkgver"
-  sed -i "s|v1[.]2[.]x[.]y[.]WINGS|v$pkgver.$pkgrel.PARABOLA|" WINGS-VERSION-GEN
 }
 
 build() {
-  cd "$_name-$pkgver"
-
   export ESDL_PATH=$(echo /usr/lib/erlang/lib/esdl-*)
-  make
-  make lang
+  make -C "$_name-$pkgver" all lang
 }
 
 package() {
+  install -Dm644 "$_pkgname.png" "$pkgdir/usr/share/pixmaps/$_pkgname.png"
+  install -Dm644 "$_pkgname.desktop" \
+    "$pkgdir/usr/share/applications/$_pkgname.desktop"
+  install -Dm755 "$_pkgname.sh" "$pkgdir/usr/bin/$_pkgname"
   cd "$_name-$pkgver"
-
-  mkdir -p "$pkgdir/usr/lib/$_pkgname"
+  install -d "$pkgdir/usr/lib/$_pkgname"
   for subdir in ebin fonts patches plugins shaders textures; do
     cp -r "$srcdir/$_name-$pkgver/$subdir/" "$pkgdir/usr/lib/$_pkgname"
   done
-  cd "$srcdir"
-  install -Dm755 "$_pkgname.sh" "$pkgdir/usr/bin/$_pkgname"
-  install -Dm644 "$_pkgname.png" "$pkgdir/usr/share/pixmaps/$_pkgname.png"
-  install -Dm644 "$_pkgname.desktop" \
-    "$pkgdir/usr/share/applications/$_pkgname.desktop"
-
   msg 'remove nonfree kerkythea render support plugin'
-  rm -v $pkgdir/usr/lib/wings3d/plugins/import_export/wpc_kerky.beam
+  rm -v $pkgdir/usr/lib/$_pkgname/plugins/import_export/wpc_kerky.beam
 
-  msg 'remove obsolete yafray render support plugin'
-  rm -v $pkgdir/usr/lib/wings3d/plugins/import_export/wpc_yafray{.beam,_{de,en,fr,ko}.lang}
+  msg 'remove deprecated yafray render support plugin'
+  rm -v $pkgdir/usr/lib/$_pkgname/plugins/import_export/wpc_yafray{.beam,_{de,en,fr,ko}.lang}
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/wings3d-libre/wings3d.install b/libre/wings3d-libre/wings3d.install
index 98f3ea190..ad97d7bab 100644
--- a/libre/wings3d-libre/wings3d.install
+++ b/libre/wings3d-libre/wings3d.install
@@ -1,5 +1,4 @@
 post_upgrade() {
-  #gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
   update-desktop-database -q
 }
 
diff --git a/nonprism/sylpheed-nonprism/PKGBUILD b/nonprism/sylpheed-nonprism/PKGBUILD
index 98282e094..13d3ce4ea 100644
--- a/nonprism/sylpheed-nonprism/PKGBUILD
+++ b/nonprism/sylpheed-nonprism/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 108818 2014-04-04 16:07:28Z speps $
+# $Id: PKGBUILD 113099 2014-06-13 15:15:18Z speps $
 # Maintainer (Arch): speps <speps at aur dot archlinux dot org>
 # Contributor (Arch): Alexander Fehr <pizzapunk gmail com>
 # Contributor (Arch): dorphell <dorphell@archlinux.org>
@@ -7,7 +7,7 @@
 
 _pkgname=sylpheed
 pkgname=sylpheed-nonprism
-pkgver=3.4.1
+pkgver=3.4.2
 pkgrel=1
 pkgdesc="Lightweight and user-friendly e-mail client, without Gmail support"
 arch=('i686' 'x86_64')
@@ -21,7 +21,7 @@ makedepends=('openssl')
 install="$_pkgname.install"
 source=("http://sylpheed.sraoss.jp/$_pkgname/v${pkgver%.*}/$_pkgname-$pkgver.tar.bz2"
         'nonprism.patch')
-md5sums=('9071bb341a6d96244fe7cd5ff013c70d'
+md5sums=('d4e53489763ff2cb575ab02890d91dc9'
          'e1bddc14962e607cdb899ec082660639')
 
 prepare() {