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

Diff of /eclass/eutils.eclass

Parent Directory | Revision Log | View Patch Patch

Revision 1.110		Revision 1.228
1	# Copyright 1999-2004 Gentoo Foundation	1	# Copyright 1999-2005 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.110 2004/10/02 17:47:48 iggy Exp $	3	# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.228 2006/03/10 23:24:21 vapier Exp $
4	#	4	#
5	# Author: Martin Schlemmer <azarah@gentoo.org>	5	# Author: Martin Schlemmer <azarah@gentoo.org>
6	#	6	#
7	# This eclass is for general purpose functions that most ebuilds	7	# This eclass is for general purpose functions that most ebuilds
8	# have to implement themselves.	8	# have to implement themselves.
9	#	9	#
10	# NB: If you add anything, please comment it!	10	# NB: If you add anything, please comment it!
11		11
12	ECLASS=eutils	12	inherit multilib portability
13	INHERITED="$INHERITED $ECLASS"
14		13
15	DEPEND="!bootstrap? ( sys-devel/patch )"	14	DEPEND="!bootstrap? ( sys-devel/patch )"
		15	# sys-apps/shadow is needed for useradd, etc, bug #94745.
16		16
17	DESCRIPTION="Based on the ${ECLASS} eclass"	17	DESCRIPTION="Based on the ${ECLASS} eclass"
18		18
19	# Wait for the supplied number of seconds. If no argument is supplied, defaults	19	# 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	20	# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
…		…
41	sleep 1	41	sleep 1
42	done	42	done
43	fi	43	fi
44	}	44	}
45		45
46	# This function simply returns the desired lib directory. With portage
47	# 2.0.51, we now have support for installing libraries to lib32/lib64
48	# to accomidate the needs of multilib systems. It's no longer a good idea
49	# to assume all libraries will end up in lib. Replace any (sane) instances
50	# where lib is named directly with $(get_libdir) if possible.
51	#
52	# Travis Tilley <lv@gentoo.org> (24 Aug 2004)
53	get_libdir() {
54	LIBDIR_TEST=$(type econf)
55	if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
56	# if there is an override, we want to use that... always.
57	CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
58	# We don't need to know the verison of portage. We only need to know
59	# if there is support for CONF_LIBDIR in econf and co.
60	# Danny van Dyk <kugelfang@gentoo.org> 2004/17/09
61	#elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then
62	# # and if there isnt an override, and we're using a version of
63	# # portage without CONF_LIBDIR support, force the use of lib. dolib
64	# # and friends from portage 2.0.50 wont be too happy otherwise.
65	# CONF_LIBDIR="lib"
66	#fi
67	elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
68	# will be <portage-2.0.51_pre20
69	CONF_LIBDIR="lib"
70	fi
71	# and of course, default to lib if CONF_LIBDIR isnt set
72	echo ${CONF_LIBDIR:=lib}
73	unset LIBDIR_TEST
74	}
75
76
77	get_multilibdir() {
78	echo ${CONF_MULTILIBDIR:=lib32}
79	}
80
81
82	# Sometimes you need to override the value returned by get_libdir. A good
83	# example of this is xorg-x11, where lib32 isnt a supported configuration,
84	# and where lib64 -must- be used on amd64 (for applications that need lib
85	# to be 32bit, such as adobe acrobat). Note that this override also bypasses
86	# portage version sanity checking.
87	# get_libdir_override expects one argument, the result get_libdir should
88	# return:
89	#
90	# get_libdir_override lib64
91	#
92	# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
93	get_libdir_override() {
94	CONF_LIBDIR="$1"
95	CONF_LIBDIR_OVERRIDE="$1"
96	}
97
98	# This function generate linker scripts in /usr/lib for dynamic	46	# This function generate linker scripts in /usr/lib for dynamic
99	# libs in /lib. This is to fix linking problems when you have	47	# libs in /lib. This is to fix linking problems when you have
100	# the .so in /lib, and the .a in /usr/lib. What happens is that	48	# the .so in /lib, and the .a in /usr/lib. What happens is that
101	# in some cases when linking dynamic, the .a in /usr/lib is used	49	# in some cases when linking dynamic, the .a in /usr/lib is used
102	# instead of the .so in /lib due to gcc/libtool tweaking ld's	50	# instead of the .so in /lib due to gcc/libtool tweaking ld's
…		…
112	# to point to the latest version of the library present.	60	# to point to the latest version of the library present.
113	#	61	#
114	# <azarah@gentoo.org> (26 Oct 2002)	62	# <azarah@gentoo.org> (26 Oct 2002)
115	#	63	#
116	gen_usr_ldscript() {	64	gen_usr_ldscript() {
117	local libdir="$(get_libdir)"	65	local lib libdir=$(get_libdir)
118	# Just make sure it exists	66	# Just make sure it exists
119	dodir /usr/${libdir}	67	dodir /usr/${libdir}
120		68
		69	for lib in "${@}" ; do
121	cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT	70	cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
122	/* GNU ld script	71	/* GNU ld script
123	Because Gentoo have critical dynamic libraries	72	Since Gentoo has critical dynamic libraries
124	in /lib, and the static versions in /usr/lib, we	73	in /lib, and the static versions in /usr/lib,
125	need to have a "fake" dynamic lib in /usr/lib,	74	we need to have a "fake" dynamic lib in /usr/lib,
126	otherwise we run into linking problems.	75	otherwise we run into linking problems.
127	See bug #4411 on http://bugs.gentoo.org/ for	76
128	more info. */	77	See bug http://bugs.gentoo.org/4411 for more info.
		78	*/
129	GROUP ( /${libdir}/${1} )	79	GROUP ( /${libdir}/${lib} )
130	END_LDSCRIPT	80	END_LDSCRIPT
131	fperms a+x "/usr/${libdir}/${1}"	81	fperms a+x "/usr/${libdir}/${lib}" \|\| die "could not change perms on ${lib}"
132	}
133
134	# Simple function to draw a line consisting of '=' the same length as $*
135	#
136	# <azarah@gentoo.org> (11 Nov 2002)
137	#
138	draw_line() {
139	local i=0
140	local str_length=""
141
142	# Handle calls that do not have args, or wc not being installed ...
143	if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
144	then
145	echo "==============================================================="
146	return 0
147	fi
148
149	# Get the length of $*
150	str_length="$(echo -n "$*" \| wc -m)"
151
152	while [ "$i" -lt "${str_length}" ]
153	do
154	echo -n "="
155
156	i=$((i + 1))
157	done	82	done
158
159	echo
160
161	return 0
162	}	83	}
		84
163		85
164	# Default directory where patches are located	86	# Default directory where patches are located
165	EPATCH_SOURCE="${WORKDIR}/patch"	87	EPATCH_SOURCE="${WORKDIR}/patch"
166	# Default extension for patches	88	# Default extension for patches
167	EPATCH_SUFFIX="patch.bz2"	89	EPATCH_SUFFIX="patch.bz2"
168	# Default options for patch	90	# Default options for patch
169	# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571	91	# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
170	EPATCH_OPTS="-g0"	92	# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
		93	EPATCH_OPTS="-g0 --no-backup-if-mismatch"
171	# List of patches not to apply. Not this is only file names,	94	# List of patches not to apply. Not this is only file names,
172	# and not the full path ..	95	# and not the full path ..
173	EPATCH_EXCLUDE=""	96	EPATCH_EXCLUDE=""
174	# Change the printed message for a single patch.	97	# Change the printed message for a single patch.
175	EPATCH_SINGLE_MSG=""	98	EPATCH_SINGLE_MSG=""
		99	# Change the printed message for multiple patches.
		100	EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
