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

net-misc/megacmd/Manifest

@@ -1 +1 @@
-DIST megacmd-1.2.0.tar.gz 2030438 BLAKE2B 4bddbec51962e8c0b8652a8fec94cb9f5e8f3392228908fed465f9ba83f2f075e24782249ace5aa9d76a5381bac98ff055f7a179e9eac21a3b7421ea8482c5a4 SHA512 e72b1ffc61fa6f501b9f287dda9a3213e266046dee65098f437e5d8c158f9bdfbd9e1f1751c6e1b93de3671e81de871e4ef845ec1809660766efeb3d2104fc8f
+DIST megacmd-1.4.0.tar.gz 2028240 BLAKE2B 730a1a3174397269837970e17495325ded7ae2df5fe13291a0929dcd3b7215a5e5a902a5afef5b798ac37044a7b729521e7183d1722ff87111b4c33358886b23 SHA512 37abc4a2a6a46203d1d309ce5377109b75fe4fa83890d377968ca3a766d4a33e555d5efd078d7cfe3720899c6fdb8e01a2797713248e28c47430ba29aadd0b1b

net-misc/megacmd/megacmd-1.2.0.ebuild

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

net-misc/megacmd/megacmd-1.4.0.ebuild

@@ -0,0 +1,50 @@
+# 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
+	PN2="MEGAcmd"
+	SRC_URI="https://yorune.pl/gentoo/${CATEGORY}/${PN}/${PN}-${PV} -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN2}-${PV}_Linux"
+	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.7.3:=[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/megacmd-9999.ebuild

@@ -9,12 +9,9 @@ if [[ -z ${PV%%*9999} ]]; then
 	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
-	"
+	PN2="MEGAcmd"
+	SRC_URI="https://yorune.pl/gentoo/${CATEGORY}/${PN}/${PN}-${PV} -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN2}-${PV}_Linux"
 	RESTRICT="primaryuri"
 	KEYWORDS="~amd64 ~x86"
 fi
@@ -25,9 +22,8 @@ HOMEPAGE="https://mega.nz/cmd"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE=""
-
 DEPEND="
-	>=net-misc/meganz-sdk-3.6.9:=[-megacmd(-),sodium(+),sqlite]
+	>=net-misc/meganz-sdk-3.7.3:=[sodium(+),sqlite]
 	dev-libs/libpcre:3[cxx]
 	sys-libs/readline:0
 "