Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 728674 | Differences between
and this patch

Collapse All | Expand All

(-)a/sys-apps/baselayout/baselayout-2.6-r1.ebuild (-3 / +5 lines)
Lines 33-39 multilib_layout() { Link Here
33
33
34
	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
34
	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
35
		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
35
		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
36
		for prefix in ${prefix_lst[@]}; do
36
		for prefix in "${prefix_lst[@]}"; do
37
			for libdir in ${libdirs}; do
37
			for libdir in ${libdirs}; do
38
				dir="${prefix}${libdir}"
38
				dir="${prefix}${libdir}"
39
				if [[ -e "${dir}" ]]; then
39
				if [[ -e "${dir}" ]]; then
Lines 43-49 multilib_layout() { Link Here
43
				fi
43
				fi
44
				if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then
44
				if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then
45
					einfo "symlinking ${dir} to usr/${libdir}"
45
					einfo "symlinking ${dir} to usr/${libdir}"
46
					ln -s usr/${libdir} ${dir} ||
46
					mkdir -p "${dir%/*}" || die
47
					ln -s usr/${libdir} "${dir}" ||
47
						die " Unable to make ${dir} symlink"
48
						die " Unable to make ${dir} symlink"
48
				else
49
				else
49
					einfo "creating directory ${dir}"
50
					einfo "creating directory ${dir}"
Lines 153-159 multilib_layout() { Link Here
153
	if ! use split-usr ; then
154
	if ! use split-usr ; then
154
		for libdir in ${libdirs}; do
155
		for libdir in ${libdirs}; do
155
			if [[ ! -e "${EROOT}${libdir}" ]]; then
156
			if [[ ! -e "${EROOT}${libdir}" ]]; then
156
				ln -s usr/"${libdir}" "${EROOT}${libdir}"
157
				mkdir -p "${EROOT}${libdir%/*}" || die
158
				ln -s usr/${libdir} "${EROOT}${libdir}" || die
157
			fi
159
			fi
158
		done
160
		done
159
	fi
161
	fi
(-)a/sys-apps/baselayout/baselayout-2.7.ebuild (-3 / +5 lines)
Lines 33-39 multilib_layout() { Link Here
33
33
34
	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
34
	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
35
		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
35
		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
36
		for prefix in ${prefix_lst[@]}; do
36
		for prefix in "${prefix_lst[@]}"; do
37
			for libdir in ${libdirs}; do
37
			for libdir in ${libdirs}; do
38
				dir="${prefix}${libdir}"
38
				dir="${prefix}${libdir}"
39
				if [[ -e "${dir}" ]]; then
39
				if [[ -e "${dir}" ]]; then
Lines 43-49 multilib_layout() { Link Here
43
				fi
43
				fi
44
				if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then
44
				if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then
45
					einfo "symlinking ${dir} to usr/${libdir}"
45
					einfo "symlinking ${dir} to usr/${libdir}"
46
					ln -s usr/${libdir} ${dir} ||
46
					mkdir -p "${dir%/*}" || die
47
					ln -s usr/${libdir} "${dir}" ||
47
						die " Unable to make ${dir} symlink"
48
						die " Unable to make ${dir} symlink"
48
				else
49
				else
49
					einfo "creating directory ${dir}"
50
					einfo "creating directory ${dir}"
Lines 153-159 multilib_layout() { Link Here
153
	if ! use split-usr ; then
154
	if ! use split-usr ; then
154
		for libdir in ${libdirs}; do
155
		for libdir in ${libdirs}; do
155
			if [[ ! -e "${EROOT}${libdir}" ]]; then
156
			if [[ ! -e "${EROOT}${libdir}" ]]; then
156
				ln -s usr/"${libdir}" "${EROOT}${libdir}"
157
				mkdir -p "${EROOT}${libdir%/*}" || die
158
				ln -s usr/${libdir} "${EROOT}${libdir}" || die
157
			fi
159
			fi
158
		done
160
		done
159
	fi
161
	fi
(-)a/sys-apps/baselayout/baselayout-9999.ebuild (-4 / +5 lines)
Lines 33-39 multilib_layout() { Link Here
33
33
34
	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
34
	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
35
		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
35
		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
36
		for prefix in ${prefix_lst[@]}; do
36
		for prefix in "${prefix_lst[@]}"; do
37
			for libdir in ${libdirs}; do
37
			for libdir in ${libdirs}; do
38
				dir="${prefix}${libdir}"
38
				dir="${prefix}${libdir}"
39
				if [[ -e "${dir}" ]]; then
39
				if [[ -e "${dir}" ]]; then
Lines 43-49 multilib_layout() { Link Here
43
				fi
43
				fi
44
				if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then
44
				if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then
45
					einfo "symlinking ${dir} to usr/${libdir}"
45
					einfo "symlinking ${dir} to usr/${libdir}"
46
					ln -s usr/${libdir} ${dir} ||
46
					mkdir -p "${dir%/*}" || die
47
					ln -s usr/${libdir} "${dir}" ||
47
						die " Unable to make ${dir} symlink"
48
						die " Unable to make ${dir} symlink"
48
				else
49
				else
49
					einfo "creating directory ${dir}"
50
					einfo "creating directory ${dir}"
Lines 153-159 multilib_layout() { Link Here
153
	if ! use split-usr ; then
154
	if ! use split-usr ; then
154
		for libdir in ${libdirs}; do
155
		for libdir in ${libdirs}; do
155
			if [[ ! -e "${EROOT}${libdir}" ]]; then
156
			if [[ ! -e "${EROOT}${libdir}" ]]; then
156
				ln -s usr/"${libdir}" "${EROOT}${libdir}"
157
				mkdir -p "${EROOT}${libdir%/*}" || die
158
				ln -s usr/${libdir} "${EROOT}${libdir}" || die
157
			fi
159
			fi
158
		done
160
		done
159
	fi
161
	fi
160
- 

Return to bug 728674