176	# Force applying bulk patches even if not following the style:	101	# Force applying bulk patches even if not following the style:
177	#	102	#
178	# ??_${ARCH}_foo.${EPATCH_SUFFIX}	103	# ??_${ARCH}_foo.${EPATCH_SUFFIX}
179	#	104	#
180	EPATCH_FORCE="no"	105	EPATCH_FORCE="no"
…		…
211	# hand its a directory, it will set EPATCH_SOURCE to this.	136	# hand its a directory, it will set EPATCH_SOURCE to this.
212	#	137	#
213	# <azarah@gentoo.org> (10 Nov 2002)	138	# <azarah@gentoo.org> (10 Nov 2002)
214	#	139	#
215	epatch() {	140	epatch() {
		141	_epatch_draw_line() {
		142	# this func produces a lot of pointless noise when debugging is turned on ...
		143	local is_debug=0
		144	[[ $- == x ]] && is_debug=1 && set +x
		145
		146	local i=0 str_length="" str_out=""
		147
		148	# Handle calls that do not have args, or wc not being installed ...
		149	if [[ -z $1 ]] \|\| ! type -p wc >/dev/null ; then
		150	str_length=65
		151	else
		152	str_length=$(echo -n "$*" \| wc -m)
		153	fi
		154
		155	while ((i++ < ${str_length})) ; do
		156	str_out="${str_out}="
		157	done
		158	echo ${str_out}
		159
		160	[[ ${is_debug} -eq 1 ]] && set -x
		161	return 0
		162	}
		163	_epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
216	local PIPE_CMD=""	164	local PIPE_CMD=""
217	local STDERR_TARGET="${T}/$$.out"	165	local STDERR_TARGET="${T}/$$.out"
218	local PATCH_TARGET="${T}/$$.patch"	166	local PATCH_TARGET="${T}/$$.patch"
219	local PATCH_SUFFIX=""	167	local PATCH_SUFFIX=""
220	local SINGLE_PATCH="no"	168	local SINGLE_PATCH="no"
221	local x=""	169	local x=""
222		170
		171	unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
		172
223	if [ "$#" -gt 1 ]	173	if [ "$#" -gt 1 ]
224	then	174	then
225	local m=""	175	local m=""
226	einfo "${#} patches to apply..."
227	for m in "$@" ; do	176	for m in "$@" ; do
228	epatch "${m}"	177	epatch "${m}"
229	done	178	done
230	return 0	179	return 0
231	fi	180	fi
…		…
245	local EPATCH_SOURCE="$1/*"	194	local EPATCH_SOURCE="$1/*"
246	else	195	else
247	local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"	196	local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
248	fi	197	fi
249	else	198	else
250	if [ ! -d ${EPATCH_SOURCE} ]	199	if [ ! -d ${EPATCH_SOURCE} ] \|\| [ -n "$1" ]
251	then	200	then
252	if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]	201	if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
253	then	202	then
254	EPATCH_SOURCE="$1"	203	EPATCH_SOURCE="$1"
255	fi	204	fi
256		205
257	echo	206	echo
258	eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"	207	eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
259	eerror	208	eerror
260	eerror " ${EPATCH_SOURCE}"	209	eerror " ${EPATCH_SOURCE}"
		210	eerror " ( ${EPATCH_SOURCE##*/} )"
261	echo	211	echo
262	die "Cannot find \$EPATCH_SOURCE!"	212	die "Cannot find \$EPATCH_SOURCE!"
263	fi	213	fi
264		214
265	local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"	215	local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
…		…
284	;;	234	;;
285	esac	235	esac
286		236
287	if [ "${SINGLE_PATCH}" = "no" ]	237	if [ "${SINGLE_PATCH}" = "no" ]
288	then	238	then
289	einfo "Applying various patches (bugfixes/updates)..."	239	einfo "${EPATCH_MULTI_MSG}"
290	fi	240	fi
291	for x in ${EPATCH_SOURCE}	241	for x in ${EPATCH_SOURCE}
292	do	242	do
293	# New ARCH dependant patch naming scheme...	243	# New ARCH dependant patch naming scheme ...
294	#	244	#
295	# ???_arch_foo.patch	245	# ???_arch_foo.patch
296	#	246	#
297	if [ -f ${x} ] && \	247	if [ -f ${x} ] && \
298	([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] \|\| \	248	([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] \|\| \
299	[ "${EPATCH_FORCE}" = "yes" ])	249	[ "${EPATCH_FORCE}" = "yes" ])
300	then	250	then
301	local count=0	251	local count=0
302	local popts="${EPATCH_OPTS}"	252	local popts="${EPATCH_OPTS}"
		253	local patchname=${x##*/}
303		254
304	if [ -n "${EPATCH_EXCLUDE}" ]	255	if [ -n "${EPATCH_EXCLUDE}" ]
305	then	256	then
306	if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ]	257	if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
307	then	258	then
308	continue	259	continue
309	fi	260	fi
310	fi	261	fi
311		262
…		…
313	then	264	then
314	if [ -n "${EPATCH_SINGLE_MSG}" ]	265	if [ -n "${EPATCH_SINGLE_MSG}" ]
315	then	266	then
316	einfo "${EPATCH_SINGLE_MSG}"	267	einfo "${EPATCH_SINGLE_MSG}"
317	else	268	else
318	einfo "Applying ${x##*/}..."	269	einfo "Applying ${patchname} ..."
319	fi	270	fi
320	else	271	else
321	einfo " ${x##*/}..."	272	einfo " ${patchname} ..."
322	fi	273	fi
323		274
324	echo "***** ${x##/} ***" > ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##/}	275	echo "*** ${patchname} **" > ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##*/}
325	echo >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##*/}	276	echo >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}
326		277
327	# Allow for prefix to differ ... im lazy, so shoot me :/	278	# Allow for prefix to differ ... im lazy, so shoot me :/
328	while [ "${count}" -lt 5 ]	279	while [ "${count}" -lt 5 ]
329	do	280	do
330	# Generate some useful debug info ...	281	# Generate some useful debug info ...
331	draw_line "***** ${x##/} ***" >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##/}	282	_epatch_draw_line "*** ${patchname} **" >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##*/}
332	echo >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##*/}	283	echo >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}
333		284
334	if [ "${PATCH_SUFFIX}" != "patch" ]	285	if [ "${PATCH_SUFFIX}" != "patch" ]
335	then	286	then
336	echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##*/}	287	echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}
337	echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##*/}	288	echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}
338	else	289	else
339	PATCH_TARGET="${x}"	290	PATCH_TARGET="${x}"
340	fi	291	fi
341		292
342	echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##*/}	293	echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}
343	echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##*/}	294	echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}
344		295
345	echo >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##*/}	296	echo >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}
346	draw_line "***** ${x##/} ***" >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##/}	297	_epatch_draw_line "*** ${patchname} **" >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##*/}
347		298
348	if [ "${PATCH_SUFFIX}" != "patch" ]	299	if [ "${PATCH_SUFFIX}" != "patch" ]
349	then	300	then
350	if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##*/} 2>&1	301	if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/} 2>&1
351	then	302	then
352	echo	303	echo
353	eerror "Could not extract patch!"	304	eerror "Could not extract patch!"
354	#die "Could not extract patch!"	305	#die "Could not extract patch!"
355	count=5	306	count=5
356	break	307	break
357	fi	308	fi
358	fi	309	fi
359		310
360	if (cat ${PATCH_TARGET} \| patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##*/} 2>&1	311	if (cat ${PATCH_TARGET} \| patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/} 2>&1
361	then	312	then
362	draw_line "***** ${x##/} ***" > ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##/}.real	313	_epatch_draw_line "*** ${patchname} **" > ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##*/}.real
363	echo >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##*/}.real	314	echo >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}.real
364	echo "ACTUALLY APPLYING ${x##/}..." >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##/}.real	315	echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}.real
365	echo >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##*/}.real	316	echo >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}.real
366	draw_line "***** ${x##/} ***" >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##/}.real	317	_epatch_draw_line "*** ${patchname} **" >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##*/}.real
367		318
368	cat ${PATCH_TARGET} \| patch -p${count} ${popts} >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##*/}.real 2>&1	319	cat ${PATCH_TARGET} \| patch -p${count} ${popts} >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}.real 2>&1
		320	_epatch_assert
369		321
370	if [ "$?" -ne 0 ]	322	if [ "$?" -ne 0 ]
371	then	323	then
372	cat ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##/}.real >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##/}	324	cat ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}.real >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}
373	echo	325	echo
374	eerror "A dry-run of patch command succeeded, but actually"	326	eerror "A dry-run of patch command succeeded, but actually"
375	eerror "applying the patch failed!"	327	eerror "applying the patch failed!"
376	#die "Real world sux compared to the dreamworld!"	328	#die "Real world sux compared to the dreamworld!"
377	count=5	329	count=5
378	fi	330	fi
379		331
380	rm -f ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##*/}.real	332	rm -f ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}.real
381		333
382	break	334	break
383	fi	335	fi
384		336
385	count=$((count + 1))	337	count=$((count + 1))
…		…
391	fi	343	fi
392		344
393	if [ "${count}" -eq 5 ]	345	if [ "${count}" -eq 5 ]
394	then	346	then
395	echo	347	echo
396	eerror "Failed Patch: ${x##*/}!"	348	eerror "Failed Patch: ${patchname} !"
		349	eerror " ( ${PATCH_TARGET} )"
397	eerror	350	eerror
398	eerror "Include in your bugreport the contents of:"	351	eerror "Include in your bugreport the contents of:"
399	eerror	352	eerror
400	eerror " ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##*/}"	353	eerror " ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}"
401	echo	354	echo
402	die "Failed Patch: ${x##*/}!"	355	die "Failed Patch: ${patchname}!"
403	fi	356	fi
404		357
405	rm -f ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##*/}	358	rm -f ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}
406		359
407	eend 0	360	eend 0
408	fi	361	fi
409	done	362	done
410	if [ "${SINGLE_PATCH}" = "no" ]	363	if [ "${SINGLE_PATCH}" = "no" ]
411	then	364	then
412	einfo "Done with patching"	365	einfo "Done with patching"
413	fi	366	fi
414	}	367	}
415		368
416	# This function return true if we are using the NPTL pthreads
417	# implementation.
418	#
419	# <azarah@gentoo.org> (06 March 2003)
420	#
421	have_NPTL() {
422	cat > ${T}/test-nptl.c <<-"END"
423	#define _XOPEN_SOURCE
424	#include <unistd.h>
425	#include <stdio.h>
426
427	int main()
428	{
429	char buf[255];
430	char *str = buf;
431
432	confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
433	if (NULL != str) {
434	printf("%s\n", str);
435	if (NULL != strstr(str, "NPTL"))
436	return 0;
437	}
438
439	return 1;
440	}
441	END
442
443	einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ... "
444	if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
445	then
446	echo "yes"
447	einfon "Checking what PTHREADS implementation we have ... "
448	if ${T}/nptl
449	then
450	return 0
451	else
452	return 1
453	fi
454	else
455	echo "no"
456	fi
457
458	return 1
459	}
460
461	# This function check how many cpu's are present, and then set
462	# -j in MAKEOPTS accordingly.
463	#
464	# Thanks to nall <nall@gentoo.org> for this.
465	#
466	get_number_of_jobs() {
467	local jobs=0
468
469	if [ ! -r /proc/cpuinfo ]
470	then
471	return 1
472	fi
473
474	# This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
475	if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf \| wc -l`" -gt 0 ]
476	then
477	ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf \| cut -d= -f2 \| sed 's/\"//g'`"
478	ADMINPARAM="`echo ${ADMINOPTS} \| gawk '{match($0, /-j [0-9]/, opt); print opt[0]}'`"
479	ADMINPARAM="${ADMINPARAM/-j}"
480	fi
481
482	export MAKEOPTS="`echo ${MAKEOPTS} \| sed -e 's:-j [0-9]::g'`"
483
484	if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
485	"${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
486	then
487	# these archs will always have "[Pp]rocessor"
488	jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
489
490	elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
491	then
492	# sparc always has "ncpus active"
493	jobs="$((`grep "^ncpus active" /proc/cpuinfo \| sed -e "s/^.: //"` 2))"
494
495	elif [ "${ARCH}" = "alpha" ]
496	then
497	# alpha has "cpus active", but only when compiled with SMP
498	if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
499	then
500	jobs="$((`grep "^cpus active" /proc/cpuinfo \| sed -e "s/^.: //"` 2))"
501	else
502	jobs=2
503	fi
504
505	elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
506	then
507	# ppc has "processor", but only when compiled with SMP
508	if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
509	then
510	jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
511	else
512	jobs=2
513	fi
514	elif [ "${ARCH}" = "s390" ]
515	then
516	# s390 has "# processors : "
517	jobs="$((`grep "^\# processors" /proc/cpuinfo \| sed -e "s/^.: //"` 2))"
518	else
519	jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
520	die "Unknown ARCH -- ${ARCH}!"
521	fi
522
523	# Make sure the number is valid ...
524	if [ "${jobs}" -lt 1 ]
525	then
526	jobs=1
527	fi
528
529	if [ -n "${ADMINPARAM}" ]
530	then
531	if [ "${jobs}" -gt "${ADMINPARAM}" ]
532	then
533	einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge..."
534	export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
535	else
536	einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..."
537	export MAKEOPTS="${MAKEOPTS} -j${jobs}"
538	fi
539	fi
540	}
541
542	# Cheap replacement for when debianutils (and thus mktemp)	369	# Cheap replacement for when debianutils (and thus mktemp)
543	# does not exist on the users system	370	# does not exist on the users system
544	# vapier@gentoo.org	371	# vapier@gentoo.org
545	#	372	#
546	# Takes just 1 parameter (the directory to create tmpfile in)	373	# Takes just 1 optional parameter (the directory to create tmpfile in)
547	mymktemp() {	374	emktemp() {
		375	local exe="touch"
		376	[[ $1 == -d ]] && exe="mkdir" && shift
548	local topdir="$1"	377	local topdir=$1
549		378
550	[ -z "${topdir}" ] && topdir=/tmp	379	if [[ -z ${topdir} ]] ; then
551	if [ "`which mktemp 2>/dev/null`" ]	380	[[ -z ${T} ]] \
552	then	381	&& topdir="/tmp" \
553	mktemp -p ${topdir}	382	\|\| topdir=${T}
554	else	383	fi
		384
		385	if [[ -z $(type -p mktemp) ]] ; then
		386	local tmp=/
		387	while [[ -e ${tmp} ]] ; do
555	local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"	388	tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
556	touch ${tmp}	389	done
		390	${exe} "${tmp}" \|\| ${exe} -p "${tmp}"
557	echo ${tmp}	391	echo "${tmp}"
		392	else
		393	if [[ ${exe} == "touch" ]] ; then
		394	[[ ${USERLAND} == "GNU" ]] \
		395	&& mktemp -p "${topdir}" \
		396	\|\| TMPDIR="${topdir}" mktemp -t tmp
		397	else
		398	[[ ${USERLAND} == "GNU" ]] \
		399	&& mktemp -d "${topdir}" \
		400	\|\| TMPDIR="${topdir}" mktemp -dt tmp
		401	fi
558	fi	402	fi
559	}	403	}
560		404
561	# Small wrapper for getent (Linux), nidump (Mac OS X),	405	# Small wrapper for getent (Linux), nidump (Mac OS X),
562	# and pw (FreeBSD) used in enewuser()/enewgroup()	406	# and pw (FreeBSD) used in enewuser()/enewgroup()
563	# Joe Jezak <josejx@gmail.com> and usata@gentoo.org	407	# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
564	# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>	408	# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
565	#	409	#
566	# egetent(database, key)	410	# egetent(database, key)
567	egetent() {	411	egetent() {
568	if use macos \|\| use ppc-macos ; then	412	case ${CHOST} in
		413	-darwin)
569	case "$2" in	414	case "$2" in
570	[!0-9]) # Non numeric	415	[!0-9]) # Non numeric
571	nidump $1 . \| awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"	416	nidump $1 . \| awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
572	;;	417	;;
573	*) # Numeric	418	*) # Numeric
574	nidump $1 . \| awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"	419	nidump $1 . \| awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
575	;;	420	;;
576	esac	421	esac
577	elif useq x86-fbsd ; then	422	;;
578	local action	423	-freebsd\|-dragonfly)
579	if [ "$1" == "passwd" ]	424	local opts action="user"
580	then	425	[[ $1 == "passwd" ]] \|\| action="group"
581	action="user"	426
582	else	427	# lookup by uid/gid
583	action="group"	428	if [[ $2 == [[:digit:]]* ]] ; then
		429	[[ ${action} == "user" ]] && opts="-u" \|\| opts="-g"
