diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2018-06-05 20:53:30 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2018-06-05 22:19:33 -0700 |
| commit | 252ca4b3c1000a23f3c32b01725b5b3c7da5e7d4 (patch) | |
| tree | 9b8cdaee25ba941103bcde69f02f7dfb0a67dc30 /sys-apps | |
| parent | dev-ruby/rrdtool-bindings: add ruby25 (diff) | |
| download | gentoo-252ca4b3c1000a23f3c32b01725b5b3c7da5e7d4.tar.gz gentoo-252ca4b3c1000a23f3c32b01725b5b3c7da5e7d4.tar.bz2 gentoo-252ca4b3c1000a23f3c32b01725b5b3c7da5e7d4.zip | |
sys-apps/portage: fix Ctrl-C CancelledError regression (bug 657436)
Fix an annoying regression involving a CancelledError exception raised
during Ctrl-C interrupt handling. Also include the small patch for
bug 657420. Remove the sed call that applied commit d07a47ff3c06 for
bug 656942, and apply the fix using a patch instead.
See: https://gitweb.gentoo.org/proj/portage.git/commit/?id=937d0156aa060bdba9095313dedbb62e0a993aea
See: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9e07f3a45c1b321edd07530b278498cb09f8983c
See: https://gitweb.gentoo.org/proj/portage.git/commit/?id=1fc628eead43fa5da4b142479aa004ded8acceab
Closes: https://bugs.gentoo.org/657436
See: https://gitweb.gentoo.org/proj/portage.git/commit/?id=e8067a8e6fbdaccca5915e66c77518e82b090401
Closes: https://bugs.gentoo.org/657420
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/portage/Manifest | 3 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.3.40.ebuild | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 61aee36d4d16..c2aa1cad252f 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,6 +1,7 @@ DIST portage-2.3.13.tar.bz2 945477 BLAKE2B 0ad44859f04db529713cc80a51e6dadc767ed6b6d0aef1d070650d82133c05e161eaa9fd1e208b3078c513ccf6f73136b8bf865542f0dc9396de9142bad1d32c SHA512 71d9ea6c9a889572f60e7e501e9f8739db588cffd98a431303906eb90c1f7bb85c55f6779cbfb921630149d1b3174539fe2357fbeffbbe9857998907e3215ad3 DIST portage-2.3.19.tar.bz2 954921 BLAKE2B e1bb3606ff2c5ba7b2123c61469b99f4d5d89f534a9af26065ac03bb2accd00cd363e4027e33546fc9b6d01b2fb65ca0d4311c6e2e8cc518c09030c979a69240 SHA512 94899bdfa4d22c846234bd28d4744613202cf67d3f32c242cb7fb60b17419419a2a29912e584ade7df52fba4c6a58774c5859148352221c978f34b4e7680981d DIST portage-2.3.24.tar.bz2 959266 BLAKE2B bc15f10599c694ad29f5a55264e929d0a04a9c5211e9cafd4f1a35de1d77e655d99df0ceb352fd431a8cefd40c733064422d8f41099edf7263aa36ef8cfd2ba8 SHA512 fca250d4afc1819a27b67daff770132ed4e88fb067038992a6b3f8aac63604536366ea628dd30c24f93db19ae55e88da372598ccc489bcf445038dfe860ce0ec -DIST portage-2.3.40-bug-657360-345256c2d439.patch 3364 BLAKE2B 38a7493ab4dedd400df51dc9d09b85fbc0268ce7551348aa548ffa29661643b5b42add2769e6e394f4d8cf4fe9e7bc82a216f0a29434de237495da802c3f83e7 SHA512 eaf73df1122a3b54a18fc6d4b6a4930020999801e907316cb2e326237e7c67340ac777b9fc76ff933f487dad600c4aa5715a336a2b51e16e4f095be446ad4abb +DIST portage-2.3.40-bug-656942-bug-657436-937d0156aa06.patch 15214 BLAKE2B 0351f82cd46aa1523eb0f70109551009a422546f2fbde1beee7a18dad4ecbfc6465b3b3052a25720196950f7da81adeb66d87940f2b477fbeca27afba56fa18e SHA512 b0482b8dac8af97b841ded426001872c1c708f649dc7774bd3c7003179888fd4d126ece33d001d127b643d88b8a70b9af75bbeb36beeaca7b8ad308f92ff72e7 +DIST portage-2.3.40-bug-657436-937d0156aa06-1fc628eead43.patch 4131 BLAKE2B 1b051097ef4fb073d22b9ef3472077b4845190ec3839886f462cacbee0996dc4c036549c4beab09025e1bb42f421e5032144e90197e3aa5de08dd7d8d1c50fbb SHA512 5910469816b69afb7a0078dd3b35a5304e2c806ac03ff3949603cf4162900fd9dd1df15661b91a2181528e8406679e525308822a0f6ddf4799c79fa9652c27a9 DIST portage-2.3.40.tar.bz2 995122 BLAKE2B 3bfadee6cf57dace32bb4a365850650e13664202f3b16bf75821ff6226e85da823785ac87875fa82bd5cf1b953d638773819495f73f471c06ffd6926518df1ac SHA512 ded128c1941664fab6bc95f05115ec08900fddaedd1b6f12afa48da024531ee8939134d49759e09995c76a95e41beafdbf5528a5b62d3bf21c826ab1ac0cd1c5 DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8 diff --git a/sys-apps/portage/portage-2.3.40.ebuild b/sys-apps/portage/portage-2.3.40.ebuild index a0135a2bd759..c68fdd509f79 100644 --- a/sys-apps/portage/portage-2.3.40.ebuild +++ b/sys-apps/portage/portage-2.3.40.ebuild @@ -86,7 +86,8 @@ prefix_src_archives() { TARBALL_PV=${PV} SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2) - https://github.com/gentoo/portage/commit/345256c2d439c5ab580e4226f227db2819883d40.patch -> ${P}-bug-657360-345256c2d439.patch" + https://github.com/gentoo/portage/compare/b7f94fccf4163364ab7b4c4f0dcd42b8847f03e0...937d0156aa060bdba9095313dedbb62e0a993aea.patch -> ${P}-bug-656942-bug-657436-937d0156aa06.patch + https://github.com/gentoo/portage/compare/937d0156aa060bdba9095313dedbb62e0a993aea...1fc628eead43fa5da4b142479aa004ded8acceab.patch -> ${P}-bug-657436-937d0156aa06-1fc628eead43.patch" pkg_setup() { use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 ) @@ -95,11 +96,8 @@ pkg_setup() { python_prepare_all() { distutils-r1_python_prepare_all - epatch "${DISTDIR}/${P}-bug-657360-345256c2d439.patch" - - # apply d07a47ff3c06 - sed -i 's:("--dynamic-deps", "y") != "n"$:\0 and "--nodeps" not in myopts:' \ - pym/_emerge/create_depgraph_params.py || die + epatch "${DISTDIR}/${P}-bug-656942-bug-657436-937d0156aa06.patch" \ + "${DISTDIR}/${P}-bug-657436-937d0156aa06-1fc628eead43.patch" # apply 4fb5ef2ce2cb sed -i "s:\\((self._poll_obj, 'close'\\)):\\1, None):" \ |