update megasync

3 files changed, 148 insertions, 12 deletions

diff --git a/net-misc/megasync/Manifest b/net-misc/megasync/Manifest
index a14409e..b24a386 100644
--- a/net-misc/megasync/Manifest
+++ b/net-misc/megasync/Manifest
@@ -1,11 +1,12 @@
-AUX MEGAsync-3.1.4.0_Linux.patch 1035 SHA256 803d59b314fbb91f3bd9c2c59b30cb8b18d52ea606c96af3298b3044cf8baf7d SHA512 afd9b11a8dcdc3240d3c3850dfccafce64078c95ae4fa44ef0f3fbd71aabb4fa129f46bbde470d916719174a19674ba3f14cf9cde1166f7c5e09e56feb9f943e WHIRLPOOL 10c3c73da7bd81453c47bc17fa179ec8c28d3c6f8c4dc3d9aeb7260752d62d7e6e57827cd967bcbc636db4365bf01a5b41b18d9de97be4f9fe4db48aa3801639
-AUX MEGAsync-3.5.3.0_Linux.patch 1035 SHA256 803d59b314fbb91f3bd9c2c59b30cb8b18d52ea606c96af3298b3044cf8baf7d SHA512 afd9b11a8dcdc3240d3c3850dfccafce64078c95ae4fa44ef0f3fbd71aabb4fa129f46bbde470d916719174a19674ba3f14cf9cde1166f7c5e09e56feb9f943e WHIRLPOOL 10c3c73da7bd81453c47bc17fa179ec8c28d3c6f8c4dc3d9aeb7260752d62d7e6e57827cd967bcbc636db4365bf01a5b41b18d9de97be4f9fe4db48aa3801639
-AUX megasync-glibc2.26.patch 5958 SHA256 8d19891f1a7f5d84edbff300cd3bcebd5db93c9524483c13f19cdcffc0f3ec8a SHA512 f8348b61028f34714dabe83fe88e5820686a35e1fa52206451152a97a286557168666142121936304d60aa18dae16d4474c3c3278274b62cc06d42587fc7016e WHIRLPOOL 69a26860bfc622e976ff87ce68cdb16daaea48f1e0a722c84b101fca4f78706e47f29dc31aa0f78a62a7c3a73297f62b384cc7c680a289443e0e70734ffb8847
-DIST megasync-3.0.1.tar.gz 10859538 SHA256 97c11019841c48dc1b88b9c4a15c2a2d69dda06e6544d30ff066f9b960af3d4d SHA512 0e3e0315f9a8f4694a59f7b50d6dd93c5e840d013d8c658288d7c0cafca9fbdc1faa2bbaec5c2d08e5f4c4d1790864a8595153808ea7b8c0a1c3550ae8398dbe WHIRLPOOL 6f67983cc76d1ec18ccc6ccd9145c9d57ac46ecd8de9e0433c964d7af728699b2250228dc40d736ad88552c71ed4b5575f2c710476ffeaca1ab85d119710342c
-DIST megasync-sdk-20170215.tar.gz 3475613 SHA256 085ad3db78f7b30d613f4ad1d62e811bdf4be070c8c48cdb5243e4e9963468e2 SHA512 738e30e3b66edb129247dcce87bf9033efe698303f0e6c81362a51d81464b2323fb41b41f4659fa7d8db4bc9992ff7718a5f975d782e558e51ab50efadd740ea WHIRLPOOL 7daea0d450e900af78f7d144883aebaf283725f0850b23e4ea5c4f86822e9804f9876b53a18426fc36ad375bce2c19ad80a4ed45a659b022805b54551ce23265
-EBUILD megasync-3.0.1.ebuild 3631 SHA256 6afcf5ee6a4d7c6a78f7599ac76c9c83523387769d647d6aec557f7a32e61181 SHA512 cef1286d280689516eb6fd754c70524c2acd48976637275a46493211151cd89e1ea45c6f0494de606a71c84876b7d186a3af55311279aca41267cbda9219bd9e WHIRLPOOL e0759fe60bbeb8dc1d0b5820e43afd3e98b35de7321749fe323a07f95b022ee60557f41dd1c929a844827f91ed6a04744667e4dc4048f28717c0347c7e8df8f0
-EBUILD megasync-3.1.4.ebuild 3165 SHA256 4f0c01436a4a28bc99b030d624872f68595412b360708cefe6b6c87270f0008f SHA512 964fbd703748194c5c2b109d89e03bdb7d99c2b793fb187875e7d7304e69ea0f7efce9a19d607ce1b87de5e229fbf9d2fbda86df02aa6c42ffeab908c8152dc1 WHIRLPOOL 4a78d7122e822b71f6337c59c424f0e2447ddfe699b6e29bea459b2a3281a8c6e5e2693ee0ea5823213e884182aedb8d740f6bf18e3716bc13b8623dc6d2e10b
-EBUILD megasync-3.5.3.ebuild 3277 SHA256 a2764c22465571bf24b3727f200032f59f182b4814701daf23c61d22f738fbb4 SHA512 3d063386c052ec6c673d31c37ac2d7a8e78ee47d627bc5961d0e8ea9f1b7fde76f58078de0cc7cd5e1aa968b1941e7f51d22e9632ffe6c0b8dda05d919b40f13 WHIRLPOOL f71103b368acab72571ad4e64dfb0603f3ab13a77a2ed75e13ef8523700bc6c5cdd2282c39419fa90ebe8a66ee8ea0a4f21a8a7ca3c36ec8f3eb553e6b155614
-EBUILD megasync-3.6.0.ebuild 3277 SHA256 a2764c22465571bf24b3727f200032f59f182b4814701daf23c61d22f738fbb4 SHA512 3d063386c052ec6c673d31c37ac2d7a8e78ee47d627bc5961d0e8ea9f1b7fde76f58078de0cc7cd5e1aa968b1941e7f51d22e9632ffe6c0b8dda05d919b40f13 WHIRLPOOL f71103b368acab72571ad4e64dfb0603f3ab13a77a2ed75e13ef8523700bc6c5cdd2282c39419fa90ebe8a66ee8ea0a4f21a8a7ca3c36ec8f3eb553e6b155614
-EBUILD megasync-9999.ebuild 3637 SHA256 99e34fd9fe0ca8724804b2b3bdccd96b8606e5702476e4784ea7068faa8d275a SHA512 020ca96d8972f66cc79673bc31083af2fffacbb02dfeb12677d5d62f08605e1a4f9b29d55d5509231a416c39e7b1cd2e6b20d16c4af00a415cbaf4c133fa6c6d WHIRLPOOL 4e8540c01b07f60881ace62cf8015e92f830b8d0f8c2b00d3813cfaee4766e16d5025630e3456efe5ed3b9a871a8bce85bb1c462ae9d1c15b25309fc54948cdb
-MISC metadata.xml 318 SHA256 705510d197fc14d45313ea036c3ce472a72da8fe1be62743a7d00f38422b43ef SHA512 e4930a21d6f75f5395e2e96436b42c792771fd7167abceeff0db7a9036616c6feeb6beee890afa6ff5e4584f5bb6938084316e60df57997aa1c20ba0a025514c WHIRLPOOL 99eadcf32497e8a117b297242fa0ed8de588a2fa4a7f3a85c67ebc479faa66c83cdd155cd974b5b80aeab2c9e431f837d4453397568a5105957d5082a7541d65
+AUX MEGAsync-3.1.4.0_Linux.patch 1035 BLAKE2B f68751902e0ec9f0276f08d1d0ba4c88ce3fd7a16f75f36644b60becc0299f80d7abe0b998d0d0f18440be172ceb3637fce7ad3fde443c51fa4aa0c1a772b124 SHA512 afd9b11a8dcdc3240d3c3850dfccafce64078c95ae4fa44ef0f3fbd71aabb4fa129f46bbde470d916719174a19674ba3f14cf9cde1166f7c5e09e56feb9f943e
+AUX MEGAsync-3.5.3.0_Linux.patch 1035 BLAKE2B f68751902e0ec9f0276f08d1d0ba4c88ce3fd7a16f75f36644b60becc0299f80d7abe0b998d0d0f18440be172ceb3637fce7ad3fde443c51fa4aa0c1a772b124 SHA512 afd9b11a8dcdc3240d3c3850dfccafce64078c95ae4fa44ef0f3fbd71aabb4fa129f46bbde470d916719174a19674ba3f14cf9cde1166f7c5e09e56feb9f943e
+AUX megasync-glibc2.26.patch 5958 BLAKE2B 990b5ddc9300979e9a059c285b05ef691566e2ec33ab40de76e9f5c251dc8c2f94ddc936eb13772c413c42b0d1122596f2e47805766fe6512ec09050f6b22111 SHA512 f8348b61028f34714dabe83fe88e5820686a35e1fa52206451152a97a286557168666142121936304d60aa18dae16d4474c3c3278274b62cc06d42587fc7016e
+DIST megasync-3.0.1.tar.gz 10859538 BLAKE2B 4ae480d36b746b70a7a155690aaa2dfb9cb70ded57228382df10db57bbdde5c0d93b98738fa6104c709cea2ce57078dd0494b122ea3ab84b9d348d3316e9e063 SHA512 0e3e0315f9a8f4694a59f7b50d6dd93c5e840d013d8c658288d7c0cafca9fbdc1faa2bbaec5c2d08e5f4c4d1790864a8595153808ea7b8c0a1c3550ae8398dbe
+DIST megasync-sdk-20170215.tar.gz 3475525 BLAKE2B 71e85a62c9429944a0bd3cbe4f914b9632fa02b2021e0ca5281c19ff98e4c11feb9de5575553eb0df4589b8929e5c22719abdb7ed1f3784827cf5532cf0ce1b5 SHA512 218f69e22110d31093d841a6f3e7aa1336f16db063ae2fe2219507c140a14c6879d2ff9a7be11d0c31662b2439117e384737be916663af1d49fdf6dbd2d83706
+EBUILD megasync-3.0.1.ebuild 3631 BLAKE2B 6747ed137f2174d13cdefd2347e0b39772f52b37b0031eae0cb0ee836657ee37e9f8836bc0b784ce6272494ec1c0a0229f7d1f42e3417812d58dfecb71982d38 SHA512 cef1286d280689516eb6fd754c70524c2acd48976637275a46493211151cd89e1ea45c6f0494de606a71c84876b7d186a3af55311279aca41267cbda9219bd9e
+EBUILD megasync-3.1.4.ebuild 3165 BLAKE2B 4f50da930addad128e9cbd6be4b7e2b44bff6e8ddd0d7609076297385bd11fed43e3c0fdd0f03ce2e29bf21b3aa707a928af8d3f3063e0a7cedcc33928a65711 SHA512 964fbd703748194c5c2b109d89e03bdb7d99c2b793fb187875e7d7304e69ea0f7efce9a19d607ce1b87de5e229fbf9d2fbda86df02aa6c42ffeab908c8152dc1
+EBUILD megasync-3.5.3.ebuild 3277 BLAKE2B a59fddfa224bcdb23b033950d8cbe0587f145717710824c2470f8e5c76d01853a0b65101b0841c01024f3ad85eb5e86a993be4d31d57f5245829b9eda92ac334 SHA512 3d063386c052ec6c673d31c37ac2d7a8e78ee47d627bc5961d0e8ea9f1b7fde76f58078de0cc7cd5e1aa968b1941e7f51d22e9632ffe6c0b8dda05d919b40f13
+EBUILD megasync-3.6.0-r1.ebuild 3275 BLAKE2B 5d38e6a51ada5d8e20d193e811cb7053f362fd9d936b2ad216116ec68a8d382f8467d69005f1399087905ac1876f32dc1d1fc62c28ae655c7da23debb99ebf7c SHA512 2c3ce9067753c26b6339f64ea2cd23a0f7fd395556f3d535a404227017601b992f66a494db999ff42f927d02573b8f2a3d49c7b8c50e499025c261fe89fec5e2
+EBUILD megasync-3.6.5.ebuild 3277 BLAKE2B 16486c24e8443039c7793a0d23e44d55d9594af91257b2edd78cda9ba5f22968aa8564fa52bba5baf368c5907725c5c2e83764a422424639b62638e7ca66364f SHA512 cdf8578835f4560087deb3e248b6c70303718fee558a11f2a5d4fe0a415934aaab5ffb6f55a799ed9159dd7d22b35f067f77fac69c304d48f73c03d840066b79
+EBUILD megasync-9999.ebuild 3637 BLAKE2B 3333948364efa4ae9ce897da38659e669fbb509de374686832d4546caccc4f9333693749540c989f1bb074b9eb929b308978ed089f4b6be714dbf76c530e608b SHA512 020ca96d8972f66cc79673bc31083af2fffacbb02dfeb12677d5d62f08605e1a4f9b29d55d5509231a416c39e7b1cd2e6b20d16c4af00a415cbaf4c133fa6c6d
+MISC metadata.xml 318 BLAKE2B ffc32715f0597b63ba78c242a5adfad13c921b43da17b5e07b4cca5e5ef69dbb3c89a7d110165dcea06ed317f873a5210db21be0ac5941dfb433185fdcb7a6e7 SHA512 e4930a21d6f75f5395e2e96436b42c792771fd7167abceeff0db7a9036616c6feeb6beee890afa6ff5e4584f5bb6938084316e60df57997aa1c20ba0a025514c
diff --git a/net-misc/megasync/megasync-3.6.0-r1.ebuild b/net-misc/megasync/megasync-3.6.0-r1.ebuild
new file mode 100644
index 0000000..ec142f1
--- /dev/null
+++ b/net-misc/megasync/megasync-3.6.0-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=6
+
+inherit eutils multilib qmake-utils autotools versionator git-r3
+
+DESCRIPTION="A Qt-based program for syncing your MEGA account in your PC. This is the official app."
+HOMEPAGE="http://mega.co.nz"
+if [[ ${PV} == *9999* ]];then
+	EGIT_REPO_URI="https://github.com/meganz/MEGAsync"
+	KEYWORDS=""
+	EGIT_SUBMODULES=( '*' )
+else
+	#SDK_COMMIT="e8e66e9f030febfb35c9e4dd503d69091e28fc04"
+	#MY_PV="$(replace_all_version_separators _)"
+	EGIT_REPO_URI="https://github.com/meganz/MEGAsync"
+	EGIT_COMMIT="v${PV}.0_Linux"
+	EGIT_SUBMODULES=( '*' )
+	#SRC_URI="https://github.com/meganz/MEGAsync/archive/v${PV}.0_Linux.tar.gz -> ${P}.tar.gz
+	#https://github.com/meganz/sdk/archive/${SDK_COMMIT}.tar.gz -> ${PN}-sdk-20170215.tar.gz"
+	KEYWORDS="x86 amd64"
+	#RESTRICT="mirror"
+	#S="${WORKDIR}/MEGAsync-${PV}.0_Linux"
+fi
+
+LICENSE="MEGA"
+SLOT="0"
+IUSE="+cryptopp +sqlite +zlib +curl freeimage readline examples threads qt5 java php python"
+
+DEPEND="
+	dev-lang/swig
+	app-doc/doxygen
+	!qt5? ( 
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtdbus:4
+		dev-libs/sni-qt
+		)
+	qt5? ( 
+		dev-qt/qtcore:5
+		dev-qt/linguist-tools
+		dev-qt/qtwidgets:5
+		dev-qt/qtgui:5
+		dev-qt/qtconcurrent:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtdbus:5
+		)"
+RDEPEND="${DEPEND}
+		x11-themes/hicolor-icon-theme
+		dev-libs/openssl
+		dev-libs/libgcrypt
+		media-libs/libpng
+		net-dns/c-ares
+		cryptopp? ( dev-libs/crypto++ )
+		app-arch/xz-utils
+		dev-libs/libuv
+		sqlite? ( dev-db/sqlite:3 )
+		dev-libs/libsodium
+		zlib? ( sys-libs/zlib )
+		curl? ( net-misc/curl[ssl,curl_ssl_openssl] )
+		freeimage? ( media-libs/freeimage )
+		readline? ( sys-libs/readline:0 )
+		"
+
+#PATCHES=( "${FILESDIR}/megasync-glibc2.26.patch" )
+
+if [[ ${PV} != *9999* ]];then
+	src_prepare(){
+		# Not needed, since using git submodules
+		#cp -r ../sdk-${SDK_COMMIT}/* src/MEGASync/mega
+		if [ -e "${FILESDIR}/MEGAsync-${PV}.0_Linux.patch" ]; then
+			EPATCH_OPTS="-p0" epatch "${FILESDIR}/MEGAsync-${PV}.0_Linux.patch"
+		fi
+		eapply_user
+		cd src/MEGASync/mega
+		eautoreconf
+	}
+fi
+
+src_configure(){
+	cd "${S}"/src/MEGASync/mega
+	econf \
+		"--disable-silent-rules" \
+		"--disable-curl-checks" \
+		"--disable-megaapi" \
+		$(use_with zlib) \
+		$(use_with sqlite) \
+		$(use_with cryptopp) \
+		"--with-cares" \
+		$(use_with curl) \
+		"--without-termcap" \
+		$(use_enable threads posix-threads) \
+		"--with-sodium" \
+		$(use_with freeimage) \
+		$(use_with readline) \
+		$(use_enable examples) \
+		$(use_enable java) \
+		$(use_enable php) \
+		$(use_enable python) \
+		"--enable-chat" \
+		"--enable-gcc-hardening" 
+	cd ../..
+	local myeqmakeargs=(
+		MEGA.pro
+		CONFIG+="release"
+	)
+	if use qt5; then
+		eqmake5 ${myeqmakeargs[@]}
+		$(qt5_get_bindir)/lrelease MEGASync/MEGASync.pro
+	else
+		eqmake4 ${myeqmakeargs[@]}
+		$(qt4_get_bindir)/lrelease MEGASync/MEGASync.pro
+	fi
+}
+
+src_compile(){
+	cd "${S}"/src
+	emake INSTALL_ROOT="${D}" || die
+}
+
+src_install(){
+	insinto usr/share/licenses/${PN}
+	doins LICENCE.md installer/terms.txt
+	cd src/MEGASync
+	dobin ${PN}
+	cd platform/linux/data
+	insinto usr/share/applications
+	doins ${PN}.desktop
+	cd icons/hicolor
+	for size in 16x16 32x32 48x48 128x128 256x256;do
+		doicon -s $size $size/apps/mega.png
+	done
+}
diff --git a/net-misc/megasync/megasync-3.6.0.ebuild b/net-misc/megasync/megasync-3.6.5.ebuild
index 131d683..7557f31 100644
--- a/net-misc/megasync/megasync-3.6.0.ebuild
+++ b/net-misc/megasync/megasync-3.6.5.ebuild
@@ -36,6 +36,7 @@ DEPEND="
 		dev-qt/qtcore:4
 		dev-qt/qtgui:4
 		dev-qt/qtdbus:4
+		dev-libs/sni-qt
 		)
 	qt5? ( 
 		dev-qt/qtcore:5
@@ -47,7 +48,6 @@ DEPEND="
 		dev-qt/qtdbus:5
 		)"
 RDEPEND="${DEPEND}
-		dev-libs/sni-qt
 		x11-themes/hicolor-icon-theme
 		dev-libs/openssl
 		dev-libs/libgcrypt