summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2020-06-15 12:51:54 -0700
committerZac Medico <zmedico@gentoo.org>2020-06-15 12:54:15 -0700
commitdd8ae90ca895c1dd17846dd9110894312c7074a6 (patch)
tree5840f6d8021c538f7dfb9b2c6073ba1ab51253e4
parentx11-misc/shared-mime-info: Revbump to fix install path of pkgconfig file (diff)
downloadgentoo-dd8ae90ca895c1dd17846dd9110894312c7074a6.tar.gz
gentoo-dd8ae90ca895c1dd17846dd9110894312c7074a6.tar.bz2
gentoo-dd8ae90ca895c1dd17846dd9110894312c7074a6.zip
sys-apps/portage: Revbump to 2.3.101-r1
#709746 revert due to reports of emerge hangs Bug: https://bugs.gentoo.org/721152 Bug: https://bugs.gentoo.org/709746 Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Zac Medico <zmedico@gentoo.org>
-rw-r--r--sys-apps/portage/Manifest1
-rw-r--r--sys-apps/portage/portage-2.3.101-r1.ebuild (renamed from sys-apps/portage/portage-2.3.101.ebuild)7
2 files changed, 6 insertions, 2 deletions
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 23e9a955e6f..81d08ba48fe 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,5 +1,6 @@
DIST portage-2.3.100-bug-719810-escape-percent-signs.patch 1486 BLAKE2B 809e3897ffbcba32bdb209bad56e32f10c550bf00e74aa48e518c35d697447d88cb110652cb621a67b3fc9d3b97afeb0c593afd1212854623445899254a851de SHA512 37d5d67194ff2dbeb637da59e20d6fe2f75a69334189e751db3329b76b3e0ac42c6d87a0f1fdeeecf9e17288948e5d5b8415c53035f0f60d81f00c4e76e26b7d
DIST portage-2.3.100.tar.bz2 1051559 BLAKE2B 32ee47c2d3e28dd7530c4d6518c264f01621677b5d8872c98088117de3bde21bb05f144935b1c035157953814573473a9ac0216595138d804dd30cf8a7c5b4a9 SHA512 b784ced00676020700a27a622a7a10162b8775185e28d639473243949ca32210458523e94960cafa908ca4a97cd8731d3515f768e2512c519c54598316ecf3c9
+DIST portage-2.3.101-revert-bug-709746.patch 18358 BLAKE2B 519c76e2c73a91309b893e278bfe10c00d8cb8dc79e750a29a04fe0582cc48e35c56959f4d31d42daeab32c0bc7655a4cbb1b676af5745dd2c94aa41e8164d85 SHA512 d9094c3db97aee49f797c81d44a279bbf0ec0b77acaaaf38a197200e89254ff0815d6a2052c83e1a38d149edc959db4db9986aa64715470d7b258c455a6e81d4
DIST portage-2.3.101.tar.bz2 1052483 BLAKE2B 8abf5a0f5c3aace92fd5e74692240558b9fd6cc27f5030409289519edb5287e6b49a0e8c33d11d7b1427a8463fe98f6041de37638451fe639b295d7b595328f3 SHA512 e5d373fc435a9f7535c9bdc202bd0aa9a534ac9991987e21fbfd43492940210312b817284a2484cb4e98854050bb559aa49daef7f5d555e637a37eb312ccbe61
DIST portage-2.3.89-bug-718578.patch 1325 BLAKE2B 7a3bc520274617736eac2e3d078e90d151bdb5d8615f6217a499c0f5d4c80813f2c753e7902cf34482df0725ad0b43a38707764c8be14aae9f7ca34f0bd8721f SHA512 6f1c5d7b42beb8078c45cccbad2bd65374b69af92521d9be3beb6784477ca5bcdd75d8e762b239e44e3121e6fe5e3a040c92c9b61521e4a9b1d6bafee10d4c88
DIST portage-2.3.99.tar.bz2 1051210 BLAKE2B dd3f990dbc87e655a767ce01e1ee3f0b1d5226fa818949408e54b81a2f96e50a4215a79af42b00dc795792858c4f86453b238b14baef4f0793c937b5617534b8 SHA512 176842318a4134ce54c5aa6485fef296f5a14edd2a72421c2011973a0f1a6af39bc5398f1e9eb3b8666d5fc307589c5b91ab93c219bdedb2d307357d8ddefbf5
diff --git a/sys-apps/portage/portage-2.3.101.ebuild b/sys-apps/portage/portage-2.3.101-r1.ebuild
index 6e1a8152761..79b5924e0ac 100644
--- a/sys-apps/portage/portage-2.3.101.ebuild
+++ b/sys-apps/portage/portage-2.3.101-r1.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=no
PYTHON_COMPAT=( pypy3 python3_{6..9} )
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"
@@ -78,7 +78,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/2f657c642ff292fd44ed9cb253ab6d13da84303f.patch -> portage-2.3.101-revert-bug-709746.patch"
pkg_pretend() {
local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
@@ -89,6 +90,8 @@ pkg_pretend() {
python_prepare_all() {
distutils-r1_python_prepare_all
+ epatch "${DISTDIR}/portage-2.3.101-revert-bug-709746.patch"
+
sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
if use gentoo-dev; then