1 |
zmedico 08/08/12 20:20:45 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: portage-2.2_rc8.ebuild |
5 |
Removed: portage-2.2_rc1.ebuild portage-2.2_rc5.ebuild |
6 |
Log: |
7 |
2.2_rc8 bump. This fixes a regression in rc7 which results in a KeyError |
8 |
when ACCEPT_LICENSE is set (bug #234478). Bug #210077 tracks all bugs |
9 |
fixed since 2.1.5.x. |
10 |
|
11 |
Remove old 2.2_rc1 and 2.2_rc5 ebuilds. |
12 |
(Portage version: 2.2_rc8/cvs/Linux 2.6.26-0810-x86-64 i686) |
13 |
|
14 |
Revision Changes Path |
15 |
1.539 sys-apps/portage/ChangeLog |
16 |
|
17 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.539&view=markup |
18 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.539&content-type=text/plain |
19 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.538&r2=1.539 |
20 |
|
21 |
Index: ChangeLog |
22 |
=================================================================== |
23 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v |
24 |
retrieving revision 1.538 |
25 |
retrieving revision 1.539 |
26 |
diff -u -r1.538 -r1.539 |
27 |
--- ChangeLog 10 Aug 2008 13:17:43 -0000 1.538 |
28 |
+++ ChangeLog 12 Aug 2008 20:20:44 -0000 1.539 |
29 |
@@ -1,6 +1,13 @@ |
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.538 2008/08/10 13:17:43 zmedico Exp $ |
33 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.539 2008/08/12 20:20:44 zmedico Exp $ |
34 |
+ |
35 |
+*portage-2.2_rc8 (12 Aug 2008) |
36 |
+ |
37 |
+ 12 Aug 2008; Zac Medico <zmedico@g.o> +portage-2.2_rc8.ebuild: |
38 |
+ 2.2_rc8 bump. This fixes a regression in rc7 which results in a KeyError |
39 |
+ when ACCEPT_LICENSE is set (bug #234478). Bug #210077 tracks all bugs |
40 |
+ fixed since 2.1.5.x. |
41 |
|
42 |
*portage-2.2_rc7 (10 Aug 2008) |
43 |
|
44 |
|
45 |
|
46 |
|
47 |
1.1 sys-apps/portage/portage-2.2_rc8.ebuild |
48 |
|
49 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.2_rc8.ebuild?rev=1.1&view=markup |
50 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.2_rc8.ebuild?rev=1.1&content-type=text/plain |
51 |
|
52 |
Index: portage-2.2_rc8.ebuild |
53 |
=================================================================== |
54 |
# Copyright 1999-2008 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc8.ebuild,v 1.1 2008/08/12 20:20:44 zmedico Exp $ |
57 |
|
58 |
inherit eutils multilib python |
59 |
|
60 |
DESCRIPTION="Portage is the package management and distribution system for Gentoo" |
61 |
HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml" |
62 |
LICENSE="GPL-2" |
63 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" |
64 |
PROVIDE="virtual/portage" |
65 |
SLOT="0" |
66 |
IUSE="build doc epydoc selinux linguas_pl" |
67 |
|
68 |
python_dep=">=dev-lang/python-2.4" |
69 |
|
70 |
DEPEND="${python_dep} |
71 |
!build? ( >=sys-apps/sed-4.0.5 ) |
72 |
doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) |
73 |
epydoc? ( =dev-python/epydoc-2* )" |
74 |
RDEPEND="${python_dep} |
75 |
!build? ( >=sys-apps/sed-4.0.5 |
76 |
>=app-shells/bash-3.2_p17 |
77 |
>=app-admin/eselect-news-20071201 ) |
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.17 |
82 |
selinux? ( >=dev-python/python-selinux-2.16 )" |
83 |
PDEPEND=" |
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 |
|
92 |
SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives" |
93 |
|
94 |
prefix_src_archives() { |
95 |
local x y |
96 |
for x in ${@}; do |
97 |
for y in ${SRC_ARCHIVES}; do |
98 |
echo ${y}/${x} |
99 |
done |
100 |
done |
101 |
} |
102 |
|
103 |
PV_PL="2.1.2" |
104 |
PATCHVER_PL="" |
105 |
TARBALL_PV="2.2_rc1" |
106 |
SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 |
107 |
$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2) |
108 |
linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2 |
109 |
$(prefix_src_archives ${PN}-man-pl-${PV_PL}.tar.bz2) )" |
110 |
|
111 |
PATCHVER=${PV} |
112 |
if [ -n "${PATCHVER}" ]; then |
113 |
SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2 |
114 |
$(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)" |
115 |
fi |
116 |
|
117 |
S="${WORKDIR}"/${PN}-${TARBALL_PV} |
118 |
S_PL="${WORKDIR}"/${PN}-${PV_PL} |
119 |
|
120 |
pkg_setup() { |
121 |
MINOR_UPGRADE=$(has_version '>=sys-apps/portage-2.2_alpha' && echo true) |
122 |
WORLD_MIGRATION_UPGRADE=$(has_version '<=sys-apps/portage-2.2_pre5' && echo true) |
123 |
NEEDED_REBUILD_UPGRADE=$(has_version '<=sys-apps/portage-2.2_pre7' && echo true) |
124 |
} |
125 |
|
126 |
src_unpack() { |
127 |
unpack ${A} |
128 |
cd "${S}" |
129 |
if [ -n "${PATCHVER}" ]; then |
130 |
cd "${S}" |
131 |
epatch "${WORKDIR}/${PN}-${PATCHVER}.patch" |
132 |
fi |
133 |
einfo "Setting portage.VERSION to ${PVR} ..." |
134 |
sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage/__init__.py || \ |
135 |
die "Failed to patch portage.VERSION" |
136 |
} |
137 |
|
138 |
src_compile() { |
139 |
|
140 |
if use doc; then |
141 |
cd "${S}"/doc |
142 |
touch fragment/date |
143 |
make xhtml xhtml-nochunks || die "failed to make docs" |
144 |
fi |
145 |
|
146 |
if use epydoc; then |
147 |
einfo "Generating api docs" |
148 |
mkdir "${WORKDIR}"/api |
149 |
local my_modules |
150 |
my_modules="$(find "${S}/pym" -name "*.py" \ |
151 |
| sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \ |
152 |
-e 's:/:.:g' | sort)" || die "error listing modules" |
153 |
PYTHONPATH="${S}/pym:${PYTHONPATH}" epydoc -o "${WORKDIR}"/api \ |
154 |
-qqqqq --no-frames --show-imports \ |
155 |
--name "${PN}" --url "${HOMEPAGE}" \ |
156 |
${my_modules} || die "epydoc failed" |
157 |
fi |
158 |
} |
159 |
|
160 |
src_test() { |
161 |
./pym/portage/tests/runTests || \ |
162 |
die "test(s) failed" |
163 |
} |
164 |
|
165 |
src_install() { |
166 |
local libdir=$(get_libdir) |
167 |
local portage_base="/usr/${libdir}/portage" |
168 |
local portage_share_config=/usr/share/portage/config |
169 |
|
170 |
cd "${S}"/cnf |
171 |
insinto /etc |
172 |
doins etc-update.conf dispatch-conf.conf |
173 |
|
174 |
dodir "${portage_share_config}" |
175 |
insinto "${portage_share_config}" |
176 |
doins "${S}/cnf/"{sets.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 |
dosym ..${portage_share_config}/make.globals /etc/make.globals |
190 |
|
191 |
insinto /etc/logrotate.d |
192 |
doins "${S}"/cnf/logrotate.d/elog-save-summary |
193 |
|
194 |
dodir ${portage_base}/bin |
195 |
exeinto ${portage_base}/bin |
196 |
|
197 |
# BSD and OSX need a sed wrapper so that find/xargs work properly |
198 |
if use userland_GNU; then |
199 |
rm "${S}"/bin/sed || die "Failed to remove sed wrapper" |
200 |
fi |
201 |
|
202 |
cd "${S}"/bin |
203 |
doexe * |
204 |
dosym newins ${portage_base}/bin/donewins |
205 |
|
206 |
local symlinks |
207 |
for mydir in $(find "${S}"/pym -type d | sed -e "s:^${S}/::") ; do |
208 |
dodir ${portage_base}/${mydir} |
209 |
insinto ${portage_base}/${mydir} |
210 |
cd "${S}"/${mydir} |
211 |
doins *.py |
212 |
symlinks=$(find . -mindepth 1 -maxdepth 1 -type l) |
213 |
[ -n "${symlinks}" ] && cp -P ${symlinks} "${D}${portage_base}/${mydir}" |
214 |
done |
215 |
|
216 |
# Symlinks to directories cause up/downgrade issues and the use of these |
217 |
# modules outside of portage is probably negligible. |
218 |
for x in "${D}${portage_base}/pym/"{cache,elog_modules} ; do |
219 |
[ ! -L "${x}" ] && continue |
220 |
die "symlink to directory will cause upgrade/downgrade issues: '${x}'" |
221 |
done |
222 |
|
223 |
exeinto ${portage_base}/pym/portage/tests |
224 |
doexe "${S}"/pym/portage/tests/runTests |
225 |
|
226 |
doman "${S}"/man/*.[0-9] |
227 |
if use linguas_pl; then |
228 |
doman -i18n=pl "${S_PL}"/man/pl/*.[0-9] |
229 |
doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] |
230 |
fi |
231 |
|
232 |
dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} |
233 |
use doc && dohtml -r "${S}"/doc/* |
234 |
use epydoc && dohtml -r "${WORKDIR}"/api |
235 |
|
236 |
dodir /usr/bin |
237 |
for x in ebuild emerge portageq repoman xpak; do |
238 |
dosym ../${libdir}/portage/bin/${x} /usr/bin/${x} |
239 |
done |
240 |
|
241 |
dodir /usr/sbin |
242 |
local my_syms="archive-conf |
243 |
dispatch-conf |
244 |
emaint |
245 |
emerge-webrsync |
246 |
env-update |
247 |
etc-update |
248 |
fixpackages |
249 |
quickpkg |
250 |
regenworld" |
251 |
local x |
252 |
for x in ${my_syms}; do |
253 |
dosym ../${libdir}/portage/bin/${x} /usr/sbin/${x} |
254 |
done |
255 |
dosym env-update /usr/sbin/update-env |
256 |
dosym etc-update /usr/sbin/update-etc |
257 |
|
258 |
dodir /etc/portage |
259 |
keepdir /etc/portage |
260 |
} |
261 |
|
262 |
pkg_preinst() { |
263 |
if ! use build && ! has_version dev-python/pycrypto && \ |
264 |
has_version '>=dev-lang/python-2.5' ; then |
265 |
if ! built_with_use '>=dev-lang/python-2.5' ssl ; then |
266 |
ewarn "If you are an ebuild developer and you plan to commit ebuilds" |
267 |
ewarn "with this system then please install dev-python/pycrypto or" |
268 |
ewarn "enable the ssl USE flag for >=dev-lang/python-2.5 in order" |
269 |
ewarn "to enable RMD160 hash support." |
270 |
ewarn "See bug #198398 for more information." |
271 |
fi |
272 |
fi |
273 |
if [ -f "${ROOT}/etc/make.globals" ]; then |
274 |
rm "${ROOT}/etc/make.globals" |
275 |
fi |
276 |
} |
277 |
|
278 |
pkg_postinst() { |
279 |
# Compile all source files recursively. Any orphans |
280 |
# will be identified and removed in postrm. |
281 |
python_mod_optimize /usr/$(get_libdir)/portage/pym |
282 |
|
283 |
if [ -n "${WORLD_MIGRATION_UPGRADE}" ]; then |
284 |
einfo "moving set references from the worldfile into world_sets" |
285 |
cd "${ROOT}/var/lib/portage/" |
286 |
grep "^@" world >> world_sets |
287 |
sed -i -e '/^@/d' world |
288 |
fi |
289 |
|
290 |
if [ -n "${NEEDED_REBUILD_UPGRADE}" ]; then |
291 |
einfo "rebuilding NEEDED.ELF.2 files" |
292 |
for cpv in "${ROOT}/var/db/pkg"/*/*; do |
293 |
if [ -f "${cpv}/NEEDED" ]; then |
294 |
rm -f "${cpv}/NEEDED.ELF.2" |
295 |
while read line; do |
296 |
filename=${line% *} |
297 |
needed=${line#* } |
298 |
needed=${needed//+/++} |
299 |
needed=${needed//#/##} |
300 |
needed=${needed//%/%%} |
301 |
newline=$(scanelf -BF "%a;%F;%S;%r;${needed}" $filename) |
302 |
newline=${newline// - } |
303 |
echo "${newline:3}" >> "${cpv}/NEEDED.ELF.2" |
304 |
done < "${cpv}/NEEDED" |
305 |
fi |
306 |
done |
307 |
fi |
308 |
|
309 |
elog |
310 |
elog "For help with using portage please consult the Gentoo Handbook" |
311 |
elog "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3" |
312 |
elog |
313 |
|
314 |
if [ -z "${MINOR_UPGRADE}" ]; then |
315 |
elog "If you're upgrading from a pre-2.2 version of portage you might" |
316 |
elog "want to remerge world (emerge -e world) to take full advantage" |
317 |
elog "of some of the new features in 2.2." |
318 |
elog "This is not required however for portage to function properly." |
319 |
elog |
320 |
fi |
321 |
|
322 |
if [ -z "${PV/*_pre*}" ]; then |
323 |
elog "If you always want to use the latest development version of portage" |
324 |
elog "please read http://www.gentoo.org/proj/en/portage/doc/testing.xml" |
325 |
elog |
326 |
fi |
327 |
} |
328 |
|
329 |
pkg_postrm() { |
330 |
python_mod_cleanup /usr/$(get_libdir)/portage/pym |
331 |
} |