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 0AC8215838C for ; Mon, 22 Jan 2024 05:55:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF420E2A12; Mon, 22 Jan 2024 05:55:49 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 B778EE2A12 for ; Mon, 22 Jan 2024 05:55:49 +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 70FA5343259 for ; Mon, 22 Jan 2024 05:55:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0C69F14C8 for ; Mon, 22 Jan 2024 05:55:46 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1705902892.fa18d029d4afcc2783dc67ca2c15896de81decf0.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/qbittorrent/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/qbittorrent/qbittorrent-9999.ebuild X-VCS-Directories: net-p2p/qbittorrent/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: fa18d029d4afcc2783dc67ca2c15896de81decf0 X-VCS-Branch: master Date: Mon, 22 Jan 2024 05:55:46 +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: 7bb33c7a-6b7d-40ff-8a18-e13eb7828a6e X-Archives-Hash: 0eb54ccee56a37ab69eb276c67d8b15d commit: fa18d029d4afcc2783dc67ca2c15896de81decf0 Author: Eli Schwartz gmail com> AuthorDate: Sun Jan 21 20:07:46 2024 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jan 22 05:54:52 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa18d029 net-p2p/qbittorrent: sync live Signed-off-by: Eli Schwartz gmail.com> Closes: https://github.com/gentoo/gentoo/pull/34949 Signed-off-by: Sam James gentoo.org> net-p2p/qbittorrent/qbittorrent-9999.ebuild | 41 +++++++++++++++-------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild index 3bb8284e631e..c52bd5d5331f 100644 --- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild +++ b/net-p2p/qbittorrent/qbittorrent-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake edo multibuild systemd xdg +inherit cmake edo multibuild systemd verify-sig xdg DESCRIPTION="BitTorrent client in C++ and Qt" HOMEPAGE="https://www.qbittorrent.org" @@ -12,14 +12,19 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/qbittorrent/qBittorrent.git" inherit git-r3 else - SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI=" + mirror://sourceforge/qbittorrent/${P}.tar.xz + verify-sig? ( mirror://sourceforge/qbittorrent/${P}.tar.xz.asc ) + " KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" - S="${WORKDIR}"/qBittorrent-release-${PV} + + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-qbittorrent )" + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qBittorrent.asc fi LICENSE="GPL-2" SLOT="0" -IUSE="+dbus +gui qt6 test webui systemd" +IUSE="+dbus +gui qt6 systemd test webui" RESTRICT="!test? ( test )" REQUIRED_USE="|| ( gui webui ) dbus? ( gui ) @@ -29,6 +34,13 @@ RDEPEND=" >=dev-libs/openssl-1.1.1:= >=net-libs/libtorrent-rasterbar-1.2.19:= >=sys-libs/zlib-1.2.11 + qt6? ( >=dev-qt/qtbase-6.2:6[network,ssl,sql,sqlite,xml] ) + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtsql:5[sqlite] + dev-qt/qtxml:5 + ) gui? ( !qt6? ( dev-qt/qtgui:5 @@ -37,17 +49,10 @@ RDEPEND=" dbus? ( dev-qt/qtdbus:5 ) ) qt6? ( - dev-qt/qtbase:6[dbus?,gui,widgets] - dev-qt/qtsvg:6 + >=dev-qt/qtbase-6.2:6[dbus?,gui,widgets] + >=dev-qt/qtsvg-6.2:6 ) ) - qt6? ( dev-qt/qtbase:6[network,ssl,sql,sqlite,xml(+)] ) - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5[sqlite] - dev-qt/qtxml:5 - ) webui? ( acct-group/qbittorrent acct-user/qbittorrent @@ -55,13 +60,13 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - dev-libs/boost + >=dev-libs/boost-1.71 test? ( !qt6? ( dev-qt/qttest:5 ) )" -BDEPEND=" +BDEPEND+=" !qt6? ( dev-qt/linguist-tools:5 ) - qt6? ( dev-qt/qttools:6[linguist] ) + qt6? ( >=dev-qt/qttools-6.2:6[linguist] ) virtual/pkgconfig" DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md ) @@ -79,14 +84,10 @@ src_configure() { local mycmakeargs=( # musl lacks execinfo.h -DSTACKTRACE=$(usex !elibc_musl) - # More verbose build logs are preferable for bug reports -DVERBOSE_CONFIGURE=ON - -DQT6=$(usex qt6) - -DWEBUI=$(usex webui) - -DTESTING=$(usex test) )