Fix riot electron app. Fixed right click, opens url in browser, and adds notification icon in system trays

dev-util/electron-bin/Manifest

@@ -0,0 +1,4 @@
+DIST electron-bin-6.1.2-arm64.zip 62659406 BLAKE2B d6c7a2ee2f1b23ffb279e99bb373a14bac8e3d0d5944cc86ad3682f917555375918c38d895a1f97caa696d26d4829045bfebe0c4932b23f039bf0370e34a3d55 SHA512 0426ee687e3b354d8a25c8926247e068f7cd3d09f8b09e15c5d7878ff7f2188e0f19513699f0bf515936b0c5af8e79184c9c463852f5b04e224906312b86b9f1
+DIST electron-bin-6.1.2-armv7l.zip 54847158 BLAKE2B dab8ab35f2f01cc3b31bb380530948006b1a58216aa6b0f0f00b6b838426f8e48cf7a6c772adc3154a7343067c5768e1625290709459d4f0bb680b4f9a35e1ad SHA512 138f2b6a6b34274a0bf6727ed465219b9fd837b6fb71e304a52686e20bb2dba5136a30f1e2e3b7963a983e9b00469a22d47684c0b421af56dbb56ae749728f32
+DIST electron-bin-6.1.2-ia32.zip 63275754 BLAKE2B 8b09c2529517441e407737787dca397084c7c1a3b67cb6cfc6f3d770ba1f20bc0ad7fc7933d824b67c8c27093f021b2b4ec8742147f83ab31f2b52a15a1b8bd2 SHA512 95f4c244ac7151b39755e5147784e4f3c7511626da67928eb8c7849ce0ad45e70ebcd8f1356be09ac06ae13304f6abfcc0c74d45357931bc79b408db12edf5af
+DIST electron-bin-6.1.2-x64.zip 62392558 BLAKE2B a7c57e223d53db9ee46a8aeff9695a6079fdc17ed944b66b65a2833abea06cd9a123741cb41f560964c7fa0ad867f66c4b45a1286f81d6f257a499a6f7eb9efd SHA512 4ad62113908077308c8976d5c71795ff027b6e633d2530605887f59f2d1d77c37711a644effce0a7183f34443cc3b34f9e99f58576d9981fa356d060b9adfdce

dev-util/electron-bin/electron-bin-6.1.2.ebuild

