merging branches

13 files changed, 536 insertions, 45 deletions

diff --git a/pcr/miniupnpd/PKGBUILD b/pcr/miniupnpd/PKGBUILD
index 57a04c290..da6f373c9 100644
--- a/pcr/miniupnpd/PKGBUILD
+++ b/pcr/miniupnpd/PKGBUILD
@@ -41,3 +41,5 @@ package() {
         cd "$pkgdir"
         mv usr/sbin usr/bin
 }
+md5sums=('484dbda7c428b2d5f3768500a48d3375'
+         'f862f79b673359adc80faf0be914394f')
diff --git a/pcr/nppangband-libre/PKGBUILD b/pcr/nppangband-libre/PKGBUILD
new file mode 100644
index 000000000..eeb59f6fc
--- /dev/null
+++ b/pcr/nppangband-libre/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Israfel <israfel@lavabit.com>
+# Original PKGBUILD by James Rayner <iphitus@gmail.com> 
+# The Angband "adjust-sound-dir" patch by Chris Carr <rantingman@gmail.com> served as a reference for what files to edit for sound.patch
+
+_pkgname=nppangband
+pkgname=nppangband-libre
+pkgver=6.1.2
+pkgrel=1
+pkgdesc="A variant of Angband that attempts to take popular ideas from other variants, without nonfree sound effects"
+url="http://forum.nppangband.org/"
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname
+depends=('sdl' 'sdl_image' 'sdl_ttf' 'sdl_mixer' 'ncurses' 'libx11' 'freetype2')
+source=(http://download.nppangband.org/npp-6.1.2-src.zip sound.patch)
+license=('GPLv2 custom')
+arch=('i686' 'x86_64')
+
+build() {
+	cd $srcdir/npp-6.1.2-src/
+	patch -Np1 -i ../sound.patch
+	sh autogen.sh
+	./configure --enable-sdl
+	make
+}
+
+package() {  
+	cd $srcdir/npp-6.1.2-src/
+	make DESTDIR="$pkgdir/" install
+}
+
+sha512sums=('e12e05fd8944bb1d7e43b883416009a8e77198ee1ad0ea87480eaafb5f46ecdb218ef0b68876fb77cc2ab490a99f9b9303e02c7db385db6eb8d1d01a48cffdd0'
+            '820f4e678543b8f4d5092d6654bb3d4006e039fbc119d9ff5f468c01176497c25579ca2b0d6f6d302b11a3fbfaa6cfcdf89029ff586cda31d97e413cb8b91040')
diff --git a/pcr/nppangband-libre/sound.patch b/pcr/nppangband-libre/sound.patch
new file mode 100644
index 000000000..9de2b0177
--- /dev/null
+++ b/pcr/nppangband-libre/sound.patch
@@ -0,0 +1,241 @@
+# Made by Israfel <israfel@lavabit.com> for the Parabola GNU/Linux-Libre "nppangband-libre" package
+# The Angband "adjust-sound-dir" patch by Chris Carr <rantingman@gmail.com> served as a reference for what files to edit
+diff -crB npp-6.1.2-src/COPYING npp-6.1.2-src-libre/COPYING
+*** npp-6.1.2-src/COPYING	2013-03-29 14:37:32.000000000 -0400
+--- npp-6.1.2-src-libre/COPYING	2013-06-29 16:22:09.154804370 -0400
+***************
+*** 13,20 ****
+   * David Gervais' (32x32) graphics, including modifications and additional tiles by Jeff Greene, Thacker and Rob Fiala for NPPAngband may be redistributed, 
+  modified, and used only under the terms of the Creative Commons Attribution 3.0 licence: http://creativecommons.org/licenses/by/3.0/
+  
+-  * the sounds are freeware, whatever that means.
+- 
+   * the font files are under the licences noted in lib/xtra/font/copying.txt,
+     all of which are OSI-compliant.
+  
+--- 13,18 ----
+Only in npp-6.1.2-src/lib/xtra/sound: breath.wav
+Only in npp-6.1.2-src/lib/xtra/sound: clunk.wav
+Only in npp-6.1.2-src/lib/xtra/sound: death.wav
+Only in npp-6.1.2-src/lib/xtra/sound: destroy.wav
+Only in npp-6.1.2-src/lib/xtra/sound: drop.wav
+Only in npp-6.1.2-src/lib/xtra/sound: eat.wav
+Only in npp-6.1.2-src/lib/xtra/sound: flee.wav
+Only in npp-6.1.2-src/lib/xtra/sound: hallu.wav
+Only in npp-6.1.2-src/lib/xtra/sound: hit1.wav
+Only in npp-6.1.2-src/lib/xtra/sound: hit.wav
+Only in npp-6.1.2-src/lib/xtra/sound: kill1.wav
+Only in npp-6.1.2-src/lib/xtra/sound: kill.wav
+Only in npp-6.1.2-src/lib/xtra/sound: level.wav
+diff -crB npp-6.1.2-src/lib/xtra/sound/Makefile npp-6.1.2-src-libre/lib/xtra/sound/Makefile
+*** npp-6.1.2-src/lib/xtra/sound/Makefile	2013-03-29 14:37:36.000000000 -0400
+--- npp-6.1.2-src-libre/lib/xtra/sound/Makefile	2013-06-29 16:21:53.525414705 -0400
+***************
+*** 1,10 ****
+  MKPATH=../../../mk/
+  include $(MKPATH)buildsys.mk
+  
+! LIBDATA = sound.cfg breath.wav clunk.wav death.wav destroy.wav \
+! drop.wav eat.wav flee.wav hallu.wav hit.wav hit1.wav kill.wav \
+! kill1.wav level.wav miss.wav miss1.wav money.wav opendoor.wav \
+! shutdoor.wav thump.wav vomit.wav \
+  
+  PACKAGE = xtra/sound
+  
+--- 1,7 ----
+  MKPATH=../../../mk/
+  include $(MKPATH)buildsys.mk
+  
+! LIBDATA = sound.cfg
+  
+  PACKAGE = xtra/sound
+  
+Only in npp-6.1.2-src/lib/xtra/sound: miss1.wav
+Only in npp-6.1.2-src/lib/xtra/sound: miss.wav
+Only in npp-6.1.2-src/lib/xtra/sound: money.wav
+Only in npp-6.1.2-src/lib/xtra/sound: opendoor.wav
+Only in npp-6.1.2-src/lib/xtra/sound: shutdoor.wav
+diff -crB npp-6.1.2-src/lib/xtra/sound/sound.cfg npp-6.1.2-src-libre/lib/xtra/sound/sound.cfg
+*** npp-6.1.2-src/lib/xtra/sound/sound.cfg	2013-03-29 14:37:38.000000000 -0400
+--- npp-6.1.2-src-libre/lib/xtra/sound/sound.cfg	2013-06-29 16:20:47.241336459 -0400
+***************
+*** 41,59 ****
+  #
+  
+  # The shopkeep bought a worthless item.
+! store1 = money.wav
+  
+  # The shopkeep paid too much for an item.
+! store2 = money.wav
+  
+  # The shopkeep got away with a good bargain.
+! store3 = money.wav
+  
+  # The shopkeep got away with a great bargain.
+! store4 = money.wav
+  
+  # You make a normal transaction (buying or selling).
+! store5 = money.wav
+  
+  # You enter a store.
+  store_enter =
+--- 41,59 ----
+  #
+  
+  # The shopkeep bought a worthless item.
+! store1 =
+  
+  # The shopkeep paid too much for an item.
+! store2 =
+  
+  # The shopkeep got away with a good bargain.
+! store3 =
+  
+  # The shopkeep got away with a great bargain.
+! store4 =
+  
+  # You make a normal transaction (buying or selling).
+! store5 =
+  
+  # You enter a store.
+  store_enter =
+***************
+*** 69,75 ****
+  #
+  
+  # You succeed in a melee attack against a monster.
+! hit = hit.wav drop.wav hit1.wav
+  
+  # It was a good hit!
+  hit_good =
+--- 69,75 ----
+  #
+  
+  # You succeed in a melee attack against a monster.
+! hit =
+  
+  # It was a good hit!
+  hit_good =
+***************
+*** 87,93 ****
+  hit_hi_superb =
+  
+  # You miss a melee attack against a monster.
+! miss = miss.wav miss1.wav
+  
+  # You fire a missile.
+  shoot =
+--- 87,93 ----
+  hit_hi_superb =
+  
+  # You miss a melee attack against a monster.
+! miss =
+  
+  # You fire a missile.
+  shoot =
+***************
+*** 99,105 ****
+  hitpoint_warn =
+  
+  # You die.
+! death = death.wav
+  
+  #
+  # Player sounds - status changes
+--- 99,105 ----
+  hitpoint_warn =
+  
+  # You die.
+! death =
+  
+  #
+  # Player sounds - status changes
+***************
+*** 197,206 ****
+  money3 =
+  
+  # You (or a monster) drop something on the ground.
+! drop = clunk.wav
+  
+  # You gain (or regain) a level.
+! level = level.wav
+  
+  # You successfully study a spell or prayer.
+  study =
+--- 197,206 ----
+  money3 =
+  
+  # You (or a monster) drop something on the ground.
+! drop =
+  
+  # You gain (or regain) a level.
+! level =
+  
+  # You successfully study a spell or prayer.
+  study =
+***************
+*** 224,242 ****
+  hitwall =
+  
+  # You eat something.
+! eat = eat.wav
+  
+  # You successfully dig through something.
+! dig = thump.wav
+  
+  # You open a door.
+! opendoor = opendoor.wav
+  
+  # You shut a door.
+! shutdoor = shutdoor.wav
+  
+  # You teleport from a level (including via recall).
+! tplevel = teleport.wav
+  
+  # Default "bell" sound for system messages.
+  bell =
+--- 224,242 ----
+  hitwall =
+  
+  # You eat something.
+! eat =
+  
+  # You successfully dig through something.
+! dig =
+  
+  # You open a door.
+! opendoor =
+  
+  # You shut a door.
+! shutdoor =
+  
+  # You teleport from a level (including via recall).
+! tplevel =
+  
+  # Default "bell" sound for system messages.
+  bell =
+***************
+*** 291,300 ****
+  #
+  
+  # A monster flees in terror.
+! flee = flee.wav
+  
+  # A monster is killed.
+! kill = kill.wav destroy.wav kill1.wav
+  
+  # A unique is killed.
+  kill_unique =
+--- 291,300 ----
+  #
+  
+  # A monster flees in terror.
+! flee =
+  
+  # A monster is killed.
+! kill =
+  
+  # A unique is killed.
+  kill_unique =
+Only in npp-6.1.2-src/lib/xtra/sound: thump.wav
+Only in npp-6.1.2-src/lib/xtra/sound: vomit.wav
diff --git a/pcr/rfc5766-turn-server/PKGBUILD b/pcr/rfc5766-turn-server/PKGBUILD
index 81eb3d14d..e85f98bb8 100644
--- a/pcr/rfc5766-turn-server/PKGBUILD
+++ b/pcr/rfc5766-turn-server/PKGBUILD
@@ -3,20 +3,21 @@
 pkgname=rfc5766-turn-server
 _portname=turnserver
 pkgver=1.8.6.0
-pkgrel=1
+pkgrel=2
 epoch=
 pkgdesc="Free open source implementation of TURN and STUN Server"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/rfc5766-turn-server/"
 license=('custom:BSDNew')
-makedepends=('gcc>=3.4.4' 'make')
+makedepends=('gcc>=3.4.4' 'make' 'hiredis' 'postgresql-libs' 'libmariadbclient')
 depends=('libevent')
-#no redis headers in redi package
-optdepends=('postgresql-client: to use postgresql' 'libmysqlclient')
+optdepends=('postgresql-client: to use postgresql'
+            'mariadb: mariadb backend'
+            'redis: redis backend')
 backup=("etc/turnserver.conf" "etc/turnuserdb.conf")
 changelog=ChangeLog
-source=(https://${pkgname}.googlecode.com/files/${_portname}-$pkgver.tar.gz)
-sha1sums=('155990b95d399542db1bb497f1746c1b9bb290d2')
+source=(https://${pkgname}.googlecode.com/files/${_portname}-$pkgver.tar.gz
+        turn.service stun.service)
 
 build() {
   cd "${srcdir}/$_portname-${pkgver}"
@@ -51,11 +52,20 @@ package() {
     install
   
   
-  install -D "$pkgdir/usr/share/$pkgname/examples/etc/turnserver.conf" "$pkgdir/etc/turnserver.conf"
-  install -D "$pkgdir/usr/share/$pkgname/examples/etc/turnuserdb.conf" "$pkgdir/etc/turnuserdb.conf"
+  install -D "$pkgdir/usr/share/$pkgname/examples/etc/turnserver.conf" \
+             "$pkgdir/etc/turnserver.conf"
+  install -D "$pkgdir/usr/share/$pkgname/examples/etc/turnuserdb.conf" \
+             "$pkgdir/etc/turnuserdb.conf"
+  install -D "$srcdir/stun.service" \
+             "$pkgdir/usr/lib/systemd/system/stun.service"
+  install -D "$srcdir/turn.service" \
+             "$pkgdir/usr/lib/systemd/system/turn.service"
   rm -r "$pkgdir/usr/etc"
 
   chmod 644 "$pkgdir/usr/lib/libturnclient.a"
 
   install -Dm 644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
+md5sums=('def4cc2ea6239795edab12b5eee5f8ed'
+         '1da26c3a1fe29a8961e6b9d73f9048d3'
+         '83670d79026c67c7701481ee9d39f100')
diff --git a/pcr/rfc5766-turn-server/stun.service b/pcr/rfc5766-turn-server/stun.service
new file mode 100644
index 000000000..bddb6168a
--- /dev/null
+++ b/pcr/rfc5766-turn-server/stun.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=STUN Server
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/turnserver --stun-only
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/rfc5766-turn-server/turn.service b/pcr/rfc5766-turn-server/turn.service
new file mode 100644
index 000000000..54cc5f01a
--- /dev/null
+++ b/pcr/rfc5766-turn-server/turn.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=TURN Server
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/turnserver
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/supermodel/PKGBUILD b/pcr/supermodel/PKGBUILD
new file mode 100644
index 000000000..fd22bea59
--- /dev/null
+++ b/pcr/supermodel/PKGBUILD
@@ -0,0 +1,38 @@
+# Maintainer: Anton Shestakov <engored*ya.ru>
+
+pkgname=supermodel
+pkgver=0.2a
+pkgrel=1
+pkgdesc='A Sega Model 3 Arcade Emulator'
+arch=('i686' 'x86_64')
+url='http://www.supermodel3.com/'
+license=('GPL3')
+depends=('mesa' 'glu' 'sdl' 'zlib')
+install=supermodel.install
+source=('multiuser.patch' 'supermodel.sh' 
+        "http://www.supermodel3.com/Files/Supermodel_${pkgver}_Src.zip")
+md5sums=('a7cf136e412a0d927b099c15793b658d' 'ea8274c2a37acddd026fce9c831530cc'
+        'd22359fbe277fe8f6fe0a06524350fc1')
+
+MAKEFLAGS="-j1"
+
+build() {
+  cd "$srcdir/Supermodel_${pkgver}_Src"
+  sed -e "s/-Wall -O3/$CFLAGS/" -i 'Makefiles/Makefile.SDL.UNIX.GCC'
+  patch -p1 < ../multiuser.patch
+  make -f 'Makefiles/Makefile.SDL.UNIX.GCC'
+}
+
+package() {
+  cd "$srcdir/Supermodel_${pkgver}_Src"
+
+  install -Dm755 "$srcdir/supermodel.sh" "$pkgdir/usr/bin/supermodel"
+
+  install -Dm755 "bin/Supermodel" "$pkgdir/usr/share/supermodel/Supermodel"
+
+  install -Dm644 "Docs/LICENSE.txt" "$pkgdir/usr/share/licenses/supermodel/LICENSE"
+  install -Dm644 "Docs/README.txt" "$pkgdir/usr/share/doc/supermodel/README"
+
+  install -d "$pkgdir/usr/share/supermodel/Config"
+  install -m644 Config/* "$pkgdir/usr/share/supermodel/Config/"
+}
diff --git a/pcr/supermodel/multiuser.patch b/pcr/supermodel/multiuser.patch
new file mode 100644
index 000000000..9cb93e02c
--- /dev/null
+++ b/pcr/supermodel/multiuser.patch
@@ -0,0 +1,107 @@
+diff --git a/Src/OSD/SDL/Main.cpp b/Src/OSD/SDL/Main.cpp
+--- a/Src/OSD/SDL/Main.cpp
++++ b/Src/OSD/SDL/Main.cpp
+@@ -307,7 +307,6 @@
+  Configuration file management and input settings.

+ ******************************************************************************/

+ 

+-#define CONFIG_FILE_PATH	"Config/Supermodel.ini"

+ #define CONFIG_FILE_COMMENT	";\n" \

+ 							"; Supermodel Configuration File\n" \

+ 							";\n"

+@@ -315,9 +314,13 @@
+ // Create and configure inputs

+ static bool ConfigureInputs(CInputs *Inputs, bool configure)

+ {

++	char		configFilePath[512];

++	

++	sprintf(configFilePath, "%s/.supermodel/supermodel.ini", getenv("HOME"));

++	

+ 	// Open and parse configuration file

+ 	CINIFile INI;

+-	INI.Open(CONFIG_FILE_PATH);	// doesn't matter if it exists or not, will get overwritten

++	INI.Open(configFilePath);	// doesn't matter if it exists or not, will get overwritten

+ 	INI.SetDefaultSectionName("Global");

+ 	INI.Parse();

+ 	

+@@ -338,9 +341,9 @@
+ 			Inputs->WriteToINIFile(&INI, "Global");

+ 		

+ 			if (OKAY != INI.Write(CONFIG_FILE_COMMENT))

+-				ErrorLog("Unable to save configuration to '%s'.", CONFIG_FILE_PATH);

++				ErrorLog("Unable to save configuration to '%s'.", configFilePath);

+ 			else

+-				printf("Configuration successfully saved to '%s'.\n", CONFIG_FILE_PATH);

++				printf("Configuration successfully saved to '%s'.\n", configFilePath);

+ 		}

+ 		else

+ 			puts("Configuration aborted...");

+@@ -412,9 +415,13 @@
+ // Read settings (from a specific section) from the config file

+ static void ReadConfigFile(const char *section)

+ {

++	char		configFilePath[512];

++	

++	sprintf(configFilePath, "%s/.supermodel/supermodel.ini", getenv("HOME"));

++	

+ 	CINIFile	INI;	

+ 	

+-	INI.Open(CONFIG_FILE_PATH);

++	INI.Open(configFilePath);

+ 	INI.SetDefaultSectionName("Global");	// required to read settings not associated with a specific section

+ 	INI.Parse();

+ 	ApplySettings(&INI, section);

+@@ -498,10 +505,10 @@
+ static void SaveState(CModel3 *Model3)

+ {

+ 	CBlockFile	SaveState;

+-	char		filePath[24];

++	char		filePath[512];

+ 	int			fileVersion = STATE_FILE_VERSION;

+ 	

+-	sprintf(filePath, "Saves/%s.st%d", Model3->GetGameInfo()->id, saveSlot);

++	sprintf(filePath, "%s/.supermodel/saves/%s.st%d", getenv("HOME"), Model3->GetGameInfo()->id, saveSlot);

+ 	if (OKAY != SaveState.Create(filePath, "Supermodel Save State", "Supermodel Version " SUPERMODEL_VERSION))

+ 	{

+ 		ErrorLog("Unable to save state to '%s'.", filePath);

+@@ -522,11 +529,11 @@
+ static void LoadState(CModel3 *Model3)

+ {

+ 	CBlockFile	SaveState;

+-	char		filePath[24];

++	char		filePath[512];

+ 	int			fileVersion;

+ 	

+ 	// Generate file path

+-	sprintf(filePath, "Saves/%s.st%d", Model3->GetGameInfo()->id, saveSlot);

++	sprintf(filePath, "%s/.supermodel/saves/%s.st%d", getenv("HOME"), Model3->GetGameInfo()->id, saveSlot);

+ 	

+ 	// Open and check to make sure format is correct

+ 	if (OKAY != SaveState.Load(filePath))

+@@ -558,10 +565,10 @@
+ static void SaveNVRAM(CModel3 *Model3)

+ {

+ 	CBlockFile	NVRAM;

+-	char		filePath[24];

++	char		filePath[512];

+ 	int			fileVersion = NVRAM_FILE_VERSION;

+ 	

+-	sprintf(filePath, "NVRAM/%s.nv", Model3->GetGameInfo()->id);

++	sprintf(filePath, "%s/.supermodel/NVRAM/%s.nv", getenv("HOME"), Model3->GetGameInfo()->id);

+ 	if (OKAY != NVRAM.Create(filePath, "Supermodel NVRAM State", "Supermodel Version " SUPERMODEL_VERSION))

+ 	{

+ 		ErrorLog("Unable to save NVRAM to '%s'. Make sure directory exists!", filePath);

+@@ -581,11 +588,11 @@
+ static void LoadNVRAM(CModel3 *Model3)

+ {

+ 	CBlockFile	NVRAM;

+-	char		filePath[24];

++	char		filePath[512];

+ 	int			fileVersion;

+ 	

+ 	// Generate file path

+-	sprintf(filePath, "NVRAM/%s.nv", Model3->GetGameInfo()->id);

++	sprintf(filePath, "%s/.supermodel/NVRAM/%s.nv", getenv("HOME"), Model3->GetGameInfo()->id);

+ 	

+ 	// Open and check to make sure format is correct

+ 	if (OKAY != NVRAM.Load(filePath))

diff --git a/pcr/supermodel/supermodel.install b/pcr/supermodel/supermodel.install
new file mode 100644
index 000000000..94ef82c48
--- /dev/null
+++ b/pcr/supermodel/supermodel.install
@@ -0,0 +1,12 @@
+# Message displayed for a fresh install.
+post_install() { 
+  echo ""
+  echo "***************************************************************"
+  echo " Supermodel has been installed in /usr/share/supermodel."
+  echo " However, Supermodel can be run by typing supermodel and it's options:"
+  echo " supermodel <romset> [options]"
+  echo ""
+  echo " Note: You need to provide the full path to the romset."
+  echo "***************************************************************"
+  echo ""
+}
diff --git a/pcr/supermodel/supermodel.sh b/pcr/supermodel/supermodel.sh
new file mode 100644
index 000000000..992dd406d
--- /dev/null
+++ b/pcr/supermodel/supermodel.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+mkdir -p ~/.supermodel/NVRAM
+mkdir -p ~/.supermodel/saves
+
+cd /usr/share/supermodel
+
+if [[ ! -f ~/.supermodel/supermodel.ini ]]; then
+    cp ./Config/Supermodel.ini ~/.supermodel/supermodel.ini
+fi
+
+./Supermodel "$@"
diff --git a/pcr/tinc-pre/PKGBUILD b/pcr/tinc-pre/PKGBUILD
new file mode 100644
index 000000000..ebbd4cc3f
--- /dev/null
+++ b/pcr/tinc-pre/PKGBUILD
@@ -0,0 +1,42 @@
+pkgname=tinc-pre
+pkgver=1.1pre7
+pkgrel=2
+pkgdesc="VPN (Virtual Private Network) daemon (Pre-release)"
+arch=(i686 x86_64)
+url="http://www.tinc-vpn.org/"
+license=('GPL')
+depends=('lzo2' 'zlib' 'openssl')
+optdepends=('wxpython: gui support')
+provides=('tinc-pre')
+conflicts=('tinc')
+source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz{,.sig}
+        tincd@.service)
+
+build() {
+  cd "$srcdir/tinc-$pkgver"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin
+  make
+}
+
+package() {
+  cd "$srcdir/tinc-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  install -dm755 "$pkgdir"/usr/share/tinc/examples
+  tar xozvf doc/sample-config.tar.gz -C $pkgdir/usr/share/tinc/examples
+  find "$pkgdir"/usr/share/tinc/examples -type f -exec chmod 644 {} +
+  find "$pkgdir"/usr/share/tinc/examples -type d -exec chmod 755 {} +
+
+  install -Dm644 "$srcdir/tincd@.service" \
+                 "$pkgdir/usr/lib/systemd/system/tincd@.service"
+
+  sed -e 's,#!/usr/bin/python,#!/usr/bin/python2,' \
+      -i $pkgdir/usr/bin/tinc-gui
+}
+sha1sums=('62a014356864c3a5204edd6e934f3ee575760cfc'
+          'SKIP'
+          '6ab485732bb6c59e7e0e162f22251a0f554ec69c')
+sha256sums=('ff330627ad0d6ce1233408bb75b11d7506be13eb0c802ff1657866d97545074b'
+            'SKIP'
+            '43d086b76e2a6ff6d91a2ace2d6d048fc7109fefecd5047ab6c437ba0e9252ed')
diff --git a/pcr/tinc-pre/tincd@.service b/pcr/tinc-pre/tincd@.service
new file mode 100644
index 000000000..069bf4570
--- /dev/null
+++ b/pcr/tinc-pre/tincd@.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Tinc daemon for net %i
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/tincd -n %i
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/zita-convolver/PKGBUILD b/pcr/zita-convolver/PKGBUILD
deleted file mode 100644
index 5017f144f..000000000
--- a/pcr/zita-convolver/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer : Guest One <theguestone at gmail dot com>
-
-pkgname=zita-convolver
-pkgver=3.1.0
-pkgrel=1
-pkgdesc="Convolution library for aeolus and jconvolver"
-arch=('i686' 'x86_64')
-url="http://kokkinizita.linuxaudio.org/linuxaudio"
-license=('GPL')
-depends=('fftw' 'gcc-libs')
-source=("http://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-convolver-$pkgver.tar.bz2")
-md5sums=('7e264d0fb0d8ea277cdb4e33d764c68a')
-
-build() {
-  cd "$srcdir/zita-convolver-$pkgver/libs"
-
-  sed -i 's/usr\/local/usr/' Makefile
-  sed -i 's/ldconfig//' Makefile
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver/libs"
-
-  make SUFFIX="" PREFIX="$pkgdir/usr" DESTDIR=${PKGDIR} install 
-
-
-  # Another failed attempt at trying to be clever. A simple call to ldconfig might have worked.
-  #  ln -s lib$pkgname.so.$pkgver \
-  #    "$pkgdir/usr/lib/lib$pkgname.so.${pkgver%%.*}"
-  
-  #  ln -s lib${pkgname}.so.$pkgver ${pkgdir}/usr/lib/lib${pkgname}.so
-}
-
-