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

Diff of /eclass/eutils.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

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

Legend:
Removed from v.1.111  
changed lines
  Added in v.1.245

  ViewVC Help
Powered by ViewVC 1.1.20