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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.135  
changed lines
  Added in v.1.228

  ViewVC Help
Powered by ViewVC 1.1.20