cleanup install files, use make targets for installing

5 files changed, 22 insertions, 68 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7ecd5846a218..850788ae65a1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Nov 25 14:23:57 UTC 2016
+# Fri Dec 30 14:09:24 UTC 2016
 pkgbase = razer-drivers-git
 	pkgdesc = An entirely open source driver and user-space daemon that allows you to manage your Razer peripherals on GNU/Linux.
-	pkgver = 1.0.17.r24.ga4e2da0
+	pkgver = 1.1.3.r45.gcdd5fe4
 	pkgrel = 1
 	url = https://github.com/terrycain/razer_drivers
 	arch = any
@@ -10,13 +10,14 @@ pkgbase = razer-drivers-git
 	makedepends = git
 	makedepends = make
 	makedepends = python
-	optdepends = razercommander-git: gtk frontend for razer-drivers
+	makedepends = python-setuptools
+	optdepends = polychromatic: gtk frontend
+	optdepends = razercommander-git: gtk frontend
 	source = razer-drivers-git::git+https://github.com/terrycain/razer_drivers.git
-	md5sums = SKIP
+	sha512sums = SKIP
 
 pkgname = python-razer-git
 	pkgdesc = A python library for controlling razer-daemon
-	install = python-razer-git.install
 	depends = razer-daemon
 	depends = python
 	depends = python-dbus
@@ -26,7 +27,6 @@ pkgname = python-razer-git
 
 pkgname = razer-daemon-git
 	pkgdesc = A daemon for controlling razer-driver
-	install = razer-daemon-git.install
 	depends = razer-driver-dkms
 	depends = python-dbus
 	depends = python-gobject
@@ -35,7 +35,7 @@ pkgname = razer-daemon-git
 	depends = xdotool
 	depends = libdbus
 	depends = python-notify2
-	depends = dbus-glib
+	depends = python-pyudev
 	provides = razer-daemon
 	conflicts = razer-daemon
 
diff --git a/PKGBUILD b/PKGBUILD
index fa2046654ee7..1c70e482d32c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,16 +3,17 @@
 
 pkgbase=razer-drivers-git
 pkgname=('python-razer-git' 'razer-daemon-git' 'razer-driver-dkms-git')
-pkgver=1.0.17.r24.ga4e2da0
+pkgver=1.1.3.r45.gcdd5fe4
 pkgrel=1
 pkgdesc="An entirely open source driver and user-space daemon that allows you to manage your Razer peripherals on GNU/Linux."
 arch=('any')
 url="https://github.com/terrycain/razer_drivers"
 license=('GPL2')
-makedepends=('git' 'make' 'python')
-optdepends=('razercommander-git: gtk frontend for razer-drivers')
+makedepends=('git' 'make' 'python' 'python-setuptools')
+optdepends=('polychromatic: gtk frontend'
+            'razercommander-git: gtk frontend')
 source=("$pkgbase::git+https://github.com/terrycain/razer_drivers.git")
