Merge remote-tracking branch 'upstream/master' into master

dev-libs/olm/Manifest

@@ -1,2 +1 @@
-DIST olm-3.1.4.tar.bz2 461540 BLAKE2B fa69b1543330c5da37c04227b51197ba57968ef24def40df621b85c0988eac91f8a155f600ab26849f2cd213059c97c7035be6dcca0943245cd4e4895da314b3 SHA512 87265d835ca7332d162bd3573dffdd09c8337c464dd673f100db9193e8ea4cedd8cb2a92cf2c34ad1b552a55bbbce8f87a47559ccfba03fa69b32fc7ff07f5f0
 DIST olm-3.1.5.tar.bz2 461855 BLAKE2B 20412686ea1621de0d45885ae6f44331389cb401410809901187431eb101113f4186dc5b31c055da15143bec70f2251ee506e4fb50b0a8e495bdfa6cdb302b9e SHA512 a41be45e3fadb4e24654a4db8a68dab7fb8b021aeaf48b524d9c2c1e9d48e0b2200b9f1ac8431e79bc620560b16c66fb4c2d3727901b47b78288ea22b3f6ba02

dev-libs/olm/metadata.xml

@@ -1,4 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email> parona@protonmail.com </email>
+		<name> Alfred Wingate </name>
+	</maintainer>
+	<maintainer type="person">
+		<email>hedmoo@yahoo.com</email>
+		<name>Andreas Westman Dorcsak</name>
+	</maintainer>
 </pkgmetadata>

dev-libs/olm/olm-3.1.5-r1.ebuild

@@ -3,7 +3,10 @@
 
 EAPI=7
 
-inherit cmake
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_OPTIONAL=1
+
+inherit cmake distutils-r1
 
 DESCRIPTION="An implementation of the Double Ratchet cryptographic ratchet in C++"
 HOMEPAGE="https://git.matrix.org/git/olm/about/"
