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

dev-libs/libQuotient/Manifest

@@ -1,2 +1,2 @@
-DIST 0.6.0.tar.gz 556773 BLAKE2B 0361b7b88cb93dbbe1dee21751425e780eed68e2e50eed8bf79f01ff4eb49047130502d5b242b6c25871f5894ca2cf5d57069e44d22164dfd8c43efbb4485704 SHA512 42f7d1ee788cc2bd9d88f0ec4339573d1c4be85c462ddb81d4b4cc222fa46d3482bf4c231fd8c35f334aefa112f45251239a99c37456efcae0ca5d9359271f72
+DIST libQuotient-0.6.0.tar.gz 556773 BLAKE2B 0361b7b88cb93dbbe1dee21751425e780eed68e2e50eed8bf79f01ff4eb49047130502d5b242b6c25871f5894ca2cf5d57069e44d22164dfd8c43efbb4485704 SHA512 42f7d1ee788cc2bd9d88f0ec4339573d1c4be85c462ddb81d4b4cc222fa46d3482bf4c231fd8c35f334aefa112f45251239a99c37456efcae0ca5d9359271f72
-DIST 0.6.1.tar.gz 557477 BLAKE2B f0e90c0bbf2eccc93cbb9a4598368929ebe2e03aea9db3b4ea1782e41cd96ae9812b649c3d2f3f3e62f09d7266dd4c27c24d87163c0ae05c0d122e734e6f59e2 SHA512 17f6bac381d62e3975d6099a92a80c6855ba078947f9855960e7c963c05e094127eb926e922868456eb0694bd5eb1f4294bb12bfdea73db1724313359a330e2e
+DIST libQuotient-0.6.1.tar.gz 557477 BLAKE2B f0e90c0bbf2eccc93cbb9a4598368929ebe2e03aea9db3b4ea1782e41cd96ae9812b649c3d2f3f3e62f09d7266dd4c27c24d87163c0ae05c0d122e734e6f59e2 SHA512 17f6bac381d62e3975d6099a92a80c6855ba078947f9855960e7c963c05e094127eb926e922868456eb0694bd5eb1f4294bb12bfdea73db1724313359a330e2e

dev-libs/libQuotient/libQuotient-0.6.0.ebuild

@@ -10,9 +10,9 @@ inherit eutils cmake
 
 if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/quotient-im/${PN}.git"
+	EGIT_REPO_URI="https://github.com/quotient-im/"${PN}".git"
 else
-	SRC_URI="https://github.com/quotient-im/libQuotient/archive/${PV}.tar.gz "
+	SRC_URI="https://github.com/quotient-im/libQuotient/archive/"${PV}".tar.gz -> "${P}".tar.gz"
 	KEYWORDS="~amd64"
 fi
 
@@ -28,7 +28,7 @@ DEPEND="
 	!!dev-libs/libqmatrixclient
 "
 
