diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2020-04-20 20:08:09 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2020-04-20 20:11:17 -0700 |
| commit | a81ec04a86a9b593d9dbafe30e96cd8453831798 (patch) | |
| tree | 723fa597a42f6f33f8cc58026d3e5c97e7a4432c /sys-apps | |
| parent | dev-libs/ppl: new revision to fix the build with clang. (diff) | |
| download | gentoo-a81ec04a86a9b593d9dbafe30e96cd8453831798.tar.gz gentoo-a81ec04a86a9b593d9dbafe30e96cd8453831798.tar.bz2 gentoo-a81ec04a86a9b593d9dbafe30e96cd8453831798.zip | |
sys-apps/portage: stable revbump to 2.3.89-r3 for bug 718578
#718578 ModuleNotFoundError for portage.util.netlink
Bug: https://bugs.gentoo.org/706142
Bug: https://bugs.gentoo.org/718578
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/portage/Manifest | 1 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.3.89-r3.ebuild (renamed from sys-apps/portage/portage-2.3.89-r2.ebuild) | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 7d0c0150bbef..28907f845283 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,4 +1,5 @@ DIST portage-2.3.69.tar.bz2 1027945 BLAKE2B 22a06370d9db8f8954f609a4435983b914f03c11fa1c4c857089738db574e3346fc286c77bb62103d868742b423484b3a186cbc22545cccca0f516a5724e331e SHA512 20a6c9d26829e9d3738da824aa3fcc0bc8f01019ae9631871ce56e5ff37d91ed27d7b9505c433cc3b7441290abf98bf0897bbb66c099cbb982854047e6c8f045 +DIST portage-2.3.89-bug-718578.patch 1325 BLAKE2B 7a3bc520274617736eac2e3d078e90d151bdb5d8615f6217a499c0f5d4c80813f2c753e7902cf34482df0725ad0b43a38707764c8be14aae9f7ca34f0bd8721f SHA512 6f1c5d7b42beb8078c45cccbad2bd65374b69af92521d9be3beb6784477ca5bcdd75d8e762b239e44e3121e6fe5e3a040c92c9b61521e4a9b1d6bafee10d4c88 DIST portage-2.3.89.tar.bz2 1048621 BLAKE2B 1353f0697a977eb395abd857c8cc43c839912f4bd31436c6620d10e3dc29dc32ee9970478ad0f569b02f14989c48a7d956a233c7db22e172897a49a98fd2a94d SHA512 fa453d3134139fc1f435d6388aa7d6271cd680d08ea1736269a917c12500bb463a81afc956ddd0045e98784bcdbb6541c333be6ff0c2a00feeb482b637f08e98 DIST portage-2.3.98.tar.bz2 1049738 BLAKE2B f312a6e0f7fedee3d4d5948b50aad7dc786e5141a22fa6df9d5d425d76cd094c6e3256460230f8fd6b4261647413a6959578dd5feeda2a966ed5e9046b246d4e SHA512 a9ad1f268479e93f4b197c21db4ff352f96299828593eb34ca678471badbdcb72d6a0e5a62be40b24b84775fbed880d0169d25a4686e0f71805225fe242b6686 DIST portage-2.3.99.tar.bz2 1051210 BLAKE2B dd3f990dbc87e655a767ce01e1ee3f0b1d5226fa818949408e54b81a2f96e50a4215a79af42b00dc795792858c4f86453b238b14baef4f0793c937b5617534b8 SHA512 176842318a4134ce54c5aa6485fef296f5a14edd2a72421c2011973a0f1a6af39bc5398f1e9eb3b8666d5fc307589c5b91ab93c219bdedb2d307357d8ddefbf5 diff --git a/sys-apps/portage/portage-2.3.89-r2.ebuild b/sys-apps/portage/portage-2.3.89-r3.ebuild index 82f329575e06..33c9b7f89e88 100644 --- a/sys-apps/portage/portage-2.3.89-r2.ebuild +++ b/sys-apps/portage/portage-2.3.89-r3.ebuild @@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=no PYTHON_COMPAT=( pypy3 python3_6 python3_7 python3_8 ) PYTHON_REQ_USE='bzip2(+),threads(+)' -inherit distutils-r1 linux-info systemd prefix +inherit distutils-r1 epatch linux-info systemd prefix DESCRIPTION="Portage is the package management and distribution system for Gentoo" HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" @@ -82,7 +82,8 @@ prefix_src_archives() { TARBALL_PV=${PV} SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 - $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)" + $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2) + https://github.com/gentoo/portage/commit/9738a404e876270cbdef2514f66915bce35d7435.patch -> portage-2.3.89-bug-718578.patch" pkg_pretend() { local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS" @@ -93,6 +94,8 @@ pkg_pretend() { python_prepare_all() { distutils-r1_python_prepare_all + epatch "${DISTDIR}/portage-2.3.89-bug-718578.patch" + # Apply e762752a8bf5c19e0d6d7b22de86306bfa4270ba for bug 711400. sed -e 's|\(if\) \(graph_interface.want_update_pkg(parent, avail_pkg):\)|\1 parent is not None and \2|' -i lib/portage/dep/dep_check.py || die |