@@ -18,4 +21,26 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/$(ver_cut 1)"
-IUSE=""
+IUSE="python"
+
+DEPEND="
+	python? (
+		dev-python/cffi[${PYTHON_USEDEP}]
+		dev-python/future[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	cmake_src_prepare
+	use python && (cd python; distutils-r1_src_prepare)
+}
+
+src_compile() {
+	cmake_src_compile
+	use python && (cd python; distutils-r1_src_compile)
+}
+
+src_install() {
+	cmake_src_install
+	use python && (cd python; distutils-r1_src_install)
+}

dev-python/blist/Manifest

@@ -0,0 +1 @@
+DIST blist-1.3.6.tar.gz 143820 BLAKE2B e3166613df87bc53720a29dd3d18656b1148095000d1800df5253d2d7cac0293a5d47576ae5c0268ef4d64bd84c8e7558281cda0325d47b6fdeb01d4122afd58 SHA512 f46ded57aeb2a33fc5450420210d015aa37c2fc91034a771dfb1a184ef2655d8e5dc97bee61139059e6211569fcb7358f972071d3830733e9dbb8908e1b0e14c

dev-python/blist/blist-1.3.6.ebuild

@@ -0,0 +1,15 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+inherit distutils-r1
+
+DESCRIPTION="A list-like type"
+HOMEPAGE="https://github.com/DanielStutzbach/blist http://stutzbachenterprises.com/blist/"
+SRC_URI="https://github.com/DanielStutzbach/blist/archive/v"${PV}".tar.gz -> "${PF}".tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"

dev-python/blist/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> parona@protonmail.com </email>
+		<name> Alfred Wingate </name>
+	</maintainer>
+	<longdescription lang="en">
+		A list-like type with better asymptotic performance and similar performance on small lists
+	</longdescription>
+</pkgmetadata>

dev-python/html_sanitizer/Manifest

@@ -0,0 +1 @@
+DIST html_sanitizer-1.9.1.tar.gz 14449 BLAKE2B 34b47cd492b86aebd67279916ad1be7088facdb93ee829337eff0d0a6e6ffdfd53148693bf748bb4014328d1bf43f41cc907b2e61340721759e733032ac93d1b SHA512 f9a76733f87dc7642a63314202855d3e8639764f64ed29f8816f325faf67062c929e1edfc435b7d1071feb2ed00f31ca9c3e015c55650d95c42226a66ab1e6dd

dev-python/html_sanitizer/html_sanitizer-1.9.1.ebuild

@@ -0,0 +1,22 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+inherit distutils-r1
+
+DESCRIPTION="Allowlist-based HTML cleaner"
+HOMEPAGE="https://github.com/matthiask/html-sanitizer/ https://pypi.org/project/html-sanitizer/"
+SRC_URI="https://github.com/matthiask/html-sanitizer/archive/"${PV}".tar.gz -> "${PN}"-"${PV}".tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=dev-python/lxml-3.6.1
+	dev-python/beautifulsoup:4
+"
+
+S=""${WORKDIR}"/html-sanitizer-"${PV}""

dev-python/html_sanitizer/metadata.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email> parona@protonmail.com </email>
+		<name> Alfred Wingate </name>
+	</maintainer>
+</pkgmetadata>

dev-python/matrix-nio/Manifest

@@ -0,0 +1 @@
+DIST matrix-nio-0.15.1.tar.gz 227809 BLAKE2B a026cb421d09ccd0949382024587a196999d09733bd76fa1a79c7423e1543b2e42209ebb39c08a227e0c7d3821ee2e2cf17253aceaa36e7be0540c0455032474 SHA512 0bcc0321e1e679e02257062ae3390a677bf5d23bf8b8ddb967037aea4120c80ed5ea37060b574e7d830b467f2b581864331db393ff4977df6fc865863f8dbd67

dev-python/matrix-nio/matrix-nio-0.15.1.ebuild

@@ -0,0 +1,35 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9})
+inherit distutils-r1
+
+DESCRIPTION="A Python Matrix client library, designed according to sans I/O principles"
+HOMEPAGE="https://github.com/poljar/matrix-nio"
+SRC_URI="https://github.com/poljar/matrix-nio/archive/${PV}.tar.gz -> ${PF}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="e2e"
+
+RDEPEND="
+	dev-python/future
+	dev-python/aiohttp
+	dev-python/aiofiles
+	python_targets_python3_6? ( dev-python/dataclasses )
+	dev-python/h11
+	dev-python/hyper-h2
+	dev-python/logbook
+	dev-python/jsonschema
+	dev-python/unpaddedbase64
+	dev-python/pycryptodome
+	e2e? (
+		>=dev-libs/olm-3.1.5[python(-)]
+		>=dev-python/peewee-3.9.5
+		dev-python/cachetools
+		dev-python/atomicwrites
+	)
+"

dev-python/matrix-nio/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> parona@protonmail.com </email>
+		<name> Alfred Wingate </name>
+	</maintainer>
+	<use>
+		<flag name="e2e"> Enable end to end encryption support </flag>
+	</use>
+</pkgmetadata>

dev-python/pyfastcopy/Manifest

@@ -0,0 +1 @@
+DIST pyfastcopy-1.0.3.tar.gz 7376 BLAKE2B 421c97d235e534cbad4b8a139ecf1d5e0e7b40ae6f25ed5084055eede33c9a016cdc029540c384cad7e0a58d7fc1f5ab2639f46bc1ae3d118fda6a64bebce8ea SHA512 7601133f0abbf0d525d2b0e37d9188bc82ae57477389d6a1d1c608b337b4ed399e18af223c3ba22caa2f9fbfb903864307a107bd669d736bae5576fc5f2a5df4

dev-python/pyfastcopy/metadata.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email> parona@protonmail.com </email>
+		<name> Alfred Wingate </name>
+	</maintainer>
+</pkgmetadata>

dev-python/pyfastcopy/pyfastcopy-1.0.3.ebuild

@@ -0,0 +1,15 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Speed up Python's shutil.copyfile by using sendfile system call"
+HOMEPAGE="https://github.com/desbma/pyfastcopy"
+SRC_URI="https://github.com/desbma/pyfastcopy/archive/"${PV}".tar.gz -> "${PF}".tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64"

