/[gentoo-x86]/eclass/eutils.eclass

Diff of /eclass/eutils.eclass

Parent Directory | Revision Log | View Patch Patch

Revision 1.197		Revision 1.279
1	# Copyright 1999-2005 Gentoo Foundation	1	# Copyright 1999-2006 Gentoo Foundation
2	# Distributed under the terms of the GNU General Public License v2	2	# Distributed under the terms of the GNU General Public License v2
3	# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.197 2005/09/18 17:33:44 flameeyes Exp $	3	# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.279 2007/04/25 09:14:35 carlo Exp $
4	#
5	# Author: Martin Schlemmer <azarah@gentoo.org>
6	#	4	#
7	# This eclass is for general purpose functions that most ebuilds	5	# This eclass is for general purpose functions that most ebuilds
8	# have to implement themselves.	6	# have to implement themselves.
9	#	7	#
10	# NB: If you add anything, please comment it!	8	# NB: If you add anything, please comment it!
		9	#
		10	# Maintainer: see each individual function, base-system@gentoo.org as default
11		11
12	inherit multilib portability	12	inherit multilib portability
13
14	DEPEND="!bootstrap? ( sys-devel/patch )"
15	# sys-apps/shadow is needed for useradd, etc, bug #94745.
16		13
17	DESCRIPTION="Based on the ${ECLASS} eclass"	14	DESCRIPTION="Based on the ${ECLASS} eclass"
18		15
19	# Wait for the supplied number of seconds. If no argument is supplied, defaults	16	# Wait for the supplied number of seconds. If no argument is supplied, defaults
20	# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not	17	# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
21	# outputting to a terminal, don't wait. For compatability purposes, the argument	18	# outputting to a terminal, don't wait. For compatability purposes, the argument
22	# must be an integer greater than zero.	19	# must be an integer greater than zero.
23	# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)	20	# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
24	epause() {	21	epause() {
25	if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then	22	[[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
26	sleep ${1:-5}
27	fi
28	}	23	}
29		24
30	# Beep the specified number of times (defaults to five). If our output	25	# Beep the specified number of times (defaults to five). If our output
31	# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set,	26	# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set,
32	# don't beep.	27	# don't beep.
33	# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)	28	# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
34	ebeep() {	29	ebeep() {
35	local n	30	local n
36	if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then	31	if [[ -z ${EBEEP_IGNORE} ]] ; then
37	for ((n=1 ; n <= ${1:-5} ; n++)) ; do	32	for ((n=1 ; n <= ${1:-5} ; n++)) ; do
38	echo -ne "\a"	33	echo -ne "\a"
39	sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null	34	sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
40	echo -ne "\a"	35	echo -ne "\a"
41	sleep 1	36	sleep 1
42	done	37	done
43	fi	38	fi
44	}	39	}
45		40
46	# This function generate linker scripts in /usr/lib for dynamic	41	# This function generate linker scripts in /usr/lib for dynamic
47	# libs in /lib. This is to fix linking problems when you have	42	# libs in /lib. This is to fix linking problems when you have
48	# the .so in /lib, and the .a in /usr/lib. What happens is that	43	# the .so in /lib, and the .a in /usr/lib. What happens is that
49	# in some cases when linking dynamic, the .a in /usr/lib is used	44	# in some cases when linking dynamic, the .a in /usr/lib is used
50	# instead of the .so in /lib due to gcc/libtool tweaking ld's	45	# instead of the .so in /lib due to gcc/libtool tweaking ld's
51	# library search path. This cause many builds to fail.	46	# library search path. This cause many builds to fail.
52	# See bug #4411 for more info.	47	# See bug #4411 for more info.
53	#	48	#
54	# To use, simply call:	49	# To use, simply call:
55	#	50	#
56	# gen_usr_ldscript libfoo.so	51	# gen_usr_ldscript libfoo.so
57	#	52	#
58	# Note that you should in general use the unversioned name of	53	# Note that you should in general use the unversioned name of
59	# the library, as ldconfig should usually update it correctly	54	# the library, as ldconfig should usually update it correctly
60	# to point to the latest version of the library present.	55	# to point to the latest version of the library present.
61	#	56	#
62	# <azarah@gentoo.org> (26 Oct 2002)	57	# <azarah@gentoo.org> (26 Oct 2002)
63	#	58	#
64	gen_usr_ldscript() {	59	gen_usr_ldscript() {
		60	if [[ $(type -t _tc_gen_usr_ldscript) == "function" ]] ; then
		61	_tc_gen_usr_ldscript "$@"
		62	return $?
		63	fi
		64
		65	ewarn "QA Notice: Please upgrade your ebuild to use toolchain-funcs"
		66	ewarn "QA Notice: rather than gen_usr_ldscript() from eutils"
		67
65	local libdir="$(get_libdir)"	68	local lib libdir=$(get_libdir)
66	# Just make sure it exists	69	# Just make sure it exists
67	dodir /usr/${libdir}	70	dodir /usr/${libdir}
68		71
69	for lib in "${@}" ; do	72	for lib in "${@}" ; do
70	cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT	73	cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
…		…
76		79
77	See bug http://bugs.gentoo.org/4411 for more info.	80	See bug http://bugs.gentoo.org/4411 for more info.
78	*/	81	*/
79	GROUP ( /${libdir}/${lib} )	82	GROUP ( /${libdir}/${lib} )
80	END_LDSCRIPT	83	END_LDSCRIPT
81	fperms a+x "/usr/${libdir}/${lib}"	84	fperms a+x "/usr/${libdir}/${lib}" \|\| die "could not change perms on ${lib}"
82	done	85	done
83	}	86	}
84		87
85	# Simple function to draw a line consisting of '=' the same length as $*
86	# - only to be used by epatch()
87	#
88	# <azarah@gentoo.org> (11 Nov 2002)
89	#
90	draw_line() {
91	local i=0
92	local str_length=""
93
94	# Handle calls that do not have args, or wc not being installed ...
95	if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
96	then
97	echo "==============================================================="
98	return 0
99	fi
100
101	# Get the length of $*
102	str_length="$(echo -n "$*" \| wc -m)"
103
104	while [ "$i" -lt "${str_length}" ]
105	do
106	echo -n "="
107
108	i=$((i + 1))
109	done
110
111	echo
112
113	return 0
114	}
115		88
116	# Default directory where patches are located	89	# Default directory where patches are located
117	EPATCH_SOURCE="${WORKDIR}/patch"	90	EPATCH_SOURCE="${WORKDIR}/patch"
118	# Default extension for patches	91	# Default extension for patches
119	EPATCH_SUFFIX="patch.bz2"	92	EPATCH_SUFFIX="patch.bz2"
120	# Default options for patch	93	# Default options for patch
121	# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571	94	# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
122	# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.	95	# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
		96	# Set -E to automatically remove empty files.
123	EPATCH_OPTS="-g0 --no-backup-if-mismatch"	97	EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
124	# List of patches not to apply. Not this is only file names,	98	# List of patches not to apply. Not this is only file names,
125	# and not the full path ..	99	# and not the full path ..
126	EPATCH_EXCLUDE=""	100	EPATCH_EXCLUDE=""
127	# Change the printed message for a single patch.	101	# Change the printed message for a single patch.
128	EPATCH_SINGLE_MSG=""	102	EPATCH_SINGLE_MSG=""
129	# Change the printed message for multiple patches.	103	# Change the printed message for multiple patches.
130	EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."	104	EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
131	# Force applying bulk patches even if not following the style:	105	# Force applying bulk patches even if not following the style:
132	#	106	#
133	# ??_${ARCH}_foo.${EPATCH_SUFFIX}	107	# ??_${ARCH}_foo.${EPATCH_SUFFIX}
134	#	108	#
135	EPATCH_FORCE="no"	109	EPATCH_FORCE="no"
136		110
137	# This function is for bulk patching, or in theory for just one	111	# This function is for bulk patching, or in theory for just one
138	# or two patches.	112	# or two patches.
…		…
149	#	123	#
150	# Patches are applied in current directory.	124	# Patches are applied in current directory.
151	#	125	#
152	# Bulk Patches should preferibly have the form of:	126	# Bulk Patches should preferibly have the form of:
153	#	127	#
154	# ??_${ARCH}_foo.${EPATCH_SUFFIX}	128	# ??_${ARCH}_foo.${EPATCH_SUFFIX}
155	#	129	#
156	# For example:	130	# For example:
157	#	131	#
158	# 01_all_misc-fix.patch.bz2	132	# 01_all_misc-fix.patch.bz2
159	# 02_sparc_another-fix.patch.bz2	133	# 02_sparc_another-fix.patch.bz2
160	#	134	#
161	# This ensures that there are a set order, and you can have ARCH	135	# This ensures that there are a set order, and you can have ARCH
162	# specific patches.	136	# specific patches.
163	#	137	#
164	# If you however give an argument to epatch(), it will treat it as a	138	# If you however give an argument to epatch(), it will treat it as a
…		…
166	# hand its a directory, it will set EPATCH_SOURCE to this.	140	# hand its a directory, it will set EPATCH_SOURCE to this.
167	#	141	#
168	# <azarah@gentoo.org> (10 Nov 2002)	142	# <azarah@gentoo.org> (10 Nov 2002)
169	#	143	#
170	epatch() {	144	epatch() {
		145	_epatch_draw_line() {
		146	[[ -z $1 ]] && set "$(printf "%65s" '')"
		147	echo "${1//?/=}"
		148	}
		149	_epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
171	local PIPE_CMD=""	150	local PIPE_CMD=""
172	local STDERR_TARGET="${T}/$$.out"	151	local STDERR_TARGET="${T}/$$.out"
173	local PATCH_TARGET="${T}/$$.patch"	152	local PATCH_TARGET="${T}/$$.patch"
174	local PATCH_SUFFIX=""	153	local PATCH_SUFFIX=""
175	local SINGLE_PATCH="no"	154	local SINGLE_PATCH="no"
…		…
247	fi	226	fi
248	for x in ${EPATCH_SOURCE}	227	for x in ${EPATCH_SOURCE}
249	do	228	do
250	# New ARCH dependant patch naming scheme ...	229	# New ARCH dependant patch naming scheme ...
251	#	230	#
252	# ???_arch_foo.patch	231	# ???_arch_foo.patch
253	#	232	#
254	if [ -f ${x} ] && \	233	if [ -f ${x} ] && \
255	([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] \|\| \	234	([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] \|\| \
256	[ "${EPATCH_FORCE}" = "yes" ])	235	[ "${EPATCH_FORCE}" = "yes" ])
257	then	236	then
258	local count=0	237	local count=0
259	local popts="${EPATCH_OPTS}"	238	local popts="${EPATCH_OPTS}"
260	local patchname=${x##*/}	239	local patchname=${x##*/}
261		240
…		…
284		263
285	# Allow for prefix to differ ... im lazy, so shoot me :/	264	# Allow for prefix to differ ... im lazy, so shoot me :/
286	while [ "${count}" -lt 5 ]	265	while [ "${count}" -lt 5 ]
287	do	266	do
288	# Generate some useful debug info ...	267	# Generate some useful debug info ...
289	draw_line "*** ${patchname} **" >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##*/}	268	_epatch_draw_line "*** ${patchname} **" >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##*/}
290	echo >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}	269	echo >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}
291		270
292	if [ "${PATCH_SUFFIX}" != "patch" ]	271	if [ "${PATCH_SUFFIX}" != "patch" ]
293	then	272	then
294	echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}	273	echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}
295	echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}	274	echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}
296	else	275	else
297	PATCH_TARGET="${x}"	276	PATCH_TARGET="${x}"
298	fi	277	fi
299		278
300	echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}	279	echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}
301	echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}	280	echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}
302		281
303	echo >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}	282	echo >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}
304	draw_line "*** ${patchname} **" >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##*/}	283	_epatch_draw_line "*** ${patchname} **" >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##*/}
305		284
306	if [ "${PATCH_SUFFIX}" != "patch" ]	285	if [ "${PATCH_SUFFIX}" != "patch" ]
307	then	286	then
308	if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/} 2>&1	287	if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/} 2>&1
309	then	288	then
…		…
313	count=5	292	count=5
314	break	293	break
315	fi	294	fi
316	fi	295	fi
317		296
318	if (cat ${PATCH_TARGET} \| patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/} 2>&1	297	if (cat ${PATCH_TARGET} \| patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/} 2>&1
319	then	298	then
320	draw_line "*** ${patchname} **" > ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##*/}.real	299	_epatch_draw_line "*** ${patchname} **" > ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##*/}.real
321	echo >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}.real	300	echo >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}.real
322	echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}.real	301	echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}.real
323	echo >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}.real	302	echo >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}.real
324	draw_line "*** ${patchname} **" >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##*/}.real	303	_epatch_draw_line "*** ${patchname} **" >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##*/}.real
325		304
326	cat ${PATCH_TARGET} \| patch -p${count} ${popts} >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}.real 2>&1	305	cat ${PATCH_TARGET} \| patch -p${count} ${popts} >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}.real 2>&1
		306	_epatch_assert
