From c8dd10ca6a7020e983d8b6cf1dc643a79bb4ac03 Mon Sep 17 00:00:00 2001
From: Mike Staszel <mikestaszel@gmail.com>
Date: Wed, 22 Dec 2010 14:36:48 -0600
Subject: [PATCH] Moved all aur packages to [aur]
---
aur/h2n/.gitignore | 4 ++
aur/h2n/PKGBUILD | 44 +++++++++++++++
aur/minidlna/PKGBUILD | 34 ++++++++++++
aur/minidlna/minidlna.install | 7 +++
aur/minidlna/minidlna.rc.d.script | 54 +++++++++++++++++++
{community => aur}/mt-daapd/PKGBUILD | 18 +++----
{community => aur}/mt-daapd/mt-daapd | 0
{community => aur}/package-query/PKGBUILD | 10 ++--
{community => aur}/par2cmdline/PKGBUILD | 2 -
.../par2cmdline-0.4-autoconf.patch | 0
.../par2cmdline-0.4-cosmetic.patch | 0
.../par2cmdline/par2cmdline-0.4-gcc4.patch | 0
.../par2cmdline-0.4-hardlinks.patch | 0
.../par2cmdline/par2cmdline-0.4-letype.patch | 0
.../par2cmdline/par2cmdline-0.4-offset.patch | 0
.../par2cmdline-0.4-wildcard-fix.patch | 0
{community => aur}/pyalpmm/PKGBUILD | 2 -
{community => aur}/python-yenc/PKGBUILD | 9 ++--
{community => aur}/sabnzbd/PKGBUILD | 22 ++++----
{community => aur}/sabnzbd/addnzb.sh | 6 +--
{community => aur}/sabnzbd/sabnzbd | 0
{community => aur}/sabnzbd/sabnzbd.confd | 0
{community => aur}/sabnzbd/sabnzbd.desktop | 2 +-
{community => aur}/sabnzbd/sabnzbd.init | 2 +-
{community => aur}/sabnzbd/sabnzbd.install | 0
{community => aur}/sabnzbd/x-nzb.xml | 0
{community => aur}/usbip/PKGBUILD | 0
{community => aur}/yaourt/PKGBUILD | 2 -
{community => aur}/yaourt/yaourt.install | 0
community/mediatomb/PKGBUILD | 40 --------------
community/mediatomb/mediatomb.conf | 24 ---------
community/mediatomb/mediatomb.rc | 54 -------------------
32 files changed, 175 insertions(+), 161 deletions(-)
create mode 100644 aur/h2n/.gitignore
create mode 100644 aur/h2n/PKGBUILD
create mode 100644 aur/minidlna/PKGBUILD
create mode 100644 aur/minidlna/minidlna.install
create mode 100644 aur/minidlna/minidlna.rc.d.script
rename {community => aur}/mt-daapd/PKGBUILD (71%)
mode change 100755 => 100644
rename {community => aur}/mt-daapd/mt-daapd (100%)
mode change 100755 => 100644
rename {community => aur}/package-query/PKGBUILD (76%)
rename {community => aur}/par2cmdline/PKGBUILD (96%)
rename {community => aur}/par2cmdline/par2cmdline-0.4-autoconf.patch (100%)
rename {community => aur}/par2cmdline/par2cmdline-0.4-cosmetic.patch (100%)
rename {community => aur}/par2cmdline/par2cmdline-0.4-gcc4.patch (100%)
rename {community => aur}/par2cmdline/par2cmdline-0.4-hardlinks.patch (100%)
rename {community => aur}/par2cmdline/par2cmdline-0.4-letype.patch (100%)
rename {community => aur}/par2cmdline/par2cmdline-0.4-offset.patch (100%)
rename {community => aur}/par2cmdline/par2cmdline-0.4-wildcard-fix.patch (100%)
rename {community => aur}/pyalpmm/PKGBUILD (93%)
rename {community => aur}/python-yenc/PKGBUILD (72%)
rename {community => aur}/sabnzbd/PKGBUILD (75%)
rename {community => aur}/sabnzbd/addnzb.sh (81%)
rename {community => aur}/sabnzbd/sabnzbd (100%)
rename {community => aur}/sabnzbd/sabnzbd.confd (100%)
rename {community => aur}/sabnzbd/sabnzbd.desktop (80%)
rename {community => aur}/sabnzbd/sabnzbd.init (87%)
rename {community => aur}/sabnzbd/sabnzbd.install (100%)
rename {community => aur}/sabnzbd/x-nzb.xml (100%)
rename {community => aur}/usbip/PKGBUILD (100%)
rename {community => aur}/yaourt/PKGBUILD (96%)
rename {community => aur}/yaourt/yaourt.install (100%)
delete mode 100644 community/mediatomb/PKGBUILD
delete mode 100644 community/mediatomb/mediatomb.conf
delete mode 100644 community/mediatomb/mediatomb.rc
diff --git a/aur/h2n/.gitignore b/aur/h2n/.gitignore
new file mode 100644
index 000000000..60acac71d
--- /dev/null
+++ b/aur/h2n/.gitignore
@@ -0,0 +1,4 @@
+src
+pkg
+*.gz
+*.xz
diff --git a/aur/h2n/PKGBUILD b/aur/h2n/PKGBUILD
new file mode 100644
index 000000000..afae79004
--- /dev/null
+++ b/aur/h2n/PKGBUILD
@@ -0,0 +1,44 @@
+#Maintainer: Mark Lamourine <markllama@gmail.com>
+
+#
+# Code and patches stolen from the Fedora 14 source RPM
+# This package isn't anywhere on AUR/Arch Linux
+#
+
+pkgname=h2n
+pkgver=2.56
+pkgrel=1
+pkgdesc="h2n Converts a hosts file to bind9 configuration and zone files"
+license=('unknown')
+arch=('arm')
+url="ftp://ftp.hpl.hp.com/pub/h2n"
+depends=('perl' 'perl-net-dns' 'pdksh')
+source=("ftp://ftp.hpl.hp.com/pub/h2n/h2n-$pkgver.tar.gz")
+
+md5sums=('eb257ca05beb35c70b195ef08da6961e')
+
+build() {
+
+ cd $srcdir/$pkgname-$pkgver
+
+ mkdir -p $pkgdir/etc
+ mkdir -p $pkgdir/usr/bin
+ mkdir -p $pkgdir/usr/share/man/man1
+ mkdir -p $pkgdir/usr/share/doc/h2n-$pkgver
+
+ install -D -m 644 h2n.conf $pkgdir/etc/ || return 1
+ install -D -m 755 h2n $pkgdir/usr/bin/ || return 1
+ install -D -m 755 build-dns $pkgdir/usr/bin/ || return 1
+ install -D -m 755 check_del $pkgdir/usr/bin/ || return 1
+ install -D -m 755 check-dn $pkgdir/usr/bin/ || return 1
+ install -D -m 755 check-ip $pkgdir/usr/bin/ || return 1
+ install -D -m 755 check-named $pkgdir/usr/bin/ || return 1
+ install -D -m 755 check-net $pkgdir/usr/bin/ || return 1
+
+ install -D -m 644 h2n.1 $pkgdir/usr/share/man/man1/ || return 1
+ install -D -m 644 README $pkgdir/usr/share/doc/h2n-$pkgver/ || return 1
+ install -D -m 644 h2n.html $pkgdir/usr/share/doc/h2n-$pkgver/ || return 1
+ install -D -m 644 h2n.txt $pkgdir/usr/share/doc/h2n-$pkgver/ || return 1
+
+
+}
diff --git a/aur/minidlna/PKGBUILD b/aur/minidlna/PKGBUILD
new file mode 100644
index 000000000..f04b54cd7
--- /dev/null
+++ b/aur/minidlna/PKGBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Kevin Mihelich <leming@gmail.com>
+
+pkgname=minidlna
+pkgver=1.0.18
+pkgrel=1
+pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)"
+arch=('i686' 'x86_64' 'arm')
+url="http://minidlna.sourceforge.net/"
+license=('BSD' 'GPL')
+depends=('sqlite3' 'libjpeg' 'libexif' 'libid3tag' 'libvorbis' 'flac' 'ffmpeg' 'util-linux-ng')
+makedepends=()
+optdepends=()
+conflicts=('minidlna')
+options=()
+install=${pkgname}.install
+backup=('etc/minidlna.conf')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}_${pkgver}_src.tar.gz \
+ minidlna.rc.d.script \
+ minidlna.install)
+md5sums=('8681b100242f0a2fef93cab7cdef061e' \
+ 'f6933a2ebf9ffb37e6c26704acc763fb' \
+ 'f2b79b4fe2b8f1df5a335900e1e00c5a')
+
+build() {
+ cd ${srcdir}/${pkgname}
+
+ make || return 1
+}
+
+package() {
+ cd ${srcdir}/${pkgname}
+ make PREFIX=${pkgdir} install || return 1
+ install -D -m 755 ${srcdir}/minidlna.rc.d.script ${pkgdir}/etc/rc.d/minidlna
+}
diff --git a/aur/minidlna/minidlna.install b/aur/minidlna/minidlna.install
new file mode 100644
index 000000000..e56322244
--- /dev/null
+++ b/aur/minidlna/minidlna.install
@@ -0,0 +1,7 @@
+post_install() {
+ cat << _EOF
+ ==> Edit /etc/minidlna.conf before running minidlna.
+ ==> Add 'minidlna' to the DAEMONS array in /etc/rc.conf
+ ==> to start MiniDLNA at boot-up.
+_EOF
+}
diff --git a/aur/minidlna/minidlna.rc.d.script b/aur/minidlna/minidlna.rc.d.script
new file mode 100644
index 000000000..885e772bb
--- /dev/null
+++ b/aur/minidlna/minidlna.rc.d.script
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# chkconfig: 345 99 10
+# description: Startup/shutdown script for MiniDLNA daemon
+#
+# $Id: minidlna.init.d.script,v 1.2 2009/07/02 00:33:15 jmaggard Exp $
+# MiniUPnP project
+# author: Thomas Bernard
+# website: http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
+
+# Modified for Arch Linux
+# Maintainer: ponsfoot <cabezon.hashimoto@gmail.com> 2010-01-20.
+
+MINIDLNA=/usr/sbin/minidlna
+ARGS='-f /etc/minidlna.conf'
+PIDFILE=/var/run/minidlna.pid
+
+test -f $MINIDLNA || exit 0
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+[[ -f $PIDFILE ]] && PID=`cat $PIDFILE`
+
+case "$1" in
+ start)
+ stat_busy "Starting MiniDLNA Daemon"
+ [[ -z "$PID" ]] && $MINIDLNA $ARGS -P $PIDFILE
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon minidlna
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping MiniDLNA Daemon"
+ [[ ! -z "&PID" ]] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon minidlna
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/community/mt-daapd/PKGBUILD b/aur/mt-daapd/PKGBUILD
old mode 100755
new mode 100644
similarity index 71%
rename from community/mt-daapd/PKGBUILD
rename to aur/mt-daapd/PKGBUILD
index 745374cfa..302a3f2e7
--- a/community/mt-daapd/PKGBUILD
+++ b/aur/mt-daapd/PKGBUILD
@@ -1,32 +1,32 @@
-# Maintainer: Mike Staszel <mikestaszel@plugboxlinux.org>
+# Maintainer : Gary Wright <wriggary at g mail dot com> $
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Jon Kristian Nilsen <jokr.nilsen@gmail.com>
-# Plugbox Linux changes:
-# - Added "LDFLAGS=""
+# Plugbox changes: Added LDFLAGS="" to make it build
pkgname=mt-daapd
pkgver=0.2.4.2
-pkgrel=4
+pkgrel=6
pkgdesc="A multi-threaded DAAP server compatible with iTunes music sharing"
url="http://www.mt-daapd.org/"
license=("LGPL")
-arch=('arm')
+arch=('i686' 'x86_64')
backup=(etc/mt-daapd/mt-daapd.conf)
depends=('libid3tag' 'gdbm' 'avahi')
-source=(http://dl.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz \
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz \
mt-daapd)
md5sums=('67bef9fb14d487693b0dfb792c3f1b05'
'26cf6ff799ef06d262a8648d6890a250')
LDFLAGS=""
build() {
- cd "$startdir/src/$pkgname-$pkgver"
+ cd "$srcdir/$pkgname-$pkgver"
sed -i 's|DEFAULT_CONFIGFILE "/etc/mt-daapd.conf"|DEFAULT_CONFIGFILE "/etc/mt-daapd/mt-daapd.conf"|' src/main.c
./configure --prefix=/usr --sysconfdir=/etc/mt-daapd --enable-avahi --enable-mdns
- make || return 1
- make DESTDIR="$startdir/pkg" install || return 1
+ make
+ make DESTDIR="$pkgdir" install
install -D -m644 $srcdir/$pkgname-$pkgver/contrib/mt-daapd.playlist $pkgdir/etc/mt-daapd/sample.playlist && \
install -D -m644 $srcdir/$pkgname-$pkgver/contrib/mt-daapd.conf $pkgdir/etc/mt-daapd/mt-daapd.conf && \
diff --git a/community/mt-daapd/mt-daapd b/aur/mt-daapd/mt-daapd
old mode 100755
new mode 100644
similarity index 100%
rename from community/mt-daapd/mt-daapd
rename to aur/mt-daapd/mt-daapd
diff --git a/community/package-query/PKGBUILD b/aur/package-query/PKGBUILD
similarity index 76%
rename from community/package-query/PKGBUILD
rename to aur/package-query/PKGBUILD
index 153c79d3a..20003a217 100644
--- a/community/package-query/PKGBUILD
+++ b/aur/package-query/PKGBUILD
@@ -1,10 +1,8 @@
# Contributor: tuxce <tuxce.net@gmail.com>
-# No Plugbox changes, straight from AUR, yaourt depends on this.
-
pkgname=package-query
-pkgver=0.5
-pkgrel=3
+pkgver=0.5.1
+pkgrel=1
pkgdesc="Query ALPM and AUR"
arch=('i686' 'x86_64')
url="http://gitweb.archlinux.fr/package-query.git/"
@@ -26,6 +24,4 @@ package ()
make DESTDIR=$pkgdir install
}
-# vim:set ts=2 sw=2 et:
-
-md5sums=('5dd7f4aa61b6e8bd9d8dcadd9a26c039')
+md5sums=('22df82924a73ae707447b063ec298cbb')
diff --git a/community/par2cmdline/PKGBUILD b/aur/par2cmdline/PKGBUILD
similarity index 96%
rename from community/par2cmdline/PKGBUILD
rename to aur/par2cmdline/PKGBUILD
index 279bbfbd9..36592347d 100644
--- a/community/par2cmdline/PKGBUILD
+++ b/aur/par2cmdline/PKGBUILD
@@ -1,8 +1,6 @@
# Maintainer: wide-eye <eyeswide@gmail.com>
# Contributor: BlackEagle < ike DOT devolder AT herecura DOT be >
-# No Plugbox changes, but sabnzbd depends on this package.
-
pkgname=par2cmdline
pkgver=0.4
pkgrel=14
diff --git a/community/par2cmdline/par2cmdline-0.4-autoconf.patch b/aur/par2cmdline/par2cmdline-0.4-autoconf.patch
similarity index 100%
rename from community/par2cmdline/par2cmdline-0.4-autoconf.patch
rename to aur/par2cmdline/par2cmdline-0.4-autoconf.patch
diff --git a/community/par2cmdline/par2cmdline-0.4-cosmetic.patch b/aur/par2cmdline/par2cmdline-0.4-cosmetic.patch
similarity index 100%
rename from community/par2cmdline/par2cmdline-0.4-cosmetic.patch
rename to aur/par2cmdline/par2cmdline-0.4-cosmetic.patch
diff --git a/community/par2cmdline/par2cmdline-0.4-gcc4.patch b/aur/par2cmdline/par2cmdline-0.4-gcc4.patch
similarity index 100%
rename from community/par2cmdline/par2cmdline-0.4-gcc4.patch
rename to aur/par2cmdline/par2cmdline-0.4-gcc4.patch
diff --git a/community/par2cmdline/par2cmdline-0.4-hardlinks.patch b/aur/par2cmdline/par2cmdline-0.4-hardlinks.patch
similarity index 100%
rename from community/par2cmdline/par2cmdline-0.4-hardlinks.patch
rename to aur/par2cmdline/par2cmdline-0.4-hardlinks.patch
diff --git a/community/par2cmdline/par2cmdline-0.4-letype.patch b/aur/par2cmdline/par2cmdline-0.4-letype.patch
similarity index 100%
rename from community/par2cmdline/par2cmdline-0.4-letype.patch
rename to aur/par2cmdline/par2cmdline-0.4-letype.patch
diff --git a/community/par2cmdline/par2cmdline-0.4-offset.patch b/aur/par2cmdline/par2cmdline-0.4-offset.patch
similarity index 100%
rename from community/par2cmdline/par2cmdline-0.4-offset.patch
rename to aur/par2cmdline/par2cmdline-0.4-offset.patch
diff --git a/community/par2cmdline/par2cmdline-0.4-wildcard-fix.patch b/aur/par2cmdline/par2cmdline-0.4-wildcard-fix.patch
similarity index 100%
rename from community/par2cmdline/par2cmdline-0.4-wildcard-fix.patch
rename to aur/par2cmdline/par2cmdline-0.4-wildcard-fix.patch
diff --git a/community/pyalpmm/PKGBUILD b/aur/pyalpmm/PKGBUILD
similarity index 93%
rename from community/pyalpmm/PKGBUILD
rename to aur/pyalpmm/PKGBUILD
index dfca8536e..34e3fbc62 100644
--- a/community/pyalpmm/PKGBUILD
+++ b/aur/pyalpmm/PKGBUILD
@@ -1,7 +1,5 @@
# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# No Plugbox changes, this is just from AUR.
-
pkgname=pyalpmm
pkgver=0.3
pkgrel=1
diff --git a/community/python-yenc/PKGBUILD b/aur/python-yenc/PKGBUILD
similarity index 72%
rename from community/python-yenc/PKGBUILD
rename to aur/python-yenc/PKGBUILD
index 3c688da47..a2c25e693 100644
--- a/community/python-yenc/PKGBUILD
+++ b/aur/python-yenc/PKGBUILD
@@ -1,20 +1,19 @@
# Contributor: Jonathan Curran <jonc@icicled.net>
-
-# No Plugbox changes, sabnzbd depends on this package.
+# Maintainer: Clément Démoulins <clement@archivel.fr>
pkgname=python-yenc
pkgver=0.3
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
license=('GPL')
pkgdesc="yenc decoder for python"
url="http://sabnzbd.sourceforge.net/"
-depends=('python')
+depends=('python2')
source=(http://sabnzbd.sourceforge.net/yenc-$pkgver.tar.gz)
md5sums=('7b3edd32db6c1ce566ad550e3de64c83')
build() {
cd $startdir/src/yenc-$pkgver
- python setup.py install --root=$startdir/pkg
+ python2 setup.py install --root=$startdir/pkg
}
diff --git a/community/sabnzbd/PKGBUILD b/aur/sabnzbd/PKGBUILD
similarity index 75%
rename from community/sabnzbd/PKGBUILD
rename to aur/sabnzbd/PKGBUILD
index 351006ae4..aeb772c7c 100644
--- a/community/sabnzbd/PKGBUILD
+++ b/aur/sabnzbd/PKGBUILD
@@ -1,26 +1,23 @@
-# No Plugbox changes, this is just from AUR but has been requested
-# very, very often.
-
pkgname=sabnzbd
-pkgver=0.5.4
-pkgrel=3
+pkgver=0.5.6
+pkgrel=1
pkgdesc="A web-interface based binary newsgrabber with NZB file support"
arch=(i686 x86_64)
url="http://www.sabnzbd.org/"
license=('GPL')
-depends=('par2cmdline' 'python' 'python-cheetah' 'python-feedparser' 'python-yenc' 'pyopenssl' 'unrar' 'unzip' 'sqlite3' 'curl')
+depends=('par2cmdline' 'python2' 'python-cheetah' 'python-feedparser' 'python-yenc' 'pyopenssl' 'unrar' 'unzip' 'sqlite3' 'curl')
install=sabnzbd.install
backup=('etc/conf.d/sabnzbd' 'opt/sabnzbd/sabnzbd.ini')
source=("http://downloads.sourceforge.net/sabnzbdplus/SABnzbd-$pkgver-src.tar.gz"
sabnzbd sabnzbd.init sabnzbd.confd sabnzbd.desktop x-nzb.xml addnzb.sh)
-md5sums=('b64e5d47ea4c115b98dd96744946c89d'
+md5sums=('6a43179f42e31bed3faa0135a213bc65'
'f45907d98a19052eaeb7ad98ff13b16d'
- '0300f4804c7abcfc7013b3a90b83c38c'
+ '2cd5c68bedc609dcff49871e0c94df54'
'dc5fdcc132033b38e2f34d2355d573be'
- 'a83d735a8a21b68622ed0d6ac1139a9e'
+ '4322c935bbe37f83a1b24cb1396a1762'
'11fb2cd1451e3725b08bfc2bd045be54'
- '3287c7a1becdf0a4f7276cfbccb301dd')
+ '65d60b1b2209138e0825a8e7b1abdcdd')
build() {
mkdir -p $startdir/pkg/opt/sabnzbd
@@ -34,6 +31,9 @@ build() {
install -D -m755 $startdir/sabnzbd.init $startdir/pkg/etc/rc.d/sabnzbd
install -D -m644 $startdir/sabnzbd.confd $startdir/pkg/etc/conf.d/sabnzbd
install -D -m755 $startdir/sabnzbd.desktop $startdir/pkg/usr/share/applications/sabnzbd.desktop
- install -D -m755 $startdir/addnzb.sh $startdir/pkg/opt/sabnzbd/addnzb.ssh
+ install -D -m755 $startdir/addnzb.sh $startdir/pkg/opt/sabnzbd/addnzb.sh
install -D -m770 $startdir/x-nzb.xml $startdir/pkg/opt/sabnzbd/x-nzb.xml
+
+ # Fix for issues with Python 3
+ find $startdir/pkg/opt/sabnzbd -type f -exec sed -i 's/python/python2/g' {} \;
}
diff --git a/community/sabnzbd/addnzb.sh b/aur/sabnzbd/addnzb.sh
similarity index 81%
rename from community/sabnzbd/addnzb.sh
rename to aur/sabnzbd/addnzb.sh
index 4282cba98..c90494672 100644
--- a/community/sabnzbd/addnzb.sh
+++ b/aur/sabnzbd/addnzb.sh
@@ -4,10 +4,10 @@
# SABnzbd must be able to read the file, so we copy it to a directory where it
# certainly has rights.
-nzbname=`basename $1`
-TEMP_NZB="/var/tmp/"$nzbname
+nzbname=`basename "$1"`
+TEMP_NZB="/var/tmp/$nzbname"
-cp $1 $TEMP_NZB
+cp "$1" $TEMP_NZB
curl -f "$SABNZBD_PROTOCOL://$SABNZBD_USPW$SABNZBD_IP:$SABNZBD_PORT/sabnzbd/api?mode=addlocalfile&name=$TEMP_NZB&pp=1&priority=-1&apikey=$SABNZBD_KEY"
rm $TEMP_NZB
exit 0
diff --git a/community/sabnzbd/sabnzbd b/aur/sabnzbd/sabnzbd
similarity index 100%
rename from community/sabnzbd/sabnzbd
rename to aur/sabnzbd/sabnzbd
diff --git a/community/sabnzbd/sabnzbd.confd b/aur/sabnzbd/sabnzbd.confd
similarity index 100%
rename from community/sabnzbd/sabnzbd.confd
rename to aur/sabnzbd/sabnzbd.confd
diff --git a/community/sabnzbd/sabnzbd.desktop b/aur/sabnzbd/sabnzbd.desktop
similarity index 80%
rename from community/sabnzbd/sabnzbd.desktop
rename to aur/sabnzbd/sabnzbd.desktop
index dd989834f..696d7b4b7 100644
--- a/community/sabnzbd/sabnzbd.desktop
+++ b/aur/sabnzbd/sabnzbd.desktop
@@ -3,7 +3,7 @@ Type=Application
Version=1.0
Name=SABnzbd+
GenericName=Binary Newsreader
-Exec=sh /opt/sabnzbd/addnzb.sh %u
+Exec=sh /opt/sabnzbd/addnzb.sh "%u"
Terminal=false
Categories=Network
MimeType=application/x-nzb
diff --git a/community/sabnzbd/sabnzbd.init b/aur/sabnzbd/sabnzbd.init
similarity index 87%
rename from community/sabnzbd/sabnzbd.init
rename to aur/sabnzbd/sabnzbd.init
index 0c36d3161..7e5901681 100644
--- a/community/sabnzbd/sabnzbd.init
+++ b/aur/sabnzbd/sabnzbd.init
@@ -12,7 +12,7 @@ case "$1" in
echo -n "Sabnzbd is already running as a daemon! If you are certain it is not running, remove /var/run/daemons/sabnzbd."
stat_fail
else
- su - $SABNZBD_USER -c "python /opt/sabnzbd/SABnzbd.py -f $SABNZBD_CONF -s $SABNZBD_IP:$SABNZBD_PORT -d" -s /bin/sh
+ su - $SABNZBD_USER -c "python2 /opt/sabnzbd/SABnzbd.py -f $SABNZBD_CONF -s $SABNZBD_IP:$SABNZBD_PORT -d" -s /bin/sh
if [ $? -gt 0 ]; then
stat_fail
else
diff --git a/community/sabnzbd/sabnzbd.install b/aur/sabnzbd/sabnzbd.install
similarity index 100%
rename from community/sabnzbd/sabnzbd.install
rename to aur/sabnzbd/sabnzbd.install
diff --git a/community/sabnzbd/x-nzb.xml b/aur/sabnzbd/x-nzb.xml
similarity index 100%
rename from community/sabnzbd/x-nzb.xml
rename to aur/sabnzbd/x-nzb.xml
diff --git a/community/usbip/PKGBUILD b/aur/usbip/PKGBUILD
similarity index 100%
rename from community/usbip/PKGBUILD
rename to aur/usbip/PKGBUILD
diff --git a/community/yaourt/PKGBUILD b/aur/yaourt/PKGBUILD
similarity index 96%
rename from community/yaourt/PKGBUILD
rename to aur/yaourt/PKGBUILD
index 2c000d643..719ed65f8 100644
--- a/community/yaourt/PKGBUILD
+++ b/aur/yaourt/PKGBUILD
@@ -1,8 +1,6 @@
# Author: Julien MISCHKOWITZ <wain@archlinux.fr>
# Author: tuxce <tuxce.net@gmail.com>
-# No Plugbox changes, directly from AUR
-
pkgname=yaourt
pkgver=0.9.5.1
pkgrel=1
diff --git a/community/yaourt/yaourt.install b/aur/yaourt/yaourt.install
similarity index 100%
rename from community/yaourt/yaourt.install
rename to aur/yaourt/yaourt.install
diff --git a/community/mediatomb/PKGBUILD b/community/mediatomb/PKGBUILD
deleted file mode 100644
index 3b6f2efc0..000000000
--- a/community/mediatomb/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Contributor: William Rea <sillywilly@gmail.com>
-# Contributor: Nikhil Bysani <nikron@gmail.com>
-# Contributor: Mika Hynnä <igheax@gmail.com>
-# Maintainer: Desmond Cox <desmondgc@gmail.com>
-
-pkgname=mediatomb
-pkgver=0.12.1
-pkgrel=1
-pkgdesc="Free UPnP MediaServer"
-arch=('i686' 'x86_64')
-url="http://mediatomb.cc/"
-license=('GPL')
-depends=('libexif' 'taglib' 'sqlite3' 'expat' 'spidermonkey' 'curl' 'ffmpeg')
-optdepends=('ffmpegthumbnailer: video thumbnail generation support')
-backup=(etc/conf.d/mediatomb etc/mediatomb/mediatomb.conf)
-source=(http://downloads.sourceforge.net/mediatomb/mediatomb-$pkgver.tar.gz
- mediatomb.rc
- mediatomb.conf)
-md5sums=('e927dd5dc52d3cfcebd8ca1af6f0d3c2'
- '16be23c425505160c031aaf239a8d9a4'
- '81786546341fc357897d127fce51c8f4')
-
-build() {
- cd $startdir/src/mediatomb-$pkgver || return 1
-
- ./configure --prefix=/usr --disable-mysql --enable-libmagic --enable-libjs --enable-ffmpeg || return 1
- make || return 1
- make DESTDIR=$startdir/pkg install || return 1
-
- # daemon script
- mkdir -p $startdir/pkg/etc/rc.d/ || return 1
- install -m0755 ../mediatomb.rc $startdir/pkg/etc/rc.d/mediatomb || return 1
-
- # daemon config
- mkdir -p $startdir/pkg/etc/conf.d/ || return 1
- install -m0644 ../mediatomb.conf $startdir/pkg/etc/conf.d/mediatomb || return 1
-
- # daemon database/config dir
- mkdir -p $startdir/pkg/var/lib/mediatomb/ || return 1
-}
diff --git a/community/mediatomb/mediatomb.conf b/community/mediatomb/mediatomb.conf
deleted file mode 100644
index c503c8e08..000000000
--- a/community/mediatomb/mediatomb.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-## This is the configuration file for the MediaTomb daemon script
-## /etc/rc.d/mediatomb
-
-## User defined command line options that may be passed to the server
-MT_OPTIONS=""
-#MT_OPTIONS="-c /home/username/.mediatomb/config.xml"
-
-## MediaTomb will be started on port 50500
-MT_PORT="50500"
-
-## MediaTomb will run as nobody
-MT_USER="nobody"
-MT_GROUP="nobody"
-
-## Location of the PID file
-MT_PIDFILE="/var/run/mediatomb.pid"
-
-## Location of the log file
-MT_LOGFILE="/var/log/mediatomb"
-
-## Location of the config file/database
-MT_HOME="/var/lib"
-MT_CFGDIR="mediatomb"
-
diff --git a/community/mediatomb/mediatomb.rc b/community/mediatomb/mediatomb.rc
deleted file mode 100644
index c4a397596..000000000
--- a/community/mediatomb/mediatomb.rc
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/mediatomb
-
-PID=$(cat $MT_PIDFILE 2> /dev/null)
-MEDIATOMB="-d -u $MT_USER -g $MT_GROUP -P $MT_PIDFILE -l $MT_LOGFILE -m $MT_HOME -f $MT_CFGDIR -p $MT_PORT"
-
-case "$1" in
- start)
- stat_busy "Starting MediaTomb UPnP MediaServer"
-
- # Ensure the daemon is able to write into MT_CFGDIR
- chown $MT_USER:$MT_GROUP "/$MT_HOME/$MT_CFGDIR"
-
- # MediaTomb does not remove MT_PIDFILE on shutdown
- [ -z "$(pidof -o %PPID /usr/bin/mediatomb)" ] && rm -f $MT_PIDFILE
-
- [ -z "$(cat $MT_PIDFILE 2> /dev/null)" ] && /usr/bin/mediatomb $MEDIATOMB $MT_OPTIONS
-
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon mediatomb
- stat_done
- fi
- ;;
-
- stop)
- stat_busy "Stopping MediaTomb UPnP MediaServer"
-
- [ ! -z "$PID" ] && kill $PID &> /dev/null
-
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm -f $MT_PIDFILE
- rm_daemon mediatomb
- stat_done
- fi
- ;;
-
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
-
- *)
- echo "Usage: $0 {start|stop|restart}"
-
-esac
-exit 0