From f3ed30281434619c7324f7f7e771d38d3e65be15 Mon Sep 17 00:00:00 2001
From: Ben Roberts <ben@sihnon.net>
Date: Sun, 22 Jan 2012 02:06:19 +0000
Subject: [PATCH] Fix ripping-cluster build, add sihnon-js-lib dependency

---
 dev-libs/sihnon-js-lib/Manifest               |  2 ++
 .../sihnon-js-lib/sihnon-js-lib-0.1.0.ebuild  | 34 +++++++++++++++++++
 media-video/ripping-cluster/Manifest          |  2 +-
 ...4.ebuild => ripping-cluster-0.4-r2.ebuild} | 26 ++++++++------
 4 files changed, 53 insertions(+), 11 deletions(-)
 create mode 100644 dev-libs/sihnon-js-lib/Manifest
 create mode 100644 dev-libs/sihnon-js-lib/sihnon-js-lib-0.1.0.ebuild
 rename media-video/ripping-cluster/{ripping-cluster-0.4.ebuild => ripping-cluster-0.4-r2.ebuild} (73%)

diff --git a/dev-libs/sihnon-js-lib/Manifest b/dev-libs/sihnon-js-lib/Manifest
new file mode 100644
index 0000000..ee730d8
--- /dev/null
+++ b/dev-libs/sihnon-js-lib/Manifest
@@ -0,0 +1,2 @@
+DIST sihnon-js-lib-0.1.0.tar.gz 4443 RMD160 cb336cfea52276f395575a005722249fe8ccd578 SHA1 e0f85c17967595e46ab8651d492577ced63a221f SHA256 156104efeb89b49c4d5897cc3b048333c17725adecf18b6c415333066c370169
+EBUILD sihnon-js-lib-0.1.0.ebuild 617 RMD160 a81900356a057d1c8e309cca283537e5ea9ea571 SHA1 bdce28e56bcb60973a525d86afda05d592ce63c5 SHA256 9e57b8e13f8ef7d0b929f4bbc32c329ca67fac50134373c90d6ff22106e89aee
diff --git a/dev-libs/sihnon-js-lib/sihnon-js-lib-0.1.0.ebuild b/dev-libs/sihnon-js-lib/sihnon-js-lib-0.1.0.ebuild
new file mode 100644
index 0000000..91ab886
--- /dev/null
+++ b/dev-libs/sihnon-js-lib/sihnon-js-lib-0.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+inherit eutils
+
+DESCRIPTION="Sihnon JS Framework"
+HOMEPAGE="https://benroberts.net/projects/sihnon-framework/"
+SRC_URI="https://github.com/optiz0r/sihnon-js-lib/tarball/release-${PV} -> ${PN}-${PV}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="CCPL-Attribution-ShareAlike-NonCommercial-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+USE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	cd "${WORKDIR}"/optiz0r-sihnon-js-lib-*
+	S=$(pwd)
+}
+
+src_install() {
+
+	insinto "/usr/lib/${PN}"
+
+	doins -r public
+
+}
+
diff --git a/media-video/ripping-cluster/Manifest b/media-video/ripping-cluster/Manifest
index 8026211..8b5b7f1 100644
--- a/media-video/ripping-cluster/Manifest
+++ b/media-video/ripping-cluster/Manifest
@@ -1,2 +1,2 @@
 DIST ripping-cluster-0.4.tar.gz 104953 RMD160 d8071a23bdcd6c0c1595948f1076c689a1848add SHA1 1bdf00e19052a2c838ead6dc3dc84b3cd8ca789d SHA256 cef4c12608e55bb09497c0d617a394ded4202674db590b0afb7fc34aa31dee11
