Update manifest and megasync-9999

Signed-off-by: Samuel Bernardo <samuelbernardo.mail@gmail.com>

2 files changed, 50 insertions, 34 deletions

diff --git a/net-misc/megasync/Manifest b/net-misc/megasync/Manifest
index 15a04ca..5fcb06c 100644
--- a/net-misc/megasync/Manifest
+++ b/net-misc/megasync/Manifest
@@ -22,5 +22,6 @@ EBUILD megasync-4.2.0.ebuild 3917 BLAKE2B 7295114af019c39c00e8d487c8cc6bfd9ad348
 EBUILD megasync-4.2.3.ebuild 3915 BLAKE2B ed8dca3c7f8062d12e17a5143a8bd5a6ee9b8d79c54b395d9e0502a4d277acd62443c36ed09572aff677842c22b879160a62f92fb7beda90c57d3d6fc14ee8f6 SHA512 eb027f7cbf263075f181645ebe2625997ed7a499c8a5e285f52cdb348ef3295ecadb03240ee446a9362895f96e9bfd11657a27aca9fb34ab9d5422cc68d847e9
 EBUILD megasync-4.2.5-r2.ebuild 4027 BLAKE2B cf745d60810047fcbf4392271263e99bb615019647dd4d52cb7b95b01e0a25005d25b551df418a46881f5f655f5e9114ab5b351fa9387c8fb027cb04ab0ccd18 SHA512 99c1cee8eb8f4e941569f2c4682bbd5ef55ff30b76f3f6dbcd759993c769f5651d88f3636d3b85046a6cfecca50826600ae2eacd31ddf7f3871cf7e6e7891040
 EBUILD megasync-4.2.5.ebuild 3915 BLAKE2B ed8dca3c7f8062d12e17a5143a8bd5a6ee9b8d79c54b395d9e0502a4d277acd62443c36ed09572aff677842c22b879160a62f92fb7beda90c57d3d6fc14ee8f6 SHA512 eb027f7cbf263075f181645ebe2625997ed7a499c8a5e285f52cdb348ef3295ecadb03240ee446a9362895f96e9bfd11657a27aca9fb34ab9d5422cc68d847e9
-EBUILD megasync-9999.ebuild 3637 BLAKE2B 3333948364efa4ae9ce897da38659e669fbb509de374686832d4546caccc4f9333693749540c989f1bb074b9eb929b308978ed089f4b6be714dbf76c530e608b SHA512 020ca96d8972f66cc79673bc31083af2fffacbb02dfeb12677d5d62f08605e1a4f9b29d55d5509231a416c39e7b1cd2e6b20d16c4af00a415cbaf4c133fa6c6d
+EBUILD megasync-4.3.1.ebuild 3455 BLAKE2B 05d5e7b0fcab78a9bb1a9eba87b97ed5b186898e4a8997a3acf9ac8bd3e09800d33b11f6f81067aeca28c3003f21acdb191b6ab3f69e3570920b9ed085f5d93c SHA512 43294e627006dbd677821970f781d56821304abd5aea1f8162ae19f6dbec2be4c83b34c89ba67ebd0a35a490ae0fdf69112cbf35c2603b5ea610abc654744fe9
+EBUILD megasync-9999.ebuild 3455 BLAKE2B 05d5e7b0fcab78a9bb1a9eba87b97ed5b186898e4a8997a3acf9ac8bd3e09800d33b11f6f81067aeca28c3003f21acdb191b6ab3f69e3570920b9ed085f5d93c SHA512 43294e627006dbd677821970f781d56821304abd5aea1f8162ae19f6dbec2be4c83b34c89ba67ebd0a35a490ae0fdf69112cbf35c2603b5ea610abc654744fe9
 MISC metadata.xml 318 BLAKE2B ffc32715f0597b63ba78c242a5adfad13c921b43da17b5e07b4cca5e5ef69dbb3c89a7d110165dcea06ed317f873a5210db21be0ac5941dfb433185fdcb7a6e7 SHA512 e4930a21d6f75f5395e2e96436b42c792771fd7167abceeff0db7a9036616c6feeb6beee890afa6ff5e4584f5bb6938084316e60df57997aa1c20ba0a025514c
diff --git a/net-misc/megasync/megasync-9999.ebuild b/net-misc/megasync/megasync-9999.ebuild
index 7ada7d1..e376fff 100644
--- a/net-misc/megasync/megasync-9999.ebuild
+++ b/net-misc/megasync/megasync-9999.ebuild
@@ -1,36 +1,41 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=6
+EAPI=7
 
-inherit eutils multilib qmake-utils autotools versionator
+inherit eutils multilib qmake-utils autotools 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"
+RTAG="_Linux"
 if [[ ${PV} == *9999* ]];then
-	inherit git-r3
 	EGIT_REPO_URI="https://github.com/meganz/MEGAsync"
 	KEYWORDS=""
+	EGIT_SUBMODULES=( '*' )
 else
-	SDK_COMMIT="d7412bb8a13139600302ad9a907a10c47bdd0b52"
-	MY_PV="$(replace_all_version_separators _)"
-	SRC_URI="https://github.com/meganz/MEGAsync/archive/v${MY_PV}_0_Linux.tar.gz -> ${P}.tar.gz
-	https://github.com/meganz/sdk/archive/${SDK_COMMIT}.tar.gz -> ${PN}-sdk-20160719.tar.gz"
+	EGIT_REPO_URI="https://github.com/meganz/MEGAsync"
+	EGIT_COMMIT="v${PV}.0${RTAG}"
+	EGIT_SUBMODULES=( '*' )
 	KEYWORDS="~x86 ~amd64"