584	fi	430	fi
		431
585	pw show "${action}" "$2" -q	432	pw show ${action} ${opts} "$2" -q
586	else	433	;;
		434	-netbsd\|-openbsd)
		435	grep "$2:\*:" /etc/$1
		436	;;
		437	*)
		438	type -p nscd >& /dev/null && nscd -i "$1"
587	getent "$1" "$2"	439	getent "$1" "$2"
588	fi	440	;;
		441	esac
589	}	442	}
590		443
591	# Simplify/standardize adding users to the system	444	# Simplify/standardize adding users to the system
592	# vapier@gentoo.org	445	# vapier@gentoo.org
593	#	446	#
…		…
601	# homedir: /dev/null	454	# homedir: /dev/null
602	# groups: none	455	# groups: none
603	# extra: comment of 'added by portage for ${PN}'	456	# extra: comment of 'added by portage for ${PN}'
604	enewuser() {	457	enewuser() {
605	# get the username	458	# get the username
606	local euser="$1"; shift	459	local euser=$1; shift
607	if [ -z "${euser}" ]	460	if [[ -z ${euser} ]] ; then
608	then
609	eerror "No username specified !"	461	eerror "No username specified !"
610	die "Cannot call enewuser without a username"	462	die "Cannot call enewuser without a username"
611	fi	463	fi
612		464
613	# lets see if the username already exists	465	# lets see if the username already exists
614	if [ "${euser}" == "`egetent passwd \"${euser}\" \| cut -d: -f1`" ]	466	if [[ ${euser} == $(egetent passwd "${euser}" \| cut -d: -f1) ]] ; then
615	then
616	return 0	467	return 0
617	fi	468	fi
618	einfo "Adding user '${euser}' to your system ..."	469	einfo "Adding user '${euser}' to your system ..."
619		470
620	# options to pass to useradd	471	# options to pass to useradd
621	local opts=	472	local opts=
622		473
623	# handle uid	474	# handle uid
624	local euid="$1"; shift	475	local euid=$1; shift
625	if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ]	476	if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
626	then
627	if [ "${euid}" -gt 0 ]	477	if [[ ${euid} -gt 0 ]] ; then
628	then
629	if [ ! -z "`egetent passwd ${euid}`" ]	478	if [[ ! -z $(egetent passwd ${euid}) ]] ; then
630	then
631	euid="next"	479	euid="next"
632	fi	480	fi
633	else	481	else
634	eerror "Userid given but is not greater than 0 !"	482	eerror "Userid given but is not greater than 0 !"
635	die "${euid} is not a valid UID"	483	die "${euid} is not a valid UID"
636	fi	484	fi
637	else	485	else
638	euid="next"	486	euid="next"
639	fi	487	fi
640	if [ "${euid}" == "next" ]	488	if [[ ${euid} == "next" ]] ; then
641	then	489	for euid in $(seq 101 999) ; do
642	local pwrange
643	if use macos \|\| use ppc-macos \|\| [ "${USERLAND}" == "BSD" ] ; then
644	pwrange="`jot 898 101`"
645	else
646	pwrange="`seq 101 999`"
647	fi
648	for euid in ${pwrange} ; do
649	[ -z "`egetent passwd ${euid}`" ] && break	490	[[ -z $(egetent passwd ${euid}) ]] && break
650	done	491	done
651	fi	492	fi
652	opts="${opts} -u ${euid}"	493	opts="${opts} -u ${euid}"
653	einfo " - Userid: ${euid}"	494	einfo " - Userid: ${euid}"
654		495
655	# handle shell	496	# handle shell
656	local eshell="$1"; shift	497	local eshell=$1; shift
657	if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ]	498	if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
658	then	499	if [[ ! -e ${ROOT}${eshell} ]] ; then
659	if [ ! -e "${eshell}" ]
660	then
661	eerror "A shell was specified but it does not exist !"	500	eerror "A shell was specified but it does not exist !"
662	die "${eshell} does not exist"	501	die "${eshell} does not exist in ${ROOT}"
663	fi	502	fi
664	else	503	if [[ ${eshell} == /false \|\| ${eshell} == /nologin ]] ; then
665	if [ "${USERLAND}" == "BSD" ]	504	eerror "Do not specify ${eshell} yourself, use -1"
666	then	505	die "Pass '-1' as the shell parameter"
667	eshell="/usr/bin/false"	506	fi
668	else	507	else
669	eshell="/bin/false"	508	for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
		509	[[ -x ${ROOT}${shell} ]] && break
		510	done
		511
		512	if [[ ${shell} == "/dev/null" ]] ; then
		513	eerror "Unable to identify the shell to use"
		514	die "Unable to identify the shell to use"
670	fi	515	fi
		516
		517	eshell=${shell}
671	fi	518	fi
672	einfo " - Shell: ${eshell}"	519	einfo " - Shell: ${eshell}"
673	opts="${opts} -s ${eshell}"	520	opts="${opts} -s ${eshell}"
674		521
675	# handle homedir	522	# handle homedir
676	local ehome="$1"; shift	523	local ehome=$1; shift
677	if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ]	524	if [[ -z ${ehome} ]] \|\| [[ ${ehome} == "-1" ]] ; then
678	then
679	ehome="/dev/null"	525	ehome="/dev/null"
680	fi	526	fi
681	einfo " - Home: ${ehome}"	527	einfo " - Home: ${ehome}"
682	opts="${opts} -d ${ehome}"	528	opts="${opts} -d ${ehome}"
683		529
684	# handle groups	530	# handle groups
685	local egroups="$1"; shift	531	local egroups=$1; shift
686	if [ ! -z "${egroups}" ]	532	if [[ ! -z ${egroups} ]] ; then
687	then
688	local oldifs="${IFS}"	533	local oldifs=${IFS}
689	local defgroup="" exgroups=""	534	local defgroup="" exgroups=""
690		535
691	export IFS=","	536	export IFS=","
692	for g in ${egroups}	537	for g in ${egroups} ; do
693	do	538	export IFS=${oldifs}
694	if [ -z "`egetent group \"${g}\"`" ]	539	if [[ -z $(egetent group "${g}") ]] ; then
695	then
696	eerror "You must add group ${g} to the system first"	540	eerror "You must add group ${g} to the system first"
697	die "${g} is not a valid GID"	541	die "${g} is not a valid GID"
698	fi	542	fi
699	if [ -z "${defgroup}" ]	543	if [[ -z ${defgroup} ]] ; then
700	then
701	defgroup="${g}"	544	defgroup=${g}
702	else	545	else
703	exgroups="${exgroups},${g}"	546	exgroups="${exgroups},${g}"
704	fi	547	fi
		548	export IFS=","
