public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Takuya Wakazono" <pastalian46@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: net-misc/megasync/
Date: Fri, 26 Jan 2024 10:06:45 +0000 (UTC)	[thread overview]
Message-ID: <1706256945.cd5a69edc3604a6348eb3c6eeb4ddeb447c7b5ab.pastalian46@gentoo> (raw)

commit:     cd5a69edc3604a6348eb3c6eeb4ddeb447c7b5ab
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Fri Jan 26 08:15:45 2024 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Fri Jan 26 08:15:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cd5a69ed

net-misc/megasync: add 4.12.0.0, sync live

Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

 net-misc/megasync/Manifest                         |  2 ++
 ...gasync-9999.ebuild => megasync-4.12.0.0.ebuild} | 41 +++++++++++-----------
 net-misc/megasync/megasync-9999.ebuild             | 41 +++++++++++-----------
 3 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/net-misc/megasync/Manifest b/net-misc/megasync/Manifest
index 701233efc4..bf22d45e39 100644
--- a/net-misc/megasync/Manifest
+++ b/net-misc/megasync/Manifest
@@ -1,2 +1,4 @@
 DIST megasync-4.11.0.0.tar.gz 20313571 BLAKE2B 8c5c58912fef730bf3e4c56c5de0b2c6f4825be6c91ec19e6c5f5946a76efa5fd9f36f6afdee3d886b31a13c924dea81f7999d29fbab0bb0f1acefbe52c449f5 SHA512 ab43b83d05d56b8eb1bf66ed89801889cfb8d21d9bae86245607a1d7c36f7436fa8879f6fd94cb07c4a2e8567532b9e0919ec9e78e2ca85d8fca262b1479b482
+DIST megasync-4.12.0.0.tar.gz 25266988 BLAKE2B 0c126feb273d6d11e05a3ec3a5e7925f27bfd86e2ef23306fce4c9b2564b178dc5918b7bef9dcea33a8a5d0462e9c1e8d771c299de6e0f8ed5d4bed616ed58f9 SHA512 fd3ea7b624e66e3d4576c436d983a027e711783d41c585eedf540ba6bbf25ab9128ab4a3c0d2e6806705d54cea5e470d7339d49cc72a635385861f9efd64faf9
 DIST megasync-sdk-4.11.0.0.tar.gz 3714994 BLAKE2B 6d6d217d8acb7f191c88f18bc0b2ef9b6f743502a9916841177a93452c1818cffcb8275134cc2a32162693c59af829d42249497f2ed18b66e3c0f032f0ba6780 SHA512 471102d280d02b90f41c46f5700c0d71d88f74ccf7c605c717a66ad154c84c725ce231d11779fd480b2eb81b073da0bbea00dbc149918e6519fe89694b185ef4
+DIST megasync-sdk-4.12.0.0.tar.gz 3580874 BLAKE2B 7fe63ccd998ac0fe4f6d31d4fb38041d01180044b6a36658da28b0793c2c0c9a95984a937ffa74b11449818ca63a55d7d1faef65e69ea29309d42c4d7646b2c3 SHA512 e97d5901e5445bd677b2d7c50d684dbd6975efcba43ed6618b76d9452b33f5c42eaa8279e920987cf5af63da6ad951589e644bf01814b69739e4260c651aa68b

diff --git a/net-misc/megasync/megasync-9999.ebuild b/net-misc/megasync/megasync-4.12.0.0.ebuild
similarity index 79%
copy from net-misc/megasync/megasync-9999.ebuild
copy to net-misc/megasync/megasync-4.12.0.0.ebuild
index 0d4b8ab3f4..78d77b1684 100644
--- a/net-misc/megasync/megasync-9999.ebuild
+++ b/net-misc/megasync/megasync-4.12.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]];then
 	EGIT_BRANCH="master"
 	EGIT_SUBMODULES=( '*' )
 else
-	MEGA_SDK_REV="6d4c102940dab277974090cd4292e58f08ac6032" # commit of src/MEGASync/mega submodule
+	MEGA_SDK_REV="2e9307d114c379967f415211d466262162e074d4" # commit of src/MEGASync/mega submodule
 	MEGA_TAG_SUFFIX="Win"
 	SRC_URI="
 		https://github.com/meganz/MEGAsync/archive/v${PV}_${MEGA_TAG_SUFFIX}.tar.gz -> ${P}.tar.gz
@@ -37,14 +37,15 @@ DEPEND="
 	dev-libs/libsodium:=
 	dev-libs/libuv:=
 	dev-libs/openssl:0=
+	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative: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/qtwidgets:5
 	dev-qt/qtx11extras:5
 	media-libs/libmediainfo
 	media-libs/libraw
@@ -69,18 +70,18 @@ BDEPEND="
 	dolphin? ( kde-frameworks/extra-cmake-modules )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-4.10.0.0_ffmpeg6.patch"
