Upstream moved to Github. Merged keymaps into the package.

2 files changed, 20 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aec305303b87..2863290369d2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,22 @@
 # Generated by mksrcinfo v8
-# Mon Dec 14 21:01:02 UTC 2015
+# Fri Jan 22 20:19:35 UTC 2016
 pkgbase = logkeys-git
 	pkgdesc = Simple keylogger supporting also USB keyboards.
-	pkgver = 2012.02.06
-	pkgrel = 5
-	url = http://logkeys.googlecode.com/
+	pkgver = r40.78321c6
+	pkgrel = 1
+	epoch = 1
+	url = https://github.com/kernc/logkeys
 	install = logkeys.install
 	arch = i686
 	arch = x86_64
 	license = GPLv3
 	makedepends = git
-	optdepends = logkeys-keymaps-git: for additional keymaps
 	provides = logkeys
 	conflicts = logkeys
 	backup = etc/conf.d/logkeysd
 	source = logkeysd.conf
 	source = logkeys.service
-	source = logkeys::git+http://logkeys.googlecode.com/git/
+	source = logkeys::git+https://github.com/kernc/logkeys
 	md5sums = c05608a47e303e8f604f46d1ed22aa4a
 	md5sums = bd70a5e5601168bbf7bf7f91ee530d14
 	md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 127b6affd3cb..eded282714a7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,40 +4,45 @@
 
 pkgname=logkeys-git
 _gitname="logkeys"
-pkgver=2012.02.06
-pkgrel=5
+pkgver=r40.78321c6
+epoch=1
+pkgrel=1
 pkgdesc="Simple keylogger supporting also USB keyboards."
 license=('GPLv3')
 arch=('i686' 'x86_64')
-optdepends=('logkeys-keymaps-git: for additional keymaps')
 makedepends=('git')
 conflicts=('logkeys')
 provides=('logkeys')
-url="http://logkeys.googlecode.com/"
+url="https://github.com/kernc/logkeys"
 install=logkeys.install
 backup=('etc/conf.d/logkeysd')
 source=("logkeysd.conf" "logkeys.service"
-        "$_gitname::git+http://logkeys.googlecode.com/git/")
+        "$_gitname::git+https://github.com/kernc/logkeys")
 
 md5sums=('c05608a47e303e8f604f46d1ed22aa4a'
          'bd70a5e5601168bbf7bf7f91ee530d14'
          'SKIP')
 
 pkgver() {
-        cd "$_gitname"
-        git log -1 --format="%cd" --date=short | sed 's|-|.|g'
+	cd "$_gitname"
+	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
-	cd "$srcdir/$_gitname"
+	cd "$_gitname"
 	./configure --prefix=/usr --sysconfdir=/etc
 	make
 }
 
 package() {
-	cd "$srcdir/$_gitname"
+	cd "$_gitname"
 	make prefix="$pkgdir/usr" sysconfdir="$pkgdir/etc" install
 
 	install -Dm0644 "$srcdir/logkeysd.conf" "$pkgdir/etc/conf.d/logkeysd"
 	install -Dm0644 "$srcdir/logkeys.service" "$pkgdir/usr/lib/systemd/system/logkeys.service"
+
+	cd "keymaps"
+	for filename in $(ls *.map); do
+		install -D -m 644 "${filename}" "${pkgdir}/usr/share/lkmaps/${filename}"
+	done
 }