commit:     d2d8479682c4191189fe63182da747b8e245dbd3
Author:     Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
AuthorDate: Sat Nov  7 10:53:49 2020 +0000
Commit:     Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
CommitDate: Sat Nov  7 10:53:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/user/ssnb.git/commit/?id=d2d84796

Add megasync changes to 4.3.3 after repoman validation. Add licenses directory 
with MEGA license.

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

 licenses/MEGA                           | 107 ++++++++++++++++++++++++
 net-misc/megasync/Manifest              |   6 +-
 net-misc/megasync/megasync-4.3.3.ebuild |  78 +++++++----------
 net-misc/megasync/megasync-9999.ebuild  | 143 +-------------------------------
 net-misc/megasync/metadata.xml          |   7 ++
 5 files changed, 149 insertions(+), 192 deletions(-)

diff --git a/licenses/MEGA b/licenses/MEGA
new file mode 100644
index 0000000..47763f3
--- /dev/null
+++ b/licenses/MEGA
@@ -0,0 +1,107 @@
+MEGA LIMITED CODE REVIEW LICENCE
+================================
+
+This licence grants you the rights, and only the rights, set out
+below, to access and review Mega's code. If you take advantage of
+these rights, you accept this licence. If you do not accept the
+licence, do not access the code.
+
+Words used in the Mega Limited Terms of Service
+[https://mega.nz/terms] have the same meaning in this licence. Where
+there is any inconsistency between this licence and those Terms of
+Service, these terms prevail.
+
+
+Section 1 -- Definitions
+------------------------
+
+- "code" means the Mega code made available from time, in our sole
+  discretion, for access under this licence at [https://github.com/].
+  Reference to code in this licence means the code and any part of it
+  and any derivative of it.
+
+- "defect" means a defect, bug, backdoor, security issue or other
+  deficiency in the code.
+
+- "review " means to access, analyse, test and otherwise review the
+  code as a reference, for the sole purpose of analysing it for
+  defects.
+
+- "you" means the licensee of rights set out in this licence.
+
+
+Section 2 -- Grant of Rights
+----------------------------
+
+1. Subject to the terms of this licence, we grant you a
+   non-transferable, non-exclusive, worldwide, royalty-free licence to
+   access and use the code solely for review purposes.
+
+2. You may provide the code to anyone else and publish excerpts of it
+   for the purposes of review and commentary, provided that when you
+   do so you make any recipient of the code aware of the terms of this
+   licence and that you attribute the code to Mega.
+
+3. Other than in respect of those parts of the code that were
+   developed by other parties and as specified strictly in accordance
+   with the open source and other licences under which those parts of
+   the code have been made available, as set out on our website or in
+   those items of code, you are not entitled to use or do anything
+   with the code for any commercial or other purpose, other than
+   review and commentary on it.
+
+4. Subject to the terms of this licence, you must at all times comply
+   with and shall be bound by our Terms of Use
+   [https://mega.nz/terms], Privacy Policy [https://mega.nz/privacy]
+   and Takedown Guidance Policy [https://mega.nz/takedown].
+
+
+Section 3 -- Limitations
+------------------------
+
+1. This licence does not grant you any rights to use Mega's name,
+   logo, or trademarks and you must not in any way indicate you are
+   authorised to speak on behalf of Mega.
+
+2. If you issue proceedings in any jurisdiction against Mega because
+   you consider Mega has infringed copyright or any patent right in
+   respect of the code (including any joinder or counterclaim), your
+   licence to the code is automatically terminated.
+
+3. THE CODE IS MADE AVAILABLE "AS-IS" AND WITHOUT ANY EXPRESS OF
+   IMPLIED GUARANTEES AS TO FITNESS, MERCHANTABILITY, NON-INFRINGEMENT
+   OR OTHERWISE. IT IS NOT BEING PROVIDED IN TRADE BUT ON A VOLUNTARY
+   BASIS ON OUR PART AND YOURS AND IS NOT MADE AVAILABE FOR CONSUMER
+   USE OR ANY OTHER USE OUTSIDE THE TERMS OF THIS LICENCE. ANYONE
+   ACCESSING THE CODE SHOULD HAVE THE REQUISITE EXPERTISE TO SECURE
+   THEIR OWN SYSTEM AND DEVICES AND TO ACCESS AND USE THE CODE FOR
+   REVIEW PURPOSES. YOU BEAR THE RISK OF ACCESSING AND USING IT. IN
+   PARTICULAR, MEGA BEARS NO LIABILITY FOR ANY INTERFERENCE WITH OR
+   ADVERSE EFFECT ON YOUR SYSTEM OR DEVICES AS A RESULT OF YOUR
+   ACCESSING AND USING THE CODE.
+
+
+Section 4 -- Termination, suspension and variation
+--------------------------------------------------
+
+1. We may suspend, terminate or vary the terms of this licence and any
+   access to the code at any time, without notice, for any reason or
+   no reason, in respect of any licensee, group of licensees or all
+   licensees.
+
+
+Section 5 -- General
+--------------------
+
+1. This licence and its interpretation and operation are governed
+   solely by New Zealand law. We and each you submit to the exclusive
+   jurisdiction of the New Zealand arbitral tribunals as further
+   described in our Terms of Service and you agree not to raise any
+   jurisdictional issue if we need to enforce an arbitral award or
+   judgment in New Zealand or another country.
+
+2. Questions and comments regarding this licence are welcomed and
+   should be addressed to [supp...@mega.nz].
+
+
+Last updated 20 January 2016.

diff --git a/net-misc/megasync/Manifest b/net-misc/megasync/Manifest
index ee32f33..603392c 100644
--- a/net-misc/megasync/Manifest
+++ b/net-misc/megasync/Manifest
@@ -5,6 +5,6 @@ AUX megasync-3.6.6-ffmpeg.patch 566 BLAKE2B 
c1e8bd4b5c4c2c6fd6cc2316e7372443672f
 AUX megasync-3.6.6-gnome.patch 446 BLAKE2B 
5ceab726168f53f82b10c96b9a5761b21903b9d602cd6c9e0b9fb0f6d06eedefb3542668dce1381689ed947989f0ca2e70bc25e9cc15d526ac197c104219b5c2
 SHA512 
02427cf7d156e541986bc1c2b1a4dc67fffcb2a68d24fe8d1cec443ca84e230515e6650e741192b6be1ebfc57aaf02a71dc4443e8086087264cfeeaf612d278e
 AUX megasync-glibc2.26.patch 5958 BLAKE2B 
990b5ddc9300979e9a059c285b05ef691566e2ec33ab40de76e9f5c251dc8c2f94ddc936eb13772c413c42b0d1122596f2e47805766fe6512ec09050f6b22111
 SHA512 
f8348b61028f34714dabe83fe88e5820686a35e1fa52206451152a97a286557168666142121936304d60aa18dae16d4474c3c3278274b62cc06d42587fc7016e
 EBUILD megasync-4.3.1-r1.ebuild 3478 BLAKE2B 
e1a3965a97a0eae7f098a49f7351e0d30d2187e7356f91c298507e8feb11313fd2d5af66fe4372a3e329233f8004a4395dfe483c53e8205e24629629e9476962
 SHA512 
acdb1cd095cd19de2c618952a8dc07b0d2dba3f26c53cd2e23f439f85fdd6850c1665f2d6fcff75fcc4650ebae27fc1596cd160c18c454421f86970c521aa0a7
-EBUILD megasync-4.3.3.ebuild 3475 BLAKE2B 
6e588b1aafef9a0bc6017e92d3122ea84b40154eb6b9a084bb28ccc67ad9d1563649ff06a3d0e4116ed54b7ba6db6552eddea8204a8148822545af5123b42cdc
 SHA512 
e28f2a7c302f52e393f697a02334062a0a4161b06ddd6896b6d3f6b12c57f9daabd7881e59b788a711e5ac774af487bc5d87d9b329b5239079aff3c2a78462d0
-EBUILD megasync-9999.ebuild 3234 BLAKE2B 
8c2dbd9234089a286275ab7381df1986b7a744de54e6b6e0216fa72913d9b61012eb869058f4dac906bb7bce36c4097c023d1d6cbca7e49792fd199e82bcead1
 SHA512 
11cdb8aad6f5d01dd87b8f5fda04b356d0c464ac122e27c4654b1b6f2489cae3131a124a0333c6dc41644fb079dec20f0e07671584a3a872ca688cef9513b66f
-MISC metadata.xml 318 BLAKE2B 
ffc32715f0597b63ba78c242a5adfad13c921b43da17b5e07b4cca5e5ef69dbb3c89a7d110165dcea06ed317f873a5210db21be0ac5941dfb433185fdcb7a6e7
 SHA512 
e4930a21d6f75f5395e2e96436b42c792771fd7167abceeff0db7a9036616c6feeb6beee890afa6ff5e4584f5bb6938084316e60df57997aa1c20ba0a025514c
+EBUILD megasync-4.3.3.ebuild 3149 BLAKE2B 
1ece4f721d19279292624b517afe94e95c390c48e83de98b68e4a9f8e78535d8bef8579ecad38d221668da2205a9877539ffe61e1a5e9028e5ac63377989a7dc
 SHA512 
9a8539c2a0084338086fe080f12cc085fe181ad9bbdf92d23aff829f6ea25bb669745c7bd0e58552175dc2af81a0f70e65a704d2bc1fb79ca8ee6e193236ffa3
+EBUILD megasync-9999.ebuild 3149 BLAKE2B 
1ece4f721d19279292624b517afe94e95c390c48e83de98b68e4a9f8e78535d8bef8579ecad38d221668da2205a9877539ffe61e1a5e9028e5ac63377989a7dc
 SHA512 
9a8539c2a0084338086fe080f12cc085fe181ad9bbdf92d23aff829f6ea25bb669745c7bd0e58552175dc2af81a0f70e65a704d2bc1fb79ca8ee6e193236ffa3
+MISC metadata.xml 736 BLAKE2B 
607426e8fd147aca3e0d4d14bafa37f3741720596f32d745d6c9b001d15f44fe766a34ff1cc44be4dd05415d5255574e54865c212e9d388563f6682d18282077
 SHA512 
63dd47f49a21469c1491830a509c23d09daff2bc526780b970f7fc02ca63ca7e2ae14f5c43acfbc990e1b14736759cf366268e8a8a6df85fdb77b5c36819bdc0

diff --git a/net-misc/megasync/megasync-4.3.3.ebuild 
b/net-misc/megasync/megasync-4.3.3.ebuild
index 91734a7..aa7d2f2 100644
--- a/net-misc/megasync/megasync-4.3.3.ebuild
+++ b/net-misc/megasync/megasync-4.3.3.ebuild
@@ -22,51 +22,41 @@ fi
 
 LICENSE="MEGA"
 SLOT="0"
-IUSE="dolphin nautilus thunar +cryptopp +sqlite +zlib +curl freeimage readline 
examples threads qt5 java php python gnome"
+IUSE="dolphin nautilus thunar +cryptopp +sqlite +zlib +curl freeimage readline 
examples threads 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
-               dev-qt/linguist-tools
-               dev-qt/qtwidgets:5
-               dev-qt/qtgui:5
-               dev-qt/qtconcurrent:5
-               dev-qt/qtnetwork:5
-               dev-qt/qtdbus:5
-               dev-qt/qtimageformats:5
-               dev-qt/qtsvg:5
-               )"
+       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
+       dev-qt/qtimageformats:5
+       dev-qt/qtsvg: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 )
-               dolphin? ( kde-apps/dolphin )
-               nautilus? ( >=gnome-base/nautilus-3 )
-               thunar? ( xfce-base/thunar )
-               "
+       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 )
+       dolphin? ( kde-apps/dolphin )
+       nautilus? ( >=gnome-base/nautilus-3 )
+       thunar? ( xfce-base/thunar )
+       "
 
 PATCHES=( )
 
@@ -116,15 +106,9 @@ src_configure(){
                MEGA.pro
                CONFIG+="release"
        )
-       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
+       eqmake5 ${myeqmakeargs[@]}
+       use dolphin && cmake-utils_src_configure
+       $(qt5_get_bindir)/lrelease MEGASync/MEGASync.pro
 }
 
 src_compile(){

diff --git a/net-misc/megasync/megasync-9999.ebuild 
b/net-misc/megasync/megasync-9999.ebuild
deleted file mode 100644
index be2bd58..0000000
--- a/net-misc/megasync/megasync-9999.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2019 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=7
-
-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"
-
-EGIT_REPO_URI="https://github.com/meganz/MEGAsync";
-KEYWORDS=""
-EGIT_SUBMODULES=( '*' )
-
-LICENSE="MEGA"
-SLOT="0"
-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
-               dev-qt/linguist-tools
-               dev-qt/qtwidgets:5
-               dev-qt/qtgui:5
-               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
-               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 )
-               dolphin? ( kde-apps/dolphin )
-               nautilus? ( >=gnome-base/nautilus-3 )
-               thunar? ( xfce-base/thunar )
-               "
-
-PATCHES=( )
-
-src_prepare(){
-       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
-}
-
-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[@]}
-               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(){
-       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
-       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-9999.ebuild 
b/net-misc/megasync/megasync-9999.ebuild
new file mode 120000
index 0000000..464f33c
--- /dev/null
+++ b/net-misc/megasync/megasync-9999.ebuild
@@ -0,0 +1 @@
+megasync-4.3.3.ebuild
\ No newline at end of file

diff --git a/net-misc/megasync/metadata.xml b/net-misc/megasync/metadata.xml
index a9aac56..dbb2516 100644
--- a/net-misc/megasync/metadata.xml
+++ b/net-misc/megasync/metadata.xml
@@ -6,4 +6,11 @@
                <name>Samuel Bernardo</name>
                <description>megasync client from mega.nz</description>
        </maintainer>
+       <use>
+               <flag name='dolphin'>Upload your files to your Mega account 
from Dolphin file manager.</flag>
+               <flag name='nautilus'>Upload your files to your Mega account 
from nautilus.</flag>
+               <flag name='thunar'>Upload your files to your Mega account from 
Thunar.</flag>
+               <flag name='cryptopp'>Compile with Crypto++ Library.</flag>
+               <flag name='freeimage'>Use freeimage to manage graphic images 
format.</flag>
+       </use>
 </pkgmetadata>

Reply via email to