net-misc/aria2: bump to 1.35.0 #18694
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Pull Request assignmentSubmitter: @crabbedhaloablution net-misc/aria2: @mgorny Linked bugsBugs linked: 704086 In order to force reassignment and/or bug reference scan, please append Docs: Code of Conduct ● Copyright policy (expl.) ● Devmanual ● GitHub PRs ● Proxy-maint guide |
gentoo-bot
added
assigned
Pull request CI reportReport generated at: 2020-12-17 13:25 UTC There are existing issues already. Please look into the report to make sure none of them affect the packages in question: |
mgorny
requested changes
Dec 17, 2020
There was a problem hiding this comment.
Tests fail:
FAIL: aria2c
============================================================================
Testsuite summary for aria2 1.35.0
============================================================================
# TOTAL: 1
# PASS: 0
# SKIP: 0
# XFAIL: 0
# FAIL: 1
# XPASS: 0
# ERROR: 0
============================================================================
See test/test-suite.log
Please report to https://github.com/aria2/aria2/issues
============================================================================
I get a pass. my test/test-suite.log isn't very verbose, is yours any better? |
|
Ok, I can reproduce with all the use-flags, looks like a sandbox thing. |
|
I think it's network sandbox, last I checked. I think disabling the two tests should fix it (but how?) |
crabbedhaloablution
force-pushed
the
aria2-1.35.0
branch
from
b4d6b9d
to
57a9a40
Compare
|
Fixed it. The sed is not pretty looking, could be reduced to a one-liner if you like that better, but I chose to robustify it so it is more likely to survive when upstream bumps their automake or adds another test on next release. |
Pull request CI reportReport generated at: 2020-12-17 16:00 UTC There are existing issues already. Please look into the report to make sure none of them affect the packages in question: |
mgorny
requested changes
Dec 17, 2020
net-misc/aria2/aria2-1.35.0.ebuild
Outdated
| src_prepare() { | ||
| default | ||
| sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed" | ||
| # Fails with all-the-use-flags && FEATURES=network-sandbox |
There was a problem hiding this comment.
I dare guess it's USE=bittorrent.
net-misc/aria2/aria2-1.35.0.ebuild
Outdated
Comment on lines
75
to
77
| app-arch/xz-utils | ||
| virtual/pkgconfig | ||
| nls? ( sys-devel/gettext ) |
There was a problem hiding this comment.
These tree are BDEPEND in EAPI 7.
net-misc/aria2/aria2-1.35.0.ebuild
Outdated
| # ssl? -> openssl || (gnutls + (nettle || libgcrypt )) | ||
| # !ssl? -> nettle || libgcrypt | ||
|
|
||
| CDEPEND="sys-libs/zlib:0= |
There was a problem hiding this comment.
Suggested change
| CDEPEND="sys-libs/zlib:0= | |
| RDEPEND="sys-libs/zlib:0= |
net-misc/aria2/aria2-1.35.0.ebuild
Outdated
| libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) | ||
| !libxml2? ( dev-libs/expat:0= ) )" | ||
|
|
||
| DEPEND="${CDEPEND} |
There was a problem hiding this comment.
Suggested change
| DEPEND="${CDEPEND} | |
| DEPEND=${RDEPEND} |
net-misc/aria2/aria2-1.35.0.ebuild
Outdated
| virtual/pkgconfig | ||
| nls? ( sys-devel/gettext ) | ||
| test? ( >=dev-util/cppunit-1.12.0:0 )" | ||
| RDEPEND="${CDEPEND} |
There was a problem hiding this comment.
Suggested change
| RDEPEND="${CDEPEND} | |
| RDEPEND+=" |
net-misc/aria2/aria2-1.35.0.ebuild
Outdated
Comment on lines
83
to
87
| # xmlrpc has no explicit switch, it's turned out by any XML library | ||
| # so metalink implicitly forces it on | ||
| REQUIRED_USE="?? ( jemalloc tcmalloc ) | ||
| metalink? ( xmlrpc )" | ||
| RESTRICT="!test? ( test )" |
There was a problem hiding this comment.
Move these just below IUSE, please.
net-misc/aria2/aria2-1.35.0.ebuild
Outdated
Comment on lines
103
to
106
| -e 's|LpdMessageDispatcherTest.cc||' \ | ||
| -e 's|LpdMessageReceiverTest.cc||' \ | ||
| -e '/LpdMessageDispatcherTest.Po/d' \ | ||
| -e '/LpdMessageReceiverTest.Po/d' \ |
There was a problem hiding this comment.
Do you actually need this? I don't think this affects the targets we're using.
net-misc/aria2/aria2-1.35.0.ebuild
Outdated
| -e 's|LpdMessageReceiverTest.cc||' \ | ||
| -e '/LpdMessageDispatcherTest.Po/d' \ | ||
| -e '/LpdMessageReceiverTest.Po/d' \ | ||
| test/Makefile.in||die |
There was a problem hiding this comment.
Suggested change
| test/Makefile.in||die | |
| test/Makefile.in || die |
net-misc/aria2/aria2-1.35.0.ebuild
Outdated
Comment on lines
178
to
179
| rm -rf "${D}"/usr/share/doc/aria2 \ | ||
| "${D}"/usr/share/doc/${PF}/README{,.html} |
There was a problem hiding this comment.
Suggested change
| rm -rf "${D}"/usr/share/doc/aria2 \ | |
| "${D}"/usr/share/doc/${PF}/README{,.html} | |
| rm -r "${ED}"/usr/share/doc/aria2 \ | |
| "${ED}"/usr/share/doc/${PF}/README{,.html} || die |
Bump EAPI while we're at it. Closes: https://bugs.gentoo.org/704086 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Peter Alfredsen <crabbedhaloablution@icloud.com>
crabbedhaloablution
force-pushed
the
aria2-1.35.0
branch
from
57a9a40
to
b06d206
Compare
|
Re-pushed, all requests integrated. |
Pull request CI reportReport generated at: 2020-12-17 17:05 UTC There are existing issues already. Please look into the report to make sure none of them affect the packages in question: |
mgorny
reviewed
Dec 17, 2020
| default | ||
| sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed" | ||
| # Fails with USE=bittorrent && FEATURES=network-sandbox | ||
| sed -i -E \ |
There was a problem hiding this comment.
I'm sorry for missing this previously but I don't think you're actually using extended regexp syntax here.
There was a problem hiding this comment.
You're correct. I was experimenting with a one-liner to start with, but felt better with a readable solution.
|
Overall good work, thanks! If you want me to fix that last nit, please just confirm that I'm correct and I'll do it while merging. |
mgorny
approved these changes
Dec 17, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bump EAPI while we're at it.
Closes: https://bugs.gentoo.org/704086
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Peter Alfredsen crabbedhaloablution@icloud.com