705	done	549	done
706	export IFS="${oldifs}"	550	export IFS=${oldifs}
707		551
708	opts="${opts} -g ${defgroup}"	552	opts="${opts} -g ${defgroup}"
709	if [ ! -z "${exgroups}" ]	553	if [[ ! -z ${exgroups} ]] ; then
710	then
711	opts="${opts} -G ${exgroups:1}"	554	opts="${opts} -G ${exgroups:1}"
712	fi	555	fi
713	else	556	else
714	egroups="(none)"	557	egroups="(none)"
715	fi	558	fi
716	einfo " - Groups: ${egroups}"	559	einfo " - Groups: ${egroups}"
717		560
718	# handle extra and add the user	561	# handle extra and add the user
719	local eextra="$@"
720	local oldsandbox="${SANDBOX_ON}"	562	local oldsandbox=${SANDBOX_ON}
721	export SANDBOX_ON="0"	563	export SANDBOX_ON="0"
722	if use macos \|\| use ppc-macos ;	564	case ${CHOST} in
723	then	565	-darwin)
724	### Make the user	566	### Make the user
725	if [ -z "${eextra}" ]	567	if [[ -z $@ ]] ; then
726	then
727	dscl . create /users/${euser} uid ${euid}	568	dscl . create /users/${euser} uid ${euid}
728	dscl . create /users/${euser} shell ${eshell}	569	dscl . create /users/${euser} shell ${eshell}
729	dscl . create /users/${euser} home ${ehome}	570	dscl . create /users/${euser} home ${ehome}
730	dscl . create /users/${euser} realname "added by portage for ${PN}"	571	dscl . create /users/${euser} realname "added by portage for ${PN}"
731	### Add the user to the groups specified	572	### Add the user to the groups specified
		573	local oldifs=${IFS}
		574	export IFS=","
732	for g in ${egroups}	575	for g in ${egroups} ; do
733	do
734	# $egroups is , delimited, not space
735	ewarn "This is code is wrong; someone on the OS X team should fix it"
736	dscl . merge /groups/${g} users ${euser}	576	dscl . merge /groups/${g} users ${euser}
737	done	577	done
		578	export IFS=${oldifs}
738	else	579	else
739	einfo "Extra options are not supported on macos yet"	580	einfo "Extra options are not supported on Darwin yet"
740	einfo "Please report the ebuild along with the info below"	581	einfo "Please report the ebuild along with the info below"
741	einfo "eextra: ${eextra}"	582	einfo "eextra: $@"
742	die "Required function missing"	583	die "Required function missing"
743	fi	584	fi
744	elif use x86-fbsd ; then	585	;;
745	if [ -z "${eextra}" ]	586	-freebsd\|-dragonfly)
746	then	587	if [[ -z $@ ]] ; then
747	pw useradd ${euser} ${opts} \	588	pw useradd ${euser} ${opts} \
748	-c "added by portage for ${PN}" \	589	-c "added by portage for ${PN}" \
749	die "enewuser failed"	590	die "enewuser failed"
750	else	591	else
751	einfo " - Extra: ${eextra}"	592	einfo " - Extra: $@"
752	pw useradd ${euser} ${opts} \	593	pw useradd ${euser} ${opts} \
753	-c ${eextra} \|\| die "enewuser failed"	594	"$@" \|\| die "enewuser failed"
754	fi	595	fi
		596	;;
		597
		598	-netbsd)
		599	if [[ -z $@ ]] ; then
		600	useradd ${opts} ${euser} \|\| die "enewuser failed"
755	else	601	else
756	if [ -z "${eextra}" ]	602	einfo " - Extra: $@"
757	then	603	useradd ${opts} ${euser} "$@" \|\| die "enewuser failed"
		604	fi
		605	;;
		606
		607	-openbsd)
		608	if [[ -z $@ ]] ; then
		609	useradd -u ${euid} -s ${eshell} \
		610	-d ${ehome} -c "Added by portage for ${PN}" \
		611	-g ${egroups} ${euser} \|\| die "enewuser failed"
		612	else
		613	einfo " - Extra: $@"
		614	useradd -u ${euid} -s ${eshell} \
		615	-d ${ehome} -c "Added by portage for ${PN}" \
		616	-g ${egroups} ${euser} "$@" \|\| die "enewuser failed"
		617	fi
		618	;;
		619
		620	*)
		621	if [[ -z $@ ]] ; then
758	useradd ${opts} ${euser} \	622	useradd ${opts} ${euser} \
759	-c "added by portage for ${PN}" \	623	-c "added by portage for ${PN}" \
760	\|\| die "enewuser failed"	624	\|\| die "enewuser failed"
761	else	625	else
762	einfo " - Extra: ${eextra}"	626	einfo " - Extra: $@"
763	useradd ${opts} ${euser} ${eextra} \	627	useradd ${opts} ${euser} "$@" \
764	\|\| die "enewuser failed"	628	\|\| die "enewuser failed"
765	fi	629	fi
		630	;;
		631	esac
		632
		633	if [[ ! -e ${ROOT}/${ehome} ]] ; then
		634	einfo " - Creating ${ehome} in ${ROOT}"
		635	mkdir -p "${ROOT}/${ehome}"
		636	chown ${euser} "${ROOT}/${ehome}"
		637	chmod 755 "${ROOT}/${ehome}"
766	fi	638	fi
		639
767	export SANDBOX_ON="${oldsandbox}"	640	export SANDBOX_ON=${oldsandbox}
768
769	if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
770	then
771	einfo " - Creating ${ehome} in ${D}"
772	dodir ${ehome}
773	fowners ${euser} ${ehome}
774	fperms 755 ${ehome}
775	fi
776	}	641	}
777		642
778	# Simplify/standardize adding groups to the system	643	# Simplify/standardize adding groups to the system
779	# vapier@gentoo.org	644	# vapier@gentoo.org
780	#	645	#
…		…
809	then	674	then
810	if [ "${egid}" -gt 0 ]	675	if [ "${egid}" -gt 0 ]
811	then	676	then
812	if [ -z "`egetent group ${egid}`" ]	677	if [ -z "`egetent group ${egid}`" ]
813	then	678	then
814	if use macos \|\| use ppc-macos ; then	679	if [[ "${CHOST}" == -darwin ]]; then
815	opts="${opts} ${egid}"	680	opts="${opts} ${egid}"
816	else	681	else
817	opts="${opts} -g ${egid}"	682	opts="${opts} -g ${egid}"
818	fi	683	fi
819	else	684	else
…		…
833	opts="${opts} ${eextra}"	698	opts="${opts} ${eextra}"
834		699
835	# add the group	700	# add the group
836	local oldsandbox="${SANDBOX_ON}"	701	local oldsandbox="${SANDBOX_ON}"
837	export SANDBOX_ON="0"	702	export SANDBOX_ON="0"
838	if use macos \|\| use ppc-macos ;	703	case ${CHOST} in
839	then	704	-darwin)
840	if [ ! -z "${eextra}" ];	705	if [ ! -z "${eextra}" ];
841	then	706	then
842	einfo "Extra options are not supported on macos yet"	707	einfo "Extra options are not supported on Darwin/OS X yet"
843	einfo "Please report the ebuild along with the info below"	708	einfo "Please report the ebuild along with the info below"
844	einfo "eextra: ${eextra}"	709	einfo "eextra: ${eextra}"
845	die "Required function missing"	710	die "Required function missing"
846	fi	711	fi
847		712
848	# If we need the next available	713	# If we need the next available
849	case ${egid} in	714	case ${egid} in
850	[!0-9]) # Non numeric	715	[!0-9]) # Non numeric
851	for egid in `jot 898 101`; do	716	for egid in $(seq 101 999); do
852	[ -z "`egetent group ${egid}`" ] && break	717	[ -z "`egetent group ${egid}`" ] && break
853	done	718	done
854	esac	719	esac
855	dscl . create /groups/${egroup} gid ${egid}	720	dscl . create /groups/${egroup} gid ${egid}
856	dscl . create /groups/${egroup} passwd '*'	721	dscl . create /groups/${egroup} passwd '*'
857	elif use x86-fbsd ; then	722	;;
		723
		724	-freebsd\|-dragonfly)
858	case ${egid} in	725	case ${egid} in
859	[!0-9]) # Non numeric	726	[!0-9]) # Non numeric
860	for egid in `jot 898 101`; do	727	for egid in $(seq 101 999); do
861	[ -z "`egetent group ${egid}`" ] && break	728	[ -z "`egetent group ${egid}`" ] && break
862	done	729	done
863	esac	730	esac
864	pw groupadd ${egroup} -g ${egid} \|\| die "enewgroup failed"	731	pw groupadd ${egroup} -g ${egid} \|\| die "enewgroup failed"
865	else	732	;;
		733
		734	-netbsd)
		735	case ${egid} in
		736	[!0-9]) # Non numeric
		737	for egid in $(seq 101 999); do
		738	[ -z "`egetent group ${egid}`" ] && break
		739	done
		740	esac
		741	groupadd -g ${egid} ${egroup} \|\| die "enewgroup failed"
		742	;;
		743
		744	*)
866	groupadd ${opts} ${egroup} \|\| die "enewgroup failed"	745	groupadd ${opts} ${egroup} \|\| die "enewgroup failed"
867	fi	746	;;
		747	esac
868	export SANDBOX_ON="${oldsandbox}"	748	export SANDBOX_ON="${oldsandbox}"
869	}	749	}
870		750
871	# Simple script to replace 'dos2unix' binaries	751	# Simple script to replace 'dos2unix' binaries
872	# vapier@gentoo.org	752	# vapier@gentoo.org
873	#	753	#
874	# edos2unix(file, <more files>...)	754	# edos2unix(file, <more files> ...)
875	edos2unix() {	755	edos2unix() {
876	for f in "$@"	756	for f in "$@"
877	do	757	do
878	cp "${f}" ${T}/edos2unix	758	cp "${f}" ${T}/edos2unix
879	sed 's/\r$//' ${T}/edos2unix > "${f}"	759	sed 's/\r$//' ${T}/edos2unix > "${f}"
880	done	760	done
881	}	761	}
882		762
		763
		764	##############################################################
		765	# START: Handle .desktop files and menu entries #
		766	# maybe this should be separated into a new eclass some time #
		767	# lanius@gentoo.org #
		768	##############################################################
		769
