1 |
zmedico 08/05/09 20:30:52 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: portage-2.1.5_rc9.ebuild |
5 |
Removed: portage-2.1.5_rc8.ebuild |
6 |
Log: |
7 |
2.1.5_rc9 bump. This fixes bugs #221053 (enable --skipfirst as a means |
8 |
to bypass digest failures), #221071 (merge list displayed twice), and |
9 |
fixed since 2.1.4.x. |
10 |
|
11 |
Remove 2.1.5_rc8 ebuild. |
12 |
(Portage version: 2.1.5_rc9) |
13 |
|
14 |
Revision Changes Path |
15 |
1.514 sys-apps/portage/ChangeLog |
16 |
|
17 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.514&view=markup |
18 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.514&content-type=text/plain |
19 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.513&r2=1.514 |
20 |
|
21 |
Index: ChangeLog |
22 |
=================================================================== |
23 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v |
24 |
retrieving revision 1.513 |
25 |
retrieving revision 1.514 |
26 |
diff -u -r1.513 -r1.514 |
27 |
--- ChangeLog 9 May 2008 09:30:09 -0000 1.513 |
28 |
+++ ChangeLog 9 May 2008 20:30:51 -0000 1.514 |
29 |
@@ -1,6 +1,14 @@ |
30 |
# ChangeLog for sys-apps/portage |
31 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
32 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.513 2008/05/09 09:30:09 zmedico Exp $ |
33 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.514 2008/05/09 20:30:51 zmedico Exp $ |
34 |
+ |
35 |
+*portage-2.1.5_rc9 (09 May 2008) |
36 |
+ |
37 |
+ 09 May 2008; Zac Medico <zmedico@g.o> +portage-2.1.5_rc9.ebuild: |
38 |
+ 2.1.5_rc9 bump. This fixes bugs #221053 (enable --skipfirst as a means |
39 |
+ to bypass digest failures), #221071 (merge list displayed twice), and |
40 |
+ #221107 (KeyError triggered by blockers). Bug #216231 tracks all bugs |
41 |
+ fixed since 2.1.4.x. |
42 |
|
43 |
*portage-2.1.5_rc8 (09 May 2008) |
44 |
|
45 |
|
46 |
|
47 |
|
48 |
1.1 sys-apps/portage/portage-2.1.5_rc9.ebuild |
49 |
|
50 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.1.5_rc9.ebuild?rev=1.1&view=markup |
51 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.1.5_rc9.ebuild?rev=1.1&content-type=text/plain |
52 |
|
53 |
Index: portage-2.1.5_rc9.ebuild |
54 |
=================================================================== |
55 |
# Copyright 1999-2008 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.5_rc9.ebuild,v 1.1 2008/05/09 20:30:51 zmedico Exp $ |
58 |
|
59 |
inherit toolchain-funcs eutils flag-o-matic multilib |
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="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" |
65 |
PROVIDE="virtual/portage" |
66 |
SLOT="0" |
67 |
IUSE="build doc epydoc selinux linguas_pl" |
68 |
DEPEND=">=dev-lang/python-2.4 |
69 |
!build? ( >=sys-apps/sed-4.0.5 ) |
70 |
doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) |
71 |
epydoc? ( >=dev-python/epydoc-2.0 )" |
72 |
RDEPEND=">=dev-lang/python-2.4 |
73 |
!build? ( >=sys-apps/sed-4.0.5 |
74 |
>=app-shells/bash-3.2_p17 ) |
75 |
elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) |
76 |
elibc_glibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) ) |
77 |
elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) ) |
78 |
>=app-misc/pax-utils-0.1.13 |
79 |
selinux? ( >=dev-python/python-selinux-2.16 )" |
80 |
PDEPEND=" |
81 |
doc? ( |
82 |
|| ( app-portage/eclass-manpages app-portage/portage-manpages ) |
83 |
) |
84 |
!build? ( |
85 |
>=net-misc/rsync-2.6.4 |
86 |
userland_GNU? ( >=sys-apps/coreutils-6.4 ) |
87 |
|| ( >=dev-lang/python-2.5 >=dev-python/pycrypto-2.0.1-r6 ) |
88 |
)" |
89 |
# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 |
90 |
# rsync-2.6.4 rdep is for the --filter option #167668 |
91 |
SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives" |
92 |
|
93 |
PV_PL="2.1.2" |
94 |
PATCHVER_PL="" |
95 |
TARBALL_PV="2.1.4" |
96 |
SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 |
97 |
${SRC_ARCHIVES}/${PN}-${TARBALL_PV}.tar.bz2 |
98 |
linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2 |
99 |
${SRC_ARCHIVES}/${PN}-man-pl-${PV_PL}.tar.bz2 )" |
100 |
|
101 |
PATCHVER="${PV}" |
102 |
if [ -n "${PATCHVER}" ]; then |
103 |
SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2 |
104 |
${SRC_ARCHIVES}/${PN}-${PATCHVER}.patch.bz2" |
105 |
fi |
106 |
|
107 |
if [ -n "${PATCHVER_PL}" ]; then |
108 |
SRC_URI="${SRC_URI} linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch.bz2 |
109 |
${SRC_ARCHIVES}/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch.bz2 )" |
110 |
fi |
111 |
|
112 |
S="${WORKDIR}"/${PN}-${TARBALL_PV} |
113 |
S_PL="${WORKDIR}"/${PN}-${PV_PL} |
114 |
|
115 |
portage_docs() { |
116 |
elog "" |
117 |
elog "For help with using portage please consult the Gentoo Handbook" |
118 |
elog "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3" |
119 |
elog "" |
120 |
} |
121 |
|
122 |
src_unpack() { |
123 |
unpack ${A} |
124 |
cd "${S}" |
125 |
if [ -n "${PATCHVER}" ]; then |
126 |
cd "${S}" |
127 |
epatch "${WORKDIR}/${PN}-${PATCHVER}.patch" |
128 |
fi |
129 |
einfo "Setting portage.VERSION to ${PVR} ..." |
130 |
sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \ |
131 |
die "Failed to patch portage.VERSION" |
132 |
eend 0 |
133 |
if [ -n "${PATCHVER_PL}" ]; then |
134 |
use linguas_pl && \ |
135 |
epatch "${WORKDIR}/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch" |
136 |
fi |
137 |
} |
138 |
|
139 |
src_compile() { |
140 |
append-lfs-flags |
141 |
|
142 |
cd "${S}"/src |
143 |
$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o tbz2tool tbz2tool.c || \ |
144 |
die "Failed to build tbz2tool" |
145 |
|
146 |
if use doc; then |
147 |
cd "${S}"/doc |
148 |
touch fragment/date |
149 |
sed -i "s/svn-trunk/${PVR}/" fragment/version |
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')" || 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 |
./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 |
cd "${S}"/cnf |
176 |
insinto /etc |
177 |
doins etc-update.conf dispatch-conf.conf make.globals |
178 |
if [ -f "make.conf.${ARCH}".diff ]; then |
179 |
patch make.conf "make.conf.${ARCH}".diff || \ |
180 |
die "Failed to patch make.conf.example" |
181 |
newins make.conf make.conf.example |
182 |
else |
183 |
eerror "" |
184 |
eerror "Portage does not have an arch-specific configuration for this arch." |
185 |
eerror "Please notify the arch maintainer about this issue. Using generic." |
186 |
eerror "" |
187 |
newins make.conf make.conf.example |
188 |
fi |
189 |
|
190 |
insinto /etc/logrotate.d |
191 |
doins "${S}"/cnf/logrotate.d/elog-save-summary |
192 |
|
193 |
dodir ${portage_base}/bin |
194 |
exeinto ${portage_base}/bin |
195 |
# BSD and OSX need a sed wrapper so that find/xargs work properly |
196 |
if use userland_GNU; then |
197 |
rm "${S}"/bin/sed || die "Failed to remove sed wrapper" |
198 |
fi |
199 |
cd "${S}"/bin |
200 |
doexe * |
201 |
doexe "${S}"/src/tbz2tool |
202 |
dosym newins ${portage_base}/bin/donewins |
203 |
|
204 |
local mydir |
205 |
for mydir in pym pym/cache pym/elog_modules; do |
206 |
dodir ${portage_base}/${mydir} |
207 |
insinto ${portage_base}/${mydir} |
208 |
cd "${S}"/${mydir} |
209 |
doins *.py |
210 |
done |
211 |
|
212 |
doman "${S}"/man/*.[0-9] |
213 |
if use linguas_pl; then |
214 |
doman -i18n=pl "${S_PL}"/man/pl/*.[0-9] |
215 |
doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] |
216 |
fi |
217 |
dodoc "${S}"/ChangeLog |
218 |
dodoc "${S}"/NEWS |
219 |
dodoc "${S}"/RELEASE-NOTES |
220 |
use doc && dohtml "${S}"/doc/*.html |
221 |
use epydoc && dohtml -r "${WORKDIR}"/api |
222 |
|
223 |
dodir /usr/bin |
224 |
local x |
225 |
for x in ebuild emerge portageq repoman tbz2tool xpak; do |
226 |
dosym ../${libdir}/portage/bin/${x} /usr/bin/${x} |
227 |
done |
228 |
|
229 |
dodir /usr/sbin |
230 |
local my_syms="archive-conf |
231 |
dispatch-conf |
232 |
emaint |
233 |
emerge-webrsync |
234 |
env-update |
235 |
etc-update |
236 |
fixpackages |
237 |
quickpkg |
238 |
regenworld" |
239 |
local x |
240 |
for x in ${my_syms}; do |
241 |
dosym ../${libdir}/portage/bin/${x} /usr/sbin/${x} |
242 |
done |
243 |
dosym env-update /usr/sbin/update-env |
244 |
dosym etc-update /usr/sbin/update-etc |
245 |
|
246 |
dodir /etc/portage |
247 |
keepdir /etc/portage |
248 |
|
249 |
echo PYTHONPATH=\"${portage_base}/pym\" > "${WORKDIR}"/05portage.envd |
250 |
doenvd "${WORKDIR}"/05portage.envd |
251 |
} |
252 |
|
253 |
pkg_preinst() { |
254 |
if ! use build && ! has_version dev-python/pycrypto && \ |
255 |
has_version '>=dev-lang/python-2.5' ; then |
256 |
if ! built_with_use '>=dev-lang/python-2.5' ssl ; then |
257 |
echo "If you are a Gentoo developer and you plan to" \ |
258 |
"commit ebuilds with this system then please install" \ |
259 |
"pycrypto or enable python's ssl USE flag in order" \ |
260 |
"to enable RMD160 hash support. See bug #198398 for" \ |
261 |
"more information." | \ |
262 |
fmt -w 70 | while read line ; do ewarn "${line}" ; done |
263 |
fi |
264 |
fi |
265 |
local portage_base="/usr/$(get_libdir)/portage" |
266 |
if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then |
267 |
rm -rf "${D}"/${portage_base}/pym/* |
268 |
mv "${D}"/${portage_base}/bin/tbz2tool "${T}" |
269 |
rm -rf "${D}"/${portage_base}/bin/* |
270 |
mv "${T}"/tbz2tool "${D}"/${portage_base}/bin/ |
271 |
fi |
272 |
} |
273 |
|
274 |
pkg_postinst() { |
275 |
local x |
276 |
|
277 |
if [ ! -f "${ROOT}/var/lib/portage/world" ] && |
278 |
[ -f "${ROOT}"/var/cache/edb/world ] && |
279 |
[ ! -h "${ROOT}"/var/cache/edb/world ]; then |
280 |
mv "${ROOT}"/var/cache/edb/world "${ROOT}"/var/lib/portage/world |
281 |
ln -s ../../lib/portage/world /var/cache/edb/world |
282 |
fi |
283 |
|
284 |
for x in "${ROOT}"/etc/._cfg????_make.globals; do |
285 |
# Overwrite the globals file automatically. |
286 |
[ -e "${x}" ] && mv -f "${x}" "${ROOT}etc/make.globals" |
287 |
done |
288 |
|
289 |
# Compile all source files recursively. Any orphans |
290 |
# will be identified and removed in postrm. |
291 |
compile_all_python_bytecodes "${ROOT}usr/$(get_libdir)/portage/pym" |
292 |
|
293 |
echo "The metadata-transfer feature is now disabled" \ |
294 |
"by default. This disables the \"Updating Portage cache\"" \ |
295 |
"routine that used to run at the tail end of each" \ |
296 |
"\`emerge --sync\` operation. If you use something" \ |
297 |
"like the sqlite module and want to keep all metadata" \ |
298 |
"in that format alone (useful for querying), enable" \ |
299 |
"FEATURES=\"metadata-transfer\" in make.conf." \ |
300 |
| fmt -w 75 | while read x ; do elog "$x" ; done |
301 |
|
302 |
portage_docs |
303 |
} |
304 |
|
305 |
pkg_postrm() { |
306 |
remove_orphan_python_bytecodes "${ROOT}usr/$(get_libdir)/portage/pym" |
307 |
} |
308 |
|
309 |
compile_all_python_bytecodes() { |
310 |
python -c "from compileall import compile_dir; compile_dir('${1}', quiet=True)" |
311 |
python -O -c "from compileall import compile_dir; compile_dir('${1}', quiet=True)" |
312 |
} |
313 |
|
314 |
remove_orphan_python_bytecodes() { |
315 |
[[ -d ${1} ]] || return |
316 |
find "${1}" -name '*.py[co]' -print0 | \ |
317 |
while read -d $'\0' f ; do |
318 |
src_py=${f%[co]} |
319 |
[[ -f ${src_py} ]] && continue |
320 |
rm -f "${src_py}"[co] |
321 |
done |
322 |
} |
323 |
|
324 |
|
325 |
|
326 |
-- |
327 |
gentoo-commits@l.g.o mailing list |