Merge in lazyman-git changes

Also updates to newest release 2.3.0.20180226

5 files changed, 65 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 049a2ed30a19..1e8de728888c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,27 @@
 pkgbase = lazyman
 	pkgdesc = A simple program that lets you stream every NHL and MLB game
-	pkgver = 2.3.0
+	pkgver = 2.3.0.20180226
 	pkgrel = 1
 	url = https://github.com/StevensNJD4/LazyMan
 	arch = any
-	license = GPL
-	depends = python
-	depends = python-setuptools
-	depends = jdk8-openjdk
-	optdepends = vlc: optional video player - choose one
-	optdepends = mpv: optional video player - choose one
-	source = https://github.com/StevensNJD4/LazyMan/releases/download/2.3.0.20171231/Mac_Linux.zip
+	license = GPL2
+	makedepends = java-environment>=8
+	makedepends = apache-ant
+	makedepends = git
+	depends = java-runtime>=8
+	depends = streamlink
+	optdepends = vlc: requires a video player - choose one
+	optdepends = mpv: requires a video player - choose one
+	backup = usr/share/java/lazyman/config.properties
+	source = git+https://github.com/StevensNJD4/LazyMan.git#commit=30374572eed67f134cc9b54b4601233fc4b52c7b
+	source = config.properties
 	source = lazyman.sh
 	source = lazyman.desktop
 	source = lazyman.png
-	md5sums = d1366c1dcfc4ec786de42b90a478e709
-	md5sums = 1d3917bff7f174d3e19e62d1ea2b49a7
-	md5sums = fdfd3f5bad0b9ec34f15a361ff737f4c
+	md5sums = SKIP
+	md5sums = d41d8cd98f00b204e9800998ecf8427e
+	md5sums = b76d76bc5941418f8f3048b941fa8228
+	md5sums = 298ca421d04992c9a9c224dff3a459a3
 	md5sums = 41aebb968e8b6856d1b73cabd6a8c5d2
 
 pkgname = lazyman
diff --git a/PKGBUILD b/PKGBUILD
index ecd46c14f0c2..23e530690c88 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,54 @@
 # Maintainer: Jace Bennest <jacebennest87 at gmail dot com>
+# Contributor: skydrome <skydrome at i2pmail dot org>
 # Contributor: StevensNJD4 <github dot com slash StevensNJD4>
+
 pkgname=lazyman
-pkgver=2.3.0
+pkgver=2.3.0.20180226
 pkgrel=1
 pkgdesc="A simple program that lets you stream every NHL and MLB game"
 arch=('any')
 url="https://github.com/StevensNJD4/LazyMan"
-license=('GPL')
-depends=('python' 'python-setuptools' 'jdk8-openjdk')
-optdepends=('vlc: optional video player - choose one' 'mpv: optional video player - choose one')
-source=('https://github.com/StevensNJD4/LazyMan/releases/download/2.3.0.20171231/Mac_Linux.zip'
+license=('GPL2')
+depends=('java-runtime>=8' 'streamlink')
+makedepends=('java-environment>=8' 'apache-ant' 'git')
+optdepends=('vlc: requires a video player - choose one' 'mpv: requires a video player - choose one')
+backup=('usr/share/java/lazyman/config.properties')
+
+source=('git+https://github.com/StevensNJD4/LazyMan.git#commit=30374572eed67f134cc9b54b4601233fc4b52c7b'
+	'config.properties'
 	"$pkgname".sh
 	"$pkgname".desktop
 	"$pkgname".png)
 
+pkgver() {
+    cd "$srcdir/LazyMan"
+    cat VERSION
+}
+
+build() {
+    cd "$srcdir/LazyMan"
+    rm -rf build dist store
+    ant -Dplatforms.JDK_1.8.home=/usr/lib/jvm/default jar
+}
+
 package() {
-	sudo easy_install -U streamlink
-	install -Dm755 "$pkgname".sh "$pkgdir"/usr/bin/"$pkgname"
-	install -Dm755 "$pkgname".desktop "$pkgdir"/usr/share/applications/"$pkgname".desktop
-	install -Dm755 "$pkgname".png "$pkgdir"/opt/"$pkgname"/"$pkgname".png
-	install -Dm755 LazyMan.jar "$pkgdir"/opt/"$pkgname"/"$pkgname".jar
+    cd "$srcdir"
+    install -dm755 "$pkgdir"/usr/bin
+    install -dm755 "$pkgdir"/usr/share/applications
+    install -dm755 "$pkgdir"/usr/share/icons
+    install -dm777 "$pkgdir"/usr/share/java/lazyman
+    install -dm755 "$pkgdir"/usr/share/java/lazyman/lib
+    install -Dm755 lazyman.sh                "$pkgdir"/usr/bin/lazyman
+    install -Dm644 lazyman.desktop           "$pkgdir"/usr/share/applications/lazyman.desktop
+    install -Dm644 lazyman.png               "$pkgdir"/usr/share/icons/lazyman.png
+    install -Dm777 config.properties         "$pkgdir"/usr/share/java/lazyman/config.properties
+    install -Dm644 LazyMan/dist/LazyMan.jar  "$pkgdir"/usr/share/java/lazyman/LazyMan.jar
+    install -Dm644 LazyMan/src/lazyman/*.jar "$pkgdir"/usr/share/java/lazyman/lib/
 }
 
-md5sums=('d1366c1dcfc4ec786de42b90a478e709'
-         '1d3917bff7f174d3e19e62d1ea2b49a7'
-         'fdfd3f5bad0b9ec34f15a361ff737f4c'
+md5sums=('SKIP'
+         'd41d8cd98f00b204e9800998ecf8427e'
+         'b76d76bc5941418f8f3048b941fa8228'
+         '298ca421d04992c9a9c224dff3a459a3'
          '41aebb968e8b6856d1b73cabd6a8c5d2')
+
diff --git a/config.properties b/config.properties
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/config.properties
diff --git a/lazyman.desktop b/lazyman.desktop
index e9f2105e8107..a06c5f458052 100644
--- a/lazyman.desktop
+++ b/lazyman.desktop
@@ -1,10 +1,11 @@
 [Desktop Entry]
 Name=LazyMan
 Version=1.0
-Comment=None
-Exec=/usr/bin/lazyman
-Icon=/opt/lazyman/lazyman.png
+Comment=Stream every NHL and MLB game
+Path=/usr/bin
+Exec=lazyman
+Icon=/usr/share/icons/lazyman.png
 Terminal=false
 Type=Application
-Categories=Video,Player
+Categories=Video;AudioVideo;TV;Player;
 StartupNotify=false
diff --git a/lazyman.sh b/lazyman.sh
index a32fc8aadf4c..52200f3cb4e1 100644
--- a/lazyman.sh
+++ b/lazyman.sh
@@ -1,3 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-exec sudo /usr/bin/java -jar /opt/lazyman/lazyman.jar
+cpath=/usr/share/java/lazyman/lib
+java -cp \
+    $cpath/gson-2.7.jar:$cpath/jcalendar-1.4.jar:$cpath/AppleJavaExtensions-1.4.jar:/usr/share/java/lazyman/LazyMan.jar \
+    lazyman.LazyMan