883	# Make a desktop file !	770	# Make a desktop file !
884	# Great for making those icons in kde/gnome startmenu !	771	# Great for making those icons in kde/gnome startmenu !
885	# Amaze your friends ! Get the women ! Join today !	772	# Amaze your friends ! Get the women ! Join today !
886	# gnome2 /usr/share/applications
887	# gnome1 /usr/share/gnome/apps/
888	# KDE ${KDEDIR}/share/applnk /usr/share/applnk
889	#	773	#
890	# make_desktop_entry(<binary>, [name], [icon], [type], [path])	774	# make_desktop_entry(<binary>, [name], [icon], [type], [path])
891	#	775	#
892	# binary: what binary does the app run with ?	776	# binary: what binary does the app run with ?
893	# name: the name that will show up in the menu	777	# name: the name that will show up in the menu
894	# icon: give your little like a pretty little icon ...	778	# icon: give your little like a pretty little icon ...
895	# this can be relative (to /usr/share/pixmaps) or	779	# this can be relative (to /usr/share/pixmaps) or
896	# a full path to an icon	780	# a full path to an icon
897	# type: what kind of application is this ? for categories:	781	# type: what kind of application is this ? for categories:
898	# http://www.freedesktop.org/standards/menu-spec/	782	# http://www.freedesktop.org/Standards/desktop-entry-spec
899	# path: if your app needs to startup in a specific dir	783	# path: if your app needs to startup in a specific dir
900	make_desktop_entry() {	784	make_desktop_entry() {
901	[ -z "$1" ] && eerror "You must specify the executable" && return 1	785	[[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
902		786
903	local exec="${1}"	787	local exec=${1}
904	local name="${2:-${PN}}"	788	local name=${2:-${PN}}
905	local icon="${3:-${PN}.png}"	789	local icon=${3:-${PN}.png}
906	local type="${4}"	790	local type=${4}
907	local subdir="${6}"	791	local path=${5}
908	local path="${5:-${GAMES_BINDIR}}"	792
909	if [ -z "${type}" ]	793	if [[ -z ${type} ]] ; then
910	then	794	local catmaj=${CATEGORY%%-*}
911	case ${CATEGORY} in	795	local catmin=${CATEGORY##*-}
912	"app-emulation")	796	case ${catmaj} in
913	type=Emulator	797	app)
914	subdir="Emulation"	798	case ${catmin} in
		799	admin) type=System;;
		800	cdr) type=DiscBurning;;
		801	dicts) type=Dictionary;;
		802	editors) type=TextEditor;;
		803	emacs) type=TextEditor;;
		804	emulation) type=Emulator;;
		805	laptop) type=HardwareSettings;;
		806	office) type=Office;;
		807	vim) type=TextEditor;;
		808	xemacs) type=TextEditor;;
		809	*) type=;;
		810	esac
915	;;	811	;;
916	"games-"*)	812
917	type=Game	813	dev)
918	subdir="Games"	814	type="Development"
919	;;	815	;;
920	"net-"*)	816
921	type=Network	817	games)
922	subdir="${type}"	818	case ${catmin} in
		819	action) type=ActionGame;;
		820	arcade) type=ArcadeGame;;
		821	board) type=BoardGame;;
		822	kid) type=KidsGame;;
		823	emulation) type=Emulator;;
		824	puzzle) type=LogicGame;;
		825	rpg) type=RolePlaying;;
		826	roguelike) type=RolePlaying;;
		827	simulation) type=Simulation;;
		828	sports) type=SportsGame;;
		829	strategy) type=StrategyGame;;
		830	*) type=;;
		831	esac
		832	type="Game;${type}"
923	;;	833	;;
		834
		835	mail)
		836	type="Network;Email"
		837	;;
		838
		839	media)
		840	case ${catmin} in
		841	gfx) type=Graphics;;
		842	radio) type=Tuner;;
		843	sound) type=Audio;;
		844	tv) type=TV;;
		845	video) type=Video;;
		846	*) type=;;
		847	esac
		848	type="AudioVideo;${type}"
		849	;;
		850
		851	net)
		852	case ${catmin} in
		853	dialup) type=Dialup;;
		854	ftp) type=FileTransfer;;
		855	im) type=InstantMessaging;;
		856	irc) type=IRCClient;;
		857	mail) type=Email;;
		858	news) type=News;;
		859	nntp) type=News;;
		860	p2p) type=FileTransfer;;
		861	*) type=;;
		862	esac
		863	type="Network;${type}"
		864	;;
		865
		866	sci)
		867	case ${catmin} in
		868	astro*) type=Astronomy;;
		869	bio*) type=Biology;;
		870	calc*) type=Calculator;;
		871	chem*) type=Chemistry;;
		872	geo*) type=Geology;;
		873	math*) type=Math;;
		874	*) type=;;
		875	esac
		876	type="Science;${type}"
		877	;;
		878
		879	www)
		880	case ${catmin} in
		881	client) type=WebBrowser;;
		882	*) type=;;
		883	esac
		884	type="Network"
		885	;;
		886
924	*)	887	*)
925	type=	888	type=
926	subdir=
927	;;	889	;;
928	esac	890	esac
929	fi	891	fi
		892	if [ "${SLOT}" == "0" ] ; then
		893	local desktop_name="${PN}"
		894	else
		895	local desktop_name="${PN}-${SLOT}"
		896	fi
930	local desktop="${T}/${exec}.desktop"	897	local desktop=${T}/${exec%% *}-${desktop_name}.desktop
931		898
932	echo "[Desktop Entry]	899	echo "[Desktop Entry]
933	Encoding=UTF-8	900	Encoding=UTF-8
934	Version=0.9.2	901	Version=0.9.2
935	Name=${name}	902	Name=${name}
…		…
938	Exec=${exec}	905	Exec=${exec}
939	Path=${path}	906	Path=${path}
940	Icon=${icon}	907	Icon=${icon}
941	Categories=Application;${type};" > "${desktop}"	908	Categories=Application;${type};" > "${desktop}"
942		909
943	if [ -d "/usr/share/applications" ]	910	(
944	then	911	# wrap the env here so that the 'insinto' call
		912	# doesn't corrupt the env of the caller
945	insinto /usr/share/applications	913	insinto /usr/share/applications
946	doins "${desktop}"	914	doins "${desktop}"
947	fi	915	)
		916	}
948		917
949	#if [ -d "/usr/share/gnome/apps" ]	918	# Make a GDM/KDM Session file
950	#then	919	#
951	# insinto /usr/share/gnome/apps/Games	920	# make_desktop_entry(<title>, <command>)
952	# doins ${desktop}	921	# title: File to execute to start the Window Manager
953	#fi	922	# command: Name of the Window Manager
954		923
955	#if [ ! -z "`ls /usr/kde/* 2>/dev/null`" ]	924	make_session_desktop() {
956	#then	925	[[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
957	# for ver in /usr/kde/*	926	[[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
958	# do
959	# insinto ${ver}/share/applnk/Games
960	# doins ${desktop}
961	# done
962	#fi
963		927
964	if [ -d "/usr/share/applnk" ]	928	local title=$1
965	then	929	local command=$2
966	insinto /usr/share/applnk/${subdir}	930	local desktop=${T}/${wm}.desktop
		931
		932	echo "[Desktop Entry]
		933	Encoding=UTF-8
		934	Name=${title}
		935	Comment=This session logs you into ${title}
		936	Exec=${command}
		937	TryExec=${command}
		938	Type=Application" > "${desktop}"
		939
		940	insinto /usr/share/xsessions
