Gentoo Archives: gentoo-commits

From: Samuel Bernardo <samuelbernardo.mail@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/user/ssnb:master commit in: net-misc/megasync/
Date: Mon, 30 Mar 2020 11:27:29
Message-Id: 1585567614.5b09f306ec64389409f6463571aa8e68c1b1b842.samuelbernardo@gentoo
1 commit: 5b09f306ec64389409f6463571aa8e68c1b1b842
2 Author: Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
3 AuthorDate: Mon Mar 30 11:11:21 2020 +0000
4 Commit: Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
5 CommitDate: Mon Mar 30 11:26:54 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/user/ssnb.git/commit/?id=5b09f306
7
8 Update megasync to EAPI 7 and clean comments and unnecessary eclass imports
9
10 Signed-off-by: Samuel Bernardo <samuelbernardo.mail <AT> gmail.com>
11
12 net-misc/megasync/megasync-4.3.1.ebuild | 16 ++--------------
13 1 file changed, 2 insertions(+), 14 deletions(-)
14
15 diff --git a/net-misc/megasync/megasync-4.3.1.ebuild b/net-misc/megasync/megasync-4.3.1.ebuild
16 index 1bd032b..e376fff 100644
17 --- a/net-misc/megasync/megasync-4.3.1.ebuild
18 +++ b/net-misc/megasync/megasync-4.3.1.ebuild
19 @@ -2,9 +2,9 @@
20 # Distributed under the terms of the GNU General Public License v2
21 # $Header: $
22
23 -EAPI=6
24 +EAPI=7
25
26 -inherit eutils multilib qmake-utils autotools versionator git-r3 toolchain-funcs
27 +inherit eutils multilib qmake-utils autotools git-r3
28
29 DESCRIPTION="A Qt-based program for syncing your MEGA account in your PC. This is the official app."
30 HOMEPAGE="http://mega.co.nz"
31 @@ -14,16 +14,10 @@ if [[ ${PV} == *9999* ]];then
32 KEYWORDS=""
33 EGIT_SUBMODULES=( '*' )
34 else
35 - #SDK_COMMIT="e8e66e9f030febfb35c9e4dd503d69091e28fc04"
36 - #MY_PV="$(replace_all_version_separators _)"
37 EGIT_REPO_URI="https://github.com/meganz/MEGAsync"
38 EGIT_COMMIT="v${PV}.0${RTAG}"
39 EGIT_SUBMODULES=( '*' )
40 - #SRC_URI="https://github.com/meganz/MEGAsync/archive/v${PV}.0_Linux.tar.gz -> ${P}.tar.gz
41 - #https://github.com/meganz/sdk/archive/${SDK_COMMIT}.tar.gz -> ${PN}-sdk-20170215.tar.gz"
42 KEYWORDS="~x86 ~amd64"
43 - #RESTRICT="mirror"
44 - #S="${WORKDIR}/MEGAsync-${PV}.0_Linux"
45 fi
46
47 LICENSE="MEGA"
48 @@ -78,9 +72,6 @@ PATCHES=( )
49
50 if [[ ${PV} != *9999* ]];then
51 src_prepare(){
52 - #default
53 - # Not needed, since using git submodules
54 - #cp -r ../sdk-${SDK_COMMIT}/* src/MEGASync/mega
55 if [ -e "${FILESDIR}/MEGAsync-${PV}.0_Linux.patch" ]; then
56 EPATCH_OPTS="-p0" epatch "${FILESDIR}/MEGAsync-${PV}.0_Linux.patch"
57 fi
58 @@ -125,9 +116,6 @@ src_configure(){
59 MEGA.pro
60 CONFIG+="release"
61 )
62 - if [ $(gcc-major-version) -eq "9" ]; then
63 - myeqmakeargs+=(QMAKE_CXXFLAGS+="-fpermissive")
64 - fi
65 if use qt5; then
66 eqmake5 ${myeqmakeargs[@]}
67 use dolphin && cmake-utils_src_configure