1 |
zmedico 12/06/27 23:09:34 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: portage-2.2.0_alpha114.ebuild |
5 |
Removed: portage-2.2.0_alpha113.ebuild |
6 |
Log: |
7 |
2.2.0_alpha114 version bump. This includes all of the fixes in 2.1.11.3. |
8 |
Bug #210077 tracks all bugs fixed since portage-2.1.x. |
9 |
|
10 |
(Portage version: 2.2.0_alpha114/cvs/Linux i686) |
11 |
|
12 |
Revision Changes Path |
13 |
1.1046 sys-apps/portage/ChangeLog |
14 |
|
15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1046&view=markup |
16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1046&content-type=text/plain |
17 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1045&r2=1.1046 |
18 |
|
19 |
Index: ChangeLog |
20 |
=================================================================== |
21 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v |
22 |
retrieving revision 1.1045 |
23 |
retrieving revision 1.1046 |
24 |
diff -u -r1.1045 -r1.1046 |
25 |
--- ChangeLog 27 Jun 2012 23:07:51 -0000 1.1045 |
26 |
+++ ChangeLog 27 Jun 2012 23:09:34 -0000 1.1046 |
27 |
@@ -1,6 +1,13 @@ |
28 |
# ChangeLog for sys-apps/portage |
29 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
30 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1045 2012/06/27 23:07:51 zmedico Exp $ |
31 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1046 2012/06/27 23:09:34 zmedico Exp $ |
32 |
+ |
33 |
+*portage-2.2.0_alpha114 (27 Jun 2012) |
34 |
+ |
35 |
+ 27 Jun 2012; Zac Medico <zmedico@g.o> +portage-2.2.0_alpha114.ebuild, |
36 |
+ -portage-2.2.0_alpha113.ebuild: |
37 |
+ 2.2.0_alpha114 version bump. This includes all of the fixes in 2.1.11.3. Bug |
38 |
+ #210077 tracks all bugs fixed since portage-2.1.x. |
39 |
|
40 |
*portage-2.1.11.3 (27 Jun 2012) |
41 |
|
42 |
|
43 |
|
44 |
|
45 |
1.1 sys-apps/portage/portage-2.2.0_alpha114.ebuild |
46 |
|
47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha114.ebuild?rev=1.1&view=markup |
48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha114.ebuild?rev=1.1&content-type=text/plain |
49 |
|
50 |
Index: portage-2.2.0_alpha114.ebuild |
51 |
=================================================================== |
52 |
# Copyright 1999-2012 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha114.ebuild,v 1.1 2012/06/27 23:09:34 zmedico Exp $ |
55 |
|
56 |
# Require EAPI 2 since we now require at least python-2.6 (for python 3 |
57 |
# syntax support) which also requires EAPI 2. |
58 |
EAPI=3 |
59 |
inherit eutils multilib python |
60 |
|
61 |
DESCRIPTION="Portage is the package management and distribution system for Gentoo" |
62 |
HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml" |
63 |
LICENSE="GPL-2" |
64 |
KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
65 |
SLOT="0" |
66 |
IUSE="build doc epydoc +ipc linguas_pl pypy1_9 python2 python3 selinux xattr" |
67 |
|
68 |
# Import of the io module in python-2.6 raises ImportError for the |
69 |
# thread module if threading is disabled. |
70 |
python_dep="python3? ( =dev-lang/python-3* ) |
71 |
!pypy1_9? ( !python2? ( !python3? ( |
72 |
|| ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) |
73 |
) ) ) |
74 |
pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) ) |
75 |
python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) )" |
76 |
|
77 |
# The pysqlite blocker is for bug #282760. |
78 |
DEPEND="${python_dep} |
79 |
!build? ( >=sys-apps/sed-4.0.5 ) |
80 |
doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) |
81 |
epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )" |
82 |
# Require sandbox-2.2 for bug #288863. |
83 |
# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's |
84 |
# quite slow, so it's not considered in the dependencies as an alternative to |
85 |
# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so |
86 |
# for now, don't pull in xattr deps for other kernels. |
87 |
RDEPEND="${python_dep} |
88 |
!build? ( >=sys-apps/sed-4.0.5 |
89 |
>=app-shells/bash-3.2_p17 |
90 |
>=app-admin/eselect-1.2 ) |
91 |
elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) |
92 |
elibc_glibc? ( >=sys-apps/sandbox-2.2 ) |
93 |
elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) |
94 |
>=app-misc/pax-utils-0.1.17 |
95 |
xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) |
96 |
selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) |
97 |
!<app-shells/bash-3.2_p17 |
98 |
!<app-admin/logrotate-3.8.0" |
99 |
PDEPEND=" |
100 |
!build? ( |
101 |
>=net-misc/rsync-2.6.4 |
102 |
userland_GNU? ( >=sys-apps/coreutils-6.4 ) |
103 |
)" |
104 |
# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 |
105 |
# NOTE: FEATURES=install-sources requires debugedit and rsync |
106 |
|
107 |
SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives" |
108 |
|
109 |
prefix_src_archives() { |
110 |
local x y |
111 |
for x in ${@}; do |
112 |
for y in ${SRC_ARCHIVES}; do |
113 |
echo ${y}/${x} |
114 |
done |
115 |
done |
116 |
} |
117 |
|
118 |
PV_PL="2.1.2" |
119 |
PATCHVER_PL="" |
120 |
TARBALL_PV=2.2.0_alpha111 |
121 |
SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 |
122 |
$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2) |
123 |
linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2 |
124 |
$(prefix_src_archives ${PN}-man-pl-${PV_PL}.tar.bz2) )" |
125 |
|
126 |
PATCHVER= |
127 |
[[ $TARBALL_PV = $PV ]] || PATCHVER=$PV |
128 |
if [ -n "${PATCHVER}" ]; then |
129 |
SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2 |
130 |
$(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)" |
131 |
fi |
132 |
|
133 |
S="${WORKDIR}"/${PN}-${TARBALL_PV} |
134 |
S_PL="${WORKDIR}"/${PN}-${PV_PL} |
135 |
|
136 |
compatible_python_is_selected() { |
137 |
[[ $("${EPREFIX}/usr/bin/python" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]] |
138 |
} |
139 |
|
140 |
current_python_has_xattr() { |
141 |
[[ $("${EPREFIX}/usr/bin/python" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x3030000 and "yes" or "no")') = yes ]] || \ |
142 |
"${EPREFIX}/usr/bin/python" -c 'import xattr' 2>/dev/null |
143 |
} |
144 |
|
145 |
pkg_setup() { |
146 |
# Bug #359731 - Die early if get_libdir fails. |
147 |
[[ -z $(get_libdir) ]] && \ |
148 |
die "get_libdir returned an empty string" |
149 |
|
150 |
if use python2 && use python3 ; then |
151 |
ewarn "Both python2 and python3 USE flags are enabled, but only one" |
152 |
ewarn "can be in the shebangs. Using python3." |
153 |
fi |
154 |
if use pypy1_9 && use python3 ; then |
155 |
ewarn "Both pypy1_9 and python3 USE flags are enabled, but only one" |
156 |
ewarn "can be in the shebangs. Using python3." |
157 |
fi |
158 |
if use pypy1_9 && use python2 ; then |
159 |
ewarn "Both pypy1_9 and python2 USE flags are enabled, but only one" |
160 |
ewarn "can be in the shebangs. Using python2" |
161 |
fi |
162 |
if ! use pypy1_9 && ! use python2 && ! use python3 && \ |
163 |
! compatible_python_is_selected ; then |
164 |
ewarn "Attempting to select a compatible default python interpreter" |
165 |
local x success=0 |
166 |
for x in /usr/bin/python2.* ; do |
167 |
x=${x#/usr/bin/python2.} |
168 |
if [[ $x -ge 6 ]] 2>/dev/null ; then |
169 |
eselect python set python2.$x |
170 |
if compatible_python_is_selected ; then |
171 |
elog "Default python interpreter is now set to python-2.$x" |
172 |
success=1 |
173 |
break |
174 |
fi |
175 |
fi |
176 |
done |
177 |
if [ $success != 1 ] ; then |
178 |
eerror "Unable to select a compatible default python interpreter!" |
179 |
die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)." |
180 |
fi |
181 |
fi |
182 |
|
183 |
if use python3; then |
184 |
python_set_active_version 3 |
185 |
elif use python2; then |
186 |
python_set_active_version 2 |
187 |
elif use pypy1_9; then |
188 |
python_set_active_version 2.7-pypy-1.9 |
189 |
fi |
190 |
} |
191 |
|
192 |
src_prepare() { |
193 |
if [ -n "${PATCHVER}" ] ; then |
194 |
if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then |
195 |
rm "$S/bin/ebuild-helpers/portageq" \ |
196 |
|| die "failed to remove portageq helper symlink" |
197 |
fi |
198 |
epatch "${WORKDIR}/${PN}-${PATCHVER}.patch" |
199 |
fi |
200 |
einfo "Setting portage.VERSION to ${PVR} ..." |
201 |
sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \ |
202 |
die "Failed to patch portage.VERSION" |
203 |
sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \ |
204 |
die "Failed to patch VERSION in doc/fragment/version" |
205 |
sed -e "1s/VERSION/${PVR}/" -i man/* || \ |
206 |
die "Failed to patch VERSION in man page headers" |
207 |
|
208 |
if ! use ipc ; then |
209 |
einfo "Disabling ipc..." |
210 |
sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ |
211 |
-i pym/_emerge/AbstractEbuildProcess.py || \ |
212 |
die "failed to patch AbstractEbuildProcess.py" |
213 |
fi |
214 |
|
215 |
if use xattr && use kernel_linux ; then |
216 |
einfo "Adding FEATURES=xattr to make.globals ..." |
217 |
echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ |
218 |
|| die "failed to append to make.globals" |
219 |
fi |
220 |
|
221 |
if use python3; then |
222 |
einfo "Converting shebangs for python3..." |
223 |
python_convert_shebangs -r 3 . |
224 |
elif use python2; then |
225 |
einfo "Converting shebangs for python2..." |
226 |
python_convert_shebangs -r 2 . |
227 |
elif use pypy1_9; then |
228 |
einfo "Converting shebangs for pypy-c1.9..." |
229 |
python_convert_shebangs -r 2.7-pypy-1.9 . |
230 |
fi |
231 |
|
232 |
if [[ -n ${EPREFIX} ]] ; then |
233 |
einfo "Setting portage.const.EPREFIX ..." |
234 |
sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \ |
235 |
-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \ |
236 |
-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \ |
237 |
-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \ |
238 |
-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \ |
239 |
-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \ |
240 |
-i pym/portage/const.py || \ |
241 |
die "Failed to patch portage.const.EPREFIX" |
242 |
|
243 |
einfo "Prefixing shebangs ..." |
244 |
find . -type f -print0 | \ |
245 |
while read -r -d $'\0' ; do |
246 |
local shebang=$(head -n1 "$REPLY") |
247 |
if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then |
248 |
sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \ |
249 |
die "sed failed" |
250 |
fi |
251 |
done |
252 |
|
253 |
einfo "Adjusting make.globals ..." |
254 |
sed -e 's|^SYNC=.*|SYNC="rsync://rsync.prefix.freens.org/gentoo-portage-prefix"|' \ |
255 |
-e "s|^\(PORTDIR=\)\(/usr/portage\)|\\1\"${EPREFIX}\\2\"|" \ |
256 |
-e "s|^\(PORTAGE_TMPDIR=\)\(/var/tmp\)|\\1\"${EPREFIX}\\2\"|" \ |
257 |
-i cnf/make.globals || die "sed failed" |
258 |
|
259 |
einfo "Adding FEATURES=force-prefix to make.globals ..." |
260 |
echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ |
261 |
|| die "failed to append to make.globals" |
262 |
fi |
263 |
|
264 |
cd "${S}/cnf" || die |
265 |
if [ -f "make.conf.${ARCH}".diff ]; then |
266 |
patch make.conf "make.conf.${ARCH}".diff || \ |
267 |
die "Failed to patch make.conf.example" |
268 |
else |
269 |
eerror "" |
270 |
eerror "Portage does not have an arch-specific configuration for this arch." |
271 |
eerror "Please notify the arch maintainer about this issue. Using generic." |
272 |
eerror "" |
273 |
fi |
274 |
|
275 |
# BSD and OSX need a sed wrapper so that find/xargs work properly |
276 |
if use userland_GNU; then |
277 |
rm -f "${S}"/bin/ebuild-helpers/sed || \ |
278 |
die "Failed to remove sed wrapper" |
279 |
fi |
280 |
} |
281 |
|
282 |
src_compile() { |
283 |
if use doc; then |
284 |
emake docbook || die |
285 |
fi |
286 |
|
287 |
if use epydoc; then |
288 |
einfo "Generating api docs" |
289 |
emake epydoc || die |
290 |
fi |
291 |
} |
292 |
|
293 |
src_test() { |
294 |
# make files executable, in case they were created by patch |
295 |
find bin -type f | xargs chmod +x |
296 |
emake test || die |
297 |
} |
298 |
|
299 |
src_install() { |
300 |
emake DESTDIR="${D}" \ |
301 |
sysconfdir="${EPREFIX}/etc" \ |
302 |
prefix="${EPREFIX}/usr" \ |
303 |
libdir="${EPREFIX}/usr/$(get_libdir)" \ |
304 |
install || die |
305 |
|
306 |
# Use dodoc for compression, since the Makefile doesn't do that. |
307 |
dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} || die |
308 |
|
309 |
if use linguas_pl; then |
310 |
doman -i18n=pl "${S_PL}"/man/pl/*.[0-9] || die |
311 |
doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] || die |
312 |
fi |
313 |
} |
314 |
|
315 |
pkg_preinst() { |
316 |
if [[ $ROOT == / ]] ; then |
317 |
# Run some minimal tests as a sanity check. |
318 |
local test_runner=$(find "$ED" -name runTests) |
319 |
if [[ -n $test_runner && -x $test_runner ]] ; then |
320 |
einfo "Running preinst sanity tests..." |
321 |
"$test_runner" || die "preinst sanity tests failed" |
322 |
fi |
323 |
fi |
324 |
|
325 |
if use xattr && ! current_python_has_xattr ; then |
326 |
ewarn "For optimal performance in xattr handling, install" |
327 |
ewarn "dev-python/pyxattr, or install >=dev-lang/python-3.3 and" |
328 |
ewarn "enable USE=python3 for $CATEGORY/$PN." |
329 |
fi |
330 |
|
331 |
if ! use build && ! has_version dev-python/pycrypto && \ |
332 |
! has_version '>=dev-lang/python-2.6[ssl]' ; then |
333 |
ewarn "If you are an ebuild developer and you plan to commit ebuilds" |
334 |
ewarn "with this system then please install dev-python/pycrypto or" |
335 |
ewarn "enable the ssl USE flag for >=dev-lang/python-2.6 in order" |
336 |
ewarn "to enable RMD160 hash support." |
337 |
ewarn "See bug #198398 for more information." |
338 |
fi |
339 |
if [[ ! -L "${EROOT}/etc/make.globals" && |
340 |
-f "${EROOT}/etc/make.globals" ]]; then |
341 |
rm "${EROOT}/etc/make.globals" |
342 |
fi |
343 |
|
344 |
has_version "<=${CATEGORY}/${PN}-2.2_pre5" \ |
345 |
&& WORLD_MIGRATION_UPGRADE=true || WORLD_MIGRATION_UPGRADE=false |
346 |
|
347 |
# If portage-2.1.6 is installed and the preserved_libs_registry exists, |
348 |
# assume that the NEEDED.ELF.2 files have already been generated. |
349 |
has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \ |
350 |
! ( [ -e "${EROOT}"var/lib/portage/preserved_libs_registry ] && \ |
351 |
has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ) \ |
352 |
&& NEEDED_REBUILD_UPGRADE=true || NEEDED_REBUILD_UPGRADE=false |
353 |
} |
354 |
|
355 |
pkg_postinst() { |
356 |
# Compile all source files recursively. Any orphans |
357 |
# will be identified and removed in postrm. |
358 |
python_mod_optimize /usr/$(get_libdir)/portage/pym |
359 |
|
360 |
if $WORLD_MIGRATION_UPGRADE && \ |
361 |
grep -q "^@" "${EROOT}/var/lib/portage/world"; then |
362 |
einfo "moving set references from the worldfile into world_sets" |
363 |
cd "${EROOT}/var/lib/portage/" |
364 |
grep "^@" world >> world_sets |
365 |
sed -i -e '/^@/d' world |
366 |
fi |
367 |
|
368 |
if $NEEDED_REBUILD_UPGRADE ; then |
369 |
einfo "rebuilding NEEDED.ELF.2 files" |
370 |
for cpv in "${EROOT}/var/db/pkg"/*/*; do |
371 |
if [ -f "${cpv}/NEEDED" ]; then |
372 |
rm -f "${cpv}/NEEDED.ELF.2" |
373 |
while read line; do |
374 |
filename=${line% *} |
375 |
needed=${line#* } |
376 |
needed=${needed//+/++} |
377 |
needed=${needed//#/##} |
378 |
needed=${needed//%/%%} |
379 |
newline=$(scanelf -BF "%a;%F;%S;%r;${needed}" $filename) |
380 |
newline=${newline// - } |
381 |
echo "${newline:3}" >> "${cpv}/NEEDED.ELF.2" |
382 |
done < "${cpv}/NEEDED" |
383 |
fi |
384 |
done |
385 |
fi |
386 |
} |
387 |
|
388 |
pkg_postrm() { |
389 |
python_mod_cleanup /usr/$(get_libdir)/portage/pym |
390 |
} |