dev-python/unpaddedbase64/Manifest

@@ -0,0 +1 @@
+DIST unpaddedbase64-1.1.0.tar.gz 5889 BLAKE2B a343bca718be9be7f8689e47fb43ee01d427709d8ac9e00804be976084c6622a57dbd509629ade248fdda0ff9a25bf7442624abf256809d8c6d0b5e5ee747dee SHA512 7e5954d8c4fbf55f21c8cda493e7db613feaa16224139ea550958073c182e4fba953c5f9670c72d1d0fc1402144a1dbeb9fa4df437a8ac51a29cce715e14f15d

dev-python/unpaddedbase64/metadata.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email> parona@protonmail.com </email>
+		<name> Alfred Wingate </name>
+	</maintainer>
+</pkgmetadata>

dev-python/unpaddedbase64/unpaddedbase64-1.1.0.ebuild

@@ -0,0 +1,17 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+inherit distutils-r1
+
+DESCRIPTION="Encode and decode Base64 without "=" padding."
+HOMEPAGE="https://github.com/matrix-org/python-unpaddedbase64"
+SRC_URI="https://github.com/matrix-org/python-unpaddedbase64/archive/v"${PV}".tar.gz -> "${PF}".tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S=""${WORKDIR}"/python-"${PF}""

net-im/mirage/Manifest

@@ -0,0 +1,6 @@
+DIST RadialBarDemo-ec3af1a087a0c4c0c31709ed94b7e939d3e51400.tar.gz 6287 BLAKE2B 307e873cd294cb16e8ee1b8d3e54b71b2e81f930df317f377454587997e0d927040c13d5daeca58e5ffe07be8dcdcd3bbe89021371d2262b3d6e4748e7f8cea8 SHA512 d4f2fcc91e3542299ffde8c6981131d3dd8c168954c6b43929b675f153c3424a29ef2a2e5f1445b8500aca97f3674eed40f7cabf242fd210ea67f5028567552d
+DIST SortFilterProxyModel-36befddf5d57faad990e72c88c5844794f274145.tar.gz 52369 BLAKE2B 02e2a85c5df7a173b1ec27f126474db0d1ddf2c5858d41b904d463277d134f6f301e25597fd71d61d4a512207eb739e094b44a6af7d9bb7deb65823ab6836691 SHA512 bfb7af36abd5ded014549042e760c1ec6779f46dd6c30e672ada21decc7a1b1a631ada1cc2c57d62d0daca4cccff9640077345b3661ef73021d5e2ee8058ae9b
+DIST gel-0e796aacc16388a164bab0bb0ce9dabc885ed7fa.tar.gz 9878 BLAKE2B 319ec5f76ace441e78f563e596b3e46baada15716e7642d71e9dce56241b7f37f58c79863e944e6710fcbe634da6538d77fa8e6c897d35e695a81ca1cd37c8ec SHA512 540549882494007219d7e5be6d4502869bf02db16046547a623a20c17be729645ccd7611fa8ecd16e8f2fe545569be29240dabbefc8cb8f9c2b333355caab480
+DIST hsluv-c-9e9be32d6010cad484a7b12b1a3d19c6cf4c1353.tar.gz 1073542 BLAKE2B d798c71be3d3f7ad4248650f08bbb477b43b27edafa8519ddb9ac2873a1da99767f6f6668280fc9fa8abce7ab8347a9fe040a9b80c189f4e13465b5747e07adc SHA512 ecd8c9afa9e22c6a0093435ce89b5d5b1882207359d02a65f6e62952fa4b57fc5b3e1aaa07527553a7e86c350173409b21d41b3da5235a7fb5f96b61944be839
+DIST mirage-v0.6.4.tar.gz 3130527 BLAKE2B eec48e6afc0e0cc609b0ebad2799c2e9defea564a271251e98c41ca2176e1c98bd3c228f4bcfb5719e993b5c71ed964e61939eaf0f4f104315fda79cc80d3db3 SHA512 1780e5e9da7a31b2310d3e07d6b52a7be8cfe97262fef34ef470fd3d92621e554596858168d1d555d7dcf6f506853e0260b744a7725e70c9a34cf399be2394e0
+DIST qsyncable-f5ca07b71cecda685d0dd4b3c74d2fb2ca71f711.tar.gz 116316 BLAKE2B f0492e8a76485f24c0b6fe5c0c0fe7ec4e308722f2bc1d868bd27a53f8bb0354b4ead10a4ceb08d35b1441a0b9dae538c14826fe31a57b80294e3b6f5396b69e SHA512 b7187b3a87b21b6ff3dde00aee55c5cc1721ee8d228eab91cc78a7b5de68457999015ef601542a69c9bed424ffcd375e7314bd451d6d7eaee5a827962c83a3a7

