diff --git a/app-misc/brightness-control/metadata.xml b/app-misc/brightness-control/metadata.xml index 2878794054..7a38bb9009 100644 --- a/app-misc/brightness-control/metadata.xml +++ b/app-misc/brightness-control/metadata.xml @@ -1,8 +1,5 @@ - - andrewammerlaan@gentoo.org - Andrew Ammerlaan - + diff --git a/dev-libs/open62541/open62541-1.2.2.ebuild b/dev-libs/open62541/open62541-1.2.2.ebuild index 7665253c86..5073deab1e 100644 --- a/dev-libs/open62541/open62541-1.2.2.ebuild +++ b/dev-libs/open62541/open62541-1.2.2.ebuild @@ -30,15 +30,15 @@ BDEPEND=" doc? ( media-gfx/graphviz $(python_gen_cond_dep ' - dev-python/sphinx[${PYTHON_MULTI_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] ') ) test? ( dev-libs/check dev-util/valgrind $(python_gen_cond_dep ' - dev-python/subunit[${PYTHON_MULTI_USEDEP}] + dev-python/subunit[${PYTHON_USEDEP}] ') ) " diff --git a/dev-python/curio/metadata.xml b/dev-python/curio/metadata.xml index d32427c1ef..6a58b1a327 100644 --- a/dev-python/curio/metadata.xml +++ b/dev-python/curio/metadata.xml @@ -2,10 +2,7 @@ - - andrewammerlaan@gentoo.org - Andrew Ammerlaan - + Curio is a coroutine-based library for concurrent Python systems programming. It provides standard programming abstractions such as as tasks, sockets, files, locks, and queues. It works on Unix and Windows. You'll find it to be familiar, small, fast, and fun Core Features diff --git a/dev-python/devtools/metadata.xml b/dev-python/devtools/metadata.xml index 9b090178b9..9347cb29d7 100644 --- a/dev-python/devtools/metadata.xml +++ b/dev-python/devtools/metadata.xml @@ -2,10 +2,7 @@ - - andrewammerlaan@gentoo.org - Andrew Ammerlaan - + samuelcolvin/python-devtools devtools diff --git a/dev-python/hstspreload/metadata.xml b/dev-python/hstspreload/metadata.xml index 797579c7fb..8cdc30f212 100644 --- a/dev-python/hstspreload/metadata.xml +++ b/dev-python/hstspreload/metadata.xml @@ -2,10 +2,7 @@ - - andrewammerlaan@gentoo.org - Andrew Ammerlaan - + The package provides a single function: in_hsts_preload() which takes an IDNA-encoded host and returns either True or False regarding whether that host should be only accessed via HTTPS. diff --git a/dev-python/jupyter-sphinx/metadata.xml b/dev-python/jupyter-sphinx/metadata.xml index 9bf31b63f5..a0a60d7147 100644 --- a/dev-python/jupyter-sphinx/metadata.xml +++ b/dev-python/jupyter-sphinx/metadata.xml @@ -2,8 +2,5 @@ - - andrewammerlaan@gentoo.org - Andrew Ammerlaan - + diff --git a/dev-python/markdown-include/metadata.xml b/dev-python/markdown-include/metadata.xml index 44fe10d521..a91e226f45 100644 --- a/dev-python/markdown-include/metadata.xml +++ b/dev-python/markdown-include/metadata.xml @@ -2,10 +2,7 @@ - - andrewammerlaan@gentoo.org - Andrew Ammerlaan - + cmacmackin/markdown-include markdown-include diff --git a/dev-python/mkdocs-exclude/metadata.xml b/dev-python/mkdocs-exclude/metadata.xml index 518928e14a..90c776dfdc 100644 --- a/dev-python/mkdocs-exclude/metadata.xml +++ b/dev-python/mkdocs-exclude/metadata.xml @@ -2,10 +2,7 @@ - - andrewammerlaan@gentoo.org - Andrew Ammerlaan - + apenwarr/mkdocs-exclude mkdocs-exclude diff --git a/dev-python/outcome/metadata.xml b/dev-python/outcome/metadata.xml index d06907f9b7..305743aab4 100644 --- a/dev-python/outcome/metadata.xml +++ b/dev-python/outcome/metadata.xml @@ -2,10 +2,7 @@ - - andrewammerlaan@gentoo.org - Andrew Ammerlaan - + python-trio/outcome outcome diff --git a/dev-python/pygsl/metadata.xml b/dev-python/pygsl/metadata.xml index 07ec539e17..dd07b6e902 100644 --- a/dev-python/pygsl/metadata.xml +++ b/dev-python/pygsl/metadata.xml @@ -2,10 +2,7 @@ - - andrewammerlaan@gentoo.org - Andrew Ammerlaan - + pygsl diff --git a/dev-python/pytest-isort/metadata.xml b/dev-python/pytest-isort/metadata.xml index 61f2519b1b..23b46bec7f 100644 --- a/dev-python/pytest-isort/metadata.xml +++ b/dev-python/pytest-isort/metadata.xml @@ -2,10 +2,7 @@ - - andrewammerlaan@gentoo.org - Andrew Ammerlaan - + moccu/pytest-isort pytest-isort diff --git a/dev-python/pytest-marks/metadata.xml b/dev-python/pytest-marks/metadata.xml index 651e2156c2..a0a60d7147 100644 --- a/dev-python/pytest-marks/metadata.xml +++ b/dev-python/pytest-marks/metadata.xml @@ -2,8 +2,5 @@ - - andrewammerlaan@gentoo.org - Andrew Ammerlaan - + diff --git a/dev-python/pytest-toolbox/metadata.xml b/dev-python/pytest-toolbox/metadata.xml index 21a336f18c..9b624d7955 100644 --- a/dev-python/pytest-toolbox/metadata.xml +++ b/dev-python/pytest-toolbox/metadata.xml @@ -2,10 +2,7 @@ - - andrewammerlaan@gentoo.org - Andrew Ammerlaan - + samuelcolvin/pytest-toolbox pytest-toolbox diff --git a/dev-python/sphinxcontrib-trio/metadata.xml b/dev-python/sphinxcontrib-trio/metadata.xml index d5051d7905..7477cd58a8 100644 --- a/dev-python/sphinxcontrib-trio/metadata.xml +++ b/dev-python/sphinxcontrib-trio/metadata.xml @@ -2,10 +2,7 @@ - - andrewammerlaan@gentoo.org - Andrew Ammerlaan - + This sphinx extension helps you document Python code that uses async/await, or abstract methods, or context managers, or generators, or … you get the idea. It works by making sphinx’s regular directives for documenting Python functions and methods smarter and more powerful. The name is because it was originally written for the Trio project, and I’m not very creative. But don’t be put off – there’s nothing Trio- or async-specific about this extension; any Python project can benefit. (Though projects using async/await probably benefit the most, since sphinx’s built-in tools are especially inadequate in this case.) diff --git a/dev-python/spotipy/metadata.xml b/dev-python/spotipy/metadata.xml index 651e2156c2..a0a60d7147 100644 --- a/dev-python/spotipy/metadata.xml +++ b/dev-python/spotipy/metadata.xml @@ -2,8 +2,5 @@ - - andrewammerlaan@gentoo.org - Andrew Ammerlaan - + diff --git a/dev-python/trio/metadata.xml b/dev-python/trio/metadata.xml index d086a391f2..dcb4e4c82b 100644 --- a/dev-python/trio/metadata.xml +++ b/dev-python/trio/metadata.xml @@ -2,10 +2,7 @@ - - andrewammerlaan@gentoo.org - Andrew Ammerlaan - + The Trio project's goal is to produce a production-quality, permissively licensed, async/await-native I/O library for Python. Like all async libraries, its main purpose is to help you write programs that do multiple things at the same time with parallelized I/O. A web spider that wants to fetch lots of pages in parallel, a web server that needs to juggle lots of downloads and websocket connections at the same time, a process supervisor monitoring multiple subprocesses... that sort of thing. Compared to other libraries, Trio attempts to distinguish itself with an obsessive focus on usability and correctness. Concurrency is complicated; we try to make it easy to get things right. diff --git a/dev-python/watchgod/metadata.xml b/dev-python/watchgod/metadata.xml index 4fff6b4487..b3c3bc1a0f 100644 --- a/dev-python/watchgod/metadata.xml +++ b/dev-python/watchgod/metadata.xml @@ -2,10 +2,7 @@ - - andrewammerlaan@gentoo.org - Andrew Ammerlaan - + samuelcolvin/watchgod watchgod diff --git a/games-action/ATLauncher/metadata.xml b/games-action/ATLauncher/metadata.xml index 2878794054..7a38bb9009 100644 --- a/games-action/ATLauncher/metadata.xml +++ b/games-action/ATLauncher/metadata.xml @@ -1,8 +1,5 @@ - - andrewammerlaan@gentoo.org - Andrew Ammerlaan - + diff --git a/games-action/technic-launcher/metadata.xml b/games-action/technic-launcher/metadata.xml index 2878794054..7a38bb9009 100644 --- a/games-action/technic-launcher/metadata.xml +++ b/games-action/technic-launcher/metadata.xml @@ -1,8 +1,5 @@ - - andrewammerlaan@gentoo.org - Andrew Ammerlaan - + diff --git a/games-util/NotEnoughProduction/metadata.xml b/games-util/NotEnoughProduction/metadata.xml index 2878794054..7a38bb9009 100644 --- a/games-util/NotEnoughProduction/metadata.xml +++ b/games-util/NotEnoughProduction/metadata.xml @@ -1,8 +1,5 @@ - - andrewammerlaan@gentoo.org - Andrew Ammerlaan - + diff --git a/kde-misc/skanpage/metadata.xml b/kde-misc/skanpage/metadata.xml index 2878794054..7a38bb9009 100644 --- a/kde-misc/skanpage/metadata.xml +++ b/kde-misc/skanpage/metadata.xml @@ -1,8 +1,5 @@ - - andrewammerlaan@gentoo.org - Andrew Ammerlaan - + diff --git a/media-libs/sonic/sonic-0.3.0_pre20210316.ebuild b/media-libs/sonic/sonic-0.3.0_pre20210316.ebuild index 3c60fa2f36..c8c89d5638 100644 --- a/media-libs/sonic/sonic-0.3.0_pre20210316.ebuild +++ b/media-libs/sonic/sonic-0.3.0_pre20210316.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit multilib +inherit multilib toolchain-funcs COMMIT="ba331411f17702e01f6c2d7016eefebaa695871f" DESCRIPTION="Simple library to speed up or slow down speech" @@ -24,6 +24,8 @@ src_prepare() { default sed "s|/lib|/$(get_libdir)|" -i Makefile || die sed "/install libsonic.a/d" -i Makefile || die + sed "s/CC=gcc/CC=$(tc-getCC)/" -i Makefile || die + export AR="$(tc-getAR)" } src_install() { diff --git a/media-video/syncplay/files/syncplay-change-alignment-operator.patch b/media-video/syncplay/files/syncplay-change-alignment-operator.patch index bccdeeae48..80a6392fed 100644 --- a/media-video/syncplay/files/syncplay-change-alignment-operator.patch +++ b/media-video/syncplay/files/syncplay-change-alignment-operator.patch @@ -1,12 +1,3 @@ -From 61584550ca734d2f3fa3b811d73f2cebd2b7f30f Mon Sep 17 00:00:00 2001 -From: Andrew Ammerlaan -Date: Thu, 8 Oct 2020 08:37:58 +0200 -Subject: [PATCH] replace & with | in Alignment, visually identical - ---- - syncplay/ui/GuiConfiguration.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - diff --git a/syncplay/ui/GuiConfiguration.py b/syncplay/ui/GuiConfiguration.py index 96915814..e0713adf 100755 --- a/syncplay/ui/GuiConfiguration.py diff --git a/media-video/syncplay/files/syncplay-make-qpixmap-to-qicon-conversion-explicit.patch b/media-video/syncplay/files/syncplay-make-qpixmap-to-qicon-conversion-explicit.patch index 8302399240..b922f71ba3 100644 --- a/media-video/syncplay/files/syncplay-make-qpixmap-to-qicon-conversion-explicit.patch +++ b/media-video/syncplay/files/syncplay-make-qpixmap-to-qicon-conversion-explicit.patch @@ -1,12 +1,3 @@ -From b0e018d0cda148ef8dba07857fcbe8d751800992 Mon Sep 17 00:00:00 2001 -From: Andrew Ammerlaan -Date: Thu, 8 Oct 2020 08:47:44 +0200 -Subject: [PATCH] make conversion from QPixmap to QIcon explicit - ---- - syncplay/ui/gui.py | 106 ++++++++++++++++++++++----------------------- - 1 file changed, 53 insertions(+), 53 deletions(-) - diff --git a/syncplay/ui/gui.py b/syncplay/ui/gui.py index c59c5697..2a4bd1a5 100755 --- a/syncplay/ui/gui.py diff --git a/media-video/syncplay/files/syncplay-make-qpixmap-to-qicon-conversion-explicit2.patch b/media-video/syncplay/files/syncplay-make-qpixmap-to-qicon-conversion-explicit2.patch index 5618950691..70843d7752 100644 --- a/media-video/syncplay/files/syncplay-make-qpixmap-to-qicon-conversion-explicit2.patch +++ b/media-video/syncplay/files/syncplay-make-qpixmap-to-qicon-conversion-explicit2.patch @@ -1,12 +1,3 @@ -From b0e018d0cda148ef8dba07857fcbe8d751800992 Mon Sep 17 00:00:00 2001 -From: Andrew Ammerlaan -Date: Thu, 8 Oct 2020 08:47:44 +0200 -Subject: [PATCH] make conversion from QPixmap to QIcon explicit - ---- - syncplay/ui/gui.py | 106 ++++++++++++++++++++++----------------------- - 1 file changed, 53 insertions(+), 53 deletions(-) - diff --git a/syncplay/ui/gui.py b/syncplay/ui/gui.py index c59c5697..2a4bd1a5 100755 --- a/syncplay/ui/gui.py diff --git a/media-video/syncplay/files/syncplay-use-lambda-to-connect-behind-wrapper.patch b/media-video/syncplay/files/syncplay-use-lambda-to-connect-behind-wrapper.patch index a88da5e009..bb70fb8887 100644 --- a/media-video/syncplay/files/syncplay-use-lambda-to-connect-behind-wrapper.patch +++ b/media-video/syncplay/files/syncplay-use-lambda-to-connect-behind-wrapper.patch @@ -1,13 +1,3 @@ -From f880d4773238a31ac7046ff290910a4ff4920d53 Mon Sep 17 00:00:00 2001 -From: Andrew Ammerlaan -Date: Thu, 8 Oct 2020 11:41:41 +0200 -Subject: [PATCH] use lambda when connect() to function with @wrapper - ---- - syncplay/ui/GuiConfiguration.py | 2 +- - syncplay/ui/gui.py | 40 ++++++++++++++++----------------- - 2 files changed, 21 insertions(+), 21 deletions(-) - diff --git a/syncplay/ui/GuiConfiguration.py b/syncplay/ui/GuiConfiguration.py index e0713adf..9ce6a429 100755 --- a/syncplay/ui/GuiConfiguration.py diff --git a/media-video/syncplay/metadata.xml b/media-video/syncplay/metadata.xml index 70e1a55fbd..870cfc18e2 100644 --- a/media-video/syncplay/metadata.xml +++ b/media-video/syncplay/metadata.xml @@ -2,10 +2,7 @@ - - andrewammerlaan@gentoo.org - Andrew Ammerlaan - + Install the Syncplay client Install the Syncplay server diff --git a/net-im/ruqola/metadata.xml b/net-im/ruqola/metadata.xml index cbf38d3d7b..9dfd313dfb 100644 --- a/net-im/ruqola/metadata.xml +++ b/net-im/ruqola/metadata.xml @@ -5,10 +5,7 @@ KDE/ruqola https://bugs.kde.org - - andrewammerlaan@gentoo.org - Andrew Ammerlaan - + Enable text-to-speech support diff --git a/net-im/whatsapp-for-linux/metadata.xml b/net-im/whatsapp-for-linux/metadata.xml index 2e14d68ad5..61f202539f 100644 --- a/net-im/whatsapp-for-linux/metadata.xml +++ b/net-im/whatsapp-for-linux/metadata.xml @@ -5,8 +5,5 @@ eneshecan/whatsapp-for-linux https://github.com/eneshecan/whatsapp-for-linux/issues - - andrewammerlaan@gentoo.org - Andrew Ammerlaan - + diff --git a/net-misc/lyrics-in-terminal/Manifest b/net-misc/lyrics-in-terminal/Manifest index b4e16f849a..ab33a28edf 100644 --- a/net-misc/lyrics-in-terminal/Manifest +++ b/net-misc/lyrics-in-terminal/Manifest @@ -1 +1 @@ -DIST lyrics-in-terminal-1.3.1.tar.gz 1664683 BLAKE2B 2d242eed832c06bd4884e87837084197cc0e20fa6e9a54d520243c41d0cea2b15c200d4dfedbaa55dd01019ef3e4200abb0d0140d5065c2c723d5acfdc57670d SHA512 927e86bdad9467a8bcb56c87ed3dbeca55a47ee20d1a4de698d2cd3615592f66623d37c0fab9408401dfd21bf39e7e8a5e3c873e990bcd1aa1c7b92277908258 +DIST lyrics-in-terminal-1.4.1.tar.gz 1666369 BLAKE2B cb3be32d834dac14a38f13694cc9efeb656cf8f223f661cf6ec774cb226e6453b27ec855de86d50cc4dfd7b5c803f3587761f9a427d1be56f9b9f1e145ae870d SHA512 e1cc80fb0d3f68962578a0cb0421759b7af70bdda2fa110f00521bde73c5b55d0652f003cd712e903a597ef65224d4cf8cb6953a832b041413c5c116e7be889d diff --git a/net-misc/lyrics-in-terminal/lyrics-in-terminal-1.3.1.ebuild b/net-misc/lyrics-in-terminal/lyrics-in-terminal-1.4.1.ebuild similarity index 76% rename from net-misc/lyrics-in-terminal/lyrics-in-terminal-1.3.1.ebuild rename to net-misc/lyrics-in-terminal/lyrics-in-terminal-1.4.1.ebuild index 0c077f6ff8..02334080e5 100644 --- a/net-misc/lyrics-in-terminal/lyrics-in-terminal-1.3.1.ebuild +++ b/net-misc/lyrics-in-terminal/lyrics-in-terminal-1.4.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{7..9} ) DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 @@ -14,6 +14,9 @@ SRC_URI="https://github.com/Jugran/lyrics-in-terminal/archive/${PV}.tar.gz -> ${ LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64" -RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]" +RDEPEND=" + dev-python/dbus-python[${PYTHON_USEDEP}] + sys-libs/ncurses +" diff --git a/net-misc/lyrics-in-terminal/metadata.xml b/net-misc/lyrics-in-terminal/metadata.xml index 651e2156c2..154fe34439 100644 --- a/net-misc/lyrics-in-terminal/metadata.xml +++ b/net-misc/lyrics-in-terminal/metadata.xml @@ -2,8 +2,11 @@ - - andrewammerlaan@gentoo.org - Andrew Ammerlaan - + + + Jugran/lyrics-in-terminal + lyrics-in-terminal + https://github.com/Jugran/lyrics-in-terminal/issues + + diff --git a/net-misc/megasync/files/megasync-4.5.0.0_ffmpeg.patch b/net-misc/megasync/files/megasync-4.5.0.0_ffmpeg.patch new file mode 100644 index 0000000000..a30d4a1eff --- /dev/null +++ b/net-misc/megasync/files/megasync-4.5.0.0_ffmpeg.patch @@ -0,0 +1,24 @@ +diff -Naur a/src/MEGASync/mega/src/gfx/freeimage.cpp b/src/MEGASync/mega/src/gfx/freeimage.cpp +--- a/src/MEGASync/mega/src/gfx/freeimage.cpp 2021-05-23 02:28:08.694081111 +0100 ++++ b/src/MEGASync/mega/src/gfx/freeimage.cpp 2021-05-23 02:29:56.189964969 +0100 +@@ -188,7 +188,7 @@ + + // Force seeking to key frames + formatContext->seek2any = false; +- videoStream->skip_to_keyframe = true; ++ //videoStream->skip_to_keyframe = true; + if (decoder->capabilities & CAP_TRUNCATED) + { + codecContext.flags |= CAP_TRUNCATED; +diff -Naur a/src/MEGASync/mega/src/gfx/qt.cpp b/src/MEGASync/mega/src/gfx/qt.cpp +--- a/src/MEGASync/mega/src/gfx/qt.cpp 2021-05-23 02:28:08.694081111 +0100 ++++ b/src/MEGASync/mega/src/gfx/qt.cpp 2021-05-23 02:29:36.172545153 +0100 +@@ -1209,7 +1209,7 @@ + + // Force seeking to key frames + formatContext->seek2any = false; +- videoStream->skip_to_keyframe = true; ++ //videoStream->skip_to_keyframe = true; + if (decoder->capabilities & CAP_TRUNCATED) + { + codecContext.flags |= CAP_TRUNCATED; diff --git a/net-misc/megasync/files/megasync-4.5.0.0_pdfium.patch b/net-misc/megasync/files/megasync-4.5.0.0_pdfium.patch new file mode 100644 index 0000000000..141ab30576 --- /dev/null +++ b/net-misc/megasync/files/megasync-4.5.0.0_pdfium.patch @@ -0,0 +1,16 @@ +diff --git a/bindings/qt/sdk.pri b/bindings/qt/sdk.pri +index 83ddc2e2f..46aa06d33 100644 +--- a/bindings/qt/sdk.pri ++++ b/bindings/qt/sdk.pri +@@ -255,6 +255,11 @@ CONFIG(USE_PDFIUM) { + DEFINES += HAVE_PDFIUM + LIBS += -lpdfium + } ++ else:exists(/usr/include/pdfium/fpdfview.h) { ++ DEFINES += HAVE_PDFIUM ++ INCLUDEPATH += /usr/include/pdfium ++ LIBS += -lpdfium ++ } + } + else {#win/mac + DEFINES += HAVE_PDFIUM diff --git a/net-misc/megasync/megasync-4.5.0.0.ebuild b/net-misc/megasync/megasync-4.5.0.0.ebuild index 604202807b..54c24108fe 100644 --- a/net-misc/megasync/megasync-4.5.0.0.ebuild +++ b/net-misc/megasync/megasync-4.5.0.0.ebuild @@ -14,14 +14,16 @@ HOMEPAGE=" if [[ ${PV} == 9999 ]];then inherit git-r3 EGIT_REPO_URI="https://github.com/meganz/MEGAsync" + EGIT_BRANCH="master" + EGIT_SUBMODULES=( '*' ) else - MEGA_SDK_REV="37b346c2e119559e40c08f43e1a8f54353e7ad59" # commit of src/MEGASync/mega submodule + MEGA_SDK_REV="c11a688d578e16dc25d4c94fee7995730be1aa50" # commit of src/MEGASync/mega submodule SRC_URI=" https://github.com/meganz/MEGAsync/archive/v${PV}_Win.tar.gz -> ${P}.tar.gz https://github.com/meganz/sdk/archive/${MEGA_SDK_REV}.tar.gz -> ${PN}-sdk-${PV}.tar.gz " KEYWORDS="~amd64 ~x86" - # 4.3.8.0 has no dedicated linux tag + # 4.5.0.0 has no dedicated linux tag S="${WORKDIR}"/MEGAsync-${PV}_Win fi @@ -76,6 +78,14 @@ src_prepare() { rmdir src/MEGASync/mega mv "${WORKDIR}"/sdk-${MEGA_SDK_REV} src/MEGASync/mega fi + if [ -e "${FILESDIR}/${P}_pdfium.patch" ]; then + cd "${S}/src/MEGASync/mega" + eapply -Np1 "${FILESDIR}/${P}_pdfium.patch" + cd "${S}" + fi + if has_version ">=media-video/ffmpeg-4.4" && [ -e "${FILESDIR}/${P}_ffmpeg.patch" ]; then + eapply "${FILESDIR}/${P}_ffmpeg.patch" + fi if use dolphin; then # use the kde5 CMakeLists instead of the kde 4 version mv src/MEGAShellExtDolphin/CMakeLists_kde5.txt src/MEGAShellExtDolphin/CMakeLists.txt || die @@ -83,12 +93,12 @@ src_prepare() { else default fi - cd src/MEGASync/mega + cd "${S}/src/MEGASync/mega" eautoreconf } src_configure() { - cd src/MEGASync/mega + cd "${S}/src/MEGASync/mega" econf \ "--disable-silent-rules" \ "--disable-curl-checks" \ @@ -109,7 +119,7 @@ src_configure() { $(use_enable python) \ "--enable-chat" \ "--enable-gcc-hardening" - cd ../.. + cd "${S}/src" local myeqmakeargs=( MEGA.pro diff --git a/net-misc/megasync/megasync-9999.ebuild b/net-misc/megasync/megasync-9999.ebuild index 5447073f4b..54c24108fe 100644 --- a/net-misc/megasync/megasync-9999.ebuild +++ b/net-misc/megasync/megasync-9999.ebuild @@ -14,14 +14,17 @@ HOMEPAGE=" if [[ ${PV} == 9999 ]];then inherit git-r3 EGIT_REPO_URI="https://github.com/meganz/MEGAsync" + EGIT_BRANCH="master" + EGIT_SUBMODULES=( '*' ) else - MEGA_SDK_REV="ba4834cb6c22f4e996f328db3aa5b82ef20eed3e" # commit of src/MEGASync/mega submodule + MEGA_SDK_REV="c11a688d578e16dc25d4c94fee7995730be1aa50" # commit of src/MEGASync/mega submodule SRC_URI=" - https://github.com/meganz/MEGAsync/archive/v${PV}.0_Linux.tar.gz -> ${P}.tar.gz + https://github.com/meganz/MEGAsync/archive/v${PV}_Win.tar.gz -> ${P}.tar.gz https://github.com/meganz/sdk/archive/${MEGA_SDK_REV}.tar.gz -> ${PN}-sdk-${PV}.tar.gz " KEYWORDS="~amd64 ~x86" - S="${WORKDIR}"/MEGAsync-${PV}.0_Linux + # 4.5.0.0 has no dedicated linux tag + S="${WORKDIR}"/MEGAsync-${PV}_Win fi LICENSE="MEGA" @@ -62,25 +65,40 @@ DEPEND=" dev-qt/qtx11extras:5 " BDEPEND=" - app-doc/doxygen dev-lang/swig dev-qt/linguist-tools " DOCS=( CREDITS.md README.md ) +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 - default - cd src/MEGASync/mega + if [ -e "${FILESDIR}/${P}_pdfium.patch" ]; then + cd "${S}/src/MEGASync/mega" + eapply -Np1 "${FILESDIR}/${P}_pdfium.patch" + cd "${S}" + fi + if has_version ">=media-video/ffmpeg-4.4" && [ -e "${FILESDIR}/${P}_ffmpeg.patch" ]; then + eapply "${FILESDIR}/${P}_ffmpeg.patch" + fi + if use dolphin; then + # use the kde5 CMakeLists instead of the kde 4 version + mv src/MEGAShellExtDolphin/CMakeLists_kde5.txt src/MEGAShellExtDolphin/CMakeLists.txt || die + cmake_src_prepare + else + default + fi + cd "${S}/src/MEGASync/mega" eautoreconf } src_configure() { - cd src/MEGASync/mega + cd "${S}/src/MEGASync/mega" econf \ "--disable-silent-rules" \ "--disable-curl-checks" \ @@ -101,7 +119,7 @@ src_configure() { $(use_enable python) \ "--enable-chat" \ "--enable-gcc-hardening" - cd ../.. + cd "${S}/src" local myeqmakeargs=( MEGA.pro