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 0245A1581E7 for ; Sun, 28 Apr 2024 13:16:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 026E3E2A26; Sun, 28 Apr 2024 13:16:04 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D9E8BE2A26 for ; Sun, 28 Apr 2024 13:16:03 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BAD15340813 for ; Sun, 28 Apr 2024 13:16:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E981F15EC for ; Sun, 28 Apr 2024 13:16:00 +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: <1714309651.7b3db06ab0bbc0e3ab97ada6c5b1d7398ca8a50a.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/snapd-glib/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/snapd-glib/snapd-glib-1.65-r1.ebuild sys-libs/snapd-glib/snapd-glib-1.65-r102.ebuild sys-libs/snapd-glib/snapd-glib-1.65-r2.ebuild X-VCS-Directories: sys-libs/snapd-glib/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 7b3db06ab0bbc0e3ab97ada6c5b1d7398ca8a50a X-VCS-Branch: master Date: Sun, 28 Apr 2024 13:16:00 +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: 3f4f9ad9-efc1-479d-94e5-782a4abf35aa X-Archives-Hash: b10eaa8d5a77d6edeef97633376f4220 commit: 7b3db06ab0bbc0e3ab97ada6c5b1d7398ca8a50a Author: Andrew Ammerlaan gentoo org> AuthorDate: Sun Apr 28 13:07:31 2024 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Sun Apr 28 13:07:31 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b3db06a sys-libs/snapd-glib: split 1.65 into qt5 and qt6 revision See-also: https://github.com/gentoo/kde/pull/991 Signed-off-by: Andrew Ammerlaan gentoo.org> ...-1.65-r1.ebuild => snapd-glib-1.65-r102.ebuild} | 30 +++------------------- ...ib-1.65-r1.ebuild => snapd-glib-1.65-r2.ebuild} | 28 +++----------------- 2 files changed, 8 insertions(+), 50 deletions(-) diff --git a/sys-libs/snapd-glib/snapd-glib-1.65-r1.ebuild b/sys-libs/snapd-glib/snapd-glib-1.65-r102.ebuild similarity index 74% copy from sys-libs/snapd-glib/snapd-glib-1.65-r1.ebuild copy to sys-libs/snapd-glib/snapd-glib-1.65-r102.ebuild index 558bca6c7442..4a9410b58007 100644 --- a/sys-libs/snapd-glib/snapd-glib-1.65-r1.ebuild +++ b/sys-libs/snapd-glib/snapd-glib-1.65-r102.ebuild @@ -13,16 +13,15 @@ LICENSE="LGPL-3" SLOT="0/1" KEYWORDS="~amd64" -IUSE="doc introspection qml qt5 qt6 vala" +IUSE="doc introspection qml qt6 vala" REQUIRED_USE=" - qml? ( || ( qt5 qt6 ) ) + qml? ( qt6 ) vala? ( introspection ) " BDEPEND=" virtual/pkgconfig sys-devel/gettext - qt5? ( dev-qt/linguist-tools:5 ) qt6? ( dev-qt/qttools:6[linguist] ) " @@ -34,14 +33,8 @@ DEPEND=" doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection ) qml? ( - qt5? ( dev-qt/qtdeclarative:5 ) qt6? ( dev-qt/qtdeclarative:6 ) ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - ) qt6? ( dev-qt/qtbase:6[network,widgets] ) @@ -66,26 +59,11 @@ src_configure() { "$(meson_use doc docs)" "$(meson_use introspection)" "$(meson_use qml qml-bindings)" + "$(meson_use qt6)" "$(meson_use vala vala-bindings)" -Dsoup2=false + -Dqt5=false ) - if use qt5; then - emesonargs+=( - -Dqt5=true - -Dqt6=false - ) - elif use qt6; then - emesonargs+=( - -Dqt5=false - -Dqt6=true - ) - else - emesonargs+=( - -Dqt5=false - -Dqt6=false - ) - fi - meson_src_configure } diff --git a/sys-libs/snapd-glib/snapd-glib-1.65-r1.ebuild b/sys-libs/snapd-glib/snapd-glib-1.65-r2.ebuild similarity index 75% rename from sys-libs/snapd-glib/snapd-glib-1.65-r1.ebuild rename to sys-libs/snapd-glib/snapd-glib-1.65-r2.ebuild index 558bca6c7442..be44bfbc7a6a 100644 --- a/sys-libs/snapd-glib/snapd-glib-1.65-r1.ebuild +++ b/sys-libs/snapd-glib/snapd-glib-1.65-r2.ebuild @@ -13,9 +13,9 @@ LICENSE="LGPL-3" SLOT="0/1" KEYWORDS="~amd64" -IUSE="doc introspection qml qt5 qt6 vala" +IUSE="doc introspection qml qt5 vala" REQUIRED_USE=" - qml? ( || ( qt5 qt6 ) ) + qml? ( qt5 ) vala? ( introspection ) " @@ -23,7 +23,6 @@ BDEPEND=" virtual/pkgconfig sys-devel/gettext qt5? ( dev-qt/linguist-tools:5 ) - qt6? ( dev-qt/qttools:6[linguist] ) " DEPEND=" @@ -35,16 +34,12 @@ DEPEND=" introspection? ( dev-libs/gobject-introspection ) qml? ( qt5? ( dev-qt/qtdeclarative:5 ) - qt6? ( dev-qt/qtdeclarative:6 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) - qt6? ( - dev-qt/qtbase:6[network,widgets] - ) vala? ( $(vala_depend) ) " @@ -66,26 +61,11 @@ src_configure() { "$(meson_use doc docs)" "$(meson_use introspection)" "$(meson_use qml qml-bindings)" + "$(meson_use qt5)" "$(meson_use vala vala-bindings)" -Dsoup2=false + -Dqt6=false ) - if use qt5; then - emesonargs+=( - -Dqt5=true - -Dqt6=false - ) - elif use qt6; then - emesonargs+=( - -Dqt5=false - -Dqt6=true - ) - else - emesonargs+=( - -Dqt5=false - -Dqt6=false - ) - fi - meson_src_configure }