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