-EBUILD ripping-cluster-0.4.ebuild 2128 RMD160 d5d58fb9c9265dcdcd2150f517a958b66d2987ab SHA1 9931cff33eee46c3616111239084e05b54731ac3 SHA256 a1e7234e553cb298300291b6a0a7daaa50e45ca571c6a85fbc059fe610833cc7
+EBUILD ripping-cluster-0.4-r2.ebuild 2376 RMD160 3b330c54452df78eaf4c6947cb196729d2710fd2 SHA1 1a05f51e63e4b3eaf20b332c7271098e7ab26d5d SHA256 9ba268894ecea78fb3951cae8458d506fe742ca6ed23c4daf72e8a4cad9ddaba
diff --git a/media-video/ripping-cluster/ripping-cluster-0.4.ebuild b/media-video/ripping-cluster/ripping-cluster-0.4-r2.ebuild
similarity index 73%
rename from media-video/ripping-cluster/ripping-cluster-0.4.ebuild
rename to media-video/ripping-cluster/ripping-cluster-0.4-r2.ebuild
index 00c023a..ab0bde1 100644
--- a/media-video/ripping-cluster/ripping-cluster-0.4.ebuild
+++ b/media-video/ripping-cluster/ripping-cluster-0.4-r2.ebuild
@@ -7,8 +7,9 @@ EAPI=3
 inherit eutils
 
 DESCRIPTION="Distributed ripping cluster manager using HandBrake as a backend"
-HOMEPAGE="http://wiki.sihnon.net/index.php/Ripping-cluster"
+HOMEPAGE="https://benroberts.net/projects/ripping-cluster/"
 SRC_URI="https://github.com/optiz0r/ripping-cluster/tarball/release-${PV} -> ${PN}-${PV}.tar.gz"
+RESTRICT="mirror"
 
 LICENSE="CCPL-Attribution-ShareAlike-NonCommercial-3.0"
 SLOT="0"
@@ -18,6 +19,7 @@ IUSE="webui +worker"
 RDEPEND=">=dev-lang/php-5.3
          >=dev-php/smarty-3.0
          >=dev-libs/sihnon-php-lib-1.1.0
+		 >=dev-libs/sihnon-js-lib-0.1.0
 		 >=dev-php/PEAR-Net_Gearman-0.2.3
 		 >=media-video/handbrake-0.9
 "
@@ -32,33 +34,37 @@ pkg_setup() {
 src_prepare() {
 	cd "${WORKDIR}"/optiz0r-ripping-cluster-*
 	S=$(pwd)
+	rm public/scripts/sihnon-js-lib
 }
 
 src_install() {
 
 	insinto "/usr/lib/${PN}"
-	dodir source
+	dodir "${S}"/source
 
 	insinto "/usr/lib/${PN}/source"
-	doins -r source/lib
+	doins -r "${S}/source/lib"
 
 	if use webui; then
-		doins -r source/webui
+		doins -r "${S}"/source/webui
+
+		insinto "/usr/lib/${PN}/public"
+		doins -r public/*
+		dosym /usr/lib/sihnon-js-lib/public /usr/lib/${PN}/public/scripts/sihnon-js-lib
 	fi
 
 	if use worker; then
-		doins -r source/worker
+		doins -r "${S}"/source/worker
 	fi
 
 	insinto "/usr/share/${PN}"
-	doins -r build/schema
+	doins -r "${S}"/build/schema
+	doins "${S}"/private/{config.php,dbconfig.conf}.dist
 
 	keepdir /etc/ripping-cluster
-	insinto /etc/ripping-cluster
-	doins private/{config.php,dbconfig.conf}.dist
 
-	newinitd build/ripping-cluster-worker.init-gentoo ripping-cluster-worker
-	newconfd build/ripping-cluster-worker.conf-gentoo ripping-cluster-worker
+	newinitd "${S}"/build/ripping-cluster-worker.init-gentoo ripping-cluster-worker
+	newconfd "${S}"/build/ripping-cluster-worker.conf-gentoo ripping-cluster-worker
 
 	keepdir /var/log/ripping-cluster
 	fowners media /var/log/ripping-cluster