967	doins "${desktop}"	941	doins "${desktop}"
		942	}
		943
		944	domenu() {
		945	local i j
		946	insinto /usr/share/applications
		947	for i in "$@" ; do
		948	if [[ -f ${i} ]] ; then
		949	doins "${i}"
		950	elif [[ -d ${i} ]] ; then
		951	for j in "${i}"/*.desktop ; do
		952	doins "${j}"
		953	done
968	fi	954	fi
969		955	done
970	return 0
971	}	956	}
		957	newmenu() {
		958	insinto /usr/share/applications
		959	newins "$1" "$2"
		960	}
		961
		962	doicon() {
		963	local i j
		964	insinto /usr/share/pixmaps
		965	for i in "$@" ; do
		966	if [[ -f ${i} ]] ; then
		967	doins "${i}"
		968	elif [[ -d ${i} ]] ; then
		969	for j in "${i}"/*.png ; do
		970	doins "${j}"
		971	done
		972	fi
		973	done
		974	}
		975	newicon() {
		976	insinto /usr/share/pixmaps
		977	newins "$1" "$2"
		978	}
		979
		980	##############################################################
		981	# END: Handle .desktop files and menu entries #
		982	##############################################################
		983
972		984
973	# for internal use only (unpack_pdv and unpack_makeself)	985	# for internal use only (unpack_pdv and unpack_makeself)
974	find_unpackable_file() {	986	find_unpackable_file() {
975	local src="$1"	987	local src=$1
976	if [ -z "${src}" ]	988	if [[ -z ${src} ]] ; then
977	then
978	src="${DISTDIR}/${A}"	989	src=${DISTDIR}/${A}
979	else	990	else
980	if [ -e "${DISTDIR}/${src}" ]	991	if [[ -e ${DISTDIR}/${src} ]] ; then
981	then
982	src="${DISTDIR}/${src}"	992	src=${DISTDIR}/${src}
983	elif [ -e "${PWD}/${src}" ]	993	elif [[ -e ${PWD}/${src} ]] ; then
984	then
985	src="${PWD}/${src}"	994	src=${PWD}/${src}
986	elif [ -e "${src}" ]	995	elif [[ -e ${src} ]] ; then
987	then
988	src="${src}"	996	src=${src}
989	fi
990	fi	997	fi
991	[ ! -e "${src}" ] && die "Could not find requested archive ${src}"	998	fi
		999	[[ ! -e ${src} ]] && return 1
992	echo "${src}"	1000	echo "${src}"
993	}	1001	}
994		1002
995	# Unpack those pesky pdv generated files ...	1003	# Unpack those pesky pdv generated files ...
996	# They're self-unpacking programs with the binary package stuffed in	1004	# They're self-unpacking programs with the binary package stuffed in
…		…
1011	# lseek	1019	# lseek
1012	# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin	1020	# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1013	# lseek(3, -4, SEEK_END) = 2981250	1021	# lseek(3, -4, SEEK_END) = 2981250
1014	# thus we would pass in the value of '4' as the second parameter.	1022	# thus we would pass in the value of '4' as the second parameter.
1015	unpack_pdv() {	1023	unpack_pdv() {
1016	local src="`find_unpackable_file $1`"	1024	local src=$(find_unpackable_file $1)
1017	local sizeoff_t="$2"	1025	local sizeoff_t=$2
1018		1026
		1027	[[ -z ${src} ]] && die "Could not locate source for '$1'"
1019	[ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :("	1028	[[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1020		1029
1021	local shrtsrc="`basename ${src}`"	1030	local shrtsrc=$(basename "${src}")
1022	echo ">>> Unpacking ${shrtsrc} to ${PWD}"	1031	echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1023	local metaskip=`tail -c ${sizeoff_t} ${src} \| hexdump -e \"%i\"`	1032	local metaskip=`tail -c ${sizeoff_t} ${src} \| hexdump -e \"%i\"`
1024	local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} \| head -c ${sizeoff_t} \| hexdump -e \"%i\"`	1033	local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} \| head -c ${sizeoff_t} \| hexdump -e \"%i\"`
1025		1034
1026	# grab metadata for debug reasons	1035	# grab metadata for debug reasons
1027	local metafile="`mymktemp ${T}`"	1036	local metafile="$(emktemp)"
1028	tail -c +$((${metaskip}+1)) ${src} > ${metafile}	1037	tail -c +$((${metaskip}+1)) ${src} > ${metafile}
1029		1038
1030	# rip out the final file name from the metadata	1039	# rip out the final file name from the metadata
1031	local datafile="`tail -c +$((${metaskip}+1)) ${src} \| strings \| head -n 1`"	1040	local datafile="`tail -c +$((${metaskip}+1)) ${src} \| strings \| head -n 1`"
1032	datafile="`basename ${datafile}`"	1041	datafile="`basename ${datafile}`"
1033		1042
1034	# now lets uncompress/untar the file if need be	1043	# now lets uncompress/untar the file if need be
1035	local tmpfile="`mymktemp ${T}`"	1044	local tmpfile="$(emktemp)"
1036	tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \| head -c 512 > ${tmpfile}	1045	tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \| head -c 512 > ${tmpfile}
1037		1046
1038	local iscompressed="`file -b ${tmpfile}`"	1047	local iscompressed="`file -b ${tmpfile}`"
1039	if [ "${iscompressed:0:8}" == "compress" ] ; then	1048	if [ "${iscompressed:0:8}" == "compress" ] ; then
1040	iscompressed=1	1049	iscompressed=1
…		…
1085	# Unpack those pesky makeself generated files ...	1094	# Unpack those pesky makeself generated files ...
1086	# They're shell scripts with the binary package tagged onto	1095	# They're shell scripts with the binary package tagged onto
1087	# the end of the archive. Loki utilized the format as does	1096	# the end of the archive. Loki utilized the format as does
1088	# many other game companies.	1097	# many other game companies.
1089	#	1098	#
1090	# Usage: unpack_makeself [file to unpack] [offset]	1099	# Usage: unpack_makeself [file to unpack] [offset] [tail\|dd]
1091	# - If the file is not specified then unpack will utilize ${A}.	1100	# - If the file is not specified then unpack will utilize ${A}.
1092	# - If the offset is not specified then we will attempt to extract	1101	# - If the offset is not specified then we will attempt to extract
1093	# the proper offset from the script itself.	1102	# the proper offset from the script itself.
1094	unpack_makeself() {	1103	unpack_makeself() {
		1104	local src_input=${1:-${A}}
1095	local src="`find_unpackable_file $1`"	1105	local src=$(find_unpackable_file "${src_input}")
1096	local skip="$2"	1106	local skip=$2
		1107	local exe=$3
1097		1108
		1109	[[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
		1110
1098	local shrtsrc="`basename ${src}`"	1111	local shrtsrc=$(basename "${src}")
1099	echo ">>> Unpacking ${shrtsrc} to ${PWD}"	1112	echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1100	if [ -z "${skip}" ]	1113	if [[ -z ${skip} ]] ; then
1101	then
1102	local ver="`grep -a '#.*Makeself' ${src} \| awk '{print $NF}'`"	1114	local ver=$(grep -a '#.*Makeself' "${src}" \| awk '{print $NF}')
1103	local skip=0	1115	local skip=0
		1116	exe=tail
1104	case ${ver} in	1117	case ${ver} in
1105	1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same	1118	1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1106	skip=`grep -a ^skip= ${src} \| cut -d= -f2`	1119	skip=$(grep -a ^skip= "${src}" \| cut -d= -f2)
1107	;;	1120	;;
1108	2.0\|2.0.1)	1121	2.0\|2.0.1)
1109	skip=`grep -a ^$'\t'tail ${src} \| awk '{print $2}' \| cut -b2-`	1122	skip=$(grep -a ^$'\t'tail "${src}" \| awk '{print $2}' \| cut -b2-)
1110	;;	1123	;;
1111	2.1.1)	1124	2.1.1)
1112	skip=`grep -a ^offset= ${src} \| awk '{print $2}' \| cut -b2-`	1125	skip=$(grep -a ^offset= "${src}" \| awk '{print $2}' \| cut -b2-)
1113	let skip="skip + 1"	1126	let skip="skip + 1"
1114	;;	1127	;;
1115	2.1.2)	1128	2.1.2)
1116	skip=`grep -a ^offset= ${src} \| awk '{print $3}' \| head -n 1`	1129	skip=$(grep -a ^offset= "${src}" \| awk '{print $3}' \| head -n 1)
1117	let skip="skip + 1"	1130	let skip="skip + 1"
1118	;;	1131	;;
1119	2.1.3)	1132	2.1.3)
1120	skip=`grep -a ^offset= ${src} \| awk '{print $3}'`	1133	skip=`grep -a ^offset= "${src}" \| awk '{print $3}'`
1121	let skip="skip + 1"	1134	let skip="skip + 1"
		1135	;;
		1136	2.1.4\|2.1.5)
		1137	skip=$(grep -a offset=.head.wc "${src}" \| awk '{print $3}' \| head -n 1)
		1138	skip=$(head -n ${skip} "${src}" \| wc -c)
		1139	exe="dd"
1122	;;	1140	;;
1123	*)	1141	*)
1124	eerror "I'm sorry, but I was unable to support the Makeself file."	1142	eerror "I'm sorry, but I was unable to support the Makeself file."
1125	eerror "The version I detected was '${ver}'."	1143	eerror "The version I detected was '${ver}'."
1126	eerror "Please file a bug about the file ${shrtsrc} at"	1144	eerror "Please file a bug about the file ${shrtsrc} at"
…		…
1128	die "makeself version '${ver}' not supported"	1146	die "makeself version '${ver}' not supported"
1129	;;	1147	;;
1130	esac	1148	esac
1131	debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"	1149	debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1132	fi	1150	fi
		1151	case ${exe} in
		1152	tail) exe="tail -n +${skip} '${src}'";;
		1153	dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
		1154	*) die "makeself cant handle exe '${exe}'"
		1155	esac
1133		1156
1134	# lets grab the first few bytes of the file to figure out what kind of archive it is	1157	# lets grab the first few bytes of the file to figure out what kind of archive it is
1135	local tmpfile="`mymktemp ${T}`"	1158	local tmpfile="$(emktemp)"
1136	tail -n +${skip} ${src} 2>/dev/null \| head -c 512 > ${tmpfile}	1159	eval ${exe} 2>/dev/null \| head -c 512 > "${tmpfile}"
1137	local filetype="`file -b ${tmpfile}`"	1160	local filetype="$(file -b "${tmpfile}")"
1138	case ${filetype} in	1161	case ${filetype} in
1139	*tar\ archive)	1162	*tar\ archive)
1140	tail -n +${skip} ${src} \| tar --no-same-owner -xf -	1163	eval ${exe} \| tar --no-same-owner -xf -
1141	;;	1164	;;
1142	bzip2*)	1165	bzip2*)
1143	tail -n +${skip} ${src} \| bzip2 -dc \| tar --no-same-owner -xf -	1166	eval ${exe} \| bzip2 -dc \| tar --no-same-owner -xf -
1144	;;	1167	;;
1145	gzip*)	1168	gzip*)
1146	tail -n +${skip} ${src} \| tar --no-same-owner -xzf -	1169	eval ${exe} \| tar --no-same-owner -xzf -
1147	;;	1170	;;
1148	compress*)	1171	compress*)
1149	tail -n +${skip} ${src} \| gunzip \| tar --no-same-owner -xf -	1172	eval ${exe} \| gunzip \| tar --no-same-owner -xf -
1150	;;	1173	;;
1151	*)	1174	*)
1152	eerror "Unknown filetype \"${filetype}\" ?"	1175	eerror "Unknown filetype \"${filetype}\" ?"
1153	false	1176	false
1154	;;	1177	;;
…		…
1163	check_license() {	1186	check_license() {
1164	local lic=$1	1187	local lic=$1
1165	if [ -z "${lic}" ] ; then	1188	if [ -z "${lic}" ] ; then
1166	lic="${PORTDIR}/licenses/${LICENSE}"	1189	lic="${PORTDIR}/licenses/${LICENSE}"
1167	else	1190	else
1168	if [ -e "${PORTDIR}/licenses/${src}" ] ; then	1191	if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1169	lic="${PORTDIR}/licenses/${src}"	1192	lic="${PORTDIR}/licenses/${lic}"
1170	elif [ -e "${PWD}/${src}" ] ; then	1193	elif [ -e "${PWD}/${lic}" ] ; then
1171	lic="${PWD}/${src}"	1194	lic="${PWD}/${lic}"
1172	elif [ -e "${src}" ] ; then	1195	elif [ -e "${lic}" ] ; then
1173	lic="${src}"	1196	lic="${lic}"
1174	fi
1175	fi	1197	fi
		1198	fi
1176	[ ! -f "${lic}" ] && die "Could not find requested license ${src}"	1199	[ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1177	local l="`basename ${lic}`"	1200	local l="`basename ${lic}`"
1178		1201
1179	# here is where we check for the licenses the user already	1202	# here is where we check for the licenses the user already
1180	# accepted ... if we don't find a match, we make the user accept	1203	# accepted ... if we don't find a match, we make the user accept
1181	local shopts=$-	1204	local shopts=$-
…		…
1187	return 0	1210	return 0
1188	fi	1211	fi
1189	done	1212	done
1190	set +o noglob; set -$shopts #reset old shell opts	1213	set +o noglob; set -$shopts #reset old shell opts
1191		1214
1192	local licmsg="`mymktemp ${T}`"	1215	local licmsg="$(emktemp)"
1193	cat << EOF > ${licmsg}	1216	cat << EOF > ${licmsg}
1194	**********************************************************	1217	**********************************************************
1195	The following license outlines the terms of use of this	1218	The following license outlines the terms of use of this
1196	package. You MUST accept this license for installation to	1219	package. You MUST accept this license for installation to
1197	continue. When you are done viewing, hit 'q'. If you	1220	continue. When you are done viewing, hit 'q'. If you
…		…
1237	# first we figure out how many cds we're dealing with by	1260	# first we figure out how many cds we're dealing with by
1238	# the # of files they gave us	1261	# the # of files they gave us
1239	local cdcnt=0	1262	local cdcnt=0
1240	local f=	1263	local f=
1241	for f in "$@" ; do	1264	for f in "$@" ; do
1242	cdcnt=$((cdcnt + 1))	1265	((++cdcnt))
1243	export CDROM_CHECK_${cdcnt}="$f"	1266	export CDROM_CHECK_${cdcnt}="$f"
1244	done	1267	done
1245	export CDROM_TOTAL_CDS=${cdcnt}	1268	export CDROM_TOTAL_CDS=${cdcnt}
1246	export CDROM_CURRENT_CD=1	1269	export CDROM_CURRENT_CD=1
1247		1270
1248	# now we see if the user gave use CD_ROOT ...	1271	# now we see if the user gave use CD_ROOT ...
1249	# if they did, let's just believe them that it's correct	1272	# if they did, let's just believe them that it's correct
1250	if [ ! -z "${CD_ROOT}" ] ; then	1273	if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1251	export CDROM_ROOT="${CD_ROOT}"
1252	einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1253	return
1254	fi
1255	# do the same for CD_ROOT_X
1256	if [ ! -z "${CD_ROOT_1}" ] ; then
1257	local var=	1274	local var=
1258	cdcnt=0	1275	cdcnt=0
1259	while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do	1276	while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1260	cdcnt=$((cdcnt + 1))	1277	((++cdcnt))
1261	var="CD_ROOT_${cdcnt}"	1278	var="CD_ROOT_${cdcnt}"
		1279	[[ -z ${!var} ]] && var="CD_ROOT"
1262	if [ -z "${!var}" ] ; then	1280	if [[ -z ${!var} ]] ; then
1263	eerror "You must either use just the CD_ROOT"	1281	eerror "You must either use just the CD_ROOT"
1264	eerror "or specify ALL the CD_ROOT_X variables."	1282	eerror "or specify ALL the CD_ROOT_X variables."
1265	eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."	1283	eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1266	die "could not locate CD_ROOT_${cdcnt}"	1284	die "could not locate CD_ROOT_${cdcnt}"
1267	fi	1285	fi
1268	export CDROM_ROOTS_${cdcnt}="${!var}"
1269	done	1286	done
1270	export CDROM_ROOT=${CDROM_ROOTS_1}	1287	export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1271	einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"	1288	einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
		1289	export CDROM_SET=-1
		1290	for f in ${CDROM_CHECK_1//:/ } ; do
		1291	((++CDROM_SET))
		1292	[[ -e ${CD_ROOT}/${f} ]] && break
		1293	done
		1294	export CDROM_MATCH=${f}
1272	return	1295	return
1273	fi	1296	fi
1274		1297
		1298	# User didn't help us out so lets make sure they know they can
		1299	# simplify the whole process ...
1275	if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then	1300	if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1276	einfon "This ebuild will need the "	1301	einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1277	if [ -z "${CDROM_NAME}" ] ; then
1278	echo "cdrom for ${PN}."
1279	else
1280	echo "${CDROM_NAME}."
1281	fi
1282	echo	1302	echo
1283	einfo "If you do not have the CD, but have the data files"	1303	einfo "If you do not have the CD, but have the data files"
1284	einfo "mounted somewhere on your filesystem, just export"	1304	einfo "mounted somewhere on your filesystem, just export"
1285	einfo "the variable CD_ROOT so that it points to the"	1305	einfo "the variable CD_ROOT so that it points to the"
1286	einfo "directory containing the files."	1306	einfo "directory containing the files."
1287	echo	1307	echo
		1308	einfo "For example:"
		1309	einfo "export CD_ROOT=/mnt/cdrom"
		1310	echo
1288	else	1311	else
1289	einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."	1312	einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1290	cdcnt=0	1313	cdcnt=0
1291	while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do	1314	while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1292	cdcnt=$((cdcnt + 1))	1315	((++cdcnt))
1293	var="CDROM_NAME_${cdcnt}"	1316	var="CDROM_NAME_${cdcnt}"
1294	[ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}"	1317	[[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1295	done	1318	done
1296	echo	1319	echo
1297	einfo "If you do not have the CDs, but have the data files"	1320	einfo "If you do not have the CDs, but have the data files"
1298	einfo "mounted somewhere on your filesystem, just export"	1321	einfo "mounted somewhere on your filesystem, just export"
1299	einfo "the following variables so they point to the right place:"	1322	einfo "the following variables so they point to the right place:"
1300	einfon ""	1323	einfon ""
1301	cdcnt=0	1324	cdcnt=0
1302	while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do	1325	while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1303	cdcnt=$((cdcnt + 1))	1326	((++cdcnt))
1304	echo -n " CD_ROOT_${cdcnt}"	1327	echo -n " CD_ROOT_${cdcnt}"
1305	done	1328	done
1306	echo	1329	echo
1307	einfo "Or, if you have all the files in the same place, or"	1330	einfo "Or, if you have all the files in the same place, or"
1308	einfo "you only have one cdrom, you can export CD_ROOT"	1331	einfo "you only have one cdrom, you can export CD_ROOT"
1309	einfo "and that place will be used as the same data source"	1332	einfo "and that place will be used as the same data source"
1310	einfo "for all the CDs."	1333	einfo "for all the CDs."
1311	echo	1334	echo
		1335	einfo "For example:"
		1336	einfo "export CD_ROOT_1=/mnt/cdrom"
		1337	echo
1312	fi	1338	fi
		1339
		1340	export CDROM_SET=""
1313	export CDROM_CURRENT_CD=0	1341	export CDROM_CURRENT_CD=0
1314	cdrom_load_next_cd	1342	cdrom_load_next_cd
1315	}	1343	}
1316		1344
1317	# this is only used when you need access to more than one cd.	1345	# this is only used when you need access to more than one cd.
1318	# when you have finished using the first cd, just call this function.	1346	# when you have finished using the first cd, just call this function.
1319	# when it returns, CDROM_ROOT will be pointing to the second cd.	1347	# when it returns, CDROM_ROOT will be pointing to the second cd.
1320	# remember, you can only go forward in the cd chain, you can't go back.	1348	# remember, you can only go forward in the cd chain, you can't go back.
1321	cdrom_load_next_cd() {	1349	cdrom_load_next_cd() {
1322	export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1323	local var=	1350	local var
1324		1351	((++CDROM_CURRENT_CD))
1325	if [ ! -z "${CD_ROOT}" ] ; then
1326	einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1327	return
1328	fi
1329		1352
1330	unset CDROM_ROOT	1353	unset CDROM_ROOT
1331	var=CDROM_ROOTS_${CDROM_CURRENT_CD}	1354	var=CD_ROOT_${CDROM_CURRENT_CD}
		1355	[[ -z ${!var} ]] && var="CD_ROOT"
1332	if [ -z "${!var}" ] ; then	1356	if [[ -z ${!var} ]] ; then
1333	var="CDROM_CHECK_${CDROM_CURRENT_CD}"	1357	var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1334	cdrom_locate_file_on_cd ${!var}	1358	_cdrom_locate_file_on_cd ${!var}
1335	else	1359	else
1336	export CDROM_ROOT="${!var}"	1360	export CDROM_ROOT=${!var}
1337	fi	1361	fi
1338		1362
1339	einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"	1363	einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1340	}	1364	}
1341		1365
…		…
1344	# all it does is try to locate a give file on a cd ... if the cd isn't	1368	# all it does is try to locate a give file on a cd ... if the cd isn't
1345	# found, then a message asking for the user to insert the cdrom will be	1369	# found, then a message asking for the user to insert the cdrom will be
1346	# displayed and we'll hang out here until:	1370	# displayed and we'll hang out here until:
1347	# (1) the file is found on a mounted cdrom	1371	# (1) the file is found on a mounted cdrom
1348	# (2) the user hits CTRL+C	1372	# (2) the user hits CTRL+C
1349	cdrom_locate_file_on_cd() {	1373	_cdrom_locate_file_on_cd() {
1350	while [ -z "${CDROM_ROOT}" ] ; do
1351	local dir="$(dirname ${@})"
1352	local file="$(basename ${@})"
1353	local mline=""	1374	local mline=""
1354	local showedmsg=0	1375	local showedmsg=0
1355		1376
1356	for mline in `mount \| egrep -e '(iso\|cdrom)' \| awk '{print $3}'` ; do	1377	while [[ -z ${CDROM_ROOT} ]] ; do
		1378	local i=0
		1379	local -a cdset=(${*//:/ })
		1380	if [[ -n ${CDROM_SET} ]] ; then
		1381	cdset=(${cdset[${CDROM_SET}]})
		1382	fi
		1383
		1384	while [[ -n ${cdset[${i}]} ]] ; do
		1385	local dir=$(dirname ${cdset[${i}]})
		1386	local file=$(basename ${cdset[${i}]})
		1387
		1388	for mline in $(mount \| gawk '/(iso\|cdrom\|fs=cdfss)/ {print $3}') ; do
