Attachment #290185 for bug #387583

View | Details | Raw Unified | Return to bug 387583
Collapse All | Expand All

Lines 13-19 Link Here

(-)/usr/lib/portage/bin/save-ebuild-env.sh.orig (-1 / +1 lines)
13	save_ebuild_env() {	13	save_ebuild_env() {
14	(	14	(
15	if has --exclude-init-phases $* ; then	15	if has --exclude-init-phases $* ; then
16	unset S _E_DOCDESTTREE_ _E_EXEDESTTREE_	16	unset S _E_DOCDESTTREE_ _E_EXEDESTTREE_ _E_MANDESTTREE_
17	if [[ -n $PYTHONPATH &&	17	if [[ -n $PYTHONPATH &&
18	${PYTHONPATH%%:*} -ef $PORTAGE_PYM_PATH ]] ; then	18	${PYTHONPATH%%:*} -ef $PORTAGE_PYM_PATH ]] ; then
19	if [[ $PYTHONPATH == : ]] ; then	19	if [[ $PYTHONPATH == : ]] ; then

Lines 9-15 Link Here

(-)/usr/lib/portage/bin/ebuild-helpers/doman.orig (-3 / +15 lines)
9	exit 1	9	exit 1
10	fi	10	fi
11		11
		12	if [[ ! -d ${D}${_E_MANDESTTREE_} ]] ; then
		13	install -d "${D}${_E_MANDESTTREE_}"
		14	fi
		15
12	i18n=""	16	i18n=""
		17	myloc="$_E_MANDESTTREE_"
		18	myext=""
		19	if [[ "$myloc" == "" ]] ; then
		20	myloc=/usr
		21	fi
		22	if [[ "$myloc" == "/usr" ]] ; then
		23	myext=/share
		24	fi
13		25
14	ret=0	26	ret=0
15		27
Lines 44-54 Link Here
44		56
45	if [[ ${mandir} == *man[0-9n] ]] ; then	57	if [[ ${mandir} == *man[0-9n] ]] ; then
46	if [[ -s ${x} ]] ; then	58	if [[ -s ${x} ]] ; then
47	if [[ ! -d ${D}/usr/share/man/${mandir} ]] ; then	59	if [[ ! -d ${D}${myloc}${myext}/man/${mandir} ]] ; then
48	install -d "${D}/usr/share/man/${mandir}"	60	install -d "${D}${myloc}${myext}/man/${mandir}"
49	fi	61	fi
50		62
51	install -m0644 "${x}" "${D}/usr/share/man/${mandir}/${name}"	63	install -m0644 "${x}" "${D}${myloc}${myext}/man/${mandir}/${name}"
52	((ret\|=$?))	64	((ret\|=$?))
53	elif [[ ! -e ${x} ]] ; then	65	elif [[ ! -e ${x} ]] ; then
54	echo "!!! ${0##*/}: $x does not exist" 1>&2	66	echo "!!! ${0##*/}: $x does not exist" 1>&2




	#invalid paths in .la files
	export S D

	# Reset exeinto(), maninto(), docinto(), insinto(), and into() state
	# variables in case the user is running the install phase multiple
	# times consecutively via the ebuild command.
	export DESTTREE=/usr
	export INSDESTTREE=""
	export _E_EXEDESTTREE_=""
	export _E_MANDESTTREE_=""
	export _E_DOCDESTTREE_=""

	ebuild_phase src_install




export DESTTREE=/usr
export INSDESTTREE=""
export _E_EXEDESTTREE_=""
export _E_MANDESTTREE_=""
export _E_DOCDESTTREE_=""
export INSOPTIONS="-m0644"
export EXEOPTIONS="-m0755"

			local ret=$?
			if [[ $ret -ne 0 ]] ; then
				helpers_die "${FUNCNAME[0]} failed"
				return $ret
			fi
		fi
	fi
}

maninto() {
	if [ "$1" == "/" ]; then
		export _E_MANDESTTREE_=""
	else
		export _E_MANDESTTREE_="$1"
		if [ ! -d "${D}${_E_MANDESTTREE_}" ]; then
			install -d "${D}${_E_MANDESTTREE_}"
			local ret=$?
			if [[ $ret -ne 0 ]] ; then
				helpers_die "${FUNCNAME[0]} failed"
				return $ret
			fi
		fi

Return to bug 387583

Lines 516-527 Link Here

(-)/usr/lib/portage/bin/phase-functions.sh.orig (-3 / +4 lines)
516	#invalid paths in .la files	516	#invalid paths in .la files
517	export S D	517	export S D
518		518
519	# Reset exeinto(), docinto(), insinto(), and into() state variables	519	# Reset exeinto(), maninto(), docinto(), insinto(), and into() state
520	# in case the user is running the install phase multiple times	520	# variables in case the user is running the install phase multiple
521	# consecutively via the ebuild command.	521	# times consecutively via the ebuild command.
522	export DESTTREE=/usr	522	export DESTTREE=/usr
523	export INSDESTTREE=""	523	export INSDESTTREE=""
524	export _E_EXEDESTTREE_=""	524	export _E_EXEDESTTREE_=""
		525	export _E_MANDESTTREE_=""
525	export _E_DOCDESTTREE_=""	526	export _E_DOCDESTTREE_=""
526		527
527	ebuild_phase src_install	528	ebuild_phase src_install

Lines 5-10 Link Here

(-)/usr/lib/portage/bin/phase-helpers.sh.orig (+17 lines)
5	export DESTTREE=/usr	5	export DESTTREE=/usr
6	export INSDESTTREE=""	6	export INSDESTTREE=""
7	export _E_EXEDESTTREE_=""	7	export _E_EXEDESTTREE_=""
		8	export _E_MANDESTTREE_=""
8	export _E_DOCDESTTREE_=""	9	export _E_DOCDESTTREE_=""
9	export INSOPTIONS="-m0644"	10	export INSOPTIONS="-m0644"
10	export EXEOPTIONS="-m0755"	11	export EXEOPTIONS="-m0755"
Lines 56-61 Link Here
56	local ret=$?	57	local ret=$?
57	if [[ $ret -ne 0 ]] ; then	58	if [[ $ret -ne 0 ]] ; then
58	helpers_die "${FUNCNAME[0]} failed"	59	helpers_die "${FUNCNAME[0]} failed"
		60	return $ret
		61	fi
		62	fi
		63	fi
		64	}
		65
		66	maninto() {
		67	if [ "$1" == "/" ]; then
		68	export _E_MANDESTTREE_=""
		69	else
		70	export _E_MANDESTTREE_="$1"
		71	if [ ! -d "${D}${_E_MANDESTTREE_}" ]; then
		72	install -d "${D}${_E_MANDESTTREE_}"
		73	local ret=$?
		74	if [[ $ret -ne 0 ]] ; then
		75	helpers_die "${FUNCNAME[0]} failed"
59	return $ret	76	return $ret
60	fi	77	fi
61	fi	78	fi