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 70C7A158013 for ; Tue, 5 Dec 2023 21:50:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 989702BC016; Tue, 5 Dec 2023 21:50:05 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 921AD2BC016 for ; Tue, 5 Dec 2023 21:50:04 +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 BF9BD33FE2A for ; Tue, 5 Dec 2023 21:50:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1D6AEAF4 for ; Tue, 5 Dec 2023 21:50:01 +0000 (UTC) From: "Marc Schiffbauer" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marc Schiffbauer" Message-ID: <1701812992.e0fefc18cda5a16991bb80fbc62f6a84502fc778.mschiff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-backup/bareos/bareos-22.1.2-r1.ebuild app-backup/bareos/bareos-22.1.2.ebuild app-backup/bareos/bareos-9999.ebuild X-VCS-Directories: app-backup/bareos/ X-VCS-Committer: mschiff X-VCS-Committer-Name: Marc Schiffbauer X-VCS-Revision: e0fefc18cda5a16991bb80fbc62f6a84502fc778 X-VCS-Branch: master Date: Tue, 5 Dec 2023 21:50:01 +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: 5fe7fba0-d5b4-4c41-a0c7-bd9f515db410 X-Archives-Hash: 150a5c326d1909fce7270b91915efced commit: e0fefc18cda5a16991bb80fbc62f6a84502fc778 Author: Marc Schiffbauer gentoo org> AuthorDate: Tue Dec 5 21:49:16 2023 +0000 Commit: Marc Schiffbauer gentoo org> CommitDate: Tue Dec 5 21:49:52 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0fefc18 app-backup/bareos: add tray-monitor support Closes: https://bugs.gentoo.org/906016 Signed-off-by: Marc Schiffbauer gentoo.org> .../bareos/{bareos-22.1.2.ebuild => bareos-22.1.2-r1.ebuild} | 7 ++++++- app-backup/bareos/bareos-9999.ebuild | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app-backup/bareos/bareos-22.1.2.ebuild b/app-backup/bareos/bareos-22.1.2-r1.ebuild similarity index 99% rename from app-backup/bareos/bareos-22.1.2.ebuild rename to app-backup/bareos/bareos-22.1.2-r1.ebuild index e00ae9693bca..3ec758c53539 100644 --- a/app-backup/bareos/bareos-22.1.2.ebuild +++ b/app-backup/bareos/bareos-22.1.2-r1.ebuild @@ -5,7 +5,6 @@ EAPI=8 PYTHON_COMPAT=( python3_{9..12} ) CMAKE_WARN_UNUSED_CLI=no -#CMAKE_REMOVE_MODULES=yes inherit python-any-r1 systemd cmake tmpfiles @@ -72,6 +71,9 @@ DEPEND=" sys-libs/ncurses:= sys-libs/zlib ) + X? ( + dev-qt/qtwidgets:5= + ) " RDEPEND="${DEPEND} !clientonly? ( @@ -175,6 +177,9 @@ src_configure() { systemd lmdb; do mycmakeargs+=( -D$useflag=$(usex $useflag) ) done + if use X; then + mycmakeargs+=( -Dtraymonitor=yes ) + fi mycmakeargs+=( -DHAVE_PYTHON=0 diff --git a/app-backup/bareos/bareos-9999.ebuild b/app-backup/bareos/bareos-9999.ebuild index e00ae9693bca..3ec758c53539 100644 --- a/app-backup/bareos/bareos-9999.ebuild +++ b/app-backup/bareos/bareos-9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 PYTHON_COMPAT=( python3_{9..12} ) CMAKE_WARN_UNUSED_CLI=no -#CMAKE_REMOVE_MODULES=yes inherit python-any-r1 systemd cmake tmpfiles @@ -72,6 +71,9 @@ DEPEND=" sys-libs/ncurses:= sys-libs/zlib ) + X? ( + dev-qt/qtwidgets:5= + ) " RDEPEND="${DEPEND} !clientonly? ( @@ -175,6 +177,9 @@ src_configure() { systemd lmdb; do mycmakeargs+=( -D$useflag=$(usex $useflag) ) done + if use X; then + mycmakeargs+=( -Dtraymonitor=yes ) + fi mycmakeargs+=( -DHAVE_PYTHON=0