+	"${FILESDIR}/${PN}-4.10.0.0_fix-build.patch"
+)
+
 CMAKE_USE_DIR="${S}/src/MEGAShellExtDolphin"
 
 src_prepare() {
 	if [[ ${PV} != 9999 ]]; then
-		rmdir src/MEGASync/mega
-		mv "${WORKDIR}/sdk-${MEGA_SDK_REV}" src/MEGASync/mega
-	fi
-
-	if has_version ">=media-video/ffmpeg-6.0"; then
-		eapply "${FILESDIR}/${PN}-4.10.0.0_ffmpeg6.patch"
+		rmdir src/MEGASync/mega || die
+		mv "${WORKDIR}/sdk-${MEGA_SDK_REV}" src/MEGASync/mega || die
 	fi
-	eapply "${FILESDIR}/${PN}-4.10.0.0_fix-build.patch"
 
 	if use dolphin; then
 		cmake_src_prepare
@@ -88,20 +89,20 @@ src_prepare() {
 		default
 	fi
 
-	cd "${S}/src/MEGASync/mega"
+	cd "${S}/src/MEGASync/mega" || die
 	eautoreconf
 }
 
 src_configure() {
-	cd "${S}/src/MEGASync/mega"
+	cd "${S}/src/MEGASync/mega" || die
 	econf \
 		"--disable-curl-checks" \
 		"--disable-examples" \
 		$(use_enable threads posix-threads) \
 		$(use_with freeimage)
 
-	cd "${S}/src"
-	local myeqmakeargs=(
+	cd "${S}/src" || die
+	local myqmakeargs=(
 		MEGA.pro
 		CONFIG+="release"
 		$(usex freeimage "" "CONFIG+=nofreeimage")
@@ -110,8 +111,8 @@ src_configure() {
 		$(usev thunar "SUBDIRS+=MEGAShellExtThunar")
 	)
 
-	eqmake5 ${myeqmakeargs[@]}
-	$(qt5_get_bindir)/lrelease MEGASync/MEGASync.pro
+	eqmake5 "${myqmakeargs[@]}"
+	$(qt5_get_bindir)/lrelease MEGASync/MEGASync.pro || die
 
 	use dolphin && cmake_src_configure
 }
@@ -127,8 +128,8 @@ src_install() {
 	dobin "src/MEGASync/${PN}"
 	dodoc CREDITS.md README.md
 
-	rm -rf "${D}"/usr/share/doc/megasync
-	rm -rf "${D}"/usr/share/icons/ubuntu-mono-dark
+	rm -rf "${D}"/usr/share/doc/megasync || die
+	rm -rf "${D}"/usr/share/icons/ubuntu-mono-dark || die
 
 	use dolphin && cmake_src_install
 }

diff --git a/net-misc/megasync/megasync-9999.ebuild b/net-misc/megasync/megasync-9999.ebuild
index 0d4b8ab3f4..78d77b1684 100644
--- a/net-misc/megasync/megasync-9999.ebuild
+++ b/net-misc/megasync/megasync-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]];then
 	EGIT_BRANCH="master"
 	EGIT_SUBMODULES=( '*' )
 else
-	MEGA_SDK_REV="6d4c102940dab277974090cd4292e58f08ac6032" # commit of src/MEGASync/mega submodule
+	MEGA_SDK_REV="2e9307d114c379967f415211d466262162e074d4" # commit of src/MEGASync/mega submodule
 	MEGA_TAG_SUFFIX="Win"
 	SRC_URI="
 		https://github.com/meganz/MEGAsync/archive/v${PV}_${MEGA_TAG_SUFFIX}.tar.gz -> ${P}.tar.gz
@@ -37,14 +37,15 @@ DEPEND="
 	dev-libs/libsodium:=
 	dev-libs/libuv:=
 	dev-libs/openssl:0=
+	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative: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/qtwidgets:5
 	dev-qt/qtx11extras:5
 	media-libs/libmediainfo
 	media-libs/libraw
@@ -69,18 +70,18 @@ BDEPEND="
 	dolphin? ( kde-frameworks/extra-cmake-modules )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-4.10.0.0_ffmpeg6.patch"
+	"${FILESDIR}/${PN}-4.10.0.0_fix-build.patch"
+)
+
 CMAKE_USE_DIR="${S}/src/MEGAShellExtDolphin"
 
 src_prepare() {
 	if [[ ${PV} != 9999 ]]; then
-		rmdir src/MEGASync/mega
-		mv "${WORKDIR}/sdk-${MEGA_SDK_REV}" src/MEGASync/mega
-	fi
-
-	if has_version ">=media-video/ffmpeg-6.0"; then
-		eapply "${FILESDIR}/${PN}-4.10.0.0_ffmpeg6.patch"
+		rmdir src/MEGASync/mega || die
+		mv "${WORKDIR}/sdk-${MEGA_SDK_REV}" src/MEGASync/mega || die
 	fi
-	eapply "${FILESDIR}/${PN}-4.10.0.0_fix-build.patch"
 
 	if use dolphin; then
 		cmake_src_prepare
@@ -88,20 +89,20 @@ src_prepare() {
 		default
 	fi
 
-	cd "${S}/src/MEGASync/mega"
+	cd "${S}/src/MEGASync/mega" || die
 	eautoreconf
 }
 
 src_configure() {
-	cd "${S}/src/MEGASync/mega"
+	cd "${S}/src/MEGASync/mega" || die
 	econf \
 		"--disable-curl-checks" \
 		"--disable-examples" \
 		$(use_enable threads posix-threads) \
 		$(use_with freeimage)
 
-	cd "${S}/src"
-	local myeqmakeargs=(
+	cd "${S}/src" || die
+	local myqmakeargs=(
 		MEGA.pro
 		CONFIG+="release"
 		$(usex freeimage "" "CONFIG+=nofreeimage")
@@ -110,8 +111,8 @@ src_configure() {
 		$(usev thunar "SUBDIRS+=MEGAShellExtThunar")
 	)
 
-	eqmake5 ${myeqmakeargs[@]}
-	$(qt5_get_bindir)/lrelease MEGASync/MEGASync.pro
+	eqmake5 "${myqmakeargs[@]}"
+	$(qt5_get_bindir)/lrelease MEGASync/MEGASync.pro || die
 
 	use dolphin && cmake_src_configure
 }
@@ -127,8 +128,8 @@ src_install() {
 	dobin "src/MEGASync/${PN}"
 	dodoc CREDITS.md README.md
 
-	rm -rf "${D}"/usr/share/doc/megasync
-	rm -rf "${D}"/usr/share/icons/ubuntu-mono-dark
+	rm -rf "${D}"/usr/share/doc/megasync || die
+	rm -rf "${D}"/usr/share/icons/ubuntu-mono-dark || die
 
 	use dolphin && cmake_src_install
 }


             reply	other threads:[~2024-01-26 10:06 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-26 10:06 Takuya Wakazono [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-11-21 12:12 [gentoo-commits] repo/proj/guru:dev commit in: net-misc/megasync/ Takuya Wakazono
2024-11-21 12:12 Takuya Wakazono
2024-10-30 13:39 Takuya Wakazono
2024-10-03 16:08 Takuya Wakazono
2024-09-21  7:46 Takuya Wakazono
2024-08-20 15:08 Takuya Wakazono
2024-08-20 15:08 Takuya Wakazono
2024-07-27  4:58 Takuya Wakazono
2024-07-27  4:58 Takuya Wakazono
2024-07-20  8:20 Takuya Wakazono
2024-07-12 17:56 Takuya Wakazono
2024-06-03 10:39 Takuya Wakazono
2024-05-07 12:30 Takuya Wakazono
2024-05-07 12:30 Takuya Wakazono
2024-03-25 13:16 Takuya Wakazono
2024-03-19 10:11 Takuya Wakazono
2024-03-19 10:11 Takuya Wakazono
2024-01-29  9:44 Takuya Wakazono
2024-01-29  9:44 Takuya Wakazono
2024-01-26 10:06 Takuya Wakazono
2023-11-23  6:09 Takuya Wakazono
2023-11-23  6:09 Takuya Wakazono
2023-11-19 11:25 Takuya Wakazono
2023-11-16 15:28 Takuya Wakazono
2023-11-14 14:30 Takuya Wakazono
2023-11-14 14:30 Takuya Wakazono
2023-11-03 13:49 Takuya Wakazono
2023-11-03  3:37 Takuya Wakazono
2022-02-09 13:12 Anna Vyalkova
2021-05-24 19:55 Samuel Bernardo
2021-05-22 11:42 Marcin Woźniak
2021-05-06  0:22 Alessandro Barbieri
2021-05-03 10:11 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2021-05-03  9:36 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2021-03-28 10:52 Andrew Ammerlaan
2021-01-25  8:53 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2021-01-25  8:53 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2021-01-03 13:58 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2021-01-03 13:58 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2021-01-03 13:58 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2021-01-03 13:58 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2021-01-02 16:57 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2021-01-02 16:49 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2020-12-31  8:31 Theo Anderson
2020-12-10 23:03 Theo Anderson
2020-12-10 22:05 Theo Anderson
2020-11-08 12:34 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2020-11-08 12:34 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2020-11-08 11:13 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2020-11-08 11:06 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2020-11-07 11:09 Samuel Bernardo
2020-11-07 10:44 Samuel Bernardo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1706256945.cd5a69edc3604a6348eb3c6eeb4ddeb447c7b5ab.pastalian46@gentoo \
    --to=pastalian46@gmail.com \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox