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