1357	[ -d "${mline}/${dir}" ] \|\| continue	1389	[[ -d ${mline}/${dir} ]] \|\| continue
1358	[ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \	1390	if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1359	&& export CDROM_ROOT=${mline}	1391	export CDROM_ROOT=${mline}
		1392	export CDROM_SET=${i}
		1393	export CDROM_MATCH=${cdset[${i}]}
		1394	return
		1395	fi
		1396	done
		1397
		1398	((++i))
1360	done	1399	done
1361		1400
1362	if [ -z "${CDROM_ROOT}" ] ; then
1363	echo	1401	echo
1364	if [ ${showedmsg} -eq 0 ] ; then	1402	if [[ ${showedmsg} -eq 0 ]] ; then
1365	if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then	1403	if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1366	if [ -z "${CDROM_NAME}" ] ; then	1404	if [[ -z ${CDROM_NAME} ]] ; then
1367	einfo "Please insert the cdrom for ${PN} now !"	1405	einfo "Please insert+mount the cdrom for ${PN} now !"
1368	else
1369	einfo "Please insert the ${CDROM_NAME} cdrom now !"
1370	fi
1371	else	1406	else
1372	if [ -z "${CDROM_NAME_1}" ] ; then
1373	einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1374	else
1375	local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1376	einfo "Please insert+mount the ${!var} cdrom now !"	1407	einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1377	fi
1378	fi	1408	fi
1379	showedmsg=1	1409	else
		1410	if [[ -z ${CDROM_NAME_1} ]] ; then
		1411	einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
		1412	else
		1413	local var="CDROM_NAME_${CDROM_CURRENT_CD}"
		1414	einfo "Please insert+mount the ${!var} cdrom now !"
		1415	fi
1380	fi	1416	fi
		1417	showedmsg=1
		1418	fi
1381	einfo "Press return to scan for the cd again"	1419	einfo "Press return to scan for the cd again"
1382	einfo "or hit CTRL+C to abort the emerge."	1420	einfo "or hit CTRL+C to abort the emerge."
1383	read	1421	echo
1384	fi	1422	einfo "If you are having trouble with the detection"
		1423	einfo "of your CD, it is possible that you do not have"
		1424	einfo "Joliet support enabled in your kernel. Please"
		1425	einfo "check that CONFIG_JOLIET is enabled in your kernel."
		1426	read \|\| die "something is screwed with your system"
1385	done	1427	done
1386	}	1428	}
1387		1429
1388	# Make sure that LINGUAS only contains languages that	1430	# Make sure that LINGUAS only contains languages that
1389	# a package can support	1431	# a package can support
…		…
1397	# directories and uses the intersection of the lists.	1439	# directories and uses the intersection of the lists.
1398	# The -u builds a list of po files found in all the	1440	# The -u builds a list of po files found in all the
1399	# directories and uses the union of the lists.	1441	# directories and uses the union of the lists.
1400	strip-linguas() {	1442	strip-linguas() {
1401	local ls newls	1443	local ls newls
1402	if [ "$1" == "-i" ] \|\| [ "$1" == "-u" ] ; then	1444	if [[ $1 == "-i" ]] \|\| [[ $1 == "-u" ]] ; then
1403	local op="$1"; shift	1445	local op=$1; shift
1404	ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift	1446	ls=" $(find "$1" -name '*.po' -exec basename {} \;) "; shift
1405	local d f	1447	local d f
1406	for d in "$@" ; do	1448	for d in "$@" ; do
1407	if [ "${op}" == "-u" ] ; then	1449	if [[ ${op} == "-u" ]] ; then
1408	newls="${ls}"	1450	newls=${ls}
1409	else	1451	else
1410	newls=""	1452	newls=""
1411	fi	1453	fi
1412	for f in $(find "$d" -name '*.po' -printf '%f ') ; do	1454	for f in $(find "$d" -name '*.po' -exec basename {} \;) ; do
1413	if [ "${op}" == "-i" ] ; then	1455	if [[ ${op} == "-i" ]] ; then
1414	[ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}"	1456	[[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1415	else	1457	else
1416	[ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}"	1458	[[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1417	fi	1459	fi
1418	done	1460	done
1419	ls="${newls}"	1461	ls=${newls}
1420	done	1462	done
1421	ls="${ls//.po}"	1463	ls=${ls//.po}
1422	else	1464	else
1423	ls="$@"	1465	ls=$@
1424	fi	1466	fi
1425		1467
1426	ls=" ${ls} "	1468	ls=" ${ls} "
1427	newls=""	1469	newls=""
1428	for f in ${LINGUAS} ; do	1470	for f in ${LINGUAS} ; do
1429	if [ "${ls/ ${f} /}" != "${ls}" ] ; then	1471	if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1430	nl="${newls} ${f}"	1472	newls="${newls} ${f}"
1431	else	1473	else
1432	ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"	1474	ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1433	fi	1475	fi
1434	done	1476	done
1435	if [ -z "${newls}" ] ; then	1477	if [[ -z ${newls} ]] ; then
1436	unset LINGUAS	1478	export LINGUAS=""
1437	else	1479	else
1438	export LINGUAS="${newls}"	1480	export LINGUAS=${newls:1}
1439	fi	1481	fi
1440	}	1482	}
1441		1483
1442	# moved from kernel.eclass since they are generally useful outside of	1484	# moved from kernel.eclass since they are generally useful outside of
1443	# kernel.eclass -iggy (20041002)	1485	# kernel.eclass -iggy (20041002)
…		…
1445	# the following functions are useful in kernel module ebuilds, etc.	1487	# the following functions are useful in kernel module ebuilds, etc.
1446	# for an example see ivtv or drbd ebuilds	1488	# for an example see ivtv or drbd ebuilds
1447		1489
1448	# set's ARCH to match what the kernel expects	1490	# set's ARCH to match what the kernel expects
1449	set_arch_to_kernel() {	1491	set_arch_to_kernel() {
		1492	i=10
		1493	while ((i--)) ; do
		1494	ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
		1495	done
1450	export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"	1496	export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1451	case ${ARCH} in	1497	case ${ARCH} in
1452	x86) export ARCH="i386";;	1498	x86) export ARCH="i386";;
1453	amd64) export ARCH="x86_64";;	1499	amd64) export ARCH="x86_64";;
1454	hppa) export ARCH="parisc";;	1500	hppa) export ARCH="parisc";;
1455	mips) export ARCH="mips";;	1501	mips) export ARCH="mips";;
		1502	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!
