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 CDB941382C5 for ; Sun, 3 Jan 2021 13:58:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 099F3E086C; Sun, 3 Jan 2021 13:58:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 E5EACE086C for ; Sun, 3 Jan 2021 13:58:39 +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 195AF34104C for ; Sun, 3 Jan 2021 13:58:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 46225CC for ; Sun, 3 Jan 2021 13:58:37 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1609682282.9785f55f12125d23055c0e31cdcf2c0f03b53fc4.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: net-misc/megasync/ X-VCS-Repository: repo/proj/guru X-VCS-Files: net-misc/megasync/megasync-4.3.8.0.ebuild X-VCS-Directories: net-misc/megasync/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 9785f55f12125d23055c0e31cdcf2c0f03b53fc4 X-VCS-Branch: master Date: Sun, 3 Jan 2021 13:58:37 +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: 88afb678-bb7b-47d1-875f-cd5e14686d94 X-Archives-Hash: 6fe423dfda5dcea2c1e715e5111c42f7 commit: 9785f55f12125d23055c0e31cdcf2c0f03b53fc4 Author: Andrew Ammerlaan riseup net> AuthorDate: Sun Jan 3 13:58:02 2021 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Sun Jan 3 13:58:02 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9785f55f net-misc/megasync: fix unable to find cmakelists.txt - also fix dep on doxygen Closes: https://bugs.gentoo.org/763057 Bug: https://bugs.gentoo.org/763138 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan riseup.net> net-misc/megasync/megasync-4.3.8.0.ebuild | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net-misc/megasync/megasync-4.3.8.0.ebuild b/net-misc/megasync/megasync-4.3.8.0.ebuild index 3edb24ae..2a65f6c8 100644 --- a/net-misc/megasync/megasync-4.3.8.0.ebuild +++ b/net-misc/megasync/megasync-4.3.8.0.ebuild @@ -63,19 +63,22 @@ DEPEND=" dev-qt/qtsvg: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 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 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 B9C381382C5 for ; Sun, 3 Jan 2021 13:58:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 043ECE0869; Sun, 3 Jan 2021 13:58:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 E3E5FE0857 for ; Sun, 3 Jan 2021 13:58:32 +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 90DA934104C for ; Sun, 3 Jan 2021 13:58:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1F6EACC for ; Sun, 3 Jan 2021 13:58:30 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1609682282.9785f55f12125d23055c0e31cdcf2c0f03b53fc4.andrewammerlaan@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.8.0.ebuild X-VCS-Directories: net-misc/megasync/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 9785f55f12125d23055c0e31cdcf2c0f03b53fc4 X-VCS-Branch: dev Date: Sun, 3 Jan 2021 13:58:30 +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: 55a860bd-82bd-47fb-9653-3a74a1aac632 X-Archives-Hash: cfbc05a6c75d0750e871b96295e8f7b3 Message-ID: <20210103135830.9VMLxXJ-euGbxekLl9MrbYuv5wirIffGRIrn13bRWqI@z> commit: 9785f55f12125d23055c0e31cdcf2c0f03b53fc4 Author: Andrew Ammerlaan riseup net> AuthorDate: Sun Jan 3 13:58:02 2021 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Sun Jan 3 13:58:02 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9785f55f net-misc/megasync: fix unable to find cmakelists.txt - also fix dep on doxygen Closes: https://bugs.gentoo.org/763057 Bug: https://bugs.gentoo.org/763138 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan riseup.net> net-misc/megasync/megasync-4.3.8.0.ebuild | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net-misc/megasync/megasync-4.3.8.0.ebuild b/net-misc/megasync/megasync-4.3.8.0.ebuild index 3edb24ae..2a65f6c8 100644 --- a/net-misc/megasync/megasync-4.3.8.0.ebuild +++ b/net-misc/megasync/megasync-4.3.8.0.ebuild @@ -63,19 +63,22 @@ DEPEND=" dev-qt/qtsvg: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 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