Gentoo Archives: gentoo-commits

From: Thomas Sachau <tommy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/multilib-portage:master commit in: sys-apps/portage/
Date: Sat, 29 Feb 2020 15:29:34
Message-Id: 1582990044.653a4430aa189c31f10e448b312b1cec2fbf220d.tommy@gentoo
1 commit: 653a4430aa189c31f10e448b312b1cec2fbf220d
2 Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 29 15:27:24 2020 +0000
4 Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 29 15:27:24 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=653a4430
7
8 sys-apps/portage: Drop old versions, update keywords
9
10 Package-Manager: Portage-2.3.83, Repoman-2.3.20
11 Manifest-Sign-Key: 0xC05330B3211CA2D4
12 Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>
13
14 sys-apps/portage/Manifest | 17 +-
15 sys-apps/portage/portage-2.3.52.ebuild | 270 --------------------------------
16 sys-apps/portage/portage-2.3.62.ebuild | 277 ---------------------------------
17 sys-apps/portage/portage-2.3.83.ebuild | 4 +-
18 4 files changed, 16 insertions(+), 552 deletions(-)
19
20 diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
21 index 56f99ad0f..928230528 100644
22 --- a/sys-apps/portage/Manifest
23 +++ b/sys-apps/portage/Manifest
24 @@ -1,6 +1,17 @@
25 +-----BEGIN PGP SIGNED MESSAGE-----
26 +Hash: SHA256
27 +
28 AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c9234c25d1266e4f6eba6ac72f907757c5f98394e1248b436286f8ba1c48456b752ee4ceb8405da SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0
29 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
30 -EBUILD portage-2.3.52.ebuild 9177 BLAKE2B 9582e49b6f99b0fe143c4fdbbdc860df052124b7223a51666a7739b8460cf87c0e845753de93360820f6af610e9977a72b6bb245fdba23915619c37b191378d9 SHA512 d726efed19ebe00514e57bd5ce7bd5e549aaa7164ce003eee36cab792288a7ce628fda61ec4be7eba229eece6449da8c52b276fe74c7e979fa762fd5558e1daf
31 -EBUILD portage-2.3.62.ebuild 9313 BLAKE2B 791935ee2bcdda2507dfe709cf198103b7bf4c1379ad66ac73655367cef90b4812a111e85cb08ed942d4bc65b0d4361d5927714739aec84e1fd3555ec5178cfd SHA512 c17efef67c6e1f9b65acd05d1e9aa0cd81e5b53438530529d7cb991baa2fab4d5346bbe6cc46589a8c20fff35e273ef62b9c17a02d302db891fc2ccf1479801b
32 -EBUILD portage-2.3.83.ebuild 8667 BLAKE2B e667865b0d9aad012bafa73b798fe110862c1d373a10ab43344d91387b55b056e616e14df6ff81ed75c97b05d2b8a4aca7126c656f1e350e50a3dc668ff8960c SHA512 5aa05757d228ee66ca2a17b9e54f030f77429576c1c6a0d79f9b2502f4b828a628146b786eee9dfbb1505714f2501d01961541ccb82684fcb096d0ada3be696a
33 +EBUILD portage-2.3.83.ebuild 8653 BLAKE2B e7a9892e867929c241a43ccd0c2afc758994aafc98db458a159e144dc6ee2f7b4019012deb4a4612678b2a85602a7bc2d35cb0ff947afb446b47307c285159f7 SHA512 6ce1e72eb76b9959b0fa3303448697a2e4a2ccc70358ade26bddd16b3fac897d0c98628c415456213fbf3d0abb3bb26e3349347992b27ee3253f026c39055a07
34 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
35 +-----BEGIN PGP SIGNATURE-----
36 +
37 +iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAl5agtVfFIAAAAAALgAo
38 +aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
39 +MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
40 +kGeiPgQAphjQ0LQ3zj7/Dpe9qOBFSRYks3+klYgrenmOIzsV0MuaEuBnK64hIBSr
41 +PE9fe8v0szwiF/TPWjqF0OUCeepsm49qk76/oQa2p33ossWYMWjLUzMWmdwNFaI+
42 +i+VqrcyqIt0dolzFL184lMvLAatUQBnn+nYjFS0V3SQfFIRT0mc=
43 +=EoRj
44 +-----END PGP SIGNATURE-----
45
46 diff --git a/sys-apps/portage/portage-2.3.52.ebuild b/sys-apps/portage/portage-2.3.52.ebuild
47 deleted file mode 100644
48 index 06b72fd8f..000000000
49 --- a/sys-apps/portage/portage-2.3.52.ebuild
50 +++ /dev/null
51 @@ -1,270 +0,0 @@
52 -# Copyright 1999-2019 Gentoo Authors
53 -# Distributed under the terms of the GNU General Public License v2
54 -
55 -EAPI=5
56 -
57 -PYTHON_COMPAT=(
58 - pypy
59 - python3_4 python3_5 python3_6 python3_7
60 - python2_7
61 -)
62 -PYTHON_REQ_USE='bzip2(+),threads(+)'
63 -
64 -inherit distutils-r1 git-2 multilib systemd
65 -
66 -EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git"
67 -EGIT_BRANCH="multilib"
68 -EGIT_COMMIT="533044621a8608b0186ae79eeaa994a0a40a7204"
69 -DESCRIPTION="Portage is the package management and distribution system for Gentoo"
70 -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
71 -
72 -LICENSE="GPL-2"
73 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
74 -SLOT="0"
75 -IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
76 -
77 -DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
78 - >=app-arch/tar-1.27
79 - dev-lang/python-exec:2
80 - >=sys-apps/sed-4.0.5 sys-devel/patch
81 - doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
82 - >=sys-apps/abi-wrapper-1.0-r6
83 - epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
84 -# Require sandbox-2.2 for bug #288863.
85 -# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
86 -# quite slow, so it's not considered in the dependencies as an alternative to
87 -# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
88 -# for now, don't pull in xattr deps for other kernels.
89 -# For whirlpool hash, require python[ssl] (bug #425046).
90 -# For compgen, require bash[readline] (bug #445576).
91 -# app-portage/gemato goes without PYTHON_USEDEP since we're calling
92 -# the executable.
93 -RDEPEND="
94 - >=app-arch/tar-1.27
95 - dev-lang/python-exec:2
96 - !build? (
97 - >=sys-apps/sed-4.0.5
98 - app-shells/bash:0[readline]
99 - >=app-admin/eselect-1.2
100 - $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
101 - python{2_7,3_4,3_5} pypy)
102 - rsync-verify? (
103 - >=app-portage/gemato-14[${PYTHON_USEDEP}]
104 - >=app-crypt/openpgp-keys-gentoo-release-20180706
105 - >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
106 - )
107 - )
108 - elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
109 - elibc_glibc? ( >=sys-apps/sandbox-2.2 )
110 - elibc_musl? ( >=sys-apps/sandbox-2.2 )
111 - elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
112 - >=app-misc/pax-utils-0.1.17
113 - selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
114 - xattr? ( kernel_linux? (
115 - >=sys-apps/install-xattr-0.3
116 - $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
117 - python2_7 pypy)
118 - ) )
119 - !<app-admin/logrotate-3.8.0
120 - >=sys-apps/abi-wrapper-1.0-r6
121 - !<app-portage/repoman-2.3.10"
122 -PDEPEND="
123 - !build? (
124 - >=net-misc/rsync-2.6.4
125 - userland_GNU? ( >=sys-apps/coreutils-6.4 )
126 - )"
127 -# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
128 -# NOTE: FEATURES=installsources requires debugedit and rsync
129 -
130 -REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
131 -
132 -pkg_setup() {
133 - use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
134 -}
135 -
136 -python_prepare_all() {
137 - distutils-r1_python_prepare_all
138 -
139 - if use gentoo-dev; then
140 - einfo "Disabling --dynamic-deps by default for gentoo-dev..."
141 - sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
142 - -i lib/_emerge/create_depgraph_params.py || \
143 - die "failed to patch create_depgraph_params.py"
144 -
145 - einfo "Enabling additional FEATURES for gentoo-dev..."
146 - echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
147 - >> cnf/make.globals || die
148 - fi
149 -
150 - if use native-extensions; then
151 - printf "[build_ext]\nportage-ext-modules=true\n" >> \
152 - setup.cfg || die
153 - fi
154 -
155 - if ! use ipc ; then
156 - einfo "Disabling ipc..."
157 - sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
158 - -i lib/_emerge/AbstractEbuildProcess.py || \
159 - die "failed to patch AbstractEbuildProcess.py"
160 - fi
161 -
162 - if use xattr && use kernel_linux ; then
163 - einfo "Adding FEATURES=xattr to make.globals ..."
164 - echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
165 - || die "failed to append to make.globals"
166 - fi
167 -
168 - if use build || ! use rsync-verify; then
169 - sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
170 - -i cnf/repos.conf || die "sed failed"
171 - fi
172 -
173 - if [[ -n ${EPREFIX} ]] ; then
174 - einfo "Setting portage.const.EPREFIX ..."
175 - sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
176 - -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
177 - -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
178 - -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
179 - -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
180 - -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
181 - -i lib/portage/const.py || \
182 - die "Failed to patch portage.const.EPREFIX"
183 -
184 - einfo "Prefixing shebangs ..."
185 - while read -r -d $'\0' ; do
186 - local shebang=$(head -n1 "$REPLY")
187 - if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
188 - sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
189 - die "sed failed"
190 - fi
191 - done < <(find . -type f -print0)
192 -
193 - einfo "Adjusting make.globals ..."
194 - sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
195 - -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
196 - -i cnf/make.globals || die "sed failed"
197 -
198 - einfo "Adjusting repos.conf ..."
199 - sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
200 - -e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
201 - -i cnf/repos.conf || die "sed failed"
202 - if use prefix-guest ; then
203 - sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
204 - -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
205 - -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
206 - -i cnf/repos.conf || die "sed failed"
207 - fi
208 -
209 - einfo "Adding FEATURES=force-prefix to make.globals ..."
210 - echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
211 - || die "failed to append to make.globals"
212 - fi
213 -
214 - cd "${S}/cnf" || die
215 - if [ -f "make.conf.example.${ARCH}".diff ]; then
216 - patch make.conf.example "make.conf.example.${ARCH}".diff || \
217 - die "Failed to patch make.conf.example"
218 - else
219 - eerror ""
220 - eerror "Portage does not have an arch-specific configuration for this arch."
221 - eerror "Please notify the arch maintainer about this issue. Using generic."
222 - eerror ""
223 - fi
224 -}
225 -
226 -python_compile_all() {
227 - local targets=()
228 - use doc && targets+=( docbook )
229 - use epydoc && targets+=( epydoc )
230 -
231 - if [[ ${targets[@]} ]]; then
232 - esetup.py "${targets[@]}"
233 - fi
234 -}
235 -
236 -python_test() {
237 - esetup.py test
238 -}
239 -
240 -python_install() {
241 - # Install sbin scripts to bindir for python-exec linking
242 - # they will be relocated in pkg_preinst()
243 - distutils-r1_python_install \
244 - --system-prefix="${EPREFIX}/usr" \
245 - --bindir="$(python_get_scriptdir)" \
246 - --docdir="${EPREFIX}/usr/share/doc/${PF}" \
247 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
248 - --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
249 - --sbindir="$(python_get_scriptdir)" \
250 - --sysconfdir="${EPREFIX}/etc" \
251 - "${@}"
252 -}
253 -
254 -python_install_all() {
255 - distutils-r1_python_install_all
256 -
257 - local targets=()
258 - use doc && targets+=(
259 - install_docbook
260 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
261 - )
262 - use epydoc && targets+=(
263 - install_epydoc
264 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
265 - )
266 -
267 - # install docs
268 - if [[ ${targets[@]} ]]; then
269 - esetup.py "${targets[@]}"
270 - fi
271 -
272 - systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
273 -
274 - # Due to distutils/python-exec limitations
275 - # these must be installed to /usr/bin.
276 - local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
277 - einfo "Moving admin scripts to the correct directory"
278 - dodir /usr/sbin
279 - for target in ${sbin_relocations}; do
280 - einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
281 - mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
282 - done
283 -}
284 -
285 -pkg_preinst() {
286 - # comment out sanity test until it is fixed to work
287 - # with the new PORTAGE_PYM_PATH
288 - #if [[ $ROOT == / ]] ; then
289 - ## Run some minimal tests as a sanity check.
290 - #local test_runner=$(find "${ED}" -name runTests)
291 - #if [[ -n $test_runner && -x $test_runner ]] ; then
292 - #einfo "Running preinst sanity tests..."
293 - #"$test_runner" || die "preinst sanity tests failed"
294 - #fi
295 - #fi
296 -
297 - # elog dir must exist to avoid logrotate error for bug #415911.
298 - # This code runs in preinst in order to bypass the mapping of
299 - # portage:portage to root:root which happens after src_install.
300 - keepdir /var/log/portage/elog
301 - # This is allowed to fail if the user/group are invalid for prefix users.
302 - if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
303 - chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
304 - fi
305 -}
306 -
307 -pkg_postinst() {
308 - einfo
309 - elog "For setup instructions after switching to portage-multilib"
310 - elog "read doc/portage-multilib-instructions inside the multilib overlay"
311 - einfo
312 - elog "The bin/ dir of the overlay has some scripts to switch from lib32"
313 - elog "to MULTILIB_ABI or to add the default MULTILIB_ABI flags"
314 -
315 - einfo ""
316 - einfo "This release of portage NO LONGER contains the repoman code base."
317 - einfo "Repoman has its own ebuild and release package."
318 - einfo "For repoman functionality please emerge app-portage/repoman"
319 - einfo "Please report any bugs you may encounter."
320 - einfo ""
321 -}
322
323 diff --git a/sys-apps/portage/portage-2.3.62.ebuild b/sys-apps/portage/portage-2.3.62.ebuild
324 deleted file mode 100644
325 index 61d17e9bb..000000000
326 --- a/sys-apps/portage/portage-2.3.62.ebuild
327 +++ /dev/null
328 @@ -1,277 +0,0 @@
329 -# Copyright 1999-2019 Gentoo Authors
330 -# Distributed under the terms of the GNU General Public License v2
331 -
332 -EAPI=5
333 -
334 -PYTHON_COMPAT=(
335 - pypy
336 - python3_4 python3_5 python3_6 python3_7
337 - python2_7
338 -)
339 -PYTHON_REQ_USE='bzip2(+),threads(+)'
340 -
341 -inherit distutils-r1 git-2 linux-info multilib systemd
342 -
343 -EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git"
344 -EGIT_BRANCH="multilib"
345 -EGIT_COMMIT="88a712b0cf17c1bc47de174f8f1219d24912eee6"
346 -DESCRIPTION="Portage is the package management and distribution system for Gentoo"
347 -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
348 -
349 -LICENSE="GPL-2"
350 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
351 -SLOT="0"
352 -IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
353 -
354 -DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
355 - >=app-arch/tar-1.27
356 - dev-lang/python-exec:2
357 - >=sys-apps/sed-4.0.5 sys-devel/patch
358 - doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
359 - >=sys-apps/abi-wrapper-1.0-r6
360 - epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
361 -# Require sandbox-2.2 for bug #288863.
362 -# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
363 -# quite slow, so it's not considered in the dependencies as an alternative to
364 -# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
365 -# for now, don't pull in xattr deps for other kernels.
366 -# For whirlpool hash, require python[ssl] (bug #425046).
367 -# For compgen, require bash[readline] (bug #445576).
368 -# app-portage/gemato goes without PYTHON_USEDEP since we're calling
369 -# the executable.
370 -RDEPEND="
371 - >=app-arch/tar-1.27
372 - dev-lang/python-exec:2
373 - !build? (
374 - >=sys-apps/sed-4.0.5
375 - app-shells/bash:0[readline]
376 - >=app-admin/eselect-1.2
377 - $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
378 - python{2_7,3_4,3_5} pypy)
379 - rsync-verify? (
380 - >=app-portage/gemato-14[${PYTHON_USEDEP}]
381 - >=app-crypt/openpgp-keys-gentoo-release-20180706
382 - >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
383 - )
384 - )
385 - elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
386 - elibc_glibc? ( >=sys-apps/sandbox-2.2 )
387 - elibc_musl? ( >=sys-apps/sandbox-2.2 )
388 - elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
389 - kernel_linux? ( sys-apps/util-linux )
390 - >=app-misc/pax-utils-0.1.17
391 - selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
392 - xattr? ( kernel_linux? (
393 - >=sys-apps/install-xattr-0.3
394 - $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
395 - python2_7 pypy)
396 - ) )
397 - !<app-admin/logrotate-3.8.0
398 - >=sys-apps/abi-wrapper-1.0-r6
399 - !<app-portage/repoman-2.3.10"
400 -PDEPEND="
401 - !build? (
402 - >=net-misc/rsync-2.6.4
403 - userland_GNU? ( >=sys-apps/coreutils-6.4 )
404 - )"
405 -# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
406 -# NOTE: FEATURES=installsources requires debugedit and rsync
407 -
408 -REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
409 -
410 -pkg_pretend() {
411 - local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
412 -
413 - check_extra_config
414 -}
415 -
416 -pkg_setup() {
417 - use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
418 -}
419 -
420 -python_prepare_all() {
421 - distutils-r1_python_prepare_all
422 -
423 - if use gentoo-dev; then
424 - einfo "Disabling --dynamic-deps by default for gentoo-dev..."
425 - sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
426 - -i lib/_emerge/create_depgraph_params.py || \
427 - die "failed to patch create_depgraph_params.py"
428 -
429 - einfo "Enabling additional FEATURES for gentoo-dev..."
430 - echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
431 - >> cnf/make.globals || die
432 - fi
433 -
434 - if use native-extensions; then
435 - printf "[build_ext]\nportage-ext-modules=true\n" >> \
436 - setup.cfg || die
437 - fi
438 -
439 - if ! use ipc ; then
440 - einfo "Disabling ipc..."
441 - sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
442 - -i lib/_emerge/AbstractEbuildProcess.py || \
443 - die "failed to patch AbstractEbuildProcess.py"
444 - fi
445 -
446 - if use xattr && use kernel_linux ; then
447 - einfo "Adding FEATURES=xattr to make.globals ..."
448 - echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
449 - || die "failed to append to make.globals"
450 - fi
451 -
452 - if use build || ! use rsync-verify; then
453 - sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
454 - -i cnf/repos.conf || die "sed failed"
455 - fi
456 -
457 - if [[ -n ${EPREFIX} ]] ; then
458 - einfo "Setting portage.const.EPREFIX ..."
459 - sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
460 - -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
461 - -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
462 - -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
463 - -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
464 - -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
465 - -i lib/portage/const.py || \
466 - die "Failed to patch portage.const.EPREFIX"
467 -
468 - einfo "Prefixing shebangs ..."
469 - while read -r -d $'\0' ; do
470 - local shebang=$(head -n1 "$REPLY")
471 - if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
472 - sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
473 - die "sed failed"
474 - fi
475 - done < <(find . -type f -print0)
476 -
477 - einfo "Adjusting make.globals ..."
478 - sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
479 - -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
480 - -i cnf/make.globals || die "sed failed"
481 -
482 - einfo "Adjusting repos.conf ..."
483 - sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
484 - -e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
485 - -i cnf/repos.conf || die "sed failed"
486 - if use prefix-guest ; then
487 - sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
488 - -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
489 - -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
490 - -i cnf/repos.conf || die "sed failed"
491 - fi
492 -
493 - einfo "Adding FEATURES=force-prefix to make.globals ..."
494 - echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
495 - || die "failed to append to make.globals"
496 - fi
497 -
498 - cd "${S}/cnf" || die
499 - if [ -f "make.conf.example.${ARCH}".diff ]; then
500 - patch make.conf.example "make.conf.example.${ARCH}".diff || \
501 - die "Failed to patch make.conf.example"
502 - else
503 - eerror ""
504 - eerror "Portage does not have an arch-specific configuration for this arch."
505 - eerror "Please notify the arch maintainer about this issue. Using generic."
506 - eerror ""
507 - fi
508 -}
509 -
510 -python_compile_all() {
511 - local targets=()
512 - use doc && targets+=( docbook )
513 - use epydoc && targets+=( epydoc )
514 -
515 - if [[ ${targets[@]} ]]; then
516 - esetup.py "${targets[@]}"
517 - fi
518 -}
519 -
520 -python_test() {
521 - esetup.py test
522 -}
523 -
524 -python_install() {
525 - # Install sbin scripts to bindir for python-exec linking
526 - # they will be relocated in pkg_preinst()
527 - distutils-r1_python_install \
528 - --system-prefix="${EPREFIX}/usr" \
529 - --bindir="$(python_get_scriptdir)" \
530 - --docdir="${EPREFIX}/usr/share/doc/${PF}" \
531 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
532 - --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
533 - --sbindir="$(python_get_scriptdir)" \
534 - --sysconfdir="${EPREFIX}/etc" \
535 - "${@}"
536 -}
537 -
538 -python_install_all() {
539 - distutils-r1_python_install_all
540 -
541 - local targets=()
542 - use doc && targets+=(
543 - install_docbook
544 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
545 - )
546 - use epydoc && targets+=(
547 - install_epydoc
548 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
549 - )
550 -
551 - # install docs
552 - if [[ ${targets[@]} ]]; then
553 - esetup.py "${targets[@]}"
554 - fi
555 -
556 - systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
557 -
558 - # Due to distutils/python-exec limitations
559 - # these must be installed to /usr/bin.
560 - local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
561 - einfo "Moving admin scripts to the correct directory"
562 - dodir /usr/sbin
563 - for target in ${sbin_relocations}; do
564 - einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
565 - mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
566 - done
567 -}
568 -
569 -pkg_preinst() {
570 - # comment out sanity test until it is fixed to work
571 - # with the new PORTAGE_PYM_PATH
572 - #if [[ $ROOT == / ]] ; then
573 - ## Run some minimal tests as a sanity check.
574 - #local test_runner=$(find "${ED}" -name runTests)
575 - #if [[ -n $test_runner && -x $test_runner ]] ; then
576 - #einfo "Running preinst sanity tests..."
577 - #"$test_runner" || die "preinst sanity tests failed"
578 - #fi
579 - #fi
580 -
581 - # elog dir must exist to avoid logrotate error for bug #415911.
582 - # This code runs in preinst in order to bypass the mapping of
583 - # portage:portage to root:root which happens after src_install.
584 - keepdir /var/log/portage/elog
585 - # This is allowed to fail if the user/group are invalid for prefix users.
586 - if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
587 - chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
588 - fi
589 -}
590 -
591 -pkg_postinst() {
592 - einfo
593 - elog "For setup instructions after switching to portage-multilib"
594 - elog "read doc/portage-multilib-instructions inside the multilib overlay"
595 - einfo
596 - elog "The bin/ dir of the overlay has some scripts to switch from lib32"
597 - elog "to MULTILIB_ABI or to add the default MULTILIB_ABI flags"
598 -
599 - einfo ""
600 - einfo "This release of portage NO LONGER contains the repoman code base."
601 - einfo "Repoman has its own ebuild and release package."
602 - einfo "For repoman functionality please emerge app-portage/repoman"
603 - einfo "Please report any bugs you may encounter."
604 - einfo ""
605 -}
606
607 diff --git a/sys-apps/portage/portage-2.3.83.ebuild b/sys-apps/portage/portage-2.3.83.ebuild
608 index c8470d3c8..15fc5f1b4 100644
609 --- a/sys-apps/portage/portage-2.3.83.ebuild
610 +++ b/sys-apps/portage/portage-2.3.83.ebuild
611 @@ -1,4 +1,4 @@
612 -# Copyright 1999-2019 Gentoo Authors
613 +# Copyright 1999-2020 Gentoo Authors
614 # Distributed under the terms of the GNU General Public License v2
615
616 EAPI=5
617 @@ -20,7 +20,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
618 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
619
620 LICENSE="GPL-2"
621 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
622 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
623 SLOT="0"
624 IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"