Gentoo Archives: gentoo-commits

From: Felix Janda <felix.janda@××××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: sys-apps/portage/files/, sys-apps/portage/
Date: Sat, 01 Oct 2016 21:25:44
Message-Id: 1475356716.1eb0ff49085025c4840614e454d0ac7b7fa9f540.doughdemon@gentoo
1 commit: 1eb0ff49085025c4840614e454d0ac7b7fa9f540
2 Author: Felix Janda <felix.janda <AT> posteo <DOT> de>
3 AuthorDate: Sat Oct 1 20:07:00 2016 +0000
4 Commit: Felix Janda <felix.janda <AT> posteo <DOT> de>
5 CommitDate: Sat Oct 1 21:18:36 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=1eb0ff49
7
8 sys-apps/portage: prestabilize version 2.3.1
9
10 This upstream version works with musl.
11
12 sys-apps/portage/Manifest | 3 +
13 ...ert-URI-changes-related-to-docbook-schema.patch | 39 +++
14 sys-apps/portage/portage-2.3.1.ebuild | 365 +++++++++++++++++++++
15 3 files changed, 407 insertions(+)
16
17 diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
18 index 51130a3..fc77bb8 100644
19 --- a/sys-apps/portage/Manifest
20 +++ b/sys-apps/portage/Manifest
21 @@ -1,9 +1,12 @@
22 AUX 0001-pym-portage-util-locale.py-fix-decoding-for-python2-.patch 1374 SHA256 1c40030d4ef7c2a56ea81f00281a56432bb7918d294abcda7b9eab7eb05fd1c9 SHA512 f434323783fa4db0bc096f35da93a33311f00fd8b315f95cc5f3d78365ea0d70376609c27f1d64319bd49f83db6d0cc7d88d035c758f1f0de62f1ef9243c0a30 WHIRLPOOL cdecf4a184fea71c0ee93aa5598cc513e676203d8a226da8c90524471d79f2c22b474c2a2edba0ae3495257792dfc7bd3e78c9a9aed3e9e85bb4906161451891
23 AUX 0002-setup.py-add-stub-for-building-custom-modules-in-C-C.patch 1867 SHA256 285fd48357a1996a92860a03059656729d5faa05e4d150865abaaf79f93d5acd SHA512 e073c849650822ea01c804605a4c5743957f9c8c45076dcd9a983951f6607716c1891c0a564268af3c1c0680361d0c4605ed30e50c4f0a23909a1f155925622a WHIRLPOOL f0e6bdaa992d2d374a65e96c9a148b6460a42bb1d939f1b60bbb11368553c750318befae3157e236302580f8b682887ebdc08ec40e62e8f1d81cda925cd48e97
24 AUX 0003-pym-portage-util-locale.py-add-a-C-module-to-help-ch.patch 4075 SHA256 42e7c7c9eff8ee423f9e23a7f3d9aa2d629b2755cd053c21d53796bfb9f3655f SHA512 090b8905db5af236644e57b3050e80dab0d58ef63abd2c94746a63204de155379ab63ca9536e53e30be6d6e7bf529047675e17ce266c0256f5f1f828222e4a32 WHIRLPOOL 0b9baa422b64072eb95454b8e833fa040a4ea47d609f42ac7da744f58d3ef20d96e06ce4c488b26593c311a0d9451cc684849d04093328abf34d174c90023a7d
25 +AUX 2.3.1-doc-Revert-URI-changes-related-to-docbook-schema.patch 1394 SHA256 a076b70b775aef23e89127d2fc64065f2d7a895b3b56a723122f641375b7c3d3 SHA512 fb3488ec9c5a849bdc9ae2cfaed3732c939072cd847534fdeaaff28560b62ad5b184f15bfb6943b921f417ec7de8e1fd3845322a0ba4d3e55f625a12cf903dcd WHIRLPOOL ddf6cd307f063404f53e9e819b01965b053df7554790d1332a5d131c11e5e6eec466412c17c4d8b3dd124ab81797641001ec3bbcfadd7ff06f5e59b2f40dc7d2
26 AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5
27 AUX portage-2.2.26-fix-check_locale.patch 810 SHA256 d055958fe52fbfb4d628b11c3a52226f0ce07895d951efbf285d55b0bac455a1 SHA512 33b4d497788de9146abe9a99e4c788c94e8e5e4e615ae7bf18ed415407d4bf0398fb972d938a78f3fff1edfee425f2d672e9868e58efb15cfcccab65cfb5152b WHIRLPOOL 3477eb51320b13de03038e5cf1987f00cce03d65467148ffc23728540de09fde94128cc25986fc40688206059d2ca84734ba4a7379583f68511a2c5f0f0aff23
28 DIST portage-2.2.28.tar.bz2 969138 SHA256 da8148a1a9275c87f535679e41b1bb3a1380ba0f903b80510017517e4c5229d0 SHA512 d21bf7e7dcc0a779a13df6a959e5d4291492fce2a5525b67e9a4705888021f9c08b8d78cd32b2eb930ac5428c40383e4e46da5a7b1ed5c9c9c42314c0f1c6a0b WHIRLPOOL 1b9584b0243b46c70d0778aad57df2d3ea99e19f243280e542c29e6fed0634b72de6b203a3c296c2977d1a6e5e5250b910574176c692d2c7c27c0938528bb43d
29 +DIST portage-2.3.1.tar.bz2 918411 SHA256 a3c5ee98791c579687ad5ec6a7882a6b6a486a54c14d1bc73ccc9a79b4a507e9 SHA512 75a713cfa077ac271ad7fad0a48bbc923beedd2ec47000602576297fabae2de47ee69e7e6d52e02c87f9ba5d9e5b27c10fa9be7b308f72c6dcc8e7f6c321f2c6 WHIRLPOOL 4ee7942d73e8e5b977d0260b568d31d0b49387787f7ffa2e77d4ec49e00b3e67c54506840be463cb5a6da070683013192f46bb47df1df1a328457de1796d05c0
30 EBUILD portage-2.2.28-r99.ebuild 11704 SHA256 b814d8beda3bd2364b13153ef5663d40497684ace1cdc2209bd03a61a5fe8fb7 SHA512 78442e2d479acb0b59cade22060c5bef2740cf3c5ae451b25ca629f547824f4bb04a768e5400623d1508f72318bbc0abcf31b8286886241de6cbe640f0f95eb1 WHIRLPOOL 7f220a0e33e825b123f364dff0d43d57f1823bb01e454f66fea71825ec206d4fb8ce42478e033e98fb6c6ae1f598af57008b64effe6274a53e5655e39834095f
31 EBUILD portage-2.2.28-r999.ebuild 11908 SHA256 65003a03410bcfcc49b56746293dcdf8bbcabb6c85e6f4229fe2caf97a27dbe9 SHA512 4e33ae8ee35ecf9bf609e8b603de050903e4b4a1c79fc6eb65cff524b731dd044314ce72a663296cd511451e333351de1ac6374569d85852fd5ab6800bddaa7c WHIRLPOOL 842c97b6cfd98ca4f3b0de666b5bc3ce465cab48cd94cf66b7fe593be4344b8737da780cb8da7c2434880ee0e5df8594061c34914451fd6425cb84cf153cf0c4
32 +EBUILD portage-2.3.1.ebuild 11403 SHA256 5cefcb0b231eac7020baee448f135fa8b3c62b2479761ace88691fcaa97b170b SHA512 98ad8c0d53ddcc95c4e0c8d15798b02cc28239cc79cfc66af74c95088dde9a85f797b71891df6c5da4c829029c84ebc98e75c0013c3fb1bc5e01b6eb8b743aa7 WHIRLPOOL 92c6550e267d64ce3de84e6f060094150ff3218012fe6428276970767ad7eaf6ef422545e40ad0a1b8e5a99c8d9f3ae2c3b74868ec2224b189abb1bd3b1b1fad
33 MISC metadata.xml 814 SHA256 e33780a3f1af692a5539738aa243581beb5d6398daf23ac28a252b8481742db1 SHA512 d68c833a70bae0e497f5c0217f6f64161c7cbe3fd01253e8f5657512e5eb62438dec5cc587ca9667c0cd4f791f25cdcb3f7017743f6f66cfdc41fec835b4f3a7 WHIRLPOOL b2c926e03f312e1cdcaedf1f6c5f9b0c25887e93f44fb8aef56212f72369e1916efa863e34cd568d0f50cddcaf8fb9bf33d745d7fc785c62476162465f3298b7
34
35 diff --git a/sys-apps/portage/files/2.3.1-doc-Revert-URI-changes-related-to-docbook-schema.patch b/sys-apps/portage/files/2.3.1-doc-Revert-URI-changes-related-to-docbook-schema.patch
36 new file mode 100644
37 index 0000000..ee191ff
38 --- /dev/null
39 +++ b/sys-apps/portage/files/2.3.1-doc-Revert-URI-changes-related-to-docbook-schema.patch
40 @@ -0,0 +1,39 @@
41 +From 35863a80b915939aac3ce6bf017d942cac879df8 Mon Sep 17 00:00:00 2001
42 +From: Mike Gilbert <floppym@g.o>
43 +Date: Wed, 20 Jul 2016 12:30:05 -0400
44 +Subject: [PATCH] doc: Revert URI changes related to docbook schema
45 +
46 +This partially reverts b5365341dad167e314023df95d2c5e0f955962f0.
47 +
48 +X-Gentoo-Bug: 589210
49 +X-Gentoo-Bug-URL: https://bugs.gentoo.org/589210
50 +---
51 + doc/custom.xsl | 2 +-
52 + doc/portage.docbook | 2 +-
53 + 2 files changed, 2 insertions(+), 2 deletions(-)
54 +
55 +diff --git a/doc/custom.xsl b/doc/custom.xsl
56 +index 11a2b9e..a7763ec 100644
57 +--- a/doc/custom.xsl
58 ++++ b/doc/custom.xsl
59 +@@ -1,4 +1,4 @@
60 +-<xsl:stylesheet xmlns:xsl="https://www.w3.org/1999/XSL/Transform" version="1.0">
61 ++<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
62 + <xsl:param name="toc.section.depth" select="20"/>
63 + <xsl:param name="chunk.section.depth" select="2"/>
64 + <xsl:param name="generate.section.toc.level" select="2"/>
65 +diff --git a/doc/portage.docbook b/doc/portage.docbook
66 +index f7d539a..811544f 100644
67 +--- a/doc/portage.docbook
68 ++++ b/doc/portage.docbook
69 +@@ -1,6 +1,6 @@
70 + <?xml version="1.0" encoding="UTF-8"?>
71 + <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
72 +- "https://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
73 ++ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
74 +
75 + <!ENTITY date SYSTEM "fragment/date">
76 + <!ENTITY version SYSTEM "fragment/version">
77 +--
78 +2.10.0
79 +
80
81 diff --git a/sys-apps/portage/portage-2.3.1.ebuild b/sys-apps/portage/portage-2.3.1.ebuild
82 new file mode 100644
83 index 0000000..5b32485
84 --- /dev/null
85 +++ b/sys-apps/portage/portage-2.3.1.ebuild
86 @@ -0,0 +1,365 @@
87 +# Copyright 1999-2016 Gentoo Foundation
88 +# Distributed under the terms of the GNU General Public License v2
89 +# $Id$
90 +
91 +EAPI=5
92 +
93 +PYTHON_COMPAT=(
94 + pypy
95 + python3_3 python3_4 python3_5
96 + python2_7
97 +)
98 +PYTHON_REQ_USE='bzip2(+)'
99 +
100 +inherit distutils-r1 multilib
101 +
102 +DESCRIPTION="Portage is the package management and distribution system for Gentoo"
103 +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
104 +
105 +LICENSE="GPL-2"
106 +KEYWORDS="amd64 arm ~mips ppc x86"
107 +SLOT="0"
108 +IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
109 +
110 +DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
111 + >=app-arch/tar-1.27
112 + dev-lang/python-exec:2
113 + >=sys-apps/sed-4.0.5 sys-devel/patch
114 + doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
115 + epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
116 +# Require sandbox-2.2 for bug #288863.
117 +# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
118 +# quite slow, so it's not considered in the dependencies as an alternative to
119 +# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
120 +# for now, don't pull in xattr deps for other kernels.
121 +# For whirlpool hash, require python[ssl] (bug #425046).
122 +# For compgen, require bash[readline] (bug #445576).
123 +RDEPEND="
124 + >=app-arch/tar-1.27
125 + dev-lang/python-exec:2
126 + !build? (
127 + >=sys-apps/sed-4.0.5
128 + app-shells/bash:0[readline]
129 + >=app-admin/eselect-1.2
130 + )
131 + elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
132 + elibc_glibc? ( >=sys-apps/sandbox-2.2 )
133 + elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
134 + >=app-misc/pax-utils-0.1.17
135 + selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
136 + xattr? ( kernel_linux? (
137 + >=sys-apps/install-xattr-0.3
138 + $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
139 + python2_7 pypy)
140 + ) )
141 + !<app-admin/logrotate-3.8.0"
142 +PDEPEND="
143 + !build? (
144 + >=net-misc/rsync-2.6.4
145 + userland_GNU? ( >=sys-apps/coreutils-6.4 )
146 + )"
147 +# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
148 +# NOTE: FEATURES=installsources requires debugedit and rsync
149 +
150 +REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
151 +
152 +SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage"
153 +
154 +prefix_src_archives() {
155 + local x y
156 + for x in ${@}; do
157 + for y in ${SRC_ARCHIVES}; do
158 + echo ${y}/${x}
159 + done
160 + done
161 +}
162 +
163 +TARBALL_PV=${PV}
164 +SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
165 + $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
166 +
167 +PATCHES=(
168 + "${FILESDIR}/2.3.1-doc-Revert-URI-changes-related-to-docbook-schema.patch"
169 +)
170 +
171 +pkg_setup() {
172 + use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
173 +}
174 +
175 +python_prepare_all() {
176 + distutils-r1_python_prepare_all
177 +
178 + if ! use ipc ; then
179 + einfo "Disabling ipc..."
180 + sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
181 + -i pym/_emerge/AbstractEbuildProcess.py || \
182 + die "failed to patch AbstractEbuildProcess.py"
183 + fi
184 +
185 + if use xattr && use kernel_linux ; then
186 + einfo "Adding FEATURES=xattr to make.globals ..."
187 + echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
188 + || die "failed to append to make.globals"
189 + fi
190 +
191 + if [[ -n ${EPREFIX} ]] ; then
192 + einfo "Setting portage.const.EPREFIX ..."
193 + sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
194 + -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
195 + -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
196 + -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
197 + -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
198 + -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
199 + -i pym/portage/const.py || \
200 + die "Failed to patch portage.const.EPREFIX"
201 +
202 + einfo "Prefixing shebangs ..."
203 + while read -r -d $'\0' ; do
204 + local shebang=$(head -n1 "$REPLY")
205 + if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
206 + sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
207 + die "sed failed"
208 + fi
209 + done < <(find . -type f -print0)
210 +
211 + einfo "Adjusting make.globals ..."
212 + sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
213 + -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
214 + -i cnf/make.globals || die "sed failed"
215 +
216 + einfo "Adjusting repos.conf ..."
217 + sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
218 + -i cnf/repos.conf || die "sed failed"
219 +
220 + einfo "Adding FEATURES=force-prefix to make.globals ..."
221 + echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
222 + || die "failed to append to make.globals"
223 + fi
224 +
225 + cd "${S}/cnf" || die
226 + if [ -f "make.conf.example.${ARCH}".diff ]; then
227 + patch make.conf.example "make.conf.example.${ARCH}".diff || \
228 + die "Failed to patch make.conf.example"
229 + else
230 + eerror ""
231 + eerror "Portage does not have an arch-specific configuration for this arch."
232 + eerror "Please notify the arch maintainer about this issue. Using generic."
233 + eerror ""
234 + fi
235 +}
236 +
237 +python_compile_all() {
238 + local targets=()
239 + use doc && targets+=( docbook )
240 + use epydoc && targets+=( epydoc )
241 +
242 + if [[ ${targets[@]} ]]; then
243 + esetup.py "${targets[@]}"
244 + fi
245 +}
246 +
247 +python_test() {
248 + esetup.py test
249 +}
250 +
251 +python_install() {
252 + # Install sbin scripts to bindir for python-exec linking
253 + # they will be relocated in pkg_preinst()
254 + distutils-r1_python_install \
255 + --system-prefix="${EPREFIX}/usr" \
256 + --bindir="$(python_get_scriptdir)" \
257 + --docdir="${EPREFIX}/usr/share/doc/${PF}" \
258 + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
259 + --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
260 + --sbindir="$(python_get_scriptdir)" \
261 + --sysconfdir="${EPREFIX}/etc" \
262 + "${@}"
263 +}
264 +
265 +python_install_all() {
266 + distutils-r1_python_install_all
267 +
268 + local targets=()
269 + use doc && targets+=( install_docbook )
270 + use epydoc && targets+=( install_epydoc )
271 +
272 + # install docs
273 + if [[ ${targets[@]} ]]; then
274 + esetup.py "${targets[@]}"
275 + fi
276 +
277 + # Due to distutils/python-exec limitations
278 + # these must be installed to /usr/bin.
279 + local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
280 + einfo "Moving admin scripts to the correct directory"
281 + dodir /usr/sbin
282 + for target in ${sbin_relocations}; do
283 + einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
284 + mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
285 + done
286 +}
287 +
288 +pkg_preinst() {
289 + # comment out sanity test until it is fixed to work
290 + # with the new PORTAGE_PYM_PATH
291 + #if [[ $ROOT == / ]] ; then
292 + ## Run some minimal tests as a sanity check.
293 + #local test_runner=$(find "${ED}" -name runTests)
294 + #if [[ -n $test_runner && -x $test_runner ]] ; then
295 + #einfo "Running preinst sanity tests..."
296 + #"$test_runner" || die "preinst sanity tests failed"
297 + #fi
298 + #fi
299 +
300 + # elog dir must exist to avoid logrotate error for bug #415911.
301 + # This code runs in preinst in order to bypass the mapping of
302 + # portage:portage to root:root which happens after src_install.
303 + keepdir /var/log/portage/elog
304 + # This is allowed to fail if the user/group are invalid for prefix users.
305 + if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
306 + chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
307 + fi
308 +
309 + if has_version "<${CATEGORY}/${PN}-2.1.13" || \
310 + {
311 + has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \
312 + has_version "<${CATEGORY}/${PN}-2.2.0_alpha189"
313 + } ; then
314 + USERPRIV_UPGRADE=true
315 + USERSYNC_UPGRADE=true
316 + REPOS_CONF_UPGRADE=true
317 + REPOS_CONF_SYNC=
318 + type -P portageq >/dev/null 2>&1 && \
319 + REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC)
320 + else
321 + USERPRIV_UPGRADE=false
322 + USERSYNC_UPGRADE=false
323 + REPOS_CONF_UPGRADE=false
324 + fi
325 +}
326 +
327 +get_ownership() {
328 + case ${USERLAND} in
329 + BSD)
330 + stat -f '%Su:%Sg' "${1}"
331 + ;;
332 + *)
333 + stat -c '%U:%G' "${1}"
334 + ;;
335 + esac
336 +}
337 +
338 +new_config_protect() {
339 + # Generate a ._cfg file even if the target file
340 + # does not exist, ensuring that the user will
341 + # notice the config change.
342 + local basename=${1##*/}
343 + local dirname=${1%/*}
344 + local i=0
345 + while true ; do
346 + local filename=$(
347 + echo -n "${dirname}/._cfg"
348 + printf "%04d" ${i}
349 + echo -n "_${basename}"
350 + )
351 + [[ -e ${filename} ]] || break
352 + (( i++ ))
353 + done
354 + echo "${filename}"
355 +}
356 +
357 +pkg_postinst() {
358 +
359 + if ${REPOS_CONF_UPGRADE} ; then
360 + einfo "Generating repos.conf"
361 + local repo_name=
362 + [[ -f ${PORTDIR}/profiles/repo_name ]] && \
363 + repo_name=$(< "${PORTDIR}/profiles/repo_name")
364 + if [[ -z ${REPOS_CONF_SYNC} ]] ; then
365 + REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf")
366 + REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
367 + fi
368 + local sync_type=
369 + [[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
370 +
371 + if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then
372 + sync_type=cvs
373 + REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://}
374 + fi
375 +
376 + cat <<-EOF > "${T}/repos.conf"
377 + [DEFAULT]
378 + main-repo = ${repo_name:-gentoo}
379 +
380 + [${repo_name:-gentoo}]
381 + location = ${PORTDIR:-${EPREFIX}/usr/portage}
382 + sync-type = ${sync_type:-rsync}
383 + sync-uri = ${REPOS_CONF_SYNC}
384 + EOF
385 +
386 + [[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf"
387 +
388 + local dest=${EROOT:-${ROOT}}etc/portage/repos.conf
389 + if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
390 + dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf
391 + fi
392 + # Don't install the config update if the desired repos.conf directory
393 + # and config file exist, since users may accept it blindly and break
394 + # their config (bug #478726).
395 + [[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
396 + mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
397 +
398 + if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
399 + einfo "Generating make.conf PORTDIR setting for backward compatibility"
400 + for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do
401 + [[ -e ${dest} ]] && break
402 + done
403 + [[ -d ${dest} ]] && dest=${dest}/portdir.conf
404 + rm -rf "${T}/make.conf"
405 + [[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
406 + cat <<-EOF >> "${T}/make.conf"
407 +
408 + # Set PORTDIR for backward compatibility with various tools:
409 + # gentoo-bashcomp - bug #478444
410 + # euse - bug #474574
411 + # euses and ufed - bug #478318
412 + PORTDIR="${EPREFIX}/usr/portage"
413 + EOF
414 + mkdir -p "${dest%/*}"
415 + mv "${T}/make.conf" "$(new_config_protect "${dest}")"
416 + fi
417 + fi
418 +
419 + local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
420 +
421 + if ${USERSYNC_UPGRADE} && \
422 + [[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
423 + local ownership=$(get_ownership "${PORTDIR}")
424 + if [[ -n ${ownership} ]] ; then
425 + einfo "Adjusting PORTDIR permissions for usersync"
426 + find "${PORTDIR}" -path "${distdir%/}" -prune -o \
427 + ! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \
428 + -exec chown "${ownership}" {} +
429 + fi
430 + fi
431 +
432 + # Do this last, since it could take a long time if there
433 + # are lots of live sources, and the user may be tempted
434 + # to kill emerge while it is running.
435 + if ${USERPRIV_UPGRADE} && \
436 + [[ -d ${distdir} && -w ${distdir} ]] ; then
437 + local ownership=$(get_ownership "${distdir}")
438 + if [[ ${ownership#*:} == portage ]] ; then
439 + einfo "Adjusting DISTDIR permissions for userpriv"
440 + find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \
441 + -exec chown -R portage:portage {} +
442 + fi
443 + fi
444 +
445 + einfo ""
446 + einfo "This release of portage NO LONGER contains the repoman code base."
447 + einfo "Repoman has its own ebuild and release package."
448 + einfo "For repoman functionality please emerge app-portage/repoman"
449 + einfo "Please report any bugs you may encounter."
450 + einfo ""
451 +}