Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre

5 files changed, 13 insertions, 88 deletions

diff --git a/pcr/check/PKGBUILD b/pcr/check/PKGBUILD
deleted file mode 100644
index fc5f6710f..000000000
--- a/pcr/check/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 220445 2014-08-20 19:25:35Z heftig $
-# Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor (Arch): Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor (Arch): Jeremy Cowgar <jeremy@cowgar.com>
-
-pkgname=check
-pkgver=0.9.14
-pkgrel=1
-pkgdesc="A unit testing framework for C"
-arch=('i686' 'x86_64')
-url="http://check.sourceforge.net/"
-license=('LGPL')
-install=$pkgname.install
-depends=('awk')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('38263d115d784c17aa3b959ce94be8b8')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  # Extremely long
-  #make -k check
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # get rid of the package's info directory,
-  # install-info adds entries for us at install-time
-  rm "$pkgdir/usr/share/info/dir"
-
-  # svn log file is too big
-  rm "$pkgdir"/usr/share/doc/check/*ChangeLog*
-}
diff --git a/pcr/check/check.install b/pcr/check/check.install
deleted file mode 100644
index c4092e298..000000000
--- a/pcr/check/check.install
+++ /dev/null
@@ -1,20 +0,0 @@
-_infodir=/usr/share/info
-_filelist=(check.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${_filelist[@]}; do
-    install-info $_infodir/$file $_infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${_filelist[@]}; do
-    install-info --delete $_infodir/$file $_infodir/dir 2> /dev/null
-  done
-}
diff --git a/pcr/xbmc-standalone-service/PKGBUILD b/pcr/kodi-standalone-service/PKGBUILD
index e0bb7537a..2e81d9251 100644
--- a/pcr/xbmc-standalone-service/PKGBUILD
+++ b/pcr/kodi-standalone-service/PKGBUILD
@@ -8,21 +8,22 @@
 # Contributor (Arch): Maxime Gauduin <alucryd@gmail.com>
 # Maintainer : André Silva <emulatorman@parabola.nu>
 
-pkgname=xbmc-standalone-service
-pkgver=1.0
-pkgrel=4
-pkgdesc="Systemd service and user to autostart xbmc at boot"
+pkgname=kodi-standalone-service
+pkgver=1.8
+pkgrel=1
+pkgdesc="Systemd service and user to autostart kodi at boot"
 arch=('any')
-url="https://wiki.parabolagnulinux.org/index.php/Xbmc#Autostarting_at_boot"
+url="https://wiki.parabola.nu/index.php/Kodi#Kodi-standalone-service"
 license=('GPL')
-depends=('xbmc' 'systemd' 'xorg-xinit')
+depends=('systemd' 'xorg-server' 'xorg-xinit' 'kodi')
+replaces=('xbmc-standalone-service')
 install=readme.install
-source=(xbmc.service)
-sha256sums=('1a94a7952ef99cd3dd6f4b921630563f72a3b907265e91e0a37b07339081558c')
+source=("https://github.com/graysky2/$pkgname/archive/v$pkgver.tar.gz")
+sha256sums=('a165a66e976bb1a6ac622618887c2f9699acd84d8790af517b85a66bf5e0474c')
 
 package() {
-	install -Dm0644 "$srcdir/xbmc.service" "$pkgdir/usr/lib/systemd/system/xbmc.service"
-
-	install -dm 700 "${pkgdir}"/var/lib/xbmc
-	chown 420:420 "${pkgdir}"/var/lib/xbmc
+	install -Dm644 "$srcdir/$pkgname-$pkgver/init/kodi.service" \
+		"$pkgdir/usr/lib/systemd/system/kodi.service"
+	install -dm 700 "$pkgdir"/var/lib/kodi
+	chown 420:420 "$pkgdir"/var/lib/kodi
 }
diff --git a/pcr/xbmc-standalone-service/readme.install b/pcr/kodi-standalone-service/readme.install
index 0f5edbec0..0f5edbec0 100644
--- a/pcr/xbmc-standalone-service/readme.install
+++ b/pcr/kodi-standalone-service/readme.install
diff --git a/pcr/xbmc-standalone-service/xbmc.service b/pcr/xbmc-standalone-service/xbmc.service
deleted file mode 100644
index 90119f07d..000000000
--- a/pcr/xbmc-standalone-service/xbmc.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description = Starts instance of XBMC using xinit
-After = systemd-user-sessions.service network.target
-Conflicts=getty@tty7.service
-
-[Service]
-User = xbmc
-Group = xbmc
-PAMName=login
-Type = simple
-TTYPath=/dev/tty7
-ExecStart = /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/bin/xbmc-standalone -- :0 -nolisten tcp vt7
-Restart = on-abort
-
-[Install]
-WantedBy = multi-user.target