summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2019-10-28 18:31:41 -0700
committerZac Medico <zmedico@gentoo.org>2019-10-28 18:42:55 -0700
commitf7b7f15761aaa20ad0b4eeddbb7b3637b2d356f0 (patch)
tree6b06792b267aad6dce2d546ff846c36a42e70cbd /sys-apps
parentmedia-tv/kodi: net-libs/libmicrohttpd[messages(+)] (diff)
downloadgentoo-f7b7f15761aaa20ad0b4eeddbb7b3637b2d356f0.tar.gz
gentoo-f7b7f15761aaa20ad0b4eeddbb7b3637b2d356f0.tar.bz2
gentoo-f7b7f15761aaa20ad0b4eeddbb7b3637b2d356f0.zip
sys-apps/portage: 2.3.76-r1 stable revbump for bug 698046
This avoids confusing "No such file or directory" errors as demonstrated by the following test case: $ ln -s /foo/bar /tmp/sudo-1.8.29rc1.tar.gz $ wget http://distfiles.gentoo.org/distfiles/sudo-1.8.29rc1.tar.gz -O /tmp/sudo-1.8.29rc1.tar.gz /tmp/sudo-1.8.29rc1.tar.gz: No such file or directory Bug: https://bugs.gentoo.org/691278 Bug: https://bugs.gentoo.org/698046 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/portage/portage-2.3.76-r1.ebuild (renamed from sys-apps/portage/portage-2.3.76.ebuild)7
1 files changed, 7 insertions, 0 deletions
diff --git a/sys-apps/portage/portage-2.3.76.ebuild b/sys-apps/portage/portage-2.3.76-r1.ebuild
index 11e24d32a9fc..ff8abf53e72d 100644
--- a/sys-apps/portage/portage-2.3.76.ebuild
+++ b/sys-apps/portage/portage-2.3.76-r1.ebuild
@@ -103,6 +103,13 @@ pkg_setup() {
python_prepare_all() {
distutils-r1_python_prepare_all
+ # Apply 03c54e340073620f489ca85bca94267a198174fe,
+ # 0299aedef74e47c0a68acf7905d8714c9578f125, and
+ # 1ca5b822133171b131cef3dc15dc43583893ad6b for bug 698046.
+ sed -e 's|rsync -avP|rsync -LtvP|' -i cnf/make.globals lib/portage/tests/util/test_getconfig.py || die
+ sed -e 's|if os.stat(download_path).st_size == 0:|mystat = os.lstat(download_path)\n\t\t\t\t\t\tif mystat.st_size == 0 or (stat.S_ISLNK(mystat.st_mode) and not os.path.exists(download_path)):|' \
+ -i lib/portage/package/ebuild/fetch.py || die
+
if use gentoo-dev; then
einfo "Disabling --dynamic-deps by default for gentoo-dev..."
sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \