commit: 17b1a1064a770fde8b4f8a8b9a9e9d57312268d1 Author: Theo Anderson <telans <AT> posteo <DOT> de> AuthorDate: Thu Dec 10 23:03:23 2020 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> CommitDate: Thu Dec 10 23:03:23 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=17b1a106
net-misc/megasync: fix 9999 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Theo Anderson <telans <AT> posteo.de> net-misc/megasync/megasync-4.3.7.ebuild | 11 ++++++----- net-misc/megasync/megasync-9999.ebuild | 9 +++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/net-misc/megasync/megasync-4.3.7.ebuild b/net-misc/megasync/megasync-4.3.7.ebuild index 390ce338..61ef362c 100644 --- a/net-misc/megasync/megasync-4.3.7.ebuild +++ b/net-misc/megasync/megasync-4.3.7.ebuild @@ -3,9 +3,7 @@ EAPI=7 -inherit autotools cmake desktop qmake-utils - -MEGA_SDK_REV="ba4834cb6c22f4e996f328db3aa5b82ef20eed3e" # commit of src/MEGASync/mega submodule +inherit autotools desktop qmake-utils xdg cmake DESCRIPTION="The official Qt-based program for syncing your MEGA account in your PC" HOMEPAGE="http://mega.co.nz"; @@ -14,6 +12,7 @@ if [[ ${PV} == 9999 ]];then inherit git-r3 EGIT_REPO_URI="https://github.com/meganz/MEGAsync"; else + MEGA_SDK_REV="ba4834cb6c22f4e996f328db3aa5b82ef20eed3e" # 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/sdk/archive/${MEGA_SDK_REV}.tar.gz -> ${PN}-sdk-${PV}.tar.gz @@ -71,8 +70,10 @@ BDEPEND=" DOCS=( CREDITS.md README.md ) src_prepare() { - rmdir src/MEGASync/mega - mv "${WORKDIR}"/sdk-${MEGA_SDK_REV} src/MEGASync/mega + if [[ ${PV} != 9999 ]]; then + rmdir src/MEGASync/mega + mv "${WORKDIR}"/sdk-${MEGA_SDK_REV} src/MEGASync/mega + fi default cd src/MEGASync/mega eautoreconf diff --git a/net-misc/megasync/megasync-9999.ebuild b/net-misc/megasync/megasync-9999.ebuild index 5a8311e0..61ef362c 100644 --- a/net-misc/megasync/megasync-9999.ebuild +++ b/net-misc/megasync/megasync-9999.ebuild @@ -5,8 +5,6 @@ EAPI=7 inherit autotools desktop qmake-utils xdg cmake -MEGA_SDK_REV="ba4834cb6c22f4e996f328db3aa5b82ef20eed3e" # commit of src/MEGASync/mega submodule - DESCRIPTION="The official Qt-based program for syncing your MEGA account in your PC" HOMEPAGE="http://mega.co.nz"; @@ -14,6 +12,7 @@ if [[ ${PV} == 9999 ]];then inherit git-r3 EGIT_REPO_URI="https://github.com/meganz/MEGAsync"; else + MEGA_SDK_REV="ba4834cb6c22f4e996f328db3aa5b82ef20eed3e" # 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/sdk/archive/${MEGA_SDK_REV}.tar.gz -> ${PN}-sdk-${PV}.tar.gz @@ -71,8 +70,10 @@ BDEPEND=" DOCS=( CREDITS.md README.md ) src_prepare() { - rmdir src/MEGASync/mega - mv "${WORKDIR}"/sdk-${MEGA_SDK_REV} src/MEGASync/mega + if [[ ${PV} != 9999 ]]; then + rmdir src/MEGASync/mega + mv "${WORKDIR}"/sdk-${MEGA_SDK_REV} src/MEGASync/mega + fi default cd src/MEGASync/mega eautoreconf
