From ab03fcd3ab6fd234b97fd13436e038c3a7b7a485 Mon Sep 17 00:00:00 2001 From: Stefan Strogin Date: Thu, 21 May 2020 17:05:01 +0300 Subject: profiles: move net-im/riot-web to net-im/riot-desktop https://github.com/vector-im/riot-desktop is used for building Riot as a desktop app. Among other things is necessary to biuld native modules such as for searching in encrypted rooms. Signed-off-by: Stefan Strogin --- net-im/riot-desktop/Manifest | 1 + net-im/riot-desktop/riot-desktop-1.5.13.ebuild | 86 ++++++++++++++++++++++++++ net-im/riot-web/Manifest | 1 - net-im/riot-web/metadata.xml | 11 ---- net-im/riot-web/riot-web-1.5.13.ebuild | 86 -------------------------- profiles/updates/2Q-2020 | 1 + 6 files changed, 88 insertions(+), 98 deletions(-) create mode 100644 net-im/riot-desktop/riot-desktop-1.5.13.ebuild delete mode 100644 net-im/riot-web/Manifest delete mode 100644 net-im/riot-web/metadata.xml delete mode 100644 net-im/riot-web/riot-web-1.5.13.ebuild create mode 100644 profiles/updates/2Q-2020 diff --git a/net-im/riot-desktop/Manifest b/net-im/riot-desktop/Manifest index 24e874e..a29f8a6 100644 --- a/net-im/riot-desktop/Manifest +++ b/net-im/riot-desktop/Manifest @@ -1,2 +1,3 @@ +DIST riot-desktop-1.5.13.tar.gz 1402204 BLAKE2B 11c17baff2e55b2d5529f23035741bd66e3404fa86ea044aba9c43473abb93bd7a145c87591ec432c27e214ae8f6799a1fffac82285f7c9d36e39235e86ad0cc SHA512 8464ac47a720734c02eadbcc0e0bbfc439f0722e60a580b2969d16aab67f746e432737209a751671177627137900fd183f32b306ecc8b0be13015c436e9e6431 DIST riot-desktop-1.6.1.tar.gz 401222 BLAKE2B dbc3aaefce9a727025c341b03c657edd348eabd22efd2285558939d460941ad85adae65d9e13be2445baaf958f018f6afa071670eae81d13e875abbbf62417af SHA512 8ff8ba30088d0caee6a45fbd1b7b70554b69344603d93d9c555be0dc4120a4dcfe99819ca06deab8bd66f535761215a832f2e69084b61738a1263497e185b404 DIST riot-web-1.6.1.tar.gz 1150368 BLAKE2B 51437fa1e0a8e62ca34dcae2701b807bba95c2071439ffff129812b975c997afc867cffd3aceef926358eeecab82b615d91b90b08672465052f695573052c2f4 SHA512 36603d19984aed6586100497a35642e061d5d8a679ff10c18e24a6bb7c865a7262e4fd57d42085e7cd7df0d6563408cb031b2c07ca73b57f11791095ac499028 diff --git a/net-im/riot-desktop/riot-desktop-1.5.13.ebuild b/net-im/riot-desktop/riot-desktop-1.5.13.ebuild new file mode 100644 index 0000000..e50fa55 --- /dev/null +++ b/net-im/riot-desktop/riot-desktop-1.5.13.ebuild @@ -0,0 +1,86 @@ +# 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 the web" +HOMEPAGE="https://riot.im" + +inherit unpacker xdg-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" +REQUIRED_USE="" + +DEPEND="sys-devel/binutils:* + >=net-libs/nodejs-12.14.0 + 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/chrome-sandbox + opt/Riot/libGLESv2.so + opt/Riot/libEGL.so + opt/Riot/libffmpeg.so + opt/Riot/libnode.so + opt/Riot/riot-web + opt/Riot/swiftshader/libGLESv2.so + opt/Riot/swiftshader/libEGL.so + opt/Riot/swiftshader/libvk_swiftshader.so" + +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 || die +} + +src_compile() { + yarn run build || die "Build failed" + + "${S}"/node_modules/.bin/electron-builder --linux --x64 || die "Bundling failed" +} + +src_install() { + unpack electron_app/dist/riot-web*.deb + tar xvf data.tar.xz || die + + mv usr/share/doc/riot-web usr/share/doc/riot-web-${PVR} || die + gunzip usr/share/doc/riot-web-${PVR}/changelog.gz || die + + insinto / + doins -r usr + doins -r opt + fperms +x /opt/Riot/riot-web + dosym ../../opt/Riot/riot-web /usr/bin/riot-web +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/net-im/riot-web/Manifest b/net-im/riot-web/Manifest deleted file mode 100644 index 367774a..0000000 --- a/net-im/riot-web/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST riot-web-1.5.13.tar.gz 1402204 BLAKE2B 11c17baff2e55b2d5529f23035741bd66e3404fa86ea044aba9c43473abb93bd7a145c87591ec432c27e214ae8f6799a1fffac82285f7c9d36e39235e86ad0cc SHA512 8464ac47a720734c02eadbcc0e0bbfc439f0722e60a580b2969d16aab67f746e432737209a751671177627137900fd183f32b306ecc8b0be13015c436e9e6431 diff --git a/net-im/riot-web/metadata.xml b/net-im/riot-web/metadata.xml deleted file mode 100644 index d796373..0000000 --- a/net-im/riot-web/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - bribbers@disroot.org - Primary maintainer - - - Use media-fonts/noto-emoji for displaying emoji - - diff --git a/net-im/riot-web/riot-web-1.5.13.ebuild b/net-im/riot-web/riot-web-1.5.13.ebuild deleted file mode 100644 index a5fd087..0000000 --- a/net-im/riot-web/riot-web-1.5.13.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# 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 the web" -HOMEPAGE="https://riot.im" - -inherit unpacker xdg-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" -REQUIRED_USE="" - -DEPEND="sys-devel/binutils:* - >=net-libs/nodejs-12.14.0 - 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/chrome-sandbox - opt/Riot/libGLESv2.so - opt/Riot/libEGL.so - opt/Riot/libffmpeg.so - opt/Riot/libnode.so - opt/Riot/riot-web - opt/Riot/swiftshader/libGLESv2.so - opt/Riot/swiftshader/libEGL.so - opt/Riot/swiftshader/libvk_swiftshader.so" - -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 || die -} - -src_compile() { - yarn run build || die "Build failed" - - "${S}"/node_modules/.bin/electron-builder --linux --x64 || die "Bundling failed" -} - -src_install() { - unpack electron_app/dist/riot-web*.deb - tar xvf data.tar.xz || 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 - fperms +x /opt/Riot/${PN} - dosym ../../opt/Riot/${PN} /usr/bin/${PN} -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/profiles/updates/2Q-2020 b/profiles/updates/2Q-2020 new file mode 100644 index 0000000..fb17393 --- /dev/null +++ b/profiles/updates/2Q-2020 @@ -0,0 +1 @@ +move net-im/riot-web net-im/riot-desktop -- cgit v1.2.3-65-gdbad