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