correct patch name for ffmpeg and update megasync for latest version

6 files changed, 159 insertions, 4 deletions

diff --git a/net-misc/megasync/Manifest b/net-misc/megasync/Manifest
index 33d419a..baa4bd0 100644
--- a/net-misc/megasync/Manifest
+++ b/net-misc/megasync/Manifest
@@ -1,6 +1,8 @@
 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-3.6.5-ffmeg.patch 566 BLAKE2B c1e8bd4b5c4c2c6fd6cc2316e7372443672ff1b25fbc3332ffc60f524396b7f784669da26506dbf683962a7f3da63809b57ec7696be8cef0d6c720fdb924999b SHA512 741df967aece39bdd3b17b105bcad390d6cf817c1e4db9bf13d460ccc972af8ff6696f72a0253f2adea76526d7346474e65df18bfd485194e7ff8a479274c655
+AUX megasync-3.6.5-ffmpeg.patch 566 BLAKE2B c1e8bd4b5c4c2c6fd6cc2316e7372443672ff1b25fbc3332ffc60f524396b7f784669da26506dbf683962a7f3da63809b57ec7696be8cef0d6c720fdb924999b SHA512 741df967aece39bdd3b17b105bcad390d6cf817c1e4db9bf13d460ccc972af8ff6696f72a0253f2adea76526d7346474e65df18bfd485194e7ff8a479274c655
+AUX megasync-3.6.6-ffmpeg.patch 566 BLAKE2B c1e8bd4b5c4c2c6fd6cc2316e7372443672ff1b25fbc3332ffc60f524396b7f784669da26506dbf683962a7f3da63809b57ec7696be8cef0d6c720fdb924999b SHA512 741df967aece39bdd3b17b105bcad390d6cf817c1e4db9bf13d460ccc972af8ff6696f72a0253f2adea76526d7346474e65df18bfd485194e7ff8a479274c655
 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
@@ -9,7 +11,8 @@ EBUILD megasync-3.1.4.ebuild 3165 BLAKE2B 4f50da930addad128e9cbd6be4b7e2b44bff6e
 EBUILD megasync-3.5.3.ebuild 3277 BLAKE2B a59fddfa224bcdb23b033950d8cbe0587f145717710824c2470f8e5c76d01853a0b65101b0841c01024f3ad85eb5e86a993be4d31d57f5245829b9eda92ac334 SHA512 3d063386c052ec6c673d31c37ac2d7a8e78ee47d627bc5961d0e8ea9f1b7fde76f58078de0cc7cd5e1aa968b1941e7f51d22e9632ffe6c0b8dda05d919b40f13
 EBUILD megasync-3.6.0-r1.ebuild 3277 BLAKE2B 16486c24e8443039c7793a0d23e44d55d9594af91257b2edd78cda9ba5f22968aa8564fa52bba5baf368c5907725c5c2e83764a422424639b62638e7ca66364f SHA512 cdf8578835f4560087deb3e248b6c70303718fee558a11f2a5d4fe0a415934aaab5ffb6f55a799ed9159dd7d22b35f067f77fac69c304d48f73c03d840066b79
 EBUILD megasync-3.6.0-r2.ebuild 3300 BLAKE2B 40ce7786ae55cfffcf902588bca7362fa3eeae819c20a1bc645e353d2fa4b77ffc4d5f5c4a642df81ba39204da35b231132fc09f8c97e666d67da4fd850a6453 SHA512 d53d07610ec4637b3d5cc45aa45cc4774ea8ee054d3b1d4885fd655cca0cdde15d6455aca42c99e301e38c891b8b897562effc512bb49dc5829f75ec49cf06e0
-EBUILD megasync-3.6.5-r1.ebuild 3361 BLAKE2B b9d0466202b87f9e443b87e16da763b09e6c99a0c2a9d53c3364fa4d584daee910f60c1b20e9be2c7fe84eb3491717555091357b84bc7473aa2c5cf92ff6ac7a SHA512 c735dc38e5776ead131e9ac2235242e251d3834c7460001bb23ae1c46bc1208e9cd45c60891ea565486b890eff6238bd8512f45e2d7aec68cab664f9fa7337a1
-EBUILD megasync-3.6.5.ebuild 3336 BLAKE2B 2cf009c94d874548b066cfa5fc3ed01b12dc531c04249d61bfd9d2cf82e00b838ebfb1caead8fa0ea051f6d06c039940fa0e6c298150ce68c9c3523b59cb7856 SHA512 e2a09e28f41fb9a3f28bbd177f50c256161d44ab02e2fa2a1b7743b6b390a337e1dd404a651923a0c1c54e8662ae70c3943629883f402a1f8e6b89257f9d7362
+EBUILD megasync-3.6.5-r1.ebuild 3362 BLAKE2B 31b8246a1600d088d30ad26687f1d14ea372aa92141be2d779aede5da7a32ab53f41463080a4148fbe74402046ede9d797d3e6d3bbc375ab634885b82476dfba SHA512 e4dfb72321158c6befd757921bd70e7b275ec6b95e2297119d70c4cf1cdf708cec903575b8f3adc308b4a6071a7bd741061acefa2ab16ce78b9a1733e5f06e99
+EBUILD megasync-3.6.5.ebuild 3337 BLAKE2B 2f5aeb4338a6b3cda24c7df83f72133078bc9d7a9b85235dbc74939a6584ee3db15c1ead62cde806419d455b400e7ecf1f16f8b9180603d2b03f3c1e522d0bbe SHA512 d8093129e32585db276e4aa88496092c7a99731b10755a8514b23492e0e6473837850dcaec1606804a732d4fc88cd77b9bc207ecafbd7a3450e249f8eade438d
+EBUILD megasync-3.6.6.ebuild 3362 BLAKE2B 31b8246a1600d088d30ad26687f1d14ea372aa92141be2d779aede5da7a32ab53f41463080a4148fbe74402046ede9d797d3e6d3bbc375ab634885b82476dfba SHA512 e4dfb72321158c6befd757921bd70e7b275ec6b95e2297119d70c4cf1cdf708cec903575b8f3adc308b4a6071a7bd741061acefa2ab16ce78b9a1733e5f06e99
 EBUILD megasync-9999.ebuild 3637 BLAKE2B 3333948364efa4ae9ce897da38659e669fbb509de374686832d4546caccc4f9333693749540c989f1bb074b9eb929b308978ed089f4b6be714dbf76c530e608b SHA512 020ca96d8972f66cc79673bc31083af2fffacbb02dfeb12677d5d62f08605e1a4f9b29d55d5509231a416c39e7b1cd2e6b20d16c4af00a415cbaf4c133fa6c6d
 MISC metadata.xml 318 BLAKE2B ffc32715f0597b63ba78c242a5adfad13c921b43da17b5e07b4cca5e5ef69dbb3c89a7d110165dcea06ed317f873a5210db21be0ac5941dfb433185fdcb7a6e7 SHA512 e4930a21d6f75f5395e2e96436b42c792771fd7167abceeff0db7a9036616c6feeb6beee890afa6ff5e4584f5bb6938084316e60df57997aa1c20ba0a025514c