327		307
328	if [ "$?" -ne 0 ]	308	if [ "$?" -ne 0 ]
329	then	309	then
330	cat ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}.real >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}	310	cat ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}.real >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}
331	echo	311	echo
…		…
394	tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}	374	tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
395	done	375	done
396	${exe} "${tmp}" \|\| ${exe} -p "${tmp}"	376	${exe} "${tmp}" \|\| ${exe} -p "${tmp}"
397	echo "${tmp}"	377	echo "${tmp}"
398	else	378	else
399	[[ ${exe} == "touch" ]] \	379	if [[ ${exe} == "touch" ]] ; then
400	&& exe="-p" \	380	[[ ${USERLAND} == "GNU" ]] \
401	\|\| exe="-d"	381	&& mktemp -p "${topdir}" \
402	mktemp ${exe} "${topdir}"	382	\|\| TMPDIR="${topdir}" mktemp -t tmp
		383	else
		384	[[ ${USERLAND} == "GNU" ]] \
		385	&& mktemp -d "${topdir}" \
		386	\|\| TMPDIR="${topdir}" mktemp -dt tmp
		387	fi
403	fi	388	fi
404	}	389	}
405		390
406	# Small wrapper for getent (Linux), nidump (Mac OS X),	391	# Small wrapper for getent (Linux), nidump (Mac OS X),
407	# and pw (FreeBSD) used in enewuser()/enewgroup()	392	# and pw (FreeBSD) used in enewuser()/enewgroup()
408	# Joe Jezak <josejx@gmail.com> and usata@gentoo.org	393	# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
409	# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>	394	# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
410	#	395	#
411	# egetent(database, key)	396	# egetent(database, key)
412	egetent() {	397	egetent() {
413	if [[ "${USERLAND}" == "Darwin" ]] ; then	398	case ${CHOST} in
		399	-darwin)
414	case "$2" in	400	case "$2" in
415	[!0-9]) # Non numeric	401	[!0-9]) # Non numeric
416	nidump $1 . \| awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"	402	nidump $1 . \| awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
417	;;	403	;;
418	*) # Numeric	404	*) # Numeric
419	nidump $1 . \| awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"	405	nidump $1 . \| awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
420	;;	406	;;
421	esac	407	esac
422	elif [[ "${USERLAND}" == "BSD" ]] ; then	408	;;
423	local action	409	-freebsd\|-dragonfly)
424	if [ "$1" == "passwd" ]	410	local opts action="user"
425	then	411	[[ $1 == "passwd" ]] \|\| action="group"
426	action="user"	412
427	else	413	# lookup by uid/gid
428	action="group"	414	if [[ $2 == [[:digit:]]* ]] ; then
		415	[[ ${action} == "user" ]] && opts="-u" \|\| opts="-g"
429	fi	416	fi
		417
430	pw show "${action}" "$2" -q	418	pw show ${action} ${opts} "$2" -q
431	else	419	;;
		420	-netbsd\|-openbsd)
		421	grep "$2:\*:" /etc/$1
		422	;;
		423	*)
432	which nscd >& /dev/null && nscd -i "$1"	424	type -p nscd >& /dev/null && nscd -i "$1"
433	getent "$1" "$2"	425	getent "$1" "$2"
434	fi	426	;;
		427	esac
435	}	428	}
436		429
437	# Simplify/standardize adding users to the system	430	# Simplify/standardize adding users to the system
438	# vapier@gentoo.org	431	# vapier@gentoo.org
439	#	432	#
…		…
446	# shell: /bin/false	439	# shell: /bin/false
447	# homedir: /dev/null	440	# homedir: /dev/null
448	# groups: none	441	# groups: none
449	# extra: comment of 'added by portage for ${PN}'	442	# extra: comment of 'added by portage for ${PN}'
450	enewuser() {	443	enewuser() {
		444	case ${EBUILD_PHASE} in
		445	unpack\|compile\|test\|install)
		446	eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
		447	eerror "Package fails at QA and at life. Please file a bug."
		448	die "Bad package! enewuser is only for use in pkg_* functions!"
		449	esac
		450
451	# get the username	451	# get the username
452	local euser=$1; shift	452	local euser=$1; shift
453	if [[ -z ${euser} ]] ; then	453	if [[ -z ${euser} ]] ; then
454	eerror "No username specified !"	454	eerror "No username specified !"
455	die "Cannot call enewuser without a username"	455	die "Cannot call enewuser without a username"
456	fi	456	fi
457		457
458	# lets see if the username already exists	458	# lets see if the username already exists
459	if [[ ${euser} == $(egetent passwd "${euser}" \| cut -d: -f1) ]] ; then	459	if [[ -n $(egetent passwd "${euser}") ]] ; then
460	return 0	460	return 0
461	fi	461	fi
462	einfo "Adding user '${euser}' to your system ..."	462	einfo "Adding user '${euser}' to your system ..."
463		463
464	# options to pass to useradd	464	# options to pass to useradd
465	local opts=	465	local opts=
466		466
467	# handle uid	467	# handle uid
468	local euid=$1; shift	468	local euid=$1; shift
469	if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then	469	if [[ -n ${euid} && ${euid} != -1 ]] ; then
470	if [[ ${euid} -gt 0 ]] ; then	470	if [[ ${euid} -gt 0 ]] ; then
471	if [[ ! -z $(egetent passwd ${euid}) ]] ; then	471	if [[ -n $(egetent passwd ${euid}) ]] ; then
472	euid="next"	472	euid="next"
473	fi	473	fi
474	else	474	else
475	eerror "Userid given but is not greater than 0 !"	475	eerror "Userid given but is not greater than 0 !"
476	die "${euid} is not a valid UID"	476	die "${euid} is not a valid UID"
477	fi	477	fi
478	else	478	else
479	euid="next"	479	euid="next"
480	fi	480	fi
481	if [[ ${euid} == "next" ]] ; then	481	if [[ ${euid} == "next" ]] ; then
482	for euid in $(seq 101 999) ; do	482	for ((euid = 101; euid <= 999; euid++)); do
483	[[ -z $(egetent passwd ${euid}) ]] && break	483	[[ -z $(egetent passwd ${euid}) ]] && break
484	done	484	done
485	fi	485	fi
486	opts="${opts} -u ${euid}"	486	opts="${opts} -u ${euid}"
487	einfo " - Userid: ${euid}"	487	einfo " - Userid: ${euid}"
488		488
489	# handle shell	489	# handle shell
490	local eshell=$1; shift	490	local eshell=$1; shift
491	if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then	491	if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
492	if [[ ! -e ${eshell} ]] ; then	492	if [[ ! -e ${ROOT}${eshell} ]] ; then
493	eerror "A shell was specified but it does not exist !"	493	eerror "A shell was specified but it does not exist !"
494	die "${eshell} does not exist"	494	die "${eshell} does not exist in ${ROOT}"
		495	fi
		496	if [[ ${eshell} == /false \|\| ${eshell} == /nologin ]] ; then
		497	eerror "Do not specify ${eshell} yourself, use -1"
		498	die "Pass '-1' as the shell parameter"
495	fi	499	fi
496	else	500	else
		501	for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
		502	[[ -x ${ROOT}${shell} ]] && break
		503	done
		504
		505	if [[ ${shell} == "/dev/null" ]] ; then
		506	eerror "Unable to identify the shell to use, proceeding with userland default."
497	case ${USERLAND} in	507	case ${USERLAND} in
498	Darwin) eshell="/usr/bin/false";;	508	GNU) shell="/bin/false" ;;
499	BSD) eshell="/usr/sbin/nologin";;	509	BSD) shell="/sbin/nologin" ;;
500	*) eshell="/bin/false";;	510	Darwin) shell="/usr/sbin/nologin" ;;
		511	*) die "Unable to identify the default shell for userland ${USERLAND}"
501	esac	512	esac
		513	fi
		514
		515	eshell=${shell}
