aur clean-up

2025-01-27 23:44:04 +00:00 · 2017-05-12 01:36:29 +00:00 · 2017-05-12 01:36:29 +00:00 · 5bb1a5c0d7
commit 5bb1a5c0d7
parent e51bdcdbbe
49 changed files with 0 additions and 2461 deletions
--- a/aur/aoetools/PKGBUILD
+++ b/aur/aoetools/PKGBUILD
@ -1,24 +0,0 @@
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Lothar Gesslein <ulmen@cryptomilch.de>
-
-pkgname=aoetools
-pkgver=36
-pkgrel=2
-pkgdesc="ATA over Ethernet Tools"
-arch=('i686' 'x86_64')
-url="http://aoetools.sourceforge.net/"
-license=('GPL')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('fb5e2cd0de7644cc1ec04ee3aeb43211cf7445a0c19e13d6b3ed5a8fbdf215ff')
-
-build() {
-  cd "${srcdir}"/$pkgname-$pkgver
-
-  make
-}
-
-package() {
-  cd "${srcdir}"/$pkgname-$pkgver
-
-  make DESTDIR="${pkgdir}" SBINDIR=/usr/bin install
-}
--- a/aur/bully/PKGBUILD
+++ b/aur/bully/PKGBUILD
@ -1,25 +0,0 @@
-# Maintainer: Lubomir 'Kuci' Kucera <kuci24-at-gmail-dot-com>
-
-pkgname=bully
-pkgver=1.0.22
-pkgrel=2
-pkgdesc="Retrieve WPA/WPA2 passphrase from a WPS enabled access point."
-arch=('i686' 'x86_64')
-url="https://github.com/bdpurcell/bully"
-license=('GPL3')
-depends=('libpcap' 'openssl')
-makedepends=('make')
-source=('http://www6.frugalware.org/mirrors/linux/kali/kali/pool/main/b/bully/bully_1.0-22.orig.tar.gz')
-sha512sums=('2319a55d5ec79322463e6b2ad27af72a8177e82a079021eb17bf0cb0ebda50b0953cf6b17563f026ac93c06e05132e3821d887951da1f077b5d26a6adbecb667')
-
-build() {
-    cd "$srcdir/bully/src"
-
-    make
-}
-
-package() {
-    cd "$srcdir/bully/src"
-    
-    install -Dm755 "bully" "$pkgdir/usr/bin/bully"
-}
--- a/aur/chocolate-doom/PKGBUILD
+++ b/aur/chocolate-doom/PKGBUILD
@ -1,141 +0,0 @@
-# Maintainer: Mike Swanson <mikeonthecomputer@gmail.com>
-
-pkgname=(chocolate-{doom,heretic,hexen,strife,common})
-pkgbase=${pkgname[0]}
-pkgdesc="Historically-accurate Doom, Heretic, Hexen, and Strife ports."
-pkgver=2.2.1
-pkgrel=1
-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)
-sha256sums=('ad11e2871667c6fa0658abf2dcba0cd9b26fbd651ee8df55adfdc18ad8fd674a')
-
-prepare() {
-  cd "${pkgbase}-${pkgver}"
-
-  for patch in ../*.patch; do
-    if [ ! -f "$patch" ]; then
-      break;
-    else
-      patch -p1 -i "$patch"
-    fi
-  done
-
-  # Change binary dir from /usr/games to /usr/bin
-  sed 's|/games|/bin|g' -i src{,/setup}/Makefile.in
-}
-
-build() {
-  cd "${pkgbase}-${pkgver}"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package_chocolate-common() {
-  pkgdesc="Files shared in common with Chocolate Doom-based games."
-  depends=('sdl_net')
-  install=chocolate-doom.install
-
-  cd "${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -dm 755 "${pkgdir}"/usr/share/games/doom
-
-  cd "${pkgdir}"/usr/bin
-  mv chocolate-doom-setup chocolate-setup
-  rm -f chocolate-{doom,heretic,hexen,strife}{,-setup}
-
-  cd "${pkgdir}"/usr/share
-  rm -rf doc man/man5
-  rm -rf applications/chocolate-{doom,heretic,hexen,strife}.desktop \
-     applications/screensavers
-  rm -rf appdata
-  cd man/man6
-  rm -f chocolate-{doom,heretic,hexen,strife}{,-setup}.6
-}
-
-package_chocolate-doom() {
-  pkgdesc="Doom port accurately reproducing the original DOS EXEs."
-  depends=(${depends[@]} 'chocolate-common')
-  optdepends=('freedm: Free deathmatch game'
-              'freedoom1: Free Ultimate Doom-compatible game (not vanilla compatible, but useful for mods)'
-              'freedoom2: Free Doom II/Final Doom-compatible game (not vanilla compatible, but useful for mods)')
-
-  cd "${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  cd "${pkgdir}"/usr/bin
-  rm -f chocolate-{heretic,hexen,strife,server} chocolate*setup
-  ln -s chocolate{,-doom}-setup
-
-  cd "${pkgdir}"/usr/share
-  rm -rf doc/chocolate-{heretic,hexen,strife}
-  rm -rf applications/chocolate-{setup,heretic,hexen,strife}.desktop icons
-  rm -f appdata/chocolate-{heretic,hexen,strife}.appdata.xml
-  rm -f man/man?/chocolate-{heretic,hexen,strife,setup,server}* \
-     man/man5/{heretic,hexen,strife}.cfg*
-}
-
-package_chocolate-heretic() {
-  pkgdesc="Heretic port accurately reproducing the original DOS EXEs."
-  depends=(${depends[@]} 'chocolate-common')
-  optdepends=('blasphemer: Free Heretic-compatible game')
-
-  cd "${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  cd "${pkgdir}"/usr/bin
-  rm -f chocolate-{doom,hexen,strife,server} chocolate*setup
-  ln -s chocolate{,-heretic}-setup
-
-  cd "${pkgdir}"/usr/share
-  rm -rf doc/chocolate-{doom,hexen,strife}
-  rm -rf applications/chocolate-{setup,doom,hexen,strife}.desktop \
-     applications/screensavers icons
-  rm -f appdata/chocolate-{doom,hexen,strife}.appdata.xml
-  rm -f man/man?/chocolate-{doom,hexen,strife,setup,server}* \
-     man/man5/{default,hexen,strife}.cfg*
-}
-
-package_chocolate-hexen() {
-  pkgdesc="Hexen port accurately reproducing the original DOS EXEs."
-  depends=(${depends[@]} 'chocolate-common')
-
-  cd "${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  cd "${pkgdir}"/usr/bin
-  rm -f chocolate-{doom,heretic,strife,server} chocolate*setup
-  ln -s chocolate{,-hexen}-setup
-
-  cd "${pkgdir}"/usr/share
-  rm -rf doc/chocolate-{doom,heretic,strife}
-  rm -rf applications/chocolate-{setup,doom,heretic,strife}.desktop \
-     applications/screensavers icons
-  rm -f appdata/chocolate-{doom,heretic,strife}.appdata.xml
-  rm -f man/man?/chocolate-{doom,heretic,strife,setup,server}* \
-     man/man5/{default,heretic,strife}.cfg*
-}
-
-package_chocolate-strife() {
-  pkgdesc="Strife port accurately reproducing the original DOS EXEs."
-  depends=(${depends[@]} 'chocolate-common')
-
-  cd "${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  cd "${pkgdir}"/usr/bin
-  rm -f chocolate-{doom,heretic,hexen,server} chocolate*setup
-  ln -s chocolate{,-strife}-setup
-
-  cd "${pkgdir}"/usr/share
-  rm -rf doc/chocolate-{doom,heretic,hexen}
-  rm -rf applications/chocolate-{setup,doom,heretic,hexen}.desktop \
-     applications/screensavers icons
-  rm -f appdata/chocolate-{doom,heretic,hexen}.appdata.xml
-  rm -f man/man?/chocolate-{doom,heretic,hexen,setup,server}* \
-     man/man5/{default,heretic,hexen}.cfg*
-}
--- a/aur/chocolate-doom/chocolate-doom.install
+++ b/aur/chocolate-doom/chocolate-doom.install
@ -1,13 +0,0 @@
-post_install() {
-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/despotify-svn/PKGBUILD
+++ b/aur/despotify-svn/PKGBUILD
@ -1,50 +0,0 @@
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-
-pkgname=despotify-svn
-pkgver=521
-pkgrel=2.1
-pkgdesc='Console client for Spotify (development version)'
-arch=('x86_64' 'i686')
-url='http://despotify.sourceforge.net/'
-license=('BSD')
-depends=('libvorbis' 'openssl' 'libao' 'mpg123')
-makedepends=('subversion' 'ncurses' 'libtool' 'expat')
-conflicts=('despotify-pulse-svn' 'despotify-ao-svn')
-install='despotify.install'
-source=('despotify::svn://svn.code.sf.net/p/despotify/code/')
-sha256sums=('SKIP')
-
-pkgver() {
-  cd "$srcdir/despotify"
-
-  svnversion | tr -d [A-z]
-}
-
-prepare() {
-  cd "$srcdir/despotify/src"
-
-  # Use libao instead of gstreamer
-  sed -i 's/gstreamer/libao/' Makefile.local.mk.dist
-  cp Makefile.local.mk.dist Makefile.local.mk
-
-  # Anti-segfault fix, add format.matrix = NULL; to libao.c
-  sed -i 's/_LITTLE;/_LITTLE; format.matrix = NULL;/' \
-    clients/despotify/libao.c
-}
-
-
-build() {
-  cd "$srcdir/despotify/src"
-
-  make
-}
-
-package() {
-  cd "$srcdir/despotify/src"
-
-  mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/include"
-  make INSTALL_PREFIX="$pkgdir/usr" DESTDIR="$pkgdir/" install
-  chmod -x "$pkgdir/usr/include/despotify.h"
-}
-
-# vim:set ts=2 sw=2 et:
--- a/aur/despotify-svn/despotify.install
+++ b/aur/despotify-svn/despotify.install
@ -1,11 +0,0 @@
-post_upgrade() {
-  echo 'NOTE:'
-  echo 'If you use PulseAudio and get no sound, try as root:'
-  echo 'setconf /etc/libao.conf default_driver pulse'
-}
-
-post_install() {
-  post_upgrade
-}
-
-# vim:set ts=2 sw=2 et:
--- a/aur/extract-xiso/PKGBUILD
+++ b/aur/extract-xiso/PKGBUILD
@ -1,27 +0,0 @@
-# Maintainer: Joe Carta <cartakid at gmail dot com>
-# Contributor: sidious/SiD <miste78 web de>
-# Contributor: Wes Brewer <brewerw@gmail.com>
-
-pkgname=extract-xiso
-pkgver=2.7.1
-pkgrel=1
-pkgdesc="xdvdfs (xbox iso) file creation and extraction utility"
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/extract-xiso"
-license=('custom')
-conflicts=('extract-xiso-somski')
-source=(http://downloads.sourceforge.net/$pkgname/${pkgname}-${pkgver}.tar.gz)
-md5sums=('464aeb312aca6f4a1ffee42384b3c738')
-
-build() {
-  cd ${srcdir}/${pkgname}
-  # build
-  make 
-}
-package() {
-  cd ${srcdir}/${pkgname}
-  # install binary
-  install -Dm755 extract-xiso ${pkgdir}/usr/bin/extract-xiso
-  # install custom license
-  install -Dm644 LICENSE.TXT ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT
-}
--- a/aur/gmrender-resurrect-git/PKGBUILD
+++ b/aur/gmrender-resurrect-git/PKGBUILD
@ -1,52 +0,0 @@
-# Original Author: Henner Zeller <h.zeller at acm dot org>
-# Maintainer: Florian Will <florian dot will at gmail dot com>
-# Contributor: Drew DeVore <w.drew.devore at gmail dot com>
-
-pkgname=gmrender-resurrect-git
-_gitname=gmrender-resurrect
-pkgver=279.4003616
-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=('GPL')
-conflicts=('gmediarender')
-depends=('libupnp' 'gst-plugins-good' 'gst-plugins-base')
-optdepends=(
-    'gst-libav: Extra media codecs'
-    'gst-plugins-bad: Extra media codecs'
-    'gst-plugins-ugly: Extra media codecs'
-)
-makedepends=('git')
-backup=('etc/conf.d/gmediarender')
-install='gmrender-resurrect.install'
-source=(
-	'git+https://github.com/hzeller/gmrender-resurrect.git'
-	'gmediarender.service'
-	'gmediarender-user.service'
-	'gmediarender')
-md5sums=('SKIP'
-         'a3fa4bedc6e0853cf40b48c80269736f'
-         'cb7ee011b08d37db1a2f5253da8e18e3'
-         '979798ff9cac610930f13fb922ca95d4')
-
-
-pkgver() {
-	cd $_gitname
-	echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
-}
-
-build() {
-	cd $_gitname
-	./autogen.sh
-	./configure --prefix=/usr/
-	make
-}
-
-package() {
-	cd $_gitname
-	make DESTDIR=$pkgdir install
-	install -D -m 644 $srcdir/gmediarender.service "$pkgdir/usr/lib/systemd/system/gmediarender.service"
-	install -D -m 644 $srcdir/gmediarender-user.service "$pkgdir/usr/lib/systemd/user/gmediarender.service"
-	install -D -m 644 $srcdir/gmediarender "$pkgdir/etc/conf.d/gmediarender"
-}
--- a/aur/gmrender-resurrect-git/gmediarender
+++ b/aur/gmrender-resurrect-git/gmediarender
@ -1,6 +0,0 @@
-#Friendly Name to display to network devices
-friendly=gMedia UPnP Renderer
-
-#UUID
-#Change this to make different players unique
-uuid=90aba109-6333-4669-85d1-d9316244f7f9
--- a/aur/gmrender-resurrect-git/gmediarender-user.service
+++ b/aur/gmrender-resurrect-git/gmediarender-user.service
@ -1,10 +0,0 @@
-[Unit]
-Description=UPnP renderer using gstreamer
-After=network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/gmediarender -f "gMedia UpPnP Renderer" -u 49e4f137-a832-481c-9117-bfa96a71aba5
-
-[Install]
-WantedBy=default.target
--- a/aur/gmrender-resurrect-git/gmediarender.service
+++ b/aur/gmrender-resurrect-git/gmediarender.service
@ -1,13 +0,0 @@
-[Unit]
-Description=UPnP renderer using gstreamer
-After=network.target
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/gmediarender
-ExecStart=/usr/bin/gmediarender -f ${friendly} -u ${uuid} -d
-User=nobody
-Group=audio
-
-[Install]
-WantedBy=multi-user.target
--- a/aur/gmrender-resurrect-git/gmrender-resurrect.install
+++ b/aur/gmrender-resurrect-git/gmrender-resurrect.install
@ -1,17 +0,0 @@
-post_install() {
-	echo "	You may edit the 'Friendly Name' in /etc/conf.d/gmediarender"
-	echo "	If you want MP3 playback, you need some of the optional dependencies."
-	echo ""
-	echo "	Start the service by running (as root):"
-	echo "		systemctl start gmediarender"
-	echo "	Enable (auto-start) the service by running (as root):"
-	echo "		systemctl enable gmediarender"
-	return 0
-}
-
-post_upgrade() {
-	echo "	Don't forget to restart gmediarender (as root) if it's running:"
-	echo "		systemctl daemon-reload"
-	echo "		systemctl restart gmediarender"
-	return 0
-}
--- a/aur/kdeplasma-applets-quickaccess/PKGBUILD
+++ b/aur/kdeplasma-applets-quickaccess/PKGBUILD
@ -1,27 +0,0 @@
-pkgname=kdeplasma-applets-quickaccess
-pkgver=0.8.3
-pkgrel=1
-pkgdesc='KDE Plasma widget for quick access to folders.'
-arch=('i686' 'x86_64')
-url='http://kde-look.org/content/show.php?content=163309'
-license=('GPL2')
-conflicts=('quickaccess-plasmoid')
-depends=('kdebase-workspace' 'kdebase-plasma')
-makedepends=('cmake' 'automoc4')
-source=('http://kde-look.org/CONTENT/content-files/163309-plasma-widget-quickaccess-0.8.3.tar.gz')
-sha1sums=('d9174ca63e80cfc661fcdbc1d730a5986e7c8e2f')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../plasma-widget-quickaccess-${pkgver} \
-          -DCMAKE_BUILD_TYPE=Release \
-          -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` \
-          -DQT_QMAKE_EXECUTABLE=qmake-qt4
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR=$pkgdir install
-}
--- a/aur/libresample/Makefile.in.patch
+++ b/aur/libresample/Makefile.in.patch
@ -1,14 +0,0 @@
-diff -Nur libresample-0.1.3.orig/Makefile.in libresample-0.1.3/Makefile.in
--- libresample-0.1.3.orig/Makefile.in	2003-10-12 17:05:59.000000000 +1000
-+++ libresample-0.1.3/Makefile.in	2009-08-24 08:43:16.000000000 +1000
-@@ -20,6 +20,10 @@
- TARGETS = @TARGETS@
- DIRS=tests
- 
-+ifeq ($(shell uname -m),x86_64)
-+	CFLAGS += -fPIC
-+endif
-+
- all: $(TARGETS)
- 
- libresample.a: $(OBJS) Makefile
--- a/aur/libresample/PKGBUILD
+++ b/aur/libresample/PKGBUILD
@ -1,28 +0,0 @@
-# Contributor: Jonathan Liu <net147@gmail.com>
-pkgname=libresample
-pkgver=0.1.3
-pkgrel=3
-pkgdesc="A real-time library for audio sampling rate conversion"
-arch=('i686' 'x86_64')
-url="http://ccrma.stanford.edu/~jos/resample/Free_Resampling_Software.html"
-license=('LGPL2')
-options=('staticlibs')
-source=("http://ccrma.stanford.edu/~jos/gz/$pkgname-$pkgver.tgz"
-        "Makefile.in.patch")
-md5sums=('99bc5ea15ef76b83e5655a10968f674b'
-         '9c18aec34f5e16baac888bd0926270e7')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/Makefile.in.patch"
-  ./configure --prefix=/usr
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make libresample.a
-  install -D -m644 include/libresample.h "$pkgdir/usr/include/libresample.h"
-  install -D -m644 libresample.a "$pkgdir/usr/lib/libresample.a"
-}
-
-# vim:set ts=2 sw=2 et:
--- a/aur/mediatomb/PKGBUILD
+++ b/aur/mediatomb/PKGBUILD
@ -1,69 +0,0 @@
-# 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=13
-pkgdesc="Free UPnP/DLNA media server"
-arch=('i686' 'x86_64' 'armv6h')
-url="http://mediatomb.cc/"
-license=('GPL')
-depends=('file' 'curl' 'ffmpegthumbnailer' 'libexif' 'libmp4v2' 'sqlite3' 'taglib' 'libmariadbclient' 'js185')
-optdepends=('mariadb: to store your music database in mariadb')
-backup=('etc/conf.d/mediatomb')
-install=mediatomb.install
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
-        'mediatomb.service'
-        'mediatomb-mariadb.service'
-        'mediatomb.conf'
-        'gcc46.patch'
-        'tonewjs.patch'
-        'jsparse.patch'
-        'libav_0.7_support.patch'
-        'libmp4v2_191_p497.patch'
-        'libavformat.patch'
-        'symlinks.patch')
-sha256sums=('31163c34a7b9d1c9735181737cb31306f29f1f2a0335fb4f53ecccf8f62f11cd'
-            'e46de674e49aa85116a8ff127908f7bac21198ce7625404004b8b7832eccd3f4'
-            '9c917f0d6e568ce0ad77c0ed17e4bbaabc0e7a1c0a3e4772b786fb1565db9768'
-            '70e4a4b89cef9a7f6f5f800e1793a6cb807f52b39e5a17d0a91356608b95e62d'
-            '0c02a20032f0c296800b1bb9644638970c2dedbc5ab7141d66a637235e9da6ce'
-            '2cd8f5628c3a38b290526f008bae351b90211825f86e5959bf95f140748de574'
-            'd9a3062858900d32b977f0d50d168fd7d36785b6ecc038c019e661e27f7b1c17'
-            'c6523e8bf5e2da89b7475d6777ef9bffe7d089752ef2f7b27b5e39a4130fb0ff'
-            'd39c2f9aab051c5447461718fd0ec72cf5982f6c920a4a985a50831f34babe84'
-            '76b11706d70ed8f5e157d96ca441c90c46c42176102fcb651b4ab1102b61bfee'
-            '72f7532d7cd827ab655df652d2912175739fe16d2b1ad989d987a0b147a1d2e8')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/gcc46.patch"
-  patch -Np1 -i "$srcdir/tonewjs.patch"
-  patch -Np1 -i "$srcdir/jsparse.patch"
-  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 \
-              --enable-libmagic \
-              --enable-libjs \
-              --enable-ffmpeg
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-
-  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/gcc46.patch
+++ b/aur/mediatomb/gcc46.patch
@ -1,10 +0,0 @@
--- a/src/zmm/object.h
-+++ b/src/zmm/object.h
-@@ -33,6 +33,7 @@
- #define __ZMM_OBJECT_H__
- 
- #include <new> // for size_t
-+#include <cstddef>
- #include "atomic.h"
- 
- namespace zmm
--- a/aur/mediatomb/jsparse.patch
+++ b/aur/mediatomb/jsparse.patch
@ -1,144 +0,0 @@
-diff -rup mediatomb-0.12.1/src/scripting/js_functions.cc ../mediatomb-0.12.1/src/scripting/js_functions.cc
--- mediatomb-0.12.1/src/scripting/js_functions.cc	2011-06-29 21:51:13.641025479 -0400
-+++ ../mediatomb-0.12.1/src/scripting/js_functions.cc	2011-06-29 21:49:21.071800273 -0400
-@@ -51,15 +51,28 @@ extern "C" {
- JSBool 
- js_print(JSContext *cx, uintN argc, jsval *argv)
- {
-    uintN i;
-+    uintN i, j;
-     JSString *str;
- 
-     for (i = 0; i < argc; i++) 
-     {
-        str = JS_ValueToString(cx, argv[i]);
-+    	String fmtStr;
-+    	for (j = 0; j < argc; j++)
-+    	{
-+    		if (j == i)
-+    			fmtStr = fmtStr + "S";
-+    		else
-+    			fmtStr = fmtStr + "*";
-+    	}
-+    	if(!JS_ConvertArguments(cx, 1, JS_ARGV(cx, argv), fmtStr.c_str(), &str))
-+		{
-+			log_debug("Could not parse input arguments\n");
-+			return JS_TRUE;
-+		}
-+
-         if (!str)
-             return JS_TRUE;
-        argv[i] = STRING_TO_JSVAL(str);
-+
-         char * log_str = JS_EncodeString(cx, str);
-         log_js("%s\n", log_str);
-         JS_free(cx, log_str);
-@@ -116,24 +129,54 @@ js_addCdsObject(JSContext *cx, uintN arg
- {
-     try
-     {
-        jsval arg;
-        JSString *str;
-        String path;
-        String containerclass;
-+    	// Inputs from native code
-+        JSObject *js_cds_obj = NULL;
-+        JSString *str =  NULL;
-+        JSString *cont = NULL;
- 
-        JSObject *js_cds_obj;
-+        String path = nil;
-+        String containerclass = nil;
-+
-+        JSObject *obj = JS_THIS_OBJECT(cx, argv);
-         JSObject *js_orig_obj = NULL;
-         Ref<CdsObject> orig_object;
- 
-         Ref<StringConverter> p2i;
-         Ref<StringConverter> i2i;
-+        switch (argc)
-+        {
-+        case 0:
-+        	log_debug("No input arguments given\n");
-+        	return JS_FALSE;
-+        case 1:
-+			if(!JS_ConvertArguments(cx, 1, JS_ARGV(cx, argv), "o", &js_cds_obj))
-+			{
-+				log_debug("Could not parse input arguments\n");
-+				return JS_TRUE;
-+			}
-+			break;
-+        case 2:
-+        	if(!JS_ConvertArguments(cx, 2, JS_ARGV(cx, argv), "oS", &js_cds_obj, &str))
-+			{
-+				log_debug("Could not parse input arguments\n");
-+				return JS_TRUE;
-+			}
-+			break;
-+        default:
-+        	if(!JS_ConvertArguments(cx, 3, JS_ARGV(cx, argv), "oSS", &js_cds_obj, &str, &cont))
-+			{
-+				log_debug("Could not parse input arguments\n");
-+				return JS_TRUE;
-+			}
-+			break;
-+        }
- 
-        Script *self = (Script *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv));
-+        Script *self = (Script *)JS_GetPrivate(cx, obj);
- 
-         if (self == NULL)
-         {
-             log_debug("Could not retrieve class instance from global object\n");
-            return JS_FALSE;
-+            return JS_TRUE;
-         }
- 
-         if (self->whoami() == S_PLAYLIST)
-@@ -144,23 +187,14 @@ js_addCdsObject(JSContext *cx, uintN arg
-         {
-             i2i = StringConverter::i2i();
-         }
- 
-        arg = argv[0];
-        if (!JSVAL_IS_OBJECT(arg))
-            return JS_TRUE;
-        if (!JS_ValueToObject(cx, arg, &js_cds_obj))
-            return JS_TRUE;
- 
-        // root it
-        argv[0] = OBJECT_TO_JSVAL(js_cds_obj);
- 
-        str = JS_ValueToString(cx, argv[1]);
-         if (!str)
-             path = _("/");
-         else
-             path = JS_EncodeString(cx, str);
- 
-        JSString *cont = JS_ValueToString(cx, argv[2]);
-+
-         if (cont)
-         {
-             containerclass = JS_EncodeString(cx, cont);
-@@ -169,9 +203,9 @@ js_addCdsObject(JSContext *cx, uintN arg
-         }
- 
-         if (self->whoami() == S_PLAYLIST)
-            js_orig_obj = self->getObjectProperty(JS_THIS_OBJECT(cx, argv), _("playlist"));
-+            js_orig_obj = self->getObjectProperty(obj, _("playlist"));
-         else if (self->whoami() == S_IMPORT)
-            js_orig_obj = self->getObjectProperty(JS_THIS_OBJECT(cx, argv), _("orig"));
-+            js_orig_obj = self->getObjectProperty(obj, _("orig"));
-         
-         if (js_orig_obj == NULL)
-         {
-@@ -179,9 +213,6 @@ js_addCdsObject(JSContext *cx, uintN arg
-             return JS_TRUE;
-         }
- 
-        // root it
-        argv[1] = OBJECT_TO_JSVAL(js_orig_obj);
-
-         orig_object = self->jsObject2cdsObject(js_orig_obj, self->getProcessedObject());
-         if (orig_object == nil)
-             return JS_TRUE;
--- a/aur/mediatomb/libav_0.7_support.patch
+++ b/aur/mediatomb/libav_0.7_support.patch
@ -1,64 +0,0 @@
-=== modified file 'src/metadata/ffmpeg_handler.cc'
--- old/src/metadata/ffmpeg_handler.cc	2010-08-25 17:07:03 +0000
-+++ new/src/metadata/ffmpeg_handler.cc	2011-05-19 04:33:32 +0000
-@@ -89,6 +89,33 @@
- 
- 	Ref<StringConverter> sc = StringConverter::m2i();
-     
-+	/* Tabs are 4 characters here */
-+	typedef struct {const char *avname; metadata_fields_t field;} mapping_t;
-+	static const mapping_t mapping[] =
-+	{
-+		{"title",   M_TITLE},
-+		{"artist",  M_ARTIST},
-+		{"album",   M_ALBUM},
-+		{"date",    M_DATE},
-+		{"genre",   M_GENRE},
-+		{"comment", M_DESCRIPTION},
-+		{"track",   M_TRACKNUMBER},
-+		{NULL,      M_MAX},
-+	};
-+
-+	if (!pFormatCtx->metadata)
-+		return;
-+	for (const mapping_t *m = mapping; m->avname != NULL; m++)
-+	{
-+		AVMetadataTag *tag = NULL;
-+		tag = av_metadata_get(pFormatCtx->metadata, m->avname, NULL, 0);
-+		if (tag && tag->value && tag->value[0])
-+		{
-+			log_debug("Added metadata %s: %s\n", m->avname, tag->value);
-+			item->setMetadata(MT_KEYS[m->field].upnp, sc->convert(tag->value));
-+		}
-+	}
-+	/* Old algorithm (doesn't work with libav >= 0.7)
- 	if (strlen(pFormatCtx->title) > 0) 
-     {
- 	    log_debug("Added metadata title: %s\n", pFormatCtx->title);
-@@ -131,6 +158,7 @@
-         item->setMetadata(MT_KEYS[M_TRACKNUMBER].upnp, 
-                           sc->convert(String::from(pFormatCtx->track)));
- 	}
-+	*/
- }
- 
- // ffmpeg library calls
-@@ -178,7 +206,7 @@
- 	for(i=0; i<pFormatCtx->nb_streams; i++) 
-     {
- 		AVStream *st = pFormatCtx->streams[i];
-		if((st != NULL) && (videoset == false) && (st->codec->codec_type == CODEC_TYPE_VIDEO))
-+		if((st != NULL) && (videoset == false) && (st->codec->codec_type == AVMEDIA_TYPE_VIDEO))
-         {
-             if (st->codec->codec_tag > 0)
-             {
-@@ -209,7 +237,7 @@
-                 *y = st->codec->height;
- 			}
- 		} 
-		if(st->codec->codec_type == CODEC_TYPE_AUDIO) 
-+		if(st->codec->codec_type == AVMEDIA_TYPE_AUDIO) 
-         {
- 			// Increase number of audiochannels
- 			audioch++;
-
--- a/aur/mediatomb/libavformat.patch
+++ b/aur/mediatomb/libavformat.patch
@ -1,52 +0,0 @@
--- mediatomb-0.12.1.orig/src/metadata/ffmpeg_handler.cc	2012-06-18 02:50:35.000000000 -0400
-+++ mediatomb-0.12.1/src/metadata/ffmpeg_handler.cc	2012-06-18 02:59:02.000000000 -0400
-@@ -107,8 +107,8 @@
- 		return;
- 	for (const mapping_t *m = mapping; m->avname != NULL; m++)
- 	{
-		AVMetadataTag *tag = NULL;
-		tag = av_metadata_get(pFormatCtx->metadata, m->avname, NULL, 0);
-+		AVDictionaryEntry *tag = NULL;
-+		tag = av_dict_get(pFormatCtx->metadata, m->avname, NULL, 0);
- 		if (tag && tag->value && tag->value[0])
- 		{
- 			log_debug("Added metadata %s: %s\n", m->avname, tag->value);
-@@ -278,7 +278,7 @@
-     int x = 0;
-     int y = 0;
- 
-	AVFormatContext *pFormatCtx;
-+	AVFormatContext *pFormatCtx = avformat_alloc_context();
- 	
- 	// Suppress all log messages
- 	av_log_set_callback(FfmpegNoOutputStub);
-@@ -286,15 +286,15 @@
- 	// Register all formats and codecs
-     av_register_all();
- 
-    // Open video file
-    if (av_open_input_file(&pFormatCtx, 
-                          item->getLocation().c_str(), NULL, 0, NULL) != 0)
-+	// Open video file
-+    if (avformat_open_input(&pFormatCtx, 
-+                          item->getLocation().c_str(), NULL, NULL) != 0)
-         return; // Couldn't open file
- 
-     // Retrieve stream information
-    if (av_find_stream_info(pFormatCtx) < 0)
-+    if (avformat_find_stream_info(pFormatCtx,NULL) < 0)
-     {
-        av_close_input_file(pFormatCtx);
-+        avformat_close_input(&pFormatCtx);
-         return; // Couldn't find stream information
-     }   
- 	// Add metadata using ffmpeg library calls
-@@ -303,7 +303,7 @@
- 	addFfmpegResourceFields(item, pFormatCtx, &x, &y);
- 	
-     // Close the video file
-    av_close_input_file(pFormatCtx);
-+    avformat_close_input(&pFormatCtx);
- }
- 
- Ref<IOHandler> FfmpegHandler::serveContent(Ref<CdsItem> item, int resNum, off_t *data_size)
--- a/aur/mediatomb/libmp4v2_191_p497.patch
+++ b/aur/mediatomb/libmp4v2_191_p497.patch
@ -1,187 +0,0 @@
-diff -urN old/src/metadata/libmp4v2_handler.cc new/src/metadata/libmp4v2_handler.cc
--- old/src/metadata/libmp4v2_handler.cc	2012-04-05 01:46:26.000000000 +0200
-+++ new/src/metadata/libmp4v2_handler.cc	2012-04-05 02:01:24.000000000 +0200
-@@ -65,29 +65,28 @@
- static void addMetaField(metadata_fields_t field, MP4FileHandle mp4, Ref<CdsItem> item)
- {
-     String value;
-    char*  mp4_retval = NULL;
-    u_int16_t track;
-    u_int16_t total_tracks;
- 
-     Ref<StringConverter> sc = StringConverter::i2i();
-     
-+    const MP4Tags* new_tags = MP4TagsAlloc();
-+
-+    if (!MP4TagsFetch(new_tags, mp4))
-+        return;
-+
-     switch (field)
-     {
-         case M_TITLE:
-            MP4GetMetadataName(mp4, &mp4_retval);
-+            value = new_tags->name;
-             break;
-         case M_ARTIST:
-            MP4GetMetadataArtist(mp4, &mp4_retval);
-+            value = new_tags->artist;
-             break;
-         case M_ALBUM:
-            MP4GetMetadataAlbum(mp4, &mp4_retval);
-+            value = new_tags->album;
-             break;
-         case M_DATE:
-            MP4GetMetadataYear(mp4, &mp4_retval);
-            if (mp4_retval)
-+            value = new_tags->releaseDate;
-+            if (value.length() > 0)
-             {
-                value = mp4_retval;
-                free(mp4_retval);
-                 if (string_ok(value))
-                     value = value + "-01-01";
-                 else
-@@ -95,34 +94,31 @@
-             }
-             break;
-         case M_GENRE:
-            MP4GetMetadataGenre(mp4, &mp4_retval);
-+            value = new_tags->genre;
-             break;
-         case M_DESCRIPTION:
-            MP4GetMetadataComment(mp4, &mp4_retval);
-+            value = new_tags->comments;
-             break;
-         case M_TRACKNUMBER:
-            MP4GetMetadataTrack(mp4, &track, &total_tracks);
-            if (track > 0)
-+            if (new_tags->track)
-             {
-                value = String::from(track);
-                item->setTrackNumber((int)track);
-+                value = String::from(new_tags->track->index);
-+                item->setTrackNumber((int)new_tags->track->index);
-             }
-             else
-+			{
-+			    MP4TagsFree( new_tags );
-                 return;
-+            }
-             break;
-         default:
-+			MP4TagsFree( new_tags );
-             return;
-     }
- 
-    if ((field != M_DATE) && (field != M_TRACKNUMBER) && 
-        (mp4_retval))
-    {
-        value = mp4_retval;
-        free(mp4_retval);
-    }
-    
-+	MP4TagsFree( new_tags );
-     value = trim_string(value);
-    
-+
-     if (string_ok(value))
-     {
-         item->setMetadata(MT_KEYS[field].upnp, sc->convert(value));
-@@ -190,14 +186,19 @@
-         }
- 
- #if defined(HAVE_MAGIC)
-        u_int8_t *art_data;
-        u_int32_t art_data_len;
-+        void *art_data = 0;
-+        u_int32_t art_data_len = 0;
-         String art_mimetype;
-+
-+        const MP4Tags* new_tags = MP4TagsAlloc();
-+        MP4TagsFetch(new_tags, mp4);
-+        if (new_tags->artworkCount)
-+        {
-+            art_data = new_tags->artwork->data;
-+            art_data_len = new_tags->artwork->size;
-+        }
- #ifdef HAVE_MP4_GET_METADATA_COVER_ART_COUNT
-        if (MP4GetMetadataCoverArtCount(mp4) && 
-            MP4GetMetadataCoverArt(mp4, &art_data, &art_data_len))
-#else
-            MP4GetMetadataCoverArt(mp4, &art_data, &art_data_len);
-+        if (new_tags->artworkCount && art_data_len > 0) 
- #endif
-         {
-             if (art_data)
-@@ -211,11 +212,10 @@
-                 }
-                 catch (Exception ex)
-                 {
-                    free(art_data);
-+                    MP4TagsFree(new_tags);
-                     throw ex;
-                 }
- 
-                free(art_data);
-                 if (art_mimetype != _(MIMETYPE_DEFAULT))
-                 {
-                     Ref<CdsResource> resource(new CdsResource(CH_MP4));
-@@ -225,6 +225,7 @@
-                 }
-             }
-         }
-+        MP4TagsFree(new_tags);
- #endif
-         MP4Close(mp4);
-     }
-@@ -249,26 +250,35 @@
- 
-     if (ctype != ID3_ALBUM_ART)
-         throw _Exception(_("LibMP4V2Handler: got unknown content type: ") + ctype);
-+
-+    const MP4Tags* new_tags = MP4TagsAlloc();
-+    if (MP4TagsFetch(new_tags, mp4))
-+    {
- #ifdef HAVE_MP4_GET_METADATA_COVER_ART_COUNT
-    if (!MP4GetMetadataCoverArtCount(mp4))
-        throw _Exception(_("LibMP4V2Handler: resource has no album art information"));
-+        if (!new_tags->artworkCount)
-+            throw _Exception(_("LibMP4V2Handler: resource has no album art information"));
- #endif
-    u_int8_t *art_data;
-    u_int32_t art_data_len;
-    if (MP4GetMetadataCoverArt(mp4, &art_data, &art_data_len))
-    {
-        if (art_data)
-+        void *art_data = 0;
-+        u_int32_t art_data_len;
-+
-+        const MP4TagArtwork* art = new_tags->artwork;
-+        art_data = art->data;
-+        art_data_len = art->size;
-+        if (art)
-         {
-            *data_size = (off_t)art_data_len;
-            Ref<IOHandler> h(new MemIOHandler((void *)art_data, art_data_len));
-            free(art_data);
-            return h;
-+            if (art_data)
-+            {
-+                *data_size = (off_t)art_data_len;
-+                Ref<IOHandler> h(new MemIOHandler(art_data, art_data_len));
-+                MP4TagsFree(new_tags);
-+                return h;
-+            }
-         }
-+        MP4TagsFree(new_tags);
-     }
-        
-     throw _Exception(_("LibMP4V2Handler: could not serve album art "
-                           "for file") + item->getLocation() + 
-                           " - embedded image not found");
-+            "for file") + item->getLocation() + 
-+        " - embedded image not found");
- }
- 
- #endif // HAVE_LIBMP4V2
-De binära filerna old/src/metadata/.libmp4v2_handler.cc.swp och new/src/metadata/.libmp4v2_handler.cc.swp skiljer
--- a/aur/mediatomb/mediatomb-mariadb.service
+++ b/aur/mediatomb/mediatomb-mariadb.service
@ -1,13 +0,0 @@
-[Unit]
-Description=MediaTomb Daemon using MariaDB
-After=mysqld.target network.target
-
-[Service]
-EnvironmentFile=/etc/conf.d/mediatomb
-ExecStart=/usr/bin/mediatomb -p $MT_PORT -u $MT_USER -g $MT_GROUP \
-  -P $MT_PIDFILE -l $MT_LOGFILE -m $MT_HOME -f $MT_CFGDIR $MT_OPTIONS
-Restart=on-failure
-RestartSec=5
-
-[Install]
-WantedBy=multi-user.target
--- a/aur/mediatomb/mediatomb.conf
+++ b/aur/mediatomb/mediatomb.conf
@ -1,23 +0,0 @@
-#
-# Parameters to be passed to mediatomb
-#
-
-# Port to listen on
-MT_PORT='50500'
-
-# User and group to run as
-MT_USER='mediatomb'
-MT_GROUP='mediatomb'
-
-# Location of the PID file
-MT_PIDFILE='/var/run/mediatomb.pid'
-
-# Location of the log file
-MT_LOGFILE='/var/log/mediatomb.log'
-
-# Location of the config file/database
-MT_HOME='/var/lib/mediatomb'
-MT_CFGDIR='.mediatomb'
-
-# User defined command line options
-MT_OPTIONS=''
--- a/aur/mediatomb/mediatomb.install
+++ b/aur/mediatomb/mediatomb.install
@ -1,20 +0,0 @@
-post_install() {
-  post_upgrade
-  passwd -l mediatomb &>/dev/null
-  echo 'Warning: the MediaTomb web interface exposes your filesystem to the network'
-  echo 'For maximum security, set <ui enabled="no"> in your MediaTomb config file'
-}
-
-post_upgrade() {
-  # create user/group that the daemon will run as by default, do not delete this on uninstall, as it will own files
-  getent group mediatomb >/dev/null || groupadd -g 241 mediatomb &>/dev/null
-  getent passwd mediatomb >/dev/null || useradd -c 'Mediatomb DLNA Server' -u 241 -g mediatomb -b '/var/lib' -m -s /bin/false mediatomb &>/dev/null
-
-  echo 'Attention: By default, MediaTomb now runs as its own user: mediatomb.'
-  echo 'Ensuring ownership of /var/lib/mediatomb is mediatomb:mediatomb...'
-  chown -R mediatomb:mediatomb /var/lib/mediatomb &>/dev/null
-  echo
-  echo 'Please note that the old rc script has been replaced with systemd service files.'
-  echo
-}
-
--- a/aur/mediatomb/mediatomb.service
+++ b/aur/mediatomb/mediatomb.service
@ -1,13 +0,0 @@
-[Unit]
-Description=MediaTomb Daemon
-After=network.target
-
-[Service]
-EnvironmentFile=/etc/conf.d/mediatomb
-ExecStart=/usr/bin/mediatomb -p $MT_PORT -u $MT_USER -g $MT_GROUP \
-  -P $MT_PIDFILE -l $MT_LOGFILE -m $MT_HOME -f $MT_CFGDIR $MT_OPTIONS
-Restart=on-failure
-RestartSec=5
-
-[Install]
-WantedBy=multi-user.target
--- a/aur/mediatomb/symlinks.patch
+++ b/aur/mediatomb/symlinks.patch
@ -1,42 +0,0 @@
--- 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/mediatomb/tonewjs.patch
+++ b/aur/mediatomb/tonewjs.patch
@ -1,564 +0,0 @@
-diff -up mediatomb-0.12.1-back/build/Makefile.in.tonewjs mediatomb-0.12.1-back/build/Makefile.in
--- mediatomb-0.12.1-back/build/Makefile.in.tonewjs	2010-04-08 00:40:15.000000000 +0200
-+++ mediatomb-0.12.1-back/build/Makefile.in	2011-04-19 17:17:01.343509944 +0200
-@@ -257,7 +257,7 @@ CURL_LIBS = @CURL_LIBS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
- CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-+CXXFLAGS = -fpermissive @CXXFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DB_AUTOCREATE_OPTION_ENABLED = @DB_AUTOCREATE_OPTION_ENABLED@
- DB_AUTOCREATE_OPTION_REQUESTED = @DB_AUTOCREATE_OPTION_REQUESTED@
-diff -up mediatomb-0.12.1-back/src/scripting/import_script.cc.tonewjs mediatomb-0.12.1-back/src/scripting/import_script.cc
--- mediatomb-0.12.1-back/src/scripting/import_script.cc.tonewjs	2011-04-18 13:10:48.000000000 +0200
-+++ mediatomb-0.12.1-back/src/scripting/import_script.cc	2011-04-18 13:29:36.000000000 +0200
-@@ -53,8 +53,8 @@ ImportScript::ImportScript(Ref<Runtime> 
-     try 
-     {
-         load(scriptPath);
-        root = JS_NewScriptObject(cx, script);
-        JS_AddNamedRoot(cx, &root, "ImportScript");
-+        root = JS_NewObject(cx, NULL, script, NULL);
-+        JS_AddNamedObjectRoot(cx, &root, "ImportScript");
-     }
-     catch (Exception ex)
-     {
-@@ -117,7 +117,7 @@ ImportScript::~ImportScript()
- #endif
-     
-     if (root)
-        JS_RemoveRoot(cx, &root);
-+        JS_RemoveObjectRoot(cx, &root);
- 
- #ifdef JS_THREADSAFE
-     JS_EndRequest(cx);
-diff -up mediatomb-0.12.1-back/src/scripting/js_functions.cc.tonewjs mediatomb-0.12.1-back/src/scripting/js_functions.cc
--- mediatomb-0.12.1-back/src/scripting/js_functions.cc.tonewjs	2011-04-18 13:29:55.000000000 +0200
-+++ mediatomb-0.12.1-back/src/scripting/js_functions.cc	2011-04-19 16:48:04.009229611 +0200
-@@ -49,7 +49,7 @@ using namespace zmm;
- extern "C" {
- 
- JSBool 
-js_print(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-+js_print(JSContext *cx, uintN argc, jsval *argv)
- {
-     uintN i;
-     JSString *str;
-@@ -60,19 +60,21 @@ js_print(JSContext *cx, JSObject *obj, u
-         if (!str)
-             return JS_TRUE;
-         argv[i] = STRING_TO_JSVAL(str);
-        log_js("%s\n", JS_GetStringBytes(str));
-+        char * log_str = JS_EncodeString(cx, str);
-+        log_js("%s\n", log_str);
-+        JS_free(cx, log_str);
-     }
-     return JS_TRUE;
- }
- 
- JSBool
-js_copyObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-+js_copyObject(JSContext *cx, uintN argc, jsval *argv)
- {
-     jsval arg;
-     JSObject *js_cds_obj;
-     JSObject *js_cds_clone_obj;
- 
-    Script *self = (Script *)JS_GetPrivate(cx, obj);
-+    Script *self = (Script *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv));
- 
-     try
-     {
-@@ -91,7 +93,7 @@ js_copyObject(JSContext *cx, JSObject *o
- 
-         self->cdsObject2jsObject(cds_obj, js_cds_clone_obj);
- 
-        *rval = OBJECT_TO_JSVAL(js_cds_clone_obj);
-+        JS_SET_RVAL(cx, argv, OBJECT_TO_JSVAL(js_cds_clone_obj));
- 
-         return JS_TRUE;
- 
-@@ -110,7 +112,7 @@ js_copyObject(JSContext *cx, JSObject *o
- }
- 
- JSBool
-js_addCdsObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-+js_addCdsObject(JSContext *cx, uintN argc, jsval *argv)
- {
-     try
-     {
-@@ -126,7 +128,7 @@ js_addCdsObject(JSContext *cx, JSObject 
-         Ref<StringConverter> p2i;
-         Ref<StringConverter> i2i;
- 
-        Script *self = (Script *)JS_GetPrivate(cx, obj);
-+        Script *self = (Script *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv));
- 
-         if (self == NULL)
-         {
-@@ -156,20 +158,20 @@ js_addCdsObject(JSContext *cx, JSObject 
-         if (!str)
-             path = _("/");
-         else
-            path = JS_GetStringBytes(str);
-+            path = JS_EncodeString(cx, str);
- 
-         JSString *cont = JS_ValueToString(cx, argv[2]);
-         if (cont)
-         {
-            containerclass = JS_GetStringBytes(cont);
-+            containerclass = JS_EncodeString(cx, cont);
-             if (!string_ok(containerclass) || containerclass == "undefined")
-                 containerclass = nil;
-         }
- 
-         if (self->whoami() == S_PLAYLIST)
-            js_orig_obj = self->getObjectProperty(obj, _("playlist"));
-+            js_orig_obj = self->getObjectProperty(JS_THIS_OBJECT(cx, argv), _("playlist"));
-         else if (self->whoami() == S_IMPORT)
-            js_orig_obj = self->getObjectProperty(obj, _("orig"));
-+            js_orig_obj = self->getObjectProperty(JS_THIS_OBJECT(cx, argv), _("orig"));
-         
-         if (js_orig_obj == NULL)
-         {
-@@ -285,8 +287,7 @@ js_addCdsObject(JSContext *cx, JSObject 
-         JSString *str2 = JS_NewStringCopyN(cx, tmp.c_str(), tmp.length());
-         if (!str2)
-             return JS_TRUE;
-        *rval = STRING_TO_JSVAL(str2);
-
-+        JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(str2)); 
-         return JS_TRUE;
-     }
-     catch (ServerShutdownException se)
-@@ -302,7 +303,7 @@ js_addCdsObject(JSContext *cx, JSObject 
-     return JS_TRUE;
- }
- 
-static JSBool convert_charset_generic(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval, charset_convert_t chr)
-+static JSBool convert_charset_generic(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, charset_convert_t chr)
- {
-     try
-     {
-@@ -321,7 +322,7 @@ static JSBool convert_charset_generic(JS
-         {
-             str = JS_ValueToString(cx, argv[0]);
-             if (str)
-                result = JS_GetStringBytes(str);
-+                result = JS_EncodeString(cx, str);
-         }
- 
-         if (result != nil)
-@@ -330,7 +331,7 @@ static JSBool convert_charset_generic(JS
-             JSString *str2 = JS_NewStringCopyN(cx, result.c_str(), result.length());
-             if (!str2)
-                 return JS_TRUE;
-            *rval = STRING_TO_JSVAL(str2);
-+            JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(str2));
-         }
-     }
-     catch (ServerShutdownException se)
-@@ -347,24 +348,23 @@ static JSBool convert_charset_generic(JS
- }
- 
- 
-JSBool js_f2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-+JSBool js_f2i(JSContext *cx, uintN argc, jsval *argv)
- {
-     return convert_charset_generic(cx, obj, argc, argv, rval, F2I);
-+     return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, F2I);
- }
- 
-JSBool js_m2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-+JSBool js_m2i(JSContext *cx, uintN argc, jsval *argv)
- {
-     return convert_charset_generic(cx, obj, argc, argv, rval, M2I);
-}
-+     return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, M2I); }
- 
-JSBool js_p2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-+JSBool js_p2i(JSContext *cx, uintN argc, jsval *argv)
- {
-     return convert_charset_generic(cx, obj, argc, argv, rval, P2I);
-+     return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, P2I);
- }
- 
-JSBool js_j2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-+JSBool js_j2i(JSContext *cx, uintN argc, jsval *argv)
- {
-     return convert_charset_generic(cx, obj, argc, argv, rval, J2I);
-+     return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, J2I);
- }
- 
- } // extern "C"
-diff -up mediatomb-0.12.1-back/src/scripting/js_functions.h.tonewjs mediatomb-0.12.1-back/src/scripting/js_functions.h
--- mediatomb-0.12.1-back/src/scripting/js_functions.h.tonewjs	2010-03-25 15:58:05.000000000 +0100
-+++ mediatomb-0.12.1-back/src/scripting/js_functions.h	2011-04-18 13:59:29.000000000 +0200
-@@ -40,18 +40,18 @@
- extern "C" {
- 
- /// \brief Log output.
-JSBool js_print(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-+JSBool js_print(JSContext *cx, uintN argc, jsval *argv);
- 
- /// \brief Adds an object to the database.
-JSBool js_addCdsObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-+JSBool js_addCdsObject(JSContext *cx, uintN argc, jsval *argv);
- 
- /// \brief Makes a copy of an CDS object.
-JSBool js_copyObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-+JSBool js_copyObject(JSContext *cx, uintN argc, jsval *argv);
- 
-JSBool js_f2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool js_m2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool js_p2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool js_j2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-+JSBool js_f2i(JSContext *cx, uintN argc, jsval *argv);
-+JSBool js_m2i(JSContext *cx, uintN argc, jsval *argv);
-+JSBool js_p2i(JSContext *cx, uintN argc, jsval *argv);
-+JSBool js_j2i(JSContext *cx, uintN argc, jsval *argv);
- 
- } // extern "C"
- 
-diff -up mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc.tonewjs mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc
--- mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc.tonewjs	2011-04-18 13:34:14.000000000 +0200
-+++ mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc	2011-04-18 13:51:59.000000000 +0200
-@@ -46,9 +46,9 @@ using namespace zmm;
- extern "C" {
- 
- static JSBool
-js_readln(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-+js_readln(JSContext *cx, uintN argc, jsval *argv)
- {
-    PlaylistParserScript *self = (PlaylistParserScript *)JS_GetPrivate(cx, obj);
-+    PlaylistParserScript *self = (PlaylistParserScript *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv));
- 
-     String line;
-     
-@@ -69,7 +69,7 @@ js_readln(JSContext *cx, JSObject *obj, 
- 
-     JSString *jsline = JS_NewStringCopyZ(cx, line.c_str());
- 
-    *rval = STRING_TO_JSVAL(jsline);
-+    JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(jsline));
-   
-     return JS_TRUE;
- }
-@@ -93,8 +93,8 @@ PlaylistParserScript::PlaylistParserScri
- 
-         String scriptPath = ConfigManager::getInstance()->getOption(CFG_IMPORT_SCRIPTING_PLAYLIST_SCRIPT); 
-         load(scriptPath);
-        root = JS_NewScriptObject(cx, script);
-        JS_AddNamedRoot(cx, &root, "PlaylistScript");
-+        root = JS_NewObject(cx, NULL, script, NULL);
-+        JS_AddNamedObjectRoot(cx, &root, "PlaylistScript");
-     }
-     catch (Exception ex)
-     {
-@@ -245,7 +245,7 @@ PlaylistParserScript::~PlaylistParserScr
- #endif
- 
-     if (root)
-        JS_RemoveRoot(cx, &root);
-+        JS_RemoveObjectRoot(cx, &root);
- 
- #ifdef JS_THREADSAFE
-     JS_EndRequest(cx);
-diff -up mediatomb-0.12.1-back/src/scripting/script.cc.tonewjs mediatomb-0.12.1-back/src/scripting/script.cc
--- mediatomb-0.12.1-back/src/scripting/script.cc.tonewjs	2011-04-18 13:53:07.000000000 +0200
-+++ mediatomb-0.12.1-back/src/scripting/script.cc	2011-04-19 18:26:34.460338804 +0200
-@@ -87,7 +87,7 @@ String Script::getProperty(JSObject *obj
-     str = JS_ValueToString(cx, val);
-     if (! str)
-         return nil;
-    return JS_GetStringBytes(str);
-+    return JS_EncodeString(cx, str);
- }
- 
- int Script::getBoolProperty(JSObject *obj, String name)
-@@ -427,14 +427,14 @@ static JSFunctionSpec js_global_function
-         try
-         {
-             common_script = _load(common_scr_path);
-            common_root = JS_NewScriptObject(cx, common_script);
-            JS_AddNamedRoot(cx, &common_root, "common-script");
-+            common_root = JS_NewObject(cx, NULL, common_script, NULL);
-+            JS_AddNamedObjectRoot(cx, &common_root, "common-script");
-             _execute(common_script);
-         }
-         catch (Exception e)
-         {
-             if (common_root)
-                JS_RemoveRoot(cx, &common_root);
-+                JS_RemoveObjectRoot(cx, &common_root);
- 
-             log_js("Unable to load %s: %s\n", common_scr_path.c_str(), 
-                     e.getMessage().c_str());
-@@ -460,7 +460,7 @@ Script::~Script()
-     JS_BeginRequest(cx);
- #endif
-     if (common_root)
-        JS_RemoveRoot(cx, &common_root);
-+        JS_RemoveObjectRoot(cx, &common_root);
- 
- /*
-  * scripts are unrooted and will be cleaned up by GC
-@@ -504,11 +504,11 @@ void Script::initGlobalObject()
-     static JSClass global_class =
-     {
-         "global",                                   /* name */
-        JSCLASS_HAS_PRIVATE,                        /* flags */
-+        JSCLASS_HAS_PRIVATE | JSCLASS_GLOBAL_FLAGS,/* flags */
-         JS_PropertyStub,                            /* add property */
-         JS_PropertyStub,                            /* del property */
-         JS_PropertyStub,                            /* get property */
-        JS_PropertyStub,                            /* set property */
-+        JS_StrictPropertyStub,                      /* set property */
-         JS_EnumerateStandardClasses,                /* enumerate */
-         JS_ResolveStub,                             /* resolve */
-         JS_ConvertStub,                             /* convert */
-@@ -517,7 +517,7 @@ void Script::initGlobalObject()
-     };
- 
-     /* create the global object here */
-    glob = JS_NewObject(cx, &global_class, NULL, NULL);
-+    glob = JS_NewCompartmentAndGlobalObject(cx, &global_class, NULL);
-     if (! glob)
-         throw _Exception(_("Scripting: could not initialize glboal class"));
- 
-@@ -539,12 +539,12 @@ void Script::defineFunctions(JSFunctionS
-         throw _Exception(_("Scripting: JS_DefineFunctions failed"));
- }
- 
-JSScript *Script::_load(zmm::String scriptPath)
-+JSObject *Script::_load(zmm::String scriptPath)
- {
-     if (glob == NULL)
-         initGlobalObject();
- 
-    JSScript *scr;
-+    JSObject *scr;
- 
-     String scriptText = read_text_file(scriptPath);
- 
-@@ -571,14 +571,11 @@ JSScript *Script::_load(zmm::String scri
- 
- void Script::load(zmm::String scriptPath)
- {
-    if (script)
-        JS_DestroyScript(cx, script);
-
-     script = _load((scriptPath));
- }
- 
- 
-void Script::_execute(JSScript *scr)
-+void Script::_execute(JSObject *scr)
- {
-     jsval ret_val;
- 
-@@ -662,7 +659,7 @@ Ref<CdsObject> Script::jsObject2cdsObjec
-     JSObject *js_meta = getObjectProperty(js, _("meta"));
-     if (js_meta)
-     {
-        JS_AddNamedRoot(cx, &js_meta, "meta");
-+        JS_AddNamedObjectRoot(cx, &js_meta, "meta");
-         /// \todo: only metadata enumerated in MT_KEYS is taken
-         for (int i = 0; i < M_MAX; i++)
-         {
-@@ -687,7 +684,7 @@ Ref<CdsObject> Script::jsObject2cdsObjec
-                 }
-             }
-         }
-        JS_RemoveRoot(cx, &js_meta);
-+        JS_RemoveObjectRoot(cx, &js_meta);
-     }
-     
-     // stuff that has not been exported to js
-diff -up mediatomb-0.12.1-back/src/scripting/script.h.tonewjs mediatomb-0.12.1-back/src/scripting/script.h
--- mediatomb-0.12.1-back/src/scripting/script.h.tonewjs	2011-04-18 12:56:14.000000000 +0200
-+++ mediatomb-0.12.1-back/src/scripting/script.h	2011-04-18 12:56:51.000000000 +0200
-@@ -66,8 +66,8 @@ public:
-     JSRuntime *rt;
-     JSContext *cx;
-     JSObject  *glob;
-    JSScript *script;
-    JSScript *common_script;
-+    JSObject  *script;
-+    JSObject  *common_script;
-     
- public:
-     Script(zmm::Ref<Runtime> runtime);
-@@ -115,8 +115,8 @@ private:
-     JSObject *common_root;
- 
-     void initGlobalObject();
-    JSScript *_load(zmm::String scriptPath);
-    void _execute(JSScript *scr);
-+    JSObject *_load(zmm::String scriptPath);
-+    void _execute(JSObject *scr);
-     zmm::Ref<StringConverter> _p2i;
-     zmm::Ref<StringConverter> _j2i;
-     zmm::Ref<StringConverter> _f2i;
--- mediatomb-0.12.1/configure.tonewjs	2011-07-04 20:20:00.290227110 +1200
-+++ mediatomb-0.12.1/configure	2011-07-04 20:20:28.186894644 +1200
-@@ -23784,14 +23784,14 @@ if test "x$ac_cv_lib_smjs_JS_NewObject"
- 
- else
- 
-                            LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lmozjs $ADD_PTHREAD_CFLAGS"
-                            { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs" >&5
-$as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; }
-if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then
-+                            LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lmozjs185 $ADD_PTHREAD_CFLAGS"
-+                            { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs185" >&5
-+$as_echo_n "checking for JS_NewObject in -lmozjs185... " >&6; }
-+if test "${ac_cv_lib_mozjs185_JS_NewObject+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmozjs  $LIBS"
-+LIBS="-lmozjs185  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -23835,12 +23835,12 @@ $as_echo "$ac_try_echo") >&5
- 	 test "$cross_compiling" = yes ||
- 	 $as_test_x conftest$ac_exeext
-        }; then
-  ac_cv_lib_mozjs_JS_NewObject=yes
-+  ac_cv_lib_mozjs185_JS_NewObject=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-	ac_cv_lib_mozjs_JS_NewObject=no
-+	ac_cv_lib_mozjs185_JS_NewObject=no
- fi
- 
- rm -rf conftest.dSYM
-@@ -23848,12 +23848,12 @@ rm -f core conftest.err conftest.$ac_obj
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs_JS_NewObject" >&5
-$as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; }
-if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs185_JS_NewObject" >&5
-+$as_echo "$ac_cv_lib_mozjs185_JS_NewObject" >&6; }
-+if test "x$ac_cv_lib_mozjs185_JS_NewObject" = x""yes; then
- 
-                                    JS_LIBS="-L$JS_SEARCH_LIBS -lmozjs"
-                                    MOZLIB=mozjs
-+                                    JS_LIBS="-L$JS_SEARCH_LIBS -lmozjs185"
-+                                    MOZLIB=mozjs185
- 
- else
- 
-@@ -24020,13 +24020,13 @@ if test "x$ac_cv_lib_smjs_JS_NewObject"
- else
- 
-                     unset ac_cv_lib_smjs_JS_NewObject
-                    { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs" >&5
-$as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; }
-if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then
-+                    { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs185" >&5
-+$as_echo_n "checking for JS_NewObject in -lmozjs185... " >&6; }
-+if test "${ac_cv_lib_mozjs185_JS_NewObject+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmozjs  $LIBS"
-+LIBS="-lmozjs185  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -24070,12 +24070,12 @@ $as_echo "$ac_try_echo") >&5
- 	 test "$cross_compiling" = yes ||
- 	 $as_test_x conftest$ac_exeext
-        }; then
-  ac_cv_lib_mozjs_JS_NewObject=yes
-+  ac_cv_lib_mozjs185_JS_NewObject=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-	ac_cv_lib_mozjs_JS_NewObject=no
-+	ac_cv_lib_mozjs185_JS_NewObject=no
- fi
- 
- rm -rf conftest.dSYM
-@@ -24083,12 +24083,12 @@ rm -f core conftest.err conftest.$ac_obj
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs_JS_NewObject" >&5
-$as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; }
-if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs185_JS_NewObject" >&5
-+$as_echo "$ac_cv_lib_mozjs185_JS_NewObject" >&6; }
-+if test "x$ac_cv_lib_mozjs185_JS_NewObject" = x""yes; then
- 
-                            MOZLIB=mozjs
-                            JS_LIBS="-lmozjs"
-+                            MOZLIB=mozjs185
-+                            JS_LIBS="-lmozjs185"
- 
- else
- 
-@@ -24239,15 +24239,15 @@ if test "x$ac_cv_lib_smjs_JS_NewObject"
- 
- else
- 
-                                            LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE -lmozjs"
-                                            unset ac_cv_lib_mozjs_JS_NewObject
-                                            { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs" >&5
-$as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; }
-if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then
-+                                            LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE -lmozjs185"
-+                                            unset ac_cv_lib_mozjs185_JS_NewObject
-+                                            { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs185" >&5
-+$as_echo_n "checking for JS_NewObject in -lmozjs185... " >&6; }
-+if test "${ac_cv_lib_mozjs185_JS_NewObject+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmozjs  $LIBS"
-+LIBS="-lmozjs185  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -24291,12 +24291,12 @@ $as_echo "$ac_try_echo") >&5
- 	 test "$cross_compiling" = yes ||
- 	 $as_test_x conftest$ac_exeext
-        }; then
-  ac_cv_lib_mozjs_JS_NewObject=yes
-+  ac_cv_lib_mozjs185_JS_NewObject=yes
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-	ac_cv_lib_mozjs_JS_NewObject=no
-+	ac_cv_lib_mozjs185_JS_NewObject=no
- fi
- 
- rm -rf conftest.dSYM
-@@ -24304,12 +24304,12 @@ rm -f core conftest.err conftest.$ac_obj
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs_JS_NewObject" >&5
-$as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; }
-if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs185_JS_NewObject" >&5
-+$as_echo "$ac_cv_lib_mozjs185_JS_NewObject" >&6; }
-+if test "x$ac_cv_lib_mozjs185_JS_NewObject" = x""yes; then
- 
-                                                    JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs"
-                                                    MOZLIB=mozjs
-+                                                    JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs185"
-+                                                    MOZLIB=mozjs185
- 
- else
- 
--- a/aur/mhddfs/PKGBUILD
+++ b/aur/mhddfs/PKGBUILD
@ -1,38 +0,0 @@
-# Maintainer: <n17ikh@gmail.com>
-# Contributor: <igor.mogielnicki@gmail.com>
-
-pkgname=mhddfs
-pkgver=0.1.39
-pkgrel=2
-pkgdesc="fuse filesystem that combines several mount points into a single one."
-arch=('i686' 'x86_64')
-url="http://mhddfs.uvw.ru/"
-license=('GPL3')
-depends=('fuse')
-makedepends=('uthash')
-source=(http://mhddfs.uvw.ru/downloads/${pkgname}_${pkgver}.tar.gz pthreads.patch)
-md5sums=('efc43fa9b4c1437bb233149bd624a459'
-         'd6476ffcc21897748014815c824652f7')
-
-build() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-  patch -p0 < ${srcdir}/pthreads.patch
-  make
-}
-
-package() {
-  mkdir -p $pkgdir/usr/bin \
-    $pkgdir/usr/share/doc/$pkgname \
-    $pkgdir/usr/share/man/man1
-
-  cp "$srcdir/${pkgname}-${pkgver}/mhddfs" "$pkgdir/usr/bin"
-
-  cp $srcdir/${pkgname}-${pkgver}/COPYING \
-    $srcdir/${pkgname}-${pkgver}/LICENSE \
-    $srcdir/${pkgname}-${pkgver}/README \
-    $srcdir/${pkgname}-${pkgver}/README.ru.UTF-8 \
-    $srcdir/${pkgname}-${pkgver}/ChangeLog \
-    $pkgdir/usr/share/doc/$pkgname
-
-  gzip -c $srcdir/${pkgname}-${pkgver}/mhddfs.1 > $pkgdir/usr/share/man/man1/mhddfs.1.gz
-}
--- a/aur/mhddfs/pthreads.patch
+++ b/aur/mhddfs/pthreads.patch
@ -1,11 +0,0 @@
--- Makefile	2012-06-17 10:09:56.000000000 -0400
-+++ Makefile_new	2012-06-19 19:00:27.000000000 -0400
-@@ -28,7 +28,7 @@
- CFLAGS	+=	-DWITHOUT_XATTR
- endif
- 
-LDFLAGS	=	$(shell pkg-config fuse --libs)
-+LDFLAGS	=	-lpthread $(shell pkg-config fuse --libs)
- 
- FORTAR	=	src COPYING LICENSE README Makefile \
- 		README.ru.UTF-8 ChangeLog mhddfs.1 \
--- a/aur/netatalk/PKGBUILD
+++ b/aur/netatalk/PKGBUILD
@ -1,42 +0,0 @@
-# Maintainer: Denis Yantarev <denis dot yantarev at gmail dot com>
-# Contributor: SJ_UnderWater
-# Contributor: Dominik Dingel <mail at wodar dot de>
-# Contributor: William Udovich <nerdzrule7 at earthlink dot net>
-# Contributor: Farhan Yousaf <farhany at xaviya dot com>
-
-pkgname=netatalk
-pkgver=3.1.8
-pkgrel=1
-pkgdesc='Open-source implementation of the Apple Filing Protocol'
-arch=('i686' 'x86_64' 'armv6h' 'armv7h')
-url='http://netatalk.sourceforge.net'
-license=('GPL')
-depends=('avahi>=0.6' 'libldap' 'libgcrypt>=1.2.3' 'libevent' 'python2' 'dbus-glib' 'python2-dbus')
-replaces=('netatalk-git' 'netatalk2')
-backup=('etc/afp.conf'
-	'etc/extmap.conf')
-install=$pkgname.install
-source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2
-	python2.patch)
-md5sums=('9cab934ca32b8979f389da52d44c69c2'
-	'97bc0467dd8a866d9f0835d6440e3c19')
-
-prepare() {
-	cd "$srcdir/$pkgname-$pkgver"
-	patch -p0 < "$srcdir/python2.patch"
-}
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	autoreconf -fi
-	CFLAGS="-Wno-unused-result -O2" \
-		./configure --prefix=/usr --localstatedir=/var/state --sysconfdir=/etc \
-		--sbindir=/usr/bin --enable-silent-rules --with-init-style=systemd \
-		--with-cracklib --with-cnid-cdb-backend --enable-pgp-uam --with-libevent=no
-	make
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
-}
--- a/aur/netatalk/netatalk.install
+++ b/aur/netatalk/netatalk.install
@ -1,21 +0,0 @@
-post_install() {
-	post_upgrade
-}
-post_upgrade() {
-	if [ -f /etc/rc.conf ];then
-	if [ "`grep -E '(cnid|atalkd|afpd)' /etc/rc.conf`" ];then
-	echo '>>> Detected old netatalk daemon entries in';
-	echo '>>> /etc/rc.conf, please replace these with';
-	echo '>>> "netatalk" before restarting!';
-	else echo '>>> Add "netatalk" to your DAEMONS list';fi
-	fi
-	if [ -f /etc/avahi/services/adisk.service ] ||
-	[ -f /etc/avahi/services/afpd.service ];then
-	echo '>>> Detected old netatalk service files in';
-	echo '>>> /etc/avahi/services, please delete these';
-	echo '>>> before restarting!';fi
-	if [ -f /opt/netatalk/afp_signature.conf ] ||
-	[ -f /opt/netatalk/afp_voluuid.conf ]; then
-	echo '>>> Found *.conf in /opt/netatalk, please';
-	echo '>>> migrate these to /var/state/netatalk before restarting';fi
-}
--- a/aur/netatalk/python2.patch
+++ b/aur/netatalk/python2.patch
@ -1,8 +0,0 @@
--- contrib/shell_utils/afpstats.orig	2014-03-04 09:56:31.000000000 +0400
-+++ contrib/shell_utils/afpstats	2014-03-04 09:57:23.000000000 +0400
-@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- usage = """Usage:
- python afpstats.py
--- a/aur/openswan/PKGBUILD
+++ b/aur/openswan/PKGBUILD
@ -1,64 +0,0 @@
-# Maintainer:   AXVill
-# Contributor:  dacoit <dacoit at tuta.io>
-# Contributor:  xjpvictor Huang <ke [AT] xjpvictor [DOT] info>
-# Contributor:  uuwe
-pkgname=openswan
-pkgver=2.6.47
-pkgrel=1
-pkgdesc='Open Source implementation of IPsec for the Linux operating system'
-url='https://www.openswan.org'
-arch=('i686' 'x86_64')
-license=('GPL' 'custom')
-depends=('gmp' 'perl' 'iproute2')
-makedepends=('flex' 'bison')
-optdepends=('python2')
-conflicts=('ipsec-tools')
-options=('!makeflags')
-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 "$pkgname-$pkgver"
-
-  # Change install paths to Arch defaults
-  sed -i 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|;s|)/sbin|)/bin|' Makefile.inc
-
-  # Replace invalid init script paths with systemd script path
-  sed -i 's/^INC_RCDIRS.*/INC_RCDIRS\?\=\/usr\/lib\/systemd\/scripts/' Makefile.inc
-}
-
-build() {
-  cd "$pkgname-$pkgver"
-  make USE_XAUTH=true USE_OBJDIR=true programs || return 1
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  # Pre-create init script directory
-  mkdir -p "$pkgdir/usr/lib/systemd/scripts"
-
-  make DESTDIR="$pkgdir" install
-
-  # Change permissions in /var
-  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 service unit
-  install -Dm644 "$srcdir/openswan.service" "$pkgdir/usr/lib/systemd/system/openswan.service"
-
-  # fix manpages
-  mv "$pkgdir/usr/man" "$pkgdir/usr/share/"
-
-  # fix python2
-  sed -i '1s|python|python2|' "$pkgdir/usr/lib/openswan/verify"
-}
-md5sums=('54aa71adb46e4f1b07f3db534540058a'
-         'd8b465c10838c72e31329d65011002b6')
-
--- a/aur/openswan/openswan.service
+++ b/aur/openswan/openswan.service
@ -1,13 +0,0 @@
-[Unit]
-Description=Openswan daemon
-After=network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/lib/systemd/scripts/ipsec --start
-ExecStop=/usr/lib/systemd/scripts/ipsec --stop
-ExecReload=/usr/lib/systemd/scripts/ipsec --restart
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
--- a/aur/pioneers/PKGBUILD
+++ b/aur/pioneers/PKGBUILD
@ -1,22 +0,0 @@
-# Maintainer: bug <bug2000@gmail.com>
-# Contributor: Lone_Wolf <lonewolf@xs4all.nl>
-pkgname=pioneers
-pkgver=15.3
-pkgrel=1
-pkgdesc="A clone of the famous Siedler of Catan game"
-arch=('i686' 'x86_64')
-url="http://pio.sourceforge.net/"
-license=('GPL2')
-depends=('gtk2')
-makedepends=('pkgconfig' 'intltool' 'librsvg')
-source=(http://downloads.sourceforge.net/pio/$pkgname-$pkgver.tar.gz)
-md5sums=('00a50e39eb87de293843b33733d40bf9')
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make || return 1
-}
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
--- a/aur/pithos-git/PKGBUILD
+++ b/aur/pithos-git/PKGBUILD
@ -1,42 +0,0 @@
-# Contributor: Matthew Bauer <mjbauer95@gmail.com>
-# Contributor: TingPing <tingping@fedoraproject.org>
-# Maintainer: Steven Allen <steven@stebalien.com>
-
-_pkgname=pithos
-pkgname=$_pkgname-git
-pkgver=1.1.1.r80.g2edf730
-pkgrel=1
-pkgdesc='Native Pandora Radio client'
-arch=('any')
-url="https://pithos.github.io/"
-license=('GPL3')
-depends=('gtk3' 'python-gobject' 'libsecret' 'python-cairo'
-         'gst-plugins-good' 'gst-plugins-bad' 'gst-plugins-base')
-optdepends=('libkeybinder3: for media keys plugin'
-            'gst-plugins-ugly: MP3 playback support'
-            'libappindicator-gtk3: Unity indicator applet support'
-            'python-pacparser: PAC proxy support'
-            'python-pylast: Last.fm scrobbling support'
-            'libnotify: Notification support'
-            'python-dbus: MPRIS/Screensaver Pause/Gnome mediakeys support')
-makedepends=('git' 'automake' 'autoconf' 'intltool')
-provides=("$_pkgname")
-conflicts=("$_pkgname-bzr" "$_pkgname")
-sha256sums=('SKIP')
-source=('git+https://github.com/pithos/pithos.git')
-
-pkgver() {
-  cd "$srcdir/$_pkgname"
-  git describe --tags | sed 's/-/.r/; s/-/./'
-}
-
-build() {
-  cd "$srcdir/$_pkgname"
-  ./autogen.sh --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname"
-  DESTDIR="$pkgdir" make install
-}
--- a/aur/python-configshell-fb/PKGBUILD
+++ b/aur/python-configshell-fb/PKGBUILD
@ -1,31 +0,0 @@
-# Contributor: Johannes Dewender  arch at JonnyJD dot net 
-pkgname=('python-configshell-fb' 'python2-configshell-fb')
-_pkgname=configshell-fb
-pkgver=1.1.fb20
-pkgrel=1
-pkgdesc="python framework for building simple CLI applications (free branch)"
-arch=('any')
-url="https://github.com/agrover/configshell-fb"
-license=('Apache')
-options=()
-makedepends=('python-setuptools' 'python2-setuptools')
-source=(https://fedorahosted.org/releases/t/a/targetcli-fb/$_pkgname-$pkgver.tar.gz)
-sha256sums=('4a9f4b59ccd256a1c4d4c270be43798853a91d9fec29bd0ba006b88b7476f383')
-
-package_python-configshell-fb() {
-  depends=('python-pyparsing' 'python-urwid')
-  provides=('python-configshell')
-  conflicts=('python-configshell')
-  cd "$srcdir/$_pkgname-$pkgver"
-  python setup.py install --root="$pkgdir/" --optimize=1
-}
-
-package_python2-configshell-fb() {
-  depends=('python2-pyparsing' 'python2-urwid')
-  provides=('python2-configshell')
-  conflicts=('python2-configshell')
-  cd "$srcdir/$_pkgname-$pkgver"
-  python2 setup.py install --root="$pkgdir/" --optimize=1
-}
-
-# vim:set ts=2 sw=2 et:
--- a/aur/python-rtslib-fb/PKGBUILD
+++ b/aur/python-rtslib-fb/PKGBUILD
@ -1,53 +0,0 @@
-# Contributor: Johannes Dewender  arch at JonnyJD dot net
-pkgname=('python-rtslib-fb' 'python2-rtslib-fb')
-_pkgname=rtslib-fb
-pkgver=2.1.fb60
-pkgrel=2
-pkgdesc="free branch version of the LIO target API"
-arch=('any')
-url="https://github.com/agrover/rtslib-fb"
-license=('Apache')
-makedepends=('python-setuptools' 'python2-setuptools' 'python-pyudev' 'python2-pyudev')
-backup=()
-options=()
-install=
-source=(https://fedorahosted.org/releases/t/a/targetcli-fb/$_pkgname-$pkgver.tar.gz target.service)
-sha256sums=('11b664f02219e5108c4a996f5bc7445500912cff5696b3f51be2f6a1b243e957'
-            '74b9e5c11eab1781aa8b43680b429080ae800fbcdafd29626791b5426a4cdea8')
-
-prepare() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  #patch -p1 < ../setup-syntax.patch
-}
-
-
-package_python-rtslib-fb() {
-  depends=('python' 'python-six' 'python-pyudev')
-  conflicts=('python2-rtslib' 'targetcli-fb<=2.1.fb31')
-
-  cd "$srcdir/$_pkgname-$pkgver"
-  python setup.py install --root="$pkgdir/" --optimize=1
-
-  install -Dm 644 doc/targetctl.8 "$pkgdir/usr/share/man/man8/targetctl.8"
-  install -Dm 644 doc/saveconfig.json.5 "$pkgdir/usr/share/man/man5/saveconfig.json.5"
-
-  # arch specific
-  cd "$srcdir"
-  install -d "$pkgdir/etc/target"
-  install -d "$pkgdir/etc/target/backup"
-  # systemd
-  mkdir -p "$pkgdir/usr/lib/systemd/system"
-  cp target.service "$pkgdir/usr/lib/systemd/system/"
-}
-
-package_python2-rtslib-fb() {
-  depends=('python2' 'python2-six' 'python2-pyudev')
-  conflicts=('python2-rtslib')
-
-  cd "$srcdir/$_pkgname-$pkgver"
-  python2 setup.py install --root="$pkgdir/" --optimize=1
-  # the service file and targetctl script is in python-rtslib-fb
-  rm -r "$pkgdir/usr/bin"
-}
-
-# vim:set ts=2 sw=2 et:
--- a/aur/python-rtslib-fb/setup-syntax.patch
+++ b/aur/python-rtslib-fb/setup-syntax.patch
@ -1,26 +0,0 @@
-From 53b9e3e7da9da9a797d0b9c0b07bf869dcc7d1bf Mon Sep 17 00:00:00 2001
-From: Johannes Dewender <github@JonnyJD.net>
-Date: Tue, 26 May 2015 22:41:54 +0200
-Subject: [PATCH] fix a syntax error in setup.py
-
-Signed-off-by: Johannes Dewender <github@JonnyJD.net>
---
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 442ac06..fcbae40 100755
--- a/setup.py
-+++ b/setup.py
-@@ -28,7 +28,7 @@ setup (
-     url = 'http://github.com/agrover/rtslib-fb',
-     packages = ['rtslib_fb', 'rtslib'],
-     scripts = ['scripts/targetctl'],
-    "classifiers": [
-+    classifiers = [
-         "Programming Language :: Python",
-         "Programming Language :: Python :: 3",
-         "License :: OSI Approved :: Apache Software License",
-- 
-2.1.3
-
--- a/aur/python-rtslib-fb/target.service
+++ b/aur/python-rtslib-fb/target.service
@ -1,14 +0,0 @@
-[Unit]
-Description=Restore LIO kernel target configuration
-Requires=sys-kernel-config.mount
-After=sys-kernel-config.mount network.target local-fs.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/targetctl restore
-ExecStop=/usr/bin/targetctl clear
-SyslogIdentifier=target
-
-[Install]
-WantedBy=multi-user.target
--- a/aur/reaver-wps-svn/PKGBUILD
+++ b/aur/reaver-wps-svn/PKGBUILD
@ -1,44 +0,0 @@
-# Maintainer: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
-
-pkgname=reaver-wps-svn
-pkgver=119
-pkgrel=1
-pkgdesc="Brute force attack against Wifi Protected Setup (WPS) registrar PINs in order to recover WPA/WPA2 passphrases"
-arch=('i686' 'x86_64' 'mips64el' 'armv6h')
-url="http://code.google.com/p/reaver-wps/"
-license=('GPL')
-depends=('libpcap' 'sqlite')
-makedepends=('subversion')
-provides=('reaver-wps')
-conflicts=('reaver-wps')
-source=('svn+http://reaver-wps.googlecode.com/svn/trunk/')
-sha512sums=('SKIP')
-
-pkgver() {
-  cd "${SRCDEST}/trunk/"
-  svnversion
-}
-
-build() {
-  cd "${srcdir}/trunk/src/"
-
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd "${srcdir}/trunk/"
-  pushd src
-  install -dm755 "${pkgdir}/usr/bin/"
-  install -m755 reaver "${pkgdir}/usr/bin/"
-  install -m755 wash "${pkgdir}/usr/bin/"
-  install -dm755 "${pkgdir}/etc/reaver/"
-  install -m644 reaver.db "${pkgdir}/etc/reaver/"
-  popd
-  pushd docs
-  install -dm755 "${pkgdir}/usr/share/man/man1/"
-  install -m644 reaver.1.gz "${pkgdir}/usr/share/man/man1/"
-  popd
-}
-
-# vim:set ts=2 sw=2 et:
--- a/aur/targetcli-fb/PKGBUILD
+++ b/aur/targetcli-fb/PKGBUILD
@ -1,36 +0,0 @@
-# Contributor: Johannes Dewender  arch at JonnyJD dot net
-pkgname=targetcli-fb
-pkgver=2.1.fb43
-pkgrel=1
-pkgdesc="free branch of the targetcli LIO administration shell (iSCSI + Co)"
-arch=('any')
-url="https://github.com/agrover/targetcli-fb"
-license=('Apache')
-groups=()
-depends=('python-rtslib-fb>=2.1.fb52' 'python-configshell-fb>=1.1.fb17'
-         'python-dbus')
-makedepends=('python-setuptools')
-# TODO: optdepend on python-ethtool when available for python3
-optdepends=()
-provides=('targetcli')
-backup=()
-options=()
-install=
-source=(https://fedorahosted.org/releases/t/a/targetcli-fb/$pkgname-$pkgver.tar.gz)
-sha256sums=('63e7c85df26ffd2b1ef34e9113585d7eb8b3fd8d4bf84ebe025a14bf518e7459')
-
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  python setup.py build
-  gzip --stdout targetcli.8 > "targetcli.8.gz"
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  python setup.py install --skip-build --root="$pkgdir/" --optimize=1
-
-  install -D -m 644 targetcli.8.gz "$pkgdir/usr/share/man/man8/targetcli.8.gz"
-}
-
-# vim:set ts=2 sw=2 et:
--- a/aur/wxbase/PKGBUILD
+++ b/aur/wxbase/PKGBUILD
@ -1,28 +0,0 @@
-# Maintainer: Ivan Zenin <i.zenin@gmx.com>
-
-pkgname="wxbase"
-pkgver=3.0.2
-pkgrel=3
-pkgdesc="wxWidgets base libraries for no X install (stable version)" 
-arch=('i686' 'x86_64')
-url="http://wxwidgets.org"
-license=('custom:wxWindows')
-makedepends=('git')
-provides=('wxbase=3.0.2')
-conflicts=('wxgtk' 'wxwidgets' 'wxbase')
-source=("git+git://github.com/wxWidgets/wxWidgets.git")
-md5sums=('SKIP')
-
-build() {
-  cd "${srcdir}/wxWidgets"
-  git checkout tags/WX_3_0_2
-  ./configure --prefix=/usr --libdir=/usr/lib --disable-gui --enable-unicode
-  make
-} 
-
-package() {
-  cd "${srcdir}/wxWidgets"
-  make DESTDIR="${pkgdir}" install
-  find "${pkgdir}" -type d -name .git -exec rm -r '{}' +
-  install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/wxWidgets/LICENSE"
-}
--- a/aur/xrdp/PKGBUILD
+++ b/aur/xrdp/PKGBUILD
@ -1,47 +0,0 @@
-# Maintainer: Brian Bidulock <bidulock@openss7.org>
-# Contributo: Jianhui Z <jianhui@outlook.com>
-# Contributo: Tau Tsao <realturner at gmail.com>
-# Contributor: Tomasz Zok <tomasz.zok [at] gmail.com>
-# Contributor: techryda <techryda at silentdome dot com>
-# Contributor: Mathias R. <pu154r@overlinux.org>
-pkgname=xrdp
-pkgver=0.8.0
-pkgrel=4
-pkgdesc="An open source remote desktop protocol (RDP) server"
-url="http://xrdp.sourceforge.net/"
-arch=('i686' 'x86_64' 'armv6h')
-license=('Apache')
-depends=('tigervnc' 'libjpeg-turbo' 'libxrandr' 'libpulse' 'fuse')
-backup=('etc/xrdp/sesman.ini' 'etc/xrdp/xrdp.ini')
-install=xrdp.install
-source=(https://github.com/neutrinolabs/${pkgname}/archive/v${pkgver}.tar.gz
-	fixups.patch)
-md5sums=('2b0c3affc65ee77ad251514c62896757'
-         'e6985363c6f13e22272afdc6a7dddc96')
-
-prepare() {
-  cd "${pkgname}-${pkgver}"
-  patch -p2 -b -z .orig <../fixups.patch
-  ./bootstrap
-}
-
-build() {
-  cd "${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --localstatedir=/var \
-              --sbindir=/usr/bin \
-              --with-systemdsystemunitdir=/usr/lib/systemd/system \
-              --enable-jpeg \
-              --enable-simplesound \
-              --enable-fuse \
-              --enable-loadpulsemodules
-  make V=0
-}
-
-package() {
-  cd "${pkgname}-${pkgver}"
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
--- a/aur/xrdp/arch-config.diff
+++ b/aur/xrdp/arch-config.diff
@ -1,98 +0,0 @@
-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/fixups.patch
+++ b/aur/xrdp/fixups.patch
@ -1,121 +0,0 @@
-diff -up src/xrdp-0.8.0/instfiles/Makefile.am.orig src/xrdp-0.8.0/instfiles/Makefile.am
--- src/xrdp-0.8.0/instfiles/Makefile.am.orig	2014-05-19 23:41:42.000000000 -0600
-+++ src/xrdp-0.8.0/instfiles/Makefile.am	2015-12-04 06:39:06.000000000 -0700
-@@ -28,5 +28,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 -up src/xrdp-0.8.0/instfiles/pam.d/xrdp-sesman.orig src/xrdp-0.8.0/instfiles/pam.d/xrdp-sesman
--- src/xrdp-0.8.0/instfiles/pam.d/xrdp-sesman.orig	2014-05-19 23:41:42.000000000 -0600
-+++ src/xrdp-0.8.0/instfiles/pam.d/xrdp-sesman	2015-12-04 06:39:06.000000000 -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 -up src/xrdp-0.8.0/instfiles/xrdp.service.orig src/xrdp-0.8.0/instfiles/xrdp.service
--- src/xrdp-0.8.0/instfiles/xrdp.service.orig	2015-12-04 06:39:06.000000000 -0700
-+++ src/xrdp-0.8.0/instfiles/xrdp.service	2015-12-04 06:40:54.000000000 -0700
-@@ -6,9 +6,8 @@ After=syslog.target network.target xrdp-
- [Service]
- Type=forking
- PIDFile=/var/run/xrdp.pid
-EnvironmentFile=/etc/sysconfig/xrdp
-ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS
-ExecStop=/usr/sbin/xrdp $XRDP_OPTIONS --kill
-+ExecStart=/usr/bin/xrdp
-+ExecStop=/usr/bin/xrdp --kill
- 
- [Install]
- WantedBy=multi-user.target
-diff -up src/xrdp-0.8.0/instfiles/xrdp-sesman.service.orig src/xrdp-0.8.0/instfiles/xrdp-sesman.service
--- src/xrdp-0.8.0/instfiles/xrdp-sesman.service.orig	2015-12-04 06:39:06.000000000 -0700
-+++ src/xrdp-0.8.0/instfiles/xrdp-sesman.service	2015-12-04 06:41:09.000000000 -0700
-@@ -6,9 +6,8 @@ StopWhenUnneeded=true
- [Service]
- Type=forking
- PIDFile=/var/run/xrdp-sesman.pid
-EnvironmentFile=/etc/sysconfig/xrdp
-ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS
-ExecStop=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --kill
-+ExecStart=/usr/bin/xrdp-sesman
-+ExecStop=/usr/bin/xrdp-sesman --kill
- 
- [Install]
- WantedBy=multi-user.target
-diff -up src/xrdp-0.8.0/instfiles/xrdp.sh.orig src/xrdp-0.8.0/instfiles/xrdp.sh
--- src/xrdp-0.8.0/instfiles/xrdp.sh.orig	2015-12-04 06:39:06.000000000 -0700
-+++ src/xrdp-0.8.0/instfiles/xrdp.sh	2015-12-04 06:39:06.000000000 -0700
-@@ -17,7 +17,7 @@
- # Description: starts xrdp
- ### END INIT INFO
- 
-SBINDIR=/usr/local/sbin
-+SBINDIR=/usr/bin
- LOG=/dev/null
- CFGDIR=/etc/xrdp
- 
-diff -up src/xrdp-0.8.0/sesman/startwm.sh.orig src/xrdp-0.8.0/sesman/startwm.sh
--- src/xrdp-0.8.0/sesman/startwm.sh.orig	2014-05-19 23:41:42.000000000 -0600
-+++ src/xrdp-0.8.0/sesman/startwm.sh	2015-12-04 06:39:06.000000000 -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 -up src/xrdp-0.8.0/xrdp/xrdp.ini.orig src/xrdp-0.8.0/xrdp/xrdp.ini
--- src/xrdp-0.8.0/xrdp/xrdp.ini.orig	2014-05-19 23:41:42.000000000 -0600
-+++ src/xrdp-0.8.0/xrdp/xrdp.ini	2015-12-04 06:39:06.000000000 -0700
-@@ -36,7 +36,7 @@ grey=dedede
- #red=ff0000
- #green=00ff00
- #background=626c72
-#autorun=xrdp1
-+autorun=xrdp2
- #hidelogwindow=yes
- 
- # when true, userid/password *must* be passed on cmd line
-@@ -119,6 +119,15 @@ xrdpvr=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
@ -1,14 +0,0 @@
-[Unit]
-Description=xrdp session manager
-After=syslog.target network.target
-StopWhenUnneeded=true
-
-[Service]
-Type=forking
-PIDFile=/var/run/xrdp-sesman.pid
-ExecStart=/usr/bin/xrdp-sesman
-ExecStop=/usr/bin/xrdp-sesman --kill
-
-[Install]
-WantedBy=multi-user.target
-
--- a/aur/xrdp/xrdp.install
+++ b/aur/xrdp/xrdp.install
@ -1,15 +0,0 @@
-post_upgrade() {
-  if [ ! -e /etc/xrdp/rsakeys.ini ]; then
-    xrdp-keygen xrdp /etc/xrdp/rsakeys.ini
-  fi
-}
-
-post_install() {
-  post_upgrade
-}
-
-pre_remove() {
-  if [ -f /etc/xrdp/rsakeys.ini ]; then
-    rm /etc/xrdp/rsakeys.ini
-  fi
-}
--- a/aur/xrdp/xrdp.service
+++ b/aur/xrdp/xrdp.service
@ -1,14 +0,0 @@
-[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