diff --git a/net-misc/megasync/files/megasync-3.6.5-ffmeg.patch b/net-misc/megasync/files/megasync-3.6.5-ffmpeg.patch
index 7306a15..7306a15 100644
--- a/net-misc/megasync/files/megasync-3.6.5-ffmeg.patch
+++ b/net-misc/megasync/files/megasync-3.6.5-ffmpeg.patch
diff --git a/net-misc/megasync/files/megasync-3.6.6-ffmpeg.patch b/net-misc/megasync/files/megasync-3.6.6-ffmpeg.patch
new file mode 100644
index 0000000..7306a15
--- /dev/null
+++ b/net-misc/megasync/files/megasync-3.6.6-ffmpeg.patch
@@ -0,0 +1,12 @@
+diff -Naur a/src/MEGASync/MEGASync.pro b/src/MEGASync/MEGASync.pro
+--- a/src/MEGASync/MEGASync.pro	2018-05-19 18:48:04.753947715 +0100
++++ b/src/MEGASync/MEGASync.pro	2018-05-19 19:48:13.055865813 +0100
+@@ -57,7 +57,7 @@
+ CONFIG += USE_MEDIAINFO
+ 
+ unix:!macx {
+-        exists(/usr/include/ffmpeg-mega)|exists(mega/bindings/qt/3rdparty/include/ffmpeg)|packagesExist(ffmpeg) {
++        exists(/usr/include/ffmpeg-mega)|exists(mega/bindings/qt/3rdparty/include/ffmpeg)|packagesExist(ffmpeg)|packagesExist(libavcodec) {
+             CONFIG += USE_FFMPEG
+         }
+ }
diff --git a/net-misc/megasync/megasync-3.6.5-r1.ebuild b/net-misc/megasync/megasync-3.6.5-r1.ebuild
index 44913f6..f947e2f 100644
--- a/net-misc/megasync/megasync-3.6.5-r1.ebuild
+++ b/net-misc/megasync/megasync-3.6.5-r1.ebuild
@@ -65,7 +65,7 @@ RDEPEND="${DEPEND}
 		readline? ( sys-libs/readline:0 )
 		"
 
-PATCHES=( "${FILESDIR}/${P}-ffmeg.patch" )
+PATCHES=( "${FILESDIR}/${P}-ffmpeg.patch" )
 
 if [[ ${PV} != *9999* ]];then
 	src_prepare(){
diff --git a/net-misc/megasync/megasync-3.6.5.ebuild b/net-misc/megasync/megasync-3.6.5.ebuild
index bf06f51..d2fe7ab 100644
--- a/net-misc/megasync/megasync-3.6.5.ebuild
+++ b/net-misc/megasync/megasync-3.6.5.ebuild
@@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
 		readline? ( sys-libs/readline:0 )
 		"
 
-PATCHES=( "${FILESDIR}/${P}-ffmeg.patch" )
+PATCHES=( "${FILESDIR}/${P}-ffmpeg.patch" )
 
 if [[ ${PV} != *9999* ]];then
 	src_prepare(){
diff --git a/net-misc/megasync/megasync-3.6.6.ebuild b/net-misc/megasync/megasync-3.6.6.ebuild
new file mode 100644
index 0000000..f947e2f
--- /dev/null
+++ b/net-misc/megasync/megasync-3.6.6.ebuild
@@ -0,0 +1,140 @@
+# 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
+	media-libs/libmediainfo
+	!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}/${P}-ffmpeg.patch" )
+
+if [[ ${PV} != *9999* ]];then
+	src_prepare(){
+		#default
+		# 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
+		if [ ! -z ${PATCHES} ]; then
+			epatch ${PATCHES}
+		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
+}