502	fi	516	fi
503	einfo " - Shell: ${eshell}"	517	einfo " - Shell: ${eshell}"
504	opts="${opts} -s ${eshell}"	518	opts="${opts} -s ${eshell}"
505		519
506	# handle homedir	520	# handle homedir
…		…
543	einfo " - Groups: ${egroups}"	557	einfo " - Groups: ${egroups}"
544		558
545	# handle extra and add the user	559	# handle extra and add the user
546	local oldsandbox=${SANDBOX_ON}	560	local oldsandbox=${SANDBOX_ON}
547	export SANDBOX_ON="0"	561	export SANDBOX_ON="0"
548	case ${USERLAND} in	562	case ${CHOST} in
549	Darwin)	563	-darwin)
550	### Make the user	564	### Make the user
551	if [[ -z $@ ]] ; then	565	if [[ -z $@ ]] ; then
552	dscl . create /users/${euser} uid ${euid}	566	dscl . create /users/${euser} uid ${euid}
553	dscl . create /users/${euser} shell ${eshell}	567	dscl . create /users/${euser} shell ${eshell}
554	dscl . create /users/${euser} home ${ehome}	568	dscl . create /users/${euser} home ${ehome}
…		…
565	einfo "Please report the ebuild along with the info below"	579	einfo "Please report the ebuild along with the info below"
566	einfo "eextra: $@"	580	einfo "eextra: $@"
567	die "Required function missing"	581	die "Required function missing"
568	fi	582	fi
569	;;	583	;;
570	BSD)	584	-freebsd\|-dragonfly)
571	if [[ -z $@ ]] ; then	585	if [[ -z $@ ]] ; then
572	pw useradd ${euser} ${opts} \	586	pw useradd ${euser} ${opts} \
573	-c "added by portage for ${PN}" \	587	-c "added by portage for ${PN}" \
574	die "enewuser failed"	588	die "enewuser failed"
575	else	589	else
576	einfo " - Extra: $@"	590	einfo " - Extra: $@"
577	pw useradd ${euser} ${opts} \	591	pw useradd ${euser} ${opts} \
578	"$@" \|\| die "enewuser failed"	592	"$@" \|\| die "enewuser failed"
579	fi	593	fi
580	;;	594	;;
		595
		596	-netbsd)
		597	if [[ -z $@ ]] ; then
		598	useradd ${opts} ${euser} \|\| die "enewuser failed"
		599	else
		600	einfo " - Extra: $@"
		601	useradd ${opts} ${euser} "$@" \|\| die "enewuser failed"
		602	fi
		603	;;
		604
		605	-openbsd)
		606	if [[ -z $@ ]] ; then
		607	useradd -u ${euid} -s ${eshell} \
		608	-d ${ehome} -c "Added by portage for ${PN}" \
		609	-g ${egroups} ${euser} \|\| die "enewuser failed"
		610	else
		611	einfo " - Extra: $@"
		612	useradd -u ${euid} -s ${eshell} \
		613	-d ${ehome} -c "Added by portage for ${PN}" \
		614	-g ${egroups} ${euser} "$@" \|\| die "enewuser failed"
		615	fi
		616	;;
		617
581	*)	618	*)
582	if [[ -z $@ ]] ; then	619	if [[ -z $@ ]] ; then
583	useradd ${opts} ${euser} \	620	useradd ${opts} ${euser} \
584	-c "added by portage for ${PN}" \	621	-c "added by portage for ${PN}" \
585	\|\| die "enewuser failed"	622	\|\| die "enewuser failed"
…		…
609	# Default values if you do not specify any:	646	# Default values if you do not specify any:
610	# groupname: REQUIRED !	647	# groupname: REQUIRED !
611	# gid: next available (see groupadd(8))	648	# gid: next available (see groupadd(8))
612	# extra: none	649	# extra: none
613	enewgroup() {	650	enewgroup() {
		651	case ${EBUILD_PHASE} in
		652	unpack\|compile\|test\|install)
		653	eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
		654	eerror "Package fails at QA and at life. Please file a bug."
		655	die "Bad package! enewgroup is only for use in pkg_* functions!"
		656	esac
		657
614	# get the group	658	# get the group
615	local egroup="$1"; shift	659	local egroup="$1"; shift
616	if [ -z "${egroup}" ]	660	if [ -z "${egroup}" ]
617	then	661	then
618	eerror "No group specified !"	662	eerror "No group specified !"
619	die "Cannot call enewgroup without a group"	663	die "Cannot call enewgroup without a group"
620	fi	664	fi
621		665
622	# see if group already exists	666	# see if group already exists
623	if [ "${egroup}" == "`egetent group \"${egroup}\" \| cut -d: -f1`" ]	667	if [[ -n $(egetent group "${egroup}") ]]; then
624	then
625	return 0	668	return 0
626	fi	669	fi
627	einfo "Adding group '${egroup}' to your system ..."	670	einfo "Adding group '${egroup}' to your system ..."
628		671
629	# options to pass to useradd	672	# options to pass to useradd
…		…
635	then	678	then
636	if [ "${egid}" -gt 0 ]	679	if [ "${egid}" -gt 0 ]
637	then	680	then
638	if [ -z "`egetent group ${egid}`" ]	681	if [ -z "`egetent group ${egid}`" ]
639	then	682	then
640	if [[ "${USERLAND}" == "Darwin" ]]; then	683	if [[ "${CHOST}" == -darwin ]]; then
641	opts="${opts} ${egid}"	684	opts="${opts} ${egid}"
642	else	685	else
643	opts="${opts} -g ${egid}"	686	opts="${opts} -g ${egid}"
644	fi	687	fi
645	else	688	else
…		…
659	opts="${opts} ${eextra}"	702	opts="${opts} ${eextra}"
660		703
661	# add the group	704	# add the group
662	local oldsandbox="${SANDBOX_ON}"	705	local oldsandbox="${SANDBOX_ON}"
663	export SANDBOX_ON="0"	706	export SANDBOX_ON="0"
664	if [[ "${USERLAND}" == "Darwin" ]]; then	707	case ${CHOST} in
		708	-darwin)
665	if [ ! -z "${eextra}" ];	709	if [ ! -z "${eextra}" ];
666	then	710	then
667	einfo "Extra options are not supported on Darwin/OS X yet"	711	einfo "Extra options are not supported on Darwin/OS X yet"
668	einfo "Please report the ebuild along with the info below"	712	einfo "Please report the ebuild along with the info below"
669	einfo "eextra: ${eextra}"	713	einfo "eextra: ${eextra}"
670	die "Required function missing"	714	die "Required function missing"
671	fi	715	fi
672		716
673	# If we need the next available	717	# If we need the next available
674	case ${egid} in	718	case ${egid} in
675	[!0-9]) # Non numeric	719	[!0-9]) # Non numeric
676	for egid in $(seq 101 999); do	720	for ((egid = 101; egid <= 999; egid++)); do
677	[ -z "`egetent group ${egid}`" ] && break	721	[[ -z $(egetent group ${egid}) ]] && break
678	done	722	done
679	esac	723	esac
680	dscl . create /groups/${egroup} gid ${egid}	724	dscl . create /groups/${egroup} gid ${egid}
681	dscl . create /groups/${egroup} passwd '*'	725	dscl . create /groups/${egroup} passwd '*'
682	elif [[ "${USERLAND}" == "BSD" ]] ; then	726	;;
		727
		728	-freebsd\|-dragonfly)
683	case ${egid} in	729	case ${egid} in
684	[!0-9]) # Non numeric	730	[!0-9]) # Non numeric
685	for egid in $(seq 101 999); do	731	for ((egid = 101; egid <= 999; egid++)); do
686	[ -z "`egetent group ${egid}`" ] && break	732	[[ -z $(egetent group ${egid}) ]] && break
687	done	733	done
688	esac	734	esac
689	pw groupadd ${egroup} -g ${egid} \|\| die "enewgroup failed"	735	pw groupadd ${egroup} -g ${egid} \|\| die "enewgroup failed"
690	else	736	;;
		737
		738	-netbsd)
		739	case ${egid} in
		740	[!0-9]) # Non numeric
		741	for ((egid = 101; egid <= 999; egid++)); do
		742	[[ -z $(egetent group ${egid}) ]] && break
		743	done
		744	esac
		745	groupadd -g ${egid} ${egroup} \|\| die "enewgroup failed"
		746	;;
		747
		748	*)
691	groupadd ${opts} ${egroup} \|\| die "enewgroup failed"	749	groupadd ${opts} ${egroup} \|\| die "enewgroup failed"
692	fi	750	;;
		751	esac
