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