On 23:48 Thu 24 Mar , Christoph Mende wrote:
> Index: mono.eclass
> ===================================================================
> RCS file: /var/cvsroot/gentoo-x86/eclass/mono.eclass,v
> retrieving revision 1.13
> diff -u -b -B -r1.13 mono.eclass
> --- mono.eclass 8 Mar 2009 15:46:54 -0000 1.13
> +++ mono.eclass 24 Mar 2011 22:47:08 -0000
> @@ -35,24 +35,26 @@
> unset MONO_AOT_CACHE
>
> egacinstall() {
> + [[ -z ${ED+set} ]] && local ED=${D%/}${EPREFIX}/
> gacutil -i "${1}" \
> - -root "${D}"/usr/$(get_libdir) \
> + -root "${ED}"/usr/$(get_libdir) \
> -gacdir /usr/$(get_libdir) \
> -package ${2:-${GACPN:-${PN}}} \
> || die "installing ${1} into the Global Assembly Cache failed"
> }
>
> mono_multilib_comply() {
> + [[ -z ${ED+set} ]] && local ED=${D%/}${EPREFIX}/
> local dir finddirs=() mv_command=${mv_command:-mv}
> - if [[ -d "${D}/usr/lib" && "$(get_libdir)" != "lib" ]]
> + if [[ -d "${ED}/usr/lib" && "$(get_libdir)" != "lib" ]]No need for quotes when expanding variables or functions inside [[ ]]. That holds true for the rest of the diff, too. I'd also split this (and a later find call) into two separate conditionals, with just one test per [[ ]]. -- Thanks, Donnie Donnie Berkholz Sr. Developer, Gentoo Linux Blog: http://dberkholz.com
pgp15BGErOV6U.pgp
Description: PGP signature
