Attachment #83112 for bug #127560

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




++ portage-2.1_pre7/bin/doexe


for x in "$@" ; do
	if [ -L "${x}" ] ; then
		cp "${x}" "${PORTAGE_T}"
		mysrc="${T}"/`/usr/bin/basename "${x}"`
	elif [ -d "${x}" ] ; then
		echo "doexe: warning, skipping directory ${x}"
++ portage-2.1_pre7/bin/doins


for x in "$@" ; do
	if [ -L "$x" ] ; then
		cp "$x" "${PORTAGE_T}"
		mysrc="${PORTAGE_T}/$(/usr/bin/basename "${x}")"
	elif [ -d "$x" ] ; then
		if [ "${DOINSRECUR}" == "n" ] ; then
			continue
++ portage-2.1_pre7/bin/dojar

	JARDESTTREE="lib"
fi

jarroot="${DESTTREE}/share/${PORTAGE_PN}/"
jardest="${DESTTREE}/share/${PORTAGE_PN}/${JARDESTTREE}/"
pf="${D}${jarroot}/package.env"

dodir "${jardest}"
++ portage-2.1_pre7/bin/dosed

	y="${D}${x}"
	if [ -a "${y}" ] ; then
		if [ -f "${y}" ] ; then
			mysrc="${PORTAGE_T}/${y##*/}"
			cp "${y}" "${mysrc}"
			sed -e "${mysed}" "${mysrc}" > "${y}"
		else
++ portage-2.1_pre7/bin/ebuild.sh

unset E_IUSE E_DEPEND E_RDEPEND E_PDEPEND

for x in T P PN PV PVR PR CATEGORY A EBUILD EMERGE_FROM O PPID FILESDIR PORTAGE_TMPDIR; do
	declare +x -r ${x}
	declare -x -r PORTAGE_${x}="${!x}"
done
# Need to be able to change D in dyn_preinst due to the IMAGE stuff
[[ $* != "preinst" ]] && declare -r D
unset x
++ portage-2.1_pre7/bin/newbin

# Distributed under the terms of the GNU General Public License v2
# $Id: /var/cvsroot/gentoo-src/portage/bin/newbin,v 1.7 2004/10/04 13:56:50 vapier Exp $

if [[ -z ${PORTAGE_T} ]] || [[ -z ${2} ]] ; then
	echo "$0: Need two arguments, old file and new file" 1>&2
	exit 1
fi

rm -rf "${PORTAGE_T}/${2}" && \
cp -f "${1}" "${PORTAGE_T}/${2}" && \
exec dobin "${PORTAGE_T}/${2}"
++ portage-2.1_pre7/bin/newconfd

# Distributed under the terms of the GNU General Public License v2
# $Id: /var/cvsroot/gentoo-src/portage/bin/newconfd,v 1.2 2004/10/04 13:56:50 vapier Exp $

if [[ -z ${PORTAGE_T} ]] || [[ -z ${2} ]] ; then
	echo "$0: Need two arguments, old file and new file" 1>&2
	exit 1
fi

rm -rf "${PORTAGE_T}/${2}" && \
cp -f "${1}" "${PORTAGE_T}/${2}" && \
exec doconfd "${PORTAGE_T}/${2}"
++ portage-2.1_pre7/bin/newdoc

# Distributed under the terms of the GNU General Public License v2
# $Id: /var/cvsroot/gentoo-src/portage/bin/newdoc,v 1.7 2004/10/04 13:56:50 vapier Exp $

if [[ -z ${PORTAGE_T} ]] || [[ -z ${2} ]] ; then
	echo "$0: Need two arguments, old file and new file" 1>&2
	exit 1
fi

rm -rf "${PORTAGE_T}/${2}" && \
cp -f "${1}" "${PORTAGE_T}/${2}" && \
exec dodoc "${PORTAGE_T}/${2}"
++ portage-2.1_pre7/bin/newenvd

# Distributed under the terms of the GNU General Public License v2
# $Id: /var/cvsroot/gentoo-src/portage/bin/newenvd,v 1.2 2004/10/04 13:56:50 vapier Exp $

if [[ -z ${PORTAGE_T} ]] || [[ -z ${2} ]] ; then
	echo "$0: Need two arguments, old file and new file" 1>&2
	exit 1
fi

