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

Diff of /eclass/eutils.eclass

Parent Directory | Revision Log | View Patch Patch

Revision 1.128		Revision 1.189
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.128 2004/12/23 09:20:45 eradicator Exp $	3	# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.189 2005/07/06 20:45:12 agriffis 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
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	#
54	# Jeremy Huddleston <eradicator@gentoo.org> (23 Dec 2004):
55	# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set,
56	# fall back on old behavior. Any profile that has these set should also
57	# depend on a newer version of portage (not yet released) which uses these
58	# over CONF_LIBDIR in econf, dolib, etc...
59	#
60	# For now, this is restricted to the sparc64-multilib ${PROFILE_ARCH} as it
61	# is still in testing.
62	get_libdir() {
63	LIBDIR_TEST=$(type econf)
64	if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
65	# if there is an override, we want to use that... always.
66	CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
67	# We don't need to know the verison of portage. We only need to know
68	# if there is support for CONF_LIBDIR in econf and co.
69	# Danny van Dyk <kugelfang@gentoo.org> 2004/17/09
70	#elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then
71	# # and if there isnt an override, and we're using a version of
72	# # portage without CONF_LIBDIR support, force the use of lib. dolib
73	# # and friends from portage 2.0.50 wont be too happy otherwise.
74	# CONF_LIBDIR="lib"
75	#fi
76	elif [ "${PROFILE_ARCH}" = "sparc64-multilib" ]; then # Using eradicator's LIBDIR_<abi> approach...
77	CONF_LIBDIR="$(get_abi_LIBDIR)"
78	elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
79	# will be <portage-2.0.51_pre20
80	CONF_LIBDIR="lib"
81	fi
82	# and of course, default to lib if CONF_LIBDIR isnt set
83	echo ${CONF_LIBDIR:=lib}
84	unset LIBDIR_TEST
85	}
86
87	get_multilibdir() {
88	[ "${PROFILE_ARCH}" = "sparc64-multilib" ] && die "get_multilibdir called, but it shouldn't be needed on sparc64-multilib"
89	echo ${CONF_MULTILIBDIR:=lib32}
90	}
91
92	# Sometimes you need to override the value returned by get_libdir. A good
93	# example of this is xorg-x11, where lib32 isnt a supported configuration,
94	# and where lib64 -must- be used on amd64 (for applications that need lib
95	# to be 32bit, such as adobe acrobat). Note that this override also bypasses
96	# portage version sanity checking.
97	# get_libdir_override expects one argument, the result get_libdir should
98	# return:
99	#
100	# get_libdir_override lib64
101	#
102	# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
103	get_libdir_override() {
104	[ "${PROFILE_ARCH}" = "sparc64-multilib" ] && die "get_libdir_override called, but it shouldn't be needed on sparc64-multilib..."
105	CONF_LIBDIR="$1"
106	CONF_LIBDIR_OVERRIDE="$1"
107	}
108
109	# This function generate linker scripts in /usr/lib for dynamic	46	# This function generate linker scripts in /usr/lib for dynamic
110	# 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
111	# 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
112	# 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
113	# 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
…		…
127	gen_usr_ldscript() {	64	gen_usr_ldscript() {
128	local libdir="$(get_libdir)"	65	local libdir="$(get_libdir)"
129	# Just make sure it exists	66	# Just make sure it exists
130	dodir /usr/${libdir}	67	dodir /usr/${libdir}
131		68
		69	for lib in "${@}" ; do
132	cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT	70	cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
133	/* GNU ld script	71	/* GNU ld script
134	Because Gentoo have critical dynamic libraries	72	Since Gentoo has critical dynamic libraries
135	in /lib, and the static versions in /usr/lib, we	73	in /lib, and the static versions in /usr/lib,
136	need to have a "fake" dynamic lib in /usr/lib,	74	we need to have a "fake" dynamic lib in /usr/lib,
137	otherwise we run into linking problems.	75	otherwise we run into linking problems.
138	See bug #4411 on http://bugs.gentoo.org/ for	76
139	more info. */	77	See bug http://bugs.gentoo.org/4411 for more info.
		78	*/
140	GROUP ( /${libdir}/${1} )	79	GROUP ( /${libdir}/${lib} )
141	END_LDSCRIPT	80	END_LDSCRIPT
142	fperms a+x "/usr/${libdir}/${1}"	81	fperms a+x "/usr/${libdir}/${lib}"
		82	done
143	}	83	}
144		84
145	# Simple function to draw a line consisting of '=' the same length as $*	85	# Simple function to draw a line consisting of '=' the same length as $*
		86	# - only to be used by epatch()