1456	*) export ARCH="${ARCH}";;	1503	*) export ARCH="${ARCH}";;
1457	esac	1504	esac
1458	}	1505	}
1459		1506
1460	# set's ARCH back to what portage expects	1507	# set's ARCH back to what portage expects
1461	set_arch_to_portage() {	1508	set_arch_to_portage() {
		1509	i=10
		1510	while ((i--)) ; do
		1511	ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
		1512	done
1462	export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"	1513	export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1463	}	1514	}
		1515
		1516	# Jeremy Huddleston <eradicator@gentoo.org>:
		1517	# preserve_old_lib /path/to/libblah.so.0
		1518	# preserve_old_lib_notify /path/to/libblah.so.0
		1519	#
		1520	# These functions are useful when a lib in your package changes --library. Such
		1521	# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
		1522	# would break packages that link against it. Most people get around this
		1523	# by using the portage SLOT mechanism, but that is not always a relevant
		1524	# solution, so instead you can add the following to your ebuilds:
		1525	#
		1526	# src_install() {
		1527	# ...
		1528	# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
		1529	# ...
		1530	# }
		1531	#
		1532	# pkg_postinst() {
		1533	# ...
		1534	# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
		1535	# ...
		1536	# }
		1537
		1538	preserve_old_lib() {
		1539	LIB=$1
		1540
		1541	if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
		1542	SONAME=`basename ${LIB}`
		1543	DIRNAME=`dirname ${LIB}`
		1544
		1545	dodir ${DIRNAME}
		1546	cp ${ROOT}${LIB} ${D}${DIRNAME}
		1547	touch ${D}${LIB}
		1548	fi
		1549	}
		1550
		1551	preserve_old_lib_notify() {
		1552	LIB=$1
		1553
		1554	if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
		1555	SONAME=`basename ${LIB}`
		1556
		1557	ewarn "An old version of an installed library was detected on your system."
		1558	ewarn "In order to avoid breaking packages that link against it, this older version"
		1559	ewarn "is not being removed. In order to make full use of this newer version,"
		1560	ewarn "you will need to execute the following command:"
		1561	ewarn " revdep-rebuild --library ${SONAME}"
		1562	ewarn
		1563	ewarn "After doing that, you can safely remove ${LIB}"
		1564	ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
		1565	fi
		1566	}
		1567
		1568	# Hack for people to figure out if a package was built with
		1569	# certain USE flags
		1570	#
		1571	# Usage: built_with_use [-a\|-o] <DEPEND ATOM> <List of USE flags>
		1572	# ex: built_with_use xchat gtk2
		1573	#
		1574	# Flags: -a all USE flags should be utilized
		1575	# -o at least one USE flag should be utilized
		1576	# Note: the default flag is '-a'
		1577	built_with_use() {
		1578	local opt=$1
		1579	[[ ${opt:0:1} = "-" ]] && shift \|\| opt="-a"
		1580
		1581	local PKG=$(best_version $1)
		1582	shift
		1583
		1584	local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
		1585
		1586	# if the USE file doesnt exist, assume the $PKG is either
		1587	# injected or package.provided
		1588	[[ ! -e ${USEFILE} ]] && return 0
		1589
		1590	local USE_BUILT=$(<${USEFILE})
		1591	while [[ $# -gt 0 ]] ; do
		1592	if [[ ${opt} = "-o" ]] ; then
		1593	has $1 ${USE_BUILT} && return 0
		1594	else
		1595	has $1 ${USE_BUILT} \|\| return 1
		1596	fi
		1597	shift
		1598	done
		1599	[[ ${opt} = "-a" ]]
		1600	}
		1601
		1602	# Many configure scripts wrongly bail when a C++ compiler
		1603	# could not be detected. #73450
		1604	epunt_cxx() {
		1605	local dir=$1
		1606	[[ -z ${dir} ]] && dir=${S}
		1607	ebegin "Removing useless C++ checks"
		1608	local f
		1609	for f in $(find ${dir} -name configure) ; do
		1610	patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
		1611	done
		1612	eend 0
		1613	}
		1614
		1615	# dopamd <file> [more files]
		1616	#
		1617	# Install pam auth config file in /etc/pam.d
		1618	dopamd() {
		1619	[[ -z $1 ]] && die "dopamd requires at least one argument"
		1620
		1621	use pam \|\| return 0
		1622
		1623	INSDESTTREE=/etc/pam.d \
		1624	doins "$@" \|\| die "failed to install $@"
		1625	}
		1626	# newpamd <old name> <new name>
		1627	#
		1628	# Install pam file <old name> as <new name> in /etc/pam.d
		1629	newpamd() {
		1630	[[ $# -ne 2 ]] && die "newpamd requires two arguements"
		1631
		1632	use pam \|\| return 0
		1633
		1634	INSDESTTREE=/etc/pam.d \
		1635	newins "$1" "$2" \|\| die "failed to install $1 as $2"
		1636	}
		1637
		1638	# make a wrapper script ...
		1639	# NOTE: this was originally games_make_wrapper, but I noticed other places where
		1640	# this could be used, so I have moved it here and made it not games-specific
		1641	# -- wolf31o2
		1642	# $1 == wrapper name
		1643	# $2 == binary to run
		1644	# $3 == directory to chdir before running binary
		1645	# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
		1646	# $5 == path for wrapper
		1647	make_wrapper() {
		1648	local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
		1649	local tmpwrapper=$(emktemp)
		1650	# We don't want to quote ${bin} so that people can pass complex
		1651	# things as $bin ... "./someprog --args"
		1652	cat << EOF > "${tmpwrapper}"
		1653	#!/bin/sh
		1654	cd "${chdir:-.}"
		1655	if [ -n "${libdir}" ] ; then
		1656	if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
		1657	export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
		1658	else
		1659	export LD_LIBRARY_PATH="${libdir}"
		1660	fi
		1661	fi
		1662	exec ${bin} "\$@"
		1663	EOF
		1664	chmod go+rx "${tmpwrapper}"
		1665	if [[ -n ${path} ]] ; then
		1666	exeinto "${path}"
		1667	newexe "${tmpwrapper}" "${wrapper}"
		1668	else
		1669	newbin "${tmpwrapper}" "${wrapper}"
		1670	fi
		1671	}

 Legend:



Removed from v.1.110
 


changed lines


 
Added in v.1.228
 Legend:



Removed from v.1.110
 


changed lines


 
Added in v.1.228
-Removed from v.1.110
+Added in v.1.228

	ViewVC Help
Powered by ViewVC 1.1.13