From 56ce292dba677d3491ea4126dd062e5eaf0f9fdb Mon Sep 17 00:00:00 2001 From: Daniel Wallace Date: Mon, 8 Apr 2013 14:02:45 -0400 Subject: [PATCH 1/7] update couchpotato to pacman 4.1 --- aur/couchpotato-git/PKGBUILD | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/aur/couchpotato-git/PKGBUILD b/aur/couchpotato-git/PKGBUILD index b9efe39b1..e44f8e425 100644 --- a/aur/couchpotato-git/PKGBUILD +++ b/aur/couchpotato-git/PKGBUILD @@ -1,7 +1,12 @@ # Maintainer: Ben Ruijl pkgname=couchpotato-git -pkgver=20120812 +pkgver=1796.0eff4f0 +pkgver() { + cd "$srcdir/$pkgname" + echo $(git rev-list --count master).$(git rev-parse --short master) +} +epoch=1 pkgrel=1 pkgdesc="Automatic Movie Downloading via NZBs & Torrent" arch=('i686' 'x86_64') @@ -11,32 +16,18 @@ depends=('python2') makedepends=('git') install='couchpotato.install' backup=('etc/conf.d/couchpotato' 'etc/conf.d/couchpotato_systemd') -source=('couchpotato' 'couchpotato.init' 'couchpotato.conf' 'couchpotato_systemd.conf' 'couchpotato.service') +source=('couchpotato' 'couchpotato.init' 'couchpotato.conf' 'couchpotato_systemd.conf' 'couchpotato.service' "$pkgname::git://github.com/RuudBurger/CouchPotatoServer.git") md5sums=('a7db842a8af532847ef41890f6714819' 'a7711d04d2db7de96f067e484c29f709' '2c3c045ae9c5f5bf4bc0972917c19071' 'c22c7a797415131baf0fbe092132abda' - 'bdedef6bcb8d04c534bd094047885fa7') + 'bdedef6bcb8d04c534bd094047885fa7' + 'SKIP') -_gitroot="git://github.com/RuudBurger/CouchPotatoServer.git" -_gitname="couchpotato_src" -build() { - cd "$srcdir" - msg "Connecting to GIT server...." - - if [ -d $_gitname ]; then - cd $_gitname && git pull origin - msg "The local files are updated." - else - git clone $_gitroot $_gitname - fi - - msg "GIT checkout done or server timeout" - msg "Starting install..." - - mkdir -p "${pkgdir}/opt/" - cp -r "$srcdir/$_gitname" "${pkgdir}/opt/couchpotato" +package() { + install -d "${pkgdir}/opt/" + cp -dpr --no-preserv=ownership "$srcdir/$pkgname" "${pkgdir}/opt/couchpotato" install -D -m755 "${srcdir}/couchpotato" "${pkgdir}/usr/bin/couchpotato" install -D -m755 "${srcdir}/couchpotato.init" "${pkgdir}/etc/rc.d/couchpotato" From 3f27a9878363a74dfa2296dc88979ecb416e96a7 Mon Sep 17 00:00:00 2001 From: Daniel Wallace Date: Mon, 8 Apr 2013 14:06:09 -0400 Subject: [PATCH 2/7] update flashbench to pacman 4.1 --- aur/flashbench-git/PKGBUILD | 39 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/aur/flashbench-git/PKGBUILD b/aur/flashbench-git/PKGBUILD index 3e04421ed..e7d0043ee 100644 --- a/aur/flashbench-git/PKGBUILD +++ b/aur/flashbench-git/PKGBUILD @@ -1,41 +1,28 @@ # Maintainer: Marti Raudsepp pkgname=flashbench-git -pkgver=20110219 +pkgver=62.2e30b19 +pkgver() { + cd "$srcdir/$pkgname" + echo $(git rev-list --count master).$(git rev-parse --short master) +} +epoch=1 pkgrel=1 pkgdesc="Tool for benchmarking and classifying flash memory drives" arch=(i686 x86_64) license=('unknown') url="https://lwn.net/SubscriberLink/428584/354d16fe00c90072/" -depends=() makedepends=('git') replaces=('flashbench') provides=('flashbench') conflicts=('flashbench') -source=() - -_gitroot="git://git.linaro.org/people/arnd/flashbench.git" -_gitname="flashbench" +source=("$pkgname::git://git.linaro.org/people/arnd/flashbench.git") +md5sums=('SKIP') build() { - cd "$srcdir" - msg "Connecting to GIT server...." - - if [ -d $_gitname ] ; then - cd $_gitname && git pull origin - msg "The local files are updated." - else - git clone $_gitroot $_gitname - fi - - msg "GIT checkout done or server timeout" - msg "Starting make..." - - rm -rf "$srcdir/$_gitname-build" - git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" - cd "$srcdir/$_gitname-build" - - make - mkdir -p $pkgdir/usr/bin - install -m755 flashbench erase $pkgdir/usr/bin/ + make -C "$srcdir/$pkgname" +} +package(){ + install -Dm755 "$srcdir/$pkgname/flashbench" "$pkgdir/usr/bin/flashbench" + install -Dm755 "$srcdir/$pkgname/erase" "$pkgdir/usr/bin/flashbench" } From 2159b85fc9fa93b6cc784ef340bff38fe249331b Mon Sep 17 00:00:00 2001 From: Daniel Wallace Date: Mon, 8 Apr 2013 14:08:47 -0400 Subject: [PATCH 3/7] remove qt*-git packages --- alarm/qtbase-git/PKGBUILD | 62 -------------------------------- alarm/qtdeclarative-git/PKGBUILD | 58 ------------------------------ alarm/qtjsbackend-git/PKGBUILD | 58 ------------------------------ alarm/qtmultimedia-git/PKGBUILD | 58 ------------------------------ alarm/qtxmlpatterns-git/PKGBUILD | 58 ------------------------------ 5 files changed, 294 deletions(-) delete mode 100644 alarm/qtbase-git/PKGBUILD delete mode 100644 alarm/qtdeclarative-git/PKGBUILD delete mode 100644 alarm/qtjsbackend-git/PKGBUILD delete mode 100644 alarm/qtmultimedia-git/PKGBUILD delete mode 100644 alarm/qtxmlpatterns-git/PKGBUILD diff --git a/alarm/qtbase-git/PKGBUILD b/alarm/qtbase-git/PKGBUILD deleted file mode 100644 index 0880a1d99..000000000 --- a/alarm/qtbase-git/PKGBUILD +++ /dev/null @@ -1,62 +0,0 @@ -# $Id$ -# Contributor: jzellner -# This package provides the master branch of QtBase 5 - -buildarch=4 - -pkgname=qtbase-git -pkgver=20120417 -pkgrel=1 -plugrel=1 -pkgdesc="The C++ Qt GUI framework - current development snapshot (master branch)" -arch=('i686' 'x86_64') -url="http://www.qt-project.org" -license=('GPL3' 'LGPL') - -depends=('libpng' 'mesa' 'fontconfig' 'libtiff' 'libmng' 'sqlite3' 'libxrandr' 'glib2' 'libxi' 'dbus' 'libxcursor' 'libxinerama' 'libxrender') -optdepends=('postgresql-libs' 'libmysqlclient' 'unixodbc') -makedepends=('inputproto' 'postgresql-libs' 'mysql' 'unixodbc' 'cups' 'libxfixes' 'gtk2' 'git') -provides=('qtbase') -replaces=() -conflicts=() -options=() -source=() -md5sums=() - -_gitroot="git://gitorious.org/qt/qtbase.git" -_gitname="qtbase" - -build() { - msg "Connecting to git server...." - - if [ -d ${srcdir}/$_gitname ] ; then - cd $_gitname - git reset --hard HEAD - git clean -fxd - git pull origin - - msg "The local files have been updated to the current revision" - - cd $srcdir/$_gitname - else - git clone $_gitroot --depth=1 - - cd $srcdir/$_gitname - - sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf - sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf - sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf - fi - - ./configure -confirm-license -opensource -v -prefix /opt/qt5 -make libs \ - - # build qt master - make || return 1 -} - -package() { - cd $srcdir/$_gitname - - #install everything - make INSTALL_ROOT=$pkgdir install -} diff --git a/alarm/qtdeclarative-git/PKGBUILD b/alarm/qtdeclarative-git/PKGBUILD deleted file mode 100644 index 6bd99d808..000000000 --- a/alarm/qtdeclarative-git/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# $Id$ -# Contributor: jzellner -# This package provides the master branch of QtBase 5 - -buildarch=4 - -pkgname=qtdeclarative-git -pkgver=20120417 -pkgrel=1 -plugrel=1 -pkgdesc="The Qt5 Declarative - current development snapshot (master branch)" -arch=('i686' 'x86_64') -url="http://www.qt-project.org" -license=('GPL3' 'LGPL') - -depends=('qtbase-git' 'qtjsbackend-git' 'qtxmlpatterns-git') -optdepends=() -makedepends=('git') -provides=('qtdeclarative') -replaces=() -conflicts=() -options=() -source=() -md5sums=() - -_gitroot="git://gitorious.org/qt/qtdeclarative.git" -_gitname="qtdeclarative" - -build() { - msg "Connecting to git server...." - - if [ -d ${srcdir}/$_gitname ] ; then - cd $_gitname - git reset --hard HEAD - git clean -fxd - git pull origin - - msg "The local files have been updated to the current revision" - - cd $srcdir/$_gitname - else - git clone $_gitroot --depth=1 - - cd $srcdir/$_gitname - fi - - /opt/qt5/bin/qmake - - # build qt master - make || return 1 -} - -package() { - cd $srcdir/$_gitname - - #install everything - make INSTALL_ROOT=$pkgdir install -} diff --git a/alarm/qtjsbackend-git/PKGBUILD b/alarm/qtjsbackend-git/PKGBUILD deleted file mode 100644 index b2d50d465..000000000 --- a/alarm/qtjsbackend-git/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# $Id$ -# Contributor: jzellner -# This package provides the master branch of QtBase 5 - -buildarch=4 - -pkgname=qtjsbackend-git -pkgver=20120417 -pkgrel=1 -plugrel=1 -pkgdesc="The Qt5 JavaScript backend - current development snapshot (master branch)" -arch=('i686' 'x86_64') -url="http://www.qt-project.org" -license=('GPL3' 'LGPL') - -depends=('qtbase-git') -optdepends=() -makedepends=('git') -provides=('qtjsbackend') -replaces=() -conflicts=() -options=() -source=() -md5sums=() - -_gitroot="git://gitorious.org/qt/qtjsbackend.git" -_gitname="qtjsbackend" - -build() { - msg "Connecting to git server...." - - if [ -d ${srcdir}/$_gitname ] ; then - cd $_gitname - git reset --hard HEAD - git clean -fxd - git pull origin - - msg "The local files have been updated to the current revision" - - cd $srcdir/$_gitname - else - git clone $_gitroot --depth=1 - - cd $srcdir/$_gitname - fi - - /opt/qt5/bin/qmake - - # build qt master - make || return 1 -} - -package() { - cd $srcdir/$_gitname - - #install everything - make INSTALL_ROOT=$pkgdir install -} diff --git a/alarm/qtmultimedia-git/PKGBUILD b/alarm/qtmultimedia-git/PKGBUILD deleted file mode 100644 index f42af8e07..000000000 --- a/alarm/qtmultimedia-git/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# $Id$ -# Contributor: jzellner -# This package provides the master branch of QtBase 5 - -buildarch=4 - -pkgname=qtmultimedia-git -pkgver=20120417 -plugrel=1 -pkgrel=1 -pkgdesc="The Qt5 Multimedia - current development snapshot (master branch)" -arch=('i686' 'x86_64') -url="http://www.qt-project.org" -license=('GPL3' 'LGPL') - -depends=('qtbase-git' 'qtjsbackend-git' 'qtdeclarative-git') -optdepends=() -makedepends=('git') -provides=('qtmultimedia-git') -replaces=() -conflicts=() -options=() -source=() -md5sums=() - -_gitroot="git://gitorious.org/qt/qtmultimedia.git" -_gitname="qtmultimedia" - -build() { - msg "Connecting to git server...." - - if [ -d ${srcdir}/$_gitname ] ; then - cd $_gitname - git reset --hard HEAD - git clean -fxd - git pull origin - - msg "The local files have been updated to the current revision" - - cd $srcdir/$_gitname - else - git clone $_gitroot --depth=1 - - cd $srcdir/$_gitname - fi - - /opt/qt5/bin/qmake - - # build qt master - make || return 1 -} - -package() { - cd $srcdir/$_gitname - - #install everything - make INSTALL_ROOT=$pkgdir install -} diff --git a/alarm/qtxmlpatterns-git/PKGBUILD b/alarm/qtxmlpatterns-git/PKGBUILD deleted file mode 100644 index 6fbd903af..000000000 --- a/alarm/qtxmlpatterns-git/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# $Id$ -# Contributor: jzellner -# This package provides the master branch of QtBase 5 - -buildarch=4 - -pkgname=qtxmlpatterns-git -pkgver=20120417 -pkgrel=1 -plugrel=1 -pkgdesc="The Qt5 XML patterns library - current development snapshot (master branch)" -arch=('i686' 'x86_64') -url="http://www.qt-project.org" -license=('GPL3' 'LGPL') - -depends=('qtbase-git') -optdepends=() -makedepends=('git') -provides=('qtxmlpatterns') -replaces=() -conflicts=() -options=() -source=() -md5sums=() - -_gitname="qtxmlpatterns" -_gitroot="git://gitorious.org/qt/"$_gitname - -build() { - msg "Connecting to git server...." - - if [ -d ${srcdir}/$_gitname ] ; then - cd $_gitname - git reset --hard HEAD - git clean -fxd - git pull origin - - msg "The local files have been updated to the current revision" - - cd $srcdir/$_gitname - else - git clone $_gitroot --depth=1 - - cd $srcdir/$_gitname - fi - - /opt/qt5/bin/qmake - - # build qt master - make || return 1 -} - -package() { - cd $srcdir/$_gitname - - #install everything - make INSTALL_ROOT=$pkgdir install -} From 42fac5b5220ec223a6de632d89dfa0d21e4a4d8c Mon Sep 17 00:00:00 2001 From: Daniel Wallace Date: Mon, 8 Apr 2013 14:10:51 -0400 Subject: [PATCH 4/7] update freeswitch-git to pacman 4.1 --- aur/freeswitch-git/PKGBUILD | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/aur/freeswitch-git/PKGBUILD b/aur/freeswitch-git/PKGBUILD index 3056e3b41..22e02d154 100644 --- a/aur/freeswitch-git/PKGBUILD +++ b/aur/freeswitch-git/PKGBUILD @@ -68,8 +68,14 @@ _disabled_modules=(say/mod_say_ru # # pkgname=freeswitch-git -pkgver=20120424 -pkgrel=2 +_gitname="freeswitch" +pkgver=1.5.0.186.g9650476 +pkgver(){ + cd "$srcdir/$_gitname" + git describe | sed 's/-/./g;s/^v//' +} +epoch=1 +pkgrel=1 pkgdesc="Open Source soft switch (telephony engine) built from a specific, stable git commit tag" arch=('i686' 'x86_64') url="http://freeswitch.org" @@ -81,11 +87,9 @@ optdepends=('unixodbc: for odbc support in the core' provides=('freeswitch') conflicts=('freeswitch') install=freeswitch.install -source=('freeswitch.conf.d' 'freeswitch.rc.conf' 'README.freeswitch' 'run.freeswitch' 'run_log.freeswitch' 'conf_log.freeswitch') +source=('freeswitch.conf.d' 'freeswitch.rc.conf' 'README.freeswitch' 'run.freeswitch' 'run_log.freeswitch' 'conf_log.freeswitch' "$_gitname::git://git.freeswitch.org/freeswitch.git" ) changelog='ChangeLog' -_gitroot="git://git.freeswitch.org/freeswitch.git" -_gitname="freeswitch" enable_module() { _fs_mod=$1 @@ -98,24 +102,7 @@ disable_module() { } build() { - cd "$srcdir" - msg "Connecting to GIT server...." - - if [ -d $_gitname ] ; then - cd $_gitname - git pull origin master - msg "The local files are updated." - else - git clone --depth 1 $_gitroot - msg "FreeSWITCH repository cloned" - fi - - msg "GIT checkout done or server timeout" - msg "Starting make..." - - rm -rf "$srcdir/$_gitname-build" - cp -a "$srcdir/$_gitname/" "$srcdir/${_gitname}-build" - cd "$srcdir/$_gitname-build" + cd "$srcdir/$_gitname" # BUILD BEGINS msg "Bootstrapping..." @@ -176,7 +163,7 @@ disable_mod_xml() { } package() { - cd "$srcdir/$_gitname-build" + cd "$srcdir/$_gitname" make DESTDIR="$pkgdir/" install make DESTDIR="$pkgdir/" ${_sounds}moh-install make DESTDIR="$pkgdir/" ${_sounds}sounds-install @@ -226,4 +213,4 @@ md5sums=('f674b302edeb1895bbefcaf7bb8510ca' 'bfa0c6c70c8173bc78fd228bd42a98ef' '4126dcbe4e1e4f689230a0fe40edcb68' 'e9f0bdde366bca6fd29a9202818f3591' - 'e6411d793501c29ec4afd6d54018de1b') + 'e6411d793501c29ec4afd6d54018de1b' 'SKIP') From e3eeff69ac82754b80edb38eb255066b10dd451f Mon Sep 17 00:00:00 2001 From: Daniel Wallace Date: Mon, 8 Apr 2013 14:18:36 -0400 Subject: [PATCH 5/7] update pithos to pacman 4.1 --- aur/pithos-git/PKGBUILD | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/aur/pithos-git/PKGBUILD b/aur/pithos-git/PKGBUILD index 023c6c57a..b15dfef90 100644 --- a/aur/pithos-git/PKGBUILD +++ b/aur/pithos-git/PKGBUILD @@ -3,7 +3,12 @@ _pkgname=pithos pkgname=pithos-git -pkgver=20130108 +pkgver=294.759fd22 +pkgver(){ + cd "$srcdir/$_pkgname" + echo $(git rev-list --count master).$(git rev-parse --short master) +} +epoch=1 pkgrel=1 pkgdesc='Pandora Internet Radio player for GNOME' arch=('any') @@ -15,34 +20,20 @@ optdepends=('python2-keybinder2: for media keys plugin' 'gstreamer0.10-ugly-plugins: MP3 playback support') provides=("$_pkgname") conflicts=("$_pkgname-bzr" "$_pkgname") -source=("$pkgname.install") install="$pkgname.install" -md5sums=('c9db50a1fd3d86efe4d6f8a7b044e718') -_gitroot="git://github.com/kevinmehall/pithos.git" -_gitname="$_pkgname" +source=("git://github.com/kevinmehall/pithos.git") +md5sums=('SKIP') + build() { - cd "$srcdir" - msg "Connecting to GIT server...." - - if [[ -d "$_gitname" ]]; then - cd "$_gitname" && git pull origin - msg "The local files are updated." - else - git clone "$_gitroot" "$_gitname" - fi - - msg "GIT checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_gitname-build" - git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" + cd "$srcdir/$_pkgname" + python2 setup.py build } package() { - cd "$srcdir/$_gitname-build" - python2 setup.py install --optimize=1 --prefix=/usr --root="${pkgdir}/" + cd "$srcdir/$_pkgname" + python2 setup.py install --prefix=/usr --root="${pkgdir}/" } # vim:set ts=2 sw=2 et: From de310f449becf5423d1e4cab561cd2aff783ee0f Mon Sep 17 00:00:00 2001 From: Daniel Wallace Date: Mon, 8 Apr 2013 14:21:56 -0400 Subject: [PATCH 6/7] update Samen-git to pacman 4.1 --- aur/samen-git/PKGBUILD | 48 ++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 27 deletions(-) diff --git a/aur/samen-git/PKGBUILD b/aur/samen-git/PKGBUILD index 38e205f13..287cfd1d4 100644 --- a/aur/samen-git/PKGBUILD +++ b/aur/samen-git/PKGBUILD @@ -1,43 +1,37 @@ # Maintainer: Kai Uwe Jesussek plugrel=1 +_gitname="Samen" pkgname=samen-git -pkgver=20110616 +pkgver=6.1e5081b +pkgver(){ + cd $srcdir/$_gitname + echo $(git rev-list --count master).$(git rev-parse --short master) +} +epoch=1 pkgrel=1 -pkgdesc="samen is a ultra small wpa_supplicant (wpa_cli) action handler." +pkgdesc="An ultra small wpa_supplicant (wpa_cli) action handler." url="https://github.com/kimperator/Samen/wiki" arch=('arm' 'i686' 'x86_64') license=('GPL') provides=('samen') makedepends=('git' 'cmake') depends=('wpa_supplicant') -_gitroot=("git://github.com/kimperator/Samen.git") -_gitname=("Samen") +source=("git://github.com/kimperator/Samen.git") +prepare(){ + if [[ ! -d $srcdir/build ]]; then + mkdir build + fi +} build() { - cd ${srcdir} - - ## Git checkout - if [ -d ${srcdir}/${_gitname} ] ; then - msg "Git checkout: Updating existing tree" - cd ${_gitname} && git pull origin - msg "Git checkout: Tree has been updated" - else - msg "Git checkout: Retrieving sources" - git clone --depth 1 ${_gitroot} - fi - msg "Checkout completed" - - ## Build - rm -rf ${srcdir}/${_gitname}-build - cp -r ${srcdir}/${_gitname} ${srcdir}/${_gitname}-build - cd ${srcdir}/${_gitname}-build - mkdir build cd build - cmake .. + cmake $srcdir/$_gitname + make +} +package(){ + cd build make DESTDIR=${pkgdir} install - cp -r ../additions/arch/etc ${pkgdir} -} -package() { - true + cp -dpr --no-preserve=ownership $srcdir/$_gitname/additions/arch/etc ${pkgdir} } +md5sums=('SKIP') From cac8d43c2e40520e3a87d7832eaa22849184c749 Mon Sep 17 00:00:00 2001 From: Daniel Wallace Date: Mon, 8 Apr 2013 14:27:32 -0400 Subject: [PATCH 7/7] update sickbeard-git to pacman 4.1 --- aur/sickbeard-git/PKGBUILD | 57 +++++++++++------------ aur/sickbeard-git/sickbeard | 8 ---- aur/sickbeard-git/sickbeard.confd | 12 ----- aur/sickbeard-git/sickbeard.init | 75 ------------------------------- 4 files changed, 25 insertions(+), 127 deletions(-) delete mode 100644 aur/sickbeard-git/sickbeard delete mode 100644 aur/sickbeard-git/sickbeard.confd delete mode 100644 aur/sickbeard-git/sickbeard.init diff --git a/aur/sickbeard-git/PKGBUILD b/aur/sickbeard-git/PKGBUILD index afa4e4a1d..fb4152b8b 100644 --- a/aur/sickbeard-git/PKGBUILD +++ b/aur/sickbeard-git/PKGBUILD @@ -4,51 +4,44 @@ # Contributor: Augusto Born de Oliveira pkgname=sickbeard-git -pkgver=20130212 +pkgver=3412.fb37d33 pkgrel=1 +epoch=1 pkgdesc="A PVR application that downloads and manages your TV shows" -arch=(any) +arch=('any') url="http://code.google.com/p/sickbeard/" -license=(GPL3) -depends=(python2 python2-cheetah) -makedepends=(git) +license=('GPL3') +depends=('python2' 'python2-cheetah') +makedepends=('git') optdepends=('sabnzbd: NZB downloader' 'python-notify: desktop notifications') install=sickbeard.install -conflicts=(sickbeard) -source=('sickbeard-system.service' 'sickbeard-user.service' 'sickbeard.tmpfile') -sha256sums=('aa2b6496bf622d2b235a47b80d950ba84411e879a08bc656d227e224653aeded' +conflicts=('sickbeard') +source=("$pkgname::git://github.com/midgetspy/Sick-Beard.git" + 'sickbeard-system.service' 'sickbeard-user.service' 'sickbeard.tmpfile') +sha256sums=('SKIP' + 'aa2b6496bf622d2b235a47b80d950ba84411e879a08bc656d227e224653aeded' 'bf2f9792d3d7e1d703fec9bf61a1562a34b8d08d1dba3d560e6299ea25bd5a72' '24f20de2445ff3998aad5d87d94e0fea3b22eb1d0a451ed33ec301ac36a7398d') -_gitroot="git://github.com/midgetspy/Sick-Beard.git" -_gitname="sickbeardpvr" - -build() { - cd "$srcdir" - msg "Connecting to GIT server...." - - if [ -d $_gitname ]; then - cd $_gitname && git pull origin - msg "The local files are updated." - else - git clone $_gitroot $_gitname - fi - - msg "GIT checkout done or server timeout" - msg "Starting install..." +pkgver() { + cd "$srcdir"/$pkgname + echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)" } package() { - mkdir -p "${pkgdir}/opt/" - cp -r "$srcdir/$_gitname" "${pkgdir}/opt/sickbeard" - chmod 775 "${pkgdir}/opt/sickbeard" + mkdir -p "$pkgdir"/opt/sickbeard + cp -r "$srcdir"/$pkgname/* "$pkgdir"/opt/sickbeard + chmod 775 "$pkgdir"/opt/sickbeard - sed -i 's/python/python2/g' "${pkgdir}/opt/sickbeard/autoProcessTV/sabToSickBeard.py" - sed -i 's/python/python2/g' "${pkgdir}/opt/sickbeard/autoProcessTV/hellaToSickBeard.py" + sed -i 's/python/python2/g' "$pkgdir"/opt/sickbeard/autoProcessTV/sabToSickBeard.py + sed -i 's/python/python2/g' "$pkgdir"/opt/sickbeard/autoProcessTV/hellaToSickBeard.py - install -D -m644 "${srcdir}/sickbeard-system.service" "${pkgdir}/usr/lib/systemd/system/sickbeard.service" - install -D -m644 "${srcdir}/sickbeard-user.service" "${pkgdir}/usr/lib/systemd/user/sickbeard.service" - install -D -m644 "${srcdir}/sickbeard.tmpfile" "${pkgdir}/usr/lib/tmpfiles.d/sickbeard.conf" + install -D -m644 "$srcdir"/sickbeard-system.service "$pkgdir"/usr/lib/systemd/system/sickbeard.service + install -D -m644 "$srcdir"/sickbeard-user.service "$pkgdir"/usr/lib/systemd/user/sickbeard.service + install -D -m644 "$srcdir"/sickbeard.tmpfile "$pkgdir"/usr/lib/tmpfiles.d/sickbeard.conf + + find "$pkgdir" -type d -name '.git' -exec rm -r '{}' + } +# vim:set ts=2 sw=2 et: diff --git a/aur/sickbeard-git/sickbeard b/aur/sickbeard-git/sickbeard deleted file mode 100644 index 0c637f018..000000000 --- a/aur/sickbeard-git/sickbeard +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# This file is a user shortcut to the Sick Beard program. -# It should only be used for simple debugging and checking the Sick Beard arguments. -# The initscript and unit use the longer command found here to prevent problems with PIDs. - -/usr/bin/env python2 /opt/sickbeard/SickBeard.py "$@" - diff --git a/aur/sickbeard-git/sickbeard.confd b/aur/sickbeard-git/sickbeard.confd deleted file mode 100644 index 8a2285f69..000000000 --- a/aur/sickbeard-git/sickbeard.confd +++ /dev/null @@ -1,12 +0,0 @@ -# Configuration parameters for the sickbeard daemon. - -# User that Sick Beard will run as -# Leave blank to run as the current user (likely root). -# If you change the user, you must now modify the sickbeard tmpfiles config file. -# To do that, copy /usr/lib/tmpfiles.d/sickbeard.conf to /etc/tmpfiles.d/sickbeard.conf and modify the user in that file. -# You also need to change the datadir to somewhere writable by that user by adding it to the SB_ARGS, e.g. --datadir=/home/$USER/.sickbeard -SB_USER="sickbeard" - -# Sick Beard arguments -SB_ARGS="--quiet --daemon --config /opt/sickbeard/config.ini" - diff --git a/aur/sickbeard-git/sickbeard.init b/aur/sickbeard-git/sickbeard.init deleted file mode 100644 index 271d188da..000000000 --- a/aur/sickbeard-git/sickbeard.init +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/sickbeard - -SB_PIDFILE="/run/sickbeard/sickbeard.pid" - -case "$1" in - start) - stat_busy "Starting Sick Beard" - - if [ -f /run/daemons/sickbeard ]; then - echo "Sick Beard is already running as a daemon! If you are certain it is not, remove /run/daemons/sickbeard." - stat_fail - elif [ -f $SB_PIDFILE ]; then - echo "Sick Beard may already be running. If you are certain it is not, remove $SB_PIDFILE." - stat_fail - else - SB_ARGS+=" --pidfile $SB_PIDFILE" - if [ ! "$SB_USER" ]; then - /usr/bin/env python2 /opt/sickbeard/SickBeard.py $SB_ARGS - RC=$? - else - su - $SB_USER -s /bin/sh -c "/usr/bin/env python2 /opt/sickbeard/SickBeard.py $SB_ARGS" - RC=$? - fi - - if [ $RC -gt 0 ]; then - stat_fail - else - add_daemon sickbeard - stat_done - fi - fi - ;; - stop) - stat_busy "Stopping Sick Beard" - - if [ ! -f $SB_PIDFILE ]; then - echo "The pid file is missing. Check that Sick Beard is actually running." - RC=1 - else - read -r SB_PID < $SB_PIDFILE - kill $SB_PID - RC=$? - fi - - if [ $RC -gt 0 ]; then - echo "The shutdown failed. Check that Sick Beard is actually running." - stat_fail - else - while [ -f $SB_PIDFILE ]; do - sleep 1 - done - - rm_daemon sickbeard - stat_done - fi - ;; - restart) - "$0" stop - sleep 1 - "$0" start - ;; - status) - stat_busy "Sick Beard daemon status:"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|restart|status}" -esac -exit 0 -