693	export SANDBOX_ON="${oldsandbox}"	752	export SANDBOX_ON="${oldsandbox}"
694	}	753	}
695		754
696	# Simple script to replace 'dos2unix' binaries	755	# Simple script to replace 'dos2unix' binaries
697	# vapier@gentoo.org	756	# vapier@gentoo.org
698	#	757	#
699	# edos2unix(file, <more files> ...)	758	# edos2unix(file, <more files> ...)
700	edos2unix() {	759	edos2unix() {
701	for f in "$@"	760	echo "$@" \| xargs sed -i 's/\r$//'
702	do
703	cp "${f}" ${T}/edos2unix
704	sed 's/\r$//' ${T}/edos2unix > "${f}"
705	done
706	}	761	}
707		762
708		763
709	##############################################################	764	##############################################################
710	# START: Handle .desktop files and menu entries #	765	# START: Handle .desktop files and menu entries #
711	# maybe this should be separated into a new eclass some time #	766	# maybe this should be separated into a new eclass some time #
712	# lanius@gentoo.org #	767	# lanius@gentoo.org #
713	##############################################################	768	##############################################################
714		769
715	# Make a desktop file !	770	# Make a desktop file !
716	# Great for making those icons in kde/gnome startmenu !	771	# Great for making those icons in kde/gnome startmenu !
717	# Amaze your friends ! Get the women ! Join today !	772	# Amaze your friends ! Get the women ! Join today !
718	#	773	#
719	# make_desktop_entry(<binary>, [name], [icon], [type], [path])	774	# make_desktop_entry(<command>, [name], [icon], [type], [path])
720	#	775	#
721	# binary: what binary does the app run with ?	776	# binary: what command does the app run with ?
722	# name: the name that will show up in the menu	777	# name: the name that will show up in the menu
723	# icon: give your little like a pretty little icon ...	778	# icon: give your little like a pretty little icon ...
724	# this can be relative (to /usr/share/pixmaps) or	779	# this can be relative (to /usr/share/pixmaps) or
725	# a full path to an icon	780	# a full path to an icon
726	# type: what kind of application is this ? for categories:	781	# type: what kind of application is this ? for categories:
727	# http://www.freedesktop.org/Standards/desktop-entry-spec	782	# http://www.freedesktop.org/Standards/desktop-entry-spec
728	# path: if your app needs to startup in a specific dir	783	# path: if your app needs to startup in a specific dir
729	make_desktop_entry() {	784	make_desktop_entry() {
730	[[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1	785	[[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
731		786
…		…
739	local catmaj=${CATEGORY%%-*}	794	local catmaj=${CATEGORY%%-*}
740	local catmin=${CATEGORY##*-}	795	local catmin=${CATEGORY##*-}
741	case ${catmaj} in	796	case ${catmaj} in
742	app)	797	app)
743	case ${catmin} in	798	case ${catmin} in
744	admin) type=System;;	799	admin) type=System;;
745	cdr) type=DiscBurning;;	800	cdr) type=DiscBurning;;
746	dicts) type=Dictionary;;	801	dicts) type=Dictionary;;
747	editors) type=TextEditor;;	802	editors) type=TextEditor;;
748	emacs) type=TextEditor;;	803	emacs) type=TextEditor;;
749	emulation) type=Emulator;;	804	emulation) type=Emulator;;
750	laptop) type=HardwareSettings;;	805	laptop) type=HardwareSettings;;
751	office) type=Office;;	806	office) type=Office;;
752	vim) type=TextEditor;;	807	vim) type=TextEditor;;
753	xemacs) type=TextEditor;;	808	xemacs) type=TextEditor;;
754	*) type=;;	809	*) type=;;
755	esac	810	esac
756	;;	811	;;
757		812
758	dev)	813	dev)
759	type="Development"	814	type="Development"
760	;;	815	;;
761		816
762	games)	817	games)
763	case ${catmin} in	818	case ${catmin} in
764	action) type=ActionGame;;	819	action\|fps) type=ActionGame;;
765	arcade) type=ArcadeGame;;	820	arcade) type=ArcadeGame;;
766	board) type=BoardGame;;	821	board) type=BoardGame;;
767	kid) type=KidsGame;;	822	kids) type=KidsGame;;
768	emulation) type=Emulator;;	823	emulation) type=Emulator;;
769	puzzle) type=LogicGame;;	824	puzzle) type=LogicGame;;
770	rpg) type=RolePlaying;;	825	rpg) type=RolePlaying;;
771	roguelike) type=RolePlaying;;	826	roguelike) type=RolePlaying;;
772	simulation) type=Simulation;;	827	simulation) type=Simulation;;
773	sports) type=SportsGame;;	828	sports) type=SportsGame;;
774	strategy) type=StrategyGame;;	829	strategy) type=StrategyGame;;
775	*) type=;;	830	*) type=;;
776	esac	831	esac
777	type="Game;${type}"	832	type="Game;${type}"
778	;;	833	;;
779		834
780	mail)	835	mail)
…		…
784	media)	839	media)
785	case ${catmin} in	840	case ${catmin} in
786	gfx) type=Graphics;;	841	gfx) type=Graphics;;
787	radio) type=Tuner;;	842	radio) type=Tuner;;
788	sound) type=Audio;;	843	sound) type=Audio;;
789	tv) type=TV;;	844	tv) type=TV;;
790	video) type=Video;;	845	video) type=Video;;
791	*) type=;;	846	*) type=;;
792	esac	847	esac
793	type="AudioVideo;${type}"	848	type="AudioVideo;${type}"
794	;;	849	;;
795		850
796	net)	851	net)
797	case ${catmin} in	852	case ${catmin} in
798	dialup) type=Dialup;;	853	dialup) type=Dialup;;
799	ftp) type=FileTransfer;;	854	ftp) type=FileTransfer;;
800	im) type=InstantMessaging;;	855	im) type=InstantMessaging;;
801	irc) type=IRCClient;;	856	irc) type=IRCClient;;
802	mail) type=Email;;	857	mail) type=Email;;
803	news) type=News;;	858	news) type=News;;
804	nntp) type=News;;	859	nntp) type=News;;
805	p2p) type=FileTransfer;;	860	p2p) type=FileTransfer;;
806	*) type=;;	861	*) type=;;
807	esac	862	esac
808	type="Network;${type}"	863	type="Network;${type}"
809	;;	864	;;
810		865
811	sci)	866	sci)
812	case ${catmin} in	867	case ${catmin} in
813	astro*) type=Astronomoy;;	868	astro*) type=Astronomy;;
814	bio*) type=Biology;;	869	bio*) type=Biology;;
815	calc*) type=Calculator;;	870	calc*) type=Calculator;;
816	chem*) type=Chemistry;;	871	chem*) type=Chemistry;;
817	geo*) type=Geology;;	872	geo*) type=Geology;;
818	math*) type=Math;;	873	math*) type=Math;;
819	*) type=;;	874	*) type=;;
820	esac	875	esac
821	type="Science;${type}"	876	type="Science;${type}"
822	;;	877	;;
823		878
824	www)	879	www)
825	case ${catmin} in	880	case ${catmin} in
826	client) type=WebBrowser;;	881	client) type=WebBrowser;;
827	*) type=;;	882	*) type=;;
828	esac	883	esac
829	type="Network"	884	type="Network"
830	;;	885	;;
831		886
832	*)	887	*)
…		…
837	if [ "${SLOT}" == "0" ] ; then	892	if [ "${SLOT}" == "0" ] ; then
838	local desktop_name="${PN}"	893	local desktop_name="${PN}"
839	else	894	else
840	local desktop_name="${PN}-${SLOT}"	895	local desktop_name="${PN}-${SLOT}"
841	fi	896	fi
		897	local desktop="${T}/$(echo ${exec} \| sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
842	local desktop=${T}/${exec%% *}-${desktop_name}.desktop	898	#local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
843		899
		900	cat <<-EOF > "${desktop}"
844	echo "[Desktop Entry]	901	[Desktop Entry]
845	Encoding=UTF-8	902	Encoding=UTF-8
846	Version=0.9.2	903	Version=0.9.2
847	Name=${name}	904	Name=${name}
848	Type=Application	905	Type=Application
849	Comment=${DESCRIPTION}	906	Comment=${DESCRIPTION}
850	Exec=${exec}	907	Exec=${exec}
		908	TryExec=${exec%% *}
851	Path=${path}	909	Path=${path}
852	Icon=${icon}	910	Icon=${icon}
853	Categories=Application;${type};" > "${desktop}"	911	Categories=Application;${type};
		912	EOF
854		913
		914	(
		915	# wrap the env here so that the 'insinto' call
		916	# doesn't corrupt the env of the caller
855	insinto /usr/share/applications	917	insinto /usr/share/applications
856	doins "${desktop}"	918	doins "${desktop}"
857		919	)
858	return 0
859	}	920	}
		921
		922
		923	# Validate desktop entries using desktop-file-utils
		924	# Carsten Lohrke <carlo@gentoo.org>
		925	#
		926	# Usage: validate_desktop_entries [directory ...]
		927
		928	validate_desktop_entries() {
		929	if [[ -x /usr/bin/desktop-file-validate ]] ; then
		930	einfo "Checking desktop entry validity"
		931	local directories=""
		932	for d in /usr/share/applications $@ ; do
		933	[[ -d ${D}${d} ]] && directories="${directories} ${D}${d}"
		934	done
		935	if [[ -n ${directories} ]] ; then
		936	for FILE in $(find ${directories} -name "*\.desktop" \
		937	-not -path '.hidden' \| sort -u 2>/dev/null)
		938	do
		939	local temp=$(desktop-file-validate ${FILE} \| grep -v "warning:" \| \
		940	sed -e "s\|error: \|\|" -e "s\|${FILE}:\|--\|g" )
		941	[[ -n $temp ]] && elog ${temp/--/${FILE/${D}/}:}
		942	done
		943	fi
		944	echo ""
		945	else
		946	einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
		947	fi
		948	}
		949