146	#	87	#
147	# <azarah@gentoo.org> (11 Nov 2002)	88	# <azarah@gentoo.org> (11 Nov 2002)
148	#	89	#
149	draw_line() {	90	draw_line() {
150	local i=0	91	local i=0
…		…
176	EPATCH_SOURCE="${WORKDIR}/patch"	117	EPATCH_SOURCE="${WORKDIR}/patch"
177	# Default extension for patches	118	# Default extension for patches
178	EPATCH_SUFFIX="patch.bz2"	119	EPATCH_SUFFIX="patch.bz2"
179	# Default options for patch	120	# Default options for patch
180	# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571	121	# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
181	EPATCH_OPTS="-g0"	122	# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
		123	EPATCH_OPTS="-g0 --no-backup-if-mismatch"
182	# List of patches not to apply. Not this is only file names,	124	# List of patches not to apply. Not this is only file names,
183	# and not the full path ..	125	# and not the full path ..
184	EPATCH_EXCLUDE=""	126	EPATCH_EXCLUDE=""
185	# Change the printed message for a single patch.	127	# Change the printed message for a single patch.
186	EPATCH_SINGLE_MSG=""	128	EPATCH_SINGLE_MSG=""
		129	# Change the printed message for multiple patches.
		130	EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
187	# Force applying bulk patches even if not following the style:	131	# Force applying bulk patches even if not following the style:
188	#	132	#
189	# ??_${ARCH}_foo.${EPATCH_SUFFIX}	133	# ??_${ARCH}_foo.${EPATCH_SUFFIX}
190	#	134	#
191	EPATCH_FORCE="no"	135	EPATCH_FORCE="no"
…		…
232	local x=""	176	local x=""
233		177
234	if [ "$#" -gt 1 ]	178	if [ "$#" -gt 1 ]
235	then	179	then
236	local m=""	180	local m=""
237	einfo "${#} patches to apply ..."
238	for m in "$@" ; do	181	for m in "$@" ; do
239	epatch "${m}"	182	epatch "${m}"
240	done	183	done
241	return 0	184	return 0
242	fi	185	fi
…		…
267		210
268	echo	211	echo
269	eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"	212	eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
270	eerror	213	eerror
271	eerror " ${EPATCH_SOURCE}"	214	eerror " ${EPATCH_SOURCE}"
		215	eerror " ( ${EPATCH_SOURCE##*/} )"
272	echo	216	echo
273	die "Cannot find \$EPATCH_SOURCE!"	217	die "Cannot find \$EPATCH_SOURCE!"
274	fi	218	fi
275		219
276	local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"	220	local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
…		…
295	;;	239	;;
296	esac	240	esac
297		241
298	if [ "${SINGLE_PATCH}" = "no" ]	242	if [ "${SINGLE_PATCH}" = "no" ]
299	then	243	then
300	einfo "Applying various patches (bugfixes/updates) ..."	244	einfo "${EPATCH_MULTI_MSG}"
301	fi	245	fi
302	for x in ${EPATCH_SOURCE}	246	for x in ${EPATCH_SOURCE}
303	do	247	do
304	# New ARCH dependant patch naming scheme ...	248	# New ARCH dependant patch naming scheme ...
305	#	249	#
306	# ???_arch_foo.patch	250	# ???_arch_foo.patch
307	#	251	#
308	if [ -f ${x} ] && \	252	if [ -f ${x} ] && \
309	([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] \|\| \	253	([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] \|\| \
310	[ "${EPATCH_FORCE}" = "yes" ])	254	[ "${EPATCH_FORCE}" = "yes" ])
311	then	255	then
312	local count=0	256	local count=0
313	local popts="${EPATCH_OPTS}"	257	local popts="${EPATCH_OPTS}"
		258	local patchname=${x##*/}
314		259
315	if [ -n "${EPATCH_EXCLUDE}" ]	260	if [ -n "${EPATCH_EXCLUDE}" ]
316	then	261	then
317	if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ]	262	if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
318	then	263	then
319	continue	264	continue
320	fi	265	fi
321	fi	266	fi
322		267
…		…
324	then	269	then
325	if [ -n "${EPATCH_SINGLE_MSG}" ]	270	if [ -n "${EPATCH_SINGLE_MSG}" ]
326	then	271	then
327	einfo "${EPATCH_SINGLE_MSG}"	272	einfo "${EPATCH_SINGLE_MSG}"
328	else	273	else
329	einfo "Applying ${x##*/} ..."	274	einfo "Applying ${patchname} ..."
330	fi	275	fi
331	else	276	else
332	einfo " ${x##*/} ..."	277	einfo " ${patchname} ..."
333	fi	278	fi
334		279
335	echo "***** ${x##/} ***" > ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##/}	280	echo "*** ${patchname} **" > ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##*/}
336	echo >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##*/}	281	echo >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}
337		282
338	# Allow for prefix to differ ... im lazy, so shoot me :/	283	# Allow for prefix to differ ... im lazy, so shoot me :/
339	while [ "${count}" -lt 5 ]	284	while [ "${count}" -lt 5 ]
340	do	285	do
341	# Generate some useful debug info ...	286	# Generate some useful debug info ...
342	draw_line "***** ${x##/} ***" >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##/}	287	draw_line "*** ${patchname} **" >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##*/}
343	echo >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##*/}	288	echo >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}
344		289
345	if [ "${PATCH_SUFFIX}" != "patch" ]	290	if [ "${PATCH_SUFFIX}" != "patch" ]
346	then	291	then
347	echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##*/}	292	echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}
348	echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##*/}	293	echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}
349	else	294	else
350	PATCH_TARGET="${x}"	295	PATCH_TARGET="${x}"
351	fi	296	fi
352		297
353	echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##*/}	298	echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}
354	echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##*/}	299	echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}
355		300
356	echo >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##*/}	301	echo >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}
357	draw_line "***** ${x##/} ***" >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##/}	302	draw_line "*** ${patchname} **" >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##*/}
358		303
359	if [ "${PATCH_SUFFIX}" != "patch" ]	304	if [ "${PATCH_SUFFIX}" != "patch" ]
360	then	305	then
361	if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##*/} 2>&1	306	if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/} 2>&1
362	then	307	then
363	echo	308	echo
364	eerror "Could not extract patch!"	309	eerror "Could not extract patch!"
365	#die "Could not extract patch!"	310	#die "Could not extract patch!"
366	count=5	311	count=5
367	break	312	break
368	fi	313	fi
369	fi	314	fi
370		315
371	if (cat ${PATCH_TARGET} \| patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##*/} 2>&1	316	if (cat ${PATCH_TARGET} \| patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/} 2>&1
372	then	317	then
373	draw_line "***** ${x##/} ***" > ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##/}.real	318	draw_line "*** ${patchname} **" > ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##*/}.real
374	echo >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##*/}.real	319	echo >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}.real
375	echo "ACTUALLY APPLYING ${x##/} ..." >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##/}.real	320	echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}.real
376	echo >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##*/}.real	321	echo >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}.real
377	draw_line "***** ${x##/} ***" >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##/}.real	322	draw_line "*** ${patchname} **" >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##*/}.real
378		323
379	cat ${PATCH_TARGET} \| patch -p${count} ${popts} >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##*/}.real 2>&1	324	cat ${PATCH_TARGET} \| patch -p${count} ${popts} >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}.real 2>&1
380		325
381	if [ "$?" -ne 0 ]	326	if [ "$?" -ne 0 ]
382	then	327	then
383	cat ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##/}.real >> ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##/}	328	cat ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}.real >> ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}
384	echo	329	echo
385	eerror "A dry-run of patch command succeeded, but actually"	330	eerror "A dry-run of patch command succeeded, but actually"
386	eerror "applying the patch failed!"	331	eerror "applying the patch failed!"
387	#die "Real world sux compared to the dreamworld!"	332	#die "Real world sux compared to the dreamworld!"
388	count=5	333	count=5
389	fi	334	fi
390		335
391	rm -f ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##*/}.real	336	rm -f ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}.real
392		337
393	break	338	break
394	fi	339	fi
395		340
396	count=$((count + 1))	341	count=$((count + 1))
…		…
402	fi	347	fi
403		348
404	if [ "${count}" -eq 5 ]	349	if [ "${count}" -eq 5 ]
405	then	350	then
406	echo	351	echo
407	eerror "Failed Patch: ${x##*/}!"	352	eerror "Failed Patch: ${patchname} !"
		353	eerror " ( ${PATCH_TARGET} )"
408	eerror	354	eerror
409	eerror "Include in your bugreport the contents of:"	355	eerror "Include in your bugreport the contents of:"
410	eerror	356	eerror
411	eerror " ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##*/}"	357	eerror " ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}"
412	echo	358	echo
413	die "Failed Patch: ${x##*/}!"	359	die "Failed Patch: ${patchname}!"
414	fi	360	fi
415		361
416	rm -f ${STDERR_TARGET%/}/${x##/}-${STDERR_TARGET##*/}	362	rm -f ${STDERR_TARGET%/}/${patchname}-${STDERR_TARGET##/}
417		363
418	eend 0	364	eend 0
419	fi	365	fi
420	done	366	done
421	if [ "${SINGLE_PATCH}" = "no" ]	367	if [ "${SINGLE_PATCH}" = "no" ]
422	then	368	then
423	einfo "Done with patching"	369	einfo "Done with patching"
424	fi
425	}
426
427	# This function return true if we are using the NPTL pthreads
428	# implementation.
429	#
430	# <azarah@gentoo.org> (06 March 2003)
431	#
432	have_NPTL() {
433	cat > ${T}/test-nptl.c <<-"END"
434	#define _XOPEN_SOURCE
435	#include <unistd.h>
436	#include <stdio.h>
437
438	int main()
439	{
440	char buf[255];
441	char *str = buf;
442
443	confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
444	if (NULL != str) {
445	printf("%s\n", str);
446	if (NULL != strstr(str, "NPTL"))
447	return 0;
448	}
449
450	return 1;
451	}
452	END
453
454	einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
455	if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
456	then
457	echo "yes"
458	einfon "Checking what PTHREADS implementation we have ..."
459	if ${T}/nptl
460	then
461	return 0
462	else
463	return 1
464	fi
465	else
466	echo "no"
467	fi
468
469	return 1
470	}
471
472	# This function check how many cpu's are present, and then set
473	# -j in MAKEOPTS accordingly.
474	#
475	# Thanks to nall <nall@gentoo.org> for this.
476	#
477	get_number_of_jobs() {
478	local jobs=0
479
480	if [ ! -r /proc/cpuinfo ]
481	then
482	return 1
483	fi
484
485	# This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
486	if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf \| wc -l`" -gt 0 ]
487	then
488	ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf \| cut -d= -f2 \| sed 's/\"//g'`"
489	ADMINPARAM="`echo ${ADMINOPTS} \| gawk '{match($0, /-j [0-9]/, opt); print opt[0]}'`"
490	ADMINPARAM="${ADMINPARAM/-j}"
491	fi
492
493	export MAKEOPTS="`echo ${MAKEOPTS} \| sed -e 's:-j [0-9]::g'`"
494
495	if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
496	"${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
497	then
498	# these archs will always have "[Pp]rocessor"
499	jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
500
501	elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
502	then
503	# sparc always has "ncpus active"
504	jobs="$((`grep "^ncpus active" /proc/cpuinfo \| sed -e "s/^.: //"` 2))"
505
506	elif [ "${ARCH}" = "alpha" ]
507	then
508	# alpha has "cpus active", but only when compiled with SMP
509	if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
510	then
511	jobs="$((`grep "^cpus active" /proc/cpuinfo \| sed -e "s/^.: //"` 2))"
512	else
513	jobs=2
514	fi
515
516	elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
517	then
518	# ppc has "processor", but only when compiled with SMP
519	if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
520	then
521	jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
522	else
523	jobs=2
524	fi
525	elif [ "${ARCH}" = "s390" ]
526	then
527	# s390 has "# processors : "
528	jobs="$((`grep "^\# processors" /proc/cpuinfo \| sed -e "s/^.: //"` 2))"
529	else
530	jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
531	die "Unknown ARCH -- ${ARCH}!"
532	fi
533
534	# Make sure the number is valid ...
535	if [ "${jobs}" -lt 1 ]
536	then
537	jobs=1
538	fi
539
540	if [ -n "${ADMINPARAM}" ]
541	then
542	if [ "${jobs}" -gt "${ADMINPARAM}" ]
543	then
544	einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
545	export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
546	else
547	einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
548	export MAKEOPTS="${MAKEOPTS} -j${jobs}"
549	fi
550	fi	370	fi
551	}	371	}
552		372
553	# Cheap replacement for when debianutils (and thus mktemp)	373	# Cheap replacement for when debianutils (and thus mktemp)
554	# does not exist on the users system	374	# does not exist on the users system
…		…
588	# Joe Jezak <josejx@gmail.com> and usata@gentoo.org	408	# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
589	# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>	409	# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
590	#	410	#
591	# egetent(database, key)	411	# egetent(database, key)
592	egetent() {	412	egetent() {
593	if useq ppc-macos ; then	413	if [[ "${USERLAND}" == "Darwin" ]] ; then
594	case "$2" in	414	case "$2" in
595	[!0-9]) # Non numeric	415	[!0-9]) # Non numeric
596	nidump $1 . \| awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"	416	nidump $1 . \| awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
597	;;	417	;;
598	*) # Numeric	418	*) # Numeric
599	nidump $1 . \| awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"	419	nidump $1 . \| awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
600	;;	420	;;
601	esac	421	esac
602	elif useq x86-fbsd ; then	422	elif [[ "${USERLAND}" == "BSD" ]] ; then
603	local action	423	local action
604	if [ "$1" == "passwd" ]	424	if [ "$1" == "passwd" ]
605	then	425	then
606	action="user"	426	action="user"
607	else	427	else
…		…
627	# homedir: /dev/null	447	# homedir: /dev/null
628	# groups: none	448	# groups: none
629	# extra: comment of 'added by portage for ${PN}'	449	# extra: comment of 'added by portage for ${PN}'
630	enewuser() {	450	enewuser() {
631	# get the username	451	# get the username
632	local euser="$1"; shift	452	local euser=$1; shift
633	if [ -z "${euser}" ]	453	if [[ -z ${euser} ]] ; then
634	then
635	eerror "No username specified !"	454	eerror "No username specified !"
636	die "Cannot call enewuser without a username"	455	die "Cannot call enewuser without a username"
637	fi	456	fi
638		457
639	# lets see if the username already exists	458	# lets see if the username already exists
640	if [ "${euser}" == "`egetent passwd \"${euser}\" \| cut -d: -f1`" ]	459	if [[ ${euser} == $(egetent passwd "${euser}" \| cut -d: -f1) ]] ; then
641	then
642	return 0	460	return 0
643	fi	461	fi
644	einfo "Adding user '${euser}' to your system ..."	462	einfo "Adding user '${euser}' to your system ..."
645		463
646	# options to pass to useradd	464	# options to pass to useradd
647	local opts=	465	local opts=
648		466
649	# handle uid	467	# handle uid
650	local euid="$1"; shift	468	local euid=$1; shift
651	if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ]	469	if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
652	then
653	if [ "${euid}" -gt 0 ]	470	if [[ ${euid} -gt 0 ]] ; then
654	then
655	if [ ! -z "`egetent passwd ${euid}`" ]	471	if [[ ! -z $(egetent passwd ${euid}) ]] ; then
656	then
657	euid="next"	472	euid="next"
658	fi	473	fi
659	else	474	else
660	eerror "Userid given but is not greater than 0 !"	475	eerror "Userid given but is not greater than 0 !"
661	die "${euid} is not a valid UID"	476	die "${euid} is not a valid UID"
662	fi	477	fi
663	else	478	else
664	euid="next"	479	euid="next"
665	fi	480	fi
666	if [ "${euid}" == "next" ]	481	if [[ ${euid} == "next" ]] ; then
667	then
668	local pwrange	482	local pwrange
669	if [ "${USERLAND}" == "BSD" ] ; then	483	if [[ ${USERLAND} == "BSD" ]] ; then
670	pwrange="`jot 898 101`"	484	pwrange=$(jot 898 101)
671	else	485	else
672	pwrange="`seq 101 999`"	486	pwrange=$(seq 101 999)
673	fi	487	fi
674	for euid in ${pwrange} ; do	488	for euid in ${pwrange} ; do
675	[ -z "`egetent passwd ${euid}`" ] && break	489	[[ -z $(egetent passwd ${euid}) ]] && break
676	done	490	done
677	fi	491	fi
678	opts="${opts} -u ${euid}"	492	opts="${opts} -u ${euid}"
679	einfo " - Userid: ${euid}"	493	einfo " - Userid: ${euid}"
680		494
681	# handle shell	495	# handle shell
682	local eshell="$1"; shift	496	local eshell=$1; shift
683	if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ]	497	if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
684	then
685	if [ ! -e "${eshell}" ]	498	if [[ ! -e ${eshell} ]] ; then
686	then
687	eerror "A shell was specified but it does not exist !"	499	eerror "A shell was specified but it does not exist !"
688	die "${eshell} does not exist"	500	die "${eshell} does not exist"
689	fi	501	fi
690	else	502	else
691	if [ "${USERLAND}" == "BSD" ]	503	case ${USERLAND} in
692	then
693	eshell="/usr/bin/false"	504	Darwin) eshell="/usr/bin/false";;
694	else	505	BSD) eshell="/usr/sbin/nologin";;
695	eshell="/bin/false"	506	*) eshell="/bin/false";;
696	fi	507	esac
697	fi	508	fi
698	einfo " - Shell: ${eshell}"	509	einfo " - Shell: ${eshell}"
699	opts="${opts} -s ${eshell}"	510	opts="${opts} -s ${eshell}"
700		511
701	# handle homedir	512	# handle homedir
702	local ehome="$1"; shift	513	local ehome=$1; shift
703	if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ]	514	if [[ -z ${ehome} ]] \|\| [[ ${ehome} == "-1" ]] ; then
704	then
705	ehome="/dev/null"	515	ehome="/dev/null"
706	fi	516	fi
707	einfo " - Home: ${ehome}"	517	einfo " - Home: ${ehome}"
708	opts="${opts} -d ${ehome}"	518	opts="${opts} -d ${ehome}"
709		519
710	# handle groups	520	# handle groups
711	local egroups="$1"; shift	521	local egroups=$1; shift
712	if [ ! -z "${egroups}" ]	522	if [[ ! -z ${egroups} ]] ; then
713	then
714	local oldifs="${IFS}"	523	local oldifs=${IFS}
715	local defgroup="" exgroups=""	524	local defgroup="" exgroups=""
716		525
717	export IFS=","	526	export IFS=","
718	for g in ${egroups}	527	for g in ${egroups} ; do
719	do
720	export IFS="${oldifs}"	528	export IFS=${oldifs}
721	if [ -z "`egetent group \"${g}\"`" ]	529	if [[ -z $(egetent group "${g}") ]] ; then
722	then
723	eerror "You must add group ${g} to the system first"	530	eerror "You must add group ${g} to the system first"
724	die "${g} is not a valid GID"	531	die "${g} is not a valid GID"
725	fi	532	fi
726	if [ -z "${defgroup}" ]	533	if [[ -z ${defgroup} ]] ; then
727	then
728	defgroup="${g}"	534	defgroup=${g}
729	else	535	else
730	exgroups="${exgroups},${g}"	536	exgroups="${exgroups},${g}"
731	fi	537	fi
732	export IFS=","	538	export IFS=","
733	done	539	done
734	export IFS="${oldifs}"	540	export IFS=${oldifs}
735		541
736	opts="${opts} -g ${defgroup}"	542	opts="${opts} -g ${defgroup}"
737	if [ ! -z "${exgroups}" ]	543	if [[ ! -z ${exgroups} ]] ; then
738	then
739	opts="${opts} -G ${exgroups:1}"	544	opts="${opts} -G ${exgroups:1}"
740	fi	545	fi
741	else	546	else
742	egroups="(none)"	547	egroups="(none)"
743	fi	548	fi
744	einfo " - Groups: ${egroups}"	549	einfo " - Groups: ${egroups}"
745		550
746	# handle extra and add the user	551	# handle extra and add the user
747	local eextra="$@"
748	local oldsandbox="${SANDBOX_ON}"	552	local oldsandbox=${SANDBOX_ON}
749	export SANDBOX_ON="0"	553	export SANDBOX_ON="0"
750	if useq ppc-macos	554	case ${USERLAND} in
751	then	555	Darwin)
752	### Make the user	556	### Make the user
753	if [ -z "${eextra}" ]	557	if [[ -z $@ ]] ; then
754	then
755	dscl . create /users/${euser} uid ${euid}	558	dscl . create /users/${euser} uid ${euid}
756	dscl . create /users/${euser} shell ${eshell}	559	dscl . create /users/${euser} shell ${eshell}
757	dscl . create /users/${euser} home ${ehome}	560	dscl . create /users/${euser} home ${ehome}
758	dscl . create /users/${euser} realname "added by portage for ${PN}"	561	dscl . create /users/${euser} realname "added by portage for ${PN}"
759	### Add the user to the groups specified	562	### Add the user to the groups specified
760	local oldifs="${IFS}"	563	local oldifs=${IFS}
761	export IFS=","	564	export IFS=","
762	for g in ${egroups}	565	for g in ${egroups} ; do
763	do
764	dscl . merge /groups/${g} users ${euser}	566	dscl . merge /groups/${g} users ${euser}
765	done	567	done
766	export IFS="${oldifs}"	568	export IFS=${oldifs}
767	else	569	else
768	einfo "Extra options are not supported on macos yet"	570	einfo "Extra options are not supported on Darwin yet"
769	einfo "Please report the ebuild along with the info below"	571	einfo "Please report the ebuild along with the info below"
770	einfo "eextra: ${eextra}"	572	einfo "eextra: $@"
771	die "Required function missing"	573	die "Required function missing"
772	fi	574	fi
773	elif use x86-fbsd ; then	575	;;
774	if [ -z "${eextra}" ]	576	BSD)
775	then	577	if [[ -z $@ ]] ; then
776	pw useradd ${euser} ${opts} \	578	pw useradd ${euser} ${opts} \
777	-c "added by portage for ${PN}" \	579	-c "added by portage for ${PN}" \
778	die "enewuser failed"	580	die "enewuser failed"
779	else	581	else
780	einfo " - Extra: ${eextra}"	582	einfo " - Extra: $@"
781	pw useradd ${euser} ${opts} \	583	pw useradd ${euser} ${opts} \
782	-c ${eextra} \|\| die "enewuser failed"	584	"$@" \|\| die "enewuser failed"
783	fi	585	fi
784	else	586	;;
785	if [ -z "${eextra}" ]	587	*)
786	then	588	if [[ -z $@ ]] ; then
787	useradd ${opts} ${euser} \	589	useradd ${opts} ${euser} \
788	-c "added by portage for ${PN}" \	590	-c "added by portage for ${PN}" \
789	\|\| die "enewuser failed"	591	\|\| die "enewuser failed"
790	else	592	else
791	einfo " - Extra: ${eextra}"	593	einfo " - Extra: $@"
792	useradd ${opts} ${euser} ${eextra} \	594	useradd ${opts} ${euser} "$@" \
793	\|\| die "enewuser failed"	595	\|\| die "enewuser failed"
794	fi	596	fi
795	fi	597	;;
		598	esac
