Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

net-p2p/qbittorrent: cleanups, version bump and adopt #34949

Closed
wants to merge 11 commits into from
Closed

net-p2p/qbittorrent: cleanups, version bump and adopt #34949

wants to merge 11 commits into from

Conversation

eli-schwartz
Copy link
Contributor

  • don't depend on acct-* when not building the webui
  • add verify-sig support, for the obvious reasons

@eli-schwartz
net-p2p/qbittorrent: drop old
3466223 
Un-stabilized versions superseded by .2 release

Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
@eli-schwartz
net-p2p/qbittorrent: drop acct-* dependencies to USE=webui
c31ceb4 
The relevant accounts are tied to use of qbittorrent-nox, the daemonized
system service with systemd/openrc service files that launch as the
created user accounts. It is totally unneeded by purely USE=gui users
(the default configuration) as that simply runs in the context of the
logged in desktop user.

While we are at it, ensure the openrc service files are only installed
for USE=webui as well. The service files attempt to run qbittorrent-nox,
and for that very reason the upstream systemd unit is only installed for
USE=webui. The openrc services stick out like a sore thumb.

Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
@gentoo-bot
Copy link

Pull Request assignment

Submitter: @eli-schwartz
Areas affected: ebuilds
Packages affected: net-p2p/qbittorrent, sec-keys/openpgp-keys-qbittorrent

net-p2p/qbittorrent: @gentoo/proxy-maint (maintainer needed)
sec-keys/openpgp-keys-qbittorrent: @gentoo/proxy-maint (new package)

Linked bugs

No bugs to link found. If your pull request references any of the Gentoo bug reports, please add appropriate GLEP 66 tags to the commit message and request reassignment.

In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of Conduct ● Copyright policy (expl.) ● Devmanual ● GitHub PRs ● Proxy-maint guide

@gentoo-bot gentoo-bot added maintainer-needed There is at least one affected package with no maintainer. Review it if you can. new package The PR is adding a new package. assigned PR successfully assigned to the package maintainer(s). no bug found No Bug/Closes found in the commits. labels Jan 21, 2024
@eli-schwartz
net-p2p/qbittorrent: add back required USE
7f61c55 
In commit 6b33e72, the statement
"enabling the dbus USE flag requires enabling the gui USE flag" was
dropped from the REQUIRED_USE variable, with the following reasoning:

> DBus support is only enabled when GUI is enabled.

This is semantically problematic because it means that portage *thinks*
USE="dbus -gui" produces a different binary than USE="-dbus -gui" even
though they are in reality the same.

On the flip side: unbinding these means that people who set USE="-gui"
will get a constraint violation until they also set -dbus, since it is
by default enabled. But "gui" is also default-enabled, so it just means
that users disabling one have to disable both at the same time.

Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
@eli-schwartz
net-p2p/qbittorrent: remove libiconv dependency
e5c0ed2 
It was silently removed from 4.6.x as part of a bump. It was *added*
long ago in commit 6b33e72 with the
informative and explanatory message:

> Add virtual/libiconv dep

I don't believe there's any valid justification for this. The
application makes heavy use of Qt, and that includes using Qt's string
translation features, which means it will use whatever Qt's APIs happen
to use internally. Nowhere in the source code is iconv mentioned at all.
If the virtual is needed then it is firmly in the realm of "citation
needed".

Remove it from 4.5 as well -- and the live ebuild.

Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
@eli-schwartz
net-p2p/qbittorrent: remove geoip dependency
bdbaecd 
It was silently removed from 4.6.x as part of a bump. Really, it could
be removed since a long time ago. Upstream dropped the use of a system
geoip database waaaaaaaaaaaaaaaay back when, in:

qbittorrent/qBittorrent@79976fb

It has been the case since 2015 and the 3.3.0 release, at least
(possibly longer but upstream has very odd git branch habits so it's
difficult to tell).

Ever since then the dependency has simply been dead weight.

Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
@eli-schwartz
net-p2p/qbittorrent: add comment explaining why cmake_src_test isn't …
490b186 
…used

Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
@eli-schwartz
net-p2p/qbittorrent: add myself as a maintainer
a2cf402 
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
@eli-schwartz
sec-keys/openpgp-keys-qbittorrent: new package, add 20161227
39081cf 
Used by net-p2p/qbittorrent; signing key has been nicely stable for 8
years now.

Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
@eli-schwartz
net-p2p/qbittorrent: add verify-sig support
089da69 
Upstream has signed the official tarballs for like a decade. The current
SRC_URI was using github autogenerated tarballs of unknown provenance
instead...

Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
@eli-schwartz
net-p2p/qbittorrent: add 4.6.3
f61b0c9 
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
@eli-schwartz
net-p2p/qbittorrent: sync live
e0aa863 
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2024-01-21 21:58 UTC
Newest commit scanned: 0204be0
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/fe2a469432/output.html

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2024-01-21 22:28 UTC
Newest commit scanned: e0aa863
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/d1491329d7/output.html

@thesamesam thesamesam mentioned this pull request Jan 22, 2024
Closed
@thesamesam
Copy link
Member

See also #34917.

thesamesam
thesamesam reviewed Jan 22, 2024
View reviewed changes
net-p2p/qbittorrent/qbittorrent-4.5.5-r2.ebuild
RESTRICT="!test? ( test )"
REQUIRED_USE="|| ( gui webui )"
REQUIRED_USE="|| ( gui webui )
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd perhaps consider consistent:

REQUIRED_USE="

"

style, like other variables.

One just to be consistent, two because it makes diffs look a bit nicer. But not a blocker at all obviously.

@eli-schwartz eli-schwartz deleted the qbt branch January 22, 2024 21:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thesamesam thesamesam thesamesam left review comments

Assignees
No one assigned
Labels
assigned PR successfully assigned to the package maintainer(s). maintainer-needed There is at least one affected package with no maintainer. Review it if you can. new package The PR is adding a new package. no bug found No Bug/Closes found in the commits.
Projects
None yet
Milestone
No milestone
4 participants
@eli-schwartz @gentoo-bot @gentoo-repo-qa-bot @thesamesam