rm -rf "${PORTAGE_T}/${2}" && \
cp -f "${1}" "${PORTAGE_T}/${2}" && \
exec doenvd "${PORTAGE_T}/${2}"
++ portage-2.1_pre7/bin/newexe

# Distributed under the terms of the GNU General Public License v2
# $Id: /var/cvsroot/gentoo-src/portage/bin/newexe,v 1.7 2004/10/04 13:56:50 vapier Exp $

if [[ -z ${PORTAGE_T} ]] || [[ -z ${2} ]] ; then
	echo "$0: Need two arguments, old file and new file" 1>&2
	exit 1
fi

rm -rf "${PORTAGE_T}/${2}" && \
cp -f "${1}" "${PORTAGE_T}/${2}" && \
exec doexe "${PORTAGE_T}/${2}"
++ portage-2.1_pre7/bin/newinitd

# Distributed under the terms of the GNU General Public License v2
# $Id: /var/cvsroot/gentoo-src/portage/bin/newinitd,v 1.2 2004/10/04 13:56:50 vapier Exp $

if [[ -z ${PORTAGE_T} ]] || [[ -z ${2} ]] ; then
	echo "$0: Need two arguments, old file and new file" 1>&2
	exit 1
fi

rm -rf "${PORTAGE_T}/${2}" && \
cp -f "${1}" "${PORTAGE_T}/${2}" && \
exec doinitd "${PORTAGE_T}/${2}"
++ portage-2.1_pre7/bin/newins

# Distributed under the terms of the GNU General Public License v2
# $Id: /var/cvsroot/gentoo-src/portage/bin/newins,v 1.7 2004/10/04 13:56:50 vapier Exp $

if [[ -z ${PORTAGE_T} ]] || [[ -z ${2} ]] ; then
	echo "$0: Need two arguments, old file and new file" 1>&2
	exit 1
fi

rm -rf "${PORTAGE_T}/${2}" && \
cp -f "${1}" "${PORTAGE_T}/${2}" && \
exec doins "${PORTAGE_T}/${2}"
++ portage-2.1_pre7/bin/newlib.a

# Distributed under the terms of the GNU General Public License v2
# $Id: /var/cvsroot/gentoo-src/portage/bin/newlib.a,v 1.7 2004/10/04 13:56:50 vapier Exp $

if [[ -z ${PORTAGE_T} ]] || [[ -z ${2} ]] ; then
	echo "$0: Need two arguments, old file and new file" 1>&2
	exit 1
fi

rm -rf "${PORTAGE_T}/${2}" && \
cp -f "${1}" "${PORTAGE_T}/${2}" && \
exec dolib.a "${PORTAGE_T}/${2}"
++ portage-2.1_pre7/bin/newlib.so

# Distributed under the terms of the GNU General Public License v2
# $Id: /var/cvsroot/gentoo-src/portage/bin/newlib.so,v 1.7 2004/10/04 13:56:50 vapier Exp $

if [[ -z ${PORTAGE_T} ]] || [[ -z ${2} ]] ; then
	echo "$0: Need two arguments, old file and new file" 1>&2
	exit 1
fi

rm -rf "${PORTAGE_T}/${2}" && \
cp -f "${1}" "${PORTAGE_T}/${2}" && \
exec dolib.so "${PORTAGE_T}/${2}"
++ portage-2.1_pre7/bin/newman

# Distributed under the terms of the GNU General Public License v2
# $Id: /var/cvsroot/gentoo-src/portage/bin/newman,v 1.7 2004/10/04 13:56:50 vapier Exp $

if [[ -z ${PORTAGE_T} ]] || [[ -z ${2} ]] ; then
	echo "$0: Need two arguments, old file and new file" 1>&2
	exit 1
fi

rm -rf "${PORTAGE_T}/${2}" && \
cp -f "${1}" "${PORTAGE_T}/${2}" && \
exec doman "${PORTAGE_T}/${2}"
++ portage-2.1_pre7/bin/newsbin

# Distributed under the terms of the GNU General Public License v2
# $Id: /var/cvsroot/gentoo-src/portage/bin/newsbin,v 1.7 2004/10/04 13:56:50 vapier Exp $

if [[ -z ${PORTAGE_T} ]] || [[ -z ${2} ]] ; then
	echo "$0: Need two arguments, old file and new file" 1>&2
	exit 1
fi

