Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/
Date: Thu, 28 Nov 2019 01:58:33
Message-Id: 1574906303.7418f55285fcbde7b4f9aee3926b3a818b1b865e.zmedico@gentoo
1 commit: 7418f55285fcbde7b4f9aee3926b3a818b1b865e
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 28 01:57:30 2019 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 28 01:58:23 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7418f552
7
8 sys-apps/portage: 2.3.80-r1 revbump for bug 689226
9
10 Package-Manager: Portage-2.3.80, Repoman-2.3.19
11 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
12
13 sys-apps/portage/Manifest | 1 +
14 .../portage/{portage-2.3.80.ebuild => portage-2.3.80-r1.ebuild} | 7 +++++--
15 2 files changed, 6 insertions(+), 2 deletions(-)
16
17 diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
18 index 4f8c6fbe056..10c609de1e7 100644
19 --- a/sys-apps/portage/Manifest
20 +++ b/sys-apps/portage/Manifest
21 @@ -2,5 +2,6 @@ DIST portage-2.3.66.tar.bz2 1023966 BLAKE2B dc378b714101b287fa33defeb778e586da83
22 DIST portage-2.3.69.tar.bz2 1027945 BLAKE2B 22a06370d9db8f8954f609a4435983b914f03c11fa1c4c857089738db574e3346fc286c77bb62103d868742b423484b3a186cbc22545cccca0f516a5724e331e SHA512 20a6c9d26829e9d3738da824aa3fcc0bc8f01019ae9631871ce56e5ff37d91ed27d7b9505c433cc3b7441290abf98bf0897bbb66c099cbb982854047e6c8f045
23 DIST portage-2.3.76.tar.bz2 1033462 BLAKE2B 1be0641337cd7d2a55f8aaba6f84bbfa7182503050e669fb28cd00e4de13cce31ec6e33cc2794e372d1a67b7d2f27e6bb85969f720f2ed449c619598b708b903 SHA512 e7774cf89e3865cb1ca5465fc961b452cc8529ccf09e86b7ebd16cca049f1efb527dca9aba892392d5909283cf12930117b1d33fa58e1e429f4408cf50181921
24 DIST portage-2.3.79.tar.bz2 1038675 BLAKE2B 7a6cff28fa1d4b54607e9416914ab534d250718b082a9789a36be057933867a8a3befd7c99d404b058f67b92c6ee975323c37251fe89d3e3e46865daf0fea25e SHA512 23101644185fb7c6eff12f015d442599b3af744f7b13dcb630f47a7f27c1392c46bd4aa5fa32d403dcf058cc3cc1d56cef00fd8c34dda811388eb268761c0797
25 +DIST portage-2.3.80-depgraph-fix-buildtime_blockers-logic-bug-689226.patch 1193 BLAKE2B 9c549d1e742f1417554d5b2c0b34ae73c53e8d65a930bd9f7cdb14f0d13a1d044aa2c0bb309dd361242aafb754b26b8b592f7e7a601e18104f2537cf7b68e3c4 SHA512 11f803c681b26780c6b1db91a299bbca7be545bc9f3903fd1e47e7157542477d84a82fdc2418b9ed0ebb7d8aefea0437a6a3defc5ffa0ff35b1a4301eb315bad
26 DIST portage-2.3.80.tar.bz2 1040844 BLAKE2B c504ab4b6cfb305a0b4228008f3aa0ac4cc77a57ac83250f20e37f99987484b3dad4c9851d0e94255bc6478c374317b8a337b91cbc3f555fa73e2c131b31edcc SHA512 816f16bf26223035e62fdfe307d4a28f7a826733f7634aca88215d42c77ea43874a9e3da2a51b1ac8a815aadd2813cdfbe7ce7bf913cbbee842d4c8413485ef0
27 DIST repoman-bug-685482-fbebef9677d6.patch 3350 BLAKE2B f715267e2731c1ec7c780aa9c6cffe1f848b3ad050273646579677a0522483df6fef844ffd87fb22f7dad53f1ec60221acd0d81a813569baf768ba62a6c1921c SHA512 0e44625aeec7c239d7db8fdcf6a13313f4a8c1275e0e474cc2f05e5476d86214881cec2917d816c8b63f69d508c0bfa69e6a8e05b614b405463c998a4fb7ce12
28
29 diff --git a/sys-apps/portage/portage-2.3.80.ebuild b/sys-apps/portage/portage-2.3.80-r1.ebuild
30 similarity index 95%
31 rename from sys-apps/portage/portage-2.3.80.ebuild
32 rename to sys-apps/portage/portage-2.3.80-r1.ebuild
33 index e7b9119d36b..6d384ab8fdd 100644
34 --- a/sys-apps/portage/portage-2.3.80.ebuild
35 +++ b/sys-apps/portage/portage-2.3.80-r1.ebuild
36 @@ -10,7 +10,7 @@ PYTHON_COMPAT=(
37 )
38 PYTHON_REQ_USE='bzip2(+),threads(+)'
39
40 -inherit distutils-r1 linux-info systemd prefix
41 +inherit distutils-r1 epatch linux-info systemd prefix
42
43 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
44 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
45 @@ -88,7 +88,8 @@ prefix_src_archives() {
46
47 TARBALL_PV=${PV}
48 SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
49 - $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
50 + $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
51 + https://github.com/gentoo/portage/commit/a107f5bad841e5fad65298881e5a1feb9ffdbed1.patch -> ${P}-depgraph-fix-buildtime_blockers-logic-bug-689226.patch"
52
53 pkg_pretend() {
54 local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
55 @@ -103,6 +104,8 @@ pkg_setup() {
56 python_prepare_all() {
57 distutils-r1_python_prepare_all
58
59 + epatch "${DISTDIR}/${P}-depgraph-fix-buildtime_blockers-logic-bug-689226.patch"
60 +
61 if use gentoo-dev; then
62 einfo "Disabling --dynamic-deps by default for gentoo-dev..."
63 sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \