From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D17FE1382C5 for ; Thu, 10 Dec 2020 23:03:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1F0DDE097C; Thu, 10 Dec 2020 23:03:42 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 05889E097C for ; Thu, 10 Dec 2020 23:03:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 83997340F0A for ; Thu, 10 Dec 2020 23:03:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0F3362CA for ; Thu, 10 Dec 2020 23:03:39 +0000 (UTC) From: "Theo Anderson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Theo Anderson" Message-ID: <1607641403.17b1a1064a770fde8b4f8a8b9a9e9d57312268d1.telans@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: net-misc/megasync/ X-VCS-Repository: repo/proj/guru X-VCS-Files: net-misc/megasync/megasync-4.3.7.ebuild net-misc/megasync/megasync-9999.ebuild X-VCS-Directories: net-misc/megasync/ X-VCS-Committer: telans X-VCS-Committer-Name: Theo Anderson X-VCS-Revision: 17b1a1064a770fde8b4f8a8b9a9e9d57312268d1 X-VCS-Branch: dev Date: Thu, 10 Dec 2020 23:03:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3048be5c-1ec5-4248-80ab-590bd8e83082 X-Archives-Hash: 2a5e0eb0657c893ac84b43c304731270 commit: 17b1a1064a770fde8b4f8a8b9a9e9d57312268d1 Author: Theo Anderson posteo de> AuthorDate: Thu Dec 10 23:03:23 2020 +0000 Commit: Theo Anderson posteo de> 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 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