-	RESTRICT="mirror"
-	S="${WORKDIR}/MEGAsync-${MY_PV}_0_Linux"
 fi
 
 LICENSE="MEGA"
 SLOT="0"
-IUSE="+cryptopp +sqlite +zlib +curl freeimage readline examples threads qt5 nautilus"
+IUSE="dolphin nautilus thunar +cryptopp +sqlite +zlib +curl freeimage readline examples threads qt5 java php python gnome"
 
 DEPEND="
+	dev-lang/swig
+	app-doc/doxygen
+	media-libs/libmediainfo
+	media-libs/libraw
 	!qt5? ( 
 		dev-qt/qtcore:4
 		dev-qt/qtgui:4
 		dev-qt/qtdbus:4
+		dev-libs/sni-qt
+		dev-qt/qtimageformats:5
+		dev-qt/qtsvg:5
 		)
 	qt5? ( 
 		dev-qt/qtcore:5
@@ -40,8 +45,11 @@ DEPEND="
 		dev-qt/qtconcurrent:5
 		dev-qt/qtnetwork:5
 		dev-qt/qtdbus:5
+		dev-qt/qtimageformats:5
+		dev-qt/qtsvg:5
 		)"
 RDEPEND="${DEPEND}
+		x11-themes/hicolor-icon-theme
 		dev-libs/openssl
 		dev-libs/libgcrypt
 		media-libs/libpng
@@ -55,15 +63,26 @@ RDEPEND="${DEPEND}
 		curl? ( net-misc/curl[ssl,curl_ssl_openssl] )
 		freeimage? ( media-libs/freeimage )
 		readline? ( sys-libs/readline:0 )
-		nautilus? (
-			>=gnome-base/nautilus-3.12.0
-			!!gnome-extra/nautilus-megasync 
-			)
+		dolphin? ( kde-apps/dolphin )
+		nautilus? ( >=gnome-base/nautilus-3 )
+		thunar? ( xfce-base/thunar )
 		"
 
+PATCHES=( )
+
 if [[ ${PV} != *9999* ]];then
 	src_prepare(){
-		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
+		if use gnome; then
+			if [ -e "${FILESDIR}${P}-gnome.patch" ]; then
+				epatch "${FILESDIR}/${P}-gnome.patch"
+			fi
+		fi
 		eapply_user
 		cd src/MEGASync/mega
 		eautoreconf
@@ -86,28 +105,37 @@ src_configure(){
 		"--with-sodium" \
 		$(use_with freeimage) \
 		$(use_with readline) \
-		$(use_enable examples)	
+		$(use_enable examples) \
+		$(use_enable java) \
+		$(use_enable php) \
+		$(use_enable python) \
+		"--enable-chat" \
+		"--enable-gcc-hardening" 
 	cd ../..
 	local myeqmakeargs=(
 		MEGA.pro
 		CONFIG+="release"
 	)
-	use nautilus && myeqmakeargs+=( CONFIG+="with_ext" )
 	if use qt5; then
 		eqmake5 ${myeqmakeargs[@]}
+		use dolphin && cmake-utils_src_configure
 		$(qt5_get_bindir)/lrelease MEGASync/MEGASync.pro
 	else
 		eqmake4 ${myeqmakeargs[@]}
+		use dolphin && cmake-utils_src_configure
 		$(qt4_get_bindir)/lrelease MEGASync/MEGASync.pro
 	fi
 }
 
 src_compile(){
-	cd "${S}"/src
-	emake INSTALL_ROOT="${D}" || die
+	emake -C src INSTALL_ROOT="${D}" || die
+	use dolphin && cmake-utils_src_compile
 }
 
 src_install(){
+	use dolphin && cmake-utils_src_install
+	local DOCS=( CREDITS.md README.md )
+	einstalldocs
 	insinto usr/share/licenses/${PN}
 	doins LICENCE.md installer/terms.txt
 	cd src/MEGASync
@@ -119,17 +147,4 @@ src_install(){
 	for size in 16x16 32x32 48x48 128x128 256x256;do
 		doicon -s $size $size/apps/mega.png
 	done
-	if use nautilus; then
-		cd "${S}/src/MEGAShellExtNautilus"
-		insinto usr/lib/nautilus/extensions-3.0
-		doins libMEGAShellExtNautilus.so.1.0.0
-		cd data/emblems
-		for size in 32x32 64x64;do
-			insinto usr/share/icons/hicolor/$size/emblems
-			doins $size/mega-{pending,synced,syncing,upload}.{icon,png}
-			dosym ${EPREFIX}/usr/lib/nautilus/extensions-3.0/libMEGAShellExtNautilus.so.1.0.0 ${EPREFIX}/usr/lib/nautilus/extensions-3.0/libMEGAShellExtNautilus.so.1.0
-			dosym ${EPREFIX}/usr/lib/nautilus/extensions-3.0/libMEGAShellExtNautilus.so.1.0.0 ${EPREFIX}/usr/lib/nautilus/extensions-3.0/libMEGAShellExtNautilus.so.1
-			dosym ${EPREFIX}/usr/lib/nautilus/extensions-3.0/libMEGAShellExtNautilus.so.1.0.0 ${EPREFIX}/usr/lib/nautilus/extensions-3.0/libMEGAShellExtNautilus.so
-		done
-	fi
 }