1 |
zmedico 08/08/01 11:10:25 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: portage-2.2_rc6.ebuild |
5 |
Removed: portage-2.2_rc4.ebuild portage-2.2_rc3.ebuild |
6 |
Log: |
7 |
2.2_rc6 bump. This fixes bugs #94133 (userfetch access check), #229033 |
8 |
InvalidAtom exception), #233303 (@dowgrade package set), #233421 (make |
9 |
DISTDIR permission adjustment less aggressive), #233458 (KeyError |
10 |
triggered by fetch failure), and #233487 (--fetch-all-uri breakage). |
11 |
Also, there are new @live-rebuild and @module-rebuild package sets that |
12 |
are now included with the default set configuration. Bug #210077 tracks |
13 |
all bugs fixed since 2.1.5.x. |
14 |
(Portage version: 2.2_rc6/cvs/Linux 2.6.26-0724-x86-64 i686) |
15 |
|
16 |
Revision Changes Path |
17 |
1.537 sys-apps/portage/ChangeLog |
18 |
|
19 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.537&view=markup |
20 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.537&content-type=text/plain |
21 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.536&r2=1.537 |
22 |
|
23 |
Index: ChangeLog |
24 |
=================================================================== |
25 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v |
26 |
retrieving revision 1.536 |
27 |
retrieving revision 1.537 |
28 |
diff -u -r1.536 -r1.537 |
29 |
--- ChangeLog 30 Jul 2008 10:18:57 -0000 1.536 |
30 |
+++ ChangeLog 1 Aug 2008 11:10:25 -0000 1.537 |
31 |
@@ -1,6 +1,18 @@ |
32 |
# ChangeLog for sys-apps/portage |
33 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
34 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.536 2008/07/30 10:18:57 zmedico Exp $ |
35 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.537 2008/08/01 11:10:25 zmedico Exp $ |
36 |
+ |
37 |
+*portage-2.2_rc6 (01 Aug 2008) |
38 |
+ |
39 |
+ 01 Aug 2008; Zac Medico <zmedico@g.o> +portage-2.2_rc6.ebuild: |
40 |
+ 2.2_rc6 bump. This fixes bugs #94133 (userfetch access check), #229033 |
41 |
+ #233252 (repoman manifest commit optimization for svn), #233253 (unhandled |
42 |
+ InvalidAtom exception), #233303 (@dowgrade package set), #233421 (make |
43 |
+ DISTDIR permission adjustment less aggressive), #233458 (KeyError |
44 |
+ triggered by fetch failure), and #233487 (--fetch-all-uri breakage). |
45 |
+ Also, there are new @live-rebuild and @module-rebuild package sets that |
46 |
+ are now included with the default set configuration. Bug #210077 tracks |
47 |
+ all bugs fixed since 2.1.5.x. |
48 |
|
49 |
*portage-2.2_rc5 (30 Jul 2008) |
50 |
|
51 |
|
52 |
|
53 |
|
54 |
1.1 sys-apps/portage/portage-2.2_rc6.ebuild |
55 |
|
56 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.2_rc6.ebuild?rev=1.1&view=markup |
57 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.2_rc6.ebuild?rev=1.1&content-type=text/plain |
58 |
|
59 |
Index: portage-2.2_rc6.ebuild |
60 |
=================================================================== |
61 |
# Copyright 1999-2008 Gentoo Foundation |
62 |
# Distributed under the terms of the GNU General Public License v2 |
63 |
# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc6.ebuild,v 1.1 2008/08/01 11:10:25 zmedico Exp $ |
64 |
|
65 |
inherit eutils multilib python |
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 |
LICENSE="GPL-2" |
70 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" |
71 |
PROVIDE="virtual/portage" |
72 |
SLOT="0" |
73 |
IUSE="build doc epydoc selinux linguas_pl" |
74 |
|
75 |
python_dep=">=dev-lang/python-2.4" |
76 |
|
77 |
DEPEND="${python_dep} |
78 |
!build? ( >=sys-apps/sed-4.0.5 ) |
79 |
doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) |
80 |
epydoc? ( =dev-python/epydoc-2* )" |
81 |
RDEPEND="${python_dep} |
82 |
!build? ( >=sys-apps/sed-4.0.5 |
83 |
>=app-shells/bash-3.2_p17 |
84 |
>=app-admin/eselect-news-20071201 ) |
85 |
elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) |
86 |
elibc_glibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) ) |
87 |
elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) ) |
88 |
>=app-misc/pax-utils-0.1.17 |
89 |
selinux? ( >=dev-python/python-selinux-2.16 )" |
90 |
PDEPEND=" |
91 |
!build? ( |
92 |
>=net-misc/rsync-2.6.4 |
93 |
userland_GNU? ( >=sys-apps/coreutils-6.4 ) |
94 |
|| ( >=dev-lang/python-2.5 >=dev-python/pycrypto-2.0.1-r6 ) |
95 |
)" |
96 |
# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 |
97 |
# rsync-2.6.4 rdep is for the --filter option #167668 |
98 |
|
99 |
SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives" |
100 |
|
101 |
prefix_src_archives() { |
102 |
local x y |
103 |
for x in ${@}; do |
104 |
for y in ${SRC_ARCHIVES}; do |
105 |
echo ${y}/${x} |
106 |
done |
107 |
done |
108 |
} |
109 |
|
110 |
PV_PL="2.1.2" |
111 |
PATCHVER_PL="" |
112 |
TARBALL_PV="2.2_rc1" |
113 |
SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 |
114 |
$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2) |
115 |
linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2 |
116 |
$(prefix_src_archives ${PN}-man-pl-${PV_PL}.tar.bz2) )" |
117 |
|
118 |
PATCHVER=${PV} |
119 |
if [ -n "${PATCHVER}" ]; then |
120 |
SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2 |
121 |
$(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)" |
122 |
fi |
123 |
|
124 |
S="${WORKDIR}"/${PN}-${TARBALL_PV} |
125 |
S_PL="${WORKDIR}"/${PN}-${PV_PL} |
126 |
|
127 |
pkg_setup() { |
128 |
MINOR_UPGRADE=$(has_version '>=sys-apps/portage-2.2_alpha' && echo true) |
129 |
WORLD_MIGRATION_UPGRADE=$(has_version '<=sys-apps/portage-2.2_pre5' && echo true) |
130 |
NEEDED_REBUILD_UPGRADE=$(has_version '<=sys-apps/portage-2.2_pre7' && echo true) |
131 |
} |
132 |
|
133 |
src_unpack() { |
134 |
unpack ${A} |
135 |
cd "${S}" |
136 |
if [ -n "${PATCHVER}" ]; then |
137 |
cd "${S}" |
138 |
epatch "${WORKDIR}/${PN}-${PATCHVER}.patch" |
139 |
fi |
140 |
einfo "Setting portage.VERSION to ${PVR} ..." |
141 |
sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage/__init__.py || \ |
142 |
die "Failed to patch portage.VERSION" |
143 |
} |
144 |
|
145 |
src_compile() { |
146 |
|
147 |
if use doc; then |
148 |
cd "${S}"/doc |
149 |
touch fragment/date |
150 |
make xhtml xhtml-nochunks || die "failed to make docs" |
151 |
fi |
152 |
|
153 |
if use epydoc; then |
154 |
einfo "Generating api docs" |
155 |
mkdir "${WORKDIR}"/api |
156 |
local my_modules |
157 |
my_modules="$(find "${S}/pym" -name "*.py" \ |
158 |
| sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \ |
159 |
-e 's:/:.:g' | sort)" || die "error listing modules" |
160 |
PYTHONPATH="${S}/pym:${PYTHONPATH}" epydoc -o "${WORKDIR}"/api \ |
161 |
-qqqqq --no-frames --show-imports \ |
162 |
--name "${PN}" --url "${HOMEPAGE}" \ |
163 |
${my_modules} || die "epydoc failed" |
164 |
fi |
165 |
} |
166 |
|
167 |
src_test() { |
168 |
./pym/portage/tests/runTests || \ |
169 |
die "test(s) failed" |
170 |
} |
171 |
|
172 |
src_install() { |
173 |
local libdir=$(get_libdir) |
174 |
local portage_base="/usr/${libdir}/portage" |
175 |
local portage_share_config=/usr/share/portage/config |
176 |
|
177 |
cd "${S}"/cnf |
178 |
insinto /etc |
179 |
doins etc-update.conf dispatch-conf.conf |
180 |
|
181 |
dodir "${portage_share_config}" |
182 |
insinto "${portage_share_config}" |
183 |
doins "${S}/cnf/"{sets.conf,make.globals} |
184 |
if [ -f "make.conf.${ARCH}".diff ]; then |
185 |
patch make.conf "make.conf.${ARCH}".diff || \ |
186 |
die "Failed to patch make.conf.example" |
187 |
newins make.conf make.conf.example |
188 |
else |
189 |
eerror "" |
190 |
eerror "Portage does not have an arch-specific configuration for this arch." |
191 |
eerror "Please notify the arch maintainer about this issue. Using generic." |
192 |
eerror "" |
193 |
newins make.conf make.conf.example |
194 |
fi |
195 |
|
196 |
dosym ..${portage_share_config}/make.globals /etc/make.globals |
197 |
|
198 |
insinto /etc/logrotate.d |
199 |
doins "${S}"/cnf/logrotate.d/elog-save-summary |
200 |
|
201 |
dodir ${portage_base}/bin |
202 |
exeinto ${portage_base}/bin |
203 |
|
204 |
# BSD and OSX need a sed wrapper so that find/xargs work properly |
205 |
if use userland_GNU; then |
206 |
rm "${S}"/bin/sed || die "Failed to remove sed wrapper" |
207 |
fi |
208 |
|
209 |
cd "${S}"/bin |
210 |
doexe * |
211 |
dosym newins ${portage_base}/bin/donewins |
212 |
|
213 |
local symlinks |
214 |
for mydir in $(find "${S}"/pym -type d | sed -e "s:^${S}/::") ; do |
215 |
dodir ${portage_base}/${mydir} |
216 |
insinto ${portage_base}/${mydir} |
217 |
cd "${S}"/${mydir} |
218 |
doins *.py |
219 |
symlinks=$(find . -mindepth 1 -maxdepth 1 -type l) |
220 |
[ -n "${symlinks}" ] && cp -P ${symlinks} "${D}${portage_base}/${mydir}" |
221 |
done |
222 |
|
223 |
# Symlinks to directories cause up/downgrade issues and the use of these |
224 |
# modules outside of portage is probably negligible. |
225 |
for x in "${D}${portage_base}/pym/"{cache,elog_modules} ; do |
226 |
[ ! -L "${x}" ] && continue |
227 |
die "symlink to directory will cause upgrade/downgrade issues: '${x}'" |
228 |
done |
229 |
|
230 |
exeinto ${portage_base}/pym/portage/tests |
231 |
doexe "${S}"/pym/portage/tests/runTests |
232 |
|
233 |
doman "${S}"/man/*.[0-9] |
234 |
if use linguas_pl; then |
235 |
doman -i18n=pl "${S_PL}"/man/pl/*.[0-9] |
236 |
doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] |
237 |
fi |
238 |
|
239 |
dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} |
240 |
use doc && dohtml -r "${S}"/doc/* |
241 |
use epydoc && dohtml -r "${WORKDIR}"/api |
242 |
|
243 |
dodir /usr/bin |
244 |
for x in ebuild emerge portageq repoman xpak; do |
245 |
dosym ../${libdir}/portage/bin/${x} /usr/bin/${x} |
246 |
done |
247 |
|
248 |
dodir /usr/sbin |
249 |
local my_syms="archive-conf |
250 |
dispatch-conf |
251 |
emaint |
252 |
emerge-webrsync |
253 |
env-update |
254 |
etc-update |
255 |
fixpackages |
256 |
quickpkg |
257 |
regenworld" |
258 |
local x |
259 |
for x in ${my_syms}; do |
260 |
dosym ../${libdir}/portage/bin/${x} /usr/sbin/${x} |
261 |
done |
262 |
dosym env-update /usr/sbin/update-env |
263 |
dosym etc-update /usr/sbin/update-etc |
264 |
|
265 |
dodir /etc/portage |
266 |
keepdir /etc/portage |
267 |
} |
268 |
|
269 |
pkg_preinst() { |
270 |
if ! use build && ! has_version dev-python/pycrypto && \ |
271 |
has_version '>=dev-lang/python-2.5' ; then |
272 |
if ! built_with_use '>=dev-lang/python-2.5' ssl ; then |
273 |
ewarn "If you are an ebuild developer and you plan to commit ebuilds" |
274 |
ewarn "with this system then please install dev-python/pycrypto or" |
275 |
ewarn "enable the ssl USE flag for >=dev-lang/python-2.5 in order" |
276 |
ewarn "to enable RMD160 hash support." |
277 |
ewarn "See bug #198398 for more information." |
278 |
fi |
279 |
fi |
280 |
if [ -f "${ROOT}/etc/make.globals" ]; then |
281 |
rm "${ROOT}/etc/make.globals" |
282 |
fi |
283 |
} |
284 |
|
285 |
pkg_postinst() { |
286 |
# Compile all source files recursively. Any orphans |
287 |
# will be identified and removed in postrm. |
288 |
python_mod_optimize /usr/$(get_libdir)/portage/pym |
289 |
|
290 |
if [ -n "${WORLD_MIGRATION_UPGRADE}" ]; then |
291 |
einfo "moving set references from the worldfile into world_sets" |
292 |
cd "${ROOT}/var/lib/portage/" |
293 |
grep "^@" world >> world_sets |
294 |
sed -i -e '/^@/d' world |
295 |
fi |
296 |
|
297 |
if [ -n "${NEEDED_REBUILD_UPGRADE}" ]; then |
298 |
einfo "rebuilding NEEDED.ELF.2 files" |
299 |
for cpv in "${ROOT}/var/db/pkg"/*/*; do |
300 |
if [ -f "${cpv}/NEEDED" ]; then |
301 |
rm -f "${cpv}/NEEDED.ELF.2" |
302 |
while read line; do |
303 |
filename=${line% *} |
304 |
needed=${line#* } |
305 |
needed=${needed//+/++} |
306 |
needed=${needed//#/##} |
307 |
needed=${needed//%/%%} |
308 |
newline=$(scanelf -BF "%a;%F;%S;%r;${needed}" $filename) |
309 |
newline=${newline// - } |
310 |
echo "${newline:3}" >> "${cpv}/NEEDED.ELF.2" |
311 |
done < "${cpv}/NEEDED" |
312 |
fi |
313 |
done |
314 |
fi |
315 |
|
316 |
elog |
317 |
elog "For help with using portage please consult the Gentoo Handbook" |
318 |
elog "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3" |
319 |
elog |
320 |
|
321 |
if [ -z "${MINOR_UPGRADE}" ]; then |
322 |
elog "If you're upgrading from a pre-2.2 version of portage you might" |
323 |
elog "want to remerge world (emerge -e world) to take full advantage" |
324 |
elog "of some of the new features in 2.2." |
325 |
elog "This is not required however for portage to function properly." |
326 |
elog |
327 |
fi |
328 |
|
329 |
if [ -z "${PV/*_pre*}" ]; then |
330 |
elog "If you always want to use the latest development version of portage" |
331 |
elog "please read http://www.gentoo.org/proj/en/portage/doc/testing.xml" |
332 |
elog |
333 |
fi |
334 |
} |
335 |
|
336 |
pkg_postrm() { |
337 |
python_mod_cleanup /usr/$(get_libdir)/portage/pym |
338 |
} |