Merge branch 'lmiphay-jivelite-20170915'

4 files changed, 75 insertions, 114 deletions

diff --git a/media-sound/jivelite/Manifest b/media-sound/jivelite/Manifest
index fc8cd6e..9813d4c 100644
--- a/media-sound/jivelite/Manifest
+++ b/media-sound/jivelite/Manifest
@@ -1,2 +1 @@
-EBUILD jivelite-20141213-r1.ebuild 1126 SHA256 677ea3797b86b1e3790674601f1bc25932c2b8a33b5521d32c56201d5ad1a2a5 SHA512 8e89f1aab4e295162a8557dc5739bbb791e19f5cbd692c83343ee564f05062875da6de510a9425c4b66b11b7f03e0043f2c13ff3517392b51a69d39935cf7d32 WHIRLPOOL 6349760fb472c71035b43c814edc10a3e851e0c49b4830365c4080466387dfc91c9cc8a0b237085d011ac8a9d849a50d3738c69d221bf4a43e9fda3f0736e3e6
-EBUILD jivelite-20141213.ebuild 1121 SHA256 ae20bc91f296810bd436bf0a78dfe0e58cd257f9884b76b0121956278f05322a SHA512 e5b489a4fdb2b14b8aa9b41bfa643e5775fc44bcf5db946cfca6300f57d1d44772afa370ef2bc44d5981c3feffd3d7a94f7718b69a5fdc4c1c13d31d4a4ac992 WHIRLPOOL 04aeba85f7782f3f3953d9ab7628bfbfb6d8a497006d5b8dad1b5579ac943b10049ff9a80e36ab2b17eedd29ef79351e2e487ef660e7485ace462905c36a1f5e
+EBUILD jivelite-20170915.ebuild 1923 SHA256 85dd0660b1e7fcc84a5e3872ac203f21800bdae6d25879aee161e15f318b32e5 SHA512 9bf1caedd12d681309fe817e5e39aeb99139800717c53f26b0e9eb1fe4c5c7be1a7cf69b144523f3fa5b1bf1bd8d5716449fe625e12568f2a1cc3824e07ef5fd WHIRLPOOL 73ed4b9c343b3dae3c1d1a21cb184ab1b3b33eaf1d73559292bc18a3ea796802b28738ceb3e9196efb4ed0b3561d4e22b81d2937cd63e7801b404baa908f3782
diff --git a/media-sound/jivelite/jivelite-20141213-r1.ebuild b/media-sound/jivelite/jivelite-20141213-r1.ebuild
deleted file mode 100644
index 59cfb95..0000000
--- a/media-sound/jivelite/jivelite-20141213-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils git-r3
-
-DESCRIPTION="Experimental squeezebox and derivative control application"
-HOMEPAGE="https://code.google.com/p/jivelite/"
-
-EGIT_REPO_URI="https://code.google.com/p/jivelite/"
-EGIT_COMMIT="de07c79a717fa678d8ae8d87f5ef41d16357949b"
-
-LICENSE="jivelite"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-lang/luajit
-	dev-lua/lua-cjson
-	dev-lua/luacrypto
-	dev-lua/luaexpat
-	dev-lua/luafilesystem
-	dev-lua/luasocket
-	media-libs/libsdl
-	media-libs/sdl-image[png]
-	media-libs/sdl-ttf
-	media-libs/sdl-gfx
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e 's;-lpthread;-lpthread -lrt;' "src/Makefile"
-	sed -i -e 's;"arp ";"/sbin/arp ";' "share/jive/jive/net/NetworkThread.lua"
-	epatch_user
-}
-
-src_compile() {
-	emake -C src PREFIX=/usr
-}
-
-src_install() {
-	dobin bin/jivelite
-	insinto /usr/share/jive
-
-	doins -r share/jive/jive
-
-	doins -r share/jive/fonts
-	doins -r share/jive/applets
-
-	for i in loop ltn12.lua lxp mime.lua socket socket.lua ; do
-		doins -r share/lua/5.1/$i
-	done
-}
diff --git a/media-sound/jivelite/jivelite-20141213.ebuild b/media-sound/jivelite/jivelite-20141213.ebuild
deleted file mode 100644
index 973e446..0000000
--- a/media-sound/jivelite/jivelite-20141213.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils git-r3
-
-DESCRIPTION="Experimental squeezebox and derivative control application"
-HOMEPAGE="https://code.google.com/p/jivelite/"
-
-EGIT_REPO_URI="https://code.google.com/p/jivelite/"
-EGIT_COMMIT="de07c79a717fa678d8ae8d87f5ef41d16357949b"
-
-LICENSE="jivelite"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-lang/luajit
-	dev-lua/lua-cjson
-	dev-lua/luacrypto
-	dev-lua/luaexpat
-	dev-lua/luafilesystem
-	dev-lua/luasocket
-	media-libs/libsdl
-	media-libs/sdl-image
-	media-libs/sdl-ttf
-	media-libs/sdl-gfx
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e 's;-lpthread;-lpthread -lrt;' "src/Makefile"
-	sed -i -e 's;"arp ";"/sbin/arp ";' "share/jive/jive/net/NetworkThread.lua"
-	epatch_user
-}
-
-src_compile() {
-	emake -C src PREFIX=/usr
-}
-
-src_install() {
-	dobin bin/jivelite
-	insinto /usr/share/jive
-
-	doins -r share/jive/jive
-
-	doins -r share/jive/fonts
-	doins -r share/jive/applets
-
-	for i in loop ltn12.lua lxp mime.lua socket socket.lua ; do
-		doins -r share/lua/5.1/$i
-	done
-}
diff --git a/media-sound/jivelite/jivelite-20170915.ebuild b/media-sound/jivelite/jivelite-20170915.ebuild
new file mode 100644
index 0000000..e0ee12a
--- /dev/null
+++ b/media-sound/jivelite/jivelite-20170915.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils git-r3
+
+DESCRIPTION="Community logitech media server control application"
+HOMEPAGE="https://github.com/ralph-irving/jivelite"
+
+EGIT_REPO_URI="https://github.com/ralph-irving/jivelite.git"
+EGIT_COMMIT="d3f683ca70ea1c959e8e994e7c94d9f036963760"
+
+LICENSE="jivelite"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-lang/luajit
+	dev-lua/lua-cjson
+	dev-lua/luacrypto
+	dev-lua/luaexpat
+	dev-lua/luafilesystem
+	dev-lua/luasocket
+	media-libs/libsdl
+	media-libs/sdl-image[png]
+	media-libs/sdl-ttf
+	media-libs/sdl-gfx
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i -e 's;-lpthread;-lpthread -lrt;' "src/Makefile"
+
+	sed -i -e 's;CFLAGS  = -O2;CFLAGS  +=;' "lib-src/luazipfilter/Makefile"
+	sed -i -e 's;LDFLAGS =;LDFLAGS += -shared;' "lib-src/luazipfilter/Makefile"
+
+	sed -i '/CC= gcc/d' "lib-src/luamd5/Makefile"
+	sed -i -e 's;CFLAGS= $(INCS) $(DEFS) $(WARN) -O2 $G -fPIC;CFLAGS += $(INCS) $(DEFS) -fPIC;' "lib-src/luamd5/Makefile"
+	sed -i -e 's;$(MYLDFLAGS);-shared $(LDFLAGS) $(MYLDFLAGS);' "lib-src/luamd5/Makefile"
+
+	sed -i -e 's;"arp ";"/sbin/arp ";' "share/jive/jive/net/NetworkThread.lua"
+	eapply_user
+}
+
+src_compile() {
+	emake -C src PREFIX=/usr
+	emake -C lib-src/luazipfilter PREFIX=/usr
+	emake -C lib-src/luamd5 PREFIX=/usr MYNAME=sha1
+	emake -C lib-src/luamd5 PREFIX=/usr MYNAME=md5
+}
+
+src_install() {
+	dobin bin/jivelite
+	insinto /usr/share/jive
+
+	doins -r share/jive/jive
+
+	doins -r share/jive/fonts
+	doins -r share/jive/applets
+
+	for i in loop ltn12.lua lxp mime.lua socket socket.lua ; do
+		doins -r share/lua/5.1/$i
+	done
+
+	doins lib-src/luazipfilter/zipfilter.so
+	doins lib-src/luamd5/md5.so
+	doins lib-src/luamd5/sha1.so
+}
+
+pkg_postinst() {
+	elog "Support thread at: http://forums.slimdevices.com/showthread.php?98156-Announce-JiveLite-cut-down-squeezebox-control-application"
+}