aur updates

2015-08-31 00:38:44 +00:00 · 2015-08-31 00:38:44 +00:00 · 34e13f3c7d
parent d53f5696d5
commit 34e13f3c7d
98 changed files with 1178 additions and 7639 deletions
--- a/alarm/devmem/PKGBUILD
+++ b/alarm/devmem/PKGBUILD
--- a/alarm/dkms-8188eu/PKGBUILD
+++ b/alarm/dkms-8188eu/PKGBUILD
--- a/alarm/dkms-8188eu/dkms-8188eu.install
+++ b/alarm/dkms-8188eu/dkms-8188eu.install
--- a/alarm/dkms-8188eu/dkms.conf
+++ b/alarm/dkms-8188eu/dkms.conf
--- a/aur/adduser/PKGBUILD
+++ b/aur/adduser/PKGBUILD
@ -1,20 +0,0 @@
-# Maintainer: Josh VanderLinden <arch@cloudlery.com>
-pkgname=adduser
-pkgver=1.15
-pkgrel=5
-pkgdesc="Interactive front end to /usr/bin/useradd from Slackware Linux"
-arch=('any')
-url="http://www.slackware.com/"
-license=('BSD')
-provides=('adduser')
-depends=('gawk' 'shadow>=4.1.5.1-3')
-source=("http://mirrors.slackware.com/slackware/slackware64-current/source/a/shadow/adduser")
-md5sums=('84514d199d0fce7ad2c2f439ec7a7bea')
-
-package() {
-  install -D -m755 adduser "${pkgdir}/usr/bin/adduser"
-  sed '/^###/q;1,2d;s/^# *//' adduser | head -n -2 > LICENSE
-  install -D LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
--- a/aur/arm-mem-git/PKGBUILD
+++ b/aur/arm-mem-git/PKGBUILD
@ -1,12 +1,13 @@
 # Maintainer: Jesse Jaara <gmail.com: jesse.jaara>

-buildarch=16
+# armv7h & armv6h
+buildarch=20

 pkgname=arm-mem-git
-pkgver=20.4418bb4
+pkgver=22.3aee5f4
 pkgrel=1
 pkgdesc="ARM-accelerated versions of selected functions from string.h"
-arch=('armv6h')
+arch=('armv6h' 'armv7h')
 url="https://github.com/bavison/arm-mem"
 license=('BSD')
 makedepends=('git')
@ -37,3 +38,4 @@ package() {
  cp "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/arm-mem-git/"
  cp libarmmem.so "${pkgdir}/usr/lib/"
 }
+
--- a/aur/bully/.AURINFO
+++ b/aur/bully/.AURINFO
@ -1,16 +0,0 @@
-pkgbase = bully
-	pkgdesc = Retrieve WPA/WPA2 passphrase from a WPS enabled access point.
-	pkgver = 1.0.22
-	pkgrel = 2
-	url = https://github.com/bdpurcell/bully
-	arch = i686
-	arch = x86_64
-	license = GPL3
-	makedepends = make
-	depends = libpcap
-	depends = openssl
-	source = http://www6.frugalware.org/mirrors/linux/kali/kali/pool/main/b/bully/bully_1.0-22.orig.tar.gz
-	sha512sums = 2319a55d5ec79322463e6b2ad27af72a8177e82a079021eb17bf0cb0ebda50b0953cf6b17563f026ac93c06e05132e3821d887951da1f077b5d26a6adbecb667
-
-pkgname = bully
-
--- a/aur/chocolate-doom/0001-setup-Fix-help-URL-for-level-warp-menu.patch
+++ b/aur/chocolate-doom/0001-setup-Fix-help-URL-for-level-warp-menu.patch
@ -1,7 +1,7 @@
 From bed0ff13bf09b3c6190f9ff0cf6f7182a96a0faf Mon Sep 17 00:00:00 2001
 From: Simon Howard <fraggle@soulsphere.org>
 Date: Wed, 10 Jun 2015 22:38:19 -0400
-Subject: [PATCH] setup: Fix help URL for level warp menu.
+Subject: [PATCH 01/13] setup: Fix help URL for level warp menu.

 The help URL for the warp menu was linking to the multiplayer start
 game menu.
@ -42,5 +42,5 @@ index a36f4da..3fe6a82 100644
                    TXT_NewSeparator("Monster options"),
                    TXT_NewInvertedCheckBox("Monsters enabled", &nomonsters),
 -- 
-2.4.3
+2.5.0

--- a/aur/chocolate-doom/0002-Update-README.Strife.patch
+++ b/aur/chocolate-doom/0002-Update-README.Strife.patch
@ -0,0 +1,107 @@
+From 432d121c862679f5d9af43dcfa3ef7d0f586104c Mon Sep 17 00:00:00 2001
+From: Simon Howard <fraggle@soulsphere.org>
+Date: Wed, 10 Jun 2015 23:04:18 -0400
+Subject: [PATCH 02/13] Update README.Strife.
+
+The legal status is a lot clearer now that Strife: Veteran Edition has
+been released. Remove the "New in v2.0 Release" section as this is
+unlikely to be kept up to date, and these updates are covered by the NEWS
+file that serves this purpose.
+---
+ README.Strife | 70 ++++++++---------------------------------------------------
+ 1 file changed, 9 insertions(+), 61 deletions(-)
+
+diff --git a/README.Strife b/README.Strife
+index 84be6b4..0bd8e77 100644
+--- a/README.Strife
+++ b/README.Strife
+@@ -28,29 +28,21 @@ have to the code is the binary executable file. Tools such as IDA Pro have
+ been employed to disassemble and decompile the executable, which was cross-
+ referenced against the Linux DOOM and DOS Heretic sources and painstakingly
+ combed over multiple times, instruction-by-instruction, to ensure that the
+-resulting Chocolate-Doom-based executable is as close as possible to the
+resulting Chocolate Doom-based executable is as close as possible to the
+ original.
+ 
+ 
+ * Is it Legal? *
+ 
+-Reverse engineering is a protected activity so long as the original code is
+-not used directly in the product. Due to the vast amount of information lost
+-through the process of compilation, and the need to refactor large portions
+-of code in order to eliminate non-portable idioms or to adapt them properly to
+-Chocolate Doom's framework, the resulting code behaves the same, but is not
+-the *same* code.
+Chocolate Strife was originally reverse-engineered from the DOS Strife
+binaries. Although reverse engineering is legally a protected activity, this
+nonetheless left some open questions about its legal status.
+ 
+-In addition, James Monroe and John Carmack have both stated that they have no
+-objections to the project. Because they are the original authors of the code,
+-and neither Rogue nor their publisher, Velocity, Inc., exist any longer as legal
+-entities, this is as close to legal permission as can be obtained.
+-
+-The transformed results of the disassembly have been combined with the
+-raven-branch version of the Chocolate Doom source port by Simon 'fraggle'
+-Howard, with his direct assistance, and have been released for the benefit of
+-the community under the GNU General Public License v2.0. See the file "COPYING"
+-for more details
+In 2014, a new commercial release of Strife was published (Strife: Veteran
+Edition) based on the Chocolate Strife code, and developed by the authors of
+Chocolate Strife under commercial license. The release of Strife: Veteran
+Edition, along with its GPL-licensed source code, constitutes tacit approval
+for the legal status of Chocolate Strife by its current copyright holder.
+ 
+ 
+ * Is it Perfect? *
+@@ -127,47 +119,3 @@ program is available from the same location where you downloaded this package.
+ Aside from Chocolate Doom, portions of the code are derived from the Eternity
+ Engine, Copyright 2011 Team Eternity, as published under the GNU GPL.
+ 
+-
+-* New in v2.0 Release *
+-
+-+ No infinite loop if menus are up during a screen fade.
+-
+-+ Peasant death sound during intro plays at normal volume level.
+-
+-+ Torches no longer produce pipping sounds (special thanks to fraggle).
+-
+-+ Fade to black occurs at the start of slideshow sequences as in vanilla.
+-
+-+ Network game support, with up to 8 players.
+-
+-+ No more infinite horizon effect if screen is resized while looking up or
+-  down.
+-
+-+ Corrected default internal Acolyte and Beggar dialogue strings.
+-
+-+ Proper save game directory behavior (same as other Choco ports).
+-
+-+ Vanilla behavior for crush-and-raise floor types (special thanks to Gez).
+-
+-+ Bug fix for all crushing floor types.
+-
+-+ Broken power coupling awards erroneous quest flag #32, as in vanilla.
+-
+-+ Complete support for emulation of Strife v1.31, including abililty to save
+-  on multiple save slots.
+-
+-+ Telefrags insta-kill as in vanilla (player cannot heal 10000 damage even with
+-  a full inventory of health items).
+-
+-+ Frags are displayed on the keys popup during deathmatch.
+-
+-+ Multiplayer chat features, including ability to set player names, now match
+-  vanilla behavior.
+-
+-+ Support for -random parameter.
+-
+-+ Vanilla behavior when pressing pause on menus with scroll bars (special
+-  thanks to fraggle and Alexandre Xavier).
+-
+-+ Merged into Chocolate Doom trunk for v2.0 release.
+-
+-- 
+2.5.0
+
--- a/aur/chocolate-doom/0003-setup.desktop-Add-a-missing-semicolon-to-Categories.patch
+++ b/aur/chocolate-doom/0003-setup.desktop-Add-a-missing-semicolon-to-Categories.patch
@ -0,0 +1,22 @@
+From af09900bad738208b3228d9fed8bd3a0619e2638 Mon Sep 17 00:00:00 2001
+From: Mike Swanson <mikeonthecomputer@gmail.com>
+Date: Sat, 13 Jun 2015 13:35:54 -0700
+Subject: [PATCH 03/13] setup.desktop: Add a missing semicolon to Categories
+
+---
+ src/setup/setup.desktop.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/setup/setup.desktop.in b/src/setup/setup.desktop.in
+index 91decb4..cf127d8 100644
+--- a/src/setup/setup.desktop.in
+++ b/src/setup/setup.desktop.in
+@@ -4,4 +4,4 @@ Exec=@PROGRAM_PREFIX@setup
+ Icon=@PROGRAM_PREFIX@setup
+ Type=Application
+ Comment=Setup tool for @PACKAGE_SHORTNAME@
+-Categories=Settings
+Categories=Settings;
+-- 
+2.5.0
+
--- a/aur/chocolate-doom/0004-Add-Keywords-to-the-setup.desktop-file.patch
+++ b/aur/chocolate-doom/0004-Add-Keywords-to-the-setup.desktop-file.patch
@ -0,0 +1,21 @@
+From 7c192af0d17f3f45d4208bc15cb1225b811aab74 Mon Sep 17 00:00:00 2001
+From: Fabian Greffrath <fabian@greffrath.com>
+Date: Mon, 15 Jun 2015 09:16:44 +0200
+Subject: [PATCH 04/13] Add Keywords to the setup.desktop file
+
+---
+ src/setup/setup.desktop.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/setup/setup.desktop.in b/src/setup/setup.desktop.in
+index cf127d8..2a5e71f 100644
+--- a/src/setup/setup.desktop.in
+++ b/src/setup/setup.desktop.in
+@@ -5,3 +5,4 @@ Icon=@PROGRAM_PREFIX@setup
+ Type=Application
+ Comment=Setup tool for @PACKAGE_SHORTNAME@
+ Categories=Settings;
+Keywords=first;person;shooter;doom;heretic;hexen;strife;vanilla;
+-- 
+2.5.0
+
--- a/aur/chocolate-doom/0005-doom-Avoid-overflow-for-spawn-angle-calculation.patch
+++ b/aur/chocolate-doom/0005-doom-Avoid-overflow-for-spawn-angle-calculation.patch
@ -0,0 +1,62 @@
+From 7d884d24adff82c020c2663c9142b38ee189ddef Mon Sep 17 00:00:00 2001
+From: Simon Howard <fraggle@soulsphere.org>
+Date: Sat, 11 Jul 2015 03:38:49 -0400
+Subject: [PATCH 05/13] doom: Avoid overflow for spawn angle calculation.
+
+Integer overflow is undefined and this breaks when using Clang with
+-O2 optimization turned on. This fixes #572 (thanks to David Majnemer
+for insight into fixing this bug).
+---
+ src/doom/g_game.c | 17 ++++++++---------
+ 1 file changed, 8 insertions(+), 9 deletions(-)
+
+diff --git a/src/doom/g_game.c b/src/doom/g_game.c
+index bc582a5..3001e03 100644
+--- a/src/doom/g_game.c
+++ b/src/doom/g_game.c
+@@ -1168,26 +1168,26 @@ G_CheckSpot
+         fixed_t xa, ya;
+         signed int an;
+ 
+-        an = (ANG45 * ((signed int) mthing->angle / 45));
+-        // Right-shifting a negative signed integer is implementation-defined,
+-        // so divide instead.
+-        an /= 1 << ANGLETOFINESHIFT;
+        // This calculation overflows in Vanilla Doom, but here we deliberately
+        // avoid integer overflow as it is undefined behavior, so the value of
+        // 'an' will always be positive.
+        an = (ANG45 >> ANGLETOFINESHIFT) * ((signed int) mthing->angle / 45);
+ 
+         switch (an)
+         {
+-            case -4096:
+            case 4096:  // -4096:
+                 xa = finetangent[2048];    // finecosine[-4096]
+                 ya = finetangent[0];       // finesine[-4096]
+                 break;
+-            case -3072:
+            case 5120:  // -3072:
+                 xa = finetangent[3072];    // finecosine[-3072]
+                 ya = finetangent[1024];    // finesine[-3072]
+                 break;
+-            case -2048:
+            case 6144:  // -2048:
+                 xa = finesine[0];          // finecosine[-2048]
+                 ya = finetangent[2048];    // finesine[-2048]
+                 break;
+-            case -1024:
+            case 7168:  // -1024:
+                 xa = finesine[1024];       // finecosine[-1024]
+                 ya = finetangent[3072];    // finesine[-1024]
+                 break;
+@@ -1195,7 +1195,6 @@ G_CheckSpot
+             case 1024:
+             case 2048:
+             case 3072:
+-            case 4096:
+                 xa = finecosine[an];
+                 ya = finesine[an];
+                 break;
+-- 
+2.5.0
+
--- a/aur/chocolate-doom/0006-osx-Add-CFBundleIdentifier-to-Info.plist.patch
+++ b/aur/chocolate-doom/0006-osx-Add-CFBundleIdentifier-to-Info.plist.patch
@ -0,0 +1,46 @@
+From c6e66393ba5ed91b02f0bfbf7367771ce7ba819c Mon Sep 17 00:00:00 2001
+From: Simon Howard <fraggle@soulsphere.org>
+Date: Sun, 12 Jul 2015 02:52:57 -0400
+Subject: [PATCH 06/13] osx: Add CFBundleIdentifier to Info.plist.
+
+The preferences for the OS X launcher are currently stored in a file
+ambiguously named "launcher.plist" that could conflict with any other
+app on the system that chose to use the same moniker. Use the more
+specific identifier of org.chocolate-doom.launcher to avoid conflicts.
+
+Also set NSHumanReadableCopyright so that we get more detail on the
+"About" window in the launcher app.
+
+This fixes #570. Thanks to Xeriphas1994 for the suggestion to tweak
+the identifier.
+---
+ pkg/osx/Info.plist.in | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/pkg/osx/Info.plist.in b/pkg/osx/Info.plist.in
+index 5ea4f32..a648ed8 100644
+--- a/pkg/osx/Info.plist.in
+++ b/pkg/osx/Info.plist.in
+@@ -2,6 +2,8 @@
+ <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+ <plist version="1.0">
+ <dict>
+        <key>CFBundleIdentifier</key>
+        <string>org.chocolate-doom.launcher</string>
+ 	<key>CFBundleDevelopmentRegion</key>
+ 	<string>English</string>
+ 	<key>CFBundleDisplayName</key>
+@@ -26,6 +28,10 @@
+ 	<string>NSApplication</string>
+ 	<key>NSMainNibFile</key>
+ 	<string>launcher</string>
+        <key>NSHumanReadableCopyright</key>
+        <string>Copyright (C) 1993-2015, id Software and Raven Software, Simon Howard, James Haley, Samuel Villarreal and other contributors.
+
+Licensed under the GNU GPL v2.</string>
+ 
+         <!-- file associations: -->
+ 
+-- 
+2.5.0
+
--- a/aur/chocolate-doom/0007-Added-deh_bexstr.c-to-MSVC-project.patch
+++ b/aur/chocolate-doom/0007-Added-deh_bexstr.c-to-MSVC-project.patch
@ -0,0 +1,27 @@
+From 750aa95aad7d924b879dce60aa8abdd9c281af6e Mon Sep 17 00:00:00 2001
+From: linguica <github@andrewstine.org>
+Date: Wed, 22 Jul 2015 11:06:50 -0700
+Subject: [PATCH 07/13] Added deh_bexstr.c to MSVC project
+
+---
+ msvc/doom.vcproj | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/msvc/doom.vcproj b/msvc/doom.vcproj
+index 7f98d3a..7446ede 100644
+--- a/msvc/doom.vcproj
+++ b/msvc/doom.vcproj
+@@ -859,6 +859,10 @@
+ 					>
+ 				</File>
+ 				<File
+					RelativePath="..\src\doom\deh_bexstr.c"
+					>
+				</File>
+				<File
+ 					RelativePath="..\src\doom\deh_cheat.c"
+ 					>
+ 				</File>
+-- 
+2.5.0
+
--- a/aur/chocolate-doom/0008-Fixed-Heretic-Hexen-vcproj-files.patch
+++ b/aur/chocolate-doom/0008-Fixed-Heretic-Hexen-vcproj-files.patch
@ -0,0 +1,55 @@
+From 1325cde4859ca54eed3e1da2c1d226ae96b62c00 Mon Sep 17 00:00:00 2001
+From: linguica <github@andrewstine.org>
+Date: Thu, 23 Jul 2015 12:27:00 -0700
+Subject: [PATCH 08/13] Fixed Heretic / Hexen vcproj files
+
+Removed nonexistent files
+---
+ msvc/heretic.vcproj | 4 ----
+ msvc/hexen.vcproj   | 8 --------
+ 2 files changed, 12 deletions(-)
+
+diff --git a/msvc/heretic.vcproj b/msvc/heretic.vcproj
+index 3b80ce3..b3e150c 100644
+--- a/msvc/heretic.vcproj
+++ b/msvc/heretic.vcproj
+@@ -469,10 +469,6 @@
+ 					>
+ 				</File>
+ 				<File
+-					RelativePath="..\src\heretic\i_sound.c"
+-					>
+-				</File>
+-				<File
+ 					RelativePath="..\src\heretic\in_lude.c"
+ 					>
+ 				</File>
+diff --git a/msvc/hexen.vcproj b/msvc/hexen.vcproj
+index 1b1e3b4..5c2d201 100644
+--- a/msvc/hexen.vcproj
+++ b/msvc/hexen.vcproj
+@@ -426,10 +426,6 @@
+ 					>
+ 				</File>
+ 				<File
+-					RelativePath="..\src\hexen\i_sound.c"
+-					>
+-				</File>
+-				<File
+ 					RelativePath="..\src\hexen\in_lude.c"
+ 					>
+ 				</File>
+@@ -438,10 +434,6 @@
+ 					>
+ 				</File>
+ 				<File
+-					RelativePath="..\src\hexen\m_misc.c"
+-					>
+-				</File>
+-				<File
+ 					RelativePath="..\src\hexen\m_random.c"
+ 					>
+ 				</File>
+-- 
+2.5.0
+
--- a/aur/chocolate-doom/0009-Remove-duplicate-variable-definitions.patch
+++ b/aur/chocolate-doom/0009-Remove-duplicate-variable-definitions.patch
@ -0,0 +1,81 @@
+From 2da2ddd3777ee5ab35b197786677eb3e0df27030 Mon Sep 17 00:00:00 2001
+From: Simon Howard <fraggle@soulsphere.org>
+Date: Sat, 15 Aug 2015 13:59:19 -0400
+Subject: [PATCH 09/13] Remove duplicate variable definitions.
+
+gametic and singletics are defined in d_loop.c, but there were still
+some duplicate definitions of these variables left over from before
+the game code was factored out.
+
+This fixed #561 (thanks edward-san).
+---
+ src/heretic/d_main.c | 1 -
+ src/heretic/g_game.c | 1 -
+ src/hexen/g_game.c   | 1 -
+ src/hexen/h2_main.c  | 1 -
+ src/strife/g_game.c  | 1 -
+ 5 files changed, 5 deletions(-)
+
+diff --git a/src/heretic/d_main.c b/src/heretic/d_main.c
+index beb876c..6521aff 100644
+--- a/src/heretic/d_main.c
+++ b/src/heretic/d_main.c
+@@ -62,7 +62,6 @@ boolean respawnparm;            // checkparm of -respawn
+ boolean debugmode;              // checkparm of -debug
+ boolean ravpic;                 // checkparm of -ravpic
+ boolean cdrom;                  // true if cd-rom mode active
+-boolean singletics;             // debug flag to cancel adaptiveness
+ boolean noartiskip;             // whether shift-enter skips an artifact
+ 
+ skill_t startskill;
+diff --git a/src/heretic/g_game.c b/src/heretic/g_game.c
+index 1154925..6ad3860 100644
+--- a/src/heretic/g_game.c
+++ b/src/heretic/g_game.c
+@@ -102,7 +102,6 @@ player_t players[MAXPLAYERS];
+ 
+ int consoleplayer;              // player taking events and displaying
+ int displayplayer;              // view being displayed
+-int gametic;
+ int levelstarttic;              // gametic at level start
+ int totalkills, totalitems, totalsecret;        // for intermission
+ 
+diff --git a/src/hexen/g_game.c b/src/hexen/g_game.c
+index e0a7afa..fd72d44 100644
+--- a/src/hexen/g_game.c
+++ b/src/hexen/g_game.c
+@@ -88,7 +88,6 @@ int RebornPosition;
+ 
+ int consoleplayer;              // player taking events and displaying
+ int displayplayer;              // view being displayed
+-int gametic;
+ int levelstarttic;              // gametic at level start
+ 
+ char demoname[32];
+diff --git a/src/hexen/h2_main.c b/src/hexen/h2_main.c
+index 1e60c84..47c5e28 100644
+--- a/src/hexen/h2_main.c
+++ b/src/hexen/h2_main.c
+@@ -103,7 +103,6 @@ boolean debugmode;              // checkparm of -debug
+ boolean ravpic;                 // checkparm of -ravpic
+ boolean cdrom = false;          // true if cd-rom mode active
+ boolean cmdfrag;                // true if a CMD_FRAG packet should be sent out
+-boolean singletics;             // debug flag to cancel adaptiveness
+ boolean artiskip;               // whether shift-enter skips an artifact
+ int maxzone = 0x800000;         // Maximum allocated for zone heap (8meg default)
+ skill_t startskill;
+diff --git a/src/strife/g_game.c b/src/strife/g_game.c
+index 906d3c9..c12e856 100644
+--- a/src/strife/g_game.c
+++ b/src/strife/g_game.c
+@@ -124,7 +124,6 @@ boolean         turbodetected[MAXPLAYERS];
+  
+ int             consoleplayer;          // player taking events and displaying 
+ int             displayplayer;          // view being displayed 
+-int             gametic; 
+ int             levelstarttic;          // gametic at level start 
+ int             totalkills, /*totalitems,*/ totalsecret;    // for intermission 
+  
+-- 
+2.5.0
+
--- a/aur/chocolate-doom/0010-setup-manifest-Add-compatibility-GUID-for-Windows-10.patch
+++ b/aur/chocolate-doom/0010-setup-manifest-Add-compatibility-GUID-for-Windows-10.patch
@ -0,0 +1,24 @@
+From 525a7b0d071b146221498a13275c5db206a437e3 Mon Sep 17 00:00:00 2001
+From: Mike Swanson <mikeonthecomputer@gmail.com>
+Date: Fri, 14 Aug 2015 00:42:31 -0700
+Subject: [PATCH 10/13] setup-manifest: Add compatibility GUID for Windows 10
+
+---
+ src/setup/setup-manifest.xml.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/setup/setup-manifest.xml.in b/src/setup/setup-manifest.xml.in
+index 7db56e8..111ad0f 100644
+--- a/src/setup/setup-manifest.xml.in
+++ b/src/setup/setup-manifest.xml.in
+@@ -32,6 +32,7 @@
+       <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> <!-- Vista -->
+       <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> <!-- 8 -->
+       <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> <!-- 8.1 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> <!-- 10 -->
+     </application>
+   </compatibility>
+ 
+-- 
+2.5.0
+
--- a/aur/chocolate-doom/0011-Apply-gcc_struct-tag-to-packed-structs.patch
+++ b/aur/chocolate-doom/0011-Apply-gcc_struct-tag-to-packed-structs.patch
@ -0,0 +1,30 @@
+From 87db726b9a9ae61caf2ff167450625ce8f4076c3 Mon Sep 17 00:00:00 2001
+From: Fabian Greffrath <fabian@greffrath.com>
+Date: Mon, 24 Aug 2015 19:14:05 +0200
+Subject: [PATCH 11/13] Apply gcc_struct tag to packed structs
+
+GCC fails to properly pack structs although they are tagged with
+__attribute__((__packed__)) if called with -mms-bitfields which has
+become the default on Windows at some point:
+
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52991
+---
+ src/doomtype.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/doomtype.h b/src/doomtype.h
+index 10820c1..5377c8c 100644
+--- a/src/doomtype.h
+++ b/src/doomtype.h
+@@ -51,7 +51,7 @@
+ //
+ 
+ #ifdef __GNUC__
+-#define PACKEDATTR __attribute__((packed))
+#define PACKEDATTR __attribute__((packed,gcc_struct))
+ #else
+ #define PACKEDATTR
+ #endif
+-- 
+2.5.0
+
--- a/aur/chocolate-doom/0012-Make-IWAD-search-paths-compliant-with-XDG-spec.patch
+++ b/aur/chocolate-doom/0012-Make-IWAD-search-paths-compliant-with-XDG-spec.patch
@ -0,0 +1,210 @@
+From 69faefcab4f8ac6599f47173b9a0eba80aaa10a6 Mon Sep 17 00:00:00 2001
+From: Simon Howard <fraggle@soulsphere.org>
+Date: Sun, 23 Aug 2015 16:08:58 -0400
+Subject: [PATCH 12/13] Make IWAD search paths compliant with XDG spec.
+
+The XDG Base Directory Specification defines standard directories
+that are searched for data files via the XDG_DATA_HOME and
+XDG_DATA_DIRS environment variables:
+http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+
+To make Chocolate Doom a good citizen, use these directories to
+determine some of the locations in which to look for IWAD files. This
+includes /usr/share/games/doom, which is absorbed under the default
+value of the XDG_DATA_DIRS variable. We also now support the alternative
+~/.local/share/games/doom as a user-writeable path in the user's home
+directory that doesn't require root privileges.
+
+This is part of #597 (thanks to @chungy for the suggestion).
+---
+ src/d_iwad.c | 128 ++++++++++++++++++++++++++++++++++++++---------------------
+ 1 file changed, 82 insertions(+), 46 deletions(-)
+
+diff --git a/src/d_iwad.c b/src/d_iwad.c
+index 2d6460b..3777bab 100644
+--- a/src/d_iwad.c
+++ b/src/d_iwad.c
+@@ -509,55 +509,96 @@ static GameMission_t IdentifyIWADByName(char *name, int mask)
+     return mission;
+ }
+ 
+-//
+-// Add directories from the list in the DOOMWADPATH environment variable.
+-//
+-
+-static void AddDoomWadPath(void)
+// Add IWAD directories parsed from splitting a path string containing
+// paths separated by PATH_SEPARATOR. 'suffix' is a string to concatenate
+// to the end of the paths before adding them.
+static void AddIWADPath(char *path, char *suffix)
+ {
+-    char *doomwadpath;
+-    char *p;
+-
+-    // Check the DOOMWADPATH environment variable.
+-
+-    doomwadpath = getenv("DOOMWADPATH");
+-
+-    if (doomwadpath == NULL)
+-    {
+-        return;
+-    }
+    char *left, *p;
+ 
+-    doomwadpath = M_StringDuplicate(doomwadpath);
+-
+-    // Add the initial directory
+-
+-    AddIWADDir(doomwadpath);
+    path = M_StringDuplicate(path);
+ 
+     // Split into individual dirs within the list.
+-
+-    p = doomwadpath;
+    left = path;
+ 
+     for (;;)
+     {
+-        p = strchr(p, PATH_SEPARATOR);
+-
+        p = strchr(left, PATH_SEPARATOR);
+         if (p != NULL)
+         {
+-            // Break at the separator and store the right hand side
+            // Break at the separator and use the left hand side
+             // as another iwad dir
+-  
+             *p = '\0';
+-            p += 1;
+ 
+-            AddIWADDir(p);
+            AddIWADDir(M_StringJoin(left, suffix, NULL));
+            left = p + 1;
+         }
+         else
+         {
+             break;
+         }
+     }
+
+    AddIWADDir(M_StringJoin(left, suffix, NULL));
+
+    free(path);
+ }
+ 
+// Add standard directories where IWADs are located on Unix systems.
+// To respect the freedesktop.org specification we support overriding
+// using standard environment variables. See the XDG Base Directory
+// Specification:
+// <http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html>
+static void AddXdgDirs(void)
+{
+    char *env, *tmp_env;
+
+    // Quote:
+    // > $XDG_DATA_HOME defines the base directory relative to which
+    // > user specific data files should be stored. If $XDG_DATA_HOME
+    // > is either not set or empty, a default equal to
+    // > $HOME/.local/share should be used.
+    env = getenv("XDG_DATA_HOME");
+    tmp_env = NULL;
+
+    if (env == NULL)
+    {
+        char *homedir = getenv("HOME");
+        if (homedir == NULL)
+        {
+            homedir = "/";
+        }
+
+        tmp_env = M_StringJoin(homedir, "/.local/share", NULL);
+        env = tmp_env;
+    }
+
+    // We support $XDG_DATA_HOME/games/doom (which will usually be
+    // ~/.local/share/games/doom) as a user-writeable extension to
+    // the usual /usr/share/games/doom location.
+    AddIWADDir(M_StringJoin(env, "/games/doom", NULL));
+    free(tmp_env);
+
+    // Quote:
+    // > $XDG_DATA_DIRS defines the preference-ordered set of base
+    // > directories to search for data files in addition to the
+    // > $XDG_DATA_HOME base directory. The directories in $XDG_DATA_DIRS
+    // > should be seperated with a colon ':'.
+    // >
+    // > If $XDG_DATA_DIRS is either not set or empty, a value equal to
+    // > /usr/local/share/:/usr/share/ should be used.
+    env = getenv("XDG_DATA_DIRS");
+    if (env == NULL)
+    {
+        // (Trailing / omitted from paths, as it is added below)
+        env = "/usr/local/share:/usr/share";
+    }
+
+    // The "standard" location for IWADs on Unix that is supported by most
+    // source ports is /usr/share/games/doom - we support this through the
+    // XDG_DATA_DIRS mechanism, through which it can be overridden.
+    AddIWADPath(env, "/games/doom");
+}
+ 
+ //
+ // Build a list of IWAD files
+@@ -565,7 +606,7 @@ static void AddDoomWadPath(void)
+ 
+ static void BuildIWADDirList(void)
+ {
+-    char *doomwaddir;
+    char *env;
+ 
+     if (iwad_dirs_built)
+     {
+@@ -573,21 +614,21 @@ static void BuildIWADDirList(void)
+     }
+ 
+     // Look in the current directory.  Doom always does this.
+-
+     AddIWADDir(".");
+ 
+     // Add DOOMWADDIR if it is in the environment
+-
+-    doomwaddir = getenv("DOOMWADDIR");
+-
+-    if (doomwaddir != NULL)
+    env = getenv("DOOMWADDIR");
+    if (env != NULL)
+     {
+-        AddIWADDir(doomwaddir);
+-    }        
+-
+-    // Add dirs from DOOMWADPATH
+        AddIWADDir(env);
+    }
+ 
+-    AddDoomWadPath();
+    // Add dirs from DOOMWADPATH:
+    env = getenv("DOOMWADPATH");
+    if (env != NULL)
+    {
+        AddIWADPath(env, "");
+    }
+ 
+ #ifdef _WIN32
+ 
+@@ -603,12 +644,7 @@ static void BuildIWADDirList(void)
+     CheckSteamGUSPatches();
+ 
+ #else
+-
+-    // Standard places where IWAD files are installed under Unix.
+-
+-    AddIWADDir("/usr/share/games/doom");
+-    AddIWADDir("/usr/local/share/games/doom");
+-
+    AddXdgDirs();
+ #endif
+ 
+     // Don't run this function again.
+-- 
+2.5.0
+
--- a/aur/chocolate-doom/0013-man-Add-documentation-for-IWAD-search-paths.patch
+++ b/aur/chocolate-doom/0013-man-Add-documentation-for-IWAD-search-paths.patch
@ -0,0 +1,156 @@
+From 5240ddc977d2f19e969a6683142e325595eec62c Mon Sep 17 00:00:00 2001
+From: Simon Howard <fraggle@soulsphere.org>
+Date: Sun, 23 Aug 2015 16:12:54 -0400
+Subject: [PATCH 13/13] man: Add documentation for IWAD search paths.
+
+We now search in a bunch of different directories in order to find
+IWAD files to use to play with, and the logic is a bit complicated.
+Add some hopefully friendly documentation to explain where people
+can put their IWAD files to play with.
+
+Part of #597.
+---
+ man/Makefile.am      |  1 +
+ man/doom.template    |  2 ++
+ man/environ.man      |  5 +----
+ man/heretic.template |  2 ++
+ man/hexen.template   |  2 ++
+ man/iwad_paths.man   | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
+ man/strife.template  |  2 ++
+ 7 files changed, 58 insertions(+), 4 deletions(-)
+ create mode 100644 man/iwad_paths.man
+
+diff --git a/man/Makefile.am b/man/Makefile.am
+index 32f275e..f93e8ed 100644
+--- a/man/Makefile.am
+++ b/man/Makefile.am
+@@ -1,4 +1,5 @@
+ MANPAGE_GEN_FILES = environ.man           \
+                    iwad_paths.man        \
+                     doom.template         \
+                     heretic.template      \
+                     hexen.template        \
+diff --git a/man/doom.template b/man/doom.template
+index b587d15..d478815 100644
+--- a/man/doom.template
+++ b/man/doom.template
+@@ -10,6 +10,8 @@ Chocolate Doom is a port of Id Software's 1993 game "Doom" that is designed
+ to behave as similar to the original DOS version of Doom as is possible.
+ .br
+ @content
+.SH IWAD SEARCH PATHS
+@include iwad_paths.man
+ .SH ENVIRONMENT
+ This section describes environment variables that control Chocolate Doom's
+ behavior.
+diff --git a/man/environ.man b/man/environ.man
+index 171b25d..ef8de02 100644
+--- a/man/environ.man
+++ b/man/environ.man
+@@ -1,9 +1,6 @@
+ .TP
+ \fBDOOMWADDIR\fR, \fBDOOMWADPATH\fR
+-These environment variables provide paths to search for Doom .WAD files when
+-looking for a game IWAD file or a PWAD file specified with the `\-file' option.
+-\fBDOOMWADDIR\fR specifies a single path in which to look for WAD files,
+-while \fBDOOMWWADPATH\fR specifies a colon-separated list of paths to search.
+See the section, \fBIWAD SEARCH PATHS\fR above.
+ .TP
+ \fBPCSOUND_DRIVER\fR
+ When running in PC speaker sound effect mode, this environment variable
+diff --git a/man/heretic.template b/man/heretic.template
+index e9afa96..8fe2e73 100644
+--- a/man/heretic.template
+++ b/man/heretic.template
+@@ -11,6 +11,8 @@ aims to behave as similar to the original DOS version of Heretic as
+ possible.
+ .br
+ @content
+.SH IWAD SEARCH PATHS
+@include iwad_paths.man
+ .SH ENVIRONMENT
+ This section describes environment variables that control Chocolate Heretic's
+ behavior.
+diff --git a/man/hexen.template b/man/hexen.template
+index 4c0524a..f5619ad 100644
+--- a/man/hexen.template
+++ b/man/hexen.template
+@@ -11,6 +11,8 @@ aims to behave as similar to the original DOS version of Hexen as
+ possible.
+ .br
+ @content
+.SH IWAD SEARCH PATHS
+@include iwad_paths.man
+ .SH ENVIRONMENT
+ This section describes environment variables that control Chocolate Hexen's
+ behavior.
+diff --git a/man/iwad_paths.man b/man/iwad_paths.man
+new file mode 100644
+index 0000000..9805815
+--- /dev/null
+++ b/man/iwad_paths.man
+@@ -0,0 +1,48 @@
+To play, an IWAD file is needed. This is a large file containing all of the
+levels, graphics, sound effects, music and other material that make up the
+game. IWAD files are named according to the game; the standard names are:
+.TP
+\fBdoom.wad, doom1.wad, doom2.wad, tnt.wad, plutonia.wad\fR
+Doom, Doom II, Final Doom
+.TP
+\fBheretic.wad, heretic1.wad, hexen.wad, strife1.wad\fR
+Heretic, Hexen and Strife (commercial Doom engine games).
+.TP
+\fBhacx.wad, chex.wad\fR
+Hacx and Chex Quest - more obscure games based on the Doom engine.
+.TP
+\fBfreedm.wad, freedoom1.wad, freedoom2.wad\fR
+The Freedoom open content IWAD files.
+.LP
+The following directory paths are searched in order to find an IWAD:
+.TP
+\fBCurrent working directory\fR
+Any IWAD files found in the current working directory will be used in
+preference to IWADs found in any other directories.
+.TP
+\fBDOOMWADDIR\fR
+This environment variable can be set to contain a path to a single directory
+in which to look for IWAD files. This environment variable is supported by
+most Doom source ports.
+.TP
+\fBDOOMWADPATH\fR
+This environment variable, if set, can contain a colon-separated list of
+directories in which to look for IWAD files, or alternatively full paths to
+specific IWAD files.
+.TP
+\fB$HOME/.local/share/games/doom\fR
+Writeable directory in the user's home directory. The path can be overridden
+using the \fBXDG_DATA_HOME\fR environment variable (see the XDG Base Directory
+Specification).
+.TP
+\fB/usr/local/share/games/doom, /usr/share/games/doom\fR
+System-wide locations that can be accessed by all users. The path
+\fB/usr/share/games/doom\fR is a standard path that is supported by most
+Doom source ports. These paths can be overridden using the \fBXDG_DATA_DIRS\fR
+environment variable (see the XDG Base Directory Specification).
+.LP
+The above can be overridden on a one-time basis by using the \fB\-iwad\fR
+command line parameter to provide the path to an IWAD file to use. This
+parameter can also be used to specify the name of a particular IWAD to use
+from one of the above paths. For example, '\fB-iwad doom.wad\fR' will search
+the above paths for the file \fBdoom.wad\fR to use.
+diff --git a/man/strife.template b/man/strife.template
+index ddcc12f..3d5614c 100644
+--- a/man/strife.template
+++ b/man/strife.template
+@@ -13,6 +13,8 @@ of the original programmers of the game (see the section HISTORY below).
+ 
+ @content
+ 
+.SH IWAD SEARCH PATHS
+@include iwad_paths.man
+ .SH ENVIRONMENT
+ This section describes environment variables that control Chocolate Strife's
+ behavior.
+-- 
+2.5.0
+
--- a/aur/chocolate-doom/PKGBUILD
+++ b/aur/chocolate-doom/PKGBUILD
@ -4,16 +4,40 @@ pkgname=(chocolate-{doom,heretic,hexen,strife,common})
 pkgbase=${pkgname[0]}
 pkgdesc="Historically-accurate Doom, Heretic, Hexen, and Strife ports."
 pkgver=2.2.0
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://www.chocolate-doom.org/"
 license=('GPL2')
 depends=('libsamplerate' 'sdl_mixer' 'sdl_net')
 makedepends=('python')
 source=(http://chocolate-doom.org/downloads/${pkgver}/${pkgbase}-${pkgver}.tar.gz
-        0001-setup-Fix-help-URL-for-level-warp-menu.patch)
+        0001-setup-Fix-help-URL-for-level-warp-menu.patch
+        0002-Update-README.Strife.patch
+        0003-setup.desktop-Add-a-missing-semicolon-to-Categories.patch
+        0004-Add-Keywords-to-the-setup.desktop-file.patch
+        0005-doom-Avoid-overflow-for-spawn-angle-calculation.patch
+        0006-osx-Add-CFBundleIdentifier-to-Info.plist.patch
+        0007-Added-deh_bexstr.c-to-MSVC-project.patch
+        0008-Fixed-Heretic-Hexen-vcproj-files.patch
+        0009-Remove-duplicate-variable-definitions.patch
+        0010-setup-manifest-Add-compatibility-GUID-for-Windows-10.patch
+        0011-Apply-gcc_struct-tag-to-packed-structs.patch
+        0012-Make-IWAD-search-paths-compliant-with-XDG-spec.patch
+        0013-man-Add-documentation-for-IWAD-search-paths.patch)
 sha256sums=('9fa9c56e72f8a04adf8f0800141192e9bafd38c9e424f70942ece6e515570173'
-            'f890dac486a77ace888e18419e0a3f95c2ff59fab9bea08eb92558c3d7320e50')
+            '172b7df49de7c233cf2720d74341e606dd896bad396a3490e99b13de48184347'
+            'dac8bb2e341e33b83f05c5475144b482f724070df80f6b83dc3feb7d2224b8d0'
+            '8d2bd8b1db28c7ec2c0ec05e4dfadfbf13f26e02a772d59523e76b2cb957228a'
+            'fa3a2b6aa1c9ac0a38a1969ac7ada9e506654929ab0f976ebb87798943561916'
+            'dbb1b3bb84befafbc4be305515c3d73943ccd93d13a65f5fa33dfc5811187d2b'
+            'c3bee8e2b7c7edeb1b305b4d892aa75ac44e661d21b91644b0c356d388976c8c'
+            '46a7327c4fd5e60f3969fa2677e815cb306f9d443033d52a6e9d007bcfab1aeb'
+            'ccb421f20e33b328b413601e9dd56553481e96810347fb523531dfcd4a5ca01a'
+            '859b29c78932f97cad9c8c77fbd333664b9f01e1d3c3881ebb1e16769a60d04f'
+            '7886a2df4967b3db0032bede909cccfe14a302cb51b1a4005b2a877231e4ab46'
+            '33f2b99d847060e13ca3e8996a178731f8652660e450121aad0f34b6af7225f6'
+            '99c57dc6264cc0ff6e0964b34f5457b1208d369eef601756313e886fcb92f85c'
+            '8588637c1e09ae2eedf097bc4350052e80eed50bbfbbb814412005ee2b208287')

 prepare() {
  cd "${pkgbase}-${pkgver}"
--- a/aur/chocolate-doom/chocolate-doom.install
+++ b/aur/chocolate-doom/chocolate-doom.install
@ -1,8 +1,13 @@
 post_install() {
-    echo "Install IWADs into /usr/share/games/doom or /usr/local/share/games/doom"
-    echo ""
-    echo "Files such as doom2.wad, heretic.wad, hexen.wad, strife1.wad"
-    echo "are IWADs appropriate for installation and usage with Chocolate"
-    echo "engines.  These must be lower-case file names unless using a"
-    echo "case-insensitive file system."
+cat <<EOF
+To install game data (*.wad files), there are two main locations for
+the engine to easily find them:
+ * For all users: /usr/share/games/doom
+ * For a single user: ~/.local/share/games/doom
+
+Files such as doom2.wad, heretic.wad, hexen.wad, and strife1.wad are
+appropriate for installation and usage with Chocolate engines.
+These must be lower-case file names, unless on a case-insensitive
+file system.
+EOF
 }
--- a/aur/couchpotato-git/PKGBUILD
+++ b/aur/couchpotato-git/PKGBUILD
@ -1,37 +0,0 @@
-# Maintainer: Ben Ruijl <benruyl at gmail>
-
-pkgname=couchpotato-git
-_gitname=CouchPotatoServer
-pkgver=4263.88dc367
-pkgrel=1
-pkgdesc="Automatic Movie Downloading via NZBs & Torrent"
-arch=('any')
-url="http://couchpota.to/"
-license=('GPL3')
-depends=('python2')
-makedepends=('git')
-install='couchpotato.install'
-source=('git://github.com/RuudBurger/CouchPotatoServer.git' 'couchpotato.service')
-md5sums=('SKIP' '82813cd00a17dd78f10756d71c7eb848')
-
-pkgver() {
-  cd $_gitname
-  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
-}
-
-prepare() {
-  cd $_gitname
-
-  # Use Python 2
-  find . -type f -exec sed -i -r \
-    -e 's|/usr/bin/python$|&2|g' \
-    -e 's|(/usr/bin/python2)\.4$|\1|g' \
-    {} +
-}
-
-package() {
-  mkdir -p "${pkgdir}/opt/"
-  cp -r "$srcdir/$_gitname" "${pkgdir}/opt/couchpotato"
-
-  install -Dm644 "${srcdir}/couchpotato.service" "${pkgdir}/usr/lib/systemd/system/couchpotato.service"
-}
--- a/aur/couchpotato-git/couchpotato.install
+++ b/aur/couchpotato-git/couchpotato.install
@ -1,22 +0,0 @@
-CP_USER="couchpotato"
-CP_GROUP="couchpotato"
-CP_DIR="/opt/couchpotato"
-
-## arg 1:  the new package version
-post_install() {
-  groupadd ${CP_GROUP} &> /dev/null
-  useradd -g ${CP_GROUP} -d ${CP_DIR} -s /bin/false ${CP_USER} &> /dev/null
-  chown -R ${CP_USER}:${CP_GROUP} ${CP_DIR}
-  echo "  >> If you want a custom user or path for CouchPotato, remember to edit the service file as well."
-}
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  chown -R ${CP_USER}:${CP_GROUP} ${CP_DIR}
-}
-
-## arg 1:  the old package version
-post_remove() {
-  userdel ${CP_USER} &> /dev/null
-  groupdel ${CP_GROUP} &> /dev/null || /bin/true
-}
--- a/aur/couchpotato-git/couchpotato.service
+++ b/aur/couchpotato-git/couchpotato.service
@ -1,14 +0,0 @@
-[Unit]
-Description=An automatic NZB and torrent movie downloader
-
-[Service]
-ExecStart=/usr/bin/python2 /opt/couchpotato/CouchPotato.py --config_file /opt/couchpotato/config.ini --data_dir /opt/couchpotato/data --daemon --quiet
-GuessMainPID=no
-Type=forking
-User=couchpotato
-Group=couchpotato
-
-[Install]
-WantedBy=multi-user.target
-
-
--- a/aur/flashbench-git/PKGBUILD
+++ b/aur/flashbench-git/PKGBUILD
@ -1,28 +1,32 @@
-# Maintainer: Marti Raudsepp <marti@juffo.org>
+# Maintainer: lestb <tkhdlstfl dot l plus aur at gmail dot com>
+# Contributor: Marti Raudsepp <marti@juffo.org>
+# Package Repository: https://github.com/mij-aur-packages/flashbench-git

 pkgname=flashbench-git
-pkgver=62.2e30b19
-pkgver() {
-	cd "$srcdir/$pkgname"
-	echo $(git rev-list --count master).$(git rev-parse --short master)
-}
-epoch=1
+pkgver=r62.2e30b19
 pkgrel=1
 pkgdesc="Tool for benchmarking and classifying flash memory drives"
 arch=(i686 x86_64)
-license=('unknown')
+license=('GPL2')
 url="https://lwn.net/SubscriberLink/428584/354d16fe00c90072/"
-makedepends=('git')
 replaces=('flashbench')
 provides=('flashbench')
 conflicts=('flashbench')
-source=("$pkgname::git://git.linaro.org/people/arnd/flashbench.git")
+source=('git+http://git.linaro.org/git-ro/people/arnd.bergmann/flashbench.git')
 md5sums=('SKIP')

+pkgver() {
+  cd "${srcdir}/flashbench"
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
 build() {
-  make -C "$srcdir/$pkgname"
+  cd "${srcdir}/flashbench"
+  make
 }
-package(){
-  install -Dm755 "$srcdir/$pkgname/flashbench" "$pkgdir/usr/bin/flashbench"
-  install -Dm755 "$srcdir/$pkgname/erase" "$pkgdir/usr/bin/flashbench"
+
+package() {
+  cd "${srcdir}/flashbench"
+  mkdir -p "${pkgdir}/usr/bin"
+  install -m755 flashbench erase "${pkgdir}/usr/bin/"
 }
--- a/aur/flexget/ChangeLog
+++ b/aur/flexget/ChangeLog
--- a/aur/flexget/PKGBUILD
+++ b/aur/flexget/PKGBUILD
@ -1,83 +0,0 @@
-# Maintainer: Amr Hassan <amr.hassan@gmail.com>
-# Maintainer: Nathan Owe <ndowens.aur at gmail dot com>
-# Maintainer: G. Richard Bellamy <rbellamy@pteradigm.com>
-
-pkgname=flexget
-_pkgname=FlexGet
-pkgver=1.2.320
-pkgrel=1
-
-pkgdesc="Automate downloading or processing content (torrents, podcasts, etc.) from different sources like RSS-feeds, html-pages, various sites and more."
-
-arch=('any')
-url="http://flexget.com/"
-license=('MIT')
-
-depends=('python2'
-         # documented in FlexGet.egg-info/requires.txt
-         'python2-feedparser>=5.1.3'
-         'python2-sqlalchemy>=0.7.5'
-         'python2-sqlalchemy<=1.999'
-         'python2-yaml'
-         'python2-beautifulsoup4>=4.1'
-         'python2-beautifulsoup4<4.4'
-         'python2-guessit>=0.9.3'
-         'python2-html5lib>=0.11'
-         'python2-pyrss2gen' #AUR#
-         'python2-progressbar'
-         'python2-rpyc' #AUR#
-         'python2-jinja'
-         'python2-path>=5.1' #AUR#
-         'python2-requests>=1.0'
-         'python2-requests<2.99'
-         'python2-dateutil1' #AUR#
-         'python2-jsonschema>=2.0' #AUR#
-         'python2-tvrage' #AUR#
-         'python2-tmdb3' #AUR#
-         'python2-pynzb' #AUR#
-         'python2-apscheduler' #AUR#
-         # undocumented in FlexGet.egg-info/requires.txt
-         )
-optdepends=('python2-guppy: for memusage plugin' #AUR#
-            'python2-transmissionrpc: Transmission support' #AUR#
-            'python2-cherrypy: web interface'
-            'python2-flask: web interface'
-            )
-makedepends=('python2-paver'
-             'python2-setuptools'
-             )
-
-source=("https://pypi.python.org/packages/source/F/FlexGet/${_pkgname}-${pkgver}.tar.gz"
-        'flexget.service'
-        "http://download.flexget.com/ChangeLog"
-        )
-
-changelog=ChangeLog
-
-sha256sums=('d659dd7dce6bcb37a1e608e928b88b3f33ae667bfc6350a258b7c9042269b5b7'
-            'e2c3a958ed0c286337cd37fba1d6cbdf4306c57fcddf2b9cc43615ce80ae83aa'
-            'dcc1bc676b8c2b798fa9a7e0ed2b6853323e9e9d8ff696696dddeaf29cbc13d6')
-prepare() {
-  cd "${_pkgname}"-"${pkgver}"
-
-  msg "Patching shebangs to point to python2"
-  sed -i 's/\(python\)/\12/' flexget{,/ui}/__init__.py
-}
-
-package() {
-  cd "${_pkgname}"-"${pkgver}"
-
-  # Python setup
-  python2 setup.py install --root="${pkgdir}"/ --prefix=/usr --optimize=1 || return 1
-
-  # License
-  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/"${pkgname}"/LICENSE
-
-  # Make sure the perms allow reading by all
-  chmod ugo+r ${pkgdir}/usr/lib/python2.7/site-packages/${_pkgname}-${pkgver}-py2.7.egg-info/*
-
-  # install systemd user unit
-  install -Dm644 ../flexget.service "${pkgdir}"/usr/lib/systemd/user/flexget.service
-}
-
-# vim:set ts=2 sw=2 et:
--- a/aur/flexget/flexget.service
+++ b/aur/flexget/flexget.service
@ -1,14 +0,0 @@
-[Unit]
-Description = FlexGet Daemon
-After = network.target
-
-[Service]
-Type=simple
-RemainAfterExit=yes
-ExecStart = /usr/bin/flexget daemon start
-ExecStop = /usr/bin/flexget daemon stop
-ExecReload = /usr/bin/flexget daemon reload
-KillMode=process
-
-[Install]
-WantedBy = default.target
--- a/aur/gmrender-resurrect-git/PKGBUILD
+++ b/aur/gmrender-resurrect-git/PKGBUILD
@ -4,12 +4,12 @@

 pkgname=gmrender-resurrect-git
 _gitname=gmrender-resurrect
-pkgver=275.61f5a8f
-pkgrel=2
+pkgver=277.aa3d02c
+pkgrel=1
 pkgdesc="Application to stream music from a UPnP server using gstreamer."
 arch=('i686' 'x86_64')
 url="https://github.com/hzeller/gmrender-resurrect"
-license=('GPL2')
+license=('GPL')
 conflicts=('gmediarender')
 depends=('libupnp' 'gst-plugins-good' 'gst-plugins-base')
 optdepends=(
--- a/aur/input-event-daemon/PKGBUILD
+++ b/aur/input-event-daemon/PKGBUILD
@ -1,30 +0,0 @@
-# Maintainer: Sebastian Wicki <gandro@gmx.net>
-# Contributor: Jason Plum <jplum@archlinuxarm.org>
-
-pkgname=input-event-daemon
-pkgver=0.1.3
-pkgrel=3
-pkgdesc="A daemon which handles input events such as shortcuts or switches"
-arch=('i686' 'x86_64')
-url="http://github.com/gandro/input-event-daemon"
-license=('custom')
-groups=()
-depends=('glibc')
-makedepends=('linux-api-headers')
-source=(
-    "http://github.com/gandro/$pkgname/tarball/v$pkgver/$pkgname-$pkgver.tar.gz"
-    'input-event-daemon.service'
-)
-md5sums=('72f8133df6d7327eb9e6f573d2a68f00'
-         '20d4e52acd32e9a272efcd8204f17d20')
-
-build() {
-  cd $srcdir/gandro-$pkgname-*/
-  make || return 1
-}
-
-package() {
-  cd $srcdir/gandro-$pkgname-*/
-  make DESTDIR=$pkgdir install || return 1
-  install -D -m 755 $srcdir/${pkgname}.service $pkgdir/usr/lib/systemd/system/${pkgname}.service
-}
--- a/aur/input-event-daemon/input-event-daemon.service
+++ b/aur/input-event-daemon/input-event-daemon.service
@ -1,13 +0,0 @@
-# input-event-daemon.service
-# Service file for input-event-daemon
-# https://github.com/gandro/input-event-daemon
-
-[Unit]
-Description=Input Event Daemon
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/input-event-daemon
-
-[Install]
-WantedBy=multi-user.target
--- a/aur/libdri2-git/PKGBUILD
+++ b/aur/libdri2-git/PKGBUILD
@ -1,35 +0,0 @@
-# Maintainer: Georges Discry <georges at discry dot be>
-
-pkgname=libdri2-git
-_gitname=libdri2
-pkgver=11.4f1eef3
-pkgrel=1
-pkgdesc="Library for the DRI2 extension to the X Window System"
-arch=('armv7h')
-url="https://github.com/robclark/libdri2"
-license=('MIT')
-depends=('libdrm' 'libxext')
-makedepends=('git' 'xextproto' 'xorg-server-devel')
-options=('!libtool')
-provides=('libdri2')
-source=('git+https://github.com/robclark/libdri2.git')
-md5sums=('SKIP')
-
-pkgver() {
-  cd "${SRCDEST}/${_gitname}"
-  echo $(git rev-list --count master).$(git rev-parse --short master)
-}
-
-build() {
-  cd "${srcdir}/${_gitname}"
-  ./autogen.sh
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${_gitname}"
-  make DESTDIR="${pkgdir}/" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
--- a/aur/lio-utils/PKGBUILD
+++ b/aur/lio-utils/PKGBUILD
@ -1,83 +0,0 @@
-# Contributor: Johannes Dewender  arch at JonnyJD dot net
-pkgname=lio-utils
-pkgver=4.1
-pkgrel=10
-epoch=
-pkgdesc="deprecated low-level configuration tool set for LIO (Target and iSCSI)"
-arch=('i686' 'x86_64')
-url="http://linux-iscsi.org/wiki/Lio-utils"
-license=('GPL2')
-depends=('python2')
-# for binary packages including lio-snmp in this package might be fine
-#makedepends=('net-snmp')
-#optdepends=("net-snmp: monitor lio with snmp")
-provides=()
-conflicts=('targetcli-fb')
-replaces=()
-backup=('etc/target/tcm_start.sh' 'etc/target/lio_start.sh')
-options=()
-install=
-source=(rc-arch.patch logfile.patch)
-md5sums=('1afad3e324d0bdde01d0383b482fac5f'
-         '43ab5e1a31f6d331dceef5bfa41a91a6')
-
-build() {
-  if [ ! -e "$pkgname-$pkgver.tgz" ]; then
-    curl -fLC - "http://www.risingtidesystems.com/git/?p=$pkgname.git;a=snapshot;h=595cd43e38ebd19813b91a3db35f3a707d2ba475;sf=tgz" -o "$pkgname-$pkgver.tgz"
-  fi
-  bsdtar -xf "$srcdir/$pkgname-$pkgver.tgz"
-
-  cd "$srcdir/$pkgname/"
-  patch -p1 < "$srcdir/logfile.patch"
-  patch -p1 < "$srcdir/rc-arch.patch"
-
-  cd "$srcdir/$pkgname/"
-	cd tcm-py ; python2 setup.py build
-  cd "$srcdir/$pkgname/"
-	cd lio-py ; python2 setup.py build
-  cd "$srcdir/$pkgname/tools"; make
-}
-
-package() {
-  cd "$srcdir/$pkgname/"
-
-  install -d $pkgdir/etc/rc.d
-  install -m 0755 scripts/rc.target $pkgdir/etc/rc.d/target
-
-  make DESTDIR="$pkgdir/" conf_install
-
-  SITE_PACKAGES=`python2 ./get-py-modules-path.py`
-  install -d "$pkgdir/usr/sbin"
-
-  cd "$srcdir/$pkgname/tcm-py"
-  python2 setup.py install --skip-build --root="$pkgdir/" --optimize=1
-  for file in "$pkgdir$SITE_PACKAGES"/tcm_*.py; do
-    sed -i '1s/python/python2/' "$file"
-  done
-  for part in {node,dump,loop,fabric}; do
-    chmod a+x "$pkgdir$SITE_PACKAGES/tcm_$part.py"
-    if [ ! -f "$pkgdir/usr/sbin/tcm_$part"  ]; then
-      ln -s "$SITE_PACKAGES/tcm_$part.py" "$pkgdir/usr/sbin/tcm_$part"
-    fi
-  done
-
-  cd "$srcdir/$pkgname/lio-py"
-  python2 setup.py install --skip-build --root="$pkgdir/" --optimize=1
-  for file in "$pkgdir$SITE_PACKAGES"/lio_*.py; do
-    sed -i '1s/python/python2/' "$file"
-  done
-  for part in {dump,node}; do
-    chmod a+x "$pkgdir$SITE_PACKAGES/lio_$part.py"
-    if [ ! -f "$pkgdir/usr/sbin/lio_$part"  ]; then
-      ln -s "$SITE_PACKAGES/lio_$part.py" "$pkgdir/usr/sbin/lio_$part"
-    fi
-  done
-
-
-  if [ -d "$srcdir/$pkgname/tools" ]; then
-    cd "$srcdir/$pkgname/tools"
-    make DESTDIR="$pkgdir/" install
-  fi
-}
-
-# vim:set ts=2 sw=2 et:
--- a/aur/lio-utils/logfile.patch
+++ b/aur/lio-utils/logfile.patch
@ -1,28 +0,0 @@
-commit 4f87d08987ab6332154cc37f81019de15a4af894
-Author: Ritesh Raj Sarraf <rrs@researchut.com>
-Date:   Fri Mar 16 01:23:40 2012 +0530
-
-    tighter checks
-    
-    Please see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=654262 for
-    details. Thanks to Aurelien Jarno
-    
-    Signed-off-by: Ritesh Raj Sarraf <rrs@researchut.com>
-    Signed-off-by: Nicholas Bellinger <nab@risingtidesystems.com>
-
-diff --git a/scripts/rc.target b/scripts/rc.target
-index 22c0350..7ad75a3 100644
--- a/scripts/rc.target
-+++ b/scripts/rc.target
-@@ -51,9 +51,9 @@ LIO_CONFIGFS_SCRIPT="/etc/target/lio_start.sh"
- # Enable: Set DEBUG=1    Disable: Set DEBUG=0
- 
- DEBUG=0
-LOGFILE=/tmp/tgtctl.dbug
-+LOGFILE=/var/log/tgtctl.dbug
- 
-if [ $DEBUG ]; then
-+if [ $DEBUG != 0 ]; then
- 	echo "$0 $*" >> $LOGFILE
- fi
- #########################################################################
--- a/aur/lio-utils/rc-arch.patch
+++ b/aur/lio-utils/rc-arch.patch
@ -1,149 +0,0 @@
-diff -aur lio-utils/scripts/rc.target lio-utils.new/scripts/rc.target
--- lio-utils/scripts/rc.target	2011-05-06 23:16:58.000000000 +0200
-+++ lio-utils.new/scripts/rc.target	2012-02-29 02:48:36.032877118 +0100
-@@ -27,10 +27,13 @@
- 
- # Source function library.
- #. /etc/init.d/functions
-+. /etc/rc.conf
-+. /etc/rc.d/functions
- 
- #########################################################################
- # Our product file definitions
- 
-+daemon_name=target
- MODNAME="target_core_mod"
- 
- TCM_CFS_DIR="/sys/kernel/config/target/core"
-@@ -112,11 +115,22 @@
- 			continue
- 		fi
- 
-		if [[ $i =~ ".rpmsave" ]]; then
-+		# files from arch package manager
-+		if [[ $i =~ ".pacsave" ]]; then
-+			continue
-+		fi
-+		if [[ $i =~ ".pacnew" ]]; then
-+			continue
-+		fi
-+		if [[ $i =~ ".pacorig" ]]; then
- 			continue
- 		fi
- 
-		if [[ $i =~ ".dpkg-dist" ]]; then
-+		# files from the free branch
-+		if [[ $i =~ ".json" ]]; then
-+			continue
-+		fi
-+		if [[ $i =~ ".backup" ]]; then
- 			continue
- 		fi
- 
-@@ -259,7 +273,7 @@
- 
- function shutdown_fabrics() {
- 	
-	echo -n $"Unloading fabric/configfs: "
-+	echo "Unloading fabric/configfs: "
- 	${TCM_FABRIC} --unloadall
- 	RETVAL=$?
- 	if [ $RETVAL == 0 ]; then
-@@ -274,7 +288,7 @@
- 		return 0
- 	fi
- 
-	echo -n $"Unloading LIO-Target/ConfigFS fabric: "
-+	echo "Unloading LIO-Target/ConfigFS fabric: "
- 	${LIO_NODE} --unload
-         RETVAL=$?
-         if [ $RETVAL == 0 ]; then
-@@ -285,7 +299,10 @@
- }
- 
- function unload_tcm_mod() {
-	
-+	if [ ! -d /sys/kernel/config/target/ ]; then
-+		return 0
-+	fi
-+
- 	shutdown_fabrics
- 	shutdown_lio_mod
- 
-@@ -446,28 +463,57 @@
- 
- case "$1" in
- 	start)
-+		stat_busy "Starting LIO targets"
- 		start 0
-+		if [ $? != 0 ]; then
-+			stat_fail
-+			exit 1
-+		else
-+			add_daemon $daemon_name
-+			stat_done
-+		fi
- 		;;
- 	startbak)
- 		if [ "$ARGS_COUNT" -ne "$ARGS_CHECK" ]; then
- 			echo "Usage: /etc/init.d/target startbak <DATE_TIME>"
- 			exit 1
- 		fi
-+		stat_busy "Starting LIO target backup $2"
- 		start $2
-+		if [ $? != 0 ]; then
-+			stat_fail
-+			exit 1
-+		else
-+			add_daemon $daemon_name
-+			stat_done
-+		fi
- 		;;
- 	stop)
-+		stat_busy "Stopping LIO targets"
- 		stop 1
-+		if [ $? != 0 ]; then
-+			stat_fail
-+			exit 1
-+		else
-+			rm_daemon $daemon_name
-+			stat_done
-+		fi
- 		;;
- 	status)
-		tcm_status
-		RETVAL=$?
-+		stat_busy "Checking status of LIO targets"
-+		ck_status $daemon_name
-+		# targetcli might have mounted configfs/target
-+		if [ -d /sys/kernel/config/target/ ]; then
-+			tcm_status
-+		fi
- 		;;
- 	restart|reload)
-		restart 1
-+		$0 stop
-+		sleep 3
-+		$0 start
- 		;;
- 	*)
-		echo $"Usage: $0 {start|startbak|stop|status|restart}"
-		exit 1
-+		echo "Usage: $0 {start|startbak|stop|status|restart}"
- esac
- 
- exit $?
-diff -aur lio-utils/tcm-py/tcm_node.py lio-utils.new/tcm-py/tcm_node.py
--- lio-utils/tcm-py/tcm_node.py	2011-05-06 23:16:58.000000000 +0200
-+++ lio-utils.new/tcm-py/tcm_node.py	2012-02-29 02:48:24.306210014 +0100
-@@ -591,7 +591,9 @@
- 
- 	# Unload TCM subsystem plugin modules
- 	for module in ("iblock", "file", "pscsi", "stgt"):
-		os.system("rmmod target_core_%s" % module)
-+		module_name = "target_core_%s" % module
-+		if not os.system("lsmod | grep %s > /dev/null" % module_name):
-+			os.system("rmmod %s" % module_name)
- 
- 	# Unload TCM Core
- 	rmmod_op = "rmmod target_core_mod"
--- a/aur/mediatomb/PKGBUILD
+++ b/aur/mediatomb/PKGBUILD
@ -1,14 +1,16 @@
-# Maintainer: Peter Richard Lewis <plewis@aur.archlinux.org>
+# Maintainer: S Leduc <sebastien@sleduc.fr>
+# 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>

 pkgname=mediatomb
 pkgver=0.12.1
-pkgrel=12.2
+pkgrel=13
 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' 'libexif' 'libmp4v2' 'sqlite3' 'taglib' 'libmariadbclient' 'js185')
@ -24,17 +26,19 @@ source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
        'jsparse.patch'
        'libav_0.7_support.patch'
        'libmp4v2_191_p497.patch'
-        'libavformat.patch')
-md5sums=('e927dd5dc52d3cfcebd8ca1af6f0d3c2'
-         '951b133930436a0ffc1c9b0c9f8145a3'
-         '27e796979c7778c3876b9a16452eb6e4'
-         '6503695608c811133db647e0991698eb'
-         '0ae34c0d73b76e3d215887834c3c08cf'
-         'd9e02a9956eecf5ff645bddf6dac0331'
-         'a7509bdaa0301ccbd9e564f727c1dd22'
-         '88144653ff2dc602bcb737f59b2421ce'
-         '915fa5b3b72649454009511a152b6102'
-         '932d29fbaaea6f1715bb6da456fb5f44')
+        'libavformat.patch'
+        'symlinks.patch')
+sha256sums=('31163c34a7b9d1c9735181737cb31306f29f1f2a0335fb4f53ecccf8f62f11cd'
+            'e46de674e49aa85116a8ff127908f7bac21198ce7625404004b8b7832eccd3f4'
+            '9c917f0d6e568ce0ad77c0ed17e4bbaabc0e7a1c0a3e4772b786fb1565db9768'
+            '70e4a4b89cef9a7f6f5f800e1793a6cb807f52b39e5a17d0a91356608b95e62d'
+            '0c02a20032f0c296800b1bb9644638970c2dedbc5ab7141d66a637235e9da6ce'
+            '2cd8f5628c3a38b290526f008bae351b90211825f86e5959bf95f140748de574'
+            'd9a3062858900d32b977f0d50d168fd7d36785b6ecc038c019e661e27f7b1c17'
+            'c6523e8bf5e2da89b7475d6777ef9bffe7d089752ef2f7b27b5e39a4130fb0ff'
+            'd39c2f9aab051c5447461718fd0ec72cf5982f6c920a4a985a50831f34babe84'
+            '76b11706d70ed8f5e157d96ca441c90c46c42176102fcb651b4ab1102b61bfee'
+            '72f7532d7cd827ab655df652d2912175739fe16d2b1ad989d987a0b147a1d2e8')

 build() {
  cd "$srcdir/$pkgname-$pkgver"
@ -44,6 +48,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 \
@ -58,7 +63,7 @@ package() {

  make DESTDIR="$pkgdir/" install

-  install -D -m0755 "$srcdir/mediatomb.service" "$pkgdir/usr/lib/systemd/system/mediatomb.service"
-  install -D -m0755 "$srcdir/mediatomb-mariadb.service" "$pkgdir/usr/lib/systemd/system/mediatomb-mariadb.service"
-  install -D -m0755 "$srcdir/mediatomb.conf" "$pkgdir/etc/conf.d/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"
 }
--- a/aur/mediatomb/mediatomb-mariadb.service
+++ b/aur/mediatomb/mediatomb-mariadb.service
@ -1,6 +1,6 @@
 [Unit]
 Description=MediaTomb Daemon using MariaDB
-After=mysql.target network.target
+After=mysqld.target network.target

 [Service]
 EnvironmentFile=/etc/conf.d/mediatomb
--- a/aur/mediatomb/symlinks.patch
+++ b/aur/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");
--- a/aur/metar/PKGBUILD
+++ b/aur/metar/PKGBUILD
@ -1,20 +0,0 @@
-# Maintainer: Dr Small <drsmall@mycroftserver.homelinux.org>
-
-pkgname=metar
-pkgver=20061030.1
-pkgrel=1
-pkgdesc="An utility to download/decode METAR reports."
-arch=('i686')
-url="http://packages.debian.org/unstable/utils/metar"
-license=('GPL')
-depends=('curl')
-source=(http://ftp.de.debian.org/debian/pool/main/m/$pkgname/${pkgname}_${pkgver}.orig.tar.gz)
-md5sums=('9349aee1e492473aabc846db8b35c348')
-
-build() {
-cd "${startdir}/src/$pkgname-$pkgver"
-
-./configure --prefix=/usr -mandir=/usr/share/man
-make || return 1
-make DESTDIR=${pkgdir} install
-}
--- a/aur/mt-daapd/PKGBUILD
+++ b/aur/mt-daapd/PKGBUILD
@ -1,53 +0,0 @@
-# Maintainer: Marcin Mikolajczyk <marcinmikolajcz at gmail dot com>
-# Contributor: Gary Wright <wriggary at g mail dot com> $
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Jon Kristian Nilsen <jokr.nilsen@gmail.com>
-# Contributor: Alan Orth <alan.orth at gmail dot com>
-
-pkgname=mt-daapd
-pkgver=0.2.4.2
-pkgrel=9
-pkgdesc="A multi-threaded DAAP server compatible with iTunes music sharing"
-arch=('i686' 'x86_64')
-url="http://www.mt-daapd.org/"
-license=('LGPL')
-depends=('libid3tag' 'avahi')
-backup=(etc/mt-daapd/mt-daapd.conf)
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz \
-	mt-daapd fix-libs.patch mt-daapd.service mt-daapd.install)
-md5sums=('67bef9fb14d487693b0dfb792c3f1b05'
-         '26cf6ff799ef06d262a8648d6890a250'
-         '59896e760486a51170d8b0e7ed5a2506'
-         'fde3fa3d5d48c05241b21b8b28d7ffa2'
-         '17c0262f291a8aaa15efc5c8e3a8e2f7')
-
-install=mt-daapd.install
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in
-  mv configure.in configure.ac
-
-  sed -i 's|DEFAULT_CONFIGFILE "/etc/mt-daapd.conf"|DEFAULT_CONFIGFILE "/etc/mt-daapd/mt-daapd.conf"|' src/main.c
-  patch configure.ac < "$srcdir/fix-libs.patch" 
-  aclocal
-  automake --add-missing
-  autoreconf
-  ./configure --prefix=/usr --sysconfdir=/etc/mt-daapd --sbindir=/usr/bin --enable-avahi --enable-mdns
-  make  
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install 
-
-  install -D -m644 contrib/mt-daapd.playlist "$pkgdir/etc/mt-daapd/sample.playlist" || return 1
-  install -D -m644 contrib/mt-daapd.conf "$pkgdir/etc/mt-daapd/mt-daapd.conf" || return 1
-  install -D -m755 ../mt-daapd "$pkgdir/etc/rc.d/mt-daapd" || return 1
-  install -D -m644 ../mt-daapd.service "$pkgdir/usr/lib/systemd/system/mt-daapd.service" || return 1
-
-  # create cache directories
-  install -d "$pkgdir/var/cache/mt-daapd" || return 1
-}
--- a/aur/mt-daapd/fix-libs.patch
+++ b/aur/mt-daapd/fix-libs.patch
@ -1,195 +0,0 @@
-*** mt-daapd-0.2.4.2/configure.in	2008-04-19 15:31:30.000000000 -0400
--- mt-daapd-0.2.4.2.new/configure.in	2011-05-01 20:56:15.204853627 -0400
-***************
-*** 20,27 ****
-  CPPFLAGS="${CPPFLAGS} -g"
-  
-  dnl fix freebsd's broken (?) libpthread
-! AC_CHECK_LIB(c_r,pthread_creat,LDFLAGS="${LDFLAGS} -lc_r", [
-!   AC_CHECK_LIB(pthread,pthread_create,LDFLAGS="${LDFLAGS} -lpthread") ])
-  
-  AC_ARG_ENABLE(debug,[  --enable-debug          Enable debugging features],
-  		       CPPFLAGS="${CPPFLAGS} -Wall")
--- 20,27 ----
-  CPPFLAGS="${CPPFLAGS} -g"
-  
-  dnl fix freebsd's broken (?) libpthread
-! AC_CHECK_LIB(c_r,pthread_creat,LIBS="${LIBS} -lc_r", [
-!   AC_CHECK_LIB(pthread,pthread_create,LIBS="${LIBS} -lpthread") ])
-  
-  AC_ARG_ENABLE(debug,[  --enable-debug          Enable debugging features],
-  		       CPPFLAGS="${CPPFLAGS} -Wall")
-***************
-*** 35,47 ****
-  		      esac ])
-  
-  AC_ARG_ENABLE(efence,[  --enable-efence         Enable electric fence],
-! 			LDFLAGS="${LDFLAGS} -lefence")
-  AC_ARG_ENABLE(nslu2,[  --enable-nslu2          Build for NSLU2/uNSLUng], 
-  		       CFLAGS="${CFLAGS} -DNSLU2")
-  
-  AC_ARG_ENABLE(howl,[  --enable-howl       Use howl 0.9.2 or later],
-  		      [ case "${enableval}" in
-!                         yes) rend_howl=true; rend_posix=false; rend_avahi=false; LDFLAGS="${LDFLAGS} -lhowl";
-  			CPPFLAGS="${CPPFLAGS} -DWITH_HOWL";;
-  		        no)  rend_howl=false;;
-  		        *)   AC_MSG_ERROR(bad value ${enableval} for --enable-howl);;
--- 35,47 ----
-  		      esac ])
-  
-  AC_ARG_ENABLE(efence,[  --enable-efence         Enable electric fence],
-! 			LIBS="${LIBS} -lefence")
-  AC_ARG_ENABLE(nslu2,[  --enable-nslu2          Build for NSLU2/uNSLUng], 
-  		       CFLAGS="${CFLAGS} -DNSLU2")
-  
-  AC_ARG_ENABLE(howl,[  --enable-howl       Use howl 0.9.2 or later],
-  		      [ case "${enableval}" in
-!                         yes) rend_howl=true; rend_posix=false; rend_avahi=false; LIBS="${LIBS} -lhowl";
-  			CPPFLAGS="${CPPFLAGS} -DWITH_HOWL";;
-  		        no)  rend_howl=false;;
-  		        *)   AC_MSG_ERROR(bad value ${enableval} for --enable-howl);;
-***************
-*** 50,56 ****
-  AC_ARG_ENABLE(avahi,[  --enable-avahi          Use avahi 0.6 or later],
-  		      [ case "${enableval}" in
-                          yes) PKG_CHECK_MODULES(AVAHI, [ avahi-client >= 0.6 ]);
-! 			rend_avahi=true; rend_howl=false; rend_posix=false; LDFLAGS="${LDFLAGS} $AVAHI_LIBS";
-  			CPPFLAGS="${CPPFLAGS} $AVAHI_CFLAGS -DWITH_AVAHI";;
-  		        no)  rend_avahi=false;;
-  		        *)   AC_MSG_ERROR(bad value ${enableval} for --enable-avahi);;
--- 50,56 ----
-  AC_ARG_ENABLE(avahi,[  --enable-avahi          Use avahi 0.6 or later],
-  		      [ case "${enableval}" in
-                          yes) PKG_CHECK_MODULES(AVAHI, [ avahi-client >= 0.6 ]);
-! 			rend_avahi=true; rend_howl=false; rend_posix=false; LIBS="${LIBS} $AVAHI_LIBS";
-  			CPPFLAGS="${CPPFLAGS} $AVAHI_CFLAGS -DWITH_AVAHI";;
-  		        no)  rend_avahi=false;;
-  		        *)   AC_MSG_ERROR(bad value ${enableval} for --enable-avahi);;
-***************
-*** 58,65 ****
-  
-  AC_ARG_ENABLE(oggvorbis,[  --enable-oggvorbis      Enable Ogg/Vorbis support],
-                             use_oggvorbis=true;
-! #                           LDFLAGS="${LDFLAGS} -logg -lvorbis";
-!                            CPPFLAGS="${CPPFLAGS} -DOGGVORBIS")
-  
-  AM_CONDITIONAL(COND_REND_HOWL, test x$rend_howl = xtrue)
-  AM_CONDITIONAL(COND_REND_AVAHI, test x$rend_avahi = xtrue)
--- 58,65 ----
-  
-  AC_ARG_ENABLE(oggvorbis,[  --enable-oggvorbis      Enable Ogg/Vorbis support],
-                             use_oggvorbis=true;
-! #                           LIBS="${LIBS} -logg -lvorbis";
-!                            CPPFLAGS="${LIBS} -DOGGVORBIS")
-  
-  AM_CONDITIONAL(COND_REND_HOWL, test x$rend_howl = xtrue)
-  AM_CONDITIONAL(COND_REND_AVAHI, test x$rend_avahi = xtrue)
-***************
-*** 82,88 ****
-  	CPPFLAGS="$CPPFLAGS -DNOT_HAVE_SA_LEN -D_XPG4_2"
-  	CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__ -DHAVE_BROKEN_RECVIF_NAME"
-  	CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
-! 	LDFLAGS="$LDFLAGS -lnsl -lsocket";;	
-  *freebsd*)
-  	CPPFLAGS="$CPPFLAGS -DFREEBSD";;
-  *linux*)
--- 82,88 ----
-  	CPPFLAGS="$CPPFLAGS -DNOT_HAVE_SA_LEN -D_XPG4_2"
-  	CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__ -DHAVE_BROKEN_RECVIF_NAME"
-  	CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
-! 	LIBS="$LIBS -lnsl -lsocket";;	
-  *freebsd*)
-  	CPPFLAGS="$CPPFLAGS -DFREEBSD";;
-  *linux*)
-***************
-*** 154,163 ****
-  AC_CHECK_LIB(gdbm,gdbm_open,echo "Have gdbm", echo "Must have gdbm";exit)
-  
-  if test "$STATIC_LIBS" != "no"; then
-!   LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libgdbm.a"
-    echo "Adding static libgdbm"
-  else
-!   LDFLAGS="${LDFLAGS} -lgdbm"
-    echo "Adding dynamic libgdbm"
-  fi
-  
--- 154,163 ----
-  AC_CHECK_LIB(gdbm,gdbm_open,echo "Have gdbm", echo "Must have gdbm";exit)
-  
-  if test "$STATIC_LIBS" != "no"; then
-!   LIBS="${LIBS} ${STATIC_LIBS}/libgdbm.a"
-    echo "Adding static libgdbm"
-  else
-!   LIBS="${LIBS} -lgdbm"
-    echo "Adding dynamic libgdbm"
-  fi
-  
-***************
-*** 170,179 ****
-  AC_CHECK_LIB(id3tag,id3_file_open,echo "Have id3tag",echo "Must have libid3tag";exit)
-  
-  if test "$STATIC_LIBS" != "no"; then
-!   LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libid3tag.a -lz"
-    echo "Adding static libid3tag"
-  else
-!   LDFLAGS="${LDFLAGS} -lid3tag -lz"
-    echo "Adding dynamic libid3tag"
-  fi
-  CFLAGS=$oldcflags
--- 170,179 ----
-  AC_CHECK_LIB(id3tag,id3_file_open,echo "Have id3tag",echo "Must have libid3tag";exit)
-  
-  if test "$STATIC_LIBS" != "no"; then
-!   LIBS="${LIBS} ${STATIC_LIBS}/libid3tag.a -lz"
-    echo "Adding static libid3tag"
-  else
-!   LIBS="${LIBS} -lid3tag -lz"
-    echo "Adding dynamic libid3tag"
-  fi
-  CFLAGS=$oldcflags
-***************
-*** 184,193 ****
-    AC_CHECK_LIB(ogg,ogg_sync_init,echo "Have ogg",echo "Must have libogg for Ogg/Vorbis support";exit)
-  
-    if test x"$STATIC_LIBS" != x"no"; then
-!     LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libogg.a"
-      echo "Adding static libogg"
-    else
-!     LDFLAGS="${LDFLAGS} -logg"
-      echo "Adding dynamic libogg"
-    fi
-  
--- 184,193 ----
-    AC_CHECK_LIB(ogg,ogg_sync_init,echo "Have ogg",echo "Must have libogg for Ogg/Vorbis support";exit)
-  
-    if test x"$STATIC_LIBS" != x"no"; then
-!     LIBS="${LIBS} ${STATIC_LIBS}/libogg.a"
-      echo "Adding static libogg"
-    else
-!     LIBS="${LIBS} -logg"
-      echo "Adding dynamic libogg"
-    fi
-  
-***************
-*** 196,205 ****
-    AC_CHECK_LIB(vorbis,vorbis_info_init,echo "Have vorbis",echo "Must have libvorbis for Ogg/Vorbis support";exit)
-  
-    if test x"$STATIC_LIBS" != x"no"; then
-!     LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libvorbis.a"
-      echo "Adding static libvorbis"
-    else
-!     LDFLAGS="${LDFLAGS} -lvorbis"
-      echo "Adding dynamic libvorbis"
-    fi
-  fi
--- 196,205 ----
-    AC_CHECK_LIB(vorbis,vorbis_info_init,echo "Have vorbis",echo "Must have libvorbis for Ogg/Vorbis support";exit)
-  
-    if test x"$STATIC_LIBS" != x"no"; then
-!     LIBS="${LIBS} ${STATIC_LIBS}/libvorbis.a"
-      echo "Adding static libvorbis"
-    else
-!     LIBS="${LIBS} -lvorbis"
-      echo "Adding dynamic libvorbis"
-    fi
-  fi
--- a/aur/mt-daapd/mt-daapd
+++ b/aur/mt-daapd/mt-daapd
@ -1,33 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-start() {
-	stat_busy "Starting DAAP server"
-	/usr/sbin/mt-daapd 
-	stat_done
-}
-
-stop() {
-	stat_busy "Shutting down DAAP server"
-	killall -INT mt-daapd
-	stat_done
-}
-
-case "$1" in
-  start)
-	start
-	;;
-  stop)
-	stop
-	;;
-  restart)
-	stop
-	start
-	;;
-  *)
-	echo $"Usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0
--- a/aur/mt-daapd/mt-daapd.install
+++ b/aur/mt-daapd/mt-daapd.install
@ -1,3 +0,0 @@
-post_install() {
-  chown -R nobody:nobody var/cache/mt-daapd &>/dev/null
-}
--- a/aur/mt-daapd/mt-daapd.service
+++ b/aur/mt-daapd/mt-daapd.service
@ -1,14 +0,0 @@
-[Unit]
-Description=mt-daapd - multi-threaded DAAP server
-ConditionPathExists=/etc/mt-daapd/mt-daapd.conf
-Requires=network.target
-Wants=avahi-daemon.service
-After=avahi-daemon.service
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/mt-daapd
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
--- a/aur/nx-common/PKGBUILD
+++ b/aur/nx-common/PKGBUILD
@ -1,51 +0,0 @@
-# Maintainer: Miguel Rasero <skuda21@gmail.com>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-# Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org>
-
-pkgname=nx-common
-pkgver=3.5.0
-pkgrel=6.1
-pkgdesc="NoMachine NX common package for client and server"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://nomachine.com/"
-depends=('libjpeg-turbo' 'libpng' 'openssl' 'gcc-libs' 'libxcomp') 
-makedepends=('xorg-server-devel' 'nx-headers')
-source=(ftp://ftp.uni-duisburg.de/X11/NX/sources/$pkgver/nxcompsh-$pkgver-1.tar.gz
-        ftp://ftp.uni-duisburg.de/X11/NX/sources/$pkgver/nxssh-$pkgver-2.tar.gz        
-        nxcompsh-gcc43.patch)
-options=('!libtool')
-md5sums=('84ade443b79ea079380b754aba9d392e'
-         'f52fcdb38e09f8dcfb9ff0344dfbbbd6'
-         '3b2436f0090cbe0fa77cde0dfa80a87a')
-
-build() {
-  # nxcompsh
-  cd ${srcdir}/nxcompsh
-  patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch
-  ./configure --prefix=/usr/lib/nx
-  make
-
-  # nxssh
-  cd ${srcdir}/nxssh
-  sed -i "s:NX.h:nx/NX.h:g" clientloop.c packet.c proxy.c
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib
-  make
-}
-
-package() {
-  install -dm755 ${pkgdir}/usr/{bin,lib/nx}
-
-  # nxcompsh
-  cd ${srcdir}/nxcompsh
-  cp -a libXcompsh.so* ${pkgdir}/usr/lib/nx
-  cd ${pkgdir}/usr/lib/
-  ln -sv /usr/lib/nx/libXcompsh.so{,.3,.3.5.0} .
-  # ^ really needed?
-
-  # nxssh
-  cd ${srcdir}/nxssh
-  install -D -m755 nxssh ${pkgdir}/usr/lib/nx/bin/nxssh
-  cd ${pkgdir}/usr/bin
-  ln -sv /usr/lib/nx/bin/nxssh .
-}
--- a/aur/nx-common/nxcompsh-gcc43.patch
+++ b/aur/nx-common/nxcompsh-gcc43.patch
@ -1,18 +0,0 @@
--- nxcompsh/Misc.h~	2007-06-04 13:39:49.000000000 +0200
-+++ nxcompsh/Misc.h	2008-04-12 12:46:24.000000000 +0200
-@@ -18,10 +18,12 @@
- #ifndef Misc_H
- #define Misc_H
- 
-#include <iostream.h>
-+#include <iostream>
- 
-#include <errno.h>
-#include <string.h>
-+#include <cerrno>
-+#include <cstring>
-+
-+using namespace std;
- 
- //
- // Error handling macros.
--- a/aur/opennx/PKGBUILD
+++ b/aur/opennx/PKGBUILD
@ -1,51 +0,0 @@
-# Maintainer: Miguel Rasero <skuda21@gmail.com>
-#Original opennx PKGBUILD: Tomas Groth tomasgroth.at.yahoo.dk
-
-pkgname=opennx
-pkgver=0.16.0.729
-pkgrel=2.1
-pkgdesc="A GPL replacement for the NoMachine client"
-url="http://opennx.sf.net/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('wxgtk2.8' 'libcups' 'libxext' 'libxft' 'xorg-xauth' 'curl' 'nx-common' 'hicolor-icon-theme')
-makedepends=('zip' 'opensc' 'libpulse' 'smbclient' 'libusb-compat')
-source=(http://downloads.sourceforge.net/project/opennx/opennx/CI-source/opennx-$pkgver.tar.gz)
-md5sums=('5271a2430693858803f2e1ca860e5a6c')
-
-build() {
-  cd "$srcdir"/opennx*
-  ./configure --prefix=/usr \
-    --enable-usbip \
-    --with-wx-config=wx-config-2.8
-  make
-}
-
-package() {
-  cd "$srcdir"/opennx*
-  make DESTDIR="${pkgdir}" install
-  make DESTDIR="${pkgdir}" install-man
-  
-  # fix some file locations
-  install -dm755 "${pkgdir}"/usr/share/applications
-  cp -aR "${pkgdir}"/usr/share/applnk/xdg/* "${pkgdir}"/usr/share/applications
-  rm -rf "${pkgdir}"/usr/share/applnk
-  
-  sed -i -e "s:Exec=/usr/NX/bin/opennx:Exec=/usr/bin/opennx:" "${pkgdir}"/usr/share/applications/*.desktop
-
-  mkdir "${pkgdir}"/usr/share/icons/hicolor
-  cd "${pkgdir}"/usr/share/icons
-  find ./ -maxdepth 1 -mindepth 1 -type d -not -name hicolor -exec mv {} hicolor/ \;
-}
-
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
--- a/aur/openswan/PKGBUILD
+++ b/aur/openswan/PKGBUILD
@ -1,23 +1,24 @@
+# Maintainer:  dacoit <dacoit at tuta.io>
+# Contributor: xjpvictor Huang <ke [AT] xjpvictor [DOT] info>
 # Contributor: uuwe
-# Maintainer: xjpvictor Huang <ke [AT] xjpvictor [DOT] info>
 pkgname=openswan
-pkgver=2.6.42
-pkgrel=3
-pkgdesc="Open Source implementation of IPsec for the Linux operating system"
-url="http://www.openswan.org"
-license=('GPL' 'custom')
+pkgver=2.6.44
+pkgrel=1
+pkgdesc='Open Source implementation of IPsec for the Linux operating system'
+url='https://www.openswan.org'
 arch=('i686' 'x86_64')
-depends=('iproute2>=2.6.8' 'gmp' 'perl')
-optdepends=('python2')
+license=('GPL' 'custom')
+depends=('gmp' 'perl' 'iproute2')
 makedepends=('flex' 'bison')
+optdepends=('python2')
 conflicts=('ipsec-tools')
-backup=(etc/ipsec.conf \
-        etc/ipsec.d/policies/{block,clear,clear-or-private,private,private-or-clear})
-source=(http://download.openswan.org/openswan/openswan-$pkgver.tar.gz
-        openswan.service)
+backup=('etc/ipsec.conf'
+        'etc/ipsec.d/policies/'{block,clear,clear-or-private,private,private-or-clear})
+source=("http://download.openswan.org/openswan/openswan-${pkgver}.tar.gz"
+        'openswan.service')

 prepare() {
-  cd $srcdir/${pkgname}-$pkgver
+  cd "$pkgname-$pkgver"

  # Change install paths to Arch defaults
  sed -i 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|;s|)/sbin|)/bin|' Makefile.inc
@ -27,34 +28,34 @@ prepare() {
 }

 build() {
-  cd $srcdir/${pkgname}-$pkgver
+  cd "$pkgname-$pkgver"
  make USE_XAUTH=true USE_OBJDIR=true programs || return 1
 }

 package() {
-  cd $srcdir/${pkgname}-$pkgver
+  cd "$pkgname-$pkgver"

  # Pre-create init script directory
-  mkdir -p $pkgdir/usr/lib/systemd/scripts/
+  mkdir -p "$pkgdir/usr/lib/systemd/scripts"

-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="$pkgdir" install

  # Change permissions in /var
-  mv $pkgdir/var/run $pkgdir/
-  rm -r $pkgdir/var
-  chmod 700 $pkgdir/run/pluto
+  mv "$pkgdir/var/run" "$pkgdir/"
+  rm -r "$pkgdir/var"
+  chmod 700 "$pkgdir/run/pluto"

  # Copy License
-  install -Dm644 LICENSE $pkgdir/usr/share/licenses/openswan/LICENSE
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/openswan/LICENSE"

-  # Install init script
-  install -Dm644 ../openswan.service $pkgdir/usr/lib/systemd/system/openswan.service
+  # Install service unit
+  install -Dm644 "$srcdir/openswan.service" "$pkgdir/usr/lib/systemd/system/openswan.service"

  # fix manpages
-  mv $pkgdir/usr/man $pkgdir/usr/share/
+  mv "$pkgdir/usr/man" "$pkgdir/usr/share/"

  # fix python2
-  sed -i '1s|python|python2|' $pkgdir/usr/lib/openswan/verify
+  sed -i '1s|python|python2|' "$pkgdir/usr/lib/openswan/verify"
 }
-md5sums=('22240ce28be48f051bfdc874083c8947'
+md5sums=('155692dbefd65be38190eb47268c1b45'
         'd8b465c10838c72e31329d65011002b6')
--- a/aur/owfs/PKGBUILD
+++ b/aur/owfs/PKGBUILD
@ -1,44 +1,39 @@
-# Contributor: plut0nium <charles(DOT)fourneau(AT)gmail(DOT)com >
-#              tzervo <tzervo@gmail.com>
-pkgname="owfs"
+# Maintainer: Spyros Stathopoulos <spystath@gmail.com>
+
+pkgname=owfs
 pkgver=3.1p0
-pkgrel=1
-pkgdesc="An easy way to use the powerful 1-wire system of Dallas/Maxim."
-arch=('any')
-url="http://www.owfs.org"
+pkgrel=2
+pkgdesc="OWFS is an easy way to use the powerful 1-wire system of Dallas/Maxim."
+arch=('i686' 'x86_64')
+url="http://www.owfs.org/"
 license=('GPL')
-groups=()
-# Dependencies are not mandatory to build owserver, but:
-# - fuse is needed for owfs
-# - swig is needed for scripting languages bindings (perl, python...)
-depends=('fuse' 'swig' 'python2')
-makedepends=()
-provides=('owfs')
-conflicts=('owfs')
-replaces=()
-backup=()
-options=()
-install=
-source=("http://downloads.sourceforge.net/sourceforge/owfs/$pkgname-$pkgver.tar.gz" "fix-libusb-includes.patch")
-noextract=()
-md5sums=('3d8919af078ae8c9171e5713a1789195'
-         'f23d0571e00fb869c2e5e0602ed6f628')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+depends=('avahi' 'fuse' 'perl')
+makedepends=('swig')
+sha1sums=('f82bf91e4f78a667c09a44d486139f1359f0950c')

 prepare() {
-	cd "$srcdir/$pkgname-$pkgver"
-	patch -p1 -i ../fix-libusb-includes.patch
+  cd "${srcdir}/${pkgname}-${pkgver}"
+   sed -i -e 's|<libusb.h>|<libusb-1.0/libusb.h>|' "module/owlib/src/include/ow.h"
 }

 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+              --libexecdir=/usr/lib \
+              --disable-owtcl \
+              --disable-owphp \
+              --disable-owpython \
+              --disable-zero \
+              --with-systemdunitdir=/usr/lib/systemd/system

-	autoreconf && \
-	./configure --disable-swig --disable-owperl --prefix=/usr --with-python="/usr/bin/python2" --with-pythonconfig="/usr/bin/python2-config"
-	make
+  make
 }

 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
 }

+# vim:ts=2:sw=2:et
--- a/aur/owfs/fix-libusb-includes.patch
+++ b/aur/owfs/fix-libusb-includes.patch
@ -1,22 +0,0 @@
-diff -ruN owfs-orig/module/owshell/src/c/Makefile.am owfs/module/owshell/src/c/Makefile.am
--- owfs-orig/module/owshell/src/c/Makefile.am 2015-01-11 03:31:32.000000000 +0200
-+++ owfs/module/owshell/src/c/Makefile.am 2015-03-23 18:47:03.211445494 +0200
-@@ -41,6 +41,7 @@
-	-Wcast-align \
-	-Wstrict-prototypes \
-	-Wredundant-decls \
-+	${LIBUSB_CFLAGS} \
-	${EXTRACFLAGS}
-
-	LDADD = ${LD_EXTRALIBS} ${OSLIBS}
-diff -ruN owfs-orig/module/owtcl/Makefile.am owfs/module/owtcl/Makefile.am
--- owfs-orig/module/owtcl/Makefile.am 2015-01-11 03:31:32.000000000 +0200
-+++ owfs/module/owtcl/Makefile.am 2015-03-23 18:46:52.681151547 +0200
-@@ -39,6 +39,7 @@
-	-Wcast-align \
-	-Wstrict-prototypes \
-	-Wredundant-decls \
-+	${LIBUSB_CFLAGS} \
-	${EXTRACFLAGS} \
-	${PTHREAD_CFLAGS} \
-	$(TCL_DEFS) \
--- a/aur/p910nd/PKGBUILD
+++ b/aur/p910nd/PKGBUILD
@ -1,42 +1,46 @@
-# Maintainer: Danilo Luvizotto <danilo.luvizotto@gmail.com>
+# Maintainer: Kyle Keen <keenerd@gmail.com>
+# Contributor: Danilo Luvizotto <danilo.luvizotto@gmail.com>
 # Contributor: Wieland Hoffmann <the_mineo@web.de>
 # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de>
 pkgname=p910nd
-pkgver=0.95
-pkgrel=7
+pkgver=0.97
+pkgrel=1
 pkgdesc="A small printer daemon intended for diskless workstations that passes jobs directly to the printer"
 arch=('i686' 'x86_64' 'armv5' 'armv5h' 'armv6' 'armv6h' 'armv7' 'armv7h')
 url="http://p910nd.sourceforge.net"
 license=('GPL2')
+depends=('glibc')
 backup=('etc/conf.d/p910nd')
-options=('emptydirs')
+#options=('emptydirs')
 source=(http://downloads.sf.net/$pkgname/$pkgname-$pkgver.tar.bz2 \
        $pkgname.service \
        $pkgname.conf)
+md5sums=('69461a6c54dca0b13ecad5b83864b43e'
+         'e37030a69b7bf302cfb23d88e25ebbdf'
+         'ea1db6d612058532c525efedd54990f2')

 CONFIGDIR=/etc/conf.d
 INITSCRIPT=""
 SCRIPTDIR=""

 build() {
-  cd $srcdir/$pkgname-$pkgver
-  sed -e "s|/var/lock/subsys|/var/lock/$pkgname|" -i $pkgname.c
-  sed -e 's|$(INSTALL) $(INITSCRIPT) $(DESTDIR)$(SCRIPTDIR)/$(PROG)||' -i Makefile
+  cd "$srcdir/$pkgname-$pkgver"
+  # TODO: this should be in its own subdir, but needs to be created at boot 
+  sed -i "s|/var/lock/subsys|/run/lock|" $pkgname.c
+  # modern linux FSH
+  sed -i 's|sbin|bin|' *
+  sed -i 's|var/lock|run/lock|' *
+  sed -i 's|var/run|run|' *
+  sed -i 's|$(INSTALL) $(INITSCRIPT) $(DESTDIR)$(SCRIPTDIR)/$(PROG)||' Makefile
  make CONFIGDIR=$CONFIGDIR INITSCRIPT=$INITSCRIPT SCRIPTDIR=$SCRIPTDIR
-  sed -e 's|P910ND_OPTS=""|P910ND_OPTS="-f /dev/usb/lp0"|' -i $pkgname.conf
+  sed -i 's|P910ND_OPTS=""|P910ND_OPTS="-f /dev/usb/lp0"|' $pkgname.conf
 }

 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make CONFIGDIR=$CONFIGDIR INITSCRIPT=$INITSCRIPT SCRIPTDIR=$SCRIPTDIR DESTDIR=$pkgdir install
-  install -d -m755 $pkgdir/var/lock/$pkgname
-  install -d -m755 $pkgdir/usr/lib/systemd/system
-  install -d -m755 $pkgdir/usr/lib/tmpfiles.d
-  install -m644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
-  install -m644 $srcdir/$pkgname.conf $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf
-  chmod 1777 $pkgdir/var/lock
+  cd "$srcdir/$pkgname-$pkgver"
+  make CONFIGDIR=$CONFIGDIR INITSCRIPT=$INITSCRIPT SCRIPTDIR=$SCRIPTDIR DESTDIR="$pkgdir" install
+  #install -dm755 "$pkgdir/run/lock/$pkgname"
+  install -Dm644 "$srcdir/$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+  install -Dm644 "$srcdir/$pkgname.conf" "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
 }

-md5sums=('c7ac6afdf7730ac8387a8e87198d4491'
-         'e37030a69b7bf302cfb23d88e25ebbdf'
-         'ea1db6d612058532c525efedd54990f2')
--- a/aur/packer/PKGBUILD
+++ b/aur/packer/PKGBUILD
@ -2,7 +2,7 @@
 # Contributor: Gilrain <pierre.buard+aur gmail com>
 # Contributor: bruenig
 pkgname=packer
-pkgver=20140810
+pkgver=20150808
 pkgrel=1
 pkgdesc="Bash wrapper for pacman and aur"
 url="http://github.com/keenerd/packer"
@ -12,7 +12,6 @@ makedepends=('git')
 depends=('grep' 'sed' 'bash' 'curl' 'pacman' 'jshon' 'expac')
 optdepends=('sudo: install and update packages as non-root'
            'customizepkg: apply customizepkg modifications')
-#source=('git://github.com/keenerd/packer.git')
 source=('git+https://github.com/keenerd/packer.git')
 md5sums=('SKIP')

--- a/aur/python-sqlalchemy-0.7.9/PKGBUILD
+++ b/aur/python-sqlalchemy-0.7.9/PKGBUILD
@ -1,63 +0,0 @@
-# Maintainer: willemw <willemw12@gmail.com>
-# Based on "community/python-sqlalchemy" package ($Id: PKGBUILD 108809 2014-04-04 10:16:01Z fyan $)
-
-#pkgbase=python-sqlalchemy-0.7.9
-pkgname=('python-sqlalchemy-0.7.9' 'python2-sqlalchemy-0.7.9')
-pkgver=0.7.9
-pkgrel=4
-arch=('i686' 'x86_64') # python2 package contain .so
-url="http://www.sqlalchemy.org/"
-license=('MIT')
-makedepends=('python' 'python2' 'python-setuptools' 'python2-setuptools')
-checkdepends=('python-pytest' 'python2-pytest' 'python-mock' 'python2-mock')
-source=("https://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-$pkgver.tar.gz")
-md5sums=('a0b58defc5ad0c7e1baeb932f62d08dd')
-
-prepare() {
-  cp -a SQLAlchemy-$pkgver SQLAlchemy2-$pkgver
-}
-
-build() {
-  cd SQLAlchemy-$pkgver
-  python setup.py build
-
-  cd ../SQLAlchemy2-$pkgver
-  python2 setup.py build
-}
-
-check() {
-  # Tests failing
-  cd SQLAlchemy-${pkgver}
-  #python setup.py test
- 
-  cd ../SQLAlchemy2-$pkgver  
-  #python2 setup.py test
-}
-
-package_python-sqlalchemy-0.7.9() {
-  pkgdesc='Python SQL toolkit and Object Relational Mapper'
-  depends=('python')
-  optdepends=('python-psycopg2: connect to PostgreSQL database')
-  conflicts=('python-sqlalchemy')
-  provides=('python-sqlalchemy')
-
-  cd SQLAlchemy-${pkgver}
-  python setup.py install --root="${pkgdir}"
-  install -D -m644 LICENSE \
-	  "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-package_python2-sqlalchemy-0.7.9() {
-  pkgdesc='Python 2 SQL toolkit and Object Relational Mapper'
-  depends=('python2')
-  optdepends=('python2-psycopg2: connect to PostgreSQL database')
-  conflicts=('python2-sqlalchemy')
-  provides=('python2-sqlalchemy')
-
-  cd SQLAlchemy2-$pkgver
-  python2 setup.py install --root="$pkgdir"
-  install -D -m644 LICENSE \
-	  "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
--- a/aur/python2-apscheduler/PKGBUILD
+++ b/aur/python2-apscheduler/PKGBUILD
@ -1,29 +0,0 @@
-# Maintainer: Yaron de Leeuw < me@jarondl.net >
-# Maintained at : https://github.com/jarondl/aur-pkgbuilds-jarondl
-
-# Contributor: Shanto <shanto@hotmail.com>
-
-pkgname=python2-apscheduler
-_pkgname=APScheduler
-pkgver=3.0.3
-pkgrel=1
-pkgdesc="In-process task scheduler with Cron-like capabilities"
-arch=('any')
-url="https://pypi.python.org/pypi/APScheduler"
-license=('MIT')
-depends=('python2'
-         'python2-pytz'
-         'python2-tzlocal'
-         'python2-futures'
-         'python2-six'
-         'python2-setuptools'
-        )
-source=("https://pypi.python.org/packages/source/A/APScheduler/APScheduler-$pkgver.tar.gz"
-        "https://bitbucket.org/agronholm/apscheduler/raw/master/LICENSE.txt")
-sha256sums=('cb22f71682cfcd21d0cb95487756da6870f751cc86014748075dfbda858e88b9'
-            '6163f7987dfb38d6bc320ce2b70b2f02b862bc41126516d552ef1cd43247e758')
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  python2 setup.py install --root="$pkgdir/" --optimize=1
-  install -D -m644 ../LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
--- a/aur/python2-babelfish/PKGBUILD
+++ b/aur/python2-babelfish/PKGBUILD
@ -1,22 +0,0 @@
-# Maintainer: Quentin Stievenart <acieroid@awesom.eu>
-name='babelfish'
-pkgname=python2-$name
-pkgver=0.5.4
-pkgrel=1
-pkgdesc="A module to work with countries and languages"
-arch=('any')
-url="http://pypi.python.org/pypi/$name"
-license=('BSD')
-makedepends=('python2-setuptools')
-depends=('python2')
-options=(!emptydirs)
-
-source=("http://pypi.python.org/packages/source/b/$name/$name-$pkgver.tar.gz")
-md5sums=('49ef0bacc0886ffa2333bc85ca4b8799')
-
-package() {
-  cd "$srcdir/$name-$pkgver"
-  python2 setup.py install --root="$pkgdir/" --optimize=1
-}
-
-# vim:set ts=2 sw=2 et:
--- a/aur/python2-dateutil1/PKGBUILD
+++ b/aur/python2-dateutil1/PKGBUILD
@ -1,35 +0,0 @@
-#Maintainer: Tor Arne Thune <http://devia.org/contact>
-#Contributor: Jelle van der Waa <jelle@vdwaa.nl>
-
-pkgname=python2-dateutil1
-pkgver=2.1
-pkgrel=8
-pkgdesc="Provides powerful extensions to the standard datetime module"
-arch=('any')
-license=('custom:PYTHON')
-url="http://labix.org/python-dateutil"
-makedepends=('python2-setuptools' 'python2-six')
-provides=('python2-dateutil=2.1')
-conflicts=('python2-dateutil')
-source=(http://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-$pkgver.tar.gz{,.asc} python-dateutil-2.1-open-utf-8.patch)
-md5sums=('1534bb15cf311f07afaa3aacba1c028b' '4aa0ba908299d983781c58ec0640ef2b' '4b780c62fc03be161629ee08e35eba6a')
-
-build() {
-  cd $srcdir/python-dateutil-$pkgver
-  patch -Np0 -i $srcdir/python-dateutil-2.1-open-utf-8.patch
-}
-
-package() {
-depends=('python2' 'python2-six')
-  cd $srcdir/python-dateutil-$pkgver
-  python2 setup.py install --root=$pkgdir --optimize=1
-  install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-
-  chmod -R a+r $pkgdir/usr/lib/python2.7/
-  rm $pkgdir/usr/lib/python2.7/site-packages/dateutil/zoneinfo/zoneinfo--latest.tar.gz
-}
-
-check() {
-  cd $srcdir/python-dateutil-$pkgver
-  python2 test.py
-}
--- a/aur/python2-dateutil1/python-dateutil-2.1-open-utf-8.patch
+++ b/aur/python2-dateutil1/python-dateutil-2.1-open-utf-8.patch
@ -1,21 +0,0 @@
-Fix UnicodeDecodeError in setup.py.
-
-https://bugs.gentoo.org/show_bug.cgi?id=410725
--- setup.py
-+++ setup.py
-@@ -1,5 +1,6 @@
- #!/usr/bin/python
- from os.path import isfile, join
-+import codecs
- import glob
- import os
- import re
-@@ -13,7 +14,7 @@
- 
- TOPDIR = os.path.dirname(__file__) or "."
- VERSION = re.search('__version__ = "([^"]+)"',
-                    open(TOPDIR + "/dateutil/__init__.py").read()).group(1)
-+                    codecs.open(TOPDIR + "/dateutil/__init__.py", encoding='utf-8').read()).group(1)
- 
- 
- setup(name="python-dateutil",
--- a/aur/python2-guessit/PKGBUILD
+++ b/aur/python2-guessit/PKGBUILD
@ -1,18 +0,0 @@
-# Maintainer: Santi Villalba <sdvillal@gmail.com>
-pkgname=python2-guessit
-pkgver=0.10.3
-pkgrel=1
-pkgdesc="A library for guessing information from video files."
-arch=(any)
-url="http://pypi.python.org/pypi/guessit"
-license=(LGPL)
-depends=(python2 python2-babelfish python2-stevedore)
-makedepends=(python2-distribute)
-conflicts=(${pkgname}-git)
-source=(http://pypi.python.org/packages/source/g/guessit/guessit-${pkgver}.tar.gz)
-md5sums=('11e658f9b0473d61d681579c03c196c3')
-
-package() {
-  cd "${srcdir}/guessit-${pkgver}"
-  python2 setup.py install --root="$pkgdir/" --optimize=1
-}
--- a/aur/python2-path/Changelog
+++ b/aur/python2-path/Changelog
@ -1,123 +0,0 @@
-Changes
-7.3
-
-        #91: Releases now include a universal wheel.
-
-7.2
-
-        In chmod, added support for multiple symbolic masks (separated by commas).
-        In chmod, fixed issue in setting of symbolic mask with ‘=’ where unreferenced permissions were cleared.
-
-7.1
-
-        #23: Added support for symbolic masks to .chmod.
-
-7.0
-
-        The open method now uses io.open and supports all of the parameters to that function. open will always raise an OSError on failure, even on Python 2.
-        Updated write_text to support additional newline patterns.
-        The text method now always returns text (never bytes), and thus requires an encoding parameter be supplied if the default encoding is not sufficient to decode the content of the file.
-
-6.2
-
-        path class renamed to Path. The path name remains as an alias for compatibility.
-
-6.1
-
-        chown now accepts names in addition to numeric IDs.
-
-6.0
-
-        Drop support for Python 2.5. Python 2.6 or later required.
-        Installation now requires setuptools.
-
-5.3
-
-        Allow arbitrary callables to be passed to path.walk errors parameter. Enables workaround for issues such as #73 and #56.
-
-5.2
-
-        #61: path.listdir now decodes filenames from os.listdir when loading characters from a file. On Python 3, the behavior is unchanged. On Python 2, the behavior will now mimick that of Python 3, attempting to decode all filenames and paths using the encoding indicated by sys.getfilesystemencoding(), and escaping any undecodable characters using the ‘surrogateescape’ handler.
-
-5.1
-
-        #53: Added path.in_place for editing files in place.
-
-5.0
-
-        path.fnmatch now takes an optional parameter normcase and this parameter defaults to self.module.normcase (using case normalization most pertinent to the path object itself). Note that this change means that any paths using a custom ntpath module on non-Windows systems will have different fnmatch behavior. Before:
-
-        # on Unix
-        >>> p = path('Foo')
-        >>> p.module = ntpath
-        >>> p.fnmatch('foo')
-        False
-
-        After:
-
-        # on any OS
-        >>> p = path('Foo')
-        >>> p.module = ntpath
-        >>> p.fnmatch('foo')
-        True
-
-        To maintain the original behavior, either don’t define the ‘module’ for the path or supply explicit normcase function:
-
-        >>> p.fnmatch('foo', normcase=os.path.normcase)
-        # result always varies based on OS, same as fnmatch.fnmatch
-
-        For most use-cases, the default behavior should remain the same.
-
-        Issue #50: Methods that accept patterns (listdir, files, dirs, walk, walkdirs, walkfiles, and fnmatch) will now use a normcase attribute if it is present on the pattern parameter. The path module now provides a CaseInsensitivePattern wrapper for strings suitable for creating case-insensitive patterns for those methods.
-
-4.4
-
-        Issue #44: _hash method would open files in text mode, producing invalid results on Windows. Now files are opened in binary mode, producing consistent results.
-        Issue #47: Documentation is dramatically improved with Intersphinx links to the Python os.path functions and documentation for all methods and properties.
-
-4.3
-
-        Issue #32: Add chdir and cd methods.
-
-4.2
-
-        open() now passes all positional and keyword arguments through to the underlying builtins.open call.
-
-4.1
-
-        Native Python 2 and Python 3 support without using 2to3 during the build process.
-
-4.0
-
-        Added a chunks() method to a allow quick iteration over pieces of a file at a given path.
-        Issue #28: Fix missing argument to samefile.
-        Initializer no longer enforces isinstance basestring for the source object. Now any object that supplies __unicode__ can be used by a path (except None). Clients that depend on a ValueError being raised for int and other non-string objects should trap these types internally.
-        Issue #30: chown no longer requires both uid and gid to be provided and will not mutate the ownership if nothing is provided.
-
-3.2
-
-        Issue #22: __enter__ now returns self.
-
-3.1
-
-        Issue #20: relpath now supports a “start” parameter to match the signature of os.path.relpath.
-
-3.0
-
-        Minimum Python version is now 2.5.
-
-2.6
-
-        Issue #5: Implemented path.tempdir, which returns a path object which is a temporary directory and context manager for cleaning up the directory.
-
-        Issue #12: One can now construct path objects from a list of strings by simply using path.joinpath. For example:
-
-        path.joinpath('a', 'b', 'c') # or
-        path.joinpath(*path_elements)
-
-2.5
-
-        Issue #7: Add the ability to do chaining of operations that formerly only returned None.
-        Issue #4: Raise a TypeError when constructed from None.
-
-
--- a/aur/python2-path/PKGBUILD
+++ b/aur/python2-path/PKGBUILD
@ -1,28 +0,0 @@
-# Maintainer: vorpalblade <vorpalblade77@gmail.com>
-# Contributor: Anxo Beltrán <anxo.beltran.alvarez@gmail.com>
-# Contributor: David Danier <david.danier@team23.de>
-pkgname=python2-path
-pkgver=7.3
-pkgrel=1
-pkgdesc="path.py provides a class (path) for working with files and directories. Less typing than os.path, more fun, a few new tricks"
-arch=('any')
-url="https://pypi.python.org/pypi/path.py"
-license=('MIT')
-depends=('python2')
-makedepends=('python2-setuptools')
-options=(!emptydirs)
-source=(http://pypi.python.org/packages/source/p/path.py/path.py-${pkgver}.zip)
-changelog=Changelog
-sha256sums=('f7d146f40768e3742199a5316fbe3eb6a6091b9feedcb4b969c7348dc03151e1')
-
-build() {
-  cd "${srcdir}/path.py-${pkgver}"
-  python2 setup.py build || return 1
-}
-package() {
-  cd ${srcdir}/path.py-${pkgver}
-  python2 setup.py install --root="${pkgdir}" \
-    --prefix=/usr \
-    --compile \
-    --optimize=1 || return 1
-}
--- a/aur/python2-paver/PKGBUILD
+++ b/aur/python2-paver/PKGBUILD
@ -1,25 +0,0 @@
-# Maintainer: Sebastien Leduc <sebastien@sleduc.fr>
-# Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
-
-pkgname=python2-paver
-pkgver=1.2.4
-pkgrel=1
-pkgdesc="Build, Distribute and Deploy Python Projects"
-arch=('i686' 'x86_64')
-url="http://www.blueskyonmars.com/projects/paver/"
-license=('BSD')
-depends=('python2')
-source=("http://pypi.python.org/packages/source/P/Paver/Paver-${pkgver}.tar.gz")
-md5sums=('dbb94faf8b004eb9920b632808c20560')
-
-package() {
-  cd "${srcdir}/Paver-${pkgver}"
-  python2 setup.py install --prefix="${pkgdir}/usr"
-  install -D "${srcdir}/Paver-${pkgver}/LICENSE.txt" \
-             "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-
-  # fix python3 conflict
-  for _f in "$pkgdir"/usr/bin/*; do
-      mv -v "$_f" "${_f}2"
-  done
-}
--- a/aur/python2-plumbum/PKGBUILD
+++ b/aur/python2-plumbum/PKGBUILD
@ -1,27 +0,0 @@
-# Maintainer: Milo Mirate <mmirate@gmx.com>
-_pkgname=plumbum
-pkgname=python2-plumbum
-pkgver=1.4.2
-pkgrel=1
-pkgdesc="Shell combinators library."
-arch=('any')
-url="http://pypi.python.org/pypi/plumbum"
-license=('GPL')
-groups=()
-depends=('python2' 'python2-six')
-makedepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=(!emptydirs)
-install=
-source=("http://pypi.python.org/packages/source/p/${_pkgname}/${_pkgname}-${pkgver}.tar.gz")
-md5sums=('38b526af9012a5282ae91dfe372cefd3')
-
-package() {
-  cd "$srcdir/${_pkgname}-$pkgver"
-  python2 setup.py install --root="$pkgdir/" --optimize=1
-}
-
-# vim:set ts=2 sw=2 et:
--- a/aur/python2-pynzb/PKGBUILD
+++ b/aur/python2-pynzb/PKGBUILD
@ -1,29 +0,0 @@
-# Contributor : Daniel Neve <the.mephit@googlemail.com>
-pkgshort=pynzb
-pkgname=python2-$pkgshort
-pkgver=0.1.0
-pkgrel=3
-pkgdesc="A unified API for parsing NZB files"
-arch=('any')
-url="http://pypi.python.org/pypi/pynzb/"
-license=('BSD')
-depends=('python2' 'expat')
-makedepends=('python2-distribute')
-conflicts=('pynzb')
-optdepends=('python-lxml: Use lxml instead of expat')
-source=(http://pypi.python.org/packages/source/p/$pkgshort/$pkgshort-$pkgver.tar.gz
-        https://www.github.com/ericflo/$pkgshort/raw/master/LICENSE.txt)
-md5sums=('63c74a36348ac28aa99732dcb8be8c59'
-         '87d87599921bae943f981b28ecfc3cc1')
-
-build() {
-  cd $srcdir/$pkgshort-$pkgver
-  python2 setup.py build
-}
-package() {
-  cd $srcdir/$pkgshort-$pkgver
-  python2 setup.py install --root="${pkgdir}" \
-    --prefix=/usr \
-    --compile -O1
-  install -D -m644 $srcdir/LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE.txt
-}
--- a/aur/python2-pyrss2gen/PKGBUILD
+++ b/aur/python2-pyrss2gen/PKGBUILD
@ -1,24 +0,0 @@
-# Maintainer: Kwpolska <kwpolska@kwpolska.tk>
-pkgname=python2-pyrss2gen
-_pyname=PyRSS2Gen
-pkgver=1.1
-pkgrel=2
-pkgdesc='A Python library for generating RSS 2.0 feeds.'
-arch=('any')
-url="http://www.dalkescientific.com/Python/PyRSS2Gen.html"
-license=('BSD')
-depends=('python2')
-makedepends=('python2-distribute')
-options=(!emptydirs)
-source=("http://www.dalkescientific.com/Python/${_pyname}-${pkgver}.tar.gz")
-md5sums=("c56b9453d52b0a70be4f3e95112058aa")
-conflicts=('pyrss2gen')
-provides=('pyrss2gen')
-
-package() {
-  cd "${srcdir}/${_pyname}-${pkgver}"
-  python2 setup.py install --root="${pkgdir}/" --optimize=1
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
--- a/aur/python2-rpyc/PKGBUILD
+++ b/aur/python2-rpyc/PKGBUILD
@ -1,22 +0,0 @@
-pkgname=python2-rpyc
-_realname=rpyc
-pkgver=3.3.0
-pkgrel=1
-pkgdesc="Remote Python Call (RPyC), a transparent and symmetric RPC library"
-url="http://rpyc.readthedocs.org"
-arch=('any')
-license=('MIT')
-depends=('python2' 'python2-plumbum')
-makedepends=('python2-setuptools')
-source=("https://pypi.python.org/packages/source/r/rpyc/$_realname-$pkgver.tar.gz")
-md5sums=('6931cb92c41f547591b525142ccaeef1')
-
-prepare() {
-  cd "$_realname-$pkgver"
-  find . -type f -exec sed -i 's@#! */usr/bin/\(env \+\)\?python *\r\?$@#!/usr/bin/\1python2@' '{}' +
-}
-
-package() {
-  cd "$_realname-$pkgver"
-  python2 setup.py install --root="$pkgdir" --optimize=1
-}
--- a/aur/python2-simpleparse/PKGBUILD
+++ b/aur/python2-simpleparse/PKGBUILD
@ -1,31 +0,0 @@
-# Contributor: Roberto Alsina <ralsina@kde.org>
-# Contributor: Fabio Varesano <fvaresano@yahoo.it> (Updated to 2.1.1a2)
-# Contributor: Martti Kühne <mysatyre@gmail.com>
-# Maintainer : David Phillips <gmail, dbphillipsnz>
-
-pkgname=python2-simpleparse
-_pkgname=SimpleParse
-pkgver=2.1.1a2
-pkgrel=2
-pkgdesc="A simple and fast parser generator"
-arch=('i686' 'x86_64')
-url="http://simpleparse.sourceforge.net"
-license=('custom')
-depends=('python2')
-makedepends=('python2-setuptools')
-source=("http://downloads.sourceforge.net/simpleparse/${_pkgname}-${pkgver}.tar.gz")
-sha256sums=('9899df932c6805dbb6433c7395e696fd60723f463513933e925cc77314c6bbb8')
-
-build () {
-	cd "${srcdir}/${_pkgname}-${pkgver}"
-	python2 setup.py bdist_dumb
-}
-
-package () {
-	cd "${srcdir}/${_pkgname}-${pkgver}"
-	install -D license.txt "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-	tar -xzv \
-		-f "${srcdir}/${_pkgname}-${pkgver}/dist/${_pkgname}-${pkgver}.linux"*".tar.gz" \
-		-C "${pkgdir}"
-				
-}
--- a/aur/python2-tmdb3/PKGBUILD
+++ b/aur/python2-tmdb3/PKGBUILD
@ -1,20 +0,0 @@
-# upstream URL: https://github.com/wagnerrp/pytmdb3
-# also as part of MythTV: https://github.com/MythTV/mythtv/tree/master/mythtv/bindings/python/tmdb3
-
-pkgname=python2-tmdb3
-_realname=tmdb3
-pkgver=0.7.2
-pkgrel=1
-pkgdesc="TheMovieDB.org APIv3 interface"
-url="https://pypi.python.org/pypi/tmdb3"
-arch=('any')
-license=('GPL2')
-depends=('python2')
-makedepends=('python2-setuptools')
-source=("https://pypi.python.org/packages/source/t/tmdb3/$_realname-$pkgver.tar.gz")
-md5sums=('c712bca4934230a16a8b1a41dcb987cf')
-
-package(){
-  cd "$_realname-$pkgver"
-  python2 setup.py install --root="$pkgdir" --optimize=1
-}
--- a/aur/python2-transmissionrpc/PKGBUILD
+++ b/aur/python2-transmissionrpc/PKGBUILD
@ -1,24 +0,0 @@
-# Maintainer: Bogdan Szczurek <thebodzio@gmail.com>
-
-pkgname=python2-transmissionrpc
-pkgver=0.11
-pkgrel=1
-pkgdesc="Module to communicate with Transmission BT client via JSON-RPC"
-arch=(any)
-url="https://bitbucket.org/blueluna/transmissionrpc/wiki/Home"
-license=('MIT')
-depends=('python2' 'python2-six')
-makedepends=('python2-setuptools')
-conflicts=('pytransmissionrpc')
-replaces=('pytransmissionrpc')
-source=(https://bitbucket.org/blueluna/${pkgname:8}/get/release-${pkgver}.tar.gz)
-
-package() {
-  cd "$srcdir/blueluna-${pkgname:8}-eb2a32720f8a"
-  python2 setup.py install --root="$pkgdir/" --optimize=1
-
-  install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
-md5sums=('2ec4dc465435cc970c20f1e10524439b')
--- a/aur/python2-tvrage/PKGBUILD
+++ b/aur/python2-tvrage/PKGBUILD
@ -1,27 +0,0 @@
-# Maintainer: shadyabhi <abhijeet.1989@gmail.com>
-# Author : Christian Kreutzer
-
-pkgname=python2-tvrage
-_realname=python-tvrage
-pkgver=0.4.1
-pkgrel=1
-pkgdesc="Object oriented client interface for tvrage.com's XML based api feeds"
-url="https://pypi.python.org/pypi/python-tvrage/0.1.4"
-arch=('any')
-license=('GPL')
-depends=('python2')
-makedepends=('python2-distribute')
-source=("http://pypi.python.org/packages/source/p/python-tvrage/$_realname-$pkgver.tar.gz")
-md5sums=('cdfec252158c5047b626861900186dfb')
-build(){
-  #Really ugly, but what can be done.
-  cd "$srcdir/ckreutzer-python-tvrage-c8e9781"
-
-  # python2 fix
-  for file in $(find . -name '*.py' -print); do
-    sed -i 's_#!.*/usr/bin/python_#!/usr/bin/python2_' $file
-    sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
-  done
-
-  python2 setup.py install --root="$pkgdir" --optimize=1
-}
--- a/aur/python2-tzlocal/PKGBUILD
+++ b/aur/python2-tzlocal/PKGBUILD
@ -1,20 +0,0 @@
-# Maintainer: Étienne Deparis <etienne [at] depar.is>
-
-pkgname=python2-tzlocal
-_pkgname=tzlocal
-pkgver=1.1.3
-pkgrel=1
-pkgdesc="Python2 version for tzinfo object for the local timezone"
-arch=('any')
-url='https://pypi.python.org/pypi/tzlocal'
-license=('custom')
-depends=('python2-pytz')
-makedepends=('python2-setuptools')
-source=("https://pypi.python.org/packages/source/t/${_pkgname}/${_pkgname}-$pkgver.tar.gz")
-sha256sums=('1950d112ed1b717683280d54f1e7a4533564d479127162cbf247bd0fb3708983')
-
-package() {
-    cd "${_pkgname}-$pkgver"
-    python2 setup.py install --root="$pkgdir"
-    install -D -m0644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
--- a/aur/python2-yenc/PKGBUILD
+++ b/aur/python2-yenc/PKGBUILD
@ -1,30 +0,0 @@
-# Maintainer: Clément Démoulins <clement@archivel.fr>
-# Contributor: Lucky <aur.archlinux.org [at] lucky.take0ver [dot] net>
-# Contributor: Jonathan Curran <jonc@icicled.net>
-
-plugrel=1
-
-pkgname=python2-yenc
-pkgver=0.4.0
-pkgrel=3
-pkgdesc="yEnc encoding/decoding module for python2"
-url="http://www.golug.it/yenc.html"
-arch=('i686' 'x86_64')
-license=("GPL")
-depends=("python2")
-conflicts=("python-yenc")
-replaces=("python-yenc")
-
-#source=("http://www.golug.it/pub/yenc/${_pkgname}-${pkgver}.tar.gz")
-source=("http://bitbucket.org/dual75/yenc/get/${pkgver}.tar.bz2")
-md5sums=('60e1a535b0e0c865c2cc4e7ddf18d9a4')
-
-build() {
-  cd "${srcdir}/dual75-yenc-ee6b73a5b14f"
-  python2 setup.py build
-}
-
-package() {
-  cd "${srcdir}/dual75-yenc-ee6b73a5b14f"
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-}
--- a/aur/qcontrol/PKGBUILD
+++ b/aur/qcontrol/PKGBUILD
@ -1,47 +0,0 @@
-# Maintainer: Ruben Silveira <ruben@silveira.ws>
-
-pkgname=qcontrol
-pkgver=0.5.2
-pkgrel=3
-pkgdesc="Daemon and command line tool which control the various peripherals that are present on some NAS devices"
-arch=('i686' 'arm' 'armv7h')
-buildarch=6
-url="https://gitorious.org/qcontrol/pages/Home"
-license=('GPL3')
-depends=('lua51')
-source=(http://www.hellion.org.uk/${pkgname}/releases/${pkgver}/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('f6029e69f6f427aac589c37c9ba9baf1369b735d')
-
-build() {
-  cd ${pkgname}-${pkgver}
-  make all
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-
-  install -Dm750 qcontrol "$pkgdir/usr/sbin/qcontrol"
-  install -dm755 "$pkgdir/etc/qcontrol"
-  install -Dm644 examples/* "$pkgdir/etc/qcontrol/"
-  install -dm755 "$pkgdir/etc/qcontrol.d"
-  install -dm755 "$pkgdir/usr/lib/systemd/system"
-  install -Dm644 systemd/* "$pkgdir/usr/lib/systemd/system/"
-
-  sed -i '/^Requires=/i\
-\
-# Mantainer Note: As the device never becomes active, this has no effect
-
-' "$pkgdir/usr/lib/systemd/system/qcontrold.service"
-  sed -i 's/^Requires=\(.*\)$/#Requires=\1/gi' "$pkgdir/usr/lib/systemd/system/qcontrold.service"
-  sed -i 's/^After=\(.*\)$/#After=\1\
-/gi' "$pkgdir/usr/lib/systemd/system/qcontrold.service"
-
-cat >> "$pkgdir/usr/lib/systemd/system/qcontrold.service" << EOF
-
-# Mantainer Note: The service should start only at the end of the startup sequence
-Type=idle
-
-# Mantainer Note: Shamelessly ripped off from the Debian package
-ExecStartPre=-/usr/bin/sh -c '{ grep "QNAP TS-119/TS-219\|QNAP TS-41x" /proc/cpuinfo > /dev/null 2>&1 && /sbin/qcontrol --direct watchdog off > /dev/null 2>&1; } || /usr/bin/true'
-EOF
-}
--- a/aur/sabnzbd/PKGBUILD
+++ b/aur/sabnzbd/PKGBUILD
@ -1,48 +0,0 @@
-pkgname=sabnzbd
-_pkgname=SABnzbd
-pkgver=0.7.20
-pkgrel=1
-pkgdesc="A web-interface based binary newsgrabber with NZB file support"
-url="http://www.sabnzbd.org"
-arch=("any")
-license=("GPL")
-depends=("curl" "par2cmdline"
-         "python2" "python2-cheetah" "python2-yenc"
-         "sqlite" "unrar" "unzip")
-optdepends=("xdg-utils: registration of .nzb files" "python2-feedparser: rss support" "python2-pyopenssl: ssl support" "par2cmdline-tbb: par2 multi-threading")
-install="${pkgname}.install"
-backup=("etc/conf.d/sabnzbd" "opt/${pkgname}/${pkgname}.ini")
-source=("http://downloads.sourceforge.net/sabnzbdplus/${_pkgname}-${pkgver}-src.tar.gz"
-        "${pkgname}" "${pkgname}.desktop" "addnzb.sh" "nzb-2.png" "sab2_64.png" "x-nzb.xml" "${pkgname}.service" "${pkgname}.confd")
-md5sums=('7972b2cdad0a3431262611c271ce5747'
-         '48d60a1c626503c7fef1bc5374390513'
-         'f9bd5485072714b11f8c30a28024dc4d'
-         '69b9bcbcf67ff3e7a4cdd9f26e001341'
-         '2a49c07b1e3e6448eabe92644315f983'
-         'fdc878dd0f6f25617e627b04409abbbd'
-         '11fb2cd1451e3725b08bfc2bd045be54'
-         '7da9222f3b86abfed590950f48dc2e77'
-         '8fc2607a7961fc643ef4f6640166322a')
-
-package() {
-  mkdir -p "${pkgdir}/opt/${pkgname}"
-  touch "${pkgdir}/opt/${pkgname}/${pkgname}.ini"
-  cp -rv "${srcdir}/${_pkgname}-${pkgver}/"* "${pkgdir}/opt/${pkgname}"
-
-  # Fix for issues with Python 3
-  find "${pkgdir}/opt/${pkgname}" -type f -exec sed -i 's/python/python2/g' {} \;
-  find "${pkgdir}/opt/${pkgname}" -type d -exec chmod 755 {} \;
-  find "${pkgdir}/opt/${pkgname}" -type f -exec chmod 644 {} \;
-  chmod 755 "${pkgdir}/opt/${pkgname}/${_pkgname}.py"
-  chmod 755 "${pkgdir}/opt/${pkgname}/Sample-PostProc.sh"
-
-  install -Dm755 "${srcdir}/${pkgname}"       "${pkgdir}/usr/bin/${pkgname}"
-  install -Dm644 "${srcdir}/${pkgname}.confd" "${pkgdir}/etc/conf.d/${pkgname}"
-  install -Dm644 "${srcdir}/${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
-  install -Dm755 "${srcdir}/${pkgname}.desktop" \
-    "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-  install -Dm755 "${srcdir}/addnzb.sh"    "${pkgdir}/opt/${pkgname}/addnzb.sh"
-  install -Dm644 "${srcdir}/nzb-2.png"    "${pkgdir}/opt/${pkgname}/nzb-2.png"
-  install -Dm644 "${srcdir}/sab2_64.png"  "${pkgdir}/opt/${pkgname}/sab2_64.png"
-  install -Dm770 "${srcdir}/x-nzb.xml"    "${pkgdir}/opt/${pkgname}/x-nzb.xml"
-}
--- a/aur/sabnzbd/addnzb.sh
+++ b/aur/sabnzbd/addnzb.sh
@ -1,4 +0,0 @@
-#!/bin/sh
-
-. /etc/conf.d/sabnzbd 
-curl -s -F apikey="$API_KEY" -F mode="addfile" -F name=@"$1" $URL/sabnzbd/api &> /dev/null
--- a/aur/sabnzbd/nzb-2.png
+++ b/aur/sabnzbd/nzb-2.png
--- a/aur/sabnzbd/sab2_64.png
+++ b/aur/sabnzbd/sab2_64.png
--- a/aur/sabnzbd/sabnzbd
+++ b/aur/sabnzbd/sabnzbd
@ -1,3 +0,0 @@
-#!/bin/sh
-
-python2 /opt/sabnzbd/SABnzbd.py -f ${HOME}/.sabnzbd.ini "${@}"
--- a/aur/sabnzbd/sabnzbd.confd
+++ b/aur/sabnzbd/sabnzbd.confd
@ -1,8 +0,0 @@
-# This file is used to make association of .nzb files with SABnzbd possible.
-# If you do not want this feature, you do no have to fill in these settings.
-
-# The SABnzbd url. Make sure to add a username and password if required
-URL="http://127.0.0.1:8080"
-
-# Put the API key from Config > General here
-API_KEY=""
--- a/aur/sabnzbd/sabnzbd.desktop
+++ b/aur/sabnzbd/sabnzbd.desktop
@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=SABnzbd+
-GenericName=Binary Newsreader
-Icon=/opt/sabnzbd/sab2_64.png
-Exec=sh /opt/sabnzbd/addnzb.sh %u
-Terminal=false
-Categories=Network
-MimeType=application/x-nzb
--- a/aur/sabnzbd/sabnzbd.install
+++ b/aur/sabnzbd/sabnzbd.install
@ -1,69 +0,0 @@
-# Change these to modify the ownership of sabnzbd
-# If you change this here, you also have to change
-# the user and group in the systemd service file.
-SABNZBD_USER="sabnzbd"
-SABNZBD_GROUP="sabnzbd"
-
-SABNZBD_DIR="/opt/sabnzbd"  # should not be changed
-
-## arg 1:  the new package version
-post_install() {
-  # add x-nzb mimetype
-  if [[ -f /usr/bin/xdg-mime ]]; then
-    xdg-mime install --mode system "${SABNZBD_DIR}/x-nzb.xml"
-    xdg-icon-resource install --context mimetypes --size 64 "${SABNZBD_DIR}/nzb-2.png" application-x-nzb
-  fi
-
-  post_upgrade
-
-  cat << "EOM"
-==> If you want to associate .nzb-files with SABnzbd, run 'xdg-mime default sabnzbd.desktop applications/x-nzb'
-EOM
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-pre_upgrade() {
-  PID="$(pgrep -f SABnzbd.py)"
-
-  if [ -n "${PID}" ];then
-    systemctl stop sabnzbd.service
-  fi
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  # if the group or user already exists, the request will be denied 
-  # and all original settings will be retained
-  if [ "$SABNZBD_GROUP" == "sabnzbd" ]; then
-    groupadd -r sabnzbd &> /dev/null
-  fi
-
-  if [ "$SABNZBD_USER" == "sabnzbd" ]; then
-  useradd -s /sbin/nologin -c "SABnzbd user" -d "${SABNZBD_DIR}" \
-          -g sabnzbd -r sabnzbd &> /dev/null
-  fi
-
-  chown -R "${SABNZBD_USER}:${SABNZBD_GROUP}" "${SABNZBD_DIR}"
-}
-
-## arg 1:  the old package version
-pre_remove() {
-  pre_upgrade
-
-  if [[ -f /usr/bin/xdg-mime ]]; then
-    xdg-mime uninstall --mode system "${SABNZBD_DIR}/x-nzb.xml"
-    xdg-icon-resource uninstall --context mimetypes --size 64 application-x-nzb
-  fi
-}
-
-## arg 1:  the old package version
-post_remove() {
-  # only delete if user is sabnzbd
-  userdel sabnzbd &> /dev/null 
-  groupdel sabnzbd &> /dev/null || /bin/true
-  echo "==> There may be some files left in ${SABNZBD_DIR}."
-}
-
-# vim:set ts=2 sw=2 et:
--- a/aur/sabnzbd/sabnzbd.service
+++ b/aur/sabnzbd/sabnzbd.service
@ -1,11 +0,0 @@
-[Unit]
-Description=SABnzbd binary newsreader
-After=network.target
-
-[Service]
-ExecStart=/opt/sabnzbd/SABnzbd.py -l0
-User=sabnzbd
-Group=sabnzbd
-
-[Install]
-WantedBy=multi-user.target
--- a/aur/sabnzbd/x-nzb.xml
+++ b/aur/sabnzbd/x-nzb.xml
@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-  <mime-type type="application/x-nzb">
-  
-    <comment xml:lang='en'>An XML-based file format for retrieving posts from NNTP (Usenet) servers</comment>
-    <sub-class-of type="application/xml"/>
-    <glob pattern="*.nzb"/>
-
-  </mime-type>
-</mime-info>
--- a/aur/sickbeard-git/PKGBUILD
+++ b/aur/sickbeard-git/PKGBUILD
@ -1,52 +0,0 @@
-# Maintainer: sudokode <sudokode@gmail.com>
-# Previous Maintainer: Crass00 <crass00 at hotmail dot com>
-# Previous Maintainer: Superstar655 <choman000 at hotmail dot com>
-# Contributor: Augusto Born de Oliveira <augustoborn at gmail dot com>
-
-pkgname=sickbeard-git
-pkgver=3969.7cfff7f
-pkgrel=1
-pkgdesc="A PVR application that downloads and manages your TV shows"
-arch=('any')
-url="http://code.google.com/p/sickbeard/"
-license=('GPL3')
-depends=('python2' 'python2-cheetah')
-makedepends=('git')
-optdepends=('sabnzbd: NZB downloader'
-            'python2-notify: desktop notifications')
-install=sickbeard.install
-conflicts=('sickbeard')
-source=("$pkgname::git://github.com/midgetspy/Sick-Beard.git"
-        'sickbeard-system.service' 'sickbeard-user.service' 'sickbeard.tmpfile')
-sha256sums=('SKIP'
-            'aa2b6496bf622d2b235a47b80d950ba84411e879a08bc656d227e224653aeded'
-            'bf2f9792d3d7e1d703fec9bf61a1562a34b8d08d1dba3d560e6299ea25bd5a72'
-            '24f20de2445ff3998aad5d87d94e0fea3b22eb1d0a451ed33ec301ac36a7398d')
-
-pkgver() {
-  cd $pkgname
-
-  echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
-}
-
-prepare() {
-  cd $pkgname
-
-  # Fix python2 shebang
-  sed -i 's/python/python2/g' autoProcessTV/sabToSickBeard.py
-  sed -i 's/python/python2/g' autoProcessTV/hellaToSickBeard.py
-}
-
-package() {
-  mkdir -p "$pkgdir"/opt/sickbeard
-  chmod 775 "$pkgdir"/opt/sickbeard
-  cp -r $pkgname/* "$pkgdir"/opt/sickbeard
-
-  install -D -m644 sickbeard-system.service "$pkgdir"/usr/lib/systemd/system/sickbeard.service
-  install -D -m644 sickbeard-user.service "$pkgdir"/usr/lib/systemd/user/sickbeard.service
-  install -D -m644 sickbeard.tmpfile "$pkgdir"/usr/lib/tmpfiles.d/sickbeard.conf
-
-  find "$pkgdir" -type d -name '.git' -exec rm -r '{}' +
-}
-
-# vim:set ts=2 sw=2 et:
--- a/aur/sickbeard-git/sickbeard-system.service
+++ b/aur/sickbeard-git/sickbeard-system.service
@ -1,11 +0,0 @@
-[Unit]
-Description=SickBeard Daemon
-After=network.target
-
-[Service]
-User=sickbeard
-Group=sickbeard
-ExecStart=/usr/bin/env python2 /opt/sickbeard/SickBeard.py --quiet --config /opt/sickbeard/config.ini --datadir /opt/sickbeard
-
-[Install]
-WantedBy=multi-user.target
--- a/aur/sickbeard-git/sickbeard-user.service
+++ b/aur/sickbeard-git/sickbeard-user.service
@ -1,8 +0,0 @@
-[Unit]
-Description=SickBeard Daemon
-
-[Service]
-ExecStart=/usr/bin/env python2 /opt/sickbeard/SickBeard.py --quiet --config %h/.sickbeard/config.ini --datadir %h/.sickbeard
-
-[Install]
-WantedBy=default.target
--- a/aur/sickbeard-git/sickbeard.install
+++ b/aur/sickbeard-git/sickbeard.install
@ -1,50 +0,0 @@
-## arg 1:  the new package version
-post_install() {
-  if grep -q "^sickbeard" /etc/group &> /dev/null ; then
-    groupmod -n sickbeard sickbeard &> /dev/null
-  else
-    groupadd -r sickbeard &> /dev/null
-  fi
-  if grep -q "^sickbeard:" /etc/passwd 2> /dev/null ; then
-    usermod -s /bin/false -c "Sickbeard user" -d /opt/sickbeard -g sickbeard sickbeard &> /dev/null
-  else
-    useradd -s /bin/false -c "Sickbeard user" -d /opt/sickbeard -g sickbeard -r sickbeard &> /dev/null
-  fi
-
-  groupadd sickbeard &> /dev/null
-  useradd -g sickbeard -d /opt/sickbeard -s /bin/false sickbeard &> /dev/null
-  chgrp -R sickbeard /opt/sickbeard
-  # sed -i 's/^if isinstance(sys.version_info, tuple):$/if isinstance(sys.version_info[:], tuple):/g' "/usr/lib/python2.7/site-packages/Cheetah/Template.py"
-
-  # Create a directory in /run if it does not exist
-  if [ ! -d /run/sickbeard ]; then
-    mkdir /run/sickbeard
-    chown sickbeard:sickbeard /run/sickbeard
-    chmod 775 /run/sickbeard
-  fi
-
-}
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  chgrp -R sickbeard /opt/sickbeard
-  sed -i 's/^if isinstance(sys.version_info, tuple):$/if isinstance(sys.version_info[:], tuple):/g' "/usr/lib/python2.7/site-packages/Cheetah/Template.py"
-
-  # Create a directory in /run if it does not exist
-  if [ ! -d /run/sickbeard ]; then
-    mkdir /run/sickbeard
-    chown sickbeard:sickbeard /run/sickbeard
-    chmod 775 /run/sickbeard
-  fi
-
-}
-
-## arg 1:  the old package version
-pre_remove() {
-  userdel sickbeard &> /dev/null
-}
-
-post_remove() {
-  echo 'Some files have not been removed because they are created by sickbeard itself, e.g. the show database.'
-}
-
--- a/aur/sickbeard-git/sickbeard.tmpfile
+++ b/aur/sickbeard-git/sickbeard.tmpfile
@ -1 +0,0 @@
-d /run/sickbeard 0775 sickbeard sickbeard
--- a/aur/tboplayer-git/PKGBUILD
+++ b/aur/tboplayer-git/PKGBUILD
@ -1,34 +0,0 @@
-# Maintainer: Rozan Martin <rozan.martin@gmail.com>
-
-buildarch=20
-
-pkgname=tboplayer-git
-pkgver=1
-pkgrel=20121230
-pkgdesc="A GUI interface to control omxplayer for the Raspberry Pi"
-arch=('arm' 'armv6h' 'armv7h')
-url="https://github.com/KenT2/tboplayer"
-license=('custom')
-depends=(omxplayer-git python2 python2-pexpect)
-makedepends=(git)
-_gitroot="https://github.com/KenT2/tboplayer.git"
-_gitname="tboplayer"
-
-build() {
-  cd "$srcdir"
-  msg "Connecting to GIT server...."
-    if [ -d $_gitname ] ; then
-    ( cd $_gitname && git pull ) || warning "Git pull 
-failed!"
-  else
-    git clone --depth=1 $_gitroot 
-  fi
-  msg "GIT checkout done or server timeout"
-  cd $_gitname
-  sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" tboplayer.py
-}
-
-package() {
-  cd "$srcdir/$_gitname"
-  install -D -m755 tboplayer.py "$pkgdir/usr/bin/tboplayer"
-}
--- a/aur/unison-beta/PKGBUILD
+++ b/aur/unison-beta/PKGBUILD
@ -1,56 +0,0 @@
-#Contributor: Andreas Wagner <andreas dot wagner at em dot uni-frankfurt dot de>
-
-pkgname=unison-beta
-pkgver=2.48.3
-pkgrel=1
-pkgdesc="Unison is a file-synchronization tool. Beta Version"
-arch=(i686 x86_64)
-license=('GPL2')
-url="http://www.cis.upenn.edu/~bcpierce/unison"
-depends=('glibc')
-makedepends=('ocaml' 'lablgtk2' 'imagemagick')
-optdepends=('gtk2: graphical UI')
-source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/unison-$pkgver/unison-$pkgver.tar.gz \
-        unison.desktop)
-conflicts=('unison')
-options=(!makeflags)
-install=unison.install
-
-build() {
-  cd $srcdir/unison-$pkgver
-  CFLAGS=""
-  make clean
-  make mkProjectInfo
-  make UISTYLE=text DEBUGGING=false THREADS=true
-  cp unison $srcdir/unison
-
-## clean the builddir and rebuild with gtk support
-#  make clean
-#  make mkProjectInfo
-#  make UISTYLE=gtk DEBUGGING=false THREADS=true
-#  cp unison $srcdir/unison-gtk
-
-## clean the builddir and rebuild with gtk2 support
-  make clean
-  make mkProjectInfo
-  make UISTYLE=gtk2 DEBUGGING=false THREADS=true
-  cp unison $srcdir/unison-gtk2
-}
-
-package() {
-  cd $srcdir/unison-$pkgver
-  mkdir -p $pkgdir/usr/bin
-  install -Dm755 ../unison      $pkgdir/usr/bin/unison
-  install -Dm755 ../unison-gtk2 $pkgdir/usr/bin/unison-gtk2
-
-# install a .desktop file; create a compliant icon from ico file and install the png
-  install -Dm644 ../unison.desktop $pkgdir/usr/share/applications/unison.desktop
-  convert win32rc/U.ico unison.png
-  install -Dm644 unison-1.png $pkgdir/share/pixmaps/unison.png
-## make symlink for .desktop file
-  cd $pkgdir/usr/bin
-  ln -s unison-gtk2 unison-x11
-}
-
-md5sums=('91ff2ef4141aede9af719fdd5e848bcb'
-         '2daecba7705455a8e4b769e48b059872')
--- a/aur/unison-beta/unison.desktop
+++ b/aur/unison-beta/unison.desktop
@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=unison
-Name[de]=unison
-Comment=File synchronisation tool for X11
-Comment[de]=Datei Abgleicher und Synchronisierer
-TryExec=unison-x11
-Exec=unison-x11
-Terminal=false
-Type=Application
-Categories=GTK;Application;Network;
-Icon=unison.png
-StartupNotify=true
--- a/aur/unison-beta/unison.install
+++ b/aur/unison-beta/unison.install
@ -1,28 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  echo "NOTE:"
-  echo "  This build is without gtk1 frontend."
-  echo "  For gtk2 frontend please add 'gtk2' package."
-  echo "  Default X11 frontend is set to gtk2. "
-  echo ""
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
- post_install $1
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-$op $*
--- a/aur/xf86-input-xwiimote/PKGBUILD
+++ b/aur/xf86-input-xwiimote/PKGBUILD
@ -1,30 +0,0 @@
-# Maintainer: David Herrmann <dh.herrmann@googlemail.com>
-pkgname=xf86-input-xwiimote
-pkgver=0.5
-pkgrel=1.1
-pkgdesc='X.Org Nintendo Wii Remote input driver'
-arch=('i686' 'x86_64')
-url="http://github.com/dvdhrm/$pkgname"
-license=('MIT')
-depends=('xwiimote>=2' 'udev')
-makedepends=('xorg-server-devel>=1.10.99.902')
-conflicts=('xorg-server<1.10.99.902')
-options=(!libtool)
-source=(https://github.com/dvdhrm/$pkgname/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz)
-#source=($pkgname-$pkgver.tar.xz)
-md5sums=('8211779b393768cb4729e74358258c95')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  mkdir -p "$pkgdir/usr/share/licenses/$pkgname/"
-  cp COPYING "$pkgdir/usr/share/licenses/$pkgname/"
-  mkdir -p "$pkgdir/etc/X11/xorg.conf.d/"
-  cp "60-xorg-xwiimote.conf" "$pkgdir/etc/X11/xorg.conf.d/60-xwiimote.conf"
-  make DESTDIR="$pkgdir/" install
-}
--- a/aur/xrdp/PKGBUILD
+++ b/aur/xrdp/PKGBUILD
@ -6,7 +6,7 @@
 # Contributor: Mathias R. <pu154r@overlinux.org>
 pkgname=xrdp
 pkgver=0.8.0
-pkgrel=2
+pkgrel=3
 pkgdesc="An open source remote desktop protocol (RDP) server"
 url="http://xrdp.sourceforge.net/"
 arch=('i686' 'x86_64' 'armv6h')
@ -40,7 +40,7 @@ build() {
              --sysconfdir=/etc \
              --localstatedir=/var \
              --sbindir=/usr/bin \
-              --with-systemdsystemdunitdir=/usr/lib/systemd/system \
+              --with-systemdsystemunitdir=/usr/lib/systemd/system \
              --enable-jpeg \
              --enable-simplesound \
              --enable-fuse \
--- a/aur/xrdp/arch-config.diff
+++ b/aur/xrdp/arch-config.diff
@ -0,0 +1,98 @@
+diff -upr xrdp-git/instfiles/Makefile.am xrdp-git-new/instfiles/Makefile.am
+--- xrdp-git/instfiles/Makefile.am	2015-04-24 16:38:02.092787754 -0700
+++ xrdp-git-new/instfiles/Makefile.am	2015-04-24 16:47:21.346145399 -0700
+@@ -4,14 +4,16 @@ xrdp.service
+ 
+ SUBDIRS = \
+   pam.d \
+-  init.d \
+-  default \
+   pulse
+ 
+ if HAVE_SYSTEMD
+ systemdsystemunit_DATA = \
+         xrdp-sesman.service \
+         xrdp.service
+else
+SUBDIRS+= \
+  init.d \
+  default
+ endif
+ 
+ startscriptdir=$(sysconfdir)/xrdp
+@@ -35,5 +37,7 @@ startscript_DATA = \
+ # must be tab below
+ install-data-hook:
+ 	chmod 755 $(DESTDIR)$(sysconfdir)/xrdp/xrdp.sh
+-	chmod 755 $(DESTDIR)$(sysconfdir)/init.d/xrdp
+-	sed -i 's|__BASE__|$(prefix)|' $(DESTDIR)$(sysconfdir)/init.d/xrdp;
+	if [ -f $(DESTDIR)$(sysconfdir)/init.d/xrdp ]; then \
+	  chmod 755 $(DESTDIR)$(sysconfdir)/init.d/xrdp \
+	  sed -i 's|__BASE__|$(prefix)|' $(DESTDIR)$(sysconfdir)/init.d/xrdp; \
+	fi
+diff -upr xrdp-git/instfiles/pam.d/xrdp-sesman xrdp-git-new/instfiles/pam.d/xrdp-sesman
+--- xrdp-git/instfiles/pam.d/xrdp-sesman	2015-04-24 16:38:02.096121088 -0700
+++ xrdp-git-new/instfiles/pam.d/xrdp-sesman	2015-04-24 16:44:57.272805802 -0700
+@@ -1,5 +1,9 @@
+ #%PAM-1.0
+-@include common-auth
+-@include common-account
+-@include common-session
+-@include common-password
+#@include common-auth
+#@include common-account
+#@include common-session
+#@include common-password
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
+diff -upr xrdp-git/sesman/startwm.sh xrdp-git-new/sesman/startwm.sh
+--- xrdp-git/sesman/startwm.sh	2015-04-24 16:38:02.116121089 -0700
+++ xrdp-git-new/sesman/startwm.sh	2015-04-24 16:43:36.872802307 -0700
+@@ -8,6 +8,17 @@ wm_start()
+     export LANG LANGUAGE
+   fi
+ 
+  # arch user
+  if [ -r ~/.xinitrc ]; then
+    . ~/.xinitrc
+    exit 0
+  fi
+  # arch
+  if [ -r /etc/X11/xinit/xinitrc ]; then
+    . /etc/X11/xinit/xinitrc
+    exit 0
+  fi
+
+   # debian
+   if [ -r /etc/X11/Xsession ]; then
+     . /etc/X11/Xsession
+diff -upr xrdp-git/xrdp/xrdp.ini xrdp-git-new/xrdp/xrdp.ini
+--- xrdp-git/xrdp/xrdp.ini	2015-04-24 16:38:02.152787757 -0700
+++ xrdp-git-new/xrdp/xrdp.ini	2015-04-24 16:46:19.786142723 -0700
+@@ -51,7 +51,7 @@ grey=dedede
+ # require_credentials=yes
+
+ # set a default entry for autorun if the client send login and pass directly
+-autorun=xrdp1
+autorun=xrdp2
+
+ bulk_compression=yes
+
+@@ -139,6 +139,15 @@ tcutils=true
+ # for debugging xrdp, add following line to section xrdp1
+ # chansrvport=/tmp/.xrdp/xrdp_chansrv_socket_7210
+
+[xrdp0]
+name=sesman-Xvnc-delay
+lib=libvnc.so
+username=ask
+password=ask
+ip=127.0.0.1
+port=-1
+delay_ms=2000
+
+ [xrdp1]
+ name=sesman-X11rdp
+ lib=libxup.so
--- a/aur/xrdp/xrdp-sesman.service
+++ b/aur/xrdp/xrdp-sesman.service
@ -0,0 +1,15 @@
+[Unit]
+Description=xrdp session manager
+After=syslog.target network.target
+StopWhenUnneeded=true
+
+[Service]
+Type=forking
+PIDFile=/var/run/xrdp-sesman.pid
+EnvironmentFile=/etc/xrdp/xrdp.ini
+ExecStart=/usr/bin/xrdp-sesman $SESMAN_OPTIONS
+ExecStop=/usr/bin/xrdp-sesman $SESMAN_OPTIONS --kill
+
+[Install]
+WantedBy=multi-user.target
+
--- a/aur/xrdp/xrdp.service
+++ b/aur/xrdp/xrdp.service
@ -0,0 +1,14 @@
+[Unit]
+Description=xrdp daemon
+Requires=xrdp-sesman.service
+After=syslog.target network.target xrdp-sesman.service
+
+[Service]
+Type=forking
+PIDFile=/var/run/xrdp.pid
+EnvironmentFile=/etc/xrdp/xrdp.ini
+ExecStart=/usr/bin/xrdp $XRDP_OPTIONS
+ExecStop=/usr/bin/xrdp $XRDP_OPTIONS --kill
+
+[Install]
+WantedBy=multi-user.target
--- a/aur/xwiimote/PKGBUILD
+++ b/aur/xwiimote/PKGBUILD
@ -1,28 +0,0 @@
-# Maintainer: David Herrmann <dh.herrmann@googlemail.com>
-pkgname=xwiimote
-pkgver=2
-pkgrel=1
-pkgdesc='Userspace utilities to control connected Nintendo Wii Remotes'
-arch=('i686' 'x86_64')
-url="http://dvdhrm.github.io/$pkgname"
-license=('MIT')
-depends=('udev' 'ncurses')
-options=(!libtool)
-source=(https://github.com/dvdhrm/xwiimote/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz)
-#source=($pkgname-$pkgver.tar.xz)
-md5sums=('763f2c1acedfea9c8cee448a674efb76')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --with-doxygen=no
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  mkdir -p "$pkgdir/usr/share/licenses/$pkgname/"
-  cp LICENSE "$pkgdir/usr/share/licenses/$pkgname/"
-  mkdir -p "$pkgdir/etc/X11/xorg.conf.d/"
-  cp "res/50-xorg-fix-xwiimote.conf" "$pkgdir/etc/X11/xorg.conf.d/50-fix-xwiimote.conf"
-  make DESTDIR="$pkgdir/" install
-}