-S="${WORKDIR}/${PN}-${PV}"
+S=""${WORKDIR}"/"${PN}"-"${PV}""
 
 src_configure() {
 	local mycmakeargs=(

dev-libs/libQuotient/libQuotient-0.6.1.ebuild

@@ -10,9 +10,9 @@ inherit eutils cmake
 
 if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/quotient-im/${PN}.git"
+	EGIT_REPO_URI="https://github.com/quotient-im/"${PN}".git"
 else
-	SRC_URI="https://github.com/quotient-im/libQuotient/archive/${PV}.tar.gz "
+	SRC_URI="https://github.com/quotient-im/libQuotient/archive/"${PV}".tar.gz -> "${P}".tar.gz"
 	KEYWORDS="~amd64"
 fi
 
@@ -28,7 +28,7 @@ DEPEND="
 	!!dev-libs/libqmatrixclient
 "
 
-S="${WORKDIR}/${PN}-${PV}"
+S=""${WORKDIR}"/"${PN}"-"${PV}""
 
 src_configure() {
 	local mycmakeargs=(

dev-libs/libQuotient/libQuotient-9999.ebuild

@@ -8,13 +8,11 @@ HOMEPAGE="https://github.com/qmatrixclient/libqmatrixclient"
 
 inherit eutils cmake
 
-MY_PV="$(ver_rs 2 '-')"
-
 if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/quotient-im/${PN}.git"
+	EGIT_REPO_URI="https://github.com/quotient-im/"${PN}".git"
 else
-	SRC_URI="https://github.com/quotient-im/libQuotient/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/quotient-im/libQuotient/archive/"${PV}".tar.gz -> "${P}".tar.gz"
 	KEYWORDS="~amd64"
 fi
 
@@ -30,7 +28,7 @@ DEPEND="
 	!!dev-libs/libqmatrixclient
 "
 
-S="${WORKDIR}/${PN}-${MY_PV}"
+S=""${WORKDIR}"/"${PN}"-"${PV}""
 
 src_configure() {
 	local mycmakeargs=(

dev-libs/olm/files/olmlib.patch

@@ -0,0 +1,12 @@
+diff --git a/python/olm_build.py b/python/olm_build.py
+index 0606337..1032da0 100644
+--- a/python/olm_build.py
++++ b/python/olm_build.py
+@@ -46,6 +46,7 @@ ffibuilder.set_source(
+         #include <olm/sas.h>
+     """,
+     libraries=["olm"],
++    library_dirs = ["../lib64"],
+     extra_compile_args=compile_args,
+     extra_link_args=link_args)
+ 

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

@@ -30,6 +30,10 @@ DEPEND="
 	)
 "
 
+CMAKE_IN_SOURCE_BUILD=1
+
+PATCHES=( "${FILESDIR}/olmlib.patch" )
+
 src_prepare() {
 	cmake_src_prepare
 	use python && (cd python; distutils-r1_src_prepare)

dev-python/blist/blist-1.3.6.ebuild

@@ -8,7 +8,7 @@ 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"
+SRC_URI="https://github.com/DanielStutzbach/blist/archive/v"${PV}".tar.gz -> "${P}".tar.gz"
 
 LICENSE="BSD"
 SLOT="0"

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

@@ -8,7 +8,7 @@ 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"
+SRC_URI="https://github.com/poljar/matrix-nio/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"

dev-python/pyfastcopy/pyfastcopy-1.0.3.ebuild

@@ -8,7 +8,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"
+SRC_URI="https://github.com/desbma/pyfastcopy/archive/"${PV}".tar.gz -> "${P}".tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"

dev-python/unpaddedbase64/unpaddedbase64-1.1.0.ebuild

@@ -8,7 +8,7 @@ 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"
+SRC_URI="https://github.com/matrix-org/python-unpaddedbase64/archive/v"${PV}".tar.gz -> "${P}".tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"

media-sound/ponymix/Manifest

@@ -0,0 +1 @@
+DIST ponymix-5.tar.gz 16862 BLAKE2B 5518f6d556972b74b2a01216332f920197070ef7b2eedab7e64dcba254c89230cf31d43e3b4a9cb342bfe0a31835c1f1a43688a7b65a4ed9eec18f48c70d72fe SHA512 0676255b3580322b4fd2ea364460b70abde94a2bf94542d3490f43f3c2cfefc11367d886d2250c93058b1712f037a730c29cf6177eed967cee9782cae48eeeee

media-sound/ponymix/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>y0rune@aol.com</email>
+		<name>Marcin Woźniak</name>
+	</maintainer>
+</pkgmetadata>

media-sound/ponymix/ponymix-5.ebuild

@@ -0,0 +1,36 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="CLI volume control for PulseAudio"
+HOMEPAGE="https://github.com/falconindy/ponymix"
+SRC_URI="https://github.com/falconindy/ponymix/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+inherit bash-completion-r1 toolchain-funcs
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bash-completion"
+
+RDEPEND="media-sound/pulseaudio"
+DEPEND="${REDPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i "s/pkg-config/$(tc-getPKG_CONFIG)/g" Makefile || die "sed failed"
+
+	default
+}
+
+src_compile() {
+	emake CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	dobin "${PN}"
+	doman "${PN}.1"
+
+	use bash-completion && newbashcomp bash-completion "${PN}"
+}

net-im/mirage/mirage-0.6.4.ebuild

@@ -59,6 +59,7 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	${PYTHON_DEPS}
+	>=dev-qt/qtgui-5.12[gif,png,jpeg]
 	>=dev-qt/qtimageformats-5.12
 	>=dev-qt/qtsvg-5.12
 	dev-libs/olm
@@ -111,7 +112,3 @@ src_configure() {
 	fi
 	eqmake5 mirage.pro PREFIX="${D}"/usr ${myconf}
 }
-
-src_install() {
-	emake install
-}

net-im/mirage/mirage-9999.ebuild

@@ -60,6 +60,7 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	${PYTHON_DEPS}
+	>=dev-qt/qtgui-5.12[gif,png,jpeg]
 	>=dev-qt/qtimageformats-5.12
 	>=dev-qt/qtsvg-5.12
 	dev-libs/olm
@@ -113,7 +114,3 @@ src_configure() {
 	fi
 	eqmake5 mirage.pro PREFIX="${D}"/usr ${myconf}
 }
-
-src_install() {
-	emake install
-}

net-misc/megacmd/Manifest

@@ -0,0 +1 @@
+DIST megacmd-1.2.0.tar.gz 2030438 BLAKE2B 4bddbec51962e8c0b8652a8fec94cb9f5e8f3392228908fed465f9ba83f2f075e24782249ace5aa9d76a5381bac98ff055f7a179e9eac21a3b7421ea8482c5a4 SHA512 e72b1ffc61fa6f501b9f287dda9a3213e266046dee65098f437e5d8c158f9bdfbd9e1f1751c6e1b93de3671e81de871e4ef845ec1809660766efeb3d2104fc8f

net-misc/megacmd/megacmd-1.2.0.ebuild

@@ -0,0 +1 @@
+megacmd-9999.ebuild

net-misc/megacmd/megacmd-9999.ebuild

@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+if [[ -z ${PV%%*9999} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/meganz/${PN}.git"
+	EGIT_SUBMODULES=( )
+else
+	inherit vcs-snapshot
+	MY_PV="2335a80"
+	SRC_URI="
+		mirror://githubcl/meganz/${PN}/tar.gz/${MY_PV}
+		-> ${P}.tar.gz
+	"
+	RESTRICT="primaryuri"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Command Line Interactive and Scriptable Application to access MEGA"
+HOMEPAGE="https://mega.nz/cmd"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	>=net-misc/meganz-sdk-3.6.9:=[-megacmd(-),sodium(+),sqlite]
+	dev-libs/libpcre:3[cxx]
+	sys-libs/readline:0
+"
+RDEPEND="
+	${DEPEND}
+"
+DOCS=( README.md build/megacmd/megacmd.changes )
+
+src_prepare() {
+	sed \
+		-e '/SUBDIRS.*sdk/d' \
+		-e '/sdk\/m4/d' \
+		-e 's:LMEGAINC=.*:PKG_CHECK_MODULES([MEGA],[libmega])\nLMEGAINC=${MEGA_CFLAGS}:' \
+		-i Makefile.am configure.ac
+	sed \
+		-e 's:\$(top_builddir)/sdk/src/libmega\.la:$(MEGA_LIBS):' \
+		-e 's:mega_cmd_LDADD = .*:&$(MEGA_LIBS):' \
+		-e 's:^mega_exec_CXXFLAGS.*:&\nmega_exec_LDADD=$(MEGA_LIBS):' \
+		-e 's:sdk/include/mega/[^ ]\+\.h::g' \
+		-e '/sdk\/src\/[^ ]\+\.cpp/d' \
+		-i src/include.am
+	default
+	eautoreconf
+}

net-misc/megacmd/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>y0rune@aol.com</email>
+		<name>Marcin Woźniak</name>
+	</maintainer>
+</pkgmetadata>

net-misc/meganz-sdk/Manifest

@@ -0,0 +1 @@
+DIST meganz-sdk-3.7.1.tar.gz 3293250 BLAKE2B c18578dd134060680070601aae4f4778f14228931cfb06e4a1b2e98622a58866354c56fc529ea8f34a6980581d464ff76c82806c456cd4b9193b083b3ad367a5 SHA512 f6ce9e286e69c1560d1f7a7b13b28e8e2ba77802e777a29bef132a09f32f5fc379e5c7f64845424081d682723c53760593442e0a71d01a497b83723c875b2d9a

net-misc/meganz-sdk/meganz-sdk-3.7.1.ebuild

@@ -0,0 +1 @@
+meganz-sdk-9999.ebuild

net-misc/meganz-sdk/meganz-sdk-9999.ebuild

@@ -0,0 +1,114 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic qmake-utils autotools db-use
+if [[ -z ${PV%%*9999} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN%-*}/${PN#*-}.git"
+else
+	inherit vcs-snapshot
+	MY_PV="b2948c7"
+	[[ -n ${PV%%*_p*} ]] && MY_PV="v${PV}"
+	SRC_URI="
+		mirror://githubcl/${PN%-*}/${PN#*-}/tar.gz/${MY_PV}
+		-> ${P}.tar.gz
+	"
+	RESTRICT="primaryuri"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="MEGA C++ SDK"
+HOMEPAGE="https://github.com/meganz/sdk"
+
+LICENSE="BSD-2"
+# awk '/define/ {print $3}' include/mega/version.h|awk 'BEGIN{RS="";FS="\n"}{printf $1*10000+$2*100+$3}'
+SLOT="0/30701"
+IUSE="examples ffmpeg freeimage fuse hardened inotify libuv mediainfo qt raw +sqlite test"
+REQUIRED_USE="
+	examples? ( sqlite )
+	fuse? ( examples )
+"
+# tests require a working mega.nz account and login details provided via $MEGA_EMAIL and $MEGA_PWD
+RESTRICT+=" test"
+
+RDEPEND="
+	dev-libs/crypto++
+	sys-libs/zlib
+	dev-libs/libpcre:3[cxx]
+	dev-libs/openssl:0
+	net-dns/c-ares
+	net-misc/curl
+	sqlite? ( dev-db/sqlite:3 )
+	!sqlite? ( sys-libs/db:*[cxx] )
+	examples? (
+		sys-libs/readline:0
+		fuse? ( sys-fs/fuse:0 )
+	)
+	freeimage? ( media-libs/freeimage )
+	libuv? ( dev-libs/libuv )
+	dev-libs/libsodium
+	mediainfo? ( media-libs/libmediainfo )
+	ffmpeg? ( virtual/ffmpeg )
+	raw? ( media-libs/libraw )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+pkg_setup() {
+	use sqlite || append-cppflags "-I$(db_includedir)"
+}
+
+src_prepare() {
+	default
+	use qt && sed \
+		-e '/SOURCES += src\// s:+:-:' \
+		-e '/!exists.*config.h/ s:!::' \
+		-e 's:CONFIG(USE_MEGAAPI) {:&\nLIBS += -lmega:' \
+		-e '/^unix:!macx {/,/^}/d' \
+		-i bindings/qt/sdk.pri
+	use test && sed \
+		-e 's:\$(GTEST_DIR)/lib/lib\([^ ]\+\)\.la:-l\1:g' \
+		-e 's: tests/tool_purge_account::' \
+		-i tests/include.am
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-chat
+		$(use_enable inotify)
+		$(use_enable hardened gcc-hardening)
+		$(use_with libuv)
+		$(use_with !sqlite db)
+		$(use_with sqlite)
+		$(use_enable examples)
+		$(use_enable test tests)
+		$(use_with freeimage)
+		$(use_with fuse)
+		$(use_with mediainfo libmediainfo)
+		$(use_with ffmpeg)
+		$(use_with raw libraw)
+	)
+	use test && myeconfargs+=(
+		--with-gtest="${EPREFIX}/usr"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	export MEGA_EMAIL MEGA_PWD MEGA_EMAIL_AUX="${MEGA_EMAIL}" MEGA_PWD_AUX="${MEGA_PWD}"
+	default
+}
+
+src_install() {
+	default
+	doheader -r include/mega
+
+	use qt || return
+	insinto /usr/share/${PN}/bindings/qt
+	doins bindings/qt/*.{h,cpp,pri}
+}

net-misc/meganz-sdk/metadata.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>y0rune@aol.com</email>
+		<name>Marcin Woźniak</name>
+	</maintainer>
+	<use>
+		<flag name="freeimage">Enable support for image I/O via media-libs/freeimage</flag>
+		<flag name="fuse">Build FUSE-based example client</flag>
+		<flag name="libuv">Support asynchronous I/O via dev-libs/libuv</flag>
+		<flag name="mediainfo">Use media-libs/libmediainfo for media files</flag>
+		<flag name="qt">Install QT bindings</flag>
+	</use>
+</pkgmetadata>

www-client/brave-bin/Manifest

@@ -1,2 +1,2 @@
-DIST brave-bin-1.12.73.zip 105195132 BLAKE2B 0bf0c1191e43ca8458932fe7120b7b34453d43106c81610c46cab75b8158dcd136d8e6eddd624cb95b1124d557824946425ce49118b638dd38bd990d8c01deaa SHA512 bbc0f13113834e1cdd11aebe7ef7304e73bee1226f948180feda737f0730d6a99ea20e1ba05f3ecf2fd6ad0b8b9b858a0f644855e5f3ef354a5d0ee994180cee
 DIST brave-bin-1.12.76.zip 105336169 BLAKE2B 71bd0cab3074a3e1a32e8fe1df3774323ac9d7265f1e87b80291e0131ea7f32952efc815669f54a6c011dec0198a975450015617fde446025d76c2c6967e1808 SHA512 e5484b39b8263de51b86f8597833d35a8647c0cd9649867566ac38285e4ecf25cb5d0bbb70559e314724940aea6bea3b987fa7611d2056d117b1c5a102763725
+DIST brave-bin-1.12.77.zip 105335718 BLAKE2B ceb862da4a37251ed1f0d3b78fbe98d2a5c8e548b9beabbfb623c7d39f9429fac95b425c1b8f70ed9ac652991912165fe5aaee3493006b128345b6c069cb2ede SHA512 85156f38d743061ec28e49ff52bc63d74801e0181dfc22fbedfc3cf3450189f035360395dc8369c2742188011421e4c41dcc29f0b23f4772a666e9bf132ce433