rm -rf "${PORTAGE_T}/${2}" && \
cp -f "${1}" "${PORTAGE_T}/${2}" && \
exec dosbin "${PORTAGE_T}/${2}"
++ portage-2.1_pre7/bin/prepstrip

	[[ " ${FEATURES} " != *" installsources "* ]] && return 0

	if [[ -x "/usr/bin/debugedit" ]] ; then
		debugedit -b "${WORKDIR}" -d /usr/src/debug/${PF} -l "${PORTAGE_T}"/debug.sources "${x}"
		if [[ -s ${PORTAGE_T}/debug.sources ]] ; then 
			[[ -d ${D}/usr/src/debug/${PF} ]] || mkdir -p "${D}/usr/src/debug/${PF}"
			cat "${PORTAGE_T}"/debug.sources | (cd "${WORKDIR}"; LANG=C sort -z -u | xargs -0 -- cp --parents -p --target-directory="${D}/usr/src/debug/${PF}" )
		fi
	fi
}

Return to bug 127560

Line Link Here

(-)file_not_specified_in_diff (-71 / +72 lines)
0	-- portage-2.1_pre7/bin/doexe	0	++ portage-2.1_pre7/bin/doexe
Lines 14-20 Link Here
14		14
15	for x in "$@" ; do	15	for x in "$@" ; do
16	if [ -L "${x}" ] ; then	16	if [ -L "${x}" ] ; then
17	cp "${x}" "${T}"	17	cp "${x}" "${PORTAGE_T}"
18	mysrc="${T}"/`/usr/bin/basename "${x}"`	18	mysrc="${T}"/`/usr/bin/basename "${x}"`
19	elif [ -d "${x}" ] ; then	19	elif [ -d "${x}" ] ; then
20	echo "doexe: warning, skipping directory ${x}"	20	echo "doexe: warning, skipping directory ${x}"
21	-- portage-2.1_pre7/bin/doins	21	++ portage-2.1_pre7/bin/doins
Lines 32-39 Link Here
32		32
33	for x in "$@" ; do	33	for x in "$@" ; do
34	if [ -L "$x" ] ; then	34	if [ -L "$x" ] ; then
35	cp "$x" "${T}"	35	cp "$x" "${PORTAGE_T}"
36	mysrc="${T}/$(/usr/bin/basename "${x}")"	36	mysrc="${PORTAGE_T}/$(/usr/bin/basename "${x}")"
37	elif [ -d "$x" ] ; then	37	elif [ -d "$x" ] ; then
38	if [ "${DOINSRECUR}" == "n" ] ; then	38	if [ "${DOINSRECUR}" == "n" ] ; then
39	continue	39	continue
40	-- portage-2.1_pre7/bin/dojar	40	++ portage-2.1_pre7/bin/dojar
Lines 30-37 Link Here
30	JARDESTTREE="lib"	30	JARDESTTREE="lib"
31	fi	31	fi
32		32
33	jarroot="${DESTTREE}/share/${PN}/"	33	jarroot="${DESTTREE}/share/${PORTAGE_PN}/"
34	jardest="${DESTTREE}/share/${PN}/${JARDESTTREE}/"	34	jardest="${DESTTREE}/share/${PORTAGE_PN}/${JARDESTTREE}/"
35	pf="${D}${jarroot}/package.env"	35	pf="${D}${jarroot}/package.env"
36		36
37	dodir "${jardest}"	37	dodir "${jardest}"
38	-- portage-2.1_pre7/bin/dosed	38	++ portage-2.1_pre7/bin/dosed
Lines 9-15 Link Here
9	y="${D}${x}"	9	y="${D}${x}"
10	if [ -a "${y}" ] ; then	10	if [ -a "${y}" ] ; then
11	if [ -f "${y}" ] ; then	11	if [ -f "${y}" ] ; then
12	mysrc="${T}/${y##*/}"	12	mysrc="${PORTAGE_T}/${y##*/}"
13	cp "${y}" "${mysrc}"	13	cp "${y}" "${mysrc}"
14	sed -e "${mysed}" "${mysrc}" > "${y}"	14	sed -e "${mysed}" "${mysrc}" > "${y}"
15	else	15	else
16	-- portage-2.1_pre7/bin/ebuild.sh	16	++ portage-2.1_pre7/bin/ebuild.sh
Lines 1391-1398 Link Here
1391	unset E_IUSE E_DEPEND E_RDEPEND E_PDEPEND	1391	unset E_IUSE E_DEPEND E_RDEPEND E_PDEPEND
1392		1392
1393	for x in T P PN PV PVR PR CATEGORY A EBUILD EMERGE_FROM O PPID FILESDIR PORTAGE_TMPDIR; do	1393	for x in T P PN PV PVR PR CATEGORY A EBUILD EMERGE_FROM O PPID FILESDIR PORTAGE_TMPDIR; do
1394	[[ ${!x-UNSET_VAR} != UNSET_VAR ]] && declare -r ${x}	1394	declare +x -r ${x}
		1395	declare -x -r PORTAGE_${x}="${!x}"
