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: Mon, 02 Sep 2019 20:50:38
Message-Id: 1567457419.cec45848eafc34f55c240c059fe84ec52c63b63c.zmedico@gentoo
1 commit: cec45848eafc34f55c240c059fe84ec52c63b63c
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 2 20:49:23 2019 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 2 20:50:19 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cec45848
7
8 sys-apps/portage: Remove old versions
9
10 Package-Manager: Portage-2.3.75, Repoman-2.3.17
11 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
12
13 sys-apps/portage/Manifest | 3 -
14 sys-apps/portage/portage-2.3.72.ebuild | 264 ---------------------------------
15 sys-apps/portage/portage-2.3.73.ebuild | 264 ---------------------------------
16 sys-apps/portage/portage-2.3.74.ebuild | 261 --------------------------------
17 4 files changed, 792 deletions(-)
18
19 diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
20 index 1193bf222f1..4536a40778c 100644
21 --- a/sys-apps/portage/Manifest
22 +++ b/sys-apps/portage/Manifest
23 @@ -1,7 +1,4 @@
24 DIST portage-2.3.66.tar.bz2 1023966 BLAKE2B dc378b714101b287fa33defeb778e586da83275cdc2d0bc7a98e9f2ea568568313d6a2767f693f3111fc41f0c6f07451315021186a1719bd52520da327c103d6 SHA512 f8642237e0127d9838c6e91430a19b8886295f8ce6b18cf915d6eb63204c7a8c65783f1554eec90b7ce7d0b613ef4206643eec8751b0594de1dcb4ede4491779
25 DIST portage-2.3.69.tar.bz2 1027945 BLAKE2B 22a06370d9db8f8954f609a4435983b914f03c11fa1c4c857089738db574e3346fc286c77bb62103d868742b423484b3a186cbc22545cccca0f516a5724e331e SHA512 20a6c9d26829e9d3738da824aa3fcc0bc8f01019ae9631871ce56e5ff37d91ed27d7b9505c433cc3b7441290abf98bf0897bbb66c099cbb982854047e6c8f045
26 -DIST portage-2.3.72.tar.bz2 1030924 BLAKE2B 84ecb1cda83a33f7159b86edc915810460f85dd6c97e971a054b5c1cc685077cb784313a666d1867c671e6324a25ea64b0032bb1924af560bd60d261b199c479 SHA512 cc42030bee07b2addc7977a5f206ab35a76ac98d37215d2ee2952d47408c0de1c74387436b85b08f94be5fd01b422cb68bcf908fa8acac8fb9dda0e5caa39f86
27 -DIST portage-2.3.73.tar.bz2 1031001 BLAKE2B f08a639ae587cae8c87670c6d8f8b8f5a860a3d1d8ad960d6da7fac7c0e170d0f19c352d6a31de20de60a4504766724901ef7d2ba026f959ef8dd6bb8e095c73 SHA512 5edda4b235a9bb7574fb5bce79c4a226200ba077580ce0e0237ef209cc935ab94eef24859bf450443a92a6cb9d31a754e1e06c8fd0293efe7e5fa87e4d21652a
28 -DIST portage-2.3.74.tar.bz2 1033130 BLAKE2B e3dc7c994ad2e35a8a8f421d972d4ff12fa2c56241b9a7d374204b0fbea1f457b8a365b56daa7a642383fc2653d7a223f12cf14936c86b5c8856411e286973bd SHA512 947805ca47445de49105867f66ac2b77426511040d3f1936ec5e169219bcf45d320ebabb7455d318043405b043ba4808ce3962af431776ae152c203343607bf9
29 DIST portage-2.3.75.tar.bz2 1032575 BLAKE2B c4f3e9a7e7056af19da6a56599fb79a26331d6ab88981f966b77e2d17ee5dac1a585f54b1185f64855c9c2af544684b759143f657a529878a4e6eb9df4757340 SHA512 06dabc9bff2992b197575ceab5b4f117aca01a10d2556bb006bb28bd4c1d99edfbff753e83aba706782da1e365b923e081ce2037053fed31e18baa5fab6da4a2
30 DIST repoman-bug-685482-fbebef9677d6.patch 3350 BLAKE2B f715267e2731c1ec7c780aa9c6cffe1f848b3ad050273646579677a0522483df6fef844ffd87fb22f7dad53f1ec60221acd0d81a813569baf768ba62a6c1921c SHA512 0e44625aeec7c239d7db8fdcf6a13313f4a8c1275e0e474cc2f05e5476d86214881cec2917d816c8b63f69d508c0bfa69e6a8e05b614b405463c998a4fb7ce12
31
32 diff --git a/sys-apps/portage/portage-2.3.72.ebuild b/sys-apps/portage/portage-2.3.72.ebuild
33 deleted file mode 100644
34 index 33fe47b8acf..00000000000
35 --- a/sys-apps/portage/portage-2.3.72.ebuild
36 +++ /dev/null
37 @@ -1,264 +0,0 @@
38 -# Copyright 1999-2019 Gentoo Authors
39 -# Distributed under the terms of the GNU General Public License v2
40 -
41 -EAPI=5
42 -
43 -PYTHON_COMPAT=(
44 - pypy
45 - python3_5 python3_6 python3_7
46 - python2_7
47 -)
48 -PYTHON_REQ_USE='bzip2(+),threads(+)'
49 -
50 -inherit distutils-r1 linux-info systemd prefix
51 -
52 -DESCRIPTION="Portage is the package management and distribution system for Gentoo"
53 -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
54 -
55 -LICENSE="GPL-2"
56 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
57 -SLOT="0"
58 -IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
59 -
60 -DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
61 - >=app-arch/tar-1.27
62 - dev-lang/python-exec:2
63 - >=sys-apps/sed-4.0.5 sys-devel/patch
64 - doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
65 - epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
66 -# Require sandbox-2.2 for bug #288863.
67 -# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
68 -# quite slow, so it's not considered in the dependencies as an alternative to
69 -# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
70 -# for now, don't pull in xattr deps for other kernels.
71 -# For whirlpool hash, require python[ssl] (bug #425046).
72 -# For compgen, require bash[readline] (bug #445576).
73 -# app-portage/gemato goes without PYTHON_USEDEP since we're calling
74 -# the executable.
75 -RDEPEND="
76 - >=app-arch/tar-1.27
77 - dev-lang/python-exec:2
78 - !build? (
79 - >=sys-apps/sed-4.0.5
80 - app-shells/bash:0[readline]
81 - >=app-admin/eselect-1.2
82 - $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
83 - python{2_7,3_5} pypy)
84 - rsync-verify? (
85 - >=app-portage/gemato-14[${PYTHON_USEDEP}]
86 - >=app-crypt/openpgp-keys-gentoo-release-20180706
87 - >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
88 - )
89 - )
90 - elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
91 - elibc_glibc? ( >=sys-apps/sandbox-2.2 )
92 - elibc_musl? ( >=sys-apps/sandbox-2.2 )
93 - elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
94 - kernel_linux? (
95 - sys-apps/iproute2
96 - sys-apps/util-linux
97 - )
98 - >=app-misc/pax-utils-0.1.17
99 - selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
100 - xattr? ( kernel_linux? (
101 - >=sys-apps/install-xattr-0.3
102 - $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
103 - python2_7 pypy)
104 - ) )
105 - !<app-admin/logrotate-3.8.0
106 - !<app-portage/gentoolkit-0.4.6
107 - !<app-portage/repoman-2.3.10"
108 -PDEPEND="
109 - !build? (
110 - >=net-misc/rsync-2.6.4
111 - userland_GNU? ( >=sys-apps/coreutils-6.4 )
112 - )"
113 -# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
114 -# NOTE: FEATURES=installsources requires debugedit and rsync
115 -
116 -REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
117 -
118 -SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
119 -
120 -prefix_src_archives() {
121 - local x y
122 - for x in ${@}; do
123 - for y in ${SRC_ARCHIVES}; do
124 - echo ${y}/${x}
125 - done
126 - done
127 -}
128 -
129 -TARBALL_PV=${PV}
130 -SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
131 - $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
132 -
133 -pkg_pretend() {
134 - local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
135 -
136 - check_extra_config
137 -}
138 -
139 -pkg_setup() {
140 - use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
141 -}
142 -
143 -python_prepare_all() {
144 - distutils-r1_python_prepare_all
145 -
146 - if use gentoo-dev; then
147 - einfo "Disabling --dynamic-deps by default for gentoo-dev..."
148 - sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
149 - -i lib/_emerge/create_depgraph_params.py || \
150 - die "failed to patch create_depgraph_params.py"
151 -
152 - einfo "Enabling additional FEATURES for gentoo-dev..."
153 - echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
154 - >> cnf/make.globals || die
155 - fi
156 -
157 - if use native-extensions; then
158 - printf "[build_ext]\nportage-ext-modules=true\n" >> \
159 - setup.cfg || die
160 - fi
161 -
162 - if ! use ipc ; then
163 - einfo "Disabling ipc..."
164 - sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
165 - -i lib/_emerge/AbstractEbuildProcess.py || \
166 - die "failed to patch AbstractEbuildProcess.py"
167 - fi
168 -
169 - if use xattr && use kernel_linux ; then
170 - einfo "Adding FEATURES=xattr to make.globals ..."
171 - echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
172 - || die "failed to append to make.globals"
173 - fi
174 -
175 - if use build || ! use rsync-verify; then
176 - sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
177 - -e '/^sync-webrsync-verify-signature/s|yes|no|' \
178 - -i cnf/repos.conf || die "sed failed"
179 - fi
180 -
181 - if [[ -n ${EPREFIX} ]] ; then
182 - einfo "Setting portage.const.EPREFIX ..."
183 - hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
184 - -w "/_BINARY/" lib/portage/const.py
185 -
186 - einfo "Prefixing shebangs ..."
187 - while read -r -d $'\0' ; do
188 - local shebang=$(head -n1 "$REPLY")
189 - if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
190 - sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
191 - die "sed failed"
192 - fi
193 - done < <(find . -type f ! -name etc-update -print0)
194 -
195 - einfo "Adjusting make.globals, repos.conf and etc-update ..."
196 - hprefixify cnf/{make.globals,repos.conf} bin/etc-update
197 -
198 - if use prefix-guest ; then
199 - sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
200 - -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
201 - -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
202 - -i cnf/repos.conf || die "sed failed"
203 - fi
204 -
205 - einfo "Adding FEATURES=force-prefix to make.globals ..."
206 - echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
207 - || die "failed to append to make.globals"
208 - fi
209 -
210 - cd "${S}/cnf" || die
211 - if [ -f "make.conf.example.${ARCH}".diff ]; then
212 - patch make.conf.example "make.conf.example.${ARCH}".diff || \
213 - die "Failed to patch make.conf.example"
214 - else
215 - eerror ""
216 - eerror "Portage does not have an arch-specific configuration for this arch."
217 - eerror "Please notify the arch maintainer about this issue. Using generic."
218 - eerror ""
219 - fi
220 -}
221 -
222 -python_compile_all() {
223 - local targets=()
224 - use doc && targets+=( docbook )
225 - use epydoc && targets+=( epydoc )
226 -
227 - if [[ ${targets[@]} ]]; then
228 - esetup.py "${targets[@]}"
229 - fi
230 -}
231 -
232 -python_test() {
233 - esetup.py test
234 -}
235 -
236 -python_install() {
237 - # Install sbin scripts to bindir for python-exec linking
238 - # they will be relocated in pkg_preinst()
239 - distutils-r1_python_install \
240 - --system-prefix="${EPREFIX}/usr" \
241 - --bindir="$(python_get_scriptdir)" \
242 - --docdir="${EPREFIX}/usr/share/doc/${PF}" \
243 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
244 - --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
245 - --sbindir="$(python_get_scriptdir)" \
246 - --sysconfdir="${EPREFIX}/etc" \
247 - "${@}"
248 -}
249 -
250 -python_install_all() {
251 - distutils-r1_python_install_all
252 -
253 - local targets=()
254 - use doc && targets+=(
255 - install_docbook
256 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
257 - )
258 - use epydoc && targets+=(
259 - install_epydoc
260 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
261 - )
262 -
263 - # install docs
264 - if [[ ${targets[@]} ]]; then
265 - esetup.py "${targets[@]}"
266 - fi
267 -
268 - systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
269 -
270 - # Due to distutils/python-exec limitations
271 - # these must be installed to /usr/bin.
272 - local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
273 - einfo "Moving admin scripts to the correct directory"
274 - dodir /usr/sbin
275 - for target in ${sbin_relocations}; do
276 - einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
277 - mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
278 - done
279 -}
280 -
281 -pkg_preinst() {
282 - python_setup
283 - python_export PYTHON_SITEDIR
284 - [[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory"
285 - env -u DISTDIR \
286 - -u PORTAGE_OVERRIDE_EPREFIX \
287 - -u PORTAGE_REPOSITORIES \
288 - -u PORTDIR \
289 - -u PORTDIR_OVERLAY \
290 - PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
291 - "${PYTHON}" -m portage._compat_upgrade.default_locations || die
292 -
293 - # elog dir must exist to avoid logrotate error for bug #415911.
294 - # This code runs in preinst in order to bypass the mapping of
295 - # portage:portage to root:root which happens after src_install.
296 - keepdir /var/log/portage/elog
297 - # This is allowed to fail if the user/group are invalid for prefix users.
298 - if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
299 - chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
300 - fi
301 -}
302
303 diff --git a/sys-apps/portage/portage-2.3.73.ebuild b/sys-apps/portage/portage-2.3.73.ebuild
304 deleted file mode 100644
305 index 1d8c2f62839..00000000000
306 --- a/sys-apps/portage/portage-2.3.73.ebuild
307 +++ /dev/null
308 @@ -1,264 +0,0 @@
309 -# Copyright 1999-2019 Gentoo Authors
310 -# Distributed under the terms of the GNU General Public License v2
311 -
312 -EAPI=5
313 -
314 -PYTHON_COMPAT=(
315 - pypy
316 - python3_5 python3_6 python3_7
317 - python2_7
318 -)
319 -PYTHON_REQ_USE='bzip2(+),threads(+)'
320 -
321 -inherit distutils-r1 linux-info systemd prefix
322 -
323 -DESCRIPTION="Portage is the package management and distribution system for Gentoo"
324 -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
325 -
326 -LICENSE="GPL-2"
327 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
328 -SLOT="0"
329 -IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
330 -
331 -DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
332 - >=app-arch/tar-1.27
333 - dev-lang/python-exec:2
334 - >=sys-apps/sed-4.0.5 sys-devel/patch
335 - doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
336 - epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
337 -# Require sandbox-2.2 for bug #288863.
338 -# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
339 -# quite slow, so it's not considered in the dependencies as an alternative to
340 -# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
341 -# for now, don't pull in xattr deps for other kernels.
342 -# For whirlpool hash, require python[ssl] (bug #425046).
343 -# For compgen, require bash[readline] (bug #445576).
344 -# app-portage/gemato goes without PYTHON_USEDEP since we're calling
345 -# the executable.
346 -RDEPEND="
347 - >=app-arch/tar-1.27
348 - dev-lang/python-exec:2
349 - !build? (
350 - >=sys-apps/sed-4.0.5
351 - app-shells/bash:0[readline]
352 - >=app-admin/eselect-1.2
353 - $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
354 - python{2_7,3_5} pypy)
355 - rsync-verify? (
356 - >=app-portage/gemato-14[${PYTHON_USEDEP}]
357 - >=app-crypt/openpgp-keys-gentoo-release-20180706
358 - >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
359 - )
360 - )
361 - elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
362 - elibc_glibc? ( >=sys-apps/sandbox-2.2 )
363 - elibc_musl? ( >=sys-apps/sandbox-2.2 )
364 - elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
365 - kernel_linux? (
366 - sys-apps/iproute2
367 - sys-apps/util-linux
368 - )
369 - >=app-misc/pax-utils-0.1.17
370 - selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
371 - xattr? ( kernel_linux? (
372 - >=sys-apps/install-xattr-0.3
373 - $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
374 - python2_7 pypy)
375 - ) )
376 - !<app-admin/logrotate-3.8.0
377 - !<app-portage/gentoolkit-0.4.6
378 - !<app-portage/repoman-2.3.10"
379 -PDEPEND="
380 - !build? (
381 - >=net-misc/rsync-2.6.4
382 - userland_GNU? ( >=sys-apps/coreutils-6.4 )
383 - )"
384 -# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
385 -# NOTE: FEATURES=installsources requires debugedit and rsync
386 -
387 -REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
388 -
389 -SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
390 -
391 -prefix_src_archives() {
392 - local x y
393 - for x in ${@}; do
394 - for y in ${SRC_ARCHIVES}; do
395 - echo ${y}/${x}
396 - done
397 - done
398 -}
399 -
400 -TARBALL_PV=${PV}
401 -SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
402 - $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
403 -
404 -pkg_pretend() {
405 - local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
406 -
407 - check_extra_config
408 -}
409 -
410 -pkg_setup() {
411 - use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
412 -}
413 -
414 -python_prepare_all() {
415 - distutils-r1_python_prepare_all
416 -
417 - if use gentoo-dev; then
418 - einfo "Disabling --dynamic-deps by default for gentoo-dev..."
419 - sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
420 - -i lib/_emerge/create_depgraph_params.py || \
421 - die "failed to patch create_depgraph_params.py"
422 -
423 - einfo "Enabling additional FEATURES for gentoo-dev..."
424 - echo 'FEATURES="${FEATURES} strict-keepdir"' \
425 - >> cnf/make.globals || die
426 - fi
427 -
428 - if use native-extensions; then
429 - printf "[build_ext]\nportage-ext-modules=true\n" >> \
430 - setup.cfg || die
431 - fi
432 -
433 - if ! use ipc ; then
434 - einfo "Disabling ipc..."
435 - sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
436 - -i lib/_emerge/AbstractEbuildProcess.py || \
437 - die "failed to patch AbstractEbuildProcess.py"
438 - fi
439 -
440 - if use xattr && use kernel_linux ; then
441 - einfo "Adding FEATURES=xattr to make.globals ..."
442 - echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
443 - || die "failed to append to make.globals"
444 - fi
445 -
446 - if use build || ! use rsync-verify; then
447 - sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
448 - -e '/^sync-webrsync-verify-signature/s|yes|no|' \
449 - -i cnf/repos.conf || die "sed failed"
450 - fi
451 -
452 - if [[ -n ${EPREFIX} ]] ; then
453 - einfo "Setting portage.const.EPREFIX ..."
454 - hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
455 - -w "/_BINARY/" lib/portage/const.py
456 -
457 - einfo "Prefixing shebangs ..."
458 - while read -r -d $'\0' ; do
459 - local shebang=$(head -n1 "$REPLY")
460 - if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
461 - sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
462 - die "sed failed"
463 - fi
464 - done < <(find . -type f ! -name etc-update -print0)
465 -
466 - einfo "Adjusting make.globals, repos.conf and etc-update ..."
467 - hprefixify cnf/{make.globals,repos.conf} bin/etc-update
468 -
469 - if use prefix-guest ; then
470 - sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
471 - -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
472 - -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
473 - -i cnf/repos.conf || die "sed failed"
474 - fi
475 -
476 - einfo "Adding FEATURES=force-prefix to make.globals ..."
477 - echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
478 - || die "failed to append to make.globals"
479 - fi
480 -
481 - cd "${S}/cnf" || die
482 - if [ -f "make.conf.example.${ARCH}".diff ]; then
483 - patch make.conf.example "make.conf.example.${ARCH}".diff || \
484 - die "Failed to patch make.conf.example"
485 - else
486 - eerror ""
487 - eerror "Portage does not have an arch-specific configuration for this arch."
488 - eerror "Please notify the arch maintainer about this issue. Using generic."
489 - eerror ""
490 - fi
491 -}
492 -
493 -python_compile_all() {
494 - local targets=()
495 - use doc && targets+=( docbook )
496 - use epydoc && targets+=( epydoc )
497 -
498 - if [[ ${targets[@]} ]]; then
499 - esetup.py "${targets[@]}"
500 - fi
501 -}
502 -
503 -python_test() {
504 - esetup.py test
505 -}
506 -
507 -python_install() {
508 - # Install sbin scripts to bindir for python-exec linking
509 - # they will be relocated in pkg_preinst()
510 - distutils-r1_python_install \
511 - --system-prefix="${EPREFIX}/usr" \
512 - --bindir="$(python_get_scriptdir)" \
513 - --docdir="${EPREFIX}/usr/share/doc/${PF}" \
514 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
515 - --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
516 - --sbindir="$(python_get_scriptdir)" \
517 - --sysconfdir="${EPREFIX}/etc" \
518 - "${@}"
519 -}
520 -
521 -python_install_all() {
522 - distutils-r1_python_install_all
523 -
524 - local targets=()
525 - use doc && targets+=(
526 - install_docbook
527 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
528 - )
529 - use epydoc && targets+=(
530 - install_epydoc
531 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
532 - )
533 -
534 - # install docs
535 - if [[ ${targets[@]} ]]; then
536 - esetup.py "${targets[@]}"
537 - fi
538 -
539 - systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
540 -
541 - # Due to distutils/python-exec limitations
542 - # these must be installed to /usr/bin.
543 - local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
544 - einfo "Moving admin scripts to the correct directory"
545 - dodir /usr/sbin
546 - for target in ${sbin_relocations}; do
547 - einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
548 - mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
549 - done
550 -}
551 -
552 -pkg_preinst() {
553 - python_setup
554 - python_export PYTHON_SITEDIR
555 - [[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory"
556 - env -u DISTDIR \
557 - -u PORTAGE_OVERRIDE_EPREFIX \
558 - -u PORTAGE_REPOSITORIES \
559 - -u PORTDIR \
560 - -u PORTDIR_OVERLAY \
561 - PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
562 - "${PYTHON}" -m portage._compat_upgrade.default_locations || die
563 -
564 - # elog dir must exist to avoid logrotate error for bug #415911.
565 - # This code runs in preinst in order to bypass the mapping of
566 - # portage:portage to root:root which happens after src_install.
567 - keepdir /var/log/portage/elog
568 - # This is allowed to fail if the user/group are invalid for prefix users.
569 - if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
570 - chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
571 - fi
572 -}
573
574 diff --git a/sys-apps/portage/portage-2.3.74.ebuild b/sys-apps/portage/portage-2.3.74.ebuild
575 deleted file mode 100644
576 index b45fedf3529..00000000000
577 --- a/sys-apps/portage/portage-2.3.74.ebuild
578 +++ /dev/null
579 @@ -1,261 +0,0 @@
580 -# Copyright 1999-2019 Gentoo Authors
581 -# Distributed under the terms of the GNU General Public License v2
582 -
583 -EAPI=5
584 -
585 -PYTHON_COMPAT=(
586 - pypy
587 - python3_5 python3_6 python3_7
588 - python2_7
589 -)
590 -PYTHON_REQ_USE='bzip2(+),threads(+)'
591 -
592 -inherit distutils-r1 linux-info systemd prefix
593 -
594 -DESCRIPTION="Portage is the package management and distribution system for Gentoo"
595 -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
596 -
597 -LICENSE="GPL-2"
598 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
599 -SLOT="0"
600 -IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
601 -
602 -DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
603 - >=app-arch/tar-1.27
604 - dev-lang/python-exec:2
605 - >=sys-apps/sed-4.0.5 sys-devel/patch
606 - doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
607 - epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
608 -# Require sandbox-2.2 for bug #288863.
609 -# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
610 -# quite slow, so it's not considered in the dependencies as an alternative to
611 -# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
612 -# for now, don't pull in xattr deps for other kernels.
613 -# For whirlpool hash, require python[ssl] (bug #425046).
614 -# For compgen, require bash[readline] (bug #445576).
615 -# app-portage/gemato goes without PYTHON_USEDEP since we're calling
616 -# the executable.
617 -RDEPEND="
618 - >=app-arch/tar-1.27
619 - dev-lang/python-exec:2
620 - !build? (
621 - >=sys-apps/sed-4.0.5
622 - app-shells/bash:0[readline]
623 - >=app-admin/eselect-1.2
624 - $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
625 - python{2_7,3_5} pypy)
626 - rsync-verify? (
627 - >=app-portage/gemato-14[${PYTHON_USEDEP}]
628 - >=app-crypt/openpgp-keys-gentoo-release-20180706
629 - >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
630 - )
631 - )
632 - elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
633 - elibc_glibc? ( >=sys-apps/sandbox-2.2 )
634 - elibc_musl? ( >=sys-apps/sandbox-2.2 )
635 - elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
636 - kernel_linux? ( sys-apps/util-linux )
637 - >=app-misc/pax-utils-0.1.17
638 - selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
639 - xattr? ( kernel_linux? (
640 - >=sys-apps/install-xattr-0.3
641 - $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
642 - python2_7 pypy)
643 - ) )
644 - !<app-admin/logrotate-3.8.0
645 - !<app-portage/gentoolkit-0.4.6
646 - !<app-portage/repoman-2.3.10"
647 -PDEPEND="
648 - !build? (
649 - >=net-misc/rsync-2.6.4
650 - userland_GNU? ( >=sys-apps/coreutils-6.4 )
651 - )"
652 -# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
653 -# NOTE: FEATURES=installsources requires debugedit and rsync
654 -
655 -REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
656 -
657 -SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
658 -
659 -prefix_src_archives() {
660 - local x y
661 - for x in ${@}; do
662 - for y in ${SRC_ARCHIVES}; do
663 - echo ${y}/${x}
664 - done
665 - done
666 -}
667 -
668 -TARBALL_PV=${PV}
669 -SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
670 - $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
671 -
672 -pkg_pretend() {
673 - local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
674 -
675 - check_extra_config
676 -}
677 -
678 -pkg_setup() {
679 - use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
680 -}
681 -
682 -python_prepare_all() {
683 - distutils-r1_python_prepare_all
684 -
685 - if use gentoo-dev; then
686 - einfo "Disabling --dynamic-deps by default for gentoo-dev..."
687 - sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
688 - -i lib/_emerge/create_depgraph_params.py || \
689 - die "failed to patch create_depgraph_params.py"
690 -
691 - einfo "Enabling additional FEATURES for gentoo-dev..."
692 - echo 'FEATURES="${FEATURES} strict-keepdir"' \
693 - >> cnf/make.globals || die
694 - fi
695 -
696 - if use native-extensions; then
697 - printf "[build_ext]\nportage-ext-modules=true\n" >> \
698 - setup.cfg || die
699 - fi
700 -
701 - if ! use ipc ; then
702 - einfo "Disabling ipc..."
703 - sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
704 - -i lib/_emerge/AbstractEbuildProcess.py || \
705 - die "failed to patch AbstractEbuildProcess.py"
706 - fi
707 -
708 - if use xattr && use kernel_linux ; then
709 - einfo "Adding FEATURES=xattr to make.globals ..."
710 - echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
711 - || die "failed to append to make.globals"
712 - fi
713 -
714 - if use build || ! use rsync-verify; then
715 - sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
716 - -e '/^sync-webrsync-verify-signature/s|yes|no|' \
717 - -i cnf/repos.conf || die "sed failed"
718 - fi
719 -
720 - if [[ -n ${EPREFIX} ]] ; then
721 - einfo "Setting portage.const.EPREFIX ..."
722 - hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
723 - -w "/_BINARY/" lib/portage/const.py
724 -
725 - einfo "Prefixing shebangs ..."
726 - while read -r -d $'\0' ; do
727 - local shebang=$(head -n1 "$REPLY")
728 - if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
729 - sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
730 - die "sed failed"
731 - fi
732 - done < <(find . -type f ! -name etc-update -print0)
733 -
734 - einfo "Adjusting make.globals, repos.conf and etc-update ..."
735 - hprefixify cnf/{make.globals,repos.conf} bin/etc-update
736 -
737 - if use prefix-guest ; then
738 - sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
739 - -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
740 - -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
741 - -i cnf/repos.conf || die "sed failed"
742 - fi
743 -
744 - einfo "Adding FEATURES=force-prefix to make.globals ..."
745 - echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
746 - || die "failed to append to make.globals"
747 - fi
748 -
749 - cd "${S}/cnf" || die
750 - if [ -f "make.conf.example.${ARCH}".diff ]; then
751 - patch make.conf.example "make.conf.example.${ARCH}".diff || \
752 - die "Failed to patch make.conf.example"
753 - else
754 - eerror ""
755 - eerror "Portage does not have an arch-specific configuration for this arch."
756 - eerror "Please notify the arch maintainer about this issue. Using generic."
757 - eerror ""
758 - fi
759 -}
760 -
761 -python_compile_all() {
762 - local targets=()
763 - use doc && targets+=( docbook )
764 - use epydoc && targets+=( epydoc )
765 -
766 - if [[ ${targets[@]} ]]; then
767 - esetup.py "${targets[@]}"
768 - fi
769 -}
770 -
771 -python_test() {
772 - esetup.py test
773 -}
774 -
775 -python_install() {
776 - # Install sbin scripts to bindir for python-exec linking
777 - # they will be relocated in pkg_preinst()
778 - distutils-r1_python_install \
779 - --system-prefix="${EPREFIX}/usr" \
780 - --bindir="$(python_get_scriptdir)" \
781 - --docdir="${EPREFIX}/usr/share/doc/${PF}" \
782 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
783 - --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
784 - --sbindir="$(python_get_scriptdir)" \
785 - --sysconfdir="${EPREFIX}/etc" \
786 - "${@}"
787 -}
788 -
789 -python_install_all() {
790 - distutils-r1_python_install_all
791 -
792 - local targets=()
793 - use doc && targets+=(
794 - install_docbook
795 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
796 - )
797 - use epydoc && targets+=(
798 - install_epydoc
799 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
800 - )
801 -
802 - # install docs
803 - if [[ ${targets[@]} ]]; then
804 - esetup.py "${targets[@]}"
805 - fi
806 -
807 - systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
808 -
809 - # Due to distutils/python-exec limitations
810 - # these must be installed to /usr/bin.
811 - local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
812 - einfo "Moving admin scripts to the correct directory"
813 - dodir /usr/sbin
814 - for target in ${sbin_relocations}; do
815 - einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
816 - mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
817 - done
818 -}
819 -
820 -pkg_preinst() {
821 - python_setup
822 - python_export PYTHON_SITEDIR
823 - [[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory"
824 - env -u DISTDIR \
825 - -u PORTAGE_OVERRIDE_EPREFIX \
826 - -u PORTAGE_REPOSITORIES \
827 - -u PORTDIR \
828 - -u PORTDIR_OVERLAY \
829 - PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
830 - "${PYTHON}" -m portage._compat_upgrade.default_locations || die
831 -
832 - # elog dir must exist to avoid logrotate error for bug #415911.
833 - # This code runs in preinst in order to bypass the mapping of
834 - # portage:portage to root:root which happens after src_install.
835 - keepdir /var/log/portage/elog
836 - # This is allowed to fail if the user/group are invalid for prefix users.
837 - if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
838 - chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
839 - fi
840 -}