796	export SANDBOX_ON="${oldsandbox}"	599	export SANDBOX_ON=${oldsandbox}
797		600
798	if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]	601	if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
799	then	602	then
800	einfo " - Creating ${ehome} in ${D}"	603	einfo " - Creating ${ehome} in ${D}"
801	dodir ${ehome}	604	dodir ${ehome}
…		…
838	then	641	then
839	if [ "${egid}" -gt 0 ]	642	if [ "${egid}" -gt 0 ]
840	then	643	then
841	if [ -z "`egetent group ${egid}`" ]	644	if [ -z "`egetent group ${egid}`" ]
842	then	645	then
843	if useq ppc-macos ; then	646	if [[ "${USERLAND}" == "Darwin" ]]; then
844	opts="${opts} ${egid}"	647	opts="${opts} ${egid}"
845	else	648	else
846	opts="${opts} -g ${egid}"	649	opts="${opts} -g ${egid}"
847	fi	650	fi
848	else	651	else
…		…
862	opts="${opts} ${eextra}"	665	opts="${opts} ${eextra}"
863		666
864	# add the group	667	# add the group
865	local oldsandbox="${SANDBOX_ON}"	668	local oldsandbox="${SANDBOX_ON}"
866	export SANDBOX_ON="0"	669	export SANDBOX_ON="0"
867	if useq ppc-macos ; then	670	if [[ "${USERLAND}" == "Darwin" ]]; then
868	if [ ! -z "${eextra}" ];	671	if [ ! -z "${eextra}" ];
869	then	672	then
870	einfo "Extra options are not supported on macos yet"	673	einfo "Extra options are not supported on Darwin/OS X yet"
871	einfo "Please report the ebuild along with the info below"	674	einfo "Please report the ebuild along with the info below"
872	einfo "eextra: ${eextra}"	675	einfo "eextra: ${eextra}"
873	die "Required function missing"	676	die "Required function missing"
874	fi	677	fi
875		678
…		…
880	[ -z "`egetent group ${egid}`" ] && break	683	[ -z "`egetent group ${egid}`" ] && break
881	done	684	done
882	esac	685	esac
883	dscl . create /groups/${egroup} gid ${egid}	686	dscl . create /groups/${egroup} gid ${egid}
884	dscl . create /groups/${egroup} passwd '*'	687	dscl . create /groups/${egroup} passwd '*'
885	elif use x86-fbsd ; then	688	elif [[ "${USERLAND}" == "BSD" ]] ; then
886	case ${egid} in	689	case ${egid} in
887	[!0-9]) # Non numeric	690	[!0-9]) # Non numeric
888	for egid in `jot 898 101`; do	691	for egid in `jot 898 101`; do
889	[ -z "`egetent group ${egid}`" ] && break	692	[ -z "`egetent group ${egid}`" ] && break
890	done	693	done
…		…
906	cp "${f}" ${T}/edos2unix	709	cp "${f}" ${T}/edos2unix
907	sed 's/\r$//' ${T}/edos2unix > "${f}"	710	sed 's/\r$//' ${T}/edos2unix > "${f}"
908	done	711	done
909	}	712	}
910		713
		714
		715	##############################################################
		716	# START: Handle .desktop files and menu entries #
		717	# maybe this should be separated into a new eclass some time #
		718	# lanius@gentoo.org #
		719	##############################################################
		720