-md5sums=('SKIP')
+sha512sums=('SKIP')
 
 pkgver() {
   cd $pkgbase
@@ -20,63 +21,32 @@ pkgver() {
 }
 
 package_python-razer-git() {
-  _srcpkgdir="$srcdir/$pkgbase"
-  _pythondir=$(python -c 'import sys; print(sys.path[-1])')
   pkgdesc="A python library for controlling razer-daemon"
   depends=('razer-daemon' 'python' 'python-dbus' 'python-numpy')
   provides=('python-razer')
   conflicts=('python-razer')
-  install=$pkgname.install
 
-  mkdir -p $pkgdir/$_pythondir
-
-  cp -r $_srcpkgdir/pylib/razer $pkgdir/$_pythondir/
+  cd $srcdir/$pkgbase
+  make DESTDIR=$pkgdir python_library_install
 }
 
 package_razer-daemon-git() {
-  _srcpkgdir="$srcdir/$pkgbase"
-  _pythondir=$(python -c 'import sys; print(sys.path[-1])')
   pkgdesc="A daemon for controlling razer-driver"
-  depends=('razer-driver-dkms' 'python-dbus' 'python-gobject' 'python-setproctitle' 'xautomation' 'xdotool' 'libdbus' 'python-notify2' 'dbus-glib')
+  depends=('razer-driver-dkms' 'python-dbus' 'python-gobject' 'python-setproctitle' 'xautomation' 'xdotool' 'libdbus' 'python-notify2' 'python-pyudev')
   provides=('razer-daemon')
   conflicts=('razer-daemon')
-  install=$pkgname.install
-  
-  # use the make file instead of copying manually? maybe, not now.
-  mkdir -p $pkgdir/usr/share/razer-service
-  mkdir -p $pkgdir/usr/share/man/man5
-  mkdir -p $pkgdir/usr/share/man/man8
-  mkdir -p $pkgdir/$_pythondir
-  mkdir -p $pkgdir/usr/bin
-  mkdir -p $pkgdir/etc/xdg/autostart
-
-  cp -r $_srcpkgdir/daemon/razer_daemon $pkgdir/$_pythondir/
-  cp $_srcpkgdir/daemon/run_razer_daemon.py $pkgdir/usr/bin/razer-service
-  cp $_srcpkgdir/daemon/resources/razer.conf $pkgdir/usr/share/razer-service/razer.conf.example
 
-  cp -v $_srcpkgdir/install_files/desktop/razer-service.desktop $pkgdir/etc/xdg/autostart/razer-service.desktop
-  
-  gzip -c $_srcpkgdir/daemon/resources/man/razer.conf.5 > $pkgdir/usr/share/man/man5/razer.conf.5.gz
-  gzip -c $_srcpkgdir/daemon/resources/man/razer-service.8 > $pkgdir/usr/share/man/man8/razer-service.8.gz
+  cd $srcdir/$pkgbase
+  make DESTDIR=$pkgdir daemon_install
 }
 
 package_razer-driver-dkms-git() {
-  _srcpkgdir="$srcdir/$pkgbase"
   pkgdesc="An entirely open source driver for managing Razer peripherals on Linux. (DKMS)"
   depends=('dkms' 'udev')
   provides=('razer-driver-dkms')
   conflicts=('razer-driver-dkms')
-  install=$pkgname.install
-  
-  #part1: dkms driver
-  mkdir -p $pkgdir/usr/src/$pkgbase-$pkgver
-  mkdir -p $pkgdir/usr/lib/udev/rules.d
-
-  cp -r $_srcpkgdir/driver $pkgdir/usr/src/$pkgbase-$pkgver
-  cp $_srcpkgdir/Makefile $pkgdir/usr/src/$pkgbase-$pkgver
-  cp $_srcpkgdir/install_files/dkms/dkms.conf $pkgdir/usr/src/$pkgbase-$pkgver
+  install=razer-driver-dkms-git.install
   
-  #part2: udev rules
-  cp $_srcpkgdir/install_files/udev/99-razer.rules $pkgdir/usr/lib/udev/rules.d
-  cp $_srcpkgdir/install_files/udev/razer_mount $pkgdir/usr/lib/udev
+  cd $srcdir/$pkgbase
+  make DESTDIR=$pkgdir setup_dkms udev_install
 }
diff --git a/python-razer-git.install b/python-razer-git.install
deleted file mode 100644
index 4a1398fac582..000000000000
--- a/python-razer-git.install
+++ /dev/null
@@ -1,4 +0,0 @@
-pre_remove() {
-  _pythondir=$(python3 -c 'import sys; print(sys.path[-1])')
-  find $_pythondir/razer/ -name '__pycache__' | xargs rm -rf
-}
diff --git a/razer-daemon-git.install b/razer-daemon-git.install
deleted file mode 100644
index 832315781fba..000000000000
--- a/razer-daemon-git.install
+++ /dev/null
@@ -1,4 +0,0 @@
-pre_remove() {
-  _pythondir=$(python3 -c 'import sys; print(sys.path[-1])')
-  find $_pythondir/razer_daemon/ -name '__pycache__' | xargs rm -rf
-}
diff --git a/razer-driver-dkms-git.install b/razer-driver-dkms-git.install
index ce48de1108d5..b3d48dae270f 100644
--- a/razer-driver-dkms-git.install
+++ b/razer-driver-dkms-git.install
@@ -1,17 +1,9 @@
 post_install() {
-  if ! getent group plugdev
-  then
-    sudo groupadd --system plugdev
-  fi
+  getent group plugdev >/dev/null || groupadd -r plugdev
+
   echo -e "\e[31m********************************************"
   echo -e "\e[31m* To complete installation, please run:    *"
   echo -e "\e[31m* # sudo gpasswd -a <yourUsername> plugdev *"
   echo -e "\e[31m********************************************"
   echo -e -n "\e[39m"
-  sleep 5
-  udevadm control --reload-rules
-}
-
-pre_remove() {
-  udevadm control --reload-rules
 }