1395	done	1396	done
1396	# Need to be able to change D in dyn_preinst due to the IMAGE stuff	1397	# Need to be able to change D in dyn_preinst due to the IMAGE stuff
1397	[[ $* != "preinst" ]] && declare -r D	1398	[[ $* != "preinst" ]] && declare -r D
1398	unset x	1399	unset x
1399	-- portage-2.1_pre7/bin/newbin	1400	++ portage-2.1_pre7/bin/newbin
Lines 3-13 Link Here
3	# Distributed under the terms of the GNU General Public License v2	3	# Distributed under the terms of the GNU General Public License v2
4	# $Id: /var/cvsroot/gentoo-src/portage/bin/newbin,v 1.7 2004/10/04 13:56:50 vapier Exp $	4	# $Id: /var/cvsroot/gentoo-src/portage/bin/newbin,v 1.7 2004/10/04 13:56:50 vapier Exp $
5		5
6	if [[ -z ${T} ]] \|\| [[ -z ${2} ]] ; then	6	if [[ -z ${PORTAGE_T} ]] \|\| [[ -z ${2} ]] ; then
7	echo "$0: Need two arguments, old file and new file" 1>&2	7	echo "$0: Need two arguments, old file and new file" 1>&2
8	exit 1	8	exit 1
9	fi	9	fi
10		10
11	rm -rf "${T}/${2}" && \	11	rm -rf "${PORTAGE_T}/${2}" && \
12	cp -f "${1}" "${T}/${2}" && \	12	cp -f "${1}" "${PORTAGE_T}/${2}" && \
13	exec dobin "${T}/${2}"	13	exec dobin "${PORTAGE_T}/${2}"
14	-- portage-2.1_pre7/bin/newconfd	14	++ portage-2.1_pre7/bin/newconfd
Lines 3-13 Link Here
3	# Distributed under the terms of the GNU General Public License v2	3	# Distributed under the terms of the GNU General Public License v2
4	# $Id: /var/cvsroot/gentoo-src/portage/bin/newconfd,v 1.2 2004/10/04 13:56:50 vapier Exp $	4	# $Id: /var/cvsroot/gentoo-src/portage/bin/newconfd,v 1.2 2004/10/04 13:56:50 vapier Exp $
5		5
6	if [[ -z ${T} ]] \|\| [[ -z ${2} ]] ; then	6	if [[ -z ${PORTAGE_T} ]] \|\| [[ -z ${2} ]] ; then
7	echo "$0: Need two arguments, old file and new file" 1>&2	7	echo "$0: Need two arguments, old file and new file" 1>&2
8	exit 1	8	exit 1
9	fi	9	fi
10		10
11	rm -rf "${T}/${2}" && \	11	rm -rf "${PORTAGE_T}/${2}" && \
12	cp -f "${1}" "${T}/${2}" && \	12	cp -f "${1}" "${PORTAGE_T}/${2}" && \
13	exec doconfd "${T}/${2}"	13	exec doconfd "${PORTAGE_T}/${2}"
14	-- portage-2.1_pre7/bin/newdoc	14	++ portage-2.1_pre7/bin/newdoc
Lines 3-13 Link Here
3	# Distributed under the terms of the GNU General Public License v2	3	# Distributed under the terms of the GNU General Public License v2
4	# $Id: /var/cvsroot/gentoo-src/portage/bin/newdoc,v 1.7 2004/10/04 13:56:50 vapier Exp $	4	# $Id: /var/cvsroot/gentoo-src/portage/bin/newdoc,v 1.7 2004/10/04 13:56:50 vapier Exp $
5		5
6	if [[ -z ${T} ]] \|\| [[ -z ${2} ]] ; then	6	if [[ -z ${PORTAGE_T} ]] \|\| [[ -z ${2} ]] ; then
7	echo "$0: Need two arguments, old file and new file" 1>&2	7	echo "$0: Need two arguments, old file and new file" 1>&2
8	exit 1	8	exit 1
9	fi	9	fi
10		10
11	rm -rf "${T}/${2}" && \	11	rm -rf "${PORTAGE_T}/${2}" && \
12	cp -f "${1}" "${T}/${2}" && \	12	cp -f "${1}" "${PORTAGE_T}/${2}" && \
13	exec dodoc "${T}/${2}"	13	exec dodoc "${PORTAGE_T}/${2}"
14	-- portage-2.1_pre7/bin/newenvd	14	++ portage-2.1_pre7/bin/newenvd
Lines 3-13 Link Here
3	# Distributed under the terms of the GNU General Public License v2	3	# Distributed under the terms of the GNU General Public License v2
4	# $Id: /var/cvsroot/gentoo-src/portage/bin/newenvd,v 1.2 2004/10/04 13:56:50 vapier Exp $	4	# $Id: /var/cvsroot/gentoo-src/portage/bin/newenvd,v 1.2 2004/10/04 13:56:50 vapier Exp $
5		5
6	if [[ -z ${T} ]] \|\| [[ -z ${2} ]] ; then	6	if [[ -z ${PORTAGE_T} ]] \|\| [[ -z ${2} ]] ; then
7	echo "$0: Need two arguments, old file and new file" 1>&2	7	echo "$0: Need two arguments, old file and new file" 1>&2
8	exit 1	8	exit 1
9	fi	9	fi
10		10
11	rm -rf "${T}/${2}" && \	11	rm -rf "${PORTAGE_T}/${2}" && \
12	cp -f "${1}" "${T}/${2}" && \	12	cp -f "${1}" "${PORTAGE_T}/${2}" && \
13	exec doenvd "${T}/${2}"	13	exec doenvd "${PORTAGE_T}/${2}"
14	-- portage-2.1_pre7/bin/newexe	14	++ portage-2.1_pre7/bin/newexe
Lines 3-13 Link Here
3	# Distributed under the terms of the GNU General Public License v2	3	# Distributed under the terms of the GNU General Public License v2
4	# $Id: /var/cvsroot/gentoo-src/portage/bin/newexe,v 1.7 2004/10/04 13:56:50 vapier Exp $	4	# $Id: /var/cvsroot/gentoo-src/portage/bin/newexe,v 1.7 2004/10/04 13:56:50 vapier Exp $
5		5
6	if [[ -z ${T} ]] \|\| [[ -z ${2} ]] ; then	6	if [[ -z ${PORTAGE_T} ]] \|\| [[ -z ${2} ]] ; then
7	echo "$0: Need two arguments, old file and new file" 1>&2	7	echo "$0: Need two arguments, old file and new file" 1>&2
8	exit 1	8	exit 1
9	fi	9	fi
10		10
11	rm -rf "${T}/${2}" && \	11	rm -rf "${PORTAGE_T}/${2}" && \
12	cp -f "${1}" "${T}/${2}" && \	12	cp -f "${1}" "${PORTAGE_T}/${2}" && \
13	exec doexe "${T}/${2}"	13	exec doexe "${PORTAGE_T}/${2}"
14	-- portage-2.1_pre7/bin/newinitd	14	++ portage-2.1_pre7/bin/newinitd
Lines 3-13 Link Here
3	# Distributed under the terms of the GNU General Public License v2	3	# Distributed under the terms of the GNU General Public License v2
4	# $Id: /var/cvsroot/gentoo-src/portage/bin/newinitd,v 1.2 2004/10/04 13:56:50 vapier Exp $	4	# $Id: /var/cvsroot/gentoo-src/portage/bin/newinitd,v 1.2 2004/10/04 13:56:50 vapier Exp $
5		5
6	if [[ -z ${T} ]] \|\| [[ -z ${2} ]] ; then	6	if [[ -z ${PORTAGE_T} ]] \|\| [[ -z ${2} ]] ; then
7	echo "$0: Need two arguments, old file and new file" 1>&2	7	echo "$0: Need two arguments, old file and new file" 1>&2
8	exit 1	8	exit 1
9	fi	9	fi
10		10
11	rm -rf "${T}/${2}" && \	11	rm -rf "${PORTAGE_T}/${2}" && \
12	cp -f "${1}" "${T}/${2}" && \	12	cp -f "${1}" "${PORTAGE_T}/${2}" && \
13	exec doinitd "${T}/${2}"	13	exec doinitd "${PORTAGE_T}/${2}"
14	-- portage-2.1_pre7/bin/newins	14	++ portage-2.1_pre7/bin/newins
Lines 3-13 Link Here
3	# Distributed under the terms of the GNU General Public License v2	3	# Distributed under the terms of the GNU General Public License v2
4	# $Id: /var/cvsroot/gentoo-src/portage/bin/newins,v 1.7 2004/10/04 13:56:50 vapier Exp $	4	# $Id: /var/cvsroot/gentoo-src/portage/bin/newins,v 1.7 2004/10/04 13:56:50 vapier Exp $
5		5
6	if [[ -z ${T} ]] \|\| [[ -z ${2} ]] ; then	6	if [[ -z ${PORTAGE_T} ]] \|\| [[ -z ${2} ]] ; then
7	echo "$0: Need two arguments, old file and new file" 1>&2	7	echo "$0: Need two arguments, old file and new file" 1>&2
8	exit 1	8	exit 1
9	fi	9	fi
10		10
11	rm -rf "${T}/${2}" && \	11	rm -rf "${PORTAGE_T}/${2}" && \
12	cp -f "${1}" "${T}/${2}" && \	12	cp -f "${1}" "${PORTAGE_T}/${2}" && \
13	exec doins "${T}/${2}"	13	exec doins "${PORTAGE_T}/${2}"
14	-- portage-2.1_pre7/bin/newlib.a	14	++ portage-2.1_pre7/bin/newlib.a
Lines 3-13 Link Here
3	# Distributed under the terms of the GNU General Public License v2	3	# Distributed under the terms of the GNU General Public License v2
4	# $Id: /var/cvsroot/gentoo-src/portage/bin/newlib.a,v 1.7 2004/10/04 13:56:50 vapier Exp $	4	# $Id: /var/cvsroot/gentoo-src/portage/bin/newlib.a,v 1.7 2004/10/04 13:56:50 vapier Exp $
5		5
6	if [[ -z ${T} ]] \|\| [[ -z ${2} ]] ; then	6	if [[ -z ${PORTAGE_T} ]] \|\| [[ -z ${2} ]] ; then
7	echo "$0: Need two arguments, old file and new file" 1>&2	7	echo "$0: Need two arguments, old file and new file" 1>&2
8	exit 1	8	exit 1
9	fi	9	fi
10		10
11	rm -rf "${T}/${2}" && \	11	rm -rf "${PORTAGE_T}/${2}" && \
12	cp -f "${1}" "${T}/${2}" && \	12	cp -f "${1}" "${PORTAGE_T}/${2}" && \
13	exec dolib.a "${T}/${2}"	13	exec dolib.a "${PORTAGE_T}/${2}"
14	-- portage-2.1_pre7/bin/newlib.so	14	++ portage-2.1_pre7/bin/newlib.so
Lines 3-13 Link Here
3	# Distributed under the terms of the GNU General Public License v2	3	# Distributed under the terms of the GNU General Public License v2
4	# $Id: /var/cvsroot/gentoo-src/portage/bin/newlib.so,v 1.7 2004/10/04 13:56:50 vapier Exp $	4	# $Id: /var/cvsroot/gentoo-src/portage/bin/newlib.so,v 1.7 2004/10/04 13:56:50 vapier Exp $
5		5
6	if [[ -z ${T} ]] \|\| [[ -z ${2} ]] ; then	6	if [[ -z ${PORTAGE_T} ]] \|\| [[ -z ${2} ]] ; then
7	echo "$0: Need two arguments, old file and new file" 1>&2	7	echo "$0: Need two arguments, old file and new file" 1>&2
8	exit 1	8	exit 1
9	fi	9	fi
10		10
11	rm -rf "${T}/${2}" && \	11	rm -rf "${PORTAGE_T}/${2}" && \
12	cp -f "${1}" "${T}/${2}" && \	12	cp -f "${1}" "${PORTAGE_T}/${2}" && \
13	exec dolib.so "${T}/${2}"	13	exec dolib.so "${PORTAGE_T}/${2}"
14	-- portage-2.1_pre7/bin/newman	14	++ portage-2.1_pre7/bin/newman
Lines 3-13 Link Here
3	# Distributed under the terms of the GNU General Public License v2	3	# Distributed under the terms of the GNU General Public License v2
4	# $Id: /var/cvsroot/gentoo-src/portage/bin/newman,v 1.7 2004/10/04 13:56:50 vapier Exp $	4	# $Id: /var/cvsroot/gentoo-src/portage/bin/newman,v 1.7 2004/10/04 13:56:50 vapier Exp $
5		5
6	if [[ -z ${T} ]] \|\| [[ -z ${2} ]] ; then	6	if [[ -z ${PORTAGE_T} ]] \|\| [[ -z ${2} ]] ; then
7	echo "$0: Need two arguments, old file and new file" 1>&2	7	echo "$0: Need two arguments, old file and new file" 1>&2
8	exit 1	8	exit 1
9	fi	9	fi
10		10
11	rm -rf "${T}/${2}" && \	11	rm -rf "${PORTAGE_T}/${2}" && \
12	cp -f "${1}" "${T}/${2}" && \	12	cp -f "${1}" "${PORTAGE_T}/${2}" && \
13	exec doman "${T}/${2}"	13	exec doman "${PORTAGE_T}/${2}"
14	-- portage-2.1_pre7/bin/newsbin	14	++ portage-2.1_pre7/bin/newsbin
Lines 3-13 Link Here
3	# Distributed under the terms of the GNU General Public License v2	3	# Distributed under the terms of the GNU General Public License v2
4	# $Id: /var/cvsroot/gentoo-src/portage/bin/newsbin,v 1.7 2004/10/04 13:56:50 vapier Exp $	4	# $Id: /var/cvsroot/gentoo-src/portage/bin/newsbin,v 1.7 2004/10/04 13:56:50 vapier Exp $
5		5
6	if [[ -z ${T} ]] \|\| [[ -z ${2} ]] ; then	6	if [[ -z ${PORTAGE_T} ]] \|\| [[ -z ${2} ]] ; then
7	echo "$0: Need two arguments, old file and new file" 1>&2	7	echo "$0: Need two arguments, old file and new file" 1>&2
8	exit 1	8	exit 1
9	fi	9	fi
10		10
11	rm -rf "${T}/${2}" && \	11	rm -rf "${PORTAGE_T}/${2}" && \
12	cp -f "${1}" "${T}/${2}" && \	12	cp -f "${1}" "${PORTAGE_T}/${2}" && \
13	exec dosbin "${T}/${2}"	13	exec dosbin "${PORTAGE_T}/${2}"
14	-- portage-2.1_pre7/bin/prepstrip	14	++ portage-2.1_pre7/bin/prepstrip
Lines 36-45 Link Here
36	[[ " ${FEATURES} " != " installsources " ]] && return 0	36	[[ " ${FEATURES} " != " installsources " ]] && return 0
37		37
38	if [[ -x "/usr/bin/debugedit" ]] ; then	38	if [[ -x "/usr/bin/debugedit" ]] ; then
39	debugedit -b "${WORKDIR}" -d /usr/src/debug/${PF} -l "${T}"/debug.sources "${x}"	39	debugedit -b "${WORKDIR}" -d /usr/src/debug/${PF} -l "${PORTAGE_T}"/debug.sources "${x}"
40	if [[ -s ${T}/debug.sources ]] ; then	40	if [[ -s ${PORTAGE_T}/debug.sources ]] ; then
41	[[ -d ${D}/usr/src/debug/${PF} ]] \|\| mkdir -p "${D}/usr/src/debug/${PF}"	41	[[ -d ${D}/usr/src/debug/${PF} ]] \|\| mkdir -p "${D}/usr/src/debug/${PF}"
42	cat "${T}"/debug.sources \| (cd "${WORKDIR}"; LANG=C sort -z -u \| xargs -0 -- cp --parents -p --target-directory="${D}/usr/src/debug/${PF}" )	42	cat "${PORTAGE_T}"/debug.sources \| (cd "${WORKDIR}"; LANG=C sort -z -u \| xargs -0 -- cp --parents -p --target-directory="${D}/usr/src/debug/${PF}" )
43	fi	43	fi
44	fi	44	fi
45	}	45	}