1 |
commit: 87db6ee1103dc33c206111288a43ac619d27cefc |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 9 01:18:34 2020 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 9 01:31:22 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87db6ee1 |
7 |
|
8 |
sys-apps/portage: Bump to version 2.3.88 |
9 |
|
10 |
#649622 prevent unecessary installation of virtual/w3m followed |
11 |
by removal by depclean |
12 |
#705736 preserve-libs: prevent unecessary preservation of system |
13 |
libraries which a package bundles |
14 |
#707820 generate API documentation with sphinx-apidoc |
15 |
#708448 support FEATURES=qa-unresolved-soname-deps so that the |
16 |
QA warning from bug 704320 can be disabled |
17 |
#708660 phase-helpers.sh: avoid passing an empty root value to |
18 |
portageq when ebuild IPC is disabled |
19 |
|
20 |
Bug: https://bugs.gentoo.org/706142 |
21 |
Bug: https://bugs.gentoo.org/649622 |
22 |
Bug: https://bugs.gentoo.org/705736 |
23 |
Bug: https://bugs.gentoo.org/707820 |
24 |
Bug: https://bugs.gentoo.org/708448 |
25 |
Bug: https://bugs.gentoo.org/708660 |
26 |
Package-Manager: Portage-2.3.88, Repoman-2.3.20 |
27 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
28 |
|
29 |
profiles/arch/riscv/package.use.mask | 2 +- |
30 |
sys-apps/portage/Manifest | 1 + |
31 |
sys-apps/portage/portage-2.3.88.ebuild | 271 +++++++++++++++++++++++++++++++++ |
32 |
3 files changed, 273 insertions(+), 1 deletion(-) |
33 |
|
34 |
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask |
35 |
index a57d6b4ffd4..663227af0ae 100644 |
36 |
--- a/profiles/arch/riscv/package.use.mask |
37 |
+++ b/profiles/arch/riscv/package.use.mask |
38 |
@@ -67,7 +67,7 @@ net-misc/curl brotli curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss http2 rtmp |
39 |
net-misc/ntp openntpd snmp vim-syntax zeroconf |
40 |
net-nds/openldap cxx kerberos sasl |
41 |
sys-apps/kmod doc |
42 |
-sys-apps/portage epydoc |
43 |
+sys-apps/portage apidoc epydoc |
44 |
sys-apps/rng-tools nistbeacon pkcs11 |
45 |
sys-auth/pambase pam_krb5 pam_ssh passwdqc mktemp |
46 |
sys-devel/automake test |
47 |
|
48 |
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest |
49 |
index 0e61327fe61..135c9674f21 100644 |
50 |
--- a/sys-apps/portage/Manifest |
51 |
+++ b/sys-apps/portage/Manifest |
52 |
@@ -5,3 +5,4 @@ DIST portage-2.3.85-bug-706186.patch 2603 BLAKE2B 6a7d236594a01514dab4fcffaec165 |
53 |
DIST portage-2.3.85.tar.bz2 1046025 BLAKE2B 721999b1200b69d2fd3fdd8f4690859f44e6796bdbef1636a80f09ff7625cdff437d183b4e3bdb7d4455b4da9f067adf199106c6b7bdf9b0d5d5ae7a30c7ce03 SHA512 f42f6d87df0bde5e143b7c8b901556c325b9f8250131db400543b54040eb931f9b541ad8211b35942c4bbd99fcfdea6ead93459e57b03173f5bcb37e64a85304 |
54 |
DIST portage-2.3.86.tar.bz2 1046806 BLAKE2B 6aadfcf17eacc8f7b82645a82fce96b7d90e93d797704c5b04fe437cbe587440dea8f8e39847c2c95eacf383e4525d4f015ee26b41694c156f907bd22d6663fb SHA512 fad0e89fd2c831ebd8cfd1fe080433c4696f408008f463a151e6fd4f3a2ab2a81249dd0db76f28c7d2cdf0e14e5163c3898c7ca22e7f0edb2e882e1ab7bda95e |
55 |
DIST portage-2.3.87.tar.bz2 1046448 BLAKE2B bbcb31a362d89bc81cdedb03be431792dab53d983d35f10853e6a68c2e2fb3da8ddd237305e78ab5946c8199f4dd7a3a41f023912a50abe9fa96bcf7ac35af75 SHA512 47a4d4901c2ecc9df8e38fa804efeb8583928a77e45a9b19dd8edd7e1323911762c357ad0bc1a182d8389225282660f4ef6e442e8addc087e404d561466c3b86 |
56 |
+DIST portage-2.3.88.tar.bz2 1048081 BLAKE2B d84b13686d09d125863835467989a11787333dea18a7eabb48560e6847c54643155a98c74d061e08b991064bfa9236e0a617a06beabb575162c4968e4cc13fe8 SHA512 ec043bbd7667f810e1a7c7fd3cae19b81adac1c323d7c488d1e4e809d9cec7c7f13bc2e5b8769a03b9f8aa78e389f5680e15b6a8f0f3543cf43d0f43fb7ee5f7 |
57 |
|
58 |
diff --git a/sys-apps/portage/portage-2.3.88.ebuild b/sys-apps/portage/portage-2.3.88.ebuild |
59 |
new file mode 100644 |
60 |
index 00000000000..0188237e0e1 |
61 |
--- /dev/null |
62 |
+++ b/sys-apps/portage/portage-2.3.88.ebuild |
63 |
@@ -0,0 +1,271 @@ |
64 |
+# Copyright 1999-2020 Gentoo Authors |
65 |
+# Distributed under the terms of the GNU General Public License v2 |
66 |
+ |
67 |
+EAPI=5 |
68 |
+ |
69 |
+DISTUTILS_USE_SETUPTOOLS=no |
70 |
+PYTHON_COMPAT=( |
71 |
+ pypy3 |
72 |
+ python3_6 python3_7 python3_8 |
73 |
+ python2_7 |
74 |
+) |
75 |
+PYTHON_REQ_USE='bzip2(+),threads(+)' |
76 |
+ |
77 |
+inherit distutils-r1 linux-info systemd prefix |
78 |
+ |
79 |
+DESCRIPTION="Portage is the package management and distribution system for Gentoo" |
80 |
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" |
81 |
+ |
82 |
+LICENSE="GPL-2" |
83 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" |
84 |
+SLOT="0" |
85 |
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr" |
86 |
+ |
87 |
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) |
88 |
+ >=app-arch/tar-1.27 |
89 |
+ dev-lang/python-exec:2 |
90 |
+ >=sys-apps/sed-4.0.5 sys-devel/patch |
91 |
+ doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) |
92 |
+ apidoc? ( |
93 |
+ dev-python/sphinx |
94 |
+ dev-python/sphinx-epytext |
95 |
+ )" |
96 |
+# Require sandbox-2.2 for bug #288863. |
97 |
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's |
98 |
+# quite slow, so it's not considered in the dependencies as an alternative to |
99 |
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so |
100 |
+# for now, don't pull in xattr deps for other kernels. |
101 |
+# For whirlpool hash, require python[ssl] (bug #425046). |
102 |
+# For compgen, require bash[readline] (bug #445576). |
103 |
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling |
104 |
+# the executable. |
105 |
+RDEPEND=" |
106 |
+ >=app-arch/tar-1.27 |
107 |
+ dev-lang/python-exec:2 |
108 |
+ !build? ( |
109 |
+ >=sys-apps/sed-4.0.5 |
110 |
+ app-shells/bash:0[readline] |
111 |
+ >=app-admin/eselect-1.2 |
112 |
+ $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ |
113 |
+ python{2_7,3_5} pypy) |
114 |
+ rsync-verify? ( |
115 |
+ >=app-portage/gemato-14[${PYTHON_USEDEP}] |
116 |
+ >=app-crypt/openpgp-keys-gentoo-release-20180706 |
117 |
+ >=app-crypt/gnupg-2.2.4-r2[ssl(-)] |
118 |
+ ) |
119 |
+ ) |
120 |
+ elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) |
121 |
+ elibc_glibc? ( >=sys-apps/sandbox-2.2 ) |
122 |
+ elibc_musl? ( >=sys-apps/sandbox-2.2 ) |
123 |
+ elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) |
124 |
+ kernel_linux? ( sys-apps/util-linux ) |
125 |
+ >=app-misc/pax-utils-0.1.17 |
126 |
+ selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) |
127 |
+ xattr? ( kernel_linux? ( |
128 |
+ >=sys-apps/install-xattr-0.3 |
129 |
+ $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \ |
130 |
+ python2_7 pypy) |
131 |
+ ) ) |
132 |
+ !<app-admin/logrotate-3.8.0 |
133 |
+ !<app-portage/gentoolkit-0.4.6 |
134 |
+ !<app-portage/repoman-2.3.10" |
135 |
+PDEPEND=" |
136 |
+ !build? ( |
137 |
+ >=net-misc/rsync-2.6.4 |
138 |
+ userland_GNU? ( >=sys-apps/coreutils-6.4 ) |
139 |
+ )" |
140 |
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 |
141 |
+# NOTE: FEATURES=installsources requires debugedit and rsync |
142 |
+ |
143 |
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives" |
144 |
+ |
145 |
+prefix_src_archives() { |
146 |
+ local x y |
147 |
+ for x in ${@}; do |
148 |
+ for y in ${SRC_ARCHIVES}; do |
149 |
+ echo ${y}/${x} |
150 |
+ done |
151 |
+ done |
152 |
+} |
153 |
+ |
154 |
+TARBALL_PV=${PV} |
155 |
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 |
156 |
+ $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)" |
157 |
+ |
158 |
+pkg_pretend() { |
159 |
+ local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS" |
160 |
+ |
161 |
+ check_extra_config |
162 |
+} |
163 |
+ |
164 |
+python_prepare_all() { |
165 |
+ distutils-r1_python_prepare_all |
166 |
+ |
167 |
+ sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die |
168 |
+ |
169 |
+ if use gentoo-dev; then |
170 |
+ einfo "Disabling --dynamic-deps by default for gentoo-dev..." |
171 |
+ sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \ |
172 |
+ -i lib/_emerge/create_depgraph_params.py || \ |
173 |
+ die "failed to patch create_depgraph_params.py" |
174 |
+ |
175 |
+ einfo "Enabling additional FEATURES for gentoo-dev..." |
176 |
+ echo 'FEATURES="${FEATURES} strict-keepdir"' \ |
177 |
+ >> cnf/make.globals || die |
178 |
+ fi |
179 |
+ |
180 |
+ if use native-extensions; then |
181 |
+ printf "[build_ext]\nportage-ext-modules=true\n" >> \ |
182 |
+ setup.cfg || die |
183 |
+ fi |
184 |
+ |
185 |
+ if ! use ipc ; then |
186 |
+ einfo "Disabling ipc..." |
187 |
+ sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ |
188 |
+ -i lib/_emerge/AbstractEbuildProcess.py || \ |
189 |
+ die "failed to patch AbstractEbuildProcess.py" |
190 |
+ fi |
191 |
+ |
192 |
+ if use xattr && use kernel_linux ; then |
193 |
+ einfo "Adding FEATURES=xattr to make.globals ..." |
194 |
+ echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ |
195 |
+ || die "failed to append to make.globals" |
196 |
+ fi |
197 |
+ |
198 |
+ if use build || ! use rsync-verify; then |
199 |
+ sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ |
200 |
+ -e '/^sync-webrsync-verify-signature/s|yes|no|' \ |
201 |
+ -i cnf/repos.conf || die "sed failed" |
202 |
+ fi |
203 |
+ |
204 |
+ if [[ -n ${EPREFIX} ]] ; then |
205 |
+ einfo "Setting portage.const.EPREFIX ..." |
206 |
+ hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \ |
207 |
+ -w "/_BINARY/" lib/portage/const.py |
208 |
+ |
209 |
+ einfo "Prefixing shebangs ..." |
210 |
+ while read -r -d $'\0' ; do |
211 |
+ local shebang=$(head -n1 "$REPLY") |
212 |
+ if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then |
213 |
+ sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \ |
214 |
+ die "sed failed" |
215 |
+ fi |
216 |
+ done < <(find . -type f ! -name etc-update -print0) |
217 |
+ |
218 |
+ einfo "Adjusting make.globals, repos.conf and etc-update ..." |
219 |
+ hprefixify cnf/{make.globals,repos.conf} bin/etc-update |
220 |
+ |
221 |
+ if use prefix-guest ; then |
222 |
+ sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ |
223 |
+ -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ |
224 |
+ -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ |
225 |
+ -i cnf/repos.conf || die "sed failed" |
226 |
+ fi |
227 |
+ |
228 |
+ einfo "Adding FEATURES=force-prefix to make.globals ..." |
229 |
+ echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ |
230 |
+ || die "failed to append to make.globals" |
231 |
+ fi |
232 |
+ |
233 |
+ cd "${S}/cnf" || die |
234 |
+ if [ -f "make.conf.example.${ARCH}".diff ]; then |
235 |
+ patch make.conf.example "make.conf.example.${ARCH}".diff || \ |
236 |
+ die "Failed to patch make.conf.example" |
237 |
+ else |
238 |
+ eerror "" |
239 |
+ eerror "Portage does not have an arch-specific configuration for this arch." |
240 |
+ eerror "Please notify the arch maintainer about this issue. Using generic." |
241 |
+ eerror "" |
242 |
+ fi |
243 |
+} |
244 |
+ |
245 |
+python_compile_all() { |
246 |
+ local targets=() |
247 |
+ use doc && targets+=( docbook ) |
248 |
+ use apidoc && targets+=( apidoc ) |
249 |
+ |
250 |
+ if [[ ${targets[@]} ]]; then |
251 |
+ esetup.py "${targets[@]}" |
252 |
+ fi |
253 |
+} |
254 |
+ |
255 |
+python_test() { |
256 |
+ esetup.py test |
257 |
+} |
258 |
+ |
259 |
+python_install() { |
260 |
+ # Install sbin scripts to bindir for python-exec linking |
261 |
+ # they will be relocated in pkg_preinst() |
262 |
+ distutils-r1_python_install \ |
263 |
+ --system-prefix="${EPREFIX}/usr" \ |
264 |
+ --bindir="$(python_get_scriptdir)" \ |
265 |
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \ |
266 |
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ |
267 |
+ --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ |
268 |
+ --sbindir="$(python_get_scriptdir)" \ |
269 |
+ --sysconfdir="${EPREFIX}/etc" \ |
270 |
+ "${@}" |
271 |
+} |
272 |
+ |
273 |
+python_install_all() { |
274 |
+ distutils-r1_python_install_all |
275 |
+ |
276 |
+ local targets=() |
277 |
+ use doc && targets+=( |
278 |
+ install_docbook |
279 |
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" |
280 |
+ ) |
281 |
+ use apidoc && targets+=( |
282 |
+ install_apidoc |
283 |
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" |
284 |
+ ) |
285 |
+ |
286 |
+ # install docs |
287 |
+ if [[ ${targets[@]} ]]; then |
288 |
+ esetup.py "${targets[@]}" |
289 |
+ fi |
290 |
+ |
291 |
+ systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf |
292 |
+ |
293 |
+ # Due to distutils/python-exec limitations |
294 |
+ # these must be installed to /usr/bin. |
295 |
+ local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' |
296 |
+ einfo "Moving admin scripts to the correct directory" |
297 |
+ dodir /usr/sbin |
298 |
+ for target in ${sbin_relocations}; do |
299 |
+ einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" |
300 |
+ mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!" |
301 |
+ done |
302 |
+} |
303 |
+ |
304 |
+pkg_preinst() { |
305 |
+ python_setup |
306 |
+ python_export PYTHON_SITEDIR |
307 |
+ [[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory" |
308 |
+ env -u DISTDIR \ |
309 |
+ -u PORTAGE_OVERRIDE_EPREFIX \ |
310 |
+ -u PORTAGE_REPOSITORIES \ |
311 |
+ -u PORTDIR \ |
312 |
+ -u PORTDIR_OVERLAY \ |
313 |
+ PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \ |
314 |
+ "${PYTHON}" -m portage._compat_upgrade.default_locations || die |
315 |
+ |
316 |
+ # elog dir must exist to avoid logrotate error for bug #415911. |
317 |
+ # This code runs in preinst in order to bypass the mapping of |
318 |
+ # portage:portage to root:root which happens after src_install. |
319 |
+ keepdir /var/log/portage/elog |
320 |
+ # This is allowed to fail if the user/group are invalid for prefix users. |
321 |
+ if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then |
322 |
+ chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog} |
323 |
+ fi |
324 |
+ |
325 |
+ if has_version "<${CATEGORY}/${PN}-2.3.77"; then |
326 |
+ elog "The emerge --autounmask option is now disabled by default, except for" |
327 |
+ elog "portions of behavior which are controlled by the --autounmask-use and" |
328 |
+ elog "--autounmask-license options. For backward compatibility, previous" |
329 |
+ elog "behavior of --autounmask=y and --autounmask=n is entirely preserved." |
330 |
+ elog "Users can get the old behavior simply by adding --autounmask to the" |
331 |
+ elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this" |
332 |
+ elog "change, see https://bugs.gentoo.org/658648." |
333 |
+ fi |
334 |
+} |