commit: 1b899f379ae37c7c3fb5332330c8c5e424ac7b81 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Aug 24 00:08:14 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Aug 24 00:08:30 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b899f37
net-p2p/qbittorrent: add 4.4.4, update live Live now has test support. Signed-off-by: Sam James <sam <AT> gentoo.org> net-p2p/qbittorrent/Manifest | 1 + ...orrent-9999.ebuild => qbittorrent-4.4.4.ebuild} | 13 ++++----- net-p2p/qbittorrent/qbittorrent-9999.ebuild | 31 +++++++++++++++------- 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest index 18ec07aba2de..410142c615b4 100644 --- a/net-p2p/qbittorrent/Manifest +++ b/net-p2p/qbittorrent/Manifest @@ -1,2 +1,3 @@ DIST qbittorrent-4.3.9.tar.gz 8510414 BLAKE2B de98aff6d81f43c3ad87f6c5f800a4488e18173fb96713d0a2420cf4d4708c9b1f2f54c8d0aa566e7738b4f94d192aad9f0196a05d43724582ef81833901727f SHA512 ec33f67895fbf47acc2f79d9c9e16db8b96c756cf493b76eb24b90e13a790a709104ea9aa378ee111d8c38b605bed5192b366d1917bbf160b21aa2ae3aacd2d1 DIST qbittorrent-4.4.3.1.tar.gz 7736308 BLAKE2B 9177f0c629418a5f9e7f117b7d1f990181ef910193fed9763f2137cbc91c9de07ad96884d57e96782b5a2f6089fe73d3fab0a2f2f54f72dd8c2cec00dd179e5f SHA512 e3d63c4090e27387f4a5524d0daab26eab70f70ef81ad607e9661e128ccccbf33f2d240cd219bbb1fb138d6e78493ce73055d5128bf888e0ad3949922774efba +DIST qbittorrent-4.4.4.tar.gz 7738480 BLAKE2B 2a3157a732fda6eaff809d3ea717ebcc2cb7f4364cc3209bd1836196541e83cf8c7430b32037a6a6c4f517d17edb576dd80c834185d7cb764567bd5ce699bd52 SHA512 3bd26021f45287ff5b6c9a1629ff470204121c4056d452a5c00bc94b69a198093127916d33797b357eaacdb9ffd01d0de13daecb7503088cde440d5e4895ec3e diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-4.4.4.ebuild similarity index 87% copy from net-p2p/qbittorrent/qbittorrent-9999.ebuild copy to net-p2p/qbittorrent/qbittorrent-4.4.4.ebuild index 2fb87e1afc1c..15b1ff95a991 100644 --- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild +++ b/net-p2p/qbittorrent/qbittorrent-4.4.4.ebuild @@ -6,16 +6,15 @@ EAPI=8 inherit cmake multibuild systemd xdg DESCRIPTION="BitTorrent client in C++ and Qt" -HOMEPAGE="https://www.qbittorrent.org - https://github.com/qbittorrent"; +HOMEPAGE="https://www.qbittorrent.org"; if [[ ${PV} == *9999 ]]; then + EGIT_REPO_URI="https://github.com/qbittorrent/qBittorrent.git"; inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"; else SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" - S="${WORKDIR}/qBittorrent-release-${PV}" + S="${WORKDIR}"/qBittorrent-release-${PV} fi LICENSE="GPL-2" @@ -26,13 +25,13 @@ REQUIRED_USE="dbus? ( gui ) RDEPEND=" >=dev-libs/boost-1.65.0-r1:= - dev-libs/openssl:= + >=dev-libs/openssl-1.1.1:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtxml:5 >=net-libs/libtorrent-rasterbar-1.2.14:= - sys-libs/zlib + >=sys-libs/zlib-1.2.11 dbus? ( dev-qt/qtdbus:5 ) gui? ( dev-libs/geoip @@ -78,6 +77,8 @@ src_configure() { if [[ ${MULTIBUILD_VARIANT} == webui ]] ; then mycmakeargs+=( + # Need to specify GUI here to allow webui settings + # to appear in the GUI. bug #864731. -DGUI=$(usex gui) -DWEBUI=ON ) diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild index 2fb87e1afc1c..aa762be794a3 100644 --- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild +++ b/net-p2p/qbittorrent/qbittorrent-9999.ebuild @@ -6,33 +6,33 @@ EAPI=8 inherit cmake multibuild systemd xdg DESCRIPTION="BitTorrent client in C++ and Qt" -HOMEPAGE="https://www.qbittorrent.org - https://github.com/qbittorrent"; +HOMEPAGE="https://www.qbittorrent.org"; if [[ ${PV} == *9999 ]]; then + EGIT_REPO_URI="https://github.com/qbittorrent/qBittorrent.git"; inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"; else SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" - S="${WORKDIR}/qBittorrent-release-${PV}" + S="${WORKDIR}"/qBittorrent-release-${PV} fi LICENSE="GPL-2" SLOT="0" -IUSE="+dbus +gui webui" +IUSE="+dbus +gui test webui" +RESTRICT="!test? ( test )" REQUIRED_USE="dbus? ( gui ) || ( gui webui )" RDEPEND=" - >=dev-libs/boost-1.65.0-r1:= - dev-libs/openssl:= + >=dev-libs/boost-1.71:= + >=dev-libs/openssl-1.1.1:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtxml:5 >=net-libs/libtorrent-rasterbar-1.2.14:= - sys-libs/zlib + >=sys-libs/zlib-1.2.11 dbus? ( dev-qt/qtdbus:5 ) gui? ( dev-libs/geoip @@ -44,7 +44,7 @@ DEPEND="${RDEPEND}" BDEPEND="dev-qt/linguist-tools:5 virtual/pkgconfig" -DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO ) +DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md ) src_prepare() { MULTIBUILD_VARIANTS=( base ) @@ -74,10 +74,14 @@ src_configure() { # We do these in multibuild, see bug #839531 for why. # Fedora has to do the same thing. -DGUI=$(usex gui) + + -DTESTING=$(usex test) ) if [[ ${MULTIBUILD_VARIANT} == webui ]] ; then mycmakeargs+=( + # Need to specify GUI here to allow webui settings + # to appear in the GUI. bug #864731. -DGUI=$(usex gui) -DWEBUI=ON ) @@ -95,6 +99,15 @@ src_compile() { multibuild_foreach_variant cmake_src_compile } +src_test() { + qbittorrent_run_tests() { + cd "${BUILD_DIR}"/test || die + ctest . || die + } + + multibuild_foreach_variant qbittorrent_run_tests +} + src_install() { multibuild_foreach_variant cmake_src_install
