1 |
dolsen 15/02/08 18:06:13 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: portage-2.2.16.ebuild |
5 |
Log: |
6 |
Version bump |
7 |
|
8 |
(Portage version: 2.2.16/cvs/Linux x86_64, signed Manifest commit with key 0xD80F5F1E1245142E) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1428 sys-apps/portage/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1428&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1428&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1427&r2=1.1428 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v |
20 |
retrieving revision 1.1427 |
21 |
retrieving revision 1.1428 |
22 |
diff -u -r1.1427 -r1.1428 |
23 |
--- ChangeLog 15 Jan 2015 09:48:44 -0000 1.1427 |
24 |
+++ ChangeLog 8 Feb 2015 18:06:12 -0000 1.1428 |
25 |
@@ -1,6 +1,14 @@ |
26 |
# ChangeLog for sys-apps/portage |
27 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1427 2015/01/15 09:48:44 armin76 Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1428 2015/02/08 18:06:12 dolsen Exp $ |
30 |
+ |
31 |
+*portage-2.2.16 (08 Feb 2015) |
32 |
+ |
33 |
+ 08 Feb 2015; Brian Dolbec <dolsen@g.o> +portage-2.2.16.ebuild: |
34 |
+ Version bump. First release with the new plug-in sync system. Fixes bugs |
35 |
+ 583512, 538314, 537298, 534722, 536926, 536392, 492932, 142579, 282927, |
36 |
+ 535850, 533036, 463266, 533884, 531656, 531724, 534070, 532670, 532784, |
37 |
+ 532594, 525718, 532224, 504116, 412471, 531690, 531854, 522032. |
38 |
|
39 |
15 Jan 2015; Raúl Porcel <armin76@g.o> portage-2.2.14.ebuild: |
40 |
alpha/arm64/ia64/m68k/s390/sh/sparc stable wrt #531594 |
41 |
|
42 |
|
43 |
|
44 |
1.1 sys-apps/portage/portage-2.2.16.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.16.ebuild?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.16.ebuild?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: portage-2.2.16.ebuild |
50 |
=================================================================== |
51 |
# Copyright 1999-2015 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.16.ebuild,v 1.1 2015/02/08 18:06:12 dolsen Exp $ |
54 |
|
55 |
EAPI=5 |
56 |
|
57 |
PYTHON_COMPAT=( |
58 |
pypy |
59 |
python3_2 python3_3 python3_4 |
60 |
python2_7 |
61 |
) |
62 |
# Note: substituted below |
63 |
PYTHON_REQ_USE='bzip2(+)' |
64 |
|
65 |
inherit distutils-r1 multilib |
66 |
|
67 |
DESCRIPTION="Portage is the package management and distribution system for Gentoo" |
68 |
HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml" |
69 |
|
70 |
LICENSE="GPL-2" |
71 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
72 |
SLOT="0" |
73 |
IUSE="build doc epydoc +ipc linguas_ru selinux xattr" |
74 |
|
75 |
DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} ) |
76 |
dev-lang/python-exec:2 |
77 |
>=sys-apps/sed-4.0.5 sys-devel/patch |
78 |
doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) |
79 |
epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )" |
80 |
# Require sandbox-2.2 for bug #288863. |
81 |
# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's |
82 |
# quite slow, so it's not considered in the dependencies as an alternative to |
83 |
# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so |
84 |
# for now, don't pull in xattr deps for other kernels. |
85 |
# For whirlpool hash, require python[ssl] (bug #425046). |
86 |
# For compgen, require bash[readline] (bug #445576). |
87 |
RDEPEND=" |
88 |
dev-lang/python-exec:2 |
89 |
!build? ( |
90 |
>=sys-apps/sed-4.0.5 |
91 |
app-shells/bash:0[readline] |
92 |
>=app-admin/eselect-1.2 |
93 |
) |
94 |
elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) |
95 |
elibc_glibc? ( >=sys-apps/sandbox-2.2 ) |
96 |
elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) |
97 |
>=app-misc/pax-utils-0.1.17 |
98 |
selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) |
99 |
xattr? ( kernel_linux? ( |
100 |
>=sys-apps/install-xattr-0.3 |
101 |
$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \ |
102 |
python{2_7,3_2} pypy) |
103 |
) ) |
104 |
!<app-admin/logrotate-3.8.0" |
105 |
PDEPEND=" |
106 |
!build? ( |
107 |
>=net-misc/rsync-2.6.4 |
108 |
userland_GNU? ( >=sys-apps/coreutils-6.4 ) |
109 |
)" |
110 |
# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 |
111 |
# NOTE: FEATURES=installsources requires debugedit and rsync |
112 |
|
113 |
REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )" |
114 |
|
115 |
SRC_ARCHIVES="http://dev.gentoo.org/~dolsen/releases/portage" |
116 |
|
117 |
prefix_src_archives() { |
118 |
local x y |
119 |
for x in ${@}; do |
120 |
for y in ${SRC_ARCHIVES}; do |
121 |
echo ${y}/${x} |
122 |
done |
123 |
done |
124 |
} |
125 |
|
126 |
TARBALL_PV=${PV} |
127 |
SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 |
128 |
$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)" |
129 |
|
130 |
python_prepare_all() { |
131 |
distutils-r1_python_prepare_all |
132 |
|
133 |
if ! use ipc ; then |
134 |
einfo "Disabling ipc..." |
135 |
sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ |
136 |
-i pym/_emerge/AbstractEbuildProcess.py || \ |
137 |
die "failed to patch AbstractEbuildProcess.py" |
138 |
fi |
139 |
|
140 |
if use xattr && use kernel_linux ; then |
141 |
einfo "Adding FEATURES=xattr to make.globals ..." |
142 |
echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ |
143 |
|| die "failed to append to make.globals" |
144 |
fi |
145 |
|
146 |
if [[ -n ${EPREFIX} ]] ; then |
147 |
einfo "Setting portage.const.EPREFIX ..." |
148 |
sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \ |
149 |
-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \ |
150 |
-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \ |
151 |
-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \ |
152 |
-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \ |
153 |
-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \ |
154 |
-i pym/portage/const.py || \ |
155 |
die "Failed to patch portage.const.EPREFIX" |
156 |
|
157 |
einfo "Prefixing shebangs ..." |
158 |
while read -r -d $'\0' ; do |
159 |
local shebang=$(head -n1 "$REPLY") |
160 |
if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then |
161 |
sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \ |
162 |
die "sed failed" |
163 |
fi |
164 |
done < <(find . -type f -print0) |
165 |
|
166 |
einfo "Adjusting make.globals ..." |
167 |
sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \ |
168 |
-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \ |
169 |
-i cnf/make.globals || die "sed failed" |
170 |
|
171 |
einfo "Adjusting repos.conf ..." |
172 |
sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ |
173 |
-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ |
174 |
-e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \ |
175 |
-e "s|^\(sync-uri = \).*|\\1rsync://prefix.gentooexperimental.org/gentoo-portage-prefix|" \ |
176 |
-i cnf/repos.conf || die "sed failed" |
177 |
|
178 |
einfo "Adding FEATURES=force-prefix to make.globals ..." |
179 |
echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ |
180 |
|| die "failed to append to make.globals" |
181 |
fi |
182 |
|
183 |
cd "${S}/cnf" || die |
184 |
if [ -f "make.conf.example.${ARCH}".diff ]; then |
185 |
patch make.conf.example "make.conf.example.${ARCH}".diff || \ |
186 |
die "Failed to patch make.conf.example" |
187 |
else |
188 |
eerror "" |
189 |
eerror "Portage does not have an arch-specific configuration for this arch." |
190 |
eerror "Please notify the arch maintainer about this issue. Using generic." |
191 |
eerror "" |
192 |
fi |
193 |
} |
194 |
|
195 |
python_compile_all() { |
196 |
local targets=() |
197 |
use doc && targets+=( docbook ) |
198 |
use epydoc && targets+=( epydoc ) |
199 |
|
200 |
if [[ ${targets[@]} ]]; then |
201 |
esetup.py "${targets[@]}" |
202 |
fi |
203 |
} |
204 |
|
205 |
python_test() { |
206 |
esetup.py test |
207 |
} |
208 |
|
209 |
python_install() { |
210 |
# Install sbin scripts to bindir for python-exec linking |
211 |
# they will be relocated in pkg_preinst() |
212 |
distutils-r1_python_install \ |
213 |
--system-prefix="${EPREFIX}/usr" \ |
214 |
--bindir="$(python_get_scriptdir)" \ |
215 |
--docdir="${EPREFIX}/usr/share/doc/${PF}" \ |
216 |
--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ |
217 |
--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ |
218 |
--sbindir="$(python_get_scriptdir)" \ |
219 |
--sysconfdir="${EPREFIX}/etc" \ |
220 |
"${@}" |
221 |
} |
222 |
|
223 |
python_install_all() { |
224 |
distutils-r1_python_install_all |
225 |
|
226 |
local targets=() |
227 |
use doc && targets+=( install_docbook ) |
228 |
use epydoc && targets+=( install_epydoc ) |
229 |
|
230 |
# install docs |
231 |
if [[ ${targets[@]} ]]; then |
232 |
esetup.py "${targets[@]}" |
233 |
fi |
234 |
|
235 |
# Due to distutils/python-exec limitations |
236 |
# these must be installed to /usr/bin. |
237 |
local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' |
238 |
einfo "Moving admin scripts to the correct directory" |
239 |
dodir /usr/sbin |
240 |
for target in ${sbin_relocations}; do |
241 |
einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" |
242 |
mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!" |
243 |
done |
244 |
} |
245 |
|
246 |
pkg_preinst() { |
247 |
# comment out sanity test until it is fixed to work |
248 |
# with the new PORTAGE_PYM_PATH |
249 |
#if [[ $ROOT == / ]] ; then |
250 |
## Run some minimal tests as a sanity check. |
251 |
#local test_runner=$(find "${ED}" -name runTests) |
252 |
#if [[ -n $test_runner && -x $test_runner ]] ; then |
253 |
#einfo "Running preinst sanity tests..." |
254 |
#"$test_runner" || die "preinst sanity tests failed" |
255 |
#fi |
256 |
#fi |
257 |
|
258 |
# elog dir must exist to avoid logrotate error for bug #415911. |
259 |
# This code runs in preinst in order to bypass the mapping of |
260 |
# portage:portage to root:root which happens after src_install. |
261 |
keepdir /var/log/portage/elog |
262 |
# This is allowed to fail if the user/group are invalid for prefix users. |
263 |
if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then |
264 |
chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog} |
265 |
fi |
266 |
|
267 |
if has_version "<${CATEGORY}/${PN}-2.1.13" || \ |
268 |
{ |
269 |
has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \ |
270 |
has_version "<${CATEGORY}/${PN}-2.2.0_alpha189" |
271 |
} ; then |
272 |
USERPRIV_UPGRADE=true |
273 |
USERSYNC_UPGRADE=true |
274 |
REPOS_CONF_UPGRADE=true |
275 |
REPOS_CONF_SYNC= |
276 |
type -P portageq >/dev/null 2>&1 && \ |
277 |
REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC) |
278 |
else |
279 |
USERPRIV_UPGRADE=false |
280 |
USERSYNC_UPGRADE=false |
281 |
REPOS_CONF_UPGRADE=false |
282 |
fi |
283 |
} |
284 |
|
285 |
get_ownership() { |
286 |
case ${USERLAND} in |
287 |
BSD) |
288 |
stat -f '%Su:%Sg' "${1}" |
289 |
;; |
290 |
*) |
291 |
stat -c '%U:%G' "${1}" |
292 |
;; |
293 |
esac |
294 |
} |
295 |
|
296 |
new_config_protect() { |
297 |
# Generate a ._cfg file even if the target file |
298 |
# does not exist, ensuring that the user will |
299 |
# notice the config change. |
300 |
local basename=${1##*/} |
301 |
local dirname=${1%/*} |
302 |
local i=0 |
303 |
while true ; do |
304 |
local filename=$( |
305 |
echo -n "${dirname}/._cfg" |
306 |
printf "%04d" ${i} |
307 |
echo -n "_${basename}" |
308 |
) |
309 |
[[ -e ${filename} ]] || break |
310 |
(( i++ )) |
311 |
done |
312 |
echo "${filename}" |
313 |
} |
314 |
|
315 |
pkg_postinst() { |
316 |
|
317 |
if ${REPOS_CONF_UPGRADE} ; then |
318 |
einfo "Generating repos.conf" |
319 |
local repo_name= |
320 |
[[ -f ${PORTDIR}/profiles/repo_name ]] && \ |
321 |
repo_name=$(< "${PORTDIR}/profiles/repo_name") |
322 |
if [[ -z ${REPOS_CONF_SYNC} ]] ; then |
323 |
REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf") |
324 |
REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* } |
325 |
fi |
326 |
local sync_type= |
327 |
[[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git |
328 |
|
329 |
if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then |
330 |
sync_type=cvs |
331 |
REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://} |
332 |
fi |
333 |
|
334 |
cat <<-EOF > "${T}/repos.conf" |
335 |
[DEFAULT] |
336 |
main-repo = ${repo_name:-gentoo} |
337 |
|
338 |
[${repo_name:-gentoo}] |
339 |
location = ${PORTDIR:-${EPREFIX}/usr/portage} |
340 |
sync-type = ${sync_type:-rsync} |
341 |
sync-uri = ${REPOS_CONF_SYNC} |
342 |
EOF |
343 |
|
344 |
[[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf" |
345 |
|
346 |
local dest=${EROOT:-${ROOT}}etc/portage/repos.conf |
347 |
if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then |
348 |
dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf |
349 |
fi |
350 |
# Don't install the config update if the desired repos.conf directory |
351 |
# and config file exist, since users may accept it blindly and break |
352 |
# their config (bug #478726). |
353 |
[[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \ |
354 |
mv "${T}/repos.conf" "$(new_config_protect "${dest}")" |
355 |
|
356 |
if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then |
357 |
einfo "Generating make.conf PORTDIR setting for backward compatibility" |
358 |
for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do |
359 |
[[ -e ${dest} ]] && break |
360 |
done |
361 |
[[ -d ${dest} ]] && dest=${dest}/portdir.conf |
362 |
rm -rf "${T}/make.conf" |
363 |
[[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf" |
364 |
cat <<-EOF >> "${T}/make.conf" |
365 |
|
366 |
# Set PORTDIR for backward compatibility with various tools: |
367 |
# gentoo-bashcomp - bug #478444 |
368 |
# euse - bug #474574 |
369 |
# euses and ufed - bug #478318 |
370 |
PORTDIR="${EPREFIX}/usr/portage" |
371 |
EOF |
372 |
mkdir -p "${dest%/*}" |
373 |
mv "${T}/make.conf" "$(new_config_protect "${dest}")" |
374 |
fi |
375 |
fi |
376 |
|
377 |
local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}} |
378 |
|
379 |
if ${USERSYNC_UPGRADE} && \ |
380 |
[[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then |
381 |
local ownership=$(get_ownership "${PORTDIR}") |
382 |
if [[ -n ${ownership} ]] ; then |
383 |
einfo "Adjusting PORTDIR permissions for usersync" |
384 |
find "${PORTDIR}" -path "${distdir%/}" -prune -o \ |
385 |
! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \ |
386 |
-exec chown "${ownership}" {} + |
387 |
fi |
388 |
fi |
389 |
|
390 |
# Do this last, since it could take a long time if there |
391 |
# are lots of live sources, and the user may be tempted |
392 |
# to kill emerge while it is running. |
393 |
if ${USERPRIV_UPGRADE} && \ |
394 |
[[ -d ${distdir} && -w ${distdir} ]] ; then |
395 |
local ownership=$(get_ownership "${distdir}") |
396 |
if [[ ${ownership#*:} == portage ]] ; then |
397 |
einfo "Adjusting DISTDIR permissions for userpriv" |
398 |
find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \ |
399 |
-exec chown -R portage:portage {} + |
400 |
fi |
401 |
fi |
402 |
} |