From 927db28aa30cf6eee6d79a2b85127388ab8773c2 Mon Sep 17 00:00:00 2001
From: rexy712 <rexy712@protonmail.com>
Date: Wed, 30 Aug 2023 11:40:01 -0700
Subject: [PATCH] Update element

---
 net-im/element-desktop/Manifest               |  10 +-
 .../element-desktop-1.11.17.ebuild            | 134 ------------------
 .../element-desktop-1.11.23.ebuild            | 134 ------------------
 .../element-desktop-1.11.30.ebuild            | 134 ------------------
 ....ebuild => element-desktop-1.11.40.ebuild} |   4 +-
 5 files changed, 4 insertions(+), 412 deletions(-)
 delete mode 100644 net-im/element-desktop/element-desktop-1.11.17.ebuild
 delete mode 100644 net-im/element-desktop/element-desktop-1.11.23.ebuild
 delete mode 100644 net-im/element-desktop/element-desktop-1.11.30.ebuild
 rename net-im/element-desktop/{element-desktop-1.11.11.ebuild => element-desktop-1.11.40.ebuild} (99%)

diff --git a/net-im/element-desktop/Manifest b/net-im/element-desktop/Manifest
index 37a8645..7280af2 100644
--- a/net-im/element-desktop/Manifest
+++ b/net-im/element-desktop/Manifest
@@ -1,8 +1,2 @@
-DIST element-desktop-1.11.11.tar.gz 2012897 BLAKE2B f7c5750a41f55ed0dee0f7aca01606e4b2fb600d92b0541a57ff0bfabf5dcb18e122ab2c2eb99f12fbd6ab00dbe59d036680e92ce95255056fc0671d7c679e9a SHA512 2fe1dd19c06cdccaff2b362e596e797e8f6cdf6929cf783960160245a9cd11c7acd88a85efc33f342a039420da36629d8385e987fd7d92d5e9672c01bb2a867c
-DIST element-desktop-1.11.17.tar.gz 7330862 BLAKE2B 108c45d4cf26220f770630203ce442272db882b9ba78aaa0a550948a26c31a14ffb3e8f821492d549a096d9c2911e381087dc086d92f89a673ee599b7d4ff675 SHA512 fdde149695afc9cf43744f766d9e3bc2b7cd1ed40c4da399f46df71d3a1daeea2b81bfcce6e523f32171ecd2e6872081d4d7644ec73f02bc27b882ddac366673
-DIST element-desktop-1.11.23.tar.gz 7343090 BLAKE2B 850fc0e284dd9486bdaf45d7235130c40e584501f52cce4b5a6ce9013f57ff510e595b92632cf2973b227caa7066136a308c76a2612ebc2d7b629219eb160fe9 SHA512 5356d0756f20ea21c2629d8194bfbe7e3a0a06cc731d98071063aac95dcc133b162f018a54d036460625e8e5a001e4471c6a86ad61329b2c4af4aa92526d41a2
-DIST element-desktop-1.11.30.tar.gz 1978258 BLAKE2B 5cc1c1969790d5cc3738bf46c507378fabeff22d559b634b3e5873e9d6687f66be589f3e138828fc35e8a7386b2cc8009539834135f7708a84e5d2476b45e0be SHA512 b44f74c8e5eb58dba7db8836805b0247bc5597086b96316c975de054f7950e59512ebf7f5d91ec1c0b0b339e29e6a1dffb08922210e78928a0c4a1b07b72e850
-DIST element-web-1.11.11.tar.gz 1468907 BLAKE2B 9879fde757873a26faad006515814d883395f4715d0da4b9fe193e3daf709492eb60a69392900e212c320f65cdbb1daaf7de4d3f6562575dd4fc149ed2834ce8 SHA512 3de3d9cdd392da41f0fcff498da98c4c56491f83a9c02818d85b3e1c1c8dd1e5a8054c68cfeb0c00e048af387846ba43859f24002a73896e286127caa0bee5c1
-DIST element-web-1.11.17.tar.gz 1473600 BLAKE2B 8603175f7388964601021a8321eead12b80581a7b482add4d685a0d3d96e6f55147fb54dd550e48e34006c8d81f7ff9fa2d3503da165249121db4095ce89ebf3 SHA512 f0a2d5f62434b9642eac913e1ca48d1587772e1b2405ec2c6239cb80f87165817ca3478243d525f894a234dc9ac8e0e63779c4a326e93c3980e17823698088d6
-DIST element-web-1.11.23.tar.gz 1478393 BLAKE2B e9bc1a2df5b0e80e3a656ad0ad47fe238e63632276b35cfb9308a749da1a874ab90429bbea081697499d4fc88a23a5876968d2882b01c787677b827c2ede7a98 SHA512 26899b0064e3ce6c865ff09c7b5d7fd31f85eb9bec8f2ac2f49b8d0b66b89b8c9bf4f1aa07c041103e2f777eb43432ed49277b4e22d943cd210f5558e2074060
-DIST element-web-1.11.30.tar.gz 1487938 BLAKE2B 6c353e39841d0090175cd98f1ba1e84dd7cd3ccec87a301aff6bcf28f34616ab8c2ecd5c3d6a4fc80630181df5e3c7c59ee32342e85ebd4089552ac5b4b70ecd SHA512 499552179cb9cbb284e405a634548ed9f899205394f27d5cbe290ec9e78ac1056b6c5ca2cc4fe40d997537cbbd8ac3e65b0685f71cd47fd81694ce7bc05c19ce
+DIST element-desktop-1.11.40.tar.gz 1992151 BLAKE2B 298e972c6212ba90804df7ce61f6d3f9d9ed71dffb1e33d8cdedf0c00880321baa921ab40ee8ffaaa86f7c3c072b2bde24e290d5a73a261b977182f67bd68c1e SHA512 35d8be8e7905365d1a5e8a1966dcc6590c1a61a0d46926ee9ace85b98b2e2e3faaba24e582f979c13976d5ec79c3cce2b6f8aa0cc2830ded9e0e8806dd6eb732
+DIST element-web-1.11.40.tar.gz 1511987 BLAKE2B dd8743aca891992b45d0096e6bc8a151366ad0a2ec2329e262e5933ddc2c7d29d71b735b3784eba88ca55fe905766cf126d9a291c970475fa17cd25a69ab126c SHA512 54795b8e4f6b09cbf6e381041c8f8c8de42a11451cd6df1e4689d2f63dce4c964fc830a8e4d0d2e4f0c5fd062c20c78d86a4f52a7a8339261a7a34da951b3723
diff --git a/net-im/element-desktop/element-desktop-1.11.17.ebuild b/net-im/element-desktop/element-desktop-1.11.17.ebuild
deleted file mode 100644
index 97d6272..0000000
--- a/net-im/element-desktop/element-desktop-1.11.17.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2020 rexy712
-# Distributed under the terms of the GNU General Public License v3
-
-EAPI=7
-
-DESCRIPTION="A glossy Matrix collaboration client for desktop"
-HOMEPAGE="https://element.io"
-
-inherit eutils desktop
-
-if [ "${PR}" != "r0" ];then
-	rc_num="${PR:1}"
-	MY_PV="${PV}-rc.${rc_num}"
-else
-	MY_PV="${PV}"
-fi
-MY_PF="${PN}-${MY_PV}"
-
-S="${WORKDIR}"
-ELEMENT_WEB_V="element-web-${MY_PV}"
-ELEMENT_DESKTOP_V="element-desktop-${MY_PV}"
-ELEMENT_WEB="element-web"
-ELEMENT_DESKTOP="element-desktop"
-WEB_S="${S}/${ELEMENT_WEB}"
-DESKTOP_S="${S}/${ELEMENT_DESKTOP}"
-
-SRC_URI="
-	https://github.com/vector-im/element-web/archive/v${MY_PV}.tar.gz -> ${ELEMENT_WEB_V}.tar.gz
-	https://github.com/vector-im/element-desktop/archive/v${MY_PV}.tar.gz -> ${ELEMENT_DESKTOP_V}.tar.gz
-"
-KEYWORDS="~amd64"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+emoji proxy native-modules"
-REQUIRED_USE=""
-RESTRICT="network-sandbox" #need network sandbox disabled for `yarn install` to work
-
-COMMON_DEPEND="
-	!net-im/element-desktop-bin
-	>=net-libs/nodejs-13.0
-	>=sys-apps/yarn-1.22
-	x11-libs/libXScrnSaver
-	net-print/cups
-	dev-libs/nss
-	gnome-base/gconf
-	>=media-video/ffmpeg-4.0
-	native-modules? (
-	                  dev-lang/tcl:=
-	                  dev-db/sqlcipher:=
-	)
-"
-DEPEND="
-	${COMMON_DEPEND}
-	native-modules? (
-	                  || ( dev-lang/rust-bin dev-lang/rust )
-	                  sys-devel/make
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	emoji? ( >=media-fonts/noto-emoji-20180823 )
-"
-
-PATCHES=()
-
-DESTINATION="/opt/Element"
-
-get_proxy() {
-	if ! use "proxy";then
-		echo ""
-	else
-		echo "$http_proxy"
-	fi
-}
-
-src_unpack() {
-	unpack "${ELEMENT_WEB_V}.tar.gz" || die
-	unpack "${ELEMENT_DESKTOP_V}.tar.gz" || die
-	mv "${S}/${ELEMENT_WEB_V}" "${S}/${ELEMENT_WEB}" || die
-	mv "${S}/${ELEMENT_DESKTOP_V}" "${S}/${ELEMENT_DESKTOP}" || die
-}
-
-src_prepare() {
-	my_proxy="$(get_proxy)"
-
-	cd "${WEB_S}" || die
-
-	#workaround for canvas-prebuilt not existing for node 15
-	http_proxy="$my_proxy" yarn add node-gyp || die "Yarn module installation failed"
-
-	http_proxy="$my_proxy" yarn install || die "Yarn module installation failed"
-
-	cd "${DESKTOP_S}" || die
-	http_proxy="$my_proxy" yarn install || die "Yarn module installation failed"
-	ln -s "${WEB_S}/webapp" "${DESKTOP_S}/" || die
-
-	cd "${S}" || die
-	default
-}
-
-src_compile() {
-	my_proxy="$(get_proxy)"
-
-	einfo "Building element-web..."
-	cd "${WEB_S}" || die
-	yarn build || die "Element web build failed"
-
-	einfo "Building element-desktop..."
-	cd "${DESKTOP_S}" || die
-	http_proxy="$my_proxy" yarn build || die "Element desktop build failed"
-
-	if use native-modules;then
-		einfo "Building native modules..."
-		http_proxy="$my_proxy" yarn run build:native || die
-	fi
-}
-
-src_install() {
-	insinto "${DESTINATION}"
-	cp "${FILESDIR}/${PN}.desktop" "${T}"
-	sed -e 's@{::install_location::}@'"${DESTINATION}"'@g' "${T}/${PN}.desktop" -i
-	domenu "${T}/${PN}.desktop"
-	cp -r "${DESKTOP_S}/dist/linux-unpacked/"* "${D}/${DESTINATION}/"
-
-	insinto "${DESTINATION}/resources/"
-	doins -r "${WEB_S}/webapp/"
-
-	insinto "${DESTINATION}/resources/webapp/"
-	doins "${DESKTOP_S}/element.io/release/config.json"
-
-	dosym "${DESTINATION}/${PN}" "/usr/bin/${PN}"
-}
-
diff --git a/net-im/element-desktop/element-desktop-1.11.23.ebuild b/net-im/element-desktop/element-desktop-1.11.23.ebuild
deleted file mode 100644
index 97d6272..0000000
--- a/net-im/element-desktop/element-desktop-1.11.23.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2020 rexy712
-# Distributed under the terms of the GNU General Public License v3
-
-EAPI=7
-
-DESCRIPTION="A glossy Matrix collaboration client for desktop"
-HOMEPAGE="https://element.io"
-
-inherit eutils desktop
-
-if [ "${PR}" != "r0" ];then
-	rc_num="${PR:1}"
-	MY_PV="${PV}-rc.${rc_num}"
-else
-	MY_PV="${PV}"
-fi
-MY_PF="${PN}-${MY_PV}"
-
-S="${WORKDIR}"
-ELEMENT_WEB_V="element-web-${MY_PV}"
-ELEMENT_DESKTOP_V="element-desktop-${MY_PV}"
-ELEMENT_WEB="element-web"
-ELEMENT_DESKTOP="element-desktop"
-WEB_S="${S}/${ELEMENT_WEB}"
-DESKTOP_S="${S}/${ELEMENT_DESKTOP}"
-
-SRC_URI="
-	https://github.com/vector-im/element-web/archive/v${MY_PV}.tar.gz -> ${ELEMENT_WEB_V}.tar.gz
-	https://github.com/vector-im/element-desktop/archive/v${MY_PV}.tar.gz -> ${ELEMENT_DESKTOP_V}.tar.gz
-"
-KEYWORDS="~amd64"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+emoji proxy native-modules"
-REQUIRED_USE=""
-RESTRICT="network-sandbox" #need network sandbox disabled for `yarn install` to work
-
-COMMON_DEPEND="
-	!net-im/element-desktop-bin
-	>=net-libs/nodejs-13.0
-	>=sys-apps/yarn-1.22
-	x11-libs/libXScrnSaver
-	net-print/cups
-	dev-libs/nss
-	gnome-base/gconf
-	>=media-video/ffmpeg-4.0
-	native-modules? (
-	                  dev-lang/tcl:=
-	                  dev-db/sqlcipher:=
-	)
-"
-DEPEND="
-	${COMMON_DEPEND}
-	native-modules? (
-	                  || ( dev-lang/rust-bin dev-lang/rust )
-	                  sys-devel/make
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	emoji? ( >=media-fonts/noto-emoji-20180823 )
-"
-
-PATCHES=()
-
-DESTINATION="/opt/Element"
-
-get_proxy() {
-	if ! use "proxy";then
-		echo ""
-	else
-		echo "$http_proxy"
-	fi
-}
-
-src_unpack() {
-	unpack "${ELEMENT_WEB_V}.tar.gz" || die
-	unpack "${ELEMENT_DESKTOP_V}.tar.gz" || die
-	mv "${S}/${ELEMENT_WEB_V}" "${S}/${ELEMENT_WEB}" || die
-	mv "${S}/${ELEMENT_DESKTOP_V}" "${S}/${ELEMENT_DESKTOP}" || die
-}
-
-src_prepare() {
-	my_proxy="$(get_proxy)"
-
-	cd "${WEB_S}" || die
-
-	#workaround for canvas-prebuilt not existing for node 15
-	http_proxy="$my_proxy" yarn add node-gyp || die "Yarn module installation failed"
-
-	http_proxy="$my_proxy" yarn install || die "Yarn module installation failed"
-
-	cd "${DESKTOP_S}" || die
-	http_proxy="$my_proxy" yarn install || die "Yarn module installation failed"
-	ln -s "${WEB_S}/webapp" "${DESKTOP_S}/" || die
-
-	cd "${S}" || die
-	default
-}
-
-src_compile() {
-	my_proxy="$(get_proxy)"
-
-	einfo "Building element-web..."
-	cd "${WEB_S}" || die
-	yarn build || die "Element web build failed"
-
-	einfo "Building element-desktop..."
-	cd "${DESKTOP_S}" || die
-	http_proxy="$my_proxy" yarn build || die "Element desktop build failed"
-
-	if use native-modules;then
-		einfo "Building native modules..."
-		http_proxy="$my_proxy" yarn run build:native || die
-	fi
-}
-
-src_install() {
-	insinto "${DESTINATION}"
-	cp "${FILESDIR}/${PN}.desktop" "${T}"
-	sed -e 's@{::install_location::}@'"${DESTINATION}"'@g' "${T}/${PN}.desktop" -i
-	domenu "${T}/${PN}.desktop"
-	cp -r "${DESKTOP_S}/dist/linux-unpacked/"* "${D}/${DESTINATION}/"
-
-	insinto "${DESTINATION}/resources/"
-	doins -r "${WEB_S}/webapp/"
-
-	insinto "${DESTINATION}/resources/webapp/"
-	doins "${DESKTOP_S}/element.io/release/config.json"
-
-	dosym "${DESTINATION}/${PN}" "/usr/bin/${PN}"
-}
-
diff --git a/net-im/element-desktop/element-desktop-1.11.30.ebuild b/net-im/element-desktop/element-desktop-1.11.30.ebuild
deleted file mode 100644
index 97d6272..0000000
--- a/net-im/element-desktop/element-desktop-1.11.30.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2020 rexy712
-# Distributed under the terms of the GNU General Public License v3
-
-EAPI=7
-
-DESCRIPTION="A glossy Matrix collaboration client for desktop"
-HOMEPAGE="https://element.io"
-
-inherit eutils desktop
-
-if [ "${PR}" != "r0" ];then
-	rc_num="${PR:1}"
-	MY_PV="${PV}-rc.${rc_num}"
-else
-	MY_PV="${PV}"
-fi
-MY_PF="${PN}-${MY_PV}"
-
-S="${WORKDIR}"
-ELEMENT_WEB_V="element-web-${MY_PV}"
-ELEMENT_DESKTOP_V="element-desktop-${MY_PV}"
-ELEMENT_WEB="element-web"
-ELEMENT_DESKTOP="element-desktop"
-WEB_S="${S}/${ELEMENT_WEB}"
-DESKTOP_S="${S}/${ELEMENT_DESKTOP}"
-
-SRC_URI="
-	https://github.com/vector-im/element-web/archive/v${MY_PV}.tar.gz -> ${ELEMENT_WEB_V}.tar.gz
-	https://github.com/vector-im/element-desktop/archive/v${MY_PV}.tar.gz -> ${ELEMENT_DESKTOP_V}.tar.gz
-"
-KEYWORDS="~amd64"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+emoji proxy native-modules"
-REQUIRED_USE=""
-RESTRICT="network-sandbox" #need network sandbox disabled for `yarn install` to work
-
-COMMON_DEPEND="
-	!net-im/element-desktop-bin
-	>=net-libs/nodejs-13.0
-	>=sys-apps/yarn-1.22
-	x11-libs/libXScrnSaver
-	net-print/cups
-	dev-libs/nss
-	gnome-base/gconf
-	>=media-video/ffmpeg-4.0
-	native-modules? (
-	                  dev-lang/tcl:=
-	                  dev-db/sqlcipher:=
-	)
-"
-DEPEND="
-	${COMMON_DEPEND}
-	native-modules? (
-	                  || ( dev-lang/rust-bin dev-lang/rust )
-	                  sys-devel/make
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	emoji? ( >=media-fonts/noto-emoji-20180823 )
-"
-
-PATCHES=()
-
-DESTINATION="/opt/Element"
-
-get_proxy() {
-	if ! use "proxy";then
-		echo ""
-	else
-		echo "$http_proxy"
-	fi
-}
-
-src_unpack() {
-	unpack "${ELEMENT_WEB_V}.tar.gz" || die
-	unpack "${ELEMENT_DESKTOP_V}.tar.gz" || die
-	mv "${S}/${ELEMENT_WEB_V}" "${S}/${ELEMENT_WEB}" || die
-	mv "${S}/${ELEMENT_DESKTOP_V}" "${S}/${ELEMENT_DESKTOP}" || die
-}
-
-src_prepare() {
-	my_proxy="$(get_proxy)"
-
-	cd "${WEB_S}" || die
-
-	#workaround for canvas-prebuilt not existing for node 15
-	http_proxy="$my_proxy" yarn add node-gyp || die "Yarn module installation failed"
-
-	http_proxy="$my_proxy" yarn install || die "Yarn module installation failed"
-
-	cd "${DESKTOP_S}" || die
-	http_proxy="$my_proxy" yarn install || die "Yarn module installation failed"
-	ln -s "${WEB_S}/webapp" "${DESKTOP_S}/" || die
-
-	cd "${S}" || die
-	default
-}
-
-src_compile() {
-	my_proxy="$(get_proxy)"
-
-	einfo "Building element-web..."
-	cd "${WEB_S}" || die
-	yarn build || die "Element web build failed"
-
-	einfo "Building element-desktop..."
-	cd "${DESKTOP_S}" || die
-	http_proxy="$my_proxy" yarn build || die "Element desktop build failed"
-
-	if use native-modules;then
-		einfo "Building native modules..."
-		http_proxy="$my_proxy" yarn run build:native || die
-	fi
-}
-
-src_install() {
-	insinto "${DESTINATION}"
-	cp "${FILESDIR}/${PN}.desktop" "${T}"
-	sed -e 's@{::install_location::}@'"${DESTINATION}"'@g' "${T}/${PN}.desktop" -i
-	domenu "${T}/${PN}.desktop"
-	cp -r "${DESKTOP_S}/dist/linux-unpacked/"* "${D}/${DESTINATION}/"
-
-	insinto "${DESTINATION}/resources/"
-	doins -r "${WEB_S}/webapp/"
-
-	insinto "${DESTINATION}/resources/webapp/"
-	doins "${DESKTOP_S}/element.io/release/config.json"
-
-	dosym "${DESTINATION}/${PN}" "/usr/bin/${PN}"
-}
-
diff --git a/net-im/element-desktop/element-desktop-1.11.11.ebuild b/net-im/element-desktop/element-desktop-1.11.40.ebuild
similarity index 99%
rename from net-im/element-desktop/element-desktop-1.11.11.ebuild
rename to net-im/element-desktop/element-desktop-1.11.40.ebuild
index 97d6272..9bd320f 100644
--- a/net-im/element-desktop/element-desktop-1.11.11.ebuild
+++ b/net-im/element-desktop/element-desktop-1.11.40.ebuild
@@ -1,12 +1,12 @@
 # Copyright 2020 rexy712
 # Distributed under the terms of the GNU General Public License v3
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="A glossy Matrix collaboration client for desktop"
 HOMEPAGE="https://element.io"
 
-inherit eutils desktop
+inherit desktop
 
 if [ "${PR}" != "r0" ];then
 	rc_num="${PR:1}"