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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1E506158020 for ; Sun, 18 Dec 2022 19:58:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 614C3E0858; Sun, 18 Dec 2022 19:58:10 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 44A48E0858 for ; Sun, 18 Dec 2022 19:58:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 834AE341476 for ; Sun, 18 Dec 2022 19:58:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1BD5A477 for ; Sun, 18 Dec 2022 19:58:08 +0000 (UTC) From: "Stephan Hartmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Stephan Hartmann" Message-ID: <1671393478.343bec8e7dce104835ef260287cf9f2abf323c20.sultan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/microsoft-edge-beta/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/microsoft-edge-beta/microsoft-edge-beta-108.0.1462.42-r1.ebuild www-client/microsoft-edge-beta/microsoft-edge-beta-108.0.1462.42.ebuild www-client/microsoft-edge-beta/microsoft-edge-beta-109.0.1518.14-r1.ebuild www-client/microsoft-edge-beta/microsoft-edge-beta-109.0.1518.14.ebuild www-client/microsoft-edge-beta/microsoft-edge-beta-109.0.1518.23-r1.ebuild www-client/microsoft-edge-beta/microsoft-edge-beta-109.0.1518.23.ebuild X-VCS-Directories: www-client/microsoft-edge-beta/ X-VCS-Committer: sultan X-VCS-Committer-Name: Stephan Hartmann X-VCS-Revision: 343bec8e7dce104835ef260287cf9f2abf323c20 X-VCS-Branch: master Date: Sun, 18 Dec 2022 19:58:08 +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: 1f776f4f-cf5b-450d-8f34-05f05cab4902 X-Archives-Hash: 0c770762ab6a76092f67626f5b3d0ba8 commit: 343bec8e7dce104835ef260287cf9f2abf323c20 Author: Stephan Hartmann gentoo org> AuthorDate: Sun Dec 18 19:57:33 2022 +0000 Commit: Stephan Hartmann gentoo org> CommitDate: Sun Dec 18 19:57:58 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=343bec8e www-client/microsoft-edge-beta: fix dependencies Closes: https://bugs.gentoo.org/880895 Signed-off-by: Stephan Hartmann gentoo.org> ...build => microsoft-edge-beta-108.0.1462.42-r1.ebuild} | 16 +++++++++++----- ...build => microsoft-edge-beta-109.0.1518.14-r1.ebuild} | 16 +++++++++++----- ...build => microsoft-edge-beta-109.0.1518.23-r1.ebuild} | 16 +++++++++++----- 3 files changed, 33 insertions(+), 15 deletions(-) diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-108.0.1462.42.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-108.0.1462.42-r1.ebuild similarity index 92% rename from www-client/microsoft-edge-beta/microsoft-edge-beta-108.0.1462.42.ebuild rename to www-client/microsoft-edge-beta/microsoft-edge-beta-108.0.1462.42-r1.ebuild index 873f8ce87360..9c041a631485 100644 --- a/www-client/microsoft-edge-beta/microsoft-edge-beta-108.0.1462.42.ebuild +++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-108.0.1462.42-r1.ebuild @@ -23,13 +23,10 @@ SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_ LICENSE="microsoft-edge" SLOT="0" RESTRICT="bindist mirror strip" -IUSE="+mip" +IUSE="+mip qt5" RDEPEND=" - || ( - >=app-accessibility/at-spi2-core-2.46.0:2 - ( app-accessibility/at-spi2-atk dev-libs/atk ) - ) + >=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 @@ -59,6 +56,11 @@ RDEPEND=" x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5[X] + dev-qt/qtwidgets:5 + ) " QA_PREBUILT="*" @@ -113,5 +115,9 @@ src_install() { rm "${EDGE_HOME}"/libmip_{core,protection_sdk}.so || die fi + if ! use qt5; then + rm "${EDGE_HOME}/libqt5_shim.so" || die + fi + pax-mark m "${EDGE_HOME}/msedge" } diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-109.0.1518.14.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-109.0.1518.14-r1.ebuild similarity index 92% rename from www-client/microsoft-edge-beta/microsoft-edge-beta-109.0.1518.14.ebuild rename to www-client/microsoft-edge-beta/microsoft-edge-beta-109.0.1518.14-r1.ebuild index 873f8ce87360..9c041a631485 100644 --- a/www-client/microsoft-edge-beta/microsoft-edge-beta-109.0.1518.14.ebuild +++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-109.0.1518.14-r1.ebuild @@ -23,13 +23,10 @@ SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_ LICENSE="microsoft-edge" SLOT="0" RESTRICT="bindist mirror strip" -IUSE="+mip" +IUSE="+mip qt5" RDEPEND=" - || ( - >=app-accessibility/at-spi2-core-2.46.0:2 - ( app-accessibility/at-spi2-atk dev-libs/atk ) - ) + >=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 @@ -59,6 +56,11 @@ RDEPEND=" x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5[X] + dev-qt/qtwidgets:5 + ) " QA_PREBUILT="*" @@ -113,5 +115,9 @@ src_install() { rm "${EDGE_HOME}"/libmip_{core,protection_sdk}.so || die fi + if ! use qt5; then + rm "${EDGE_HOME}/libqt5_shim.so" || die + fi + pax-mark m "${EDGE_HOME}/msedge" } diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-109.0.1518.23.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-109.0.1518.23-r1.ebuild similarity index 92% rename from www-client/microsoft-edge-beta/microsoft-edge-beta-109.0.1518.23.ebuild rename to www-client/microsoft-edge-beta/microsoft-edge-beta-109.0.1518.23-r1.ebuild index 873f8ce87360..9c041a631485 100644 --- a/www-client/microsoft-edge-beta/microsoft-edge-beta-109.0.1518.23.ebuild +++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-109.0.1518.23-r1.ebuild @@ -23,13 +23,10 @@ SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_ LICENSE="microsoft-edge" SLOT="0" RESTRICT="bindist mirror strip" -IUSE="+mip" +IUSE="+mip qt5" RDEPEND=" - || ( - >=app-accessibility/at-spi2-core-2.46.0:2 - ( app-accessibility/at-spi2-atk dev-libs/atk ) - ) + >=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 @@ -59,6 +56,11 @@ RDEPEND=" x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5[X] + dev-qt/qtwidgets:5 + ) " QA_PREBUILT="*" @@ -113,5 +115,9 @@ src_install() { rm "${EDGE_HOME}"/libmip_{core,protection_sdk}.so || die fi + if ! use qt5; then + rm "${EDGE_HOME}/libqt5_shim.so" || die + fi + pax-mark m "${EDGE_HOME}/msedge" }