On 28-09-2006 19:28:19 +0200, Michael Haubenwallner wrote:
> Hi,
>
> successfully emerged python & python-fchksum, but after applying
> attached patch.
>
> /haubi/
> Index: dev-lang/python/python-2.4.2.ebuild
> ===================================================================
> --- dev-lang/python/python-2.4.2.ebuild (revision 1663)
> +++ dev-lang/python/python-2.4.2.ebuild (working copy)
> @@ -278,7 +278,7 @@
> ewarn
> ewarn "If you have just upgraded from an older version of python you
> will need to run:"
> ewarn
> - ewarn "/usr/sbin/python-updater"
> + ewarn "${EPREFIX}/usr/sbin/python-updater"
Ok, trivial.
> ewarn
> ewarn "This will automatically rebuild all the python dependent modules"
> ewarn "to run with python-${PYVER}."
> Index: eclass/python.eclass
> ===================================================================
> --- eclass/python.eclass (revision 1663)
> +++ eclass/python.eclass (working copy)
> @@ -79,7 +79,7 @@
>
> python_version() {
> local tmpstr
> - python=${python:-/usr/bin/python}
> + python=${python:-${EPREFIX}/usr/bin/python}
Ok, trivial
> tmpstr="$(${python} -V 2>&1 )"
> export PYVER_ALL="${tmpstr#Python }"
> __python_version_extract $PYVER_ALL
> @@ -217,11 +217,11 @@
>
> for path in ${SEARCH_PATH}; do
> einfo "Cleaning orphaned Python bytecode from ${path} .."
> - for obj in $(find ${path} -name *.pyc); do
> - src_py="${obj%c}"
> + for obj in $(find ${path} -name *.py[co]); do
> + src_py="${obj%[co]}"
> if [ ! -f "${src_py}" ]; then
> - einfo "Purging ${src_py}[co]"
> - rm -f ${src_py}[co]
> + einfo "Purging ${obj}"
> + rm -f ${obj}
this hunk looks like a behavioural change to me, not prefix specific.
> fi
> done
> # attempt to remove directories that maybe empty
> Index: eclass/alternatives.eclass
> ===================================================================
> --- eclass/alternatives.eclass (revision 1663)
> +++ eclass/alternatives.eclass (working copy)
> @@ -72,8 +72,8 @@
> # usage: alternatives_makesym <resulting symlink> [alternative
> targets..]
> # make sure it is in the prefix, allow it already to be in the prefix
> SYMLINK=${EPREFIX}/${1#${EPREFIX}}
> - # this trick removes the trailing / from ${ROOT}
> - pref=$(echo ${ROOT} | sed 's:/$::')
> + # this trick removes the trailing ${EPREFIX}/ from ${ROOT}
> + pref=${ROOT%/}; pref=${ROOT%${EPREFIX}}
Is there ever a trailing EPREFIX? I'd say only a leading EPREFIX. I
never want to see anything outside of it. Actually, I never understood
why they use sed to do something so trivial in bash.
> shift
> ALTERNATIVES=$@
>
--
Fabian Groffen
Gentoo on a different level
--
[EMAIL PROTECTED] mailing list