net-im/mirage/metadata.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email> parona@protonmail.com </email>
+		<name> Alfred Wingate </name>
+	</maintainer>
+	<maintainer type="person">
+		<email>hedmoo@yahoo.com</email>
+		<name>Andreas Westman Dorcsak</name>
+	</maintainer>
+</pkgmetadata>

net-im/mirage/mirage-0.6.4.ebuild

@@ -0,0 +1,117 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} )
+inherit qmake-utils python-single-r1 xdg
+
+DESCRIPTION="A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client."
+HOMEPAGE="https://github.com/mirukana/mirage"
+
+SUBMODULE_COMMITS=(
+	"ec3af1a087a0c4c0c31709ed94b7e939d3e51400"
+	"36befddf5d57faad990e72c88c5844794f274145"
+	"0e796aacc16388a164bab0bb0ce9dabc885ed7fa"
+	"9e9be32d6010cad484a7b12b1a3d19c6cf4c1353"
+	"f5ca07b71cecda685d0dd4b3c74d2fb2ca71f711"
+)
+
+#[0] mirukana/RadialBarDemo
+#[1] oKcerG/SortFilterProxyModel
+#[2] Cutehacks/gel
+#[3] hsluv/hsluv-c
+#[4] benlau/qsyncable
+
+if [[ "${PV}" == "9999" ]]
+then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mirukana/mirage.git"
+	EGIT_SUBMODULES=( '*' )
+else
+	SRC_URI="
+		https://github.com/mirukana/"${PN}"/archive/v"${PV}".tar.gz -> "${PN}"-v"${PV}".tar.gz
+		https://github.com/mirukana/RadialBarDemo/archive/"${SUBMODULE_COMMITS[0]}".tar.gz -> RadialBarDemo-"${SUBMODULE_COMMITS[0]}".tar.gz
+		https://github.com/oKcerG/SortFilterProxyModel/archive/"${SUBMODULE_COMMITS[1]}".tar.gz -> SortFilterProxyModel-"${SUBMODULE_COMMITS[1]}".tar.gz
+		https://github.com/Cutehacks/gel/archive/"${SUBMODULE_COMMITS[2]}".tar.gz -> gel-"${SUBMODULE_COMMITS[2]}".tar.gz
+		https://github.com/hsluv/hsluv-c/archive/"${SUBMODULE_COMMITS[3]}".tar.gz -> hsluv-c-"${SUBMODULE_COMMITS[3]}".tar.gz
+		https://github.com/benlau/qsyncable/archive/"${SUBMODULE_COMMITS[4]}".tar.gz -> qsyncable-"${SUBMODULE_COMMITS[4]}".tar.gz
+	"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="X"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	>=dev-qt/qtcore-5.12
+	>=dev-qt/qtdeclarative-5.12
+	>=dev-qt/qtquickcontrols2-5.12[widgets]
+	>=dev-qt/qtgraphicaleffects-5.12
+	X? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+	)
+"
+
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+	>=dev-qt/qtimageformats-5.12
+	>=dev-qt/qtsvg-5.12
+	dev-libs/olm
+	dev-python/pyotherside[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/matrix-nio[e2e,${PYTHON_USEDEP}]
+		>=dev-python/aiofiles-0.4.0[${PYTHON_USEDEP}]
+		>=dev-python/appdirs-1.4.4[${PYTHON_USEDEP}]
+		>=dev-python/blist-1.3.6[${PYTHON_USEDEP}]
+		>=media-gfx/cairosvg-2.4.2[${PYTHON_USEDEP}]
+		>=dev-python/filetype-1.0.7[${PYTHON_USEDEP}]
+		>=dev-python/html_sanitizer-1.9.1[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.5.1[${PYTHON_USEDEP}]
+		>=dev-python/mistune-0.8.4[${PYTHON_USEDEP}]
+		>=dev-python/pillow-7.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pymediainfo-4.2.1[${PYTHON_USEDEP}]
+		python_single_target_python3_6? ( >=dev-python/async_generator-1.10[python_targets_python3_6] )
+		python_single_target_python3_6? ( >=dev-python/dataclasses-0.6[python_targets_python3_6] )
+		python_single_target_python3_6? ( >=dev-python/pyfastcopy-1.0.3[python_targets_python3_6] )
+		python_single_target_python3_7? ( >=dev-python/pyfastcopy-1.0.3[python_targets_python3_7] )
+
+	')
+	media-libs/libjpeg-turbo
+	media-libs/libmediainfo
+	media-libs/libwebp
+	media-libs/tiff
+	media-libs/openjpeg:2
+	sys-libs/zlib
+"
+
+src_prepare() {
+	move_lib() {
+		local IN_DIR="${1}"
+		local OUT_DIR
+		[ -z "${2}" ] && OUT_DIR="${IN_DIR}" || OUT_DIR=""${2%/}"/"${IN_DIR}""
+		mv ""${WORKDIR}"/"${IN_DIR}""*/* ""${S}"/"${OUT_DIR}"" || die
+	}
+	if [ "${PV}" != "9999" ]; then
+		local submodules_libs="RadialBarDemo SortFilterProxyModel gel hsluv-c qsyncable"
+		for submodules_lib in ${submodules_libs} ; do
+			move_lib "${submodules_lib}" submodules
+		done
+	fi
+	eapply_user
+}
+
+src_configure() {
+	if use !X; then
+		myconf="CONFIG+=no-x11"
+	fi
+	eqmake5 mirage.pro PREFIX="${D}"/usr ${myconf}
+}
+
+src_install() {
+	emake install
+}

net-im/mirage/mirage-9999.ebuild

@@ -0,0 +1,117 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} )
+inherit qmake-utils python-single-r1 xdg
+
+DESCRIPTION="A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client."
+HOMEPAGE="https://github.com/mirukana/mirage"
+
+SUBMODULE_COMMITS=(
+	"ec3af1a087a0c4c0c31709ed94b7e939d3e51400"
+	"36befddf5d57faad990e72c88c5844794f274145"
+	"0e796aacc16388a164bab0bb0ce9dabc885ed7fa"
+	"9e9be32d6010cad484a7b12b1a3d19c6cf4c1353"
+	"f5ca07b71cecda685d0dd4b3c74d2fb2ca71f711"
+)
+
+#[0] mirukana/RadialBarDemo
+#[1] oKcerG/SortFilterProxyModel
+#[2] Cutehacks/gel
+#[3] hsluv/hsluv-c
+#[4] benlau/qsyncable
+
+if [[ "${PV}" == "9999" ]]
+then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mirukana/mirage.git"
+	EGIT_SUBMODULES=( '*' )
+else
+	SRC_URI="
+		https://github.com/mirukana/"${PN}"/archive/v"${PV}".tar.gz -> "${PN}"-v"${PV}".tar.gz
+		https://github.com/mirukana/RadialBarDemo/archive/"${SUBMODULE_COMMITS[0]}".tar.gz -> RadialBarDemo-"${SUBMODULE_COMMITS[0]}".tar.gz
+		https://github.com/oKcerG/SortFilterProxyModel/archive/"${SUBMODULE_COMMITS[1]}".tar.gz -> SortFilterProxyModel-"${SUBMODULE_COMMITS[1]}".tar.gz
+		https://github.com/Cutehacks/gel/archive/"${SUBMODULE_COMMITS[2]}".tar.gz -> gel-"${SUBMODULE_COMMITS[2]}".tar.gz
+		https://github.com/hsluv/hsluv-c/archive/"${SUBMODULE_COMMITS[3]}".tar.gz -> hsluv-c-"${SUBMODULE_COMMITS[3]}".tar.gz
+		https://github.com/benlau/qsyncable/archive/"${SUBMODULE_COMMITS[4]}".tar.gz -> qsyncable-"${SUBMODULE_COMMITS[4]}".tar.gz
+	"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="X"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	>=dev-qt/qtcore-5.12
+	>=dev-qt/qtdeclarative-5.12
+	>=dev-qt/qtquickcontrols2-5.12[widgets]
+	>=dev-qt/qtgraphicaleffects-5.12
+	X? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+	)
+"
+
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+	>=dev-qt/qtimageformats-5.12
+	>=dev-qt/qtsvg-5.12
+	dev-libs/olm
+	dev-python/pyotherside[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/matrix-nio[e2e,${PYTHON_USEDEP}]
+		>=dev-python/aiofiles-0.4.0[${PYTHON_USEDEP}]
+		>=dev-python/appdirs-1.4.4[${PYTHON_USEDEP}]
+		>=dev-python/blist-1.3.6[${PYTHON_USEDEP}]
+		>=media-gfx/cairosvg-2.4.2[${PYTHON_USEDEP}]
+		>=dev-python/filetype-1.0.7[${PYTHON_USEDEP}]
+		>=dev-python/html_sanitizer-1.9.1[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.5.1[${PYTHON_USEDEP}]
+		>=dev-python/mistune-0.8.4[${PYTHON_USEDEP}]
+		>=dev-python/pillow-7.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pymediainfo-4.2.1[${PYTHON_USEDEP}]
+		python_single_target_python3_6? ( >=dev-python/async_generator-1.10[python_targets_python3_6] )
+		python_single_target_python3_6? ( >=dev-python/dataclasses-0.6[python_targets_python3_6] )
+		python_single_target_python3_6? ( >=dev-python/pyfastcopy-1.0.3[python_targets_python3_6] )
+		python_single_target_python3_7? ( >=dev-python/pyfastcopy-1.0.3[python_targets_python3_7] )
+
+	')
+	media-libs/libjpeg-turbo
+	media-libs/libmediainfo
+	media-libs/libwebp
+	media-libs/tiff
+	media-libs/openjpeg:2
+	sys-libs/zlib
+"
+
+src_prepare() {
+	move_lib() {
+		local IN_DIR="${1}"
+		local OUT_DIR
+		[ -z "${2}" ] && OUT_DIR="${IN_DIR}" || OUT_DIR=""${2%/}"/"${IN_DIR}""
+		mv ""${WORKDIR}"/"${IN_DIR}""*/* ""${S}"/"${OUT_DIR}"" || die
+	}
+	if [ "${PV}" != "9999" ]; then
+		local submodules_libs="RadialBarDemo SortFilterProxyModel gel hsluv-c qsyncable"
+		for submodules_lib in ${submodules_libs} ; do
+			move_lib "${submodules_lib}" submodules
+		done
+	fi
+	eapply_user
+}
+
+src_configure() {
+	if use !X; then
+		myconf="CONFIG+=no-x11"
+	fi
+	eqmake5 mirage.pro PREFIX="${D}"/usr ${myconf}
+}
+
+src_install() {
+	emake install
+}

www-client/waterfox/Manifest

@@ -1,4 +1,4 @@
 DIST firefox-56.0-patches-07.tar.xz 12696 BLAKE2B 60fe9e4aee235bebd1ceeeca9f455b5129368e3b83a1a7487e912d28642f2c67f0041f10333f05ce5a17b8b0db05e33730c972038e72c0250551194316a6dfa6 SHA512 b7f1b32b8dc563b2c0c6b12eb1698fbd145c9b45597ef0f46159888e1c792f944c92cd1c1e3d0a5b36a3cf3cdc2f7ae9e8c537adbbfa6a1ce293311d3956a2d2
-DIST waterfox-2020.05.tar.gz 409604600 BLAKE2B 2ba76eea8623c27c9bfa4baa182a89c5f6734c107082032cf49a4f3bdda340b3d65c54337553908f8cf8657d9da515d3fa6d3536b4d5ff869092582a85de7e0b SHA512 50bc6c8f2d8a1c9d529c75b466413343a1475fca3b5177067b01f4de19c22a437f549824d19f97b49f0383c146f728a2ebd296daeb0c354c3a3d9ca0db86346f
 DIST waterfox-2020.07.1.tar.gz 410117026 BLAKE2B 5c2a54caa27c3dec323c1f66110e288ab84b45b6001eb78ff3623d992d1cea3ea4b6378e1c18e0618ace9f049d341c987cc25231a6d10bec2f3f4df96d20bfe5 SHA512 28c111de097e165fe9e80d20f92e68ef095a10fd136bc906c1ec75ebf4af0aacb31e6f10d74222438014f5d579d68c773cae6e7aedfb78e869fb8d26372d569e
 DIST waterfox-2020.07.2.tar.gz 410119190 BLAKE2B dded02d62a61e664ddf1a24fbfecf7381d5a26dd0360e2fb0844aae79a815e02046fcb997c4e2f355f853a6b5432402c97ed6d45a5fe515707c631345edc2cb2 SHA512 9a554067a9b19d06d6fd3d20f9743d484138130516dd099d0656f4b0a911cbab8c38e0286fd7c0ed66aefebf6c3f1af609c09f4c7fead77278b69f14794bb6d4
+DIST waterfox-2020.09.tar.gz 476808044 BLAKE2B 35a359f2c8237ab284a895f06a721a921807d4862f5415fdd61142e540783e14a6d92c10c5c00acbeac24a638afdcd0b3b14fd808fb9303406c605865afc4c92 SHA512 fbf3d36dcd8b90e509612d08276d55aa0e09d2e0158c90a538d91499b8d6840782b6194eedaa6eb949d2f47c1b7e247831370c6d9971de813920d7bf7f1c6fc1

www-client/waterfox/waterfox-2020.07.1.ebuild

@@ -351,7 +351,7 @@ src_install() {
 	doins "${icon_path}/${icon}.png"
 	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
 	newicon "${icon_path}/default48.png" "${icon}.png"
-	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
+	newmenu "${FILESDIR}/${PN}.desktop" "${PN}.desktop"
 	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
 		"${ED%/}/usr/share/applications/${PN}.desktop" \
 		|| die

www-client/waterfox/waterfox-2020.07.2.ebuild

@@ -351,7 +351,7 @@ src_install() {
 	doins "${icon_path}/${icon}.png"
 	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
 	newicon "${icon_path}/default48.png" "${icon}.png"
-	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
+	newmenu "${FILESDIR}/${PN}.desktop" "${PN}.desktop"
 	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
 		"${ED%/}/usr/share/applications/${PN}.desktop" \
 		|| die

www-client/waterfox/waterfox-2020.09.ebuild

@@ -60,8 +60,9 @@ ASM_DEPEND="
 	>=dev-lang/yasm-1.1
 "
 RDEPEND="
-	>=dev-libs/nss-3.32.1
+	>=dev-db/sqlite-3.33.0
 	>=dev-libs/nspr-4.16
+	>=dev-libs/nss-3.32.1
 	jack? (
 		virtual/jack
 	)
@@ -351,7 +352,7 @@ src_install() {
 	doins "${icon_path}/${icon}.png"
 	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
 	newicon "${icon_path}/default48.png" "${icon}.png"
-	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
+	newmenu "${FILESDIR}/${PN}.desktop" "${PN}.desktop"
 	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
 		"${ED%/}/usr/share/applications/${PN}.desktop" \
 		|| die