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

Legend:
Removed from v.1.118  
changed lines
  Added in v.1.223

  ViewVC Help
Powered by ViewVC 1.1.20