1 |
commit: 8304a26f4c4d5ef446cac60caa41df5529700929 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 19 05:13:39 2020 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 19 05:43:16 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8304a26f |
7 |
|
8 |
sys-apps/portage: Bump to version 3.0.4 |
9 |
|
10 |
#737698 fix hang for API consumers, involving support for |
11 |
local event loops which may run in threads |
12 |
|
13 |
Bug: https://bugs.gentoo.org/733180 |
14 |
Bug: https://bugs.gentoo.org/737698 |
15 |
Package-Manager: Portage-3.0.3, Repoman-3.0.0 |
16 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
17 |
|
18 |
sys-apps/portage/Manifest | 1 + |
19 |
sys-apps/portage/portage-3.0.4.ebuild | 264 ++++++++++++++++++++++++++++++++++ |
20 |
2 files changed, 265 insertions(+) |
21 |
|
22 |
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest |
23 |
index 42c77bc242e..f5a26bf1173 100644 |
24 |
--- a/sys-apps/portage/Manifest |
25 |
+++ b/sys-apps/portage/Manifest |
26 |
@@ -3,3 +3,4 @@ DIST portage-2.3.89-bug-718578.patch 1325 BLAKE2B 7a3bc520274617736eac2e3d078e90 |
27 |
DIST portage-2.3.99.tar.bz2 1051210 BLAKE2B dd3f990dbc87e655a767ce01e1ee3f0b1d5226fa818949408e54b81a2f96e50a4215a79af42b00dc795792858c4f86453b238b14baef4f0793c937b5617534b8 SHA512 176842318a4134ce54c5aa6485fef296f5a14edd2a72421c2011973a0f1a6af39bc5398f1e9eb3b8666d5fc307589c5b91ab93c219bdedb2d307357d8ddefbf5 |
28 |
DIST portage-3.0.2.tar.bz2 1049718 BLAKE2B ce3ec52ab70a35ba2242aa05df20083e3d63bb0725b71f943b75a5bde375912da4e0200fa8b2542ec4efebe2e484329f98aba8a3301d1144023b16405569725f SHA512 9e433e6a3ebd3758432853dc42a7fdb087aa0ba26f6458ce20e0a2f4046c6cf92ecd36ac1795f1e6bbe02f58ed467010eb810574351825a0c88b028338029e64 |
29 |
DIST portage-3.0.3.tar.bz2 1042517 BLAKE2B 95ec2135b2a3b29b15feedcd54a4f7bf194382ca08f5928a42688def55c9c33c6442b2e520af3a2e3ff77c1e4581bc609dc225afcd50e6878cd32c04b4211843 SHA512 a2ef09682d185e56b8e01fd512217b5506c5bc589c395c35f801cb4533f22b1c48201c1541df1c36afd823c587d06350434e15a5897c2a066bf4b0be54b5daae |
30 |
+DIST portage-3.0.4.tar.bz2 1042654 BLAKE2B 6f869b2eb24f9e590bf8e01172050105a1bd9ea88657db5893133b4620231a0ddcda871d6fcc10623f7f2ef809116310c76355263819be6c3734b0ca184d5fc0 SHA512 7a0c39cd4ed65aebd84ff8bbadba29760b3aa392a0d606c5b29a1112fd0845c42f74eebb0728a069b2b097a6eb7eec2d18af615fd9edcc38f1018ae6ff686812 |
31 |
|
32 |
diff --git a/sys-apps/portage/portage-3.0.4.ebuild b/sys-apps/portage/portage-3.0.4.ebuild |
33 |
new file mode 100644 |
34 |
index 00000000000..5578b8a560f |
35 |
--- /dev/null |
36 |
+++ b/sys-apps/portage/portage-3.0.4.ebuild |
37 |
@@ -0,0 +1,264 @@ |
38 |
+# Copyright 1999-2020 Gentoo Authors |
39 |
+# Distributed under the terms of the GNU General Public License v2 |
40 |
+ |
41 |
+EAPI=7 |
42 |
+ |
43 |
+DISTUTILS_USE_SETUPTOOLS=no |
44 |
+PYTHON_COMPAT=( pypy3 python3_{6..9} ) |
45 |
+PYTHON_REQ_USE='bzip2(+),threads(+)' |
46 |
+ |
47 |
+inherit distutils-r1 linux-info systemd prefix |
48 |
+ |
49 |
+DESCRIPTION="Portage is the package management and distribution system for Gentoo" |
50 |
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" |
51 |
+ |
52 |
+LICENSE="GPL-2" |
53 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
54 |
+SLOT="0" |
55 |
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr" |
56 |
+ |
57 |
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) |
58 |
+ >=app-arch/tar-1.27 |
59 |
+ dev-lang/python-exec:2 |
60 |
+ >=sys-apps/sed-4.0.5 sys-devel/patch |
61 |
+ doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) |
62 |
+ apidoc? ( |
63 |
+ dev-python/sphinx |
64 |
+ dev-python/sphinx-epytext |
65 |
+ )" |
66 |
+# Require sandbox-2.2 for bug #288863. |
67 |
+# For whirlpool hash, require python[ssl] (bug #425046). |
68 |
+# For compgen, require bash[readline] (bug #445576). |
69 |
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling |
70 |
+# the executable. |
71 |
+RDEPEND=" |
72 |
+ app-arch/zstd |
73 |
+ >=app-arch/tar-1.27 |
74 |
+ dev-lang/python-exec:2 |
75 |
+ !build? ( |
76 |
+ >=sys-apps/sed-4.0.5 |
77 |
+ app-shells/bash:0[readline] |
78 |
+ >=app-admin/eselect-1.2 |
79 |
+ rsync-verify? ( |
80 |
+ >=app-portage/gemato-14.4-r1[${PYTHON_USEDEP}] |
81 |
+ >=app-crypt/openpgp-keys-gentoo-release-20180706 |
82 |
+ >=app-crypt/gnupg-2.2.4-r2[ssl(-)] |
83 |
+ ) |
84 |
+ ) |
85 |
+ elibc_glibc? ( >=sys-apps/sandbox-2.2 ) |
86 |
+ elibc_musl? ( >=sys-apps/sandbox-2.2 ) |
87 |
+ elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) |
88 |
+ kernel_linux? ( sys-apps/util-linux ) |
89 |
+ >=app-misc/pax-utils-0.1.17 |
90 |
+ selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) |
91 |
+ xattr? ( kernel_linux? ( |
92 |
+ >=sys-apps/install-xattr-0.3 |
93 |
+ ) ) |
94 |
+ !<app-admin/logrotate-3.8.0 |
95 |
+ !<app-portage/gentoolkit-0.4.6 |
96 |
+ !<app-portage/repoman-2.3.10 |
97 |
+ !~app-portage/repoman-3.0.0" |
98 |
+PDEPEND=" |
99 |
+ !build? ( |
100 |
+ >=net-misc/rsync-2.6.4 |
101 |
+ userland_GNU? ( >=sys-apps/coreutils-6.4 ) |
102 |
+ )" |
103 |
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 |
104 |
+# NOTE: FEATURES=installsources requires debugedit and rsync |
105 |
+ |
106 |
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives" |
107 |
+ |
108 |
+prefix_src_archives() { |
109 |
+ local x y |
110 |
+ for x in ${@}; do |
111 |
+ for y in ${SRC_ARCHIVES}; do |
112 |
+ echo ${y}/${x} |
113 |
+ done |
114 |
+ done |
115 |
+} |
116 |
+ |
117 |
+TARBALL_PV=${PV} |
118 |
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 |
119 |
+ $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)" |
120 |
+ |
121 |
+pkg_pretend() { |
122 |
+ local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS" |
123 |
+ |
124 |
+ check_extra_config |
125 |
+} |
126 |
+ |
127 |
+python_prepare_all() { |
128 |
+ distutils-r1_python_prepare_all |
129 |
+ |
130 |
+ sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die |
131 |
+ |
132 |
+ if use gentoo-dev; then |
133 |
+ einfo "Disabling --dynamic-deps by default for gentoo-dev..." |
134 |
+ sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \ |
135 |
+ -i lib/_emerge/create_depgraph_params.py || \ |
136 |
+ die "failed to patch create_depgraph_params.py" |
137 |
+ |
138 |
+ einfo "Enabling additional FEATURES for gentoo-dev..." |
139 |
+ echo 'FEATURES="${FEATURES} strict-keepdir"' \ |
140 |
+ >> cnf/make.globals || die |
141 |
+ fi |
142 |
+ |
143 |
+ if use native-extensions; then |
144 |
+ printf "[build_ext]\nportage-ext-modules=true\n" >> \ |
145 |
+ setup.cfg || die |
146 |
+ fi |
147 |
+ |
148 |
+ if ! use ipc ; then |
149 |
+ einfo "Disabling ipc..." |
150 |
+ sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ |
151 |
+ -i lib/_emerge/AbstractEbuildProcess.py || \ |
152 |
+ die "failed to patch AbstractEbuildProcess.py" |
153 |
+ fi |
154 |
+ |
155 |
+ if use xattr && use kernel_linux ; then |
156 |
+ einfo "Adding FEATURES=xattr to make.globals ..." |
157 |
+ echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ |
158 |
+ || die "failed to append to make.globals" |
159 |
+ fi |
160 |
+ |
161 |
+ if use build || ! use rsync-verify; then |
162 |
+ sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ |
163 |
+ -e '/^sync-webrsync-verify-signature/s|yes|no|' \ |
164 |
+ -i cnf/repos.conf || die "sed failed" |
165 |
+ fi |
166 |
+ |
167 |
+ if [[ -n ${EPREFIX} ]] ; then |
168 |
+ einfo "Setting portage.const.EPREFIX ..." |
169 |
+ hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \ |
170 |
+ -w "/_BINARY/" lib/portage/const.py |
171 |
+ |
172 |
+ einfo "Prefixing shebangs ..." |
173 |
+ while read -r -d $'\0' ; do |
174 |
+ local shebang=$(head -n1 "$REPLY") |
175 |
+ if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then |
176 |
+ sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \ |
177 |
+ die "sed failed" |
178 |
+ fi |
179 |
+ done < <(find . -type f ! -name etc-update -print0) |
180 |
+ |
181 |
+ einfo "Adjusting make.globals, repos.conf and etc-update ..." |
182 |
+ hprefixify cnf/{make.globals,repos.conf} bin/etc-update |
183 |
+ |
184 |
+ if use prefix-guest ; then |
185 |
+ sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ |
186 |
+ -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ |
187 |
+ -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ |
188 |
+ -i cnf/repos.conf || die "sed failed" |
189 |
+ fi |
190 |
+ |
191 |
+ einfo "Adding FEATURES=force-prefix to make.globals ..." |
192 |
+ echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ |
193 |
+ || die "failed to append to make.globals" |
194 |
+ fi |
195 |
+ |
196 |
+ cd "${S}/cnf" || die |
197 |
+ if [ -f "make.conf.example.${ARCH}".diff ]; then |
198 |
+ patch make.conf.example "make.conf.example.${ARCH}".diff || \ |
199 |
+ die "Failed to patch make.conf.example" |
200 |
+ else |
201 |
+ eerror "" |
202 |
+ eerror "Portage does not have an arch-specific configuration for this arch." |
203 |
+ eerror "Please notify the arch maintainer about this issue. Using generic." |
204 |
+ eerror "" |
205 |
+ fi |
206 |
+} |
207 |
+ |
208 |
+python_compile_all() { |
209 |
+ local targets=() |
210 |
+ use doc && targets+=( docbook ) |
211 |
+ use apidoc && targets+=( apidoc ) |
212 |
+ |
213 |
+ if [[ ${targets[@]} ]]; then |
214 |
+ esetup.py "${targets[@]}" |
215 |
+ fi |
216 |
+} |
217 |
+ |
218 |
+python_test() { |
219 |
+ esetup.py test |
220 |
+} |
221 |
+ |
222 |
+python_install() { |
223 |
+ # Install sbin scripts to bindir for python-exec linking |
224 |
+ # they will be relocated in pkg_preinst() |
225 |
+ distutils-r1_python_install \ |
226 |
+ --system-prefix="${EPREFIX}/usr" \ |
227 |
+ --bindir="$(python_get_scriptdir)" \ |
228 |
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \ |
229 |
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ |
230 |
+ --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ |
231 |
+ --sbindir="$(python_get_scriptdir)" \ |
232 |
+ --sysconfdir="${EPREFIX}/etc" \ |
233 |
+ "${@}" |
234 |
+} |
235 |
+ |
236 |
+python_install_all() { |
237 |
+ distutils-r1_python_install_all |
238 |
+ |
239 |
+ local targets=() |
240 |
+ use doc && targets+=( |
241 |
+ install_docbook |
242 |
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" |
243 |
+ ) |
244 |
+ use apidoc && targets+=( |
245 |
+ install_apidoc |
246 |
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" |
247 |
+ ) |
248 |
+ |
249 |
+ # install docs |
250 |
+ if [[ ${targets[@]} ]]; then |
251 |
+ esetup.py "${targets[@]}" |
252 |
+ fi |
253 |
+ |
254 |
+ systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf |
255 |
+ |
256 |
+ # Due to distutils/python-exec limitations |
257 |
+ # these must be installed to /usr/bin. |
258 |
+ local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' |
259 |
+ einfo "Moving admin scripts to the correct directory" |
260 |
+ dodir /usr/sbin |
261 |
+ for target in ${sbin_relocations}; do |
262 |
+ einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" |
263 |
+ mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!" |
264 |
+ done |
265 |
+} |
266 |
+ |
267 |
+pkg_preinst() { |
268 |
+ python_setup |
269 |
+ local sitedir=$(python_get_sitedir) |
270 |
+ [[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory" |
271 |
+ env -u DISTDIR \ |
272 |
+ -u PORTAGE_OVERRIDE_EPREFIX \ |
273 |
+ -u PORTAGE_REPOSITORIES \ |
274 |
+ -u PORTDIR \ |
275 |
+ -u PORTDIR_OVERLAY \ |
276 |
+ PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ |
277 |
+ "${PYTHON}" -m portage._compat_upgrade.default_locations || die |
278 |
+ |
279 |
+ env -u BINPKG_COMPRESS \ |
280 |
+ PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ |
281 |
+ "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die |
282 |
+ |
283 |
+ # elog dir must exist to avoid logrotate error for bug #415911. |
284 |
+ # This code runs in preinst in order to bypass the mapping of |
285 |
+ # portage:portage to root:root which happens after src_install. |
286 |
+ keepdir /var/log/portage/elog |
287 |
+ # This is allowed to fail if the user/group are invalid for prefix users. |
288 |
+ if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then |
289 |
+ chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog} |
290 |
+ fi |
291 |
+ |
292 |
+ if has_version "<${CATEGORY}/${PN}-2.3.77"; then |
293 |
+ elog "The emerge --autounmask option is now disabled by default, except for" |
294 |
+ elog "portions of behavior which are controlled by the --autounmask-use and" |
295 |
+ elog "--autounmask-license options. For backward compatibility, previous" |
296 |
+ elog "behavior of --autounmask=y and --autounmask=n is entirely preserved." |
297 |
+ elog "Users can get the old behavior simply by adding --autounmask to the" |
298 |
+ elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this" |
299 |
+ elog "change, see https://bugs.gentoo.org/658648." |
300 |
+ fi |
301 |
+} |