megasync: add missing dependency

4 files changed, 280 insertions, 2 deletions

diff --git a/net-misc/megasync/Manifest b/net-misc/megasync/Manifest
index 962d108..33d419a 100644
--- a/net-misc/megasync/Manifest
+++ b/net-misc/megasync/Manifest
@@ -7,7 +7,9 @@ DIST megasync-sdk-20170215.tar.gz 3475525 BLAKE2B 71e85a62c9429944a0bd3cbe4f914b
 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.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-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
index ec142f1..7557f31 100644
--- a/net-misc/megasync/megasync-3.6.0-r1.ebuild
+++ b/net-misc/megasync/megasync-3.6.0-r1.ebuild
@@ -20,7 +20,7 @@ else
 	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"
+	KEYWORDS="~x86 ~amd64"
 	#RESTRICT="mirror"
 	#S="${WORKDIR}/MEGAsync-${PV}.0_Linux"
 fi
diff --git a/net-misc/megasync/megasync-3.6.0-r2.ebuild b/net-misc/megasync/megasync-3.6.0-r2.ebuild
new file mode 100644
index 0000000..c4ccf5f
--- /dev/null
+++ b/net-misc/megasync/megasync-3.6.0-r2.ebuild
@@ -0,0 +1,136 @@
+# 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}/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.5-r1.ebuild b/net-misc/megasync/megasync-3.6.5-r1.ebuild
new file mode 100644
index 0000000..44913f6
--- /dev/null
+++ b/net-misc/megasync/megasync-3.6.5-r1.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}-ffmeg.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
+}