911	# Make a desktop file !	721	# Make a desktop file !
912	# Great for making those icons in kde/gnome startmenu !	722	# Great for making those icons in kde/gnome startmenu !
913	# Amaze your friends ! Get the women ! Join today !	723	# Amaze your friends ! Get the women ! Join today !
914	#	724	#
915	# make_desktop_entry(<binary>, [name], [icon], [type], [path])	725	# make_desktop_entry(<binary>, [name], [icon], [type], [path])
…		…
918	# name: the name that will show up in the menu	728	# name: the name that will show up in the menu
919	# icon: give your little like a pretty little icon ...	729	# icon: give your little like a pretty little icon ...
920	# this can be relative (to /usr/share/pixmaps) or	730	# this can be relative (to /usr/share/pixmaps) or
921	# a full path to an icon	731	# a full path to an icon
922	# type: what kind of application is this ? for categories:	732	# type: what kind of application is this ? for categories:
923	# http://www.freedesktop.org/standards/menu-spec/	733	# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
924	# path: if your app needs to startup in a specific dir	734	# path: if your app needs to startup in a specific dir
925	make_desktop_entry() {	735	make_desktop_entry() {
926	[ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1	736	[[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
927		737
928	local exec="${1}"	738	local exec=${1}
929	local name="${2:-${PN}}"	739	local name=${2:-${PN}}
930	local icon="${3:-${PN}.png}"	740	local icon=${3:-${PN}.png}
931	local type="${4}"	741	local type=${4}
932	local subdir="${6}"	742	local path=${5}
933	local path="${5:-${GAMES_BINDIR}}"	743
934	if [ -z "${type}" ]	744	if [[ -z ${type} ]] ; then
935	then	745	local catmaj=${CATEGORY%%-*}
936	case ${CATEGORY} in	746	local catmin=${CATEGORY##*-}
937	"app-emulation")	747	case ${catmaj} in
938	type=Emulator	748	app)
939	subdir="Emulation"	749	case ${catmin} in
		750	admin) type=System;;
		751	cdr) type=DiscBurning;;
		752	dicts) type=Dictionary;;
		753	editors) type=TextEditor;;
		754	emacs) type=TextEditor;;
		755	emulation) type=Emulator;;
		756	laptop) type=HardwareSettings;;
		757	office) type=Office;;
		758	vim) type=TextEditor;;
		759	xemacs) type=TextEditor;;
		760	*) type=;;
		761	esac
