1 |
zmedico 13/03/02 04:24:16 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: portage-2.1.11.53.ebuild |
5 |
Removed: portage-2.1.11.31.ebuild |
6 |
Log: |
7 |
2.1.11.53 version bump. This fixes bug #102297 (remove |
8 |
deprecated preplib helper), |
9 |
bug #225821 (clarify python api docs for abssymlink function), |
10 |
bug #328113 (repoman validation of metadata.xml doctype), |
11 |
bug #368297 (remove useless 'Starting parallel fetch' |
12 |
message), bug #451326 (add workaround for compatibility with epoll |
13 |
implementation in qemu-user), bug #457136 (support quoted args in EXTRA_ECONF), |
14 |
bug #458730 (fix emerge --help docs to indicate that --verbose does not |
15 |
change output of --help), bug #459350 (unset LIGUAS in ebuild env when appropriate), |
16 |
and bug #459832 (incorrect emerge handling of broken slot-operator deps). |
17 |
Bug #459934 tracks all bugs fixed since portage-2.1.11.52. |
18 |
|
19 |
(Portage version: 2.2.0_alpha164/cvs/Linux i686, signed Manifest commit with key 0xFDE8EF85AE5719A3) |
20 |
|
21 |
Revision Changes Path |
22 |
1.1215 sys-apps/portage/ChangeLog |
23 |
|
24 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1215&view=markup |
25 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1215&content-type=text/plain |
26 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1214&r2=1.1215 |
27 |
|
28 |
Index: ChangeLog |
29 |
=================================================================== |
30 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v |
31 |
retrieving revision 1.1214 |
32 |
retrieving revision 1.1215 |
33 |
diff -u -r1.1214 -r1.1215 |
34 |
--- ChangeLog 1 Mar 2013 10:02:48 -0000 1.1214 |
35 |
+++ ChangeLog 2 Mar 2013 04:24:16 -0000 1.1215 |
36 |
@@ -1,6 +1,21 @@ |
37 |
# ChangeLog for sys-apps/portage |
38 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
39 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1214 2013/03/01 10:02:48 ago Exp $ |
40 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1215 2013/03/02 04:24:16 zmedico Exp $ |
41 |
+ |
42 |
+*portage-2.1.11.53 (02 Mar 2013) |
43 |
+ |
44 |
+ 02 Mar 2013; Zac Medico <zmedico@g.o> +portage-2.1.11.53.ebuild, |
45 |
+ -portage-2.1.11.31.ebuild: |
46 |
+ 2.1.11.53 version bump. This fixes bug #102297 (remove deprecated preplib |
47 |
+ helper), bug #225821 (clarify python api docs for abssymlink function), bug |
48 |
+ #328113 (repoman validation of metadata.xml doctype), bug #368297 (remove |
49 |
+ useless 'Starting parallel fetch' message), bug #451326 (add workaround for |
50 |
+ compatibility with epoll implementation in qemu-user), bug #457136 (support |
51 |
+ quoted args in EXTRA_ECONF), bug #458730 (fix emerge --help docs to indicate |
52 |
+ that --verbose does not change output of --help), bug #459350 (unset LIGUAS in |
53 |
+ ebuild env when appropriate), and bug #459832 (incorrect emerge handling of |
54 |
+ broken slot-operator deps). Bug #459934 tracks all bugs fixed since |
55 |
+ portage-2.1.11.52. |
56 |
|
57 |
01 Mar 2013; Agostino Sarubbo <ago@g.o> portage-2.1.11.52.ebuild: |
58 |
Stable for sparc, wrt bug #459748 |
59 |
|
60 |
|
61 |
|
62 |
1.1 sys-apps/portage/portage-2.1.11.53.ebuild |
63 |
|
64 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.11.53.ebuild?rev=1.1&view=markup |
65 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.11.53.ebuild?rev=1.1&content-type=text/plain |
66 |
|
67 |
Index: portage-2.1.11.53.ebuild |
68 |
=================================================================== |
69 |
# Copyright 1999-2013 Gentoo Foundation |
70 |
# Distributed under the terms of the GNU General Public License v2 |
71 |
# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.53.ebuild,v 1.1 2013/03/02 04:24:16 zmedico Exp $ |
72 |
|
73 |
# Require EAPI 2 since we now require at least python-2.6 (for python 3 |
74 |
# syntax support) which also requires EAPI 2. |
75 |
EAPI=2 |
76 |
inherit eutils python |
77 |
|
78 |
DESCRIPTION="Portage is the package management and distribution system for Gentoo" |
79 |
HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml" |
80 |
LICENSE="GPL-2" |
81 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" |
82 |
SLOT="0" |
83 |
IUSE="build doc epydoc +ipc linguas_pl linguas_ru pypy2_0 python2 python3 selinux xattr" |
84 |
|
85 |
# Import of the io module in python-2.6 raises ImportError for the |
86 |
# thread module if threading is disabled. |
87 |
python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] ) |
88 |
!pypy2_0? ( !python2? ( !python3? ( |
89 |
|| ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) |
90 |
) ) ) |
91 |
pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2,ssl] ) ) ) |
92 |
python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )" |
93 |
python_dep="${python_dep_ssl//\[ssl\]}" |
94 |
python_dep="${python_dep//,ssl}" |
95 |
python_dep="${python_dep//ssl,}" |
96 |
|
97 |
# The pysqlite blocker is for bug #282760. |
98 |
# make-3.82 is for bug #455858 |
99 |
DEPEND="${python_dep} |
100 |
>=sys-devel/make-3.82 |
101 |
>=sys-apps/sed-4.0.5 sys-devel/patch |
102 |
doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) |
103 |
epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )" |
104 |
# Require sandbox-2.2 for bug #288863. |
105 |
# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's |
106 |
# quite slow, so it's not considered in the dependencies as an alternative to |
107 |
# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so |
108 |
# for now, don't pull in xattr deps for other kernels. |
109 |
# For whirlpool hash, require python[ssl] or python-mhash (bug #425046). |
110 |
# For compgen, require bash[readline] (bug #445576). |
111 |
RDEPEND="${python_dep} |
112 |
!build? ( >=sys-apps/sed-4.0.5 |
113 |
|| ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) ) |
114 |
>=app-admin/eselect-1.2 |
115 |
|| ( ${python_dep_ssl} dev-python/python-mhash ) |
116 |
) |
117 |
elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) |
118 |
elibc_glibc? ( >=sys-apps/sandbox-2.2 ) |
119 |
elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) |
120 |
>=app-misc/pax-utils-0.1.17 |
121 |
xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) |
122 |
selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) |
123 |
!<app-shells/bash-3.2_p17 |
124 |
!<app-admin/logrotate-3.8.0" |
125 |
PDEPEND=" |
126 |
!build? ( |
127 |
>=net-misc/rsync-2.6.4 |
128 |
userland_GNU? ( >=sys-apps/coreutils-6.4 ) |
129 |
)" |
130 |
# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 |
131 |
# NOTE: FEATURES=installsources requires debugedit and rsync |
132 |
|
133 |
SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives" |
134 |
|
135 |
prefix_src_archives() { |
136 |
local x y |
137 |
for x in ${@}; do |
138 |
for y in ${SRC_ARCHIVES}; do |
139 |
echo ${y}/${x} |
140 |
done |
141 |
done |
142 |
} |
143 |
|
144 |
PV_PL="2.1.2" |
145 |
PATCHVER_PL="" |
146 |
TARBALL_PV=$PV |
147 |
SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 |
148 |
$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2) |
149 |
linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2 |
150 |
$(prefix_src_archives ${PN}-man-pl-${PV_PL}.tar.bz2) )" |
151 |
|
152 |
PATCHVER= |
153 |
[[ $TARBALL_PV = $PV ]] || PATCHVER=$PV |
154 |
if [ -n "${PATCHVER}" ]; then |
155 |
SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2 |
156 |
$(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)" |
157 |
fi |
158 |
|
159 |
S="${WORKDIR}"/${PN}-${TARBALL_PV} |
160 |
S_PL="${WORKDIR}"/${PN}-${PV_PL} |
161 |
|
162 |
compatible_python_is_selected() { |
163 |
[[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]] |
164 |
} |
165 |
|
166 |
current_python_has_xattr() { |
167 |
[[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x3030000 and "yes" or "no")') = yes ]] || \ |
168 |
/usr/bin/python -c 'import xattr' 2>/dev/null |
169 |
} |
170 |
|
171 |
pkg_setup() { |
172 |
if use python2 && use python3 ; then |
173 |
ewarn "Both python2 and python3 USE flags are enabled, but only one" |
174 |
ewarn "can be in the shebangs. Using python3." |
175 |
fi |
176 |
if use pypy2_0 && use python3 ; then |
177 |
ewarn "Both pypy2_0 and python3 USE flags are enabled, but only one" |
178 |
ewarn "can be in the shebangs. Using python3." |
179 |
fi |
180 |
if use pypy2_0 && use python2 ; then |
181 |
ewarn "Both pypy2_0 and python2 USE flags are enabled, but only one" |
182 |
ewarn "can be in the shebangs. Using python2" |
183 |
fi |
184 |
if ! use pypy2_0 && ! use python2 && ! use python3 && \ |
185 |
! compatible_python_is_selected ; then |
186 |
ewarn "Attempting to select a compatible default python interpreter" |
187 |
local x success=0 |
188 |
for x in /usr/bin/python2.* ; do |
189 |
x=${x#/usr/bin/python2.} |
190 |
if [[ $x -ge 6 ]] 2>/dev/null ; then |
191 |
eselect python set python2.$x |
192 |
if compatible_python_is_selected ; then |
193 |
elog "Default python interpreter is now set to python-2.$x" |
194 |
success=1 |
195 |
break |
196 |
fi |
197 |
fi |
198 |
done |
199 |
if [ $success != 1 ] ; then |
200 |
eerror "Unable to select a compatible default python interpreter!" |
201 |
die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)." |
202 |
fi |
203 |
fi |
204 |
|
205 |
if use python3; then |
206 |
python_set_active_version 3 |
207 |
elif use python2; then |
208 |
python_set_active_version 2 |
209 |
elif use pypy2_0; then |
210 |
python_set_active_version 2.7-pypy-2.0 |
211 |
fi |
212 |
} |
213 |
|
214 |
src_prepare() { |
215 |
if [ -n "${PATCHVER}" ] ; then |
216 |
if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then |
217 |
rm "$S/bin/ebuild-helpers/portageq" \ |
218 |
|| die "failed to remove portageq helper symlink" |
219 |
fi |
220 |
epatch "${WORKDIR}/${PN}-${PATCHVER}.patch" |
221 |
fi |
222 |
einfo "Setting portage.VERSION to ${PVR} ..." |
223 |
sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \ |
224 |
die "Failed to patch portage.VERSION" |
225 |
sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \ |
226 |
die "Failed to patch VERSION in doc/fragment/version" |
227 |
sed -e "1s/VERSION/${PVR}/" -i $(find man -type f) || \ |
228 |
die "Failed to patch VERSION in man page headers" |
229 |
|
230 |
if ! use ipc ; then |
231 |
einfo "Disabling ipc..." |
232 |
sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ |
233 |
-i pym/_emerge/AbstractEbuildProcess.py || \ |
234 |
die "failed to patch AbstractEbuildProcess.py" |
235 |
fi |
236 |
|
237 |
if use xattr && use kernel_linux ; then |
238 |
einfo "Adding FEATURES=xattr to make.globals ..." |
239 |
echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ |
240 |
|| die "failed to append to make.globals" |
241 |
fi |
242 |
|
243 |
if use python3; then |
244 |
einfo "Converting shebangs for python3..." |
245 |
python_convert_shebangs -r 3 . |
246 |
elif use python2; then |
247 |
einfo "Converting shebangs for python2..." |
248 |
python_convert_shebangs -r 2 . |
249 |
elif use pypy2_0; then |
250 |
einfo "Converting shebangs for pypy-c2.0..." |
251 |
python_convert_shebangs -r 2.7-pypy-2.0 . |
252 |
fi |
253 |
|
254 |
cd "${S}/cnf" || die |
255 |
if [ -f "make.conf.${ARCH}".diff ]; then |
256 |
patch make.conf "make.conf.${ARCH}".diff || \ |
257 |
die "Failed to patch make.conf.example" |
258 |
else |
259 |
eerror "" |
260 |
eerror "Portage does not have an arch-specific configuration for this arch." |
261 |
eerror "Please notify the arch maintainer about this issue. Using generic." |
262 |
eerror "" |
263 |
fi |
264 |
} |
265 |
|
266 |
src_compile() { |
267 |
if use doc; then |
268 |
emake docbook || die |
269 |
fi |
270 |
|
271 |
if use epydoc; then |
272 |
einfo "Generating api docs" |
273 |
emake epydoc || die |
274 |
fi |
275 |
} |
276 |
|
277 |
src_test() { |
278 |
emake test || die |
279 |
} |
280 |
|
281 |
src_install() { |
282 |
emake DESTDIR="${D}" \ |
283 |
sysconfdir="/etc" \ |
284 |
prefix="/usr" \ |
285 |
install || die |
286 |
|
287 |
# Extended set config is currently disabled in portage-2.1.x. |
288 |
rm -rf "${D}/usr/share/portage/config/sets" || die |
289 |
|
290 |
# Use dodoc for compression, since the Makefile doesn't do that. |
291 |
dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} || die |
292 |
|
293 |
if use linguas_pl; then |
294 |
doman -i18n=pl "${S_PL}"/man/pl/*.[0-9] || die |
295 |
doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] || die |
296 |
fi |
297 |
|
298 |
# Set PYTHONPATH for portage API consumers. This way we don't have |
299 |
# to rely on patched python having the correct path, since it has |
300 |
# been known to incorrectly add /usr/libx32/portage/pym to sys.path. |
301 |
echo "PYTHONPATH=\"/usr/lib/portage/pym\"" > \ |
302 |
"${T}/05portage" || die |
303 |
doenvd "${T}/05portage" || die |
304 |
} |
305 |
|
306 |
pkg_preinst() { |
307 |
if [[ $ROOT == / ]] ; then |
308 |
# Run some minimal tests as a sanity check. |
309 |
local test_runner=$(find "$D" -name runTests) |
310 |
if [[ -n $test_runner && -x $test_runner ]] ; then |
311 |
einfo "Running preinst sanity tests..." |
312 |
"$test_runner" || die "preinst sanity tests failed" |
313 |
fi |
314 |
fi |
315 |
|
316 |
if use xattr && ! current_python_has_xattr ; then |
317 |
ewarn "For optimal performance in xattr handling, install" |
318 |
ewarn "dev-python/pyxattr, or install >=dev-lang/python-3.3 and" |
319 |
ewarn "enable USE=python3 for $CATEGORY/$PN." |
320 |
fi |
321 |
|
322 |
if [[ -d ${ROOT}var/log/portage && \ |
323 |
$(ls -ld "${ROOT}var/log/portage") != *" portage portage "* ]] && \ |
324 |
has_version '<sys-apps/portage-2.1.10.11' ; then |
325 |
# Initialize permissions for bug #378451 and bug #377177, since older |
326 |
# portage does not create /var/log/portage with the desired default |
327 |
# permissions. |
328 |
einfo "Applying portage group permission to ${ROOT}var/log/portage for bug #378451" |
329 |
chown portage:portage "${ROOT}var/log/portage" |
330 |
chmod g+ws "${ROOT}var/log/portage" |
331 |
fi |
332 |
|
333 |
if has_version '<sys-apps/portage-2.1.10.61' ; then |
334 |
ewarn "FEATURES=config-protect-if-modified is now enabled by default." |
335 |
ewarn "This causes the CONFIG_PROTECT behavior to be skipped for" |
336 |
ewarn "files that have not been modified since they were installed." |
337 |
fi |
338 |
} |
339 |
|
340 |
pkg_postinst() { |
341 |
# Compile all source files recursively. Any orphans |
342 |
# will be identified and removed in postrm. |
343 |
python_mod_optimize /usr/lib/portage/pym |
344 |
} |
345 |
|
346 |
pkg_postrm() { |
347 |
python_mod_cleanup /usr/lib/portage/pym |
348 |
} |