Update Riot web to 0.17.0

3 files changed, 84 insertions, 6 deletions

diff --git a/net-im/riot-web/Manifest b/net-im/riot-web/Manifest
index 51c6d58..01c366f 100644
--- a/net-im/riot-web/Manifest
+++ b/net-im/riot-web/Manifest
@@ -3,8 +3,10 @@ AUX remove-package-lock.patch 325538 BLAKE2B d6d2412c5c06f7d9e4e07e09629e8bc6c80
 DIST riot-web-0.14.2.tar.gz 1005927 BLAKE2B 8148576eeeae141f214e6ce21fe6ea496084241c027dbc16690f306e0047768a19fbeb36b24c67f38a6598c37c567a675febf53891793ec81c80147c14fcfc4b SHA512 98c1559e9a11e2cb687abfdf544c5fb7a25912163ef0391ab5cfa29b567a962eeecee023b0218b8e3c676fd0df211532475fb222d0fb52562365bd26947926f5
 DIST riot-web-0.15.7.tar.gz 1007822 BLAKE2B fc61e1260a2080b5508fe258b87f07cdadb00118d2e482c4bfe814312b6ee21313f5f740f5be6de1b6fb0ee6c3fedb8c41699e3a1caf718fce4834acbc9ca14a SHA512 27a5f5d94f0160a9db4a532e3d3f36bcc7187a316387762e5a953937f05735d63b6af80cb170492ab3e4be9fd3cb5a93fc075a8e5bca60f3427100a3c0db03cd
 DIST riot-web-0.16.5.tar.gz 1062604 BLAKE2B 52dbdf83b0e36d7eaa377400fa911e1f7650869b4e89b403ed0f846b6cc1526131f3ab615dd6a4b685c19debf7471f4167a8dd1bf0cae0bcff409ace1ea66a0c SHA512 072bb325ff69cdc4eadaff7c9ed05e64e7db89c394029cb2875487316decc05d85ac312d0556832817b9e7771f2322310645559210b7d79970aa059bff6d2a76
+DIST riot-web-0.17.0.tar.gz 1133259 BLAKE2B e90ca213fe4a78f558d60a947321cc864e4692181105027c26ef37e0150314318ada43659dd9aa633bf5484f9be9064805d058029d4abcc5dfb87103f837d096 SHA512 c8ea1b67298cd7514df52baeea8385f5abd6fd803ee08bd2bf5868fa60c28c49c4e3c8e9e6e424c677c4a8669e249f28a4d8ac6b792388e9633dff6325e11448
 EBUILD riot-web-0.14.2.ebuild 1336 BLAKE2B 6c8971c67a7b9f66068d6554f71ad6dab992370bb6e6c6593f567843b8c24eeb43d494ae315adc1ca489794e410b42f2ba8cbef2dc763dc7d8dcacd5ea44f080 SHA512 50911ba1e4812881fc50b4eeb11724a6c694273ad153f0d5cccc6309d0e8404ce697adb2e6754eb5684a22dd07cd9203ab50b95ff3ec1b6e5328078a84ad5944
 EBUILD riot-web-0.15.7.ebuild 1538 BLAKE2B 32c2625fd8835a70aa30806af04e6ffb37634a6639ff8141532c3a3d572d014ce1982b790974851c26d3c765625f3f2712603ea04c29b8fff3e5f4f96cfc1873 SHA512 ef64fe16016cf6c633ba7f93066ff88b83e13f0f2562e33517e09e95c1a76b2bc43984d3c4b29c4d7c01da0d86670c7670b92f8790441a3aea9c2fb2f7767fd6
 EBUILD riot-web-0.16.5.ebuild 1538 BLAKE2B 32c2625fd8835a70aa30806af04e6ffb37634a6639ff8141532c3a3d572d014ce1982b790974851c26d3c765625f3f2712603ea04c29b8fff3e5f4f96cfc1873 SHA512 ef64fe16016cf6c633ba7f93066ff88b83e13f0f2562e33517e09e95c1a76b2bc43984d3c4b29c4d7c01da0d86670c7670b92f8790441a3aea9c2fb2f7767fd6
