1 |
zmedico 08/02/01 05:30:00 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: portage-2.1.4.1.ebuild |
5 |
Log: |
6 |
2.1.4.1 bump. This fixes bugs #138159, #205718, #205966, #206772, and |
7 |
an overlay then you should remove **/files/digest-* files (Manifest1) |
8 |
because they are no longer supported. If earlier versions of portage |
9 |
will be used to generate manifests for your overlay then you should add |
10 |
a file named manifest1_obsolete to the root of the repository in order |
11 |
to disable generation of the Manifest1 digest files. |
12 |
(Portage version: 2.1.4.1) |
13 |
|
14 |
Revision Changes Path |
15 |
1.491 sys-apps/portage/ChangeLog |
16 |
|
17 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.491&view=markup |
18 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.491&content-type=text/plain |
19 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.490&r2=1.491 |
20 |
|
21 |
Index: ChangeLog |
22 |
=================================================================== |
23 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v |
24 |
retrieving revision 1.490 |
25 |
retrieving revision 1.491 |
26 |
diff -u -r1.490 -r1.491 |
27 |
--- ChangeLog 24 Jan 2008 09:49:01 -0000 1.490 |
28 |
+++ ChangeLog 1 Feb 2008 05:29:59 -0000 1.491 |
29 |
@@ -1,6 +1,17 @@ |
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.490 2008/01/24 09:49:01 zmedico Exp $ |
33 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.491 2008/02/01 05:29:59 zmedico Exp $ |
34 |
+ |
35 |
+*portage-2.1.4.1 (01 Feb 2008) |
36 |
+ |
37 |
+ 01 Feb 2008; Zac Medico <zmedico@g.o> +portage-2.1.4.1.ebuild: |
38 |
+ 2.1.4.1 bump. This fixes bugs #138159, #205718, #205966, #206772, and |
39 |
+ #207104. Bug #200044 tracks all bugs fixed since 2.1.3.x. If you have |
40 |
+ an overlay then you should remove **/files/digest-* files (Manifest1) |
41 |
+ because they are no longer supported. If earlier versions of portage |
42 |
+ will be used to generate manifests for your overlay then you should add |
43 |
+ a file named manifest1_obsolete to the root of the repository in order |
44 |
+ to disable generation of the Manifest1 digest files. |
45 |
|
46 |
24 Jan 2008; Zac Medico <zmedico@g.o> portage-2.1.4.ebuild: |
47 |
Bug #206800 - Fix epydoc command to work with epydoc-3.0. |
48 |
|
49 |
|
50 |
|
51 |
1.1 sys-apps/portage/portage-2.1.4.1.ebuild |
52 |
|
53 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.1.4.1.ebuild?rev=1.1&view=markup |
54 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.1.4.1.ebuild?rev=1.1&content-type=text/plain |
55 |
|
56 |
Index: portage-2.1.4.1.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.4.1.ebuild,v 1.1 2008/02/01 05:29:59 zmedico Exp $ |
61 |
|
62 |
inherit toolchain-funcs eutils flag-o-matic 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 |
append-lfs-flags |
144 |
|
145 |
cd "${S}"/src |
146 |
$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o tbz2tool tbz2tool.c || \ |
147 |
die "Failed to build tbz2tool" |
148 |
|
149 |
if use doc; then |
150 |
cd "${S}"/doc |
151 |
touch fragment/date |
152 |
sed -i "s/svn-trunk/${PVR}/" fragment/version |
153 |
make xhtml xhtml-nochunks || die "failed to make docs" |
154 |
fi |
155 |
|
156 |
if use epydoc; then |
157 |
einfo "Generating api docs" |
158 |
mkdir "${WORKDIR}"/api |
159 |
local my_modules |
160 |
my_modules="$(find "${S}/pym" -name "*.py" \ |
161 |
| sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \ |
162 |
-e 's:/:.:g')" || die "error listing modules" |
163 |
PYTHONPATH="${S}/pym:${PYTHONPATH}" epydoc -o "${WORKDIR}"/api \ |
164 |
-qqqqq --no-frames --show-imports \ |
165 |
--name "${PN}" --url "${HOMEPAGE}" \ |
166 |
${my_modules} || die "epydoc failed" |
167 |
fi |
168 |
} |
169 |
|
170 |
src_test() { |
171 |
./tests/runTests || \ |
172 |
die "test(s) failed" |
173 |
} |
174 |
|
175 |
src_install() { |
176 |
local libdir=$(get_libdir) |
177 |
local portage_base="/usr/${libdir}/portage" |
178 |
cd "${S}"/cnf |
179 |
insinto /etc |
180 |
doins etc-update.conf dispatch-conf.conf make.globals |
181 |
if [ -f "make.conf.${ARCH}".diff ]; then |
182 |
patch make.conf "make.conf.${ARCH}".diff || \ |
183 |
die "Failed to patch make.conf.example" |
184 |
newins make.conf make.conf.example |
185 |
else |
186 |
eerror "" |
187 |
eerror "Portage does not have an arch-specific configuration for this arch." |
188 |
eerror "Please notify the arch maintainer about this issue. Using generic." |
189 |
eerror "" |
190 |
newins make.conf make.conf.example |
191 |
fi |
192 |
|
193 |
insinto /etc/logrotate.d |
194 |
doins "${S}"/cnf/logrotate.d/elog-save-summary |
195 |
|
196 |
dodir ${portage_base}/bin |
197 |
exeinto ${portage_base}/bin |
198 |
# BSD and OSX need a sed wrapper so that find/xargs work properly |
199 |
if use userland_GNU; then |
200 |
rm "${S}"/bin/sed || die "Failed to remove sed wrapper" |
201 |
fi |
202 |
cd "${S}"/bin |
203 |
doexe * |
204 |
doexe "${S}"/src/tbz2tool |
205 |
dosym newins ${portage_base}/bin/donewins |
206 |
|
207 |
local mydir |
208 |
for mydir in pym pym/cache pym/elog_modules; do |
209 |
dodir ${portage_base}/${mydir} |
210 |
insinto ${portage_base}/${mydir} |
211 |
cd "${S}"/${mydir} |
212 |
doins *.py |
213 |
done |
214 |
|
215 |
doman "${S}"/man/*.[0-9] |
216 |
if use linguas_pl; then |
217 |
doman -i18n=pl "${S_PL}"/man/pl/*.[0-9] |
218 |
doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] |
219 |
fi |
220 |
dodoc "${S}"/ChangeLog |
221 |
dodoc "${S}"/NEWS |
222 |
dodoc "${S}"/RELEASE-NOTES |
223 |
use doc && dohtml "${S}"/doc/*.html |
224 |
use epydoc && dohtml -r "${WORKDIR}"/api |
225 |
|
226 |
dodir /usr/bin |
227 |
local x |
228 |
for x in ebuild emerge portageq repoman tbz2tool xpak; do |
229 |
dosym ../${libdir}/portage/bin/${x} /usr/bin/${x} |
230 |
done |
231 |
|
232 |
dodir /usr/sbin |
233 |
local my_syms="archive-conf |
234 |
dispatch-conf |
235 |
emaint |
236 |
emerge-webrsync |
237 |
env-update |
238 |
etc-update |
239 |
fixpackages |
240 |
quickpkg |
241 |
regenworld" |
242 |
local x |
243 |
for x in ${my_syms}; do |
244 |
dosym ../${libdir}/portage/bin/${x} /usr/sbin/${x} |
245 |
done |
246 |
dosym env-update /usr/sbin/update-env |
247 |
dosym etc-update /usr/sbin/update-etc |
248 |
|
249 |
dodir /etc/portage |
250 |
keepdir /etc/portage |
251 |
|
252 |
echo PYTHONPATH=\"${portage_base}/pym\" > "${WORKDIR}"/05portage.envd |
253 |
doenvd "${WORKDIR}"/05portage.envd |
254 |
} |
255 |
|
256 |
pkg_preinst() { |
257 |
if ! use build && ! has_version dev-python/pycrypto && \ |
258 |
has_version '>=dev-lang/python-2.5' ; then |
259 |
if ! built_with_use '>=dev-lang/python-2.5' ssl ; then |
260 |
echo "If you are a Gentoo developer and you plan to" \ |
261 |
"commit ebuilds with this system then please install" \ |
262 |
"pycrypto or enable python's ssl USE flag in order" \ |
263 |
"to enable RMD160 hash support. See bug #198398 for" \ |
264 |
"more information." | \ |
265 |
fmt -w 70 | while read line ; do ewarn "${line}" ; done |
266 |
fi |
267 |
fi |
268 |
local portage_base="/usr/$(get_libdir)/portage" |
269 |
if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then |
270 |
rm -rf "${D}"/${portage_base}/pym/* |
271 |
mv "${D}"/${portage_base}/bin/tbz2tool "${T}" |
272 |
rm -rf "${D}"/${portage_base}/bin/* |
273 |
mv "${T}"/tbz2tool "${D}"/${portage_base}/bin/ |
274 |
fi |
275 |
} |
276 |
|
277 |
pkg_postinst() { |
278 |
local x |
279 |
|
280 |
if [ ! -f "${ROOT}/var/lib/portage/world" ] && |
281 |
[ -f "${ROOT}"/var/cache/edb/world ] && |
282 |
[ ! -h "${ROOT}"/var/cache/edb/world ]; then |
283 |
mv "${ROOT}"/var/cache/edb/world "${ROOT}"/var/lib/portage/world |
284 |
ln -s ../../lib/portage/world /var/cache/edb/world |
285 |
fi |
286 |
|
287 |
for x in "${ROOT}"/etc/._cfg????_make.globals; do |
288 |
# Overwrite the globals file automatically. |
289 |
[ -e "${x}" ] && mv -f "${x}" "${ROOT}etc/make.globals" |
290 |
done |
291 |
|
292 |
# Compile all source files recursively. Any orphans |
293 |
# will be identified and removed in postrm. |
294 |
compile_all_python_bytecodes "${ROOT}usr/$(get_libdir)/portage/pym" |
295 |
|
296 |
echo "If you have an overlay then you should remove **/files/digest-*" \ |
297 |
"files (Manifest1) because they are no longer supported. If earlier" \ |
298 |
"versions of portage will be used to generate manifests for your overlay" \ |
299 |
"then you should add a file named manifest1_obsolete to the root of the" \ |
300 |
"repository in order to disable generation of the" \ |
301 |
"Manifest1 digest files." | fmt -w 75 | while read x ; do elog "$x" ; done |
302 |
|
303 |
portage_docs |
304 |
} |
305 |
|
306 |
pkg_postrm() { |
307 |
remove_orphan_python_bytecodes "${ROOT}usr/$(get_libdir)/portage/pym" |
308 |
} |
309 |
|
310 |
compile_all_python_bytecodes() { |
311 |
python -c "from compileall import compile_dir; compile_dir('${1}', quiet=True)" |
312 |
python -O -c "from compileall import compile_dir; compile_dir('${1}', quiet=True)" |
313 |
} |
314 |
|
315 |
remove_orphan_python_bytecodes() { |
316 |
[[ -d ${1} ]] || return |
317 |
find "${1}" -name '*.py[co]' -print0 | \ |
318 |
while read -d $'\0' f ; do |
319 |
src_py=${f%[co]} |
320 |
[[ -f ${src_py} ]] && continue |
321 |
rm -f "${src_py}"[co] |
322 |
done |
323 |
} |
324 |
|
325 |
|
326 |
|
327 |
-- |
328 |
gentoo-commits@l.g.o mailing list |