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

Diff of /eclass/eutils.eclass

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

Revision 1.118 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.118 2004/10/13 14:33:01 vapier 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 optional parameter (the directory to create tmpfile in) 351# Takes just 1 optional parameter (the directory to create tmpfile in)
547emktemp() { 352emktemp() {
353 local exe="touch"
354 [[ $1 == -d ]] && exe="mkdir" && shift
548 local topdir="$1" 355 local topdir=$1
549 356
550 if [ -z "${topdir}" ] 357 if [[ -z ${topdir} ]] ; then
551 then
552 [ -z "${T}" ] \ 358 [[ -z ${T} ]] \
553 && topdir="/tmp" \ 359 && topdir="/tmp" \
554 || topdir="${T}" 360 || topdir=${T}
555 fi 361 fi
556 362
557 if [ -z "$(type -p mktemp)" ] 363 if [[ -z $(type -p mktemp) ]] ; then
558 then
559 local tmp=/ 364 local tmp=/
560 while [ -e "${tmp}" ] ; do 365 while [[ -e ${tmp} ]] ; do
561 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 366 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
562 done 367 done
563 touch "${tmp}" 368 ${exe} "${tmp}" || ${exe} -p "${tmp}"
564 echo "${tmp}" 369 echo "${tmp}"
565 else 370 else
371 if [[ ${exe} == "touch" ]] ; then
372 [[ ${USERLAND} == "GNU" ]] \
566 mktemp -p "${topdir}" 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
567 fi 380 fi
568} 381}
569 382
570# Small wrapper for getent (Linux), nidump (Mac OS X), 383# Small wrapper for getent (Linux), nidump (Mac OS X),
571# and pw (FreeBSD) used in enewuser()/enewgroup() 384# and pw (FreeBSD) used in enewuser()/enewgroup()
572# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 385# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
573# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 386# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
574# 387#
575# egetent(database, key) 388# egetent(database, key)
576egetent() { 389egetent() {
577 if useq macos || useq ppc-macos ; then 390 case ${CHOST} in
391 *-darwin*)
578 case "$2" in 392 case "$2" in
579 *[!0-9]*) # Non numeric 393 *[!0-9]*) # Non numeric
580 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 394 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
581 ;; 395 ;;
582 *) # Numeric 396 *) # Numeric
583 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 397 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
584 ;; 398 ;;
585 esac 399 esac
586 elif useq x86-fbsd ; then 400 ;;
587 local action 401 *-freebsd*|*-dragonfly*)
588 if [ "$1" == "passwd" ] 402 local opts action="user"
589 then 403 [[ $1 == "passwd" ]] || action="group"
590 action="user" 404
591 else 405 # lookup by uid/gid
592 action="group" 406 if [[ $2 == [[:digit:]]* ]] ; then
407 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
593 fi 408 fi
409
594 pw show "${action}" "$2" -q 410 pw show ${action} ${opts} "$2" -q
595 else 411 ;;
412 *-netbsd*|*-openbsd*)
413 grep "$2:\*:" /etc/$1
414 ;;
415 *)
596 which nscd >& /dev/null && nscd -i "$1" 416 type -p nscd >& /dev/null && nscd -i "$1"
597 getent "$1" "$2" 417 getent "$1" "$2"
598 fi 418 ;;
419 esac
599} 420}
600 421
601# Simplify/standardize adding users to the system 422# Simplify/standardize adding users to the system
602# vapier@gentoo.org 423# vapier@gentoo.org
603# 424#
610# shell: /bin/false 431# shell: /bin/false
611# homedir: /dev/null 432# homedir: /dev/null
612# groups: none 433# groups: none
613# extra: comment of 'added by portage for ${PN}' 434# extra: comment of 'added by portage for ${PN}'
614enewuser() { 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
615 # get the username 443 # get the username
616 local euser="$1"; shift 444 local euser=$1; shift
617 if [ -z "${euser}" ] 445 if [[ -z ${euser} ]] ; then
618 then
619 eerror "No username specified !" 446 eerror "No username specified !"
620 die "Cannot call enewuser without a username" 447 die "Cannot call enewuser without a username"
621 fi 448 fi
622 449
623 # lets see if the username already exists 450 # lets see if the username already exists
624 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 451 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
625 then
626 return 0 452 return 0
627 fi 453 fi
628 einfo "Adding user '${euser}' to your system ..." 454 einfo "Adding user '${euser}' to your system ..."
629 455
630 # options to pass to useradd 456 # options to pass to useradd
631 local opts= 457 local opts=
632 458
633 # handle uid 459 # handle uid
634 local euid="$1"; shift 460 local euid=$1; shift
635 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 461 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
636 then
637 if [ "${euid}" -gt 0 ] 462 if [[ ${euid} -gt 0 ]] ; then
638 then
639 if [ ! -z "`egetent passwd ${euid}`" ] 463 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
640 then
641 euid="next" 464 euid="next"
642 fi 465 fi
643 else 466 else
644 eerror "Userid given but is not greater than 0 !" 467 eerror "Userid given but is not greater than 0 !"
645 die "${euid} is not a valid UID" 468 die "${euid} is not a valid UID"
646 fi 469 fi
647 else 470 else
648 euid="next" 471 euid="next"
649 fi 472 fi
650 if [ "${euid}" == "next" ] 473 if [[ ${euid} == "next" ]] ; then
651 then 474 for euid in $(seq 101 999) ; do
652 local pwrange
653 if [ "${USERLAND}" == "BSD" ] ; then
654 pwrange="`jot 898 101`"
655 else
656 pwrange="`seq 101 999`"
657 fi
658 for euid in ${pwrange} ; do
659 [ -z "`egetent passwd ${euid}`" ] && break 475 [[ -z $(egetent passwd ${euid}) ]] && break
660 done 476 done
661 fi 477 fi
662 opts="${opts} -u ${euid}" 478 opts="${opts} -u ${euid}"
663 einfo " - Userid: ${euid}" 479 einfo " - Userid: ${euid}"
664 480
665 # handle shell 481 # handle shell
666 local eshell="$1"; shift 482 local eshell=$1; shift
667 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 483 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
668 then 484 if [[ ! -e ${ROOT}${eshell} ]] ; then
669 if [ ! -e "${eshell}" ]
670 then
671 eerror "A shell was specified but it does not exist !" 485 eerror "A shell was specified but it does not exist !"
672 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"
673 fi 491 fi
674 else 492 else
675 if [ "${USERLAND}" == "BSD" ] 493 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
676 then 494 [[ -x ${ROOT}${shell} ]] && break
677 eshell="/usr/bin/false" 495 done
678 else 496
679 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"
680 fi 500 fi
501
502 eshell=${shell}
681 fi 503 fi
682 einfo " - Shell: ${eshell}" 504 einfo " - Shell: ${eshell}"
683 opts="${opts} -s ${eshell}" 505 opts="${opts} -s ${eshell}"
684 506
685 # handle homedir 507 # handle homedir
686 local ehome="$1"; shift 508 local ehome=$1; shift
687 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 509 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
688 then
689 ehome="/dev/null" 510 ehome="/dev/null"
690 fi 511 fi
691 einfo " - Home: ${ehome}" 512 einfo " - Home: ${ehome}"
692 opts="${opts} -d ${ehome}" 513 opts="${opts} -d ${ehome}"
693 514
694 # handle groups 515 # handle groups
695 local egroups="$1"; shift 516 local egroups=$1; shift
696 if [ ! -z "${egroups}" ] 517 if [[ ! -z ${egroups} ]] ; then
697 then
698 local oldifs="${IFS}" 518 local oldifs=${IFS}
699 local defgroup="" exgroups="" 519 local defgroup="" exgroups=""
700 520
701 export IFS="," 521 export IFS=","
702 for g in ${egroups} 522 for g in ${egroups} ; do
703 do
704 export IFS="${oldifs}" 523 export IFS=${oldifs}
705 if [ -z "`egetent group \"${g}\"`" ] 524 if [[ -z $(egetent group "${g}") ]] ; then
706 then
707 eerror "You must add group ${g} to the system first" 525 eerror "You must add group ${g} to the system first"
708 die "${g} is not a valid GID" 526 die "${g} is not a valid GID"
709 fi 527 fi
710 if [ -z "${defgroup}" ] 528 if [[ -z ${defgroup} ]] ; then
711 then
712 defgroup="${g}" 529 defgroup=${g}
713 else 530 else
714 exgroups="${exgroups},${g}" 531 exgroups="${exgroups},${g}"
715 fi 532 fi
716 export IFS="," 533 export IFS=","
717 done 534 done
718 export IFS="${oldifs}" 535 export IFS=${oldifs}
719 536
720 opts="${opts} -g ${defgroup}" 537 opts="${opts} -g ${defgroup}"
721 if [ ! -z "${exgroups}" ] 538 if [[ ! -z ${exgroups} ]] ; then
722 then
723 opts="${opts} -G ${exgroups:1}" 539 opts="${opts} -G ${exgroups:1}"
724 fi 540 fi
725 else 541 else
726 egroups="(none)" 542 egroups="(none)"
727 fi 543 fi
728 einfo " - Groups: ${egroups}" 544 einfo " - Groups: ${egroups}"
729 545
730 # handle extra and add the user 546 # handle extra and add the user
731 local eextra="$@"
732 local oldsandbox="${SANDBOX_ON}" 547 local oldsandbox=${SANDBOX_ON}
733 export SANDBOX_ON="0" 548 export SANDBOX_ON="0"
734 if useq macos || useq ppc-macos ; 549 case ${CHOST} in
735 then 550 *-darwin*)
736 ### Make the user 551 ### Make the user
737 if [ -z "${eextra}" ] 552 if [[ -z $@ ]] ; then
738 then
739 dscl . create /users/${euser} uid ${euid} 553 dscl . create /users/${euser} uid ${euid}
740 dscl . create /users/${euser} shell ${eshell} 554 dscl . create /users/${euser} shell ${eshell}
741 dscl . create /users/${euser} home ${ehome} 555 dscl . create /users/${euser} home ${ehome}
742 dscl . create /users/${euser} realname "added by portage for ${PN}" 556 dscl . create /users/${euser} realname "added by portage for ${PN}"
743 ### Add the user to the groups specified 557 ### Add the user to the groups specified
744 local oldifs="${IFS}" 558 local oldifs=${IFS}
745 export IFS="," 559 export IFS=","
746 for g in ${egroups} 560 for g in ${egroups} ; do
747 do
748 dscl . merge /groups/${g} users ${euser} 561 dscl . merge /groups/${g} users ${euser}
749 done 562 done
750 export IFS="${oldifs}" 563 export IFS=${oldifs}
751 else 564 else
752 einfo "Extra options are not supported on macos yet" 565 einfo "Extra options are not supported on Darwin yet"
753 einfo "Please report the ebuild along with the info below" 566 einfo "Please report the ebuild along with the info below"
754 einfo "eextra: ${eextra}" 567 einfo "eextra: $@"
755 die "Required function missing" 568 die "Required function missing"
756 fi 569 fi
757 elif use x86-fbsd ; then 570 ;;
758 if [ -z "${eextra}" ] 571 *-freebsd*|*-dragonfly*)
759 then 572 if [[ -z $@ ]] ; then
760 pw useradd ${euser} ${opts} \ 573 pw useradd ${euser} ${opts} \
761 -c "added by portage for ${PN}" \ 574 -c "added by portage for ${PN}" \
762 die "enewuser failed" 575 die "enewuser failed"
763 else 576 else
764 einfo " - Extra: ${eextra}" 577 einfo " - Extra: $@"
765 pw useradd ${euser} ${opts} \ 578 pw useradd ${euser} ${opts} \
766 -c ${eextra} || die "enewuser failed" 579 "$@" || die "enewuser failed"
767 fi 580 fi
581 ;;
582
583 *-netbsd*)
584 if [[ -z $@ ]] ; then
585 useradd ${opts} ${euser} || die "enewuser failed"
768 else 586 else
769 if [ -z "${eextra}" ] 587 einfo " - Extra: $@"
770 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
771 useradd ${opts} ${euser} \ 607 useradd ${opts} ${euser} \
772 -c "added by portage for ${PN}" \ 608 -c "added by portage for ${PN}" \
773 || die "enewuser failed" 609 || die "enewuser failed"
774 else 610 else
775 einfo " - Extra: ${eextra}" 611 einfo " - Extra: $@"
776 useradd ${opts} ${euser} ${eextra} \ 612 useradd ${opts} ${euser} "$@" \
777 || die "enewuser failed" 613 || die "enewuser failed"
778 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}"
779 fi 623 fi
624
780 export SANDBOX_ON="${oldsandbox}" 625 export SANDBOX_ON=${oldsandbox}
781
782 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
783 then
784 einfo " - Creating ${ehome} in ${D}"
785 dodir ${ehome}
786 fowners ${euser} ${ehome}
787 fperms 755 ${ehome}
788 fi
789} 626}
790 627
791# Simplify/standardize adding groups to the system 628# Simplify/standardize adding groups to the system
792# vapier@gentoo.org 629# vapier@gentoo.org
793# 630#
796# Default values if you do not specify any: 633# Default values if you do not specify any:
797# groupname: REQUIRED ! 634# groupname: REQUIRED !
798# gid: next available (see groupadd(8)) 635# gid: next available (see groupadd(8))
799# extra: none 636# extra: none
800enewgroup() { 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
801 # get the group 645 # get the group
802 local egroup="$1"; shift 646 local egroup="$1"; shift
803 if [ -z "${egroup}" ] 647 if [ -z "${egroup}" ]
804 then 648 then
805 eerror "No group specified !" 649 eerror "No group specified !"
822 then 666 then
823 if [ "${egid}" -gt 0 ] 667 if [ "${egid}" -gt 0 ]
824 then 668 then
825 if [ -z "`egetent group ${egid}`" ] 669 if [ -z "`egetent group ${egid}`" ]
826 then 670 then
827 if useq macos || useq ppc-macos ; then 671 if [[ "${CHOST}" == *-darwin* ]]; then
828 opts="${opts} ${egid}" 672 opts="${opts} ${egid}"
829 else 673 else
830 opts="${opts} -g ${egid}" 674 opts="${opts} -g ${egid}"
831 fi 675 fi
832 else 676 else
846 opts="${opts} ${eextra}" 690 opts="${opts} ${eextra}"
847 691
848 # add the group 692 # add the group
849 local oldsandbox="${SANDBOX_ON}" 693 local oldsandbox="${SANDBOX_ON}"
850 export SANDBOX_ON="0" 694 export SANDBOX_ON="0"
851 if useq macos || useq ppc-macos ; 695 case ${CHOST} in
852 then 696 *-darwin*)
853 if [ ! -z "${eextra}" ]; 697 if [ ! -z "${eextra}" ];
854 then 698 then
855 einfo "Extra options are not supported on macos yet" 699 einfo "Extra options are not supported on Darwin/OS X yet"
856 einfo "Please report the ebuild along with the info below" 700 einfo "Please report the ebuild along with the info below"
857 einfo "eextra: ${eextra}" 701 einfo "eextra: ${eextra}"
858 die "Required function missing" 702 die "Required function missing"
859 fi 703 fi
860 704
861 # If we need the next available 705 # If we need the next available
862 case ${egid} in 706 case ${egid} in
863 *[!0-9]*) # Non numeric 707 *[!0-9]*) # Non numeric
864 for egid in `jot 898 101`; do 708 for egid in $(seq 101 999); do
865 [ -z "`egetent group ${egid}`" ] && break 709 [ -z "`egetent group ${egid}`" ] && break
866 done 710 done
867 esac 711 esac
868 dscl . create /groups/${egroup} gid ${egid} 712 dscl . create /groups/${egroup} gid ${egid}
869 dscl . create /groups/${egroup} passwd '*' 713 dscl . create /groups/${egroup} passwd '*'
870 elif use x86-fbsd ; then 714 ;;
715
716 *-freebsd*|*-dragonfly*)
871 case ${egid} in 717 case ${egid} in
872 *[!0-9]*) # Non numeric 718 *[!0-9]*) # Non numeric
873 for egid in `jot 898 101`; do 719 for egid in $(seq 101 999); do
874 [ -z "`egetent group ${egid}`" ] && break 720 [ -z "`egetent group ${egid}`" ] && break
875 done 721 done
876 esac 722 esac
877 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 723 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
878 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 *)
879 groupadd ${opts} ${egroup} || die "enewgroup failed" 737 groupadd ${opts} ${egroup} || die "enewgroup failed"
880 fi 738 ;;
739 esac
881 export SANDBOX_ON="${oldsandbox}" 740 export SANDBOX_ON="${oldsandbox}"
882} 741}
883 742
884# Simple script to replace 'dos2unix' binaries 743# Simple script to replace 'dos2unix' binaries
885# vapier@gentoo.org 744# vapier@gentoo.org
886# 745#
887# edos2unix(file, <more files>...) 746# edos2unix(file, <more files> ...)
888edos2unix() { 747edos2unix() {
889 for f in "$@" 748 for f in "$@"
890 do 749 do
891 cp "${f}" ${T}/edos2unix 750 cp "${f}" ${T}/edos2unix
892 sed 's/\r$//' ${T}/edos2unix > "${f}" 751 sed 's/\r$//' ${T}/edos2unix > "${f}"
893 done 752 done
894} 753}
895 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
896# Make a desktop file ! 762# Make a desktop file !
897# Great for making those icons in kde/gnome startmenu ! 763# Great for making those icons in kde/gnome startmenu !
898# Amaze your friends ! Get the women ! Join today ! 764# Amaze your friends ! Get the women ! Join today !
899# 765#
900# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 766# make_desktop_entry(<command>, [name], [icon], [type], [path])
901# 767#
902# binary: what binary does the app run with ? 768# binary: what command does the app run with ?
903# name: the name that will show up in the menu 769# name: the name that will show up in the menu
904# icon: give your little like a pretty little icon ... 770# icon: give your little like a pretty little icon ...
905# this can be relative (to /usr/share/pixmaps) or 771# this can be relative (to /usr/share/pixmaps) or
906# a full path to an icon 772# a full path to an icon
907# type: what kind of application is this ? for categories: 773# type: what kind of application is this ? for categories:
908# http://www.freedesktop.org/standards/menu-spec/ 774# http://www.freedesktop.org/Standards/desktop-entry-spec
909# path: if your app needs to startup in a specific dir 775# path: if your app needs to startup in a specific dir
910make_desktop_entry() { 776make_desktop_entry() {
911 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 777 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
912 778
913 local exec="${1}" 779 local exec=${1}
914 local name="${2:-${PN}}" 780 local name=${2:-${PN}}
915 local icon="${3:-${PN}.png}" 781 local icon=${3:-${PN}.png}
916 local type="${4}" 782 local type=${4}
917 local subdir="${6}" 783 local path=${5}
918 local path="${5:-${GAMES_BINDIR}}" 784
919 if [ -z "${type}" ] 785 if [[ -z ${type} ]] ; then
920 then 786 local catmaj=${CATEGORY%%-*}
921 case ${CATEGORY} in 787 local catmin=${CATEGORY##*-}
922 "app-emulation") 788 case ${catmaj} in
923 type=Emulator 789 app)
924 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
925 ;; 803 ;;
926 "games-"*) 804
927 type=Game 805 dev)
928 subdir="Games" 806 type="Development"
929 ;; 807 ;;
930 "net-"*) 808
931 type=Network 809 games)
932 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}"
933 ;; 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
934 *) 879 *)
935 type= 880 type=
936 subdir=
937 ;; 881 ;;
938 esac 882 esac
939 fi 883 fi
884 if [ "${SLOT}" == "0" ] ; then
885 local desktop_name="${PN}"
886 else
887 local desktop_name="${PN}-${SLOT}"
888 fi
940 local desktop="${T}/${exec}.desktop" 889 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
890# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
941 891
942echo "[Desktop Entry] 892echo "[Desktop Entry]
943Encoding=UTF-8 893Encoding=UTF-8
944Version=0.9.2 894Version=0.9.2
945Name=${name} 895Name=${name}
946Type=Application 896Type=Application
947Comment=${DESCRIPTION} 897Comment=${DESCRIPTION}
948Exec=${exec} 898Exec=${exec}
899TryExec=${exec%% *}
949Path=${path} 900Path=${path}
950Icon=${icon} 901Icon=${icon}
951Categories=Application;${type};" > "${desktop}" 902Categories=Application;${type};" > "${desktop}"
952 903
904 (
905 # wrap the env here so that the 'insinto' call
906 # doesn't corrupt the env of the caller
907 insinto /usr/share/applications
908 doins "${desktop}"
909 )
910}
911
912# Make a GDM/KDM Session file
913#
914# make_desktop_entry(<title>, <command>)
915# title: File to execute to start the Window Manager
916# command: Name of the Window Manager
917
918make_session_desktop() {
919 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
920 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
921
922 local title=$1
923 local command=$2
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
935 doins "${desktop}"
936}
937
938domenu() {
939 local i j
953 insinto /usr/share/applications 940 insinto /usr/share/applications
954 doins "${desktop}" 941 for i in "$@" ; do
955 942 if [[ -f ${i} ]] ; then
956 return 0 943 doins "${i}"
944 elif [[ -d ${i} ]] ; then
945 for j in "${i}"/*.desktop ; do
946 doins "${j}"
947 done
948 fi
949 done
957} 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
958 978
959# for internal use only (unpack_pdv and unpack_makeself) 979# for internal use only (unpack_pdv and unpack_makeself)
960find_unpackable_file() { 980find_unpackable_file() {
961 local src="$1" 981 local src=$1
962 if [ -z "${src}" ] 982 if [[ -z ${src} ]] ; then
963 then
964 src="${DISTDIR}/${A}" 983 src=${DISTDIR}/${A}
965 else 984 else
966 if [ -e "${DISTDIR}/${src}" ] 985 if [[ -e ${DISTDIR}/${src} ]] ; then
967 then
968 src="${DISTDIR}/${src}" 986 src=${DISTDIR}/${src}
969 elif [ -e "${PWD}/${src}" ] 987 elif [[ -e ${PWD}/${src} ]] ; then
970 then
971 src="${PWD}/${src}" 988 src=${PWD}/${src}
972 elif [ -e "${src}" ] 989 elif [[ -e ${src} ]] ; then
973 then
974 src="${src}" 990 src=${src}
975 fi
976 fi 991 fi
977 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 992 fi
993 [[ ! -e ${src} ]] && return 1
978 echo "${src}" 994 echo "${src}"
979} 995}
980 996
981# Unpack those pesky pdv generated files ... 997# Unpack those pesky pdv generated files ...
982# They're self-unpacking programs with the binary package stuffed in 998# They're self-unpacking programs with the binary package stuffed in
997# lseek 1013# lseek
998# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1014# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
999# lseek(3, -4, SEEK_END) = 2981250 1015# lseek(3, -4, SEEK_END) = 2981250
1000# 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.
1001unpack_pdv() { 1017unpack_pdv() {
1002 local src="`find_unpackable_file $1`" 1018 local src=$(find_unpackable_file $1)
1003 local sizeoff_t="$2" 1019 local sizeoff_t=$2
1004 1020
1021 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1005 [ -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 :("
1006 1023
1007 local shrtsrc="`basename ${src}`" 1024 local shrtsrc=$(basename "${src}")
1008 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1025 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1009 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1026 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1010 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\"`
1011 1028
1012 # grab metadata for debug reasons 1029 # grab metadata for debug reasons
1076# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1093# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1077# - If the file is not specified then unpack will utilize ${A}. 1094# - If the file is not specified then unpack will utilize ${A}.
1078# - 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
1079# the proper offset from the script itself. 1096# the proper offset from the script itself.
1080unpack_makeself() { 1097unpack_makeself() {
1098 local src_input=${1:-${A}}
1081 local src="$(find_unpackable_file "$1")" 1099 local src=$(find_unpackable_file "${src_input}")
1082 local skip="$2" 1100 local skip=$2
1083 local exe="$3" 1101 local exe=$3
1084 1102
1103 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1104
1085 local shrtsrc="$(basename "${src}")" 1105 local shrtsrc=$(basename "${src}")
1086 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1106 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1087 if [ -z "${skip}" ] 1107 if [[ -z ${skip} ]] ; then
1088 then
1089 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1108 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1090 local skip=0 1109 local skip=0
1091 exe=tail 1110 exe=tail
1092 case ${ver} in 1111 case ${ver} in
1093 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
1094 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1113 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1095 ;; 1114 ;;
1096 2.0|2.0.1) 1115 2.0|2.0.1)
1097 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1116 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1098 ;; 1117 ;;
1106 ;; 1125 ;;
1107 2.1.3) 1126 2.1.3)
1108 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1127 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1109 let skip="skip + 1" 1128 let skip="skip + 1"
1110 ;; 1129 ;;
1111 2.1.4) 1130 2.1.4|2.1.5)
1112 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1131 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1113 skip=$(head -n ${skip} "${src}" | wc -c) 1132 skip=$(head -n ${skip} "${src}" | wc -c)
1114 exe="dd" 1133 exe="dd"
1115 ;; 1134 ;;
1116 *) 1135 *)
1161check_license() { 1180check_license() {
1162 local lic=$1 1181 local lic=$1
1163 if [ -z "${lic}" ] ; then 1182 if [ -z "${lic}" ] ; then
1164 lic="${PORTDIR}/licenses/${LICENSE}" 1183 lic="${PORTDIR}/licenses/${LICENSE}"
1165 else 1184 else
1166 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1185 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1167 lic="${PORTDIR}/licenses/${src}" 1186 lic="${PORTDIR}/licenses/${lic}"
1168 elif [ -e "${PWD}/${src}" ] ; then 1187 elif [ -e "${PWD}/${lic}" ] ; then
1169 lic="${PWD}/${src}" 1188 lic="${PWD}/${lic}"
1170 elif [ -e "${src}" ] ; then 1189 elif [ -e "${lic}" ] ; then
1171 lic="${src}" 1190 lic="${lic}"
1172 fi
1173 fi 1191 fi
1192 fi
1174 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1193 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1175 local l="`basename ${lic}`" 1194 local l="`basename ${lic}`"
1176 1195
1177 # here is where we check for the licenses the user already 1196 # here is where we check for the licenses the user already
1178 # 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
1179 local shopts=$- 1198 local shopts=$-
1221# 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
1222# found at CDROM_ROOT. 1241# found at CDROM_ROOT.
1223# 1242#
1224# 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',
1225# 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
1226# 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_#
1227# 1250#
1228# 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.
1229# 1252#
1230# 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] [...]
1231# - 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
1235 # 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
1236 # the # of files they gave us 1259 # the # of files they gave us
1237 local cdcnt=0 1260 local cdcnt=0
1238 local f= 1261 local f=
1239 for f in "$@" ; do 1262 for f in "$@" ; do
1240 cdcnt=$((cdcnt + 1)) 1263 ((++cdcnt))
1241 export CDROM_CHECK_${cdcnt}="$f" 1264 export CDROM_CHECK_${cdcnt}="$f"
1242 done 1265 done
1243 export CDROM_TOTAL_CDS=${cdcnt} 1266 export CDROM_TOTAL_CDS=${cdcnt}
1244 export CDROM_CURRENT_CD=1 1267 export CDROM_CURRENT_CD=1
1245 1268
1246 # now we see if the user gave use CD_ROOT ... 1269 # now we see if the user gave use CD_ROOT ...
1247 # 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
1248 if [ ! -z "${CD_ROOT}" ] ; then 1271 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1249 export CDROM_ROOT="${CD_ROOT}"
1250 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1251 return
1252 fi
1253 # do the same for CD_ROOT_X
1254 if [ ! -z "${CD_ROOT_1}" ] ; then
1255 local var= 1272 local var=
1256 cdcnt=0 1273 cdcnt=0
1257 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1274 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1258 cdcnt=$((cdcnt + 1)) 1275 ((++cdcnt))
1259 var="CD_ROOT_${cdcnt}" 1276 var="CD_ROOT_${cdcnt}"
1277 [[ -z ${!var} ]] && var="CD_ROOT"
1260 if [ -z "${!var}" ] ; then 1278 if [[ -z ${!var} ]] ; then
1261 eerror "You must either use just the CD_ROOT" 1279 eerror "You must either use just the CD_ROOT"
1262 eerror "or specify ALL the CD_ROOT_X variables." 1280 eerror "or specify ALL the CD_ROOT_X variables."
1263 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."
1264 die "could not locate CD_ROOT_${cdcnt}" 1282 die "could not locate CD_ROOT_${cdcnt}"
1265 fi 1283 fi
1266 export CDROM_ROOTS_${cdcnt}="${!var}"
1267 done 1284 done
1268 export CDROM_ROOT=${CDROM_ROOTS_1} 1285 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1269 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}
1270 return 1293 return
1271 fi 1294 fi
1272 1295
1296 # User didn't help us out so lets make sure they know they can
1297 # simplify the whole process ...
1273 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1298 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1274 einfon "This ebuild will need the " 1299 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1275 if [ -z "${CDROM_NAME}" ] ; then
1276 echo "cdrom for ${PN}."
1277 else
1278 echo "${CDROM_NAME}."
1279 fi
1280 echo 1300 echo
1281 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"
1282 einfo "mounted somewhere on your filesystem, just export" 1302 einfo "mounted somewhere on your filesystem, just export"
1283 einfo "the variable CD_ROOT so that it points to the" 1303 einfo "the variable CD_ROOT so that it points to the"
1284 einfo "directory containing the files." 1304 einfo "directory containing the files."
1285 echo 1305 echo
1306 einfo "For example:"
1307 einfo "export CD_ROOT=/mnt/cdrom"
1308 echo
1286 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
1287 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1319 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1288 cdcnt=0 1320 cdcnt=0
1289 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1290 cdcnt=$((cdcnt + 1)) 1322 ((++cdcnt))
1291 var="CDROM_NAME_${cdcnt}" 1323 var="CDROM_NAME_${cdcnt}"
1292 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1324 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1293 done 1325 done
1294 echo 1326 echo
1295 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"
1296 einfo "mounted somewhere on your filesystem, just export" 1328 einfo "mounted somewhere on your filesystem, just export"
1297 einfo "the following variables so they point to the right place:" 1329 einfo "the following variables so they point to the right place:"
1298 einfon "" 1330 einfon ""
1299 cdcnt=0 1331 cdcnt=0
1300 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1332 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1301 cdcnt=$((cdcnt + 1)) 1333 ((++cdcnt))
1302 echo -n " CD_ROOT_${cdcnt}" 1334 echo -n " CD_ROOT_${cdcnt}"
1303 done 1335 done
1304 echo 1336 echo
1305 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"
1306 einfo "you only have one cdrom, you can export CD_ROOT" 1338 einfo "you only have one cdrom, you can export CD_ROOT"
1307 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"
1308 einfo "for all the CDs." 1340 einfo "for all the CDs."
1309 echo 1341 echo
1342 einfo "For example:"
1343 einfo "export CD_ROOT_1=/mnt/cdrom"
1344 echo
1310 fi 1345 fi
1346
1347 export CDROM_SET=""
1311 export CDROM_CURRENT_CD=0 1348 export CDROM_CURRENT_CD=0
1312 cdrom_load_next_cd 1349 cdrom_load_next_cd
1313} 1350}
1314 1351
1315# 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.
1316# 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.
1317# 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.
1318# 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.
1319cdrom_load_next_cd() { 1356cdrom_load_next_cd() {
1320 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1321 local var= 1357 local var
1322 1358 ((++CDROM_CURRENT_CD))
1323 if [ ! -z "${CD_ROOT}" ] ; then
1324 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1325 return
1326 fi
1327 1359
1328 unset CDROM_ROOT 1360 unset CDROM_ROOT
1329 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1361 var=CD_ROOT_${CDROM_CURRENT_CD}
1362 [[ -z ${!var} ]] && var="CD_ROOT"
1330 if [ -z "${!var}" ] ; then 1363 if [[ -z ${!var} ]] ; then
1331 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1364 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1332 cdrom_locate_file_on_cd ${!var} 1365 _cdrom_locate_file_on_cd ${!var}
1333 else 1366 else
1334 export CDROM_ROOT="${!var}" 1367 export CDROM_ROOT=${!var}
1335 fi 1368 fi
1336 1369
1337 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1370 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1338} 1371}
1339 1372
1342# 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
1343# 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
1344# displayed and we'll hang out here until: 1377# displayed and we'll hang out here until:
1345# (1) the file is found on a mounted cdrom 1378# (1) the file is found on a mounted cdrom
1346# (2) the user hits CTRL+C 1379# (2) the user hits CTRL+C
1347cdrom_locate_file_on_cd() { 1380_cdrom_locate_file_on_cd() {
1348 while [ -z "${CDROM_ROOT}" ] ; do
1349 local dir="$(dirname ${@})"
1350 local file="$(basename ${@})"
1351 local mline="" 1381 local mline=""
1352 local showedmsg=0 1382 local showedmsg=0
1353 1383
1354 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
1355 [ -d "${mline}/${dir}" ] || continue 1396 [[ -d ${mline}/${dir} ]] || continue
1356 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1397 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1357 && 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))
1358 done 1406 done
1359 1407
1360 if [ -z "${CDROM_ROOT}" ] ; then
1361 echo 1408 echo
1362 if [ ${showedmsg} -eq 0 ] ; then 1409 if [[ ${showedmsg} -eq 0 ]] ; then
1363 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1410 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1364 if [ -z "${CDROM_NAME}" ] ; then 1411 if [[ -z ${CDROM_NAME} ]] ; then
1365 einfo "Please insert the cdrom for ${PN} now !" 1412 einfo "Please insert+mount the cdrom for ${PN} now !"
1366 else
1367 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1368 fi
1369 else 1413 else
1370 if [ -z "${CDROM_NAME_1}" ] ; then
1371 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1372 else
1373 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1374 einfo "Please insert+mount the ${!var} cdrom now !" 1414 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1375 fi
1376 fi 1415 fi
1377 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
1378 fi 1423 fi
1424 showedmsg=1
1425 fi
1379 einfo "Press return to scan for the cd again" 1426 einfo "Press return to scan for the cd again"
1380 einfo "or hit CTRL+C to abort the emerge." 1427 einfo "or hit CTRL+C to abort the emerge."
1381 read 1428 echo
1382 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"
1383 done 1434 done
1384} 1435}
1385 1436
1386# Make sure that LINGUAS only contains languages that 1437# Make sure that LINGUAS only contains languages that
1387# a package can support 1438# a package can support
1394# 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
1395# directories and uses the intersection of the lists. 1446# directories and uses the intersection of the lists.
1396# 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
1397# directories and uses the union of the lists. 1448# directories and uses the union of the lists.
1398strip-linguas() { 1449strip-linguas() {
1399 local ls newls 1450 local ls newls nols
1400 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1451 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1401 local op="$1"; shift 1452 local op=$1; shift
1402 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1453 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1403 local d f 1454 local d f
1404 for d in "$@" ; do 1455 for d in "$@" ; do
1405 if [ "${op}" == "-u" ] ; then 1456 if [[ ${op} == "-u" ]] ; then
1406 newls="${ls}" 1457 newls=${ls}
1407 else 1458 else
1408 newls="" 1459 newls=""
1409 fi 1460 fi
1410 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1461 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1411 if [ "${op}" == "-i" ] ; then 1462 if [[ ${op} == "-i" ]] ; then
1412 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1463 hasq ${f} ${ls} && newls="${newls} ${f}"
1413 else 1464 else
1414 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1465 hasq ${f} ${ls} || newls="${newls} ${f}"
1415 fi 1466 fi
1416 done 1467 done
1417 ls="${newls}" 1468 ls=${newls}
1418 done 1469 done
1419 ls="${ls//.po}"
1420 else 1470 else
1421 ls="$@" 1471 ls="$@"
1422 fi 1472 fi
1423 1473
1424 ls=" ${ls} " 1474 nols=""
1425 newls="" 1475 newls=""
1426 for f in ${LINGUAS} ; do 1476 for f in ${LINGUAS} ; do
1427 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1477 if hasq ${f} ${ls} ; then
1428 nl="${newls} ${f}" 1478 newls="${newls} ${f}"
1429 else 1479 else
1430 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1480 nols="${nols} ${f}"
1431 fi 1481 fi
1432 done 1482 done
1433 if [ -z "${newls}" ] ; then 1483 [[ -n ${nols} ]] \
1434 unset LINGUAS 1484 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1435 else
1436 export LINGUAS="${newls}" 1485 export LINGUAS=${newls:1}
1437 fi
1438} 1486}
1439 1487
1440# moved from kernel.eclass since they are generally useful outside of 1488# moved from kernel.eclass since they are generally useful outside of
1441# kernel.eclass -iggy (20041002) 1489# kernel.eclass -iggy (20041002)
1442 1490
1443# the following functions are useful in kernel module ebuilds, etc. 1491# the following functions are useful in kernel module ebuilds, etc.
1444# for an example see ivtv or drbd ebuilds 1492# for an example see ivtv or drbd ebuilds
1445 1493
1446# set's ARCH to match what the kernel expects 1494# set's ARCH to match what the kernel expects
1447set_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
1448 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1500 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1449 case ${ARCH} in 1501 case ${ARCH} in
1450 x86) export ARCH="i386";; 1502 x86) export ARCH="i386";;
1451 amd64) export ARCH="x86_64";; 1503 amd64) export ARCH="x86_64";;
1452 hppa) export ARCH="parisc";; 1504 hppa) export ARCH="parisc";;
1453 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!
1454 *) export ARCH="${ARCH}";; 1507 *) export ARCH="${ARCH}";;
1455 esac 1508 esac
1456} 1509}
1457 1510
1458# set's ARCH back to what portage expects 1511# set's ARCH back to what portage expects
1459set_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
1460 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1517 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1461} 1518}
1462 1519
1463# Jeremy Huddleston <eradicator@gentoo.org>: 1520# Jeremy Huddleston <eradicator@gentoo.org>:
1464# preserve_old_lib /path/to/libblah.so.0 1521# preserve_old_lib /path/to/libblah.so.0
1465# preserve_old_lib_notify /path/to/libblah.so.0 1522# preserve_old_lib_notify /path/to/libblah.so.0
1466# 1523#
1467# 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
1468# 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
1469# 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
1470# 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
1471# solution, so instead you can add the following to your ebuilds: 1528# solution, so instead you can add the following to your ebuilds:
1472# 1529#
1494 touch ${D}${LIB} 1551 touch ${D}${LIB}
1495 fi 1552 fi
1496} 1553}
1497 1554
1498preserve_old_lib_notify() { 1555preserve_old_lib_notify() {
1499 LIB=$1 1556 LIB=$1
1500 1557
1501 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1558 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1502 SONAME=`basename ${LIB}` 1559 SONAME=`basename ${LIB}`
1503 1560
1504 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."
1505 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"
1506 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,"
1507 einfo "you will need to execute the following command:" 1564 ewarn "you will need to execute the following command:"
1508 einfo " revdep-rebuild --soname ${SONAME}" 1565 ewarn " revdep-rebuild --library ${SONAME}"
1509 einfo 1566 ewarn
1510 einfo "After doing that, you can safely remove ${LIB}" 1567 ewarn "After doing that, you can safely remove ${LIB}"
1511 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1568 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1512 fi 1569 fi
1513} 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.118  
changed lines
  Added in v.1.245

  ViewVC Help
Powered by ViewVC 1.1.20