940	;;	762	;;
941	"games-"*)	763
942	type=Game	764	dev)
943	subdir="Games"	765	type="Development"
944	;;	766	;;
945	"net-"*)	767
946	type=Network	768	games)
947	subdir="${type}"	769	[[ -z ${path} ]] && path=${GAMES_BINDIR}
		770
		771	case ${catmin} in
		772	action) type=ActionGame;;
		773	arcade) type=ArcadeGame;;
		774	board) type=BoardGame;;
		775	kid) type=KidsGame;;
		776	emulation) type=Emulator;;
		777	puzzle) type=LogicGame;;
		778	rpg) type=RolePlaying;;
		779	roguelike) type=RolePlaying;;
		780	simulation) type=Simulation;;
		781	sports) type=SportsGame;;
		782	strategy) type=StrategyGame;;
		783	*) type=;;
		784	esac
		785	type="Game;${type}"
948	;;	786	;;
		787
		788	mail)
		789	type="Network;Email"
		790	;;
		791
		792	media)
		793	case ${catmin} in
		794	gfx) type=Graphics;;
		795	radio) type=Tuner;;
		796	sound) type=Audio;;
		797	tv) type=TV;;
		798	video) type=Video;;
		799	*) type=;;
		800	esac
		801	type="AudioVideo;${type}"
		802	;;
		803
		804	net)
		805	case ${catmin} in
		806	dialup) type=Dialup;;
		807	ftp) type=FileTransfer;;
		808	im) type=InstantMessaging;;
		809	irc) type=IRCClient;;
		810	mail) type=Email;;
		811	news) type=News;;
		812	nntp) type=News;;
		813	p2p) type=FileTransfer;;
		814	*) type=;;
		815	esac
		816	type="Network;${type}"
		817	;;
		818
		819	sci)
		820	case ${catmin} in
		821	astro*) type=Astronomoy;;
		822	bio*) type=Biology;;
		823	calc*) type=Calculator;;
		824	chem*) type=Chemistry;;
		825	geo*) type=Geology;;
		826	math*) type=Math;;
		827	*) type=;;
		828	esac
		829	type="Science;${type}"
		830	;;
		831
		832	www)
		833	case ${catmin} in
		834	client) type=WebBrowser;;
		835	*) type=;;
		836	esac
		837	type="Network"
		838	;;
		839
949	*)	840	*)
950	type=	841	type=
951	subdir=
952	;;	842	;;
953	esac	843	esac
954	fi	844	fi
		845	if [ "${SLOT}" == "0" ] ; then
		846	local desktop_name="${PN}"
		847	else
		848	local desktop_name="${PN}-${SLOT}"
		849	fi