-EBUILD riot-web-9999.ebuild 1412 BLAKE2B b2746c00c6cf6fabfcb532bd66a853e5344d7da0de00d278eb46e304d76c75dc9eaac5b26336edca3cba5fd6a22b0e05715d8dbbf30544329d3d334f50a64df3 SHA512 641452ce3903a1d97dedbbe2cab14d925ff1e7465394bd803a1b3c4dadf41ec5164002ab32919c717ba0a3b435a23249e99e21a116f26ea65ca526e2ce5a8de6
+EBUILD riot-web-0.17.0.ebuild 1622 BLAKE2B 0be6abe2b809285a27292e9adf04cdabebbcf05032f132b658299e2ccedc6d2537cc25481e38f5519ea97cc564ea16fbac9871d5383c27c443cbfa0501af15d7 SHA512 ceddb26166b74dcd6ac479aa82ffba737ab66f9ccef1f1e49a1900d055e9c6652fa006165f7337d78ab5bc5913e7cb9e92b447202b0f5d1c45a21ffa29b2192d
+EBUILD riot-web-9999.ebuild 1612 BLAKE2B 0cfc21d90be274dab1b53b4e643f30943d77c7545fd5178e497c05d067820525587b519318a68a4fdd506af1c2c48f5c93f28cd61a44ae60f4a43b93a40f8aa8 SHA512 d68ffcba587a17343741ea6c12666909c08f58d0dfc9cec0cdfe795c6ccec4aabebc76c3a2c30f597f6f9773dd6493b150d9462f219233c9fee30da70a8b2dcd
 MISC metadata.xml 361 BLAKE2B b0e28c6b9872c0dfc3830a386e9018c08fede44b15eed009b7a72794c4dd9ae0e2ebe81f7d305fb4342460340dc6eb7709a22886ca7e807ab740e53705a7b7f5 SHA512 5f1b13f360c4410c833a461ee81ec0f39f8b6ec74575d36779b6bb78b3ed2f9b2abd82260eb61dc825e1452692ac99de58f838877eb7e66b3c6a852b472a3d95
diff --git a/net-im/riot-web/riot-web-0.17.0.ebuild b/net-im/riot-web/riot-web-0.17.0.ebuild
new file mode 100644
index 0000000..e3f622b
--- /dev/null
+++ b/net-im/riot-web/riot-web-0.17.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A glossy Matrix collaboration client for the web"
+HOMEPAGE="https://riot.im"
+
+inherit eutils
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/vector-im/riot-web.git"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="https://github.com/vector-im/riot-web/archive/v${PV}.tar.gz -> ${P}.tar.gz"	
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="abi_x86_32 abi_x86_64"
+REQUIRED_USE="abi_x86_32? ( !abi_x86_64 )
+			abi_x86_64? ( !abi_x86_32 )"
+
+DEPEND="sys-devel/binutils
+		net-libs/nodejs
+		x11-libs/libXScrnSaver
+		net-print/cups
+		dev-libs/nss
+		gnome-base/gconf"
+RDEPEND="${DEPEND}"
+
+QA_PREBUILT="
+		opt/Riot/libffmpeg.so
+		opt/Riot/libnode.so
+		opt/Riot/riot-web"
+
+DESTINATION="/" # We build and unpack a Debian installer, which already has everything in the proper directories {usr,opt}, so we just set the destination to "/"
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == "9999" ]]; then
+		${S}/scripts/fetch-develop.deps.sh
+	fi
+
+	npm install
+
+	cp ${S}/config.sample.json ${S}/config.json
+}
+
+src_compile() {
+	npm run build
+
+	if use abi_x86_32; then
+		${S}/node_modules/.bin/build --linux --ia32
+	elif use abi_x86_64; then
+		${S}/node_modules/.bin/build --linux --x64
+	fi
+}
+
+src_install() {
+	ar x ${S}/electron_app/dist/riot-web*.deb
+	tar xvf data.tar.xz
+
+	mv usr/share/doc/${PN} usr/share/doc/${P}
+	insinto ${DESTINATION}
+	doins -r usr
+	doins -r opt
+	fperms +x /opt/Riot/${PN}
+	dosym ${DESTINATION}/opt/Riot/${PN} ${DESTINATION}/usr/bin/${PN}
+}
diff --git a/net-im/riot-web/riot-web-9999.ebuild b/net-im/riot-web/riot-web-9999.ebuild
index 30b1e1d..d0450d7 100644
--- a/net-im/riot-web/riot-web-9999.ebuild
+++ b/net-im/riot-web/riot-web-9999.ebuild
@@ -30,7 +30,7 @@ DEPEND="sys-devel/binutils
 		x11-libs/libXScrnSaver
 		net-print/cups
 		dev-libs/nss
-		gnome-base-gconf"
+		gnome-base/gconf"
 RDEPEND="${DEPEND}"
 
 QA_PREBUILT="
@@ -38,11 +38,11 @@ QA_PREBUILT="
 		opt/Riot/libnode.so
 		opt/Riot/riot-web"
 
+DESTINATION="/" # We build and unpack a Debian installer, which already has everything in the proper directories {usr,opt}, so we just set the destination to "/"
+
 src_prepare() {
 	default
 
-	epatch ${FILESDIR}/remove-package-lock.patch
-
 	if [[ ${PV} == "9999" ]]; then
 		${S}/scripts/fetch-develop.deps.sh
 	fi
@@ -66,9 +66,10 @@ src_install() {
 	ar x ${S}/electron_app/dist/riot-web*.deb
 	tar xvf data.tar.xz
 
-	insinto /
+	mv usr/share/doc/${PN} usr/share/doc/${P}
+	insinto ${DESTINATION}
 	doins -r usr
 	doins -r opt
 	fperms +x /opt/Riot/${PN}
-	dosym /opt/Riot/${PN} /usr/bin/${PN}
+	dosym ${DESTINATION}/opt/Riot/${PN} ${DESTINATION}/usr/bin/${PN}
 }