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 12:23:24
Message-Id: 1585570986.ee2c8611382896c3685bce378d8480f1f98a1ce8.samuelbernardo@gentoo
1 commit: ee2c8611382896c3685bce378d8480f1f98a1ce8
2 Author: Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
3 AuthorDate: Mon Mar 30 12:23:06 2020 +0000
4 Commit: Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
5 CommitDate: Mon Mar 30 12:23:06 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/user/ssnb.git/commit/?id=ee2c8611
7
8 Update manifest and megasync-9999
9
10 Signed-off-by: Samuel Bernardo <samuelbernardo.mail <AT> gmail.com>
11
12 net-misc/megasync/Manifest | 3 +-
13 net-misc/megasync/megasync-9999.ebuild | 81 ++++++++++++++++++++--------------
14 2 files changed, 50 insertions(+), 34 deletions(-)
15
16 diff --git a/net-misc/megasync/Manifest b/net-misc/megasync/Manifest
17 index 15a04ca..5fcb06c 100644
18 --- a/net-misc/megasync/Manifest
19 +++ b/net-misc/megasync/Manifest
20 @@ -22,5 +22,6 @@ EBUILD megasync-4.2.0.ebuild 3917 BLAKE2B 7295114af019c39c00e8d487c8cc6bfd9ad348
21 EBUILD megasync-4.2.3.ebuild 3915 BLAKE2B ed8dca3c7f8062d12e17a5143a8bd5a6ee9b8d79c54b395d9e0502a4d277acd62443c36ed09572aff677842c22b879160a62f92fb7beda90c57d3d6fc14ee8f6 SHA512 eb027f7cbf263075f181645ebe2625997ed7a499c8a5e285f52cdb348ef3295ecadb03240ee446a9362895f96e9bfd11657a27aca9fb34ab9d5422cc68d847e9
22 EBUILD megasync-4.2.5-r2.ebuild 4027 BLAKE2B cf745d60810047fcbf4392271263e99bb615019647dd4d52cb7b95b01e0a25005d25b551df418a46881f5f655f5e9114ab5b351fa9387c8fb027cb04ab0ccd18 SHA512 99c1cee8eb8f4e941569f2c4682bbd5ef55ff30b76f3f6dbcd759993c769f5651d88f3636d3b85046a6cfecca50826600ae2eacd31ddf7f3871cf7e6e7891040
23 EBUILD megasync-4.2.5.ebuild 3915 BLAKE2B ed8dca3c7f8062d12e17a5143a8bd5a6ee9b8d79c54b395d9e0502a4d277acd62443c36ed09572aff677842c22b879160a62f92fb7beda90c57d3d6fc14ee8f6 SHA512 eb027f7cbf263075f181645ebe2625997ed7a499c8a5e285f52cdb348ef3295ecadb03240ee446a9362895f96e9bfd11657a27aca9fb34ab9d5422cc68d847e9
24 -EBUILD megasync-9999.ebuild 3637 BLAKE2B 3333948364efa4ae9ce897da38659e669fbb509de374686832d4546caccc4f9333693749540c989f1bb074b9eb929b308978ed089f4b6be714dbf76c530e608b SHA512 020ca96d8972f66cc79673bc31083af2fffacbb02dfeb12677d5d62f08605e1a4f9b29d55d5509231a416c39e7b1cd2e6b20d16c4af00a415cbaf4c133fa6c6d
25 +EBUILD megasync-4.3.1.ebuild 3455 BLAKE2B 05d5e7b0fcab78a9bb1a9eba87b97ed5b186898e4a8997a3acf9ac8bd3e09800d33b11f6f81067aeca28c3003f21acdb191b6ab3f69e3570920b9ed085f5d93c SHA512 43294e627006dbd677821970f781d56821304abd5aea1f8162ae19f6dbec2be4c83b34c89ba67ebd0a35a490ae0fdf69112cbf35c2603b5ea610abc654744fe9
26 +EBUILD megasync-9999.ebuild 3455 BLAKE2B 05d5e7b0fcab78a9bb1a9eba87b97ed5b186898e4a8997a3acf9ac8bd3e09800d33b11f6f81067aeca28c3003f21acdb191b6ab3f69e3570920b9ed085f5d93c SHA512 43294e627006dbd677821970f781d56821304abd5aea1f8162ae19f6dbec2be4c83b34c89ba67ebd0a35a490ae0fdf69112cbf35c2603b5ea610abc654744fe9
27 MISC metadata.xml 318 BLAKE2B ffc32715f0597b63ba78c242a5adfad13c921b43da17b5e07b4cca5e5ef69dbb3c89a7d110165dcea06ed317f873a5210db21be0ac5941dfb433185fdcb7a6e7 SHA512 e4930a21d6f75f5395e2e96436b42c792771fd7167abceeff0db7a9036616c6feeb6beee890afa6ff5e4584f5bb6938084316e60df57997aa1c20ba0a025514c
28
29 diff --git a/net-misc/megasync/megasync-9999.ebuild b/net-misc/megasync/megasync-9999.ebuild
30 index 7ada7d1..e376fff 100644
31 --- a/net-misc/megasync/megasync-9999.ebuild
32 +++ b/net-misc/megasync/megasync-9999.ebuild
33 @@ -1,36 +1,41 @@
34 -# Copyright 1999-2016 Gentoo Foundation
35 +# Copyright 1999-2020 Gentoo Foundation
36 # Distributed under the terms of the GNU General Public License v2
37 # $Header: $
38
39 -EAPI=6
40 +EAPI=7
41
42 -inherit eutils multilib qmake-utils autotools versionator
43 +inherit eutils multilib qmake-utils autotools git-r3
44
45 DESCRIPTION="A Qt-based program for syncing your MEGA account in your PC. This is the official app."
46 HOMEPAGE="http://mega.co.nz"
47 +RTAG="_Linux"
48 if [[ ${PV} == *9999* ]];then
49 - inherit git-r3
50 EGIT_REPO_URI="https://github.com/meganz/MEGAsync"
51 KEYWORDS=""
52 + EGIT_SUBMODULES=( '*' )
53 else
54 - SDK_COMMIT="d7412bb8a13139600302ad9a907a10c47bdd0b52"
55 - MY_PV="$(replace_all_version_separators _)"
56 - SRC_URI="https://github.com/meganz/MEGAsync/archive/v${MY_PV}_0_Linux.tar.gz -> ${P}.tar.gz
57 - https://github.com/meganz/sdk/archive/${SDK_COMMIT}.tar.gz -> ${PN}-sdk-20160719.tar.gz"
58 + EGIT_REPO_URI="https://github.com/meganz/MEGAsync"
59 + EGIT_COMMIT="v${PV}.0${RTAG}"
60 + EGIT_SUBMODULES=( '*' )
61 KEYWORDS="~x86 ~amd64"
62 - RESTRICT="mirror"
63 - S="${WORKDIR}/MEGAsync-${MY_PV}_0_Linux"
64 fi
65
66 LICENSE="MEGA"
67 SLOT="0"
68 -IUSE="+cryptopp +sqlite +zlib +curl freeimage readline examples threads qt5 nautilus"
69 +IUSE="dolphin nautilus thunar +cryptopp +sqlite +zlib +curl freeimage readline examples threads qt5 java php python gnome"
70
71 DEPEND="
72 + dev-lang/swig
73 + app-doc/doxygen
74 + media-libs/libmediainfo
75 + media-libs/libraw
76 !qt5? (
77 dev-qt/qtcore:4
78 dev-qt/qtgui:4
79 dev-qt/qtdbus:4
80 + dev-libs/sni-qt
81 + dev-qt/qtimageformats:5
82 + dev-qt/qtsvg:5
83 )
84 qt5? (
85 dev-qt/qtcore:5
86 @@ -40,8 +45,11 @@ DEPEND="
87 dev-qt/qtconcurrent:5
88 dev-qt/qtnetwork:5
89 dev-qt/qtdbus:5
90 + dev-qt/qtimageformats:5
91 + dev-qt/qtsvg:5
92 )"
93 RDEPEND="${DEPEND}
94 + x11-themes/hicolor-icon-theme
95 dev-libs/openssl
96 dev-libs/libgcrypt
97 media-libs/libpng
98 @@ -55,15 +63,26 @@ RDEPEND="${DEPEND}
99 curl? ( net-misc/curl[ssl,curl_ssl_openssl] )
100 freeimage? ( media-libs/freeimage )
101 readline? ( sys-libs/readline:0 )
102 - nautilus? (
103 - >=gnome-base/nautilus-3.12.0
104 - !!gnome-extra/nautilus-megasync
105 - )
106 + dolphin? ( kde-apps/dolphin )
107 + nautilus? ( >=gnome-base/nautilus-3 )
108 + thunar? ( xfce-base/thunar )
109 "
110
111 +PATCHES=( )
112 +
113 if [[ ${PV} != *9999* ]];then
114 src_prepare(){
115 - cp -r ../sdk-${SDK_COMMIT}/* src/MEGASync/mega
116 + if [ -e "${FILESDIR}/MEGAsync-${PV}.0_Linux.patch" ]; then
117 + EPATCH_OPTS="-p0" epatch "${FILESDIR}/MEGAsync-${PV}.0_Linux.patch"
118 + fi
119 + if [ ! -z ${PATCHES} ]; then
120 + epatch ${PATCHES}
121 + fi
122 + if use gnome; then
123 + if [ -e "${FILESDIR}${P}-gnome.patch" ]; then
124 + epatch "${FILESDIR}/${P}-gnome.patch"
125 + fi
126 + fi
127 eapply_user
128 cd src/MEGASync/mega
129 eautoreconf
130 @@ -86,28 +105,37 @@ src_configure(){
131 "--with-sodium" \
132 $(use_with freeimage) \
133 $(use_with readline) \
134 - $(use_enable examples)
135 + $(use_enable examples) \
136 + $(use_enable java) \
137 + $(use_enable php) \
138 + $(use_enable python) \
139 + "--enable-chat" \
140 + "--enable-gcc-hardening"
141 cd ../..
142 local myeqmakeargs=(
143 MEGA.pro
144 CONFIG+="release"
145 )
146 - use nautilus && myeqmakeargs+=( CONFIG+="with_ext" )
147 if use qt5; then
148 eqmake5 ${myeqmakeargs[@]}
149 + use dolphin && cmake-utils_src_configure
150 $(qt5_get_bindir)/lrelease MEGASync/MEGASync.pro
151 else
152 eqmake4 ${myeqmakeargs[@]}
153 + use dolphin && cmake-utils_src_configure
154 $(qt4_get_bindir)/lrelease MEGASync/MEGASync.pro
155 fi
156 }
157
158 src_compile(){
159 - cd "${S}"/src
160 - emake INSTALL_ROOT="${D}" || die
161 + emake -C src INSTALL_ROOT="${D}" || die
162 + use dolphin && cmake-utils_src_compile
163 }
164
165 src_install(){
166 + use dolphin && cmake-utils_src_install
167 + local DOCS=( CREDITS.md README.md )
168 + einstalldocs
169 insinto usr/share/licenses/${PN}
170 doins LICENCE.md installer/terms.txt
171 cd src/MEGASync
172 @@ -119,17 +147,4 @@ src_install(){
173 for size in 16x16 32x32 48x48 128x128 256x256;do
174 doicon -s $size $size/apps/mega.png
175 done
176 - if use nautilus; then
177 - cd "${S}/src/MEGAShellExtNautilus"
178 - insinto usr/lib/nautilus/extensions-3.0
179 - doins libMEGAShellExtNautilus.so.1.0.0
180 - cd data/emblems
181 - for size in 32x32 64x64;do
182 - insinto usr/share/icons/hicolor/$size/emblems
183 - doins $size/mega-{pending,synced,syncing,upload}.{icon,png}
184 - dosym ${EPREFIX}/usr/lib/nautilus/extensions-3.0/libMEGAShellExtNautilus.so.1.0.0 ${EPREFIX}/usr/lib/nautilus/extensions-3.0/libMEGAShellExtNautilus.so.1.0
185 - dosym ${EPREFIX}/usr/lib/nautilus/extensions-3.0/libMEGAShellExtNautilus.so.1.0.0 ${EPREFIX}/usr/lib/nautilus/extensions-3.0/libMEGAShellExtNautilus.so.1
186 - dosym ${EPREFIX}/usr/lib/nautilus/extensions-3.0/libMEGAShellExtNautilus.so.1.0.0 ${EPREFIX}/usr/lib/nautilus/extensions-3.0/libMEGAShellExtNautilus.so
187 - done
188 - fi
189 }