860		950
861	# Make a GDM/KDM Session file	951	# Make a GDM/KDM Session file
862	#	952	#
863	# make_desktop_entry(<title>, <command>)	953	# make_session_desktop(<title>, <command>)
864	# title: File to execute to start the Window Manager	954	# title: File to execute to start the Window Manager
865	# command: Name of the Window Manager	955	# command: Name of the Window Manager
866		956
867	make_session_desktop() {	957	make_session_desktop() {
868	[[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1	958	[[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
…		…
870		960
871	local title=$1	961	local title=$1
872	local command=$2	962	local command=$2
873	local desktop=${T}/${wm}.desktop	963	local desktop=${T}/${wm}.desktop
874		964
		965	cat <<-EOF > "${desktop}"
875	echo "[Desktop Entry]	966	[Desktop Entry]
876	Encoding=UTF-8	967	Encoding=UTF-8
877	Name=${title}	968	Name=${title}
878	Comment=This session logs you into ${title}	969	Comment=This session logs you into ${title}
879	Exec=${command}	970	Exec=${command}
880	TryExec=${command}	971	TryExec=${command}
881	Type=Application" > "${desktop}"	972	Type=Application
		973	EOF
882		974
		975	(
		976	# wrap the env here so that the 'insinto' call
		977	# doesn't corrupt the env of the caller
883	insinto /usr/share/xsessions	978	insinto /usr/share/xsessions
884	doins "${desktop}"	979	doins "${desktop}"
		980	)
885	}	981	}
886		982
887	domenu() {	983	domenu() {
		984	(
		985	# wrap the env here so that the 'insinto' call
		986	# doesn't corrupt the env of the caller
888	local i j	987	local i j ret=0
889	insinto /usr/share/applications	988	insinto /usr/share/applications
890	for i in "$@" ; do	989	for i in "$@" ; do
891	if [[ -f ${i} ]] ; then	990	if [[ -f ${i} ]] ; then
892	doins "${i}"	991	doins "${i}"
		992	((ret+=$?))
893	elif [[ -d ${i} ]] ; then	993	elif [[ -d ${i} ]] ; then
894	for j in "${i}"/*.desktop ; do	994	for j in "${i}"/*.desktop ; do
895	doins "${j}"	995	doins "${j}"
		996	((ret+=$?))
896	done	997	done
897	fi	998	fi
898	done	999	done
		1000	exit ${ret}
		1001	)
899	}	1002	}
900	newmenu() {	1003	newmenu() {
		1004	(
		1005	# wrap the env here so that the 'insinto' call
		1006	# doesn't corrupt the env of the caller
901	insinto /usr/share/applications	1007	insinto /usr/share/applications
902	newins "$1" "$2"	1008	newins "$@"
		1009	)
903	}	1010	}
904		1011
905	doicon() {	1012	doicon() {
		1013	(
		1014	# wrap the env here so that the 'insinto' call
		1015	# doesn't corrupt the env of the caller
906	local i j	1016	local i j ret
907	insinto /usr/share/pixmaps	1017	insinto /usr/share/pixmaps
908	for i in "$@" ; do	1018	for i in "$@" ; do
909	if [[ -f ${i} ]] ; then	1019	if [[ -f ${i} ]] ; then
910	doins "${i}"	1020	doins "${i}"
		1021	((ret+=$?))
911	elif [[ -d ${i} ]] ; then	1022	elif [[ -d ${i} ]] ; then
912	for j in "${i}"/*.png ; do	1023	for j in "${i}"/*.png ; do
913	doins "${j}"	1024	doins "${j}"
		1025	((ret+=$?))
914	done	1026	done
915	fi	1027	fi
916	done	1028	done
		1029	exit ${ret}
		1030	)
917	}	1031	}
918	newicon() {	1032	newicon() {
		1033	(
		1034	# wrap the env here so that the 'insinto' call
		1035	# doesn't corrupt the env of the caller
919	insinto /usr/share/pixmaps	1036	insinto /usr/share/pixmaps
920	newins "$1" "$2"	1037	newins "$@"
		1038	)
921	}	1039	}
922		1040
923	##############################################################	1041	##############################################################
924	# END: Handle .desktop files and menu entries #	1042	# END: Handle .desktop files and menu entries #
925	##############################################################	1043	##############################################################
926		1044
927		1045
928	# for internal use only (unpack_pdv and unpack_makeself)	1046	# for internal use only (unpack_pdv and unpack_makeself)
929	find_unpackable_file() {	1047	find_unpackable_file() {
…		…
948	# the middle of the archive. Valve seems to use it a lot ... too bad	1066	# the middle of the archive. Valve seems to use it a lot ... too bad
949	# it seems to like to segfault a lot :(. So lets take it apart ourselves.	1067	# it seems to like to segfault a lot :(. So lets take it apart ourselves.
950	#	1068	#
951	# Usage: unpack_pdv [file to unpack] [size of off_t]	1069	# Usage: unpack_pdv [file to unpack] [size of off_t]
952	# - you have to specify the off_t size ... i have no idea how to extract that	1070	# - you have to specify the off_t size ... i have no idea how to extract that
953	# information out of the binary executable myself. basically you pass in	1071	# information out of the binary executable myself. basically you pass in
954	# the size of the off_t type (in bytes) on the machine that built the pdv	1072	# the size of the off_t type (in bytes) on the machine that built the pdv
955	# archive. one way to determine this is by running the following commands:	1073	# archive. one way to determine this is by running the following commands:
956	# strings <pdv archive> \| grep lseek	1074	# strings <pdv archive> \| grep lseek
957	# strace -elseek <pdv archive>	1075	# strace -elseek <pdv archive>
958	# basically look for the first lseek command (we do the strings/grep because	1076	# basically look for the first lseek command (we do the strings/grep because
959	# sometimes the function call is _llseek or something) and steal the 2nd	1077	# sometimes the function call is _llseek or something) and steal the 2nd
960	# parameter. here is an example:	1078	# parameter. here is an example:
961	# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin \| grep lseek	1079	# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin \| grep lseek
962	# lseek	1080	# lseek
963	# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin	1081	# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
964	# lseek(3, -4, SEEK_END) = 2981250	1082	# lseek(3, -4, SEEK_END) = 2981250
965	# thus we would pass in the value of '4' as the second parameter.	1083	# thus we would pass in the value of '4' as the second parameter.
966	unpack_pdv() {	1084	unpack_pdv() {
967	local src=$(find_unpackable_file $1)	1085	local src=$(find_unpackable_file "$1")
968	local sizeoff_t=$2	1086	local sizeoff_t=$2
969		1087
970	[[ -z ${src} ]] && die "Could not locate source for '$1'"	1088	[[ -z ${src} ]] && die "Could not locate source for '$1'"
971	[[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("	1089	[[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
972		1090
973	local shrtsrc="`basename ${src}`"	1091	local shrtsrc=$(basename "${src}")
974	echo ">>> Unpacking ${shrtsrc} to ${PWD}"	1092	echo ">>> Unpacking ${shrtsrc} to ${PWD}"
975	local metaskip=`tail -c ${sizeoff_t} ${src} \| hexdump -e \"%i\"`	1093	local metaskip=$(tail -c ${sizeoff_t} "${src}" \| hexdump -e \"%i\")
976	local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} \| head -c ${sizeoff_t} \| hexdump -e \"%i\"`	1094	local tailskip=$(tail -c $((${sizeoff_t}*2)) "${src}" \| head -c ${sizeoff_t} \| hexdump -e \"%i\")
977		1095
978	# grab metadata for debug reasons	1096	# grab metadata for debug reasons
979	local metafile="$(emktemp)"	1097	local metafile=$(emktemp)
980	tail -c +$((${metaskip}+1)) ${src} > ${metafile}	1098	tail -c +$((${metaskip}+1)) "${src}" > "${metafile}"
981		1099
982	# rip out the final file name from the metadata	1100	# rip out the final file name from the metadata
983	local datafile="`tail -c +$((${metaskip}+1)) ${src} \| strings \| head -n 1`"	1101	local datafile=$(tail -c +$((${metaskip}+1)) "${src}" \| strings \| head -n 1)
984	datafile="`basename ${datafile}`"	1102	datafile=$(basename "${datafile}")
985		1103
986	# now lets uncompress/untar the file if need be	1104	# now lets uncompress/untar the file if need be
987	local tmpfile="$(emktemp)"	1105	local tmpfile=$(emktemp)
988	tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \| head -c 512 > ${tmpfile}	1106	tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \| head -c 512 > ${tmpfile}
989		1107
990	local iscompressed="`file -b ${tmpfile}`"	1108	local iscompressed=$(file -b "${tmpfile}")
991	if [ "${iscompressed:0:8}" == "compress" ] ; then	1109	if [[ ${iscompressed:0:8} == "compress" ]] ; then
992	iscompressed=1	1110	iscompressed=1
993	mv ${tmpfile}{,.Z}	1111	mv ${tmpfile}{,.Z}
994	gunzip ${tmpfile}	1112	gunzip ${tmpfile}
995	else	1113	else
996	iscompressed=0	1114	iscompressed=0
997	fi	1115	fi
998	local istar="`file -b ${tmpfile}`"	1116	local istar=$(file -b "${tmpfile}")
999	if [ "${istar:0:9}" == "POSIX tar" ] ; then	1117	if [[ ${istar:0:9} == "POSIX tar" ]] ; then
1000	istar=1	1118	istar=1
1001	else	1119	else
1002	istar=0	1120	istar=0
1003	fi	1121	fi
1004		1122
…		…
1040	# many other game companies.	1158	# many other game companies.
1041	#	1159	#
1042	# Usage: unpack_makeself [file to unpack] [offset] [tail\|dd]	1160	# Usage: unpack_makeself [file to unpack] [offset] [tail\|dd]
1043	# - If the file is not specified then unpack will utilize ${A}.	1161	# - If the file is not specified then unpack will utilize ${A}.
1044	# - If the offset is not specified then we will attempt to extract	1162	# - If the offset is not specified then we will attempt to extract
1045	# the proper offset from the script itself.	1163	# the proper offset from the script itself.
1046	unpack_makeself() {	1164	unpack_makeself() {
		1165	local src_input=${1:-${A}}
1047	local src=$(find_unpackable_file "$1")	1166	local src=$(find_unpackable_file "${src_input}")
1048	local skip=$2	1167	local skip=$2
1049	local exe=$3	1168	local exe=$3
1050		1169
1051	[[ -z ${src} ]] && die "Could not locate source for '$1'"	1170	[[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1052		1171
1053	local shrtsrc=$(basename "${src}")	1172	local shrtsrc=$(basename "${src}")
1054	echo ">>> Unpacking ${shrtsrc} to ${PWD}"	1173	echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1055	if [ -z "${skip}" ]	1174	if [[ -z ${skip} ]] ; then
1056	then
1057	local ver="`grep -a '#.*Makeself' ${src} \| awk '{print $NF}'`"	1175	local ver=$(grep -a '#.*Makeself' "${src}" \| awk '{print $NF}')
1058	local skip=0	1176	local skip=0
1059	exe=tail	1177	exe=tail
1060	case ${ver} in	1178	case ${ver} in
1061	1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same	1179	1.5.*\|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1062	skip=$(grep -a ^skip= "${src}" \| cut -d= -f2)	1180	skip=$(grep -a ^skip= "${src}" \| cut -d= -f2)
1063	;;	1181	;;
1064	2.0\|2.0.1)	1182	2.0\|2.0.1)
1065	skip=$(grep -a ^$'\t'tail "${src}" \| awk '{print $2}' \| cut -b2-)	1183	skip=$(grep -a ^$'\t'tail "${src}" \| awk '{print $2}' \| cut -b2-)
1066	;;	1184	;;
…		…
1074	;;	1192	;;
1075	2.1.3)	1193	2.1.3)
1076	skip=`grep -a ^offset= "${src}" \| awk '{print $3}'`	1194	skip=`grep -a ^offset= "${src}" \| awk '{print $3}'`
1077	let skip="skip + 1"	1195	let skip="skip + 1"
1078	;;	1196	;;
1079	2.1.4)	1197	2.1.4\|2.1.5)
1080	skip=$(grep -a offset=.head.wc "${src}" \| awk '{print $3}' \| head -n 1)	1198	skip=$(grep -a offset=.head.wc "${src}" \| awk '{print $3}' \| head -n 1)
1081	skip=$(head -n ${skip} "${src}" \| wc -c)	1199	skip=$(head -n ${skip} "${src}" \| wc -c)
1082	exe="dd"	1200	exe="dd"
1083	;;	1201	;;
1084	*)	1202	*)
…		…
1096	dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;	1214	dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1097	*) die "makeself cant handle exe '${exe}'"	1215	*) die "makeself cant handle exe '${exe}'"
1098	esac	1216	esac
1099		1217
1100	# lets grab the first few bytes of the file to figure out what kind of archive it is	1218	# lets grab the first few bytes of the file to figure out what kind of archive it is
1101	local tmpfile="$(emktemp)"	1219	local tmpfile=$(emktemp)
1102	eval ${exe} 2>/dev/null \| head -c 512 > "${tmpfile}"	1220	eval ${exe} 2>/dev/null \| head -c 512 > "${tmpfile}"
1103	local filetype="$(file -b "${tmpfile}")"	1221	local filetype=$(file -b "${tmpfile}")
1104	case ${filetype} in	1222	case ${filetype} in
1105	*tar\ archive)	1223	tar\ archive)
1106	eval ${exe} \| tar --no-same-owner -xf -	1224	eval ${exe} \| tar --no-same-owner -xf -
1107	;;	1225	;;
1108	bzip2*)	1226	bzip2*)
1109	eval ${exe} \| bzip2 -dc \| tar --no-same-owner -xf -	1227	eval ${exe} \| bzip2 -dc \| tar --no-same-owner -xf -
1110	;;	1228	;;
…		…
1129	check_license() {	1247	check_license() {
1130	local lic=$1	1248	local lic=$1
1131	if [ -z "${lic}" ] ; then	1249	if [ -z "${lic}" ] ; then
1132	lic="${PORTDIR}/licenses/${LICENSE}"	1250	lic="${PORTDIR}/licenses/${LICENSE}"
1133	else	1251	else
1134	if [ -e "${PORTDIR}/licenses/${src}" ] ; then	1252	if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1135	lic="${PORTDIR}/licenses/${src}"	1253	lic="${PORTDIR}/licenses/${lic}"
1136	elif [ -e "${PWD}/${src}" ] ; then	1254	elif [ -e "${PWD}/${lic}" ] ; then
1137	lic="${PWD}/${src}"	1255	lic="${PWD}/${lic}"
1138	elif [ -e "${src}" ] ; then	1256	elif [ -e "${lic}" ] ; then
1139	lic="${src}"	1257	lic="${lic}"
1140	fi
1141	fi	1258	fi
		1259	fi
1142	[ ! -f "${lic}" ] && die "Could not find requested license ${src}"	1260	[ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1143	local l="`basename ${lic}`"	1261	local l="`basename ${lic}`"
1144		1262
1145	# here is where we check for the licenses the user already	1263	# here is where we check for the licenses the user already
1146	# accepted ... if we don't find a match, we make the user accept	1264	# accepted ... if we don't find a match, we make the user accept
1147	local shopts=$-	1265	local shopts=$-
1148	local alic	1266	local alic
1149	set -o noglob #so that bash doesn't expand "*"	1267	set -o noglob #so that bash doesn't expand "*"
1150	for alic in ${ACCEPT_LICENSE} ; do	1268	for alic in ${ACCEPT_LICENSE} ; do
1151	if [[ ${alic} == * \|\| ${alic} == ${l} ]]; then	1269	if [[ ${alic} == ${l} ]]; then
1152	set +o noglob; set -${shopts} #reset old shell opts	1270	set +o noglob; set -${shopts} #reset old shell opts
1153	return 0	1271	return 0
1154	fi	1272	fi
1155	done	1273	done
1156	set +o noglob; set -$shopts #reset old shell opts	1274	set +o noglob; set -$shopts #reset old shell opts
1157		1275
1158	local licmsg="$(emktemp)"	1276	local licmsg=$(emktemp)
1159	cat << EOF > ${licmsg}	1277	cat <<-EOF > ${licmsg}
1160	**********************************************************	1278	**********************************************************
1161	The following license outlines the terms of use of this	1279	The following license outlines the terms of use of this
1162	package. You MUST accept this license for installation to	1280	package. You MUST accept this license for installation to
1163	continue. When you are done viewing, hit 'q'. If you	1281	continue. When you are done viewing, hit 'q'. If you
1164	CTRL+C out of this, the install will not run!	1282	CTRL+C out of this, the install will not run!
1165	**********************************************************	1283	**********************************************************
1166		1284
1167	EOF	1285	EOF
1168	cat ${lic} >> ${licmsg}	1286	cat ${lic} >> ${licmsg}
1169	${PAGER:-less} ${licmsg} \|\| die "Could not execute pager (${PAGER}) to accept ${lic}"	1287	${PAGER:-less} ${licmsg} \|\| die "Could not execute pager (${PAGER}) to accept ${lic}"
1170	einfon "Do you accept the terms of this license (${l})? [yes/no] "	1288	einfon "Do you accept the terms of this license (${l})? [yes/no] "
1171	read alic	1289	read alic
1172	case ${alic} in	1290	case ${alic} in
…		…
1189	# and when the function returns, you can assume that the cd has been	1307	# and when the function returns, you can assume that the cd has been
1190	# found at CDROM_ROOT.	1308	# found at CDROM_ROOT.
1191	#	1309	#
1192	# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',	1310	# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1193	# etc... if you want to give the cds better names, then just export	1311	# etc... if you want to give the cds better names, then just export
1194	# the CDROM_NAME_X variables before calling cdrom_get_cds().	1312	# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
		1313	# - CDROM_NAME="fooie cd" - for when you only want 1 cd
		1314	# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
		1315	# CDROM_NAME_2="data cd"
		1316	# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1195	#	1317	#
1196	# for those multi cd ebuilds, see the cdrom_load_next_cd() below.	1318	# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1197	#	1319	#
1198	# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]	1320	# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1199	# - this will attempt to locate a cd based upon a file that is on	1321	# - this will attempt to locate a cd based upon a file that is on
1200	# the cd ... the more files you give this function, the more cds	1322	# the cd ... the more files you give this function, the more cds
1201	# the cdrom functions will handle	1323	# the cdrom functions will handle
1202	cdrom_get_cds() {	1324	cdrom_get_cds() {
1203	# first we figure out how many cds we're dealing with by	1325	# first we figure out how many cds we're dealing with by
1204	# the # of files they gave us	1326	# the # of files they gave us
1205	local cdcnt=0	1327	local cdcnt=0
1206	local f=	1328	local f=
1207	for f in "$@" ; do	1329	for f in "$@" ; do
1208	cdcnt=$((cdcnt + 1))	1330	((++cdcnt))
1209	export CDROM_CHECK_${cdcnt}="$f"	1331	export CDROM_CHECK_${cdcnt}="$f"
1210	done	1332	done
1211	export CDROM_TOTAL_CDS=${cdcnt}	1333	export CDROM_TOTAL_CDS=${cdcnt}
1212	export CDROM_CURRENT_CD=1	1334	export CDROM_CURRENT_CD=1
1213		1335
1214	# now we see if the user gave use CD_ROOT ...	1336	# now we see if the user gave use CD_ROOT ...
1215	# if they did, let's just believe them that it's correct	1337	# if they did, let's just believe them that it's correct
1216	if [[ ! -z ${CD_ROOT} ]] ; then
1217	export CDROM_ROOT=${CD_ROOT}
1218	einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1219	return
1220	fi
1221	# do the same for CD_ROOT_X
1222	if [[ ! -z ${CD_ROOT_1} ]] ; then	1338	if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1223	local var=	1339	local var=
1224	cdcnt=0	1340	cdcnt=0
1225	while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do	1341	while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1226	cdcnt=$((cdcnt + 1))	1342	((++cdcnt))
1227	var="CD_ROOT_${cdcnt}"	1343	var="CD_ROOT_${cdcnt}"
		1344	[[ -z ${!var} ]] && var="CD_ROOT"
1228	if [[ -z ${!var} ]] ; then	1345	if [[ -z ${!var} ]] ; then
1229	eerror "You must either use just the CD_ROOT"	1346	eerror "You must either use just the CD_ROOT"
1230	eerror "or specify ALL the CD_ROOT_X variables."	1347	eerror "or specify ALL the CD_ROOT_X variables."
1231	eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."	1348	eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1232	die "could not locate CD_ROOT_${cdcnt}"	1349	die "could not locate CD_ROOT_${cdcnt}"
1233	fi	1350	fi
1234	export CDROM_ROOTS_${cdcnt}="${!var}"
1235	done	1351	done
1236	export CDROM_ROOT=${CDROM_ROOTS_1}	1352	export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1237	einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"	1353	einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
		1354	export CDROM_SET=-1
		1355	for f in ${CDROM_CHECK_1//:/ } ; do
		1356	((++CDROM_SET))
		1357	[[ -e ${CD_ROOT}/${f} ]] && break
		1358	done
		1359	export CDROM_MATCH=${f}
1238	return	1360	return
1239	fi	1361	fi
1240		1362
		1363	# User didn't help us out so lets make sure they know they can
		1364	# simplify the whole process ...
1241	if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then	1365	if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1242	einfon "This ebuild will need the "	1366	einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1243	if [[ -z ${CDROM_NAME} ]] ; then
1244	echo "cdrom for ${PN}."
1245	else
1246	echo "${CDROM_NAME}."
1247	fi
1248	echo	1367	echo
1249	einfo "If you do not have the CD, but have the data files"	1368	einfo "If you do not have the CD, but have the data files"
1250	einfo "mounted somewhere on your filesystem, just export"	1369	einfo "mounted somewhere on your filesystem, just export"
1251	einfo "the variable CD_ROOT so that it points to the"	1370	einfo "the variable CD_ROOT so that it points to the"
1252	einfo "directory containing the files."	1371	einfo "directory containing the files."
1253	echo	1372	echo
1254	einfo "For example:"	1373	einfo "For example:"
1255	einfo "export CD_ROOT=/mnt/cdrom"	1374	einfo "export CD_ROOT=/mnt/cdrom"
1256	echo	1375	echo
1257	else	1376	else
		1377	if [[ -n ${CDROM_NAME_SET} ]] ; then
		1378	# Translate the CDROM_NAME_SET array into CDROM_NAME_#
		1379	cdcnt=0
		1380	while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
		1381	((++cdcnt))
		1382	export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
		1383	done
		1384	fi
		1385
1258	einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."	1386	einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1259	cdcnt=0	1387	cdcnt=0
1260	while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do	1388	while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1261	cdcnt=$((cdcnt + 1))	1389	((++cdcnt))
1262	var="CDROM_NAME_${cdcnt}"	1390	var="CDROM_NAME_${cdcnt}"
1263	[[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"	1391	[[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1264	done	1392	done
1265	echo	1393	echo
1266	einfo "If you do not have the CDs, but have the data files"	1394	einfo "If you do not have the CDs, but have the data files"
1267	einfo "mounted somewhere on your filesystem, just export"	1395	einfo "mounted somewhere on your filesystem, just export"
1268	einfo "the following variables so they point to the right place:"	1396	einfo "the following variables so they point to the right place:"
1269	einfon ""	1397	einfon ""
1270	cdcnt=0	1398	cdcnt=0
1271	while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do	1399	while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1272	cdcnt=$((cdcnt + 1))	1400	((++cdcnt))
1273	echo -n " CD_ROOT_${cdcnt}"	1401	echo -n " CD_ROOT_${cdcnt}"
1274	done	1402	done
1275	echo	1403	echo
1276	einfo "Or, if you have all the files in the same place, or"	1404	einfo "Or, if you have all the files in the same place, or"
1277	einfo "you only have one cdrom, you can export CD_ROOT"	1405	einfo "you only have one cdrom, you can export CD_ROOT"
…		…
1280	echo	1408	echo
1281	einfo "For example:"	1409	einfo "For example:"
1282	einfo "export CD_ROOT_1=/mnt/cdrom"	1410	einfo "export CD_ROOT_1=/mnt/cdrom"
1283	echo	1411	echo
1284	fi	1412	fi
		1413
		1414	export CDROM_SET=""
1285	export CDROM_CURRENT_CD=0	1415	export CDROM_CURRENT_CD=0
1286	cdrom_load_next_cd	1416	cdrom_load_next_cd
1287	}	1417	}
1288		1418
1289	# this is only used when you need access to more than one cd.	1419	# this is only used when you need access to more than one cd.
1290	# when you have finished using the first cd, just call this function.	1420	# when you have finished using the first cd, just call this function.
1291	# when it returns, CDROM_ROOT will be pointing to the second cd.	1421	# when it returns, CDROM_ROOT will be pointing to the second cd.
1292	# remember, you can only go forward in the cd chain, you can't go back.	1422	# remember, you can only go forward in the cd chain, you can't go back.
1293	cdrom_load_next_cd() {	1423	cdrom_load_next_cd() {
1294	export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1295	local var=	1424	local var
1296		1425	((++CDROM_CURRENT_CD))
1297	if [[ ! -z ${CD_ROOT} ]] ; then
1298	einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1299	return
1300	fi
1301		1426
1302	unset CDROM_ROOT	1427	unset CDROM_ROOT
1303	var=CDROM_ROOTS_${CDROM_CURRENT_CD}	1428	var=CD_ROOT_${CDROM_CURRENT_CD}
		1429	[[ -z ${!var} ]] && var="CD_ROOT"
1304	if [[ -z ${!var} ]] ; then	1430	if [[ -z ${!var} ]] ; then
1305	var="CDROM_CHECK_${CDROM_CURRENT_CD}"	1431	var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1306	cdrom_locate_file_on_cd ${!var}	1432	_cdrom_locate_file_on_cd ${!var}
1307	else	1433	else
1308	export CDROM_ROOT=${!var}	1434	export CDROM_ROOT=${!var}
1309	fi	1435	fi
1310		1436
1311	einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"	1437	einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
…		…
1316	# all it does is try to locate a give file on a cd ... if the cd isn't	1442	# all it does is try to locate a give file on a cd ... if the cd isn't
1317	# found, then a message asking for the user to insert the cdrom will be	1443	# found, then a message asking for the user to insert the cdrom will be
1318	# displayed and we'll hang out here until:	1444	# displayed and we'll hang out here until:
1319	# (1) the file is found on a mounted cdrom	1445	# (1) the file is found on a mounted cdrom
1320	# (2) the user hits CTRL+C	1446	# (2) the user hits CTRL+C
1321	cdrom_locate_file_on_cd() {	1447	_cdrom_locate_file_on_cd() {
		1448	local mline=""
		1449	local showedmsg=0
		1450
1322	while [[ -z ${CDROM_ROOT} ]] ; do	1451	while [[ -z ${CDROM_ROOT} ]] ; do
1323	local dir=$(dirname "$*")	1452	local i=0
		1453	local -a cdset=(${*//:/ })
		1454	if [[ -n ${CDROM_SET} ]] ; then
		1455	cdset=(${cdset[${CDROM_SET}]})
		1456	fi
		1457
		1458	while [[ -n ${cdset[${i}]} ]] ; do
		1459	local dir=$(dirname ${cdset[${i}]})
1324	local file=$(basename "$*")	1460	local file=$(basename ${cdset[${i}]})
1325	local mline=""
1326	local showedmsg=0
1327		1461
1328	for mline in $(mount \| egrep -e '(iso\|cdrom)' \| awk '{print $3}') ; do	1462	local point= node= fs= foo=
1329	[[ -d ${mline}/${dir} ]] \|\| continue	1463	while read point node fs foo ; do
		1464	[[ " cd9660 iso9660 " != " ${fs} " ]] && \
		1465	! [[ ${fs} == "subfs" && ",${opts}," == ",fs=cdfss," ]] \
		1466	&& continue
		1467	point=${point//\040/ }
1330	[[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \	1468	[[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1331	&& export CDROM_ROOT=${mline}	1469	export CDROM_ROOT=${point}
		1470	export CDROM_SET=${i}
		1471	export CDROM_MATCH=${cdset[${i}]}
		1472	return
		1473	done <<< "$(get_mounts)"
		1474
		1475	((++i))
1332	done	1476	done
1333		1477
1334	if [[ -z ${CDROM_ROOT} ]] ; then
1335	echo	1478	echo
1336	if [[ ${showedmsg} -eq 0 ]] ; then	1479	if [[ ${showedmsg} -eq 0 ]] ; then
1337	if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then	1480	if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1338	if [[ -z ${CDROM_NAME} ]] ; then	1481	if [[ -z ${CDROM_NAME} ]] ; then
1339	einfo "Please insert the cdrom for ${PN} now !"	1482	einfo "Please insert+mount the cdrom for ${PN} now !"
1340	else
1341	einfo "Please insert the ${CDROM_NAME} cdrom now !"
1342	fi
1343	else	1483	else
1344	if [[ -z ${CDROM_NAME_1} ]] ; then
1345	einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1346	else
1347	local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1348	einfo "Please insert+mount the ${!var} cdrom now !"	1484	einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1349	fi
1350	fi	1485	fi
1351	showedmsg=1	1486	else
		1487	if [[ -z ${CDROM_NAME_1} ]] ; then
		1488	einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
		1489	else
		1490	local var="CDROM_NAME_${CDROM_CURRENT_CD}"
		1491	einfo "Please insert+mount the ${!var} cdrom now !"
		1492	fi
1352	fi	1493	fi
		1494	showedmsg=1
		1495	fi
1353	einfo "Press return to scan for the cd again"	1496	einfo "Press return to scan for the cd again"
1354	einfo "or hit CTRL+C to abort the emerge."	1497	einfo "or hit CTRL+C to abort the emerge."
1355	echo	1498	echo
1356	einfo "If you are having trouble with the detection"	1499	einfo "If you are having trouble with the detection"
1357	einfo "of your CD, it is possible that you do not have"	1500	einfo "of your CD, it is possible that you do not have"
1358	einfo "Joliet support enabled in your kernel. Please"	1501	einfo "Joliet support enabled in your kernel. Please"
1359	einfo "check that CONFIG_JOLIET is enabled in your kernel."	1502	einfo "check that CONFIG_JOLIET is enabled in your kernel."
1360	read	1503	read \|\| die "something is screwed with your system"
1361	fi
1362	done	1504	done
1363	}	1505	}
1364		1506
1365	# Make sure that LINGUAS only contains languages that	1507	# Make sure that LINGUAS only contains languages that
1366	# a package can support	1508	# a package can support
1367	#	1509	#
1368	# usage: strip-linguas <allow LINGUAS>	1510	# usage: strip-linguas <allow LINGUAS>
1369	# strip-linguas -i <directories of .po files>	1511	# strip-linguas -i <directories of .po files>
1370	# strip-linguas -u <directories of .po files>	1512	# strip-linguas -u <directories of .po files>
1371	#	1513	#
1372	# The first form allows you to specify a list of LINGUAS.	1514	# The first form allows you to specify a list of LINGUAS.
1373	# The -i builds a list of po files found in all the	1515	# The -i builds a list of po files found in all the
1374	# directories and uses the intersection of the lists.	1516	# directories and uses the intersection of the lists.
1375	# The -u builds a list of po files found in all the	1517	# The -u builds a list of po files found in all the
1376	# directories and uses the union of the lists.	1518	# directories and uses the union of the lists.
1377	strip-linguas() {	1519	strip-linguas() {
1378	local ls newls	1520	local ls newls nols
1379	if [[ $1 == "-i" ]] \|\| [[ $1 == "-u" ]] ; then	1521	if [[ $1 == "-i" ]] \|\| [[ $1 == "-u" ]] ; then
1380	local op=$1; shift	1522	local op=$1; shift
1381	ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift	1523	ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1382	local d f	1524	local d f
1383	for d in "$@" ; do	1525	for d in "$@" ; do
1384	if [[ ${op} == "-u" ]] ; then	1526	if [[ ${op} == "-u" ]] ; then
1385	newls=${ls}	1527	newls=${ls}
1386	else	1528	else
1387	newls=""	1529	newls=""
1388	fi	1530	fi
1389	for f in $(find "$d" -name '*.po' -printf '%f ') ; do	1531	for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1390	if [[ ${op} == "-i" ]] ; then	1532	if [[ ${op} == "-i" ]] ; then
1391	[[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"	1533	hasq ${f} ${ls} && newls="${newls} ${f}"
1392	else	1534	else
1393	[[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"	1535	hasq ${f} ${ls} \|\| newls="${newls} ${f}"
1394	fi	1536	fi
1395	done	1537	done
1396	ls=${newls}	1538	ls=${newls}
1397	done	1539	done
1398	ls=${ls//.po}
1399	else	1540	else
1400	ls=$@	1541	ls="$@"
1401	fi	1542	fi
1402		1543
1403	ls=" ${ls} "	1544	nols=""
1404	newls=""	1545	newls=""
1405	for f in ${LINGUAS} ; do	1546	for f in ${LINGUAS} ; do
1406	if [[ ${ls/ ${f} /} != ${ls} ]] ; then	1547	if hasq ${f} ${ls} ; then
1407	newls="${newls} ${f}"	1548	newls="${newls} ${f}"
1408	else	1549	else
1409	ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"	1550	nols="${nols} ${f}"
1410	fi	1551	fi
1411	done	1552	done
1412	if [[ -z ${newls} ]] ; then	1553	[[ -n ${nols} ]] \
1413	export LINGUAS=""	1554	&& ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1414	else
1415	export LINGUAS=${newls:1}	1555	export LINGUAS=${newls:1}
1416	fi
1417	}	1556	}
1418		1557
1419	# moved from kernel.eclass since they are generally useful outside of	1558	# moved from kernel.eclass since they are generally useful outside of
1420	# kernel.eclass -iggy (20041002)	1559	# kernel.eclass -iggy (20041002)
1421		1560
…		…
1428	while ((i--)) ; do	1567	while ((i--)) ; do
1429	ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"	1568	ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1430	done	1569	done
1431	export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"	1570	export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1432	case ${ARCH} in	1571	case ${ARCH} in
1433	x86) export ARCH="i386";;	1572	x86) export ARCH="i386";;
1434	amd64) export ARCH="x86_64";;	1573	amd64) export ARCH="x86_64";;
1435	hppa) export ARCH="parisc";;	1574	hppa) export ARCH="parisc";;
1436	mips) export ARCH="mips";;	1575	mips) export ARCH="mips";;
1437	sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!	1576	sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
1438	*) export ARCH="${ARCH}";;	1577	*) export ARCH="${ARCH}";;
1439	esac	1578	esac
1440	}	1579	}
1441		1580
1442	# set's ARCH back to what portage expects	1581	# set's ARCH back to what portage expects
1443	set_arch_to_portage() {	1582	set_arch_to_portage() {
…		…
1450		1589
1451	# Jeremy Huddleston <eradicator@gentoo.org>:	1590	# Jeremy Huddleston <eradicator@gentoo.org>:
1452	# preserve_old_lib /path/to/libblah.so.0	1591	# preserve_old_lib /path/to/libblah.so.0
1453	# preserve_old_lib_notify /path/to/libblah.so.0	1592	# preserve_old_lib_notify /path/to/libblah.so.0
1454	#	1593	#
1455	# These functions are useful when a lib in your package changes --soname. Such	1594	# These functions are useful when a lib in your package changes --library. Such
1456	# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0	1595	# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1457	# would break packages that link against it. Most people get around this	1596	# would break packages that link against it. Most people get around this
1458	# by using the portage SLOT mechanism, but that is not always a relevant	1597	# by using the portage SLOT mechanism, but that is not always a relevant
1459	# solution, so instead you can add the following to your ebuilds:	1598	# solution, so instead you can add the following to your ebuilds:
1460	#	1599	#
1461	# src_install() {	1600	# pkg_preinst() {
1462	# ...	1601	# ...
1463	# preserve_old_lib /usr/$(get_libdir)/libogg.so.0	1602	# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1464	# ...	1603	# ...
1465	# }	1604	# }
1466	#	1605	#
…		…
1469	# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0	1608	# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1470	# ...	1609	# ...
1471	# }	1610	# }
1472		1611
1473	preserve_old_lib() {	1612	preserve_old_lib() {
1474	LIB=$1	1613	if [[ ${EBUILD_PHASE} != "preinst" ]] ; then
		1614	eerror "preserve_old_lib() must be called from pkg_preinst() only"
		1615	die "Invalid preserve_old_lib() usage"
		1616	fi
		1617	[[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1475		1618
1476	if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then	1619	local lib dir
1477	SONAME=`basename ${LIB}`	1620	for lib in "$@" ; do
1478	DIRNAME=`dirname ${LIB}`	1621	[[ -e ${ROOT}/${lib} ]] \|\| continue
1479		1622	dir=${lib%/*}
1480	dodir ${DIRNAME}	1623	dodir ${dir} \|\| die "dodir ${dir} failed"
1481	cp ${ROOT}${LIB} ${D}${DIRNAME}	1624	cp "${ROOT}"/${lib} "${D}"/${lib} \|\| die "cp ${lib} failed"
1482	touch ${D}${LIB}	1625	touch "${D}"/${lib}
1483	fi	1626	done
1484	}	1627	}
1485		1628
1486	preserve_old_lib_notify() {	1629	preserve_old_lib_notify() {
1487	LIB=$1	1630	if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
		1631	eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
		1632	die "Invalid preserve_old_lib_notify() usage"
		1633	fi
1488		1634
1489	if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then	1635	local lib notice=0
1490	SONAME=`basename ${LIB}`	1636	for lib in "$@" ; do
1491		1637	[[ -e ${ROOT}/${lib} ]] \|\| continue
		1638	if [[ ${notice} -eq 0 ]] ; then
		1639	notice=1
1492	ewarn "An old version of an installed library was detected on your system."	1640	ewarn "Old versions of installed libraries were detected on your system."
1493	ewarn "In order to avoid breaking packages that link against it, this older version"	1641	ewarn "In order to avoid breaking packages that depend on these old libs,"
1494	ewarn "is not being removed. In order to make full use of this newer version,"	1642	ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1495	ewarn "you will need to execute the following command:"	1643	ewarn "in order to remove these old dependencies. If you do not have this"
1496	ewarn " revdep-rebuild --soname ${SONAME}"	1644	ewarn "helper program, simply emerge the 'gentoolkit' package."
1497	ewarn	1645	ewarn
1498	ewarn "After doing that, you can safely remove ${LIB}"
1499	ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1500	fi	1646	fi
		1647	ewarn " # revdep-rebuild --library ${lib##*/}"
		1648	done
1501	}	1649	}
1502		1650
1503	# Hack for people to figure out if a package was built with	1651	# Hack for people to figure out if a package was built with
1504	# certain USE flags	1652	# certain USE flags
1505	#	1653	#
1506	# Usage: built_with_use [-a\|-o] <DEPEND ATOM> <List of USE flags>	1654	# Usage: built_with_use [--missing <action>] [-a\|-o] <DEPEND ATOM> <List of USE flags>
1507	# ex: built_with_use xchat gtk2	1655	# ex: built_with_use xchat gtk2
1508	#	1656	#
1509	# Flags: -a all USE flags should be utilized	1657	# Flags: -a all USE flags should be utilized
1510	# -o at least one USE flag should be utilized	1658	# -o at least one USE flag should be utilized
		1659	# --missing peform the specified action if the flag is not in IUSE (true/false/die)
		1660	# --hidden USE flag we're checking is hidden expanded so it isnt in IUSE
1511	# Note: the default flag is '-a'	1661	# Note: the default flag is '-a'
1512	built_with_use() {	1662	built_with_use() {
		1663	local hidden="no"
		1664	if [[ $1 == "--hidden" ]] ; then
		1665	hidden="yes"
		1666	shift
		1667	fi
		1668
		1669	local missing_action="die"
		1670	if [[ $1 == "--missing" ]] ; then
		1671	missing_action=$2
		1672	shift ; shift
		1673	case ${missing_action} in
		1674	true\|false\|die) ;;
		1675	*) die "unknown action '${missing_action}'";;
		1676	esac
		1677	fi
		1678
1513	local opt=$1	1679	local opt=$1
1514	[[ ${opt:0:1} = "-" ]] && shift \|\| opt="-a"	1680	[[ ${opt:0:1} = "-" ]] && shift \|\| opt="-a"
1515		1681
1516	local PKG=$(best_version $1)	1682	local PKG=$(best_version $1)
		1683	[[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1517	shift	1684	shift
1518		1685
1519	local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"	1686	local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1520	[[ ! -e ${USEFILE} ]] && return 1	1687	local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
		1688
		1689	# if the IUSE file doesn't exist, the read will error out, we need to handle
		1690	# this gracefully
		1691	if [[ ! -e ${USEFILE} ]] \|\| [[ ! -e ${IUSEFILE} && ${hidden} == "no" ]] ; then
		1692	case ${missing_action} in
		1693	true) return 0;;
		1694	false) return 1;;
		1695	die) die "Unable to determine what USE flags $PKG was built with";;
		1696	esac
		1697	fi
		1698
		1699	if [[ ${hidden} == "no" ]] ; then
		1700	local IUSE_BUILT=$(<${IUSEFILE})
		1701	# Don't check USE_EXPAND #147237
		1702	local expand
		1703	for expand in $(echo ${USE_EXPAND} \| tr '[:upper:]' '[:lower:]') ; do
		1704	if [[ $1 == ${expand}_* ]] ; then
		1705	expand=""
		1706	break
		1707	fi
		1708	done
		1709	if [[ -n ${expand} ]] ; then
		1710	if ! has $1 ${IUSE_BUILT} ; then
		1711	case ${missing_action} in
		1712	true) return 0;;
		1713	false) return 1;;
		1714	die) die "$PKG does not actually support the $1 USE flag!";;
		1715	esac
		1716	fi
		1717	fi
		1718	fi
1521		1719
1522	local USE_BUILT=$(<${USEFILE})	1720	local USE_BUILT=$(<${USEFILE})
1523	while [[ $# -gt 0 ]] ; do	1721	while [[ $# -gt 0 ]] ; do
1524	if [[ ${opt} = "-o" ]] ; then	1722	if [[ ${opt} = "-o" ]] ; then
1525	has $1 ${USE_BUILT} && return 0	1723	has $1 ${USE_BUILT} && return 0
…		…
1540	local f	1738	local f
1541	for f in $(find ${dir} -name configure) ; do	1739	for f in $(find ${dir} -name configure) ; do
1542	patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null	1740	patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1543	done	1741	done
1544	eend 0	1742	eend 0
1545	}
1546
1547	# dopamd <file> [more files]
1548	#
1549	# Install pam auth config file in /etc/pam.d
1550	dopamd() {
1551	[[ -z $1 ]] && die "dopamd requires at least one argument"
1552
1553	use pam \|\| return 0
1554
1555	INSDESTTREE=/etc/pam.d \
1556	doins "$@" \|\| die "failed to install $@"
1557	}
1558	# newpamd <old name> <new name>
1559	#
1560	# Install pam file <old name> as <new name> in /etc/pam.d
1561	newpamd() {
1562	[[ $# -ne 2 ]] && die "newpamd requires two arguements"
1563
1564	use pam \|\| return 0
1565
1566	INSDESTTREE=/etc/pam.d \
1567	newins "$1" "$2" \|\| die "failed to install $1 as $2"
1568	}	1743	}
1569		1744
1570	# make a wrapper script ...	1745	# make a wrapper script ...
1571	# NOTE: this was originally games_make_wrapper, but I noticed other places where	1746	# NOTE: this was originally games_make_wrapper, but I noticed other places where
1572	# this could be used, so I have moved it here and made it not games-specific	1747	# this could be used, so I have moved it here and made it not games-specific
…		…
1577	# $4 == extra LD_LIBRARY_PATH's (make it : delimited)	1752	# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1578	# $5 == path for wrapper	1753	# $5 == path for wrapper
1579	make_wrapper() {	1754	make_wrapper() {
1580	local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5	1755	local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1581	local tmpwrapper=$(emktemp)	1756	local tmpwrapper=$(emktemp)
		1757	# We don't want to quote ${bin} so that people can pass complex
		1758	# things as $bin ... "./someprog --args"
1582	cat << EOF > "${tmpwrapper}"	1759	cat << EOF > "${tmpwrapper}"
1583	#!/bin/sh	1760	#!/bin/sh
1584	cd "${chdir}"	1761	cd "${chdir:-.}"
		1762	if [ -n "${libdir}" ] ; then
		1763	if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1585	export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"	1764	export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
		1765	else
		1766	export LD_LIBRARY_PATH="${libdir}"
		1767	fi
		1768	fi
1586	exec ${bin} "\$@"	1769	exec ${bin} "\$@"
1587	EOF	1770	EOF
1588	chmod go+rx "${tmpwrapper}"	1771	chmod go+rx "${tmpwrapper}"
1589	if [ -n "${5}" ]	1772	if [[ -n ${path} ]] ; then
1590	then
1591	exeinto ${5}	1773	exeinto "${path}"
1592	newexe "${tmpwrapper}" "${wrapper}"	1774	newexe "${tmpwrapper}" "${wrapper}"
1593	else	1775	else
1594	newbin "${tmpwrapper}" "${wrapper}"	1776	newbin "${tmpwrapper}" "${wrapper}"
1595	fi	1777	fi
1596	}	1778	}

 Legend:



Removed from v.1.197
 


changed lines


 
Added in v.1.279
 Legend:



Removed from v.1.197
 


changed lines


 
Added in v.1.279
-Removed from v.1.197
+Added in v.1.279

	ViewVC Help
Powered by ViewVC 1.1.13