@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CHROMIUM_LANGS="
+	am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi hr
+	hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv sw
+	ta te th tr uk vi zh-CN zh-TW
+"
+
+inherit chromium-2
+
+MY_PN="${PN/-bin}"
+VERSION_MAJ="$(ver_cut 1)"
+VERSION_MIN="$(ver_cut 2)"
+SRC_URI_BASE="https://github.com/electron/electron/releases/download"
+DESCRIPTION="Cross platform application development framework based on web technologies"
+HOMEPAGE="https://electron.atom.io"
+SRC_URI="
+	amd64? ( ${SRC_URI_BASE}/v${PV}/${MY_PN}-v${PV}-linux-x64.zip -> ${P}-x64.zip )
+	arm? ( ${SRC_URI_BASE}/v${PV}/${MY_PN}-v${PV}-linux-armv7l.zip -> ${P}-armv7l.zip )
+	arm64? ( ${SRC_URI_BASE}/v${PV}/${MY_PN}-v${PV}-linux-arm64.zip -> ${P}-arm64.zip )
+	x86? ( ${SRC_URI_BASE}/v${PV}/${MY_PN}-v${PV}-linux-ia32.zip -> ${P}-ia32.zip )
+"
+RESTRICT="mirror"
+
+LICENSE="MIT"
+SLOT="${VERSION_MAJ}/${VERSION_MIN}"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nss
+	media-gfx/graphite2
+	media-libs/alsa-lib
+	media-libs/fontconfig:1.0
+	media-libs/libepoxy
+	media-libs/libpng
+	net-print/cups
+	sys-apps/dbus
+	virtual/opengl
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libxcb
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/pango
+"
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+OPTPATH="opt/${MY_PN}-${VERSION_MAJ}.${VERSION_MIN}"
+QA_PRESTRIPPED="${OPTPATH}/.*"
+
+pkg_setup() {
+	# Silence linux-info_pkg_setup()
+	:;
+}
+
+src_prepare() {
+	pushd locales > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+	default
+}
+
+src_install() {
+	dodir "/${OPTPATH}"
+	# Note: intentionally not using "doins" so that we preserve +x bits
+	cp -r ./* "${ED}/${OPTPATH}" || die
+
+	dosym "../../${OPTPATH}/electron" "/usr/bin/electron-${VERSION_MAJ}.${VERSION_MIN}"
+}

dev-util/electron-bin/metadata.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@chaoslab.org</email>
+		<name>Ian Moone</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">electron/electron</remote-id>
+		<bugs-to>https://github.com/electron/electron/issues</bugs-to>
+		<doc>https://electronjs.org/docs</doc>
+	</upstream>
+	<longdescription lang="en">
+		Electron is an open source library developed by GitHub
+		for building cross-platform desktop applications with
+		HTML, CSS, and JavaScript. Electron accomplishes this
+		by combining Chromium and Node.js into a single runtime
+		and apps can be packaged for Mac, Windows, and Linux.
+	</longdescription>
+</pkgmetadata>

net-im/riot-web/riot-web-1.4.0-r2.ebuild

@@ -43,7 +43,7 @@ DEPEND="sys-devel/binutils:*
 	gnome-base/gconf
 	emoji? ( >=media-fonts/noto-emoji-20180823 )
 	>=media-video/ffmpeg-4.0
-	|| ( dev-util/electron dev-util/electron-bin )"
+	|| ( >=dev-util/electron-6.0.0 >=dev-util/electron-bin-6.0.0 )"
 RDEPEND="${DEPEND}"
 
 DESTINATION="/opt/Riot"
@@ -54,7 +54,7 @@ create_the_executable_file() {
 
 install_location="'"${DESTINATION}"'"
 
-if [ ! -d "$install_location" ];then
+if [ ! -d "$install_location/electron_app" ];then
 	echo -n "Could not chdir to install location: " >&2
 	if [ ! -e "$install_location" ];then
 		echo "No such file or directory" >&2
@@ -63,14 +63,8 @@ if [ ! -d "$install_location" ];then
 	fi
 	exit 1
 fi
-cd "$install_location"
+cd "$install_location/electron_app"
-
+exec electron .\n' > "${1}"
-if [ ! -e 'index.html' ];then
-	echo "Could not find index.html in '$install_location'" >&2
-	exit 2
-fi
-
-exec electron index.html\n' > "${1}"
 
 }
 
@@ -79,9 +73,15 @@ src_prepare() {
 
 	if use "proxy";then
 		yarn install || die "Yarn module installation failed"
+		cd electron_app
+		yarn install || die "Yarn module installation failed"
+		cd ..
 		[ "${PV}" == "9999" ] && "${S}"/scripts/fetch-develop.deps.sh
 	else
 		http_proxy="" yarn install || die "Yarn module installation failed"
+		cd electron_app
+		http_proxy="" yarn install || die "Yarn module installation failed"
+		cd ..
 		[ "${PV}" == "9999" ] && { http_proxy=""; "${S}"/scripts/fetch-develop.deps.sh; }
 	fi
 
@@ -100,11 +100,12 @@ src_compile() {
 
 src_install() {
 	insinto "${DESTINATION}"
-	doins -r "${S}/webapp/"*
+	doins -r "${S}/webapp"
+	doins -r "${S}/electron_app"
 
-	create_the_executable_file "${S}/webapp/${PN}"
+	create_the_executable_file "${S}/${PN}"
 	insopts "-m755"
-	doins "${S}/webapp/${PN}"
+	doins "${S}/${PN}"
 
 	dosym "${DESTINATION}/${PN}" "/usr/bin/${PN}"
 }

net-im/riot-web/riot-web-1.4.2.ebuild

@@ -43,7 +43,7 @@ DEPEND="sys-devel/binutils:*
 	gnome-base/gconf
 	emoji? ( >=media-fonts/noto-emoji-20180823 )
 	>=media-video/ffmpeg-4.0
-	|| ( dev-util/electron dev-util/electron-bin )"
+	|| ( >=dev-util/electron-6.0.0 >=dev-util/electron-bin-6.0.0 )"
 RDEPEND="${DEPEND}"
 
 DESTINATION="/opt/Riot"
@@ -54,7 +54,7 @@ create_the_executable_file() {
 
 install_location="'"${DESTINATION}"'"
 
-if [ ! -d "$install_location" ];then
+if [ ! -d "$install_location/electron_app" ];then
 	echo -n "Could not chdir to install location: " >&2
 	if [ ! -e "$install_location" ];then
 		echo "No such file or directory" >&2
@@ -63,14 +63,8 @@ if [ ! -d "$install_location" ];then
 	fi
 	exit 1
 fi
-cd "$install_location"
+cd "$install_location/electron_app"
-
+exec electron .\n' > "${1}"
-if [ ! -e 'index.html' ];then
-	echo "Could not find index.html in '$install_location'" >&2
-	exit 2
-fi
-
-exec electron index.html\n' > "${1}"
 
 }
 
@@ -79,9 +73,15 @@ src_prepare() {
 
 	if use "proxy";then
 		yarn install || die "Yarn module installation failed"
+		cd electron_app
+		yarn install || die "Yarn module installation failed"
+		cd ..
 		[ "${PV}" == "9999" ] && "${S}"/scripts/fetch-develop.deps.sh
 	else
 		http_proxy="" yarn install || die "Yarn module installation failed"
+		cd electron_app
+		http_proxy="" yarn install || die "Yarn module installation failed"
+		cd ..
 		[ "${PV}" == "9999" ] && { http_proxy=""; "${S}"/scripts/fetch-develop.deps.sh; }
 	fi
 
@@ -100,11 +100,12 @@ src_compile() {
 
 src_install() {
 	insinto "${DESTINATION}"
-	doins -r "${S}/webapp/"*
+	doins -r "${S}/webapp"
+	doins -r "${S}/electron_app"
 
-	create_the_executable_file "${S}/webapp/${PN}"
+	create_the_executable_file "${S}/${PN}"
 	insopts "-m755"
-	doins "${S}/webapp/${PN}"
+	doins "${S}/${PN}"
 
 	dosym "${DESTINATION}/${PN}" "/usr/bin/${PN}"
 }

net-im/riot-web/riot-web-1.5.0.ebuild

@@ -43,7 +43,7 @@ DEPEND="sys-devel/binutils:*
 	gnome-base/gconf
 	emoji? ( >=media-fonts/noto-emoji-20180823 )
 	>=media-video/ffmpeg-4.0
-	|| ( dev-util/electron dev-util/electron-bin )"
+	|| ( >=dev-util/electron-6.0.0 >=dev-util/electron-bin-6.0.0 )"
 RDEPEND="${DEPEND}"
 
 DESTINATION="/opt/Riot"
@@ -54,7 +54,7 @@ create_the_executable_file() {
 
 install_location="'"${DESTINATION}"'"
 
-if [ ! -d "$install_location" ];then
+if [ ! -d "$install_location/electron_app" ];then
 	echo -n "Could not chdir to install location: " >&2
 	if [ ! -e "$install_location" ];then
 		echo "No such file or directory" >&2
@@ -63,14 +63,8 @@ if [ ! -d "$install_location" ];then
 	fi
 	exit 1
 fi
-cd "$install_location"
+cd "$install_location/electron_app"
-
+exec electron .\n' > "${1}"
-if [ ! -e 'index.html' ];then
-	echo "Could not find index.html in '$install_location'" >&2
-	exit 2
-fi
-
-exec electron index.html\n' > "${1}"
 
 }
 
@@ -79,9 +73,15 @@ src_prepare() {
 
 	if use "proxy";then
 		yarn install || die "Yarn module installation failed"
+		cd electron_app
+		yarn install || die "Yarn module installation failed"
+		cd ..
 		[ "${PV}" == "9999" ] && "${S}"/scripts/fetch-develop.deps.sh
 	else
 		http_proxy="" yarn install || die "Yarn module installation failed"
+		cd electron_app
+		http_proxy="" yarn install || die "Yarn module installation failed"
+		cd ..
 		[ "${PV}" == "9999" ] && { http_proxy=""; "${S}"/scripts/fetch-develop.deps.sh; }
 	fi
 
@@ -100,11 +100,12 @@ src_compile() {
 
 src_install() {
 	insinto "${DESTINATION}"
-	doins -r "${S}/webapp/"*
+	doins -r "${S}/webapp"
+	doins -r "${S}/electron_app"
 
-	create_the_executable_file "${S}/webapp/${PN}"
+	create_the_executable_file "${S}/${PN}"
 	insopts "-m755"
-	doins "${S}/webapp/${PN}"
+	doins "${S}/${PN}"
 
 	dosym "${DESTINATION}/${PN}" "/usr/bin/${PN}"
 }

net-im/riot-web/riot-web-9999.ebuild

@@ -43,7 +43,7 @@ DEPEND="sys-devel/binutils:*
 	gnome-base/gconf
 	emoji? ( >=media-fonts/noto-emoji-20180823 )
 	>=media-video/ffmpeg-4.0
-	|| ( dev-util/electron dev-util/electron-bin )"
+	|| ( >=dev-util/electron-6.0.0 >=dev-util/electron-bin-6.0.0 )"
 RDEPEND="${DEPEND}"
 
 DESTINATION="/opt/Riot"
@@ -54,7 +54,7 @@ create_the_executable_file() {
 
 install_location="'"${DESTINATION}"'"
 
-if [ ! -d "$install_location" ];then
+if [ ! -d "$install_location/electron_app" ];then
 	echo -n "Could not chdir to install location: " >&2
 	if [ ! -e "$install_location" ];then
 		echo "No such file or directory" >&2
@@ -63,14 +63,8 @@ if [ ! -d "$install_location" ];then
 	fi
 	exit 1
 fi
-cd "$install_location"
+cd "$install_location/electron_app"
-
+exec electron .\n' > "${1}"
-if [ ! -e 'index.html' ];then
-	echo "Could not find index.html in '$install_location'" >&2
-	exit 2
-fi
-
-exec electron index.html\n' > "${1}"
 
 }
 
@@ -79,9 +73,15 @@ src_prepare() {
 
 	if use "proxy";then
 		yarn install || die "Yarn module installation failed"
+		cd electron_app
+		yarn install || die "Yarn module installation failed"
+		cd ..
 		[ "${PV}" == "9999" ] && "${S}"/scripts/fetch-develop.deps.sh
 	else
 		http_proxy="" yarn install || die "Yarn module installation failed"
+		cd electron_app
+		http_proxy="" yarn install || die "Yarn module installation failed"
+		cd ..
 		[ "${PV}" == "9999" ] && { http_proxy=""; "${S}"/scripts/fetch-develop.deps.sh; }
 	fi
 
@@ -100,11 +100,12 @@ src_compile() {
 
 src_install() {
 	insinto "${DESTINATION}"
-	doins -r "${S}/webapp/"*
+	doins -r "${S}/webapp"
+	doins -r "${S}/electron_app"
 
-	create_the_executable_file "${S}/webapp/${PN}"
+	create_the_executable_file "${S}/${PN}"
 	insopts "-m755"
-	doins "${S}/webapp/${PN}"
+	doins "${S}/${PN}"
 
 	dosym "${DESTINATION}/${PN}" "/usr/bin/${PN}"
 }