net-im/riot-desktop: version bump, remove riot-web

net-im/riot-desktop/Manifest

@@ -0,0 +1,2 @@
+DIST riot-desktop-1.6.2.tar.gz 401236 BLAKE2B 0df29f11778d85988b4368de974c2e3ce62b3dfdda4b0c063def27d6bad9ed01814fb85c195aedfc0133b5da34fb49ddb5935fd0ef7149f274f76fcb75056791 SHA512 9709a4704aaef0e670c734c17d2499cd3299cd6cfc3160cda2a9f88954823a47874d619442e25c4f4a35182174db939f95017977af62037471daeae7b61ee666
+DIST riot-web-1.6.2.tar.gz 1150424 BLAKE2B 47436ac75160338abe2c38991256fb4ee6587433d6635e36d761c2d01c35cbc8a9585756da1bd9681c9385828661e0b4d9eeb8fd49bf6b6d70329b1aa205b024 SHA512 0b6287f806f14b7408315d34935b7f7f5f36d23e3bf5870141747ec988c9f30acfc74281103369b7b2ee30709c4a89c998c7855a917fd0cedd455dd0156128ec

net-im/riot-desktop/metadata.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>steils@gentoo.org</email>
+		<name>Stefan Strogin</name>
+	</maintainer>
+	<use>
+		<flag name="emoji">Use <pkg>media-fonts/noto-emoji</pkg> for displaying emoji</flag>
+	</use>
+</pkgmetadata>

net-im/riot-desktop/riot-desktop-1.6.2.ebuild

@@ -0,0 +1,117 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A glossy Matrix collaboration client for desktop"
+HOMEPAGE="https://riot.im"
+
+inherit unpacker xdg-utils
+
+SRC_URI="https://github.com/vector-im/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/vector-im/riot-web/archive/v${PV}.tar.gz -> riot-web-${PV}.tar.gz"
+KEYWORDS="amd64"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+emoji"
+REQUIRED_USE=""
+
+RESTRICT="network-sandbox"
+
+RDEPEND="app-accessibility/at-spi2-atk:2
+	dev-db/sqlcipher
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/nspr
+	dev-libs/nss
+	>=net-libs/nodejs-12.14.0
+	net-print/cups
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libxcb
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libXScrnSaver
+	x11-libs/pango
+	emoji? ( media-fonts/noto-emoji )"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-apps/yarn
+	virtual/rust"
+
+QA_PREBUILT="
+	/opt/Riot/chrome-sandbox
+	/opt/Riot/crashpad_handler
+	/opt/Riot/riot-desktop
+	/opt/Riot/libEGL.so
+	/opt/Riot/libGLESv2.so
+	/opt/Riot/libffmpeg.so
+	/opt/Riot/libvk_swiftshader.so
+	/opt/Riot/swiftshader/libEGL.so
+	/opt/Riot/swiftshader/libGLESv2.so"
+
+RIOT_WEB_S="${WORKDIR}/riot-web-${PV}"
+
+src_prepare() {
+	default
+	pushd "${RIOT_WEB_S}" >/dev/null || die
+	yarn install || die
+	cp config.sample.json config.json || die
+
+	popd || die
+	yarn install || die
+}
+
+src_compile() {
+	pushd "${RIOT_WEB_S}" >/dev/null || die
+	yarn build || die
+
+	popd || die
+	ln -s "${RIOT_WEB_S}"/webapp ./ || die
+	yarn build:native || die
+	yarn build || die
+}
+
+src_install() {
+	unpack dist/${PN}_${PV}_amd64.deb
+	tar -xvf data.tar.xz || die
+
+	./node_modules/asar/bin/asar.js p webapp opt/Riot/resources/webapp.asar || die
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	insinto /
+	doins -r usr
+	doins -r opt
+	local f
+	for f in ${QA_PREBUILT}; do
+		fperms +x "${f}"
+	done
+	dosym ../../opt/Riot/${PN} /usr/bin/${PN}
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	elog "Since upgrading Riot to Electron 8 it uses StatusNotifierItem"
+	elog "for displaying the tray icon."
+	elog "Some popular status bars do not support the new API."
+	elog
+	elog "If you have problems with showing the tray icon, consider installing"
+	elog "x11-misc/snixembed."
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}

net-im/riot-web/Manifest

@@ -1 +0,0 @@
-DIST riot-web-1.6.0.tar.gz 1419370 BLAKE2B eed6daad0a95cbdf4e7cd442edbf65e652653242095307bf64405aacd2c777263bb25cb9e28bd67e26093a48ac9cf4737346cc0dec5f37acc237d2c93dd4741d SHA512 f51096dcad4567b9e0f0456f01c76f5b7b7bf2c1ad15ae3e5ab1c8f9e856f452bfb6190d521e5afcef32c5dbc1b358ce6020cd613ab42e820f903cd725bf40f7

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

@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 gnome2-utils
-
-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"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="emoji 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
-	sys-apps/yarn
-	x11-libs/libXScrnSaver
-	net-print/cups
-	dev-libs/nss
-	gnome-base/gconf
-	emoji? ( >=media-fonts/noto-emoji-20180823 )"
-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
-
-	yarn install || die "Yarn module installation failed"
-
-	cp "${S}"/config.sample.json "${S}"/config.json
-}
-
-src_compile() {
-	yarn run build || die "Build failed"
-
-	"${S}"/node_modules/.bin/electron-builder --linux --x64 || die "Bundling failed"
-}
-
-src_install() {
-	ar x "${S}"/electron_app/dist/riot-web*.deb
-	tar xvf data.tar.xz
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF}
-	gunzip usr/share/doc/${PF}/changelog.gz
-	insinto ${DESTINATION}
-	doins -r usr
-	doins -r opt
-	fperms +x /opt/Riot/${PN}
-	dosym ${DESTINATION}/opt/Riot/${PN} ${DESTINATION}/usr/bin/${PN}
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}

profiles/updates/2Q-2020

@@ -0,0 +1 @@
+move net-im/riot-web net-im/riot-desktop