955	local desktop="${T}/${exec}.desktop"	850	local desktop=${T}/${exec%% *}-${desktop_name}.desktop
956		851
957	echo "[Desktop Entry]	852	echo "[Desktop Entry]
958	Encoding=UTF-8	853	Encoding=UTF-8
959	Version=0.9.2	854	Version=0.9.2
960	Name=${name}	855	Name=${name}
…		…
968	insinto /usr/share/applications	863	insinto /usr/share/applications
969	doins "${desktop}"	864	doins "${desktop}"
970		865
971	return 0	866	return 0
972	}	867	}
		868
		869	# Make a GDM/KDM Session file
		870	#
		871	# make_desktop_entry(<title>, <command>)
		872	# title: File to execute to start the Window Manager
		873	# command: Name of the Window Manager
		874
		875	make_session_desktop() {
		876	[[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
		877	[[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
		878
		879	local title=$1
		880	local command=$2
		881	local desktop=${T}/${wm}.desktop
		882
		883	echo "[Desktop Entry]
		884	Encoding=UTF-8
		885	Name=${title}
		886	Comment=This session logs you into ${title}
		887	Exec=${command}
		888	TryExec=${command}
		889	Type=Application" > "${desktop}"
		890
		891	insinto /usr/share/xsessions
		892	doins "${desktop}"
		893	}
		894
		895	domenu() {
		896	local i j
		897	insinto /usr/share/applications
		898	for i in "$@" ; do
		899	if [[ -f ${i} ]] ; then
		900	doins "${i}"
		901	elif [[ -d ${i} ]] ; then
		902	for j in "${i}"/*.desktop ; do
		903	doins "${j}"
		904	done
		905	fi
		906	done
		907	}
		908	newmenu() {
		909	insinto /usr/share/applications
		910	newins "$1" "$2"
		911	}
		912
		913	doicon() {
		914	local i j
		915	insinto /usr/share/pixmaps
		916	for i in "$@" ; do
		917	if [[ -f ${i} ]] ; then
		918	doins "${i}"
		919	elif [[ -d ${i} ]] ; then
		920	for j in "${i}"/*.png ; do
		921	doins "${j}"
		922	done
		923	fi
		924	done
		925	}
		926	newicon() {
		927	insinto /usr/share/pixmaps
		928	newins "$1" "$2"
		929	}
		930
		931	##############################################################
		932	# END: Handle .desktop files and menu entries #
		933	##############################################################
		934
973		935
974	# for internal use only (unpack_pdv and unpack_makeself)	936	# for internal use only (unpack_pdv and unpack_makeself)
975	find_unpackable_file() {	937	find_unpackable_file() {
976	local src="$1"	938	local src="$1"
977	if [ -z "${src}" ]	939	if [ -z "${src}" ]
…		…
1258	export CDROM_TOTAL_CDS=${cdcnt}	1220	export CDROM_TOTAL_CDS=${cdcnt}
1259	export CDROM_CURRENT_CD=1	1221	export CDROM_CURRENT_CD=1
1260		1222
1261	# now we see if the user gave use CD_ROOT ...	1223	# now we see if the user gave use CD_ROOT ...
1262	# if they did, let's just believe them that it's correct	1224	# if they did, let's just believe them that it's correct
1263	if [ ! -z "${CD_ROOT}" ] ; then	1225	if [[ ! -z ${CD_ROOT} ]] ; then
1264	export CDROM_ROOT="${CD_ROOT}"	1226	export CDROM_ROOT=${CD_ROOT}
1265	einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"	1227	einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1266	return	1228	return
1267	fi	1229	fi
1268	# do the same for CD_ROOT_X	1230	# do the same for CD_ROOT_X
1269	if [ ! -z "${CD_ROOT_1}" ] ; then	1231	if [[ ! -z ${CD_ROOT_1} ]] ; then
1270	local var=	1232	local var=
1271	cdcnt=0	1233	cdcnt=0
1272	while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do	1234	while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1273	cdcnt=$((cdcnt + 1))	1235	cdcnt=$((cdcnt + 1))
1274	var="CD_ROOT_${cdcnt}"	1236	var="CD_ROOT_${cdcnt}"
1275	if [ -z "${!var}" ] ; then	1237	if [[ -z ${!var} ]] ; then
1276	eerror "You must either use just the CD_ROOT"	1238	eerror "You must either use just the CD_ROOT"
1277	eerror "or specify ALL the CD_ROOT_X variables."	1239	eerror "or specify ALL the CD_ROOT_X variables."
1278	eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."	1240	eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1279	die "could not locate CD_ROOT_${cdcnt}"	1241	die "could not locate CD_ROOT_${cdcnt}"
1280	fi	1242	fi
…		…
1283	export CDROM_ROOT=${CDROM_ROOTS_1}	1245	export CDROM_ROOT=${CDROM_ROOTS_1}
1284	einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"	1246	einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1285	return	1247	return
1286	fi	1248	fi
1287		1249
1288	if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then	1250	if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1289	einfon "This ebuild will need the "	1251	einfon "This ebuild will need the "
1290	if [ -z "${CDROM_NAME}" ] ; then	1252	if [[ -z ${CDROM_NAME} ]] ; then
1291	echo "cdrom for ${PN}."	1253	echo "cdrom for ${PN}."
1292	else	1254	else
1293	echo "${CDROM_NAME}."	1255	echo "${CDROM_NAME}."
1294	fi	1256	fi
1295	echo	1257	echo
1296	einfo "If you do not have the CD, but have the data files"	1258	einfo "If you do not have the CD, but have the data files"
1297	einfo "mounted somewhere on your filesystem, just export"	1259	einfo "mounted somewhere on your filesystem, just export"
1298	einfo "the variable CD_ROOT so that it points to the"	1260	einfo "the variable CD_ROOT so that it points to the"
1299	einfo "directory containing the files."	1261	einfo "directory containing the files."
1300	echo	1262	echo
		1263	einfo "For example:"
		1264	einfo "export CD_ROOT=/mnt/cdrom"
		1265	echo
1301	else	1266	else
1302	einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."	1267	einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1303	cdcnt=0	1268	cdcnt=0
1304	while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do	1269	while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1305	cdcnt=$((cdcnt + 1))	1270	cdcnt=$((cdcnt + 1))
1306	var="CDROM_NAME_${cdcnt}"	1271	var="CDROM_NAME_${cdcnt}"
1307	[ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}"	1272	[[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1308	done	1273	done
1309	echo	1274	echo
1310	einfo "If you do not have the CDs, but have the data files"	1275	einfo "If you do not have the CDs, but have the data files"
1311	einfo "mounted somewhere on your filesystem, just export"	1276	einfo "mounted somewhere on your filesystem, just export"
1312	einfo "the following variables so they point to the right place:"	1277	einfo "the following variables so they point to the right place:"
1313	einfon ""	1278	einfon ""
1314	cdcnt=0	1279	cdcnt=0
1315	while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do	1280	while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1316	cdcnt=$((cdcnt + 1))	1281	cdcnt=$((cdcnt + 1))
1317	echo -n " CD_ROOT_${cdcnt}"	1282	echo -n " CD_ROOT_${cdcnt}"
1318	done	1283	done
1319	echo	1284	echo
1320	einfo "Or, if you have all the files in the same place, or"	1285	einfo "Or, if you have all the files in the same place, or"
1321	einfo "you only have one cdrom, you can export CD_ROOT"	1286	einfo "you only have one cdrom, you can export CD_ROOT"
1322	einfo "and that place will be used as the same data source"	1287	einfo "and that place will be used as the same data source"
1323	einfo "for all the CDs."	1288	einfo "for all the CDs."
1324	echo	1289	echo
		1290	einfo "For example:"
		1291	einfo "export CD_ROOT_1=/mnt/cdrom"
		1292	echo
1325	fi	1293	fi
1326	export CDROM_CURRENT_CD=0	1294	export CDROM_CURRENT_CD=0
1327	cdrom_load_next_cd	1295	cdrom_load_next_cd
1328	}	1296	}
1329		1297
…		…
1333	# remember, you can only go forward in the cd chain, you can't go back.	1301	# remember, you can only go forward in the cd chain, you can't go back.
1334	cdrom_load_next_cd() {	1302	cdrom_load_next_cd() {
1335	export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))	1303	export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1336	local var=	1304	local var=
1337		1305
1338	if [ ! -z "${CD_ROOT}" ] ; then	1306	if [[ ! -z ${CD_ROOT} ]] ; then
1339	einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"	1307	einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1340	return	1308	return
1341	fi	1309	fi
1342		1310
1343	unset CDROM_ROOT	1311	unset CDROM_ROOT
1344	var=CDROM_ROOTS_${CDROM_CURRENT_CD}	1312	var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1345	if [ -z "${!var}" ] ; then	1313	if [[ -z ${!var} ]] ; then
1346	var="CDROM_CHECK_${CDROM_CURRENT_CD}"	1314	var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1347	cdrom_locate_file_on_cd ${!var}	1315	cdrom_locate_file_on_cd ${!var}
1348	else	1316	else
1349	export CDROM_ROOT="${!var}"	1317	export CDROM_ROOT=${!var}
1350	fi	1318	fi
1351		1319
1352	einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"	1320	einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1353	}	1321	}
1354		1322
…		…
1358	# found, then a message asking for the user to insert the cdrom will be	1326	# found, then a message asking for the user to insert the cdrom will be
1359	# displayed and we'll hang out here until:	1327	# displayed and we'll hang out here until:
1360	# (1) the file is found on a mounted cdrom	1328	# (1) the file is found on a mounted cdrom
1361	# (2) the user hits CTRL+C	1329	# (2) the user hits CTRL+C
1362	cdrom_locate_file_on_cd() {	1330	cdrom_locate_file_on_cd() {
1363	while [ -z "${CDROM_ROOT}" ] ; do	1331	while [[ -z ${CDROM_ROOT} ]] ; do
1364	local dir="$(dirname ${@})"	1332	local dir="$(dirname ${@})"
1365	local file="$(basename ${@})"	1333	local file="$(basename ${@})"
1366	local mline=""	1334	local mline=""
1367	local showedmsg=0	1335	local showedmsg=0
1368		1336
1369	for mline in `mount \| egrep -e '(iso\|cdrom)' \| awk '{print $3}'` ; do	1337	for mline in $(mount \| egrep -e '(iso\|cdrom)' \| awk '{print $3}') ; do
1370	[ -d "${mline}/${dir}" ] \|\| continue	1338	[[ -d ${mline}/${dir} ]] \|\| continue
1371	[ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \	1339	[[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1372	&& export CDROM_ROOT=${mline}	1340	&& export CDROM_ROOT=${mline}
1373	done	1341	done
1374		1342
1375	if [ -z "${CDROM_ROOT}" ] ; then	1343	if [[ -z ${CDROM_ROOT} ]] ; then
1376	echo	1344	echo
1377	if [ ${showedmsg} -eq 0 ] ; then	1345	if [[ ${showedmsg} -eq 0 ]] ; then
1378	if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then	1346	if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1379	if [ -z "${CDROM_NAME}" ] ; then	1347	if [[ -z ${CDROM_NAME} ]] ; then
1380	einfo "Please insert the cdrom for ${PN} now !"	1348	einfo "Please insert the cdrom for ${PN} now !"
1381	else	1349	else
1382	einfo "Please insert the ${CDROM_NAME} cdrom now !"	1350	einfo "Please insert the ${CDROM_NAME} cdrom now !"
1383	fi	1351	fi
1384	else	1352	else
1385	if [ -z "${CDROM_NAME_1}" ] ; then	1353	if [[ -z ${CDROM_NAME_1} ]] ; then
1386	einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"	1354	einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1387	else	1355	else
1388	local var="CDROM_NAME_${CDROM_CURRENT_CD}"	1356	local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1389	einfo "Please insert+mount the ${!var} cdrom now !"	1357	einfo "Please insert+mount the ${!var} cdrom now !"
1390	fi	1358	fi
1391	fi	1359	fi
1392	showedmsg=1	1360	showedmsg=1
1393	fi	1361	fi
1394	einfo "Press return to scan for the cd again"	1362	einfo "Press return to scan for the cd again"
1395	einfo "or hit CTRL+C to abort the emerge."	1363	einfo "or hit CTRL+C to abort the emerge."
		1364	echo
		1365	einfo "If you are having trouble with the detection"
		1366	einfo "of your CD, it is possible that you do not have"
		1367	einfo "Joliet support enabled in your kernel. Please"
		1368	einfo "check that CONFIG_JOLIET is enabled in your kernel."
1396	read	1369	read
1397	fi	1370	fi
1398	done	1371	done
1399	}	1372	}
1400		1373
…		…
1410	# directories and uses the intersection of the lists.	1383	# directories and uses the intersection of the lists.
1411	# The -u builds a list of po files found in all the	1384	# The -u builds a list of po files found in all the
1412	# directories and uses the union of the lists.	1385	# directories and uses the union of the lists.
1413	strip-linguas() {	1386	strip-linguas() {
1414	local ls newls	1387	local ls newls
1415	if [ "$1" == "-i" ] \|\| [ "$1" == "-u" ] ; then	1388	if [[ $1 == "-i" ]] \|\| [[ $1 == "-u" ]] ; then
1416	local op="$1"; shift	1389	local op=$1; shift
1417	ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift	1390	ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1418	local d f	1391	local d f
1419	for d in "$@" ; do	1392	for d in "$@" ; do
1420	if [ "${op}" == "-u" ] ; then	1393	if [[ ${op} == "-u" ]] ; then
1421	newls="${ls}"	1394	newls=${ls}
1422	else	1395	else
1423	newls=""	1396	newls=""
1424	fi	1397	fi
1425	for f in $(find "$d" -name '*.po' -printf '%f ') ; do	1398	for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1426	if [ "${op}" == "-i" ] ; then	1399	if [[ ${op} == "-i" ]] ; then
1427	[ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}"	1400	[[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1428	else	1401	else
1429	[ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}"	1402	[[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1430	fi	1403	fi
1431	done	1404	done
1432	ls="${newls}"	1405	ls=${newls}
1433	done	1406	done
1434	ls="${ls//.po}"	1407	ls=${ls//.po}
1435	else	1408	else
1436	ls="$@"	1409	ls=$@
1437	fi	1410	fi
1438		1411
1439	ls=" ${ls} "	1412	ls=" ${ls} "
1440	newls=""	1413	newls=""
1441	for f in ${LINGUAS} ; do	1414	for f in ${LINGUAS} ; do
1442	if [ "${ls/ ${f} /}" != "${ls}" ] ; then	1415	if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1443	newls="${newls} ${f}"	1416	newls="${newls} ${f}"
1444	else	1417	else
1445	ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"	1418	ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1446	fi	1419	fi
1447	done	1420	done
1448	if [ -z "${newls}" ] ; then	1421	if [[ -z ${newls} ]] ; then
1449	unset LINGUAS	1422	export LINGUAS=""
1450	else	1423	else
1451	export LINGUAS="${newls}"	1424	export LINGUAS=${newls:1}
1452	fi	1425	fi
1453	}	1426	}
1454		1427
1455	# moved from kernel.eclass since they are generally useful outside of	1428	# moved from kernel.eclass since they are generally useful outside of
1456	# kernel.eclass -iggy (20041002)	1429	# kernel.eclass -iggy (20041002)
…		…
1458	# the following functions are useful in kernel module ebuilds, etc.	1431	# the following functions are useful in kernel module ebuilds, etc.
1459	# for an example see ivtv or drbd ebuilds	1432	# for an example see ivtv or drbd ebuilds
1460		1433
1461	# set's ARCH to match what the kernel expects	1434	# set's ARCH to match what the kernel expects
1462	set_arch_to_kernel() {	1435	set_arch_to_kernel() {
		1436	i=10
		1437	while ((i--)) ; do
		1438	ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
		1439	done
1463	export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"	1440	export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1464	case ${ARCH} in	1441	case ${ARCH} in
1465	x86) export ARCH="i386";;	1442	x86) export ARCH="i386";;
1466	amd64) export ARCH="x86_64";;	1443	amd64) export ARCH="x86_64";;
1467	hppa) export ARCH="parisc";;	1444	hppa) export ARCH="parisc";;
1468	mips) export ARCH="mips";;	1445	mips) export ARCH="mips";;
		1446	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!
1469	*) export ARCH="${ARCH}";;	1447	*) export ARCH="${ARCH}";;
1470	esac	1448	esac
1471	}	1449	}
1472		1450
1473	# set's ARCH back to what portage expects	1451	# set's ARCH back to what portage expects
1474	set_arch_to_portage() {	1452	set_arch_to_portage() {
		1453	i=10
		1454	while ((i--)) ; do
		1455	ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
		1456	done
1475	export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"	1457	export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1476	}	1458	}
1477		1459
1478	# Jeremy Huddleston <eradicator@gentoo.org>:	1460	# Jeremy Huddleston <eradicator@gentoo.org>:
1479	# preserve_old_lib /path/to/libblah.so.0	1461	# preserve_old_lib /path/to/libblah.so.0
…		…
1509	touch ${D}${LIB}	1491	touch ${D}${LIB}
1510	fi	1492	fi
1511	}	1493	}
1512		1494
1513	preserve_old_lib_notify() {	1495	preserve_old_lib_notify() {
1514	LIB=$1	1496	LIB=$1
1515		1497
1516	if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then	1498	if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1517	SONAME=`basename ${LIB}`	1499	SONAME=`basename ${LIB}`
1518		1500
1519	einfo "An old version of an installed library was detected on your system."	1501	einfo "An old version of an installed library was detected on your system."
1520	einfo "In order to avoid breaking packages that link against is, this older version"	1502	einfo "In order to avoid breaking packages that link against it, this older version"
1521	einfo "is not being removed. In order to make full use of this newer version,"	1503	einfo "is not being removed. In order to make full use of this newer version,"
1522	einfo "you will need to execute the following command:"	1504	einfo "you will need to execute the following command:"
1523	einfo " revdep-rebuild --soname ${SONAME}"	1505	einfo " revdep-rebuild --soname ${SONAME}"
1524	einfo	1506	einfo
1525	einfo "After doing that, you can safely remove ${LIB}"	1507	einfo "After doing that, you can safely remove ${LIB}"
1526	einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"	1508	einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1527	fi	1509	fi
1528	}	1510	}
1529		1511
1530	# Hack for people to figure out if a package was built with	1512	# Hack for people to figure out if a package was built with
1531	# certain USE flags	1513	# certain USE flags
1532	#	1514	#
1533	# Usage: built_with_use <DEPEND ATOM> <List of USE flags>	1515	# Usage: built_with_use [-a\|-o] <DEPEND ATOM> <List of USE flags>
1534	# ex: built_with_use xchat gtk2	1516	# ex: built_with_use xchat gtk2
		1517	#
		1518	# Flags: -a all USE flags should be utilized
		1519	# -o at least one USE flag should be utilized
		1520	# Note: the default flag is '-a'
1535	built_with_use() {	1521	built_with_use() {
		1522	local opt=$1
		1523	[[ ${opt:0:1} = "-" ]] && shift \|\| opt="-a"
		1524
1536	local PKG=$(portageq best_version ${ROOT} $1)	1525	local PKG=$(best_version $1)
		1526	shift
		1527
1537	local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"	1528	local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1538	[[ ! -e ${USEFILE} ]] && return 1	1529	[[ ! -e ${USEFILE} ]] && return 1
1539		1530
1540	local USE_BUILT=$(<${USEFILE})	1531	local USE_BUILT=$(<${USEFILE})
1541
1542	shift
1543	while [ $# -gt 0 ] ; do	1532	while [[ $# -gt 0 ]] ; do
		1533	if [[ ${opt} = "-o" ]] ; then
		1534	has $1 ${USE_BUILT} && return 0
		1535	else
1544	has $1 ${USE_BUILT} \|\| return 1	1536	has $1 ${USE_BUILT} \|\| return 1
		1537	fi
1545	shift	1538	shift
1546	done	1539	done
1547	return 0	1540	[[ ${opt} = "-a" ]]
1548	}	1541	}
1549		1542
1550	# Many configure scripts wrongly bail when a C++ compiler	1543	# Many configure scripts wrongly bail when a C++ compiler
1551	# could not be detected. #73450	1544	# could not be detected. #73450
1552	epunt_cxx() {	1545	epunt_cxx() {
1553	local dir=$1	1546	local dir=$1
1554	[[ -z ${dir} ]] && dir=${S}	1547	[[ -z ${dir} ]] && dir=${S}
1555	ebegin "Removing useless C++ checks"	1548	ebegin "Removing useless C++ checks"
…		…
1558	patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null	1551	patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1559	done	1552	done
1560	eend 0	1553	eend 0
1561	}	1554	}
1562		1555
1563	# get_abi_var <VAR> [<ABI>]	1556	# dopamd <file> [more files]
1564	# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
1565	#	1557	#
1566	# This code is for testing purposes only with the sparc64-multilib ${PROFILE_ARCH}	1558	# Install pam auth config file in /etc/pam.d
1567	# and getting a more multilib-aware portage layout. It may end up being used, but for now	1559	dopamd() {
1568	# it is subject to removal if a better way is worked out.	1560	[[ -z $1 ]] && die "dopamd requires at least one argument"
1569	#
1570	# ex:
1571	# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32
1572	#
1573	# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)"
1574	# This will hopefully be added to portage soon...
1575	#
1576	# If <ABI> is not specified, ${ABI} is used.
1577	# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used.
1578	# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string.
1579	#
1580	# Jeremy Huddleston <eradicator@gentoo.org>
1581	get_abi_var() {
1582	local flag=$1
1583	local abi
1584	if [ $# -gt 1 ]; then
1585	abi=$1
1586	elif [ -n "${ABI}" ]; then
1587	abi=${ABI}
1588	elif [ -n "${DEFAULT_ABI}" ]; then
1589	abi=${DEFAULT_ABI}
1590	else
1591	return ""
1592	fi
1593	eval echo \${${flag}_${abi}}
1594	}
1595		1561
1596	get_abi_CFLAGS() { get_abi_var CFLAGS $1; }	1562	use pam \|\| return 0
1597	get_abi_CXXFLAGS() { get_abi_var CXXFLAGS $1; }
1598	get_abi_ASFLAGS() { get_abi_var ASFLAGS $1; }
1599	get_abi_LIBDIR() { get_abi_var LIBDIR $1; }
1600		1563
		1564	INSDESTTREE=/etc/pam.d \
		1565	doins "$@" \|\| die "failed to install $@"
		1566	}
		1567	# newpamd <old name> <new name>
		1568	#
		1569	# Install pam file <old name> as <new name> in /etc/pam.d
		1570	newpamd() {
		1571	[[ $# -ne 2 ]] && die "newpamd requires two arguements"
		1572
		1573	use pam \|\| return 0
		1574
		1575	INSDESTTREE=/etc/pam.d \
		1576	newins "$1" "$2" \|\| die "failed to install $1 as $2"
		1577	}
		1578
		1579	# make a wrapper script ...
		1580	# NOTE: this was originally games_make_wrapper, but I noticed other places where
		1581	# this could be used, so I have moved it here and made it not games-specific
		1582	# -- wolf31o2
		1583	# $1 == wrapper name
		1584	# $2 == binary to run
		1585	# $3 == directory to chdir before running binary
		1586	# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
		1587	# $5 == path for wrapper
		1588	make_wrapper() {
		1589	local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
		1590	local tmpwrapper=$(emktemp)
		1591	cat << EOF > "${tmpwrapper}"
		1592	#!/bin/sh
		1593	cd "${chdir}"
		1594	export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
		1595	exec ${bin} "\$@"
		1596	EOF
		1597	chmod go+rx "${tmpwrapper}"
		1598	if [ -n "${5}" ]
		1599	then
		1600	exeinto ${5}
		1601	newexe "${tmpwrapper}" "${wrapper}"
		1602	else
		1603	newbin "${tmpwrapper}" "${wrapper}"
		1604	fi
		1605	}

 Legend:



Removed from v.1.128
 


changed lines


 
Added in v.1.189
 Legend:



Removed from v.1.128
 


changed lines


 
Added in v.1.189
-Removed from v.1.128
+Added in v.1.189

	ViewVC Help
Powered by ViewVC 1.1.13