1 |
commit: 20dab4b8fee584b1693ca1a4f16658f6a560e32d |
2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 23 17:39:59 2016 +0000 |
4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 23 17:39:59 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20dab4b8 |
7 |
|
8 |
sys-apps/portage: Bump, final release |
9 |
|
10 |
Includes bug fixes for: 576888, 579626, 579292, 578204, 577862, 582388, 576788 |
11 |
583560, 577720, 583164, 584530, 572494, 582802, 583754, 574626, 586410. |
12 |
|
13 |
Package-Manager: portage-2.3.0 |
14 |
|
15 |
sys-apps/portage/Manifest | 3 +- |
16 |
sys-apps/portage/portage-2.2.20.1.ebuild | 364 --------------------- |
17 |
...{portage-2.2.27.ebuild => portage-2.3.0.ebuild} | 13 +- |
18 |
3 files changed, 5 insertions(+), 375 deletions(-) |
19 |
|
20 |
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest |
21 |
index 67e147f..79c62fd 100644 |
22 |
--- a/sys-apps/portage/Manifest |
23 |
+++ b/sys-apps/portage/Manifest |
24 |
@@ -1,7 +1,6 @@ |
25 |
-DIST portage-2.2.20.1.tar.bz2 950298 SHA256 84dd3ed1d9fd0a3336e956d057590c75834a906ae62a450411232fe5a842475c SHA512 5f7373da20d448059e8fdc8a3593eaca780be3184f0494bac66f5eea7c33d00dd61b9e74cbe9a52413f08cef29d426ed8751e20e16be09178468c18d77a6ae2e WHIRLPOOL 99643ce0ab74c5df64fb5239948c6102bc39847ff88eaf210c069c0c9587c1e8bdd1a032a7e61c1225b6113645387861d439e9c4f103df4d0f042b73e1afc328 |
26 |
DIST portage-2.2.24.tar.bz2 972610 SHA256 c2dbd53dd474c6fe455ffa5920514a6afe467abf02959c33ddb7a7e363939550 SHA512 9dc00410de604db66843bdf62cf0ee7e93ff2c4d562390172c4f0c55ab98b2712078b0eb02c9f35d52633b0fff0b024736e25a1c66cf40ad61a6bf99a7cee4a6 WHIRLPOOL 3227c61662acf69abd843344d0fb1b7cc2cfa91c1bae48b08e1da8fdf42cda15834994852d42dfc089f189e318c657e12fd6b1c19885279e0bb5cfd2349235f8 |
27 |
DIST portage-2.2.26.tar.bz2 977277 SHA256 7f57aa704c58ea47f031f177203dc7b335e01e7ec1e809437ea9e46e3f9263e5 SHA512 fd1a5e5d028d52ba82bbeb7f87bf331d0c1d8c7f5a3bd450c668dd742e99185b6d2b21944f5d7788fe941c99736744b08157ca30145f0964ea60a7c2c435d601 WHIRLPOOL 0469f4c5609146c57eae4baeb8488b95c04f336a5511460ee44d15746339fd43a7c2d61b58528845d77a6a0b21e46c2afad19a9f05e94ac8dc6180032d71f298 |
28 |
-DIST portage-2.2.27.tar.bz2 977125 SHA256 3126b59456d2f0a1c9b2c03df15154b2fb29e462abbbe1b8898fa7bc291421af SHA512 8f16a7c9ce33bd34d60f0b06d3e4e0bd4e2c27e6bdc0756e6d3b59108b5438e92f5ca9e981bbfe4ebe9b64f1afe9442d72c52c02fe456e0d36daffae6f77d694 WHIRLPOOL e467c6d9e4e1c177667389a4ce134fabc8676ff5baf9403d73de241086c7d5bab4d11bfe84be749cf9f9781cadc1dd8d173e03e9fba4c926e24131c261a28d1e |
29 |
DIST portage-2.2.28.tar.bz2 969138 SHA256 da8148a1a9275c87f535679e41b1bb3a1380ba0f903b80510017517e4c5229d0 SHA512 d21bf7e7dcc0a779a13df6a959e5d4291492fce2a5525b67e9a4705888021f9c08b8d78cd32b2eb930ac5428c40383e4e46da5a7b1ed5c9c9c42314c0f1c6a0b WHIRLPOOL 1b9584b0243b46c70d0778aad57df2d3ea99e19f243280e542c29e6fed0634b72de6b203a3c296c2977d1a6e5e5250b910574176c692d2c7c27c0938528bb43d |
30 |
DIST portage-2.2.8.tar.bz2 874672 SHA256 c1074e01173df5384e003598dbc5f64f09e92f83fd26faab2f88f9f0bc64aa7e SHA512 acc47d94ff8c08e5a7bf2d4c4e600863430dd1e7d0bb8b4254d6477a498933cae663db84debf9487d2243c2cba689629ef8e8b6cf108e10d40e89e8e8d7e1257 WHIRLPOOL d54290ede8d3d85e5211cda7e86ed740178121ef2f47cf0858c27941d8679d29c11445befff962986d40a47ded50d0d4654de19e7d4aef3fdf2546655a0d6fe2 |
31 |
+DIST portage-2.3.0.tar.bz2 907500 SHA256 1fbed03f78587c80f5afd36b57d7ac085ed5e5b2cc19fea63fc8a43a477e4067 SHA512 85d15a234e446677dc3458de8dacaa0d91164b190c59f8002ff98dc27a9ad699cba6c4f871ac785ba6116ed53f1f3530ec3ed662ce7f4b3e8c49380b4b206074 WHIRLPOOL 979a7fc61a65dca790a077d4839fbbb22fc8ef31ccbe534b12b87c699a25a1930586dd6ddfb9013d57a71c03ed8d976612ea15e9dc3541aff0b67e3d604a5be2 |
32 |
DIST portage-2.3.0_rc1.tar.bz2 910204 SHA256 52cf0837975c4b2a8e1d3d18e3334a735b14e4ebdbdca8992548b86c1d5bebd1 SHA512 d7a5ce8800668606a2e3549621686bb8bb30bd2f5d7a57b106efc1c58d34b95cef4605f5067824db0beb6f870c9e81cb3fdb5c074e9e64bef40a9df6f524ad13 WHIRLPOOL c4c86fe20606e93ecf4d125f436077ec4d15cb453c98e83894a8383f1654a9b294107c9c04bb3019f66a643ff42c333060319d59dda47c323e9711723c3b9cfe |
33 |
|
34 |
diff --git a/sys-apps/portage/portage-2.2.20.1.ebuild b/sys-apps/portage/portage-2.2.20.1.ebuild |
35 |
deleted file mode 100644 |
36 |
index d24b923..0000000 |
37 |
--- a/sys-apps/portage/portage-2.2.20.1.ebuild |
38 |
+++ /dev/null |
39 |
@@ -1,364 +0,0 @@ |
40 |
-# Copyright 1999-2015 Gentoo Foundation |
41 |
-# Distributed under the terms of the GNU General Public License v2 |
42 |
-# $Id$ |
43 |
- |
44 |
-EAPI=5 |
45 |
- |
46 |
-PYTHON_COMPAT=( |
47 |
- pypy |
48 |
- python3_3 python3_4 |
49 |
- python2_7 |
50 |
-) |
51 |
-PYTHON_REQ_USE='bzip2(+)' |
52 |
- |
53 |
-inherit distutils-r1 multilib |
54 |
- |
55 |
-DESCRIPTION="Portage is the package management and distribution system for Gentoo" |
56 |
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" |
57 |
- |
58 |
-LICENSE="GPL-2" |
59 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
60 |
-SLOT="0" |
61 |
-IUSE="build doc epydoc +ipc linguas_ru selinux xattr" |
62 |
- |
63 |
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) |
64 |
- >=app-arch/tar-1.27 |
65 |
- dev-lang/python-exec:2 |
66 |
- >=sys-apps/sed-4.0.5 sys-devel/patch |
67 |
- doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) |
68 |
- epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )" |
69 |
-# Require sandbox-2.2 for bug #288863. |
70 |
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's |
71 |
-# quite slow, so it's not considered in the dependencies as an alternative to |
72 |
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so |
73 |
-# for now, don't pull in xattr deps for other kernels. |
74 |
-# For whirlpool hash, require python[ssl] (bug #425046). |
75 |
-# For compgen, require bash[readline] (bug #445576). |
76 |
-RDEPEND=" |
77 |
- >=app-arch/tar-1.27 |
78 |
- dev-lang/python-exec:2 |
79 |
- !build? ( |
80 |
- >=sys-apps/sed-4.0.5 |
81 |
- app-shells/bash:0[readline] |
82 |
- >=app-admin/eselect-1.2 |
83 |
- ) |
84 |
- elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) |
85 |
- elibc_glibc? ( >=sys-apps/sandbox-2.2 ) |
86 |
- elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) |
87 |
- >=app-misc/pax-utils-0.1.17 |
88 |
- selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) |
89 |
- xattr? ( kernel_linux? ( |
90 |
- >=sys-apps/install-xattr-0.3 |
91 |
- $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \ |
92 |
- python2_7 pypy) |
93 |
- ) ) |
94 |
- !<app-admin/logrotate-3.8.0" |
95 |
-PDEPEND=" |
96 |
- !build? ( |
97 |
- >=net-misc/rsync-2.6.4 |
98 |
- userland_GNU? ( >=sys-apps/coreutils-6.4 ) |
99 |
- )" |
100 |
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 |
101 |
-# NOTE: FEATURES=installsources requires debugedit and rsync |
102 |
- |
103 |
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )" |
104 |
- |
105 |
-SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage" |
106 |
- |
107 |
-prefix_src_archives() { |
108 |
- local x y |
109 |
- for x in ${@}; do |
110 |
- for y in ${SRC_ARCHIVES}; do |
111 |
- echo ${y}/${x} |
112 |
- done |
113 |
- done |
114 |
-} |
115 |
- |
116 |
-TARBALL_PV=${PV} |
117 |
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 |
118 |
- $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)" |
119 |
- |
120 |
-python_prepare_all() { |
121 |
- distutils-r1_python_prepare_all |
122 |
- |
123 |
- if ! use ipc ; then |
124 |
- einfo "Disabling ipc..." |
125 |
- sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ |
126 |
- -i pym/_emerge/AbstractEbuildProcess.py || \ |
127 |
- die "failed to patch AbstractEbuildProcess.py" |
128 |
- fi |
129 |
- |
130 |
- if use xattr && use kernel_linux ; then |
131 |
- einfo "Adding FEATURES=xattr to make.globals ..." |
132 |
- echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ |
133 |
- || die "failed to append to make.globals" |
134 |
- fi |
135 |
- |
136 |
- if [[ -n ${EPREFIX} ]] ; then |
137 |
- einfo "Setting portage.const.EPREFIX ..." |
138 |
- sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \ |
139 |
- -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \ |
140 |
- -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \ |
141 |
- -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \ |
142 |
- -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \ |
143 |
- -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \ |
144 |
- -i pym/portage/const.py || \ |
145 |
- die "Failed to patch portage.const.EPREFIX" |
146 |
- |
147 |
- einfo "Prefixing shebangs ..." |
148 |
- while read -r -d $'\0' ; do |
149 |
- local shebang=$(head -n1 "$REPLY") |
150 |
- if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then |
151 |
- sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \ |
152 |
- die "sed failed" |
153 |
- fi |
154 |
- done < <(find . -type f -print0) |
155 |
- |
156 |
- einfo "Adjusting make.globals ..." |
157 |
- sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \ |
158 |
- -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \ |
159 |
- -i cnf/make.globals || die "sed failed" |
160 |
- |
161 |
- einfo "Adjusting repos.conf ..." |
162 |
- sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ |
163 |
- -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ |
164 |
- -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \ |
165 |
- -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ |
166 |
- -i cnf/repos.conf || die "sed failed" |
167 |
- |
168 |
- einfo "Adding FEATURES=force-prefix to make.globals ..." |
169 |
- echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ |
170 |
- || die "failed to append to make.globals" |
171 |
- fi |
172 |
- |
173 |
- cd "${S}/cnf" || die |
174 |
- if [ -f "make.conf.example.${ARCH}".diff ]; then |
175 |
- patch make.conf.example "make.conf.example.${ARCH}".diff || \ |
176 |
- die "Failed to patch make.conf.example" |
177 |
- else |
178 |
- eerror "" |
179 |
- eerror "Portage does not have an arch-specific configuration for this arch." |
180 |
- eerror "Please notify the arch maintainer about this issue. Using generic." |
181 |
- eerror "" |
182 |
- fi |
183 |
-} |
184 |
- |
185 |
-python_compile_all() { |
186 |
- local targets=() |
187 |
- use doc && targets+=( docbook ) |
188 |
- use epydoc && targets+=( epydoc ) |
189 |
- |
190 |
- if [[ ${targets[@]} ]]; then |
191 |
- esetup.py "${targets[@]}" |
192 |
- fi |
193 |
-} |
194 |
- |
195 |
-python_test() { |
196 |
- esetup.py test |
197 |
-} |
198 |
- |
199 |
-python_install() { |
200 |
- # Install sbin scripts to bindir for python-exec linking |
201 |
- # they will be relocated in pkg_preinst() |
202 |
- distutils-r1_python_install \ |
203 |
- --system-prefix="${EPREFIX}/usr" \ |
204 |
- --bindir="$(python_get_scriptdir)" \ |
205 |
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \ |
206 |
- --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ |
207 |
- --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ |
208 |
- --sbindir="$(python_get_scriptdir)" \ |
209 |
- --sysconfdir="${EPREFIX}/etc" \ |
210 |
- "${@}" |
211 |
-} |
212 |
- |
213 |
-python_install_all() { |
214 |
- distutils-r1_python_install_all |
215 |
- |
216 |
- local targets=() |
217 |
- use doc && targets+=( install_docbook ) |
218 |
- use epydoc && targets+=( install_epydoc ) |
219 |
- |
220 |
- # install docs |
221 |
- if [[ ${targets[@]} ]]; then |
222 |
- esetup.py "${targets[@]}" |
223 |
- fi |
224 |
- |
225 |
- # Due to distutils/python-exec limitations |
226 |
- # these must be installed to /usr/bin. |
227 |
- local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' |
228 |
- einfo "Moving admin scripts to the correct directory" |
229 |
- dodir /usr/sbin |
230 |
- for target in ${sbin_relocations}; do |
231 |
- einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" |
232 |
- mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!" |
233 |
- done |
234 |
-} |
235 |
- |
236 |
-pkg_preinst() { |
237 |
- # comment out sanity test until it is fixed to work |
238 |
- # with the new PORTAGE_PYM_PATH |
239 |
- #if [[ $ROOT == / ]] ; then |
240 |
- ## Run some minimal tests as a sanity check. |
241 |
- #local test_runner=$(find "${ED}" -name runTests) |
242 |
- #if [[ -n $test_runner && -x $test_runner ]] ; then |
243 |
- #einfo "Running preinst sanity tests..." |
244 |
- #"$test_runner" || die "preinst sanity tests failed" |
245 |
- #fi |
246 |
- #fi |
247 |
- |
248 |
- # elog dir must exist to avoid logrotate error for bug #415911. |
249 |
- # This code runs in preinst in order to bypass the mapping of |
250 |
- # portage:portage to root:root which happens after src_install. |
251 |
- keepdir /var/log/portage/elog |
252 |
- # This is allowed to fail if the user/group are invalid for prefix users. |
253 |
- if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then |
254 |
- chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog} |
255 |
- fi |
256 |
- |
257 |
- if has_version "<${CATEGORY}/${PN}-2.1.13" || \ |
258 |
- { |
259 |
- has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \ |
260 |
- has_version "<${CATEGORY}/${PN}-2.2.0_alpha189" |
261 |
- } ; then |
262 |
- USERPRIV_UPGRADE=true |
263 |
- USERSYNC_UPGRADE=true |
264 |
- REPOS_CONF_UPGRADE=true |
265 |
- REPOS_CONF_SYNC= |
266 |
- type -P portageq >/dev/null 2>&1 && \ |
267 |
- REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC) |
268 |
- else |
269 |
- USERPRIV_UPGRADE=false |
270 |
- USERSYNC_UPGRADE=false |
271 |
- REPOS_CONF_UPGRADE=false |
272 |
- fi |
273 |
-} |
274 |
- |
275 |
-get_ownership() { |
276 |
- case ${USERLAND} in |
277 |
- BSD) |
278 |
- stat -f '%Su:%Sg' "${1}" |
279 |
- ;; |
280 |
- *) |
281 |
- stat -c '%U:%G' "${1}" |
282 |
- ;; |
283 |
- esac |
284 |
-} |
285 |
- |
286 |
-new_config_protect() { |
287 |
- # Generate a ._cfg file even if the target file |
288 |
- # does not exist, ensuring that the user will |
289 |
- # notice the config change. |
290 |
- local basename=${1##*/} |
291 |
- local dirname=${1%/*} |
292 |
- local i=0 |
293 |
- while true ; do |
294 |
- local filename=$( |
295 |
- echo -n "${dirname}/._cfg" |
296 |
- printf "%04d" ${i} |
297 |
- echo -n "_${basename}" |
298 |
- ) |
299 |
- [[ -e ${filename} ]] || break |
300 |
- (( i++ )) |
301 |
- done |
302 |
- echo "${filename}" |
303 |
-} |
304 |
- |
305 |
-pkg_postinst() { |
306 |
- |
307 |
- if ${REPOS_CONF_UPGRADE} ; then |
308 |
- einfo "Generating repos.conf" |
309 |
- local repo_name= |
310 |
- [[ -f ${PORTDIR}/profiles/repo_name ]] && \ |
311 |
- repo_name=$(< "${PORTDIR}/profiles/repo_name") |
312 |
- if [[ -z ${REPOS_CONF_SYNC} ]] ; then |
313 |
- REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf") |
314 |
- REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* } |
315 |
- fi |
316 |
- local sync_type= |
317 |
- [[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git |
318 |
- |
319 |
- if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then |
320 |
- sync_type=cvs |
321 |
- REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://} |
322 |
- fi |
323 |
- |
324 |
- cat <<-EOF > "${T}/repos.conf" |
325 |
- [DEFAULT] |
326 |
- main-repo = ${repo_name:-gentoo} |
327 |
- |
328 |
- [${repo_name:-gentoo}] |
329 |
- location = ${PORTDIR:-${EPREFIX}/usr/portage} |
330 |
- sync-type = ${sync_type:-rsync} |
331 |
- sync-uri = ${REPOS_CONF_SYNC} |
332 |
- EOF |
333 |
- |
334 |
- [[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf" |
335 |
- |
336 |
- local dest=${EROOT:-${ROOT}}etc/portage/repos.conf |
337 |
- if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then |
338 |
- dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf |
339 |
- fi |
340 |
- # Don't install the config update if the desired repos.conf directory |
341 |
- # and config file exist, since users may accept it blindly and break |
342 |
- # their config (bug #478726). |
343 |
- [[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \ |
344 |
- mv "${T}/repos.conf" "$(new_config_protect "${dest}")" |
345 |
- |
346 |
- if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then |
347 |
- einfo "Generating make.conf PORTDIR setting for backward compatibility" |
348 |
- for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do |
349 |
- [[ -e ${dest} ]] && break |
350 |
- done |
351 |
- [[ -d ${dest} ]] && dest=${dest}/portdir.conf |
352 |
- rm -rf "${T}/make.conf" |
353 |
- [[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf" |
354 |
- cat <<-EOF >> "${T}/make.conf" |
355 |
- |
356 |
- # Set PORTDIR for backward compatibility with various tools: |
357 |
- # gentoo-bashcomp - bug #478444 |
358 |
- # euse - bug #474574 |
359 |
- # euses and ufed - bug #478318 |
360 |
- PORTDIR="${EPREFIX}/usr/portage" |
361 |
- EOF |
362 |
- mkdir -p "${dest%/*}" |
363 |
- mv "${T}/make.conf" "$(new_config_protect "${dest}")" |
364 |
- fi |
365 |
- fi |
366 |
- |
367 |
- local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}} |
368 |
- |
369 |
- if ${USERSYNC_UPGRADE} && \ |
370 |
- [[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then |
371 |
- local ownership=$(get_ownership "${PORTDIR}") |
372 |
- if [[ -n ${ownership} ]] ; then |
373 |
- einfo "Adjusting PORTDIR permissions for usersync" |
374 |
- find "${PORTDIR}" -path "${distdir%/}" -prune -o \ |
375 |
- ! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \ |
376 |
- -exec chown "${ownership}" {} + |
377 |
- fi |
378 |
- fi |
379 |
- |
380 |
- # Do this last, since it could take a long time if there |
381 |
- # are lots of live sources, and the user may be tempted |
382 |
- # to kill emerge while it is running. |
383 |
- if ${USERPRIV_UPGRADE} && \ |
384 |
- [[ -d ${distdir} && -w ${distdir} ]] ; then |
385 |
- local ownership=$(get_ownership "${distdir}") |
386 |
- if [[ ${ownership#*:} == portage ]] ; then |
387 |
- einfo "Adjusting DISTDIR permissions for userpriv" |
388 |
- find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \ |
389 |
- -exec chown -R portage:portage {} + |
390 |
- fi |
391 |
- fi |
392 |
- |
393 |
- einfo "" |
394 |
- einfo "The 'websync' module has now been properly renamed to 'webrsync'" |
395 |
- einfo "Please update your repos.conf/gentoo.conf file if needed." |
396 |
- einfo "" |
397 |
- einfo "This release of portage removed the new squashfs sync module " |
398 |
- einfo "introduced in portage-2.2.19." |
399 |
- einfo "Look for it to be released as an installable portage module soon." |
400 |
- einfo "This will allow it to develop at its own pace partially independent" |
401 |
- einfo "of portage." |
402 |
- einfo "" |
403 |
-} |
404 |
|
405 |
diff --git a/sys-apps/portage/portage-2.2.27.ebuild b/sys-apps/portage/portage-2.3.0.ebuild |
406 |
similarity index 94% |
407 |
rename from sys-apps/portage/portage-2.2.27.ebuild |
408 |
rename to sys-apps/portage/portage-2.3.0.ebuild |
409 |
index eb400ab..b4a805b 100644 |
410 |
--- a/sys-apps/portage/portage-2.2.27.ebuild |
411 |
+++ b/sys-apps/portage/portage-2.3.0.ebuild |
412 |
@@ -124,10 +124,7 @@ python_prepare_all() { |
413 |
-i cnf/make.globals || die "sed failed" |
414 |
|
415 |
einfo "Adjusting repos.conf ..." |
416 |
- sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ |
417 |
- -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ |
418 |
- -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \ |
419 |
- -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ |
420 |
+ sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \ |
421 |
-i cnf/repos.conf || die "sed failed" |
422 |
|
423 |
einfo "Adding FEATURES=force-prefix to make.globals ..." |
424 |
@@ -356,11 +353,9 @@ pkg_postinst() { |
425 |
fi |
426 |
|
427 |
einfo "" |
428 |
- einfo "This release of portage contains the new repoman code base" |
429 |
- einfo "This code base is still being developed. So its API's are" |
430 |
- einfo "not to be considered stable and are subject to change." |
431 |
- einfo "The code released has been tested and considered ready for use." |
432 |
- einfo "This however does not guarantee it to be completely bug free." |
433 |
+ einfo "This release of portage NO LONGER contains the repoman code base." |
434 |
+ einfo "Repoman has its own ebuild and release package." |
435 |
+ einfo "For repoman functionality please emerge app-portage/repoman" |
436 |
einfo "Please report any bugs you may encounter." |
437 |
einfo "" |
438 |
} |