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

Diff of /eclass/eutils.eclass

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

Revision 1.137 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.137 2005/01/07 11:21:42 eradicator 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)
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 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 ]] ; }
224 local PIPE_CMD="" 159 local PIPE_CMD=""
225 local STDERR_TARGET="${T}/$$.out" 160 local STDERR_TARGET="${T}/$$.out"
226 local PATCH_TARGET="${T}/$$.patch" 161 local PATCH_TARGET="${T}/$$.patch"
227 local PATCH_SUFFIX="" 162 local PATCH_SUFFIX=""
228 local SINGLE_PATCH="no" 163 local SINGLE_PATCH="no"
229 local x="" 164 local x=""
230 165
166 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
167
231 if [ "$#" -gt 1 ] 168 if [ "$#" -gt 1 ]
232 then 169 then
233 local m="" 170 local m=""
234 einfo "${#} patches to apply ..."
235 for m in "$@" ; do 171 for m in "$@" ; do
236 epatch "${m}" 172 epatch "${m}"
237 done 173 done
238 return 0 174 return 0
239 fi 175 fi
264 200
265 echo 201 echo
266 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 202 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
267 eerror 203 eerror
268 eerror " ${EPATCH_SOURCE}" 204 eerror " ${EPATCH_SOURCE}"
205 eerror " ( ${EPATCH_SOURCE##*/} )"
269 echo 206 echo
270 die "Cannot find \$EPATCH_SOURCE!" 207 die "Cannot find \$EPATCH_SOURCE!"
271 fi 208 fi
272 209
273 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 210 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
292 ;; 229 ;;
293 esac 230 esac
294 231
295 if [ "${SINGLE_PATCH}" = "no" ] 232 if [ "${SINGLE_PATCH}" = "no" ]
296 then 233 then
297 einfo "Applying various patches (bugfixes/updates) ..." 234 einfo "${EPATCH_MULTI_MSG}"
298 fi 235 fi
299 for x in ${EPATCH_SOURCE} 236 for x in ${EPATCH_SOURCE}
300 do 237 do
301 # New ARCH dependant patch naming scheme ... 238 # New ARCH dependant patch naming scheme ...
302 # 239 #
303 # ???_arch_foo.patch 240 # ???_arch_foo.patch
304 # 241 #
305 if [ -f ${x} ] && \ 242 if [ -f ${x} ] && \
306 ([ "${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}" ] || \
307 [ "${EPATCH_FORCE}" = "yes" ]) 244 [ "${EPATCH_FORCE}" = "yes" ])
308 then 245 then
309 local count=0 246 local count=0
310 local popts="${EPATCH_OPTS}" 247 local popts="${EPATCH_OPTS}"
248 local patchname=${x##*/}
311 249
312 if [ -n "${EPATCH_EXCLUDE}" ] 250 if [ -n "${EPATCH_EXCLUDE}" ]
313 then 251 then
314 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 252 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
315 then 253 then
316 continue 254 continue
317 fi 255 fi
318 fi 256 fi
319 257
321 then 259 then
322 if [ -n "${EPATCH_SINGLE_MSG}" ] 260 if [ -n "${EPATCH_SINGLE_MSG}" ]
323 then 261 then
324 einfo "${EPATCH_SINGLE_MSG}" 262 einfo "${EPATCH_SINGLE_MSG}"
325 else 263 else
326 einfo "Applying ${x##*/} ..." 264 einfo "Applying ${patchname} ..."
327 fi 265 fi
328 else 266 else
329 einfo " ${x##*/} ..." 267 einfo " ${patchname} ..."
330 fi 268 fi
331 269
332 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 270 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
333 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 271 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
334 272
335 # Allow for prefix to differ ... im lazy, so shoot me :/ 273 # Allow for prefix to differ ... im lazy, so shoot me :/
336 while [ "${count}" -lt 5 ] 274 while [ "${count}" -lt 5 ]
337 do 275 do
338 # Generate some useful debug info ... 276 # Generate some useful debug info ...
339 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 277 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
340 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 278 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
341 279
342 if [ "${PATCH_SUFFIX}" != "patch" ] 280 if [ "${PATCH_SUFFIX}" != "patch" ]
343 then 281 then
344 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 282 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
345 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 283 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
346 else 284 else
347 PATCH_TARGET="${x}" 285 PATCH_TARGET="${x}"
348 fi 286 fi
349 287
350 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 288 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
351 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##*/}
352 290
353 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 291 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
354 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 292 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
355 293
356 if [ "${PATCH_SUFFIX}" != "patch" ] 294 if [ "${PATCH_SUFFIX}" != "patch" ]
357 then 295 then
358 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
359 then 297 then
360 echo 298 echo
361 eerror "Could not extract patch!" 299 eerror "Could not extract patch!"
362 #die "Could not extract patch!" 300 #die "Could not extract patch!"
363 count=5 301 count=5
364 break 302 break
365 fi 303 fi
366 fi 304 fi
367 305
368 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
369 then 307 then
370 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 308 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
371 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 309 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
372 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 310 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
373 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 311 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
374 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 312 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
375 313
376 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
377 316
378 if [ "$?" -ne 0 ] 317 if [ "$?" -ne 0 ]
379 then 318 then
380 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##*/}
381 echo 320 echo
382 eerror "A dry-run of patch command succeeded, but actually" 321 eerror "A dry-run of patch command succeeded, but actually"
383 eerror "applying the patch failed!" 322 eerror "applying the patch failed!"
384 #die "Real world sux compared to the dreamworld!" 323 #die "Real world sux compared to the dreamworld!"
385 count=5 324 count=5
386 fi 325 fi
387 326
388 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 327 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
389 328
390 break 329 break
391 fi 330 fi
392 331
393 count=$((count + 1)) 332 count=$((count + 1))
399 fi 338 fi
400 339
401 if [ "${count}" -eq 5 ] 340 if [ "${count}" -eq 5 ]
402 then 341 then
403 echo 342 echo
404 eerror "Failed Patch: ${x##*/}!" 343 eerror "Failed Patch: ${patchname} !"
344 eerror " ( ${PATCH_TARGET} )"
405 eerror 345 eerror
406 eerror "Include in your bugreport the contents of:" 346 eerror "Include in your bugreport the contents of:"
407 eerror 347 eerror
408 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 348 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
409 echo 349 echo
410 die "Failed Patch: ${x##*/}!" 350 die "Failed Patch: ${patchname}!"
411 fi 351 fi
412 352
413 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 353 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
414 354
415 eend 0 355 eend 0
416 fi 356 fi
417 done 357 done
418 if [ "${SINGLE_PATCH}" = "no" ] 358 if [ "${SINGLE_PATCH}" = "no" ]
419 then 359 then
420 einfo "Done with patching" 360 einfo "Done with patching"
421 fi 361 fi
422} 362}
423 363
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) 364# Cheap replacement for when debianutils (and thus mktemp)
551# does not exist on the users system 365# does not exist on the users system
552# vapier@gentoo.org 366# vapier@gentoo.org
553# 367#
554# Takes just 1 optional parameter (the directory to create tmpfile in) 368# Takes just 1 optional parameter (the directory to create tmpfile in)
555emktemp() { 369emktemp() {
556 local exe="touch" 370 local exe="touch"
557 [ "$1" == "-d" ] && exe="mkdir" && shift 371 [[ $1 == -d ]] && exe="mkdir" && shift
558 local topdir="$1" 372 local topdir=$1
559 373
560 if [ -z "${topdir}" ] 374 if [[ -z ${topdir} ]] ; then
561 then
562 [ -z "${T}" ] \ 375 [[ -z ${T} ]] \
563 && topdir="/tmp" \ 376 && topdir="/tmp" \
564 || topdir="${T}" 377 || topdir=${T}
565 fi 378 fi
566 379
567 if [ -z "$(type -p mktemp)" ] 380 if [[ -z $(type -p mktemp) ]] ; then
568 then
569 local tmp=/ 381 local tmp=/
570 while [ -e "${tmp}" ] ; do 382 while [[ -e ${tmp} ]] ; do
571 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 383 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
572 done 384 done
573 ${exe} "${tmp}" 385 ${exe} "${tmp}" || ${exe} -p "${tmp}"
574 echo "${tmp}" 386 echo "${tmp}"
575 else 387 else
576 [ "${exe}" == "touch" ] \ 388 if [[ ${exe} == "touch" ]] ; then
389 [[ ${USERLAND} == "GNU" ]] \
577 && exe="-p" \ 390 && exe="-p" \
391 || exe="-t"
392 else
393 [[ ${USERLAND} == "GNU" ]] \
394 && exe="-d" \
578 || exe="-d" 395 || exe="-dt"
579 mktemp ${exe} "${topdir}" 396 fi
397 TMPDIR="${topdir}" mktemp ${exe} tmp
580 fi 398 fi
581} 399}
582 400
583# Small wrapper for getent (Linux), nidump (Mac OS X), 401# Small wrapper for getent (Linux), nidump (Mac OS X),
584# and pw (FreeBSD) used in enewuser()/enewgroup() 402# and pw (FreeBSD) used in enewuser()/enewgroup()
585# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 403# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
586# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 404# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
587# 405#
588# egetent(database, key) 406# egetent(database, key)
589egetent() { 407egetent() {
590 if useq ppc-macos ; then 408 case ${CHOST} in
409 *-darwin*)
591 case "$2" in 410 case "$2" in
592 *[!0-9]*) # Non numeric 411 *[!0-9]*) # Non numeric
593 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 412 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
594 ;; 413 ;;
595 *) # Numeric 414 *) # Numeric
596 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 415 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
597 ;; 416 ;;
598 esac 417 esac
599 elif useq x86-fbsd ; then 418 ;;
600 local action 419 *-freebsd*|*-dragonfly*)
601 if [ "$1" == "passwd" ] 420 local opts action="user"
602 then 421 [[ $1 == "passwd" ]] || action="group"
603 action="user" 422
604 else 423 # lookup by uid/gid
605 action="group" 424 if [[ $2 == [[:digit:]]* ]] ; then
425 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
606 fi 426 fi
427
607 pw show "${action}" "$2" -q 428 pw show ${action} ${opts} "$2" -q
608 else 429 ;;
430 *-netbsd*|*-openbsd*)
431 grep "$2:\*:" /etc/$1
432 ;;
433 *)
609 which nscd >& /dev/null && nscd -i "$1" 434 type -p nscd >& /dev/null && nscd -i "$1"
610 getent "$1" "$2" 435 getent "$1" "$2"
611 fi 436 ;;
437 esac
612} 438}
613 439
614# Simplify/standardize adding users to the system 440# Simplify/standardize adding users to the system
615# vapier@gentoo.org 441# vapier@gentoo.org
616# 442#
624# homedir: /dev/null 450# homedir: /dev/null
625# groups: none 451# groups: none
626# extra: comment of 'added by portage for ${PN}' 452# extra: comment of 'added by portage for ${PN}'
627enewuser() { 453enewuser() {
628 # get the username 454 # get the username
629 local euser="$1"; shift 455 local euser=$1; shift
630 if [ -z "${euser}" ] 456 if [[ -z ${euser} ]] ; then
631 then
632 eerror "No username specified !" 457 eerror "No username specified !"
633 die "Cannot call enewuser without a username" 458 die "Cannot call enewuser without a username"
634 fi 459 fi
635 460
636 # lets see if the username already exists 461 # lets see if the username already exists
637 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 462 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
638 then
639 return 0 463 return 0
640 fi 464 fi
641 einfo "Adding user '${euser}' to your system ..." 465 einfo "Adding user '${euser}' to your system ..."
642 466
643 # options to pass to useradd 467 # options to pass to useradd
644 local opts= 468 local opts=
645 469
646 # handle uid 470 # handle uid
647 local euid="$1"; shift 471 local euid=$1; shift
648 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 472 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
649 then
650 if [ "${euid}" -gt 0 ] 473 if [[ ${euid} -gt 0 ]] ; then
651 then
652 if [ ! -z "`egetent passwd ${euid}`" ] 474 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
653 then
654 euid="next" 475 euid="next"
655 fi 476 fi
656 else 477 else
657 eerror "Userid given but is not greater than 0 !" 478 eerror "Userid given but is not greater than 0 !"
658 die "${euid} is not a valid UID" 479 die "${euid} is not a valid UID"
659 fi 480 fi
660 else 481 else
661 euid="next" 482 euid="next"
662 fi 483 fi
663 if [ "${euid}" == "next" ] 484 if [[ ${euid} == "next" ]] ; then
664 then 485 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 486 [[ -z $(egetent passwd ${euid}) ]] && break
673 done 487 done
674 fi 488 fi
675 opts="${opts} -u ${euid}" 489 opts="${opts} -u ${euid}"
676 einfo " - Userid: ${euid}" 490 einfo " - Userid: ${euid}"
677 491
678 # handle shell 492 # handle shell
679 local eshell="$1"; shift 493 local eshell=$1; shift
680 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 494 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
681 then 495 if [[ ! -e ${ROOT}${eshell} ]] ; then
682 if [ ! -e "${eshell}" ]
683 then
684 eerror "A shell was specified but it does not exist !" 496 eerror "A shell was specified but it does not exist !"
685 die "${eshell} does not exist" 497 die "${eshell} does not exist in ${ROOT}"
686 fi 498 fi
687 else 499 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
688 if [ "${USERLAND}" == "BSD" ] 500 eerror "Do not specify ${eshell} yourself, use -1"
689 then 501 die "Pass '-1' as the shell parameter"
690 eshell="/usr/bin/false" 502 fi
691 else 503 else
692 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"
693 fi 511 fi
512
513 eshell=${shell}
694 fi 514 fi
695 einfo " - Shell: ${eshell}" 515 einfo " - Shell: ${eshell}"
696 opts="${opts} -s ${eshell}" 516 opts="${opts} -s ${eshell}"
697 517
698 # handle homedir 518 # handle homedir
699 local ehome="$1"; shift 519 local ehome=$1; shift
700 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 520 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
701 then
702 ehome="/dev/null" 521 ehome="/dev/null"
703 fi 522 fi
704 einfo " - Home: ${ehome}" 523 einfo " - Home: ${ehome}"
705 opts="${opts} -d ${ehome}" 524 opts="${opts} -d ${ehome}"
706 525
707 # handle groups 526 # handle groups
708 local egroups="$1"; shift 527 local egroups=$1; shift
709 if [ ! -z "${egroups}" ] 528 if [[ ! -z ${egroups} ]] ; then
710 then
711 local oldifs="${IFS}" 529 local oldifs=${IFS}
712 local defgroup="" exgroups="" 530 local defgroup="" exgroups=""
713 531
714 export IFS="," 532 export IFS=","
715 for g in ${egroups} 533 for g in ${egroups} ; do
716 do
717 export IFS="${oldifs}" 534 export IFS=${oldifs}
718 if [ -z "`egetent group \"${g}\"`" ] 535 if [[ -z $(egetent group "${g}") ]] ; then
719 then
720 eerror "You must add group ${g} to the system first" 536 eerror "You must add group ${g} to the system first"
721 die "${g} is not a valid GID" 537 die "${g} is not a valid GID"
722 fi 538 fi
723 if [ -z "${defgroup}" ] 539 if [[ -z ${defgroup} ]] ; then
724 then
725 defgroup="${g}" 540 defgroup=${g}
726 else 541 else
727 exgroups="${exgroups},${g}" 542 exgroups="${exgroups},${g}"
728 fi 543 fi
729 export IFS="," 544 export IFS=","
730 done 545 done
731 export IFS="${oldifs}" 546 export IFS=${oldifs}
732 547
733 opts="${opts} -g ${defgroup}" 548 opts="${opts} -g ${defgroup}"
734 if [ ! -z "${exgroups}" ] 549 if [[ ! -z ${exgroups} ]] ; then
735 then
736 opts="${opts} -G ${exgroups:1}" 550 opts="${opts} -G ${exgroups:1}"
737 fi 551 fi
738 else 552 else
739 egroups="(none)" 553 egroups="(none)"
740 fi 554 fi
741 einfo " - Groups: ${egroups}" 555 einfo " - Groups: ${egroups}"
742 556
743 # handle extra and add the user 557 # handle extra and add the user
744 local eextra="$@"
745 local oldsandbox="${SANDBOX_ON}" 558 local oldsandbox=${SANDBOX_ON}
746 export SANDBOX_ON="0" 559 export SANDBOX_ON="0"
747 if useq ppc-macos 560 case ${CHOST} in
748 then 561 *-darwin*)
749 ### Make the user 562 ### Make the user
750 if [ -z "${eextra}" ] 563 if [[ -z $@ ]] ; then
751 then
752 dscl . create /users/${euser} uid ${euid} 564 dscl . create /users/${euser} uid ${euid}
753 dscl . create /users/${euser} shell ${eshell} 565 dscl . create /users/${euser} shell ${eshell}
754 dscl . create /users/${euser} home ${ehome} 566 dscl . create /users/${euser} home ${ehome}
755 dscl . create /users/${euser} realname "added by portage for ${PN}" 567 dscl . create /users/${euser} realname "added by portage for ${PN}"
756 ### Add the user to the groups specified 568 ### Add the user to the groups specified
757 local oldifs="${IFS}" 569 local oldifs=${IFS}
758 export IFS="," 570 export IFS=","
759 for g in ${egroups} 571 for g in ${egroups} ; do
760 do
761 dscl . merge /groups/${g} users ${euser} 572 dscl . merge /groups/${g} users ${euser}
762 done 573 done
763 export IFS="${oldifs}" 574 export IFS=${oldifs}
764 else 575 else
765 einfo "Extra options are not supported on macos yet" 576 einfo "Extra options are not supported on Darwin yet"
766 einfo "Please report the ebuild along with the info below" 577 einfo "Please report the ebuild along with the info below"
767 einfo "eextra: ${eextra}" 578 einfo "eextra: $@"
768 die "Required function missing" 579 die "Required function missing"
769 fi 580 fi
770 elif use x86-fbsd ; then 581 ;;
771 if [ -z "${eextra}" ] 582 *-freebsd*|*-dragonfly*)
772 then 583 if [[ -z $@ ]] ; then
773 pw useradd ${euser} ${opts} \ 584 pw useradd ${euser} ${opts} \
774 -c "added by portage for ${PN}" \ 585 -c "added by portage for ${PN}" \
775 die "enewuser failed" 586 die "enewuser failed"
776 else 587 else
777 einfo " - Extra: ${eextra}" 588 einfo " - Extra: $@"
778 pw useradd ${euser} ${opts} \ 589 pw useradd ${euser} ${opts} \
779 -c ${eextra} || die "enewuser failed" 590 "$@" || die "enewuser failed"
780 fi 591 fi
592 ;;
593
594 *-netbsd*)
595 if [[ -z $@ ]] ; then
596 useradd ${opts} ${euser} || die "enewuser failed"
781 else 597 else
782 if [ -z "${eextra}" ] 598 einfo " - Extra: $@"
783 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
784 useradd ${opts} ${euser} \ 618 useradd ${opts} ${euser} \
785 -c "added by portage for ${PN}" \ 619 -c "added by portage for ${PN}" \
786 || die "enewuser failed" 620 || die "enewuser failed"
787 else 621 else
788 einfo " - Extra: ${eextra}" 622 einfo " - Extra: $@"
789 useradd ${opts} ${euser} ${eextra} \ 623 useradd ${opts} ${euser} "$@" \
790 || die "enewuser failed" 624 || die "enewuser failed"
791 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}"
792 fi 634 fi
635
793 export SANDBOX_ON="${oldsandbox}" 636 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} 637}
803 638
804# Simplify/standardize adding groups to the system 639# Simplify/standardize adding groups to the system
805# vapier@gentoo.org 640# vapier@gentoo.org
806# 641#
835 then 670 then
836 if [ "${egid}" -gt 0 ] 671 if [ "${egid}" -gt 0 ]
837 then 672 then
838 if [ -z "`egetent group ${egid}`" ] 673 if [ -z "`egetent group ${egid}`" ]
839 then 674 then
840 if useq ppc-macos ; then 675 if [[ "${CHOST}" == *-darwin* ]]; then
841 opts="${opts} ${egid}" 676 opts="${opts} ${egid}"
842 else 677 else
843 opts="${opts} -g ${egid}" 678 opts="${opts} -g ${egid}"
844 fi 679 fi
845 else 680 else
859 opts="${opts} ${eextra}" 694 opts="${opts} ${eextra}"
860 695
861 # add the group 696 # add the group
862 local oldsandbox="${SANDBOX_ON}" 697 local oldsandbox="${SANDBOX_ON}"
863 export SANDBOX_ON="0" 698 export SANDBOX_ON="0"
864 if useq ppc-macos ; then 699 case ${CHOST} in
700 *-darwin*)
865 if [ ! -z "${eextra}" ]; 701 if [ ! -z "${eextra}" ];
866 then 702 then
867 einfo "Extra options are not supported on macos yet" 703 einfo "Extra options are not supported on Darwin/OS X yet"
868 einfo "Please report the ebuild along with the info below" 704 einfo "Please report the ebuild along with the info below"
869 einfo "eextra: ${eextra}" 705 einfo "eextra: ${eextra}"
870 die "Required function missing" 706 die "Required function missing"
871 fi 707 fi
872 708
873 # If we need the next available 709 # If we need the next available
874 case ${egid} in 710 case ${egid} in
875 *[!0-9]*) # Non numeric 711 *[!0-9]*) # Non numeric
876 for egid in `jot 898 101`; do 712 for egid in $(seq 101 999); do
877 [ -z "`egetent group ${egid}`" ] && break 713 [ -z "`egetent group ${egid}`" ] && break
878 done 714 done
879 esac 715 esac
880 dscl . create /groups/${egroup} gid ${egid} 716 dscl . create /groups/${egroup} gid ${egid}
881 dscl . create /groups/${egroup} passwd '*' 717 dscl . create /groups/${egroup} passwd '*'
882 elif use x86-fbsd ; then 718 ;;
719
720 *-freebsd*|*-dragonfly*)
883 case ${egid} in 721 case ${egid} in
884 *[!0-9]*) # Non numeric 722 *[!0-9]*) # Non numeric
885 for egid in `jot 898 101`; do 723 for egid in $(seq 101 999); do
886 [ -z "`egetent group ${egid}`" ] && break 724 [ -z "`egetent group ${egid}`" ] && break
887 done 725 done
888 esac 726 esac
889 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 727 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
890 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 *)
891 groupadd ${opts} ${egroup} || die "enewgroup failed" 741 groupadd ${opts} ${egroup} || die "enewgroup failed"
892 fi 742 ;;
743 esac
893 export SANDBOX_ON="${oldsandbox}" 744 export SANDBOX_ON="${oldsandbox}"
894} 745}
895 746
896# Simple script to replace 'dos2unix' binaries 747# Simple script to replace 'dos2unix' binaries
897# vapier@gentoo.org 748# vapier@gentoo.org
922# name: the name that will show up in the menu 773# name: the name that will show up in the menu
923# icon: give your little like a pretty little icon ... 774# icon: give your little like a pretty little icon ...
924# this can be relative (to /usr/share/pixmaps) or 775# this can be relative (to /usr/share/pixmaps) or
925# a full path to an icon 776# a full path to an icon
926# type: what kind of application is this ? for categories: 777# type: what kind of application is this ? for categories:
927# http://www.freedesktop.org/standards/menu-spec/ 778# http://www.freedesktop.org/Standards/desktop-entry-spec
928# path: if your app needs to startup in a specific dir 779# path: if your app needs to startup in a specific dir
929make_desktop_entry() { 780make_desktop_entry() {
930 [ -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
931 782
932 local exec="${1}" 783 local exec=${1}
933 local name="${2:-${PN}}" 784 local name=${2:-${PN}}
934 local icon="${3:-${PN}.png}" 785 local icon=${3:-${PN}.png}
935 local type="${4}" 786 local type=${4}
936 local subdir="${6}" 787 local path=${5}
937 local path="${5:-${GAMES_BINDIR}}" 788
938 if [ -z "${type}" ] 789 if [[ -z ${type} ]] ; then
939 then 790 local catmaj=${CATEGORY%%-*}
940 case ${CATEGORY} in 791 local catmin=${CATEGORY##*-}
941 "app-emulation") 792 case ${catmaj} in
942 type=Emulator 793 app)
943 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
944 ;; 807 ;;
945 "games-"*) 808
946 type=Game 809 dev)
947 subdir="Games" 810 type="Development"
948 ;; 811 ;;
949 "net-"*) 812
950 type=Network 813 games)
951 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}"
952 ;; 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
953 *) 883 *)
954 type= 884 type=
955 subdir=
956 ;; 885 ;;
957 esac 886 esac
958 fi 887 fi
888 if [ "${SLOT}" == "0" ] ; then
889 local desktop_name="${PN}"
890 else
891 local desktop_name="${PN}-${SLOT}"
892 fi
959 local desktop="${T}/${exec}.desktop" 893 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
960 894
961echo "[Desktop Entry] 895echo "[Desktop Entry]
962Encoding=UTF-8 896Encoding=UTF-8
963Version=0.9.2 897Version=0.9.2
964Name=${name} 898Name=${name}
967Exec=${exec} 901Exec=${exec}
968Path=${path} 902Path=${path}
969Icon=${icon} 903Icon=${icon}
970Categories=Application;${type};" > "${desktop}" 904Categories=Application;${type};" > "${desktop}"
971 905
906 (
907 # wrap the env here so that the 'insinto' call
908 # doesn't corrupt the env of the caller
972 insinto /usr/share/applications 909 insinto /usr/share/applications
973 doins "${desktop}" 910 doins "${desktop}"
974 911 )
975 return 0
976} 912}
977 913
978# Make a GDM/KDM Session file 914# Make a GDM/KDM Session file
979# 915#
980# make_desktop_entry(<title>, <command>) 916# make_desktop_entry(<title>, <command>)
981# title: File to execute to start the Window Manager 917# title: File to execute to start the Window Manager
982# command: Name of the Window Manager 918# command: Name of the Window Manager
983 919
984make_session_desktop() { 920make_session_desktop() {
985
986 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 921 [[ -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 922 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
988 923
989 local title="${1}" 924 local title=$1
990 local command="${2}" 925 local command=$2
991 local desktop="${T}/${wm}.desktop" 926 local desktop=${T}/${wm}.desktop
992 927
993echo "[Desktop Entry] 928echo "[Desktop Entry]
994Encoding=UTF-8 929Encoding=UTF-8
995Name=${title} 930Name=${title}
996Comment=This session logs you into ${title} 931Comment=This session logs you into ${title}
998TryExec=${command} 933TryExec=${command}
999Type=Application" > "${desktop}" 934Type=Application" > "${desktop}"
1000 935
1001 insinto /usr/share/xsessions 936 insinto /usr/share/xsessions
1002 doins "${desktop}" 937 doins "${desktop}"
1003
1004 return 0
1005} 938}
1006 939
1007domenu() { 940domenu() {
1008 local i 941 local i j
1009 local j
1010 insinto /usr/share/applications 942 insinto /usr/share/applications
1011 for i in ${@} 943 for i in "$@" ; do
1012 do
1013 if [ -f "${i}" ]; 944 if [[ -f ${i} ]] ; then
1014 then
1015 doins ${i} 945 doins "${i}"
1016 elif [ -d "${i}" ]; 946 elif [[ -d ${i} ]] ; then
1017 then
1018 for j in ${i}/*.desktop 947 for j in "${i}"/*.desktop ; do
1019 do
1020 doins ${j} 948 doins "${j}"
1021 done 949 done
1022 fi 950 fi
1023 done 951 done
1024} 952}
953newmenu() {
954 insinto /usr/share/applications
955 newins "$1" "$2"
956}
1025 957
1026doicon() { 958doicon() {
1027 local i 959 local i j
1028 local j
1029 insinto /usr/share/pixmaps 960 insinto /usr/share/pixmaps
1030 for i in ${@} 961 for i in "$@" ; do
1031 do
1032 if [ -f "${i}" ]; 962 if [[ -f ${i} ]] ; then
1033 then
1034 doins ${i} 963 doins "${i}"
1035 elif [ -d "${i}" ]; 964 elif [[ -d ${i} ]] ; then
1036 then
1037 for j in ${i}/*.png 965 for j in "${i}"/*.png ; do
1038 do
1039 doins ${j} 966 doins "${j}"
1040 done 967 done
1041 fi 968 fi
1042 done 969 done
970}
971newicon() {
972 insinto /usr/share/pixmaps
973 newins "$1" "$2"
1043} 974}
1044 975
1045############################################################## 976##############################################################
1046# END: Handle .desktop files and menu entries # 977# END: Handle .desktop files and menu entries #
1047############################################################## 978##############################################################
1048 979
1049 980
1050# for internal use only (unpack_pdv and unpack_makeself) 981# for internal use only (unpack_pdv and unpack_makeself)
1051find_unpackable_file() { 982find_unpackable_file() {
1052 local src="$1" 983 local src=$1
1053 if [ -z "${src}" ] 984 if [[ -z ${src} ]] ; then
1054 then
1055 src="${DISTDIR}/${A}" 985 src=${DISTDIR}/${A}
1056 else 986 else
1057 if [ -e "${DISTDIR}/${src}" ] 987 if [[ -e ${DISTDIR}/${src} ]] ; then
1058 then
1059 src="${DISTDIR}/${src}" 988 src=${DISTDIR}/${src}
1060 elif [ -e "${PWD}/${src}" ] 989 elif [[ -e ${PWD}/${src} ]] ; then
1061 then
1062 src="${PWD}/${src}" 990 src=${PWD}/${src}
1063 elif [ -e "${src}" ] 991 elif [[ -e ${src} ]] ; then
1064 then
1065 src="${src}" 992 src=${src}
1066 fi
1067 fi 993 fi
1068 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 994 fi
995 [[ ! -e ${src} ]] && return 1
1069 echo "${src}" 996 echo "${src}"
1070} 997}
1071 998
1072# Unpack those pesky pdv generated files ... 999# Unpack those pesky pdv generated files ...
1073# They're self-unpacking programs with the binary package stuffed in 1000# They're self-unpacking programs with the binary package stuffed in
1088# lseek 1015# lseek
1089# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1016# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1090# lseek(3, -4, SEEK_END) = 2981250 1017# lseek(3, -4, SEEK_END) = 2981250
1091# 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.
1092unpack_pdv() { 1019unpack_pdv() {
1093 local src="`find_unpackable_file $1`" 1020 local src=$(find_unpackable_file $1)
1094 local sizeoff_t="$2" 1021 local sizeoff_t=$2
1095 1022
1023 [[ -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 :(" 1024 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1097 1025
1098 local shrtsrc="`basename ${src}`" 1026 local shrtsrc=$(basename "${src}")
1099 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1027 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1100 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1028 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\"` 1029 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1102 1030
1103 # grab metadata for debug reasons 1031 # grab metadata for debug reasons
1167# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1095# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1168# - If the file is not specified then unpack will utilize ${A}. 1096# - If the file is not specified then unpack will utilize ${A}.
1169# - 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
1170# the proper offset from the script itself. 1098# the proper offset from the script itself.
1171unpack_makeself() { 1099unpack_makeself() {
1100 local src_input=${1:-${A}}
1172 local src="$(find_unpackable_file "$1")" 1101 local src=$(find_unpackable_file "${src_input}")
1173 local skip="$2" 1102 local skip=$2
1174 local exe="$3" 1103 local exe=$3
1175 1104
1105 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1106
1176 local shrtsrc="$(basename "${src}")" 1107 local shrtsrc=$(basename "${src}")
1177 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1108 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1178 if [ -z "${skip}" ] 1109 if [[ -z ${skip} ]] ; then
1179 then
1180 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1110 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1181 local skip=0 1111 local skip=0
1182 exe=tail 1112 exe=tail
1183 case ${ver} in 1113 case ${ver} in
1184 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
1185 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1115 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1197 ;; 1127 ;;
1198 2.1.3) 1128 2.1.3)
1199 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1129 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1200 let skip="skip + 1" 1130 let skip="skip + 1"
1201 ;; 1131 ;;
1202 2.1.4) 1132 2.1.4|2.1.5)
1203 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)
1204 skip=$(head -n ${skip} "${src}" | wc -c) 1134 skip=$(head -n ${skip} "${src}" | wc -c)
1205 exe="dd" 1135 exe="dd"
1206 ;; 1136 ;;
1207 *) 1137 *)
1252check_license() { 1182check_license() {
1253 local lic=$1 1183 local lic=$1
1254 if [ -z "${lic}" ] ; then 1184 if [ -z "${lic}" ] ; then
1255 lic="${PORTDIR}/licenses/${LICENSE}" 1185 lic="${PORTDIR}/licenses/${LICENSE}"
1256 else 1186 else
1257 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1187 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1258 lic="${PORTDIR}/licenses/${src}" 1188 lic="${PORTDIR}/licenses/${lic}"
1259 elif [ -e "${PWD}/${src}" ] ; then 1189 elif [ -e "${PWD}/${lic}" ] ; then
1260 lic="${PWD}/${src}" 1190 lic="${PWD}/${lic}"
1261 elif [ -e "${src}" ] ; then 1191 elif [ -e "${lic}" ] ; then
1262 lic="${src}" 1192 lic="${lic}"
1263 fi
1264 fi 1193 fi
1194 fi
1265 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1195 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1266 local l="`basename ${lic}`" 1196 local l="`basename ${lic}`"
1267 1197
1268 # here is where we check for the licenses the user already 1198 # 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 1199 # accepted ... if we don't find a match, we make the user accept
1270 local shopts=$- 1200 local shopts=$-
1326 # 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
1327 # the # of files they gave us 1257 # the # of files they gave us
1328 local cdcnt=0 1258 local cdcnt=0
1329 local f= 1259 local f=
1330 for f in "$@" ; do 1260 for f in "$@" ; do
1331 cdcnt=$((cdcnt + 1)) 1261 ((++cdcnt))
1332 export CDROM_CHECK_${cdcnt}="$f" 1262 export CDROM_CHECK_${cdcnt}="$f"
1333 done 1263 done
1334 export CDROM_TOTAL_CDS=${cdcnt} 1264 export CDROM_TOTAL_CDS=${cdcnt}
1335 export CDROM_CURRENT_CD=1 1265 export CDROM_CURRENT_CD=1
1336 1266
1337 # now we see if the user gave use CD_ROOT ... 1267 # now we see if the user gave use CD_ROOT ...
1338 # 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
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 1269 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1346 local var= 1270 local var=
1347 cdcnt=0 1271 cdcnt=0
1348 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1272 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1349 cdcnt=$((cdcnt + 1)) 1273 ((++cdcnt))
1350 var="CD_ROOT_${cdcnt}" 1274 var="CD_ROOT_${cdcnt}"
1275 [[ -z ${!var} ]] && var="CD_ROOT"
1351 if [[ -z ${!var} ]] ; then 1276 if [[ -z ${!var} ]] ; then
1352 eerror "You must either use just the CD_ROOT" 1277 eerror "You must either use just the CD_ROOT"
1353 eerror "or specify ALL the CD_ROOT_X variables." 1278 eerror "or specify ALL the CD_ROOT_X variables."
1354 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."
1355 die "could not locate CD_ROOT_${cdcnt}" 1280 die "could not locate CD_ROOT_${cdcnt}"
1356 fi 1281 fi
1357 export CDROM_ROOTS_${cdcnt}="${!var}"
1358 done 1282 done
1359 export CDROM_ROOT=${CDROM_ROOTS_1} 1283 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1360 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}
1361 return 1291 return
1362 fi 1292 fi
1363 1293
1294 # User didn't help us out so lets make sure they know they can
1295 # simplify the whole process ...
1364 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1296 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1365 einfon "This ebuild will need the " 1297 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 1298 echo
1372 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"
1373 einfo "mounted somewhere on your filesystem, just export" 1300 einfo "mounted somewhere on your filesystem, just export"
1374 einfo "the variable CD_ROOT so that it points to the" 1301 einfo "the variable CD_ROOT so that it points to the"
1375 einfo "directory containing the files." 1302 einfo "directory containing the files."
1379 echo 1306 echo
1380 else 1307 else
1381 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1308 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1382 cdcnt=0 1309 cdcnt=0
1383 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1310 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1384 cdcnt=$((cdcnt + 1)) 1311 ((++cdcnt))
1385 var="CDROM_NAME_${cdcnt}" 1312 var="CDROM_NAME_${cdcnt}"
1386 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1313 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1387 done 1314 done
1388 echo 1315 echo
1389 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"
1390 einfo "mounted somewhere on your filesystem, just export" 1317 einfo "mounted somewhere on your filesystem, just export"
1391 einfo "the following variables so they point to the right place:" 1318 einfo "the following variables so they point to the right place:"
1392 einfon "" 1319 einfon ""
1393 cdcnt=0 1320 cdcnt=0
1394 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1395 cdcnt=$((cdcnt + 1)) 1322 ((++cdcnt))
1396 echo -n " CD_ROOT_${cdcnt}" 1323 echo -n " CD_ROOT_${cdcnt}"
1397 done 1324 done
1398 echo 1325 echo
1399 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"
1400 einfo "you only have one cdrom, you can export CD_ROOT" 1327 einfo "you only have one cdrom, you can export CD_ROOT"
1403 echo 1330 echo
1404 einfo "For example:" 1331 einfo "For example:"
1405 einfo "export CD_ROOT_1=/mnt/cdrom" 1332 einfo "export CD_ROOT_1=/mnt/cdrom"
1406 echo 1333 echo
1407 fi 1334 fi
1335
1336 export CDROM_SET=""
1408 export CDROM_CURRENT_CD=0 1337 export CDROM_CURRENT_CD=0
1409 cdrom_load_next_cd 1338 cdrom_load_next_cd
1410} 1339}
1411 1340
1412# 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.
1413# 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.
1414# 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.
1415# 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.
1416cdrom_load_next_cd() { 1345cdrom_load_next_cd() {
1417 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1418 local var= 1346 local var
1419 1347 ((++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 1348
1425 unset CDROM_ROOT 1349 unset CDROM_ROOT
1426 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1350 var=CD_ROOT_${CDROM_CURRENT_CD}
1351 [[ -z ${!var} ]] && var="CD_ROOT"
1427 if [[ -z ${!var} ]] ; then 1352 if [[ -z ${!var} ]] ; then
1428 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1353 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1429 cdrom_locate_file_on_cd ${!var} 1354 _cdrom_locate_file_on_cd ${!var}
1430 else 1355 else
1431 export CDROM_ROOT=${!var} 1356 export CDROM_ROOT=${!var}
1432 fi 1357 fi
1433 1358
1434 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1359 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 1364# 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 1365# found, then a message asking for the user to insert the cdrom will be
1441# displayed and we'll hang out here until: 1366# displayed and we'll hang out here until:
1442# (1) the file is found on a mounted cdrom 1367# (1) the file is found on a mounted cdrom
1443# (2) the user hits CTRL+C 1368# (2) the user hits CTRL+C
1444cdrom_locate_file_on_cd() { 1369_cdrom_locate_file_on_cd() {
1370 local mline=""
1371 local showedmsg=0
1372
1445 while [[ -z ${CDROM_ROOT} ]] ; 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
1446 local dir="$(dirname ${@})" 1381 local dir=$(dirname ${cdset[${i}]})
1447 local file="$(basename ${@})" 1382 local file=$(basename ${cdset[${i}]})
1448 local mline=""
1449 local showedmsg=0
1450 1383
1451 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1384 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1452 [[ -d ${mline}/${dir} ]] || continue 1385 [[ -d ${mline}/${dir} ]] || continue
1453 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1386 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1454 && 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))
1455 done 1395 done
1456 1396
1457 if [[ -z ${CDROM_ROOT} ]] ; then
1458 echo 1397 echo
1459 if [[ ${showedmsg} -eq 0 ]] ; then 1398 if [[ ${showedmsg} -eq 0 ]] ; then
1460 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1399 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1461 if [[ -z ${CDROM_NAME} ]] ; then 1400 if [[ -z ${CDROM_NAME} ]] ; then
1462 einfo "Please insert the cdrom for ${PN} now !" 1401 einfo "Please insert+mount the cdrom for ${PN} now !"
1463 else
1464 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1465 fi
1466 else 1402 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 !" 1403 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1472 fi
1473 fi 1404 fi
1474 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
1475 fi 1412 fi
1413 showedmsg=1
1414 fi
1476 einfo "Press return to scan for the cd again" 1415 einfo "Press return to scan for the cd again"
1477 einfo "or hit CTRL+C to abort the emerge." 1416 einfo "or hit CTRL+C to abort the emerge."
1478 read 1417 echo
1479 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"
1480 done 1423 done
1481} 1424}
1482 1425
1483# Make sure that LINGUAS only contains languages that 1426# Make sure that LINGUAS only contains languages that
1484# a package can support 1427# a package can support
1492# directories and uses the intersection of the lists. 1435# directories and uses the intersection of the lists.
1493# 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
1494# directories and uses the union of the lists. 1437# directories and uses the union of the lists.
1495strip-linguas() { 1438strip-linguas() {
1496 local ls newls 1439 local ls newls
1497 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1440 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1498 local op="$1"; shift 1441 local op=$1; shift
1499 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1442 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1500 local d f 1443 local d f
1501 for d in "$@" ; do 1444 for d in "$@" ; do
1502 if [ "${op}" == "-u" ] ; then 1445 if [[ ${op} == "-u" ]] ; then
1503 newls="${ls}" 1446 newls=${ls}
1504 else 1447 else
1505 newls="" 1448 newls=""
1506 fi 1449 fi
1507 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1450 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1508 if [ "${op}" == "-i" ] ; then 1451 if [[ ${op} == "-i" ]] ; then
1509 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1452 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1510 else 1453 else
1511 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1454 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1512 fi 1455 fi
1513 done 1456 done
1514 ls="${newls}" 1457 ls=${newls}
1515 done 1458 done
1516 ls="${ls//.po}" 1459 ls=${ls//.po}
1517 else 1460 else
1518 ls="$@" 1461 ls=$@
1519 fi 1462 fi
1520 1463
1521 ls=" ${ls} " 1464 ls=" ${ls} "
1522 newls="" 1465 newls=""
1523 for f in ${LINGUAS} ; do 1466 for f in ${LINGUAS} ; do
1524 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1467 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1525 newls="${newls} ${f}" 1468 newls="${newls} ${f}"
1526 else 1469 else
1527 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1470 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1528 fi 1471 fi
1529 done 1472 done
1530 if [ -z "${newls}" ] ; then 1473 if [[ -z ${newls} ]] ; then
1531 unset LINGUAS 1474 export LINGUAS=""
1532 else 1475 else
1533 export LINGUAS="${newls}" 1476 export LINGUAS=${newls:1}
1534 fi 1477 fi
1535} 1478}
1536 1479
1537# moved from kernel.eclass since they are generally useful outside of 1480# moved from kernel.eclass since they are generally useful outside of
1538# kernel.eclass -iggy (20041002) 1481# kernel.eclass -iggy (20041002)
1540# the following functions are useful in kernel module ebuilds, etc. 1483# the following functions are useful in kernel module ebuilds, etc.
1541# for an example see ivtv or drbd ebuilds 1484# for an example see ivtv or drbd ebuilds
1542 1485
1543# set's ARCH to match what the kernel expects 1486# set's ARCH to match what the kernel expects
1544set_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
1545 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1492 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1546 case ${ARCH} in 1493 case ${ARCH} in
1547 x86) export ARCH="i386";; 1494 x86) export ARCH="i386";;
1548 amd64) export ARCH="x86_64";; 1495 amd64) export ARCH="x86_64";;
1549 hppa) export ARCH="parisc";; 1496 hppa) export ARCH="parisc";;
1550 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!
1551 *) export ARCH="${ARCH}";; 1499 *) export ARCH="${ARCH}";;
1552 esac 1500 esac
1553} 1501}
1554 1502
1555# set's ARCH back to what portage expects 1503# set's ARCH back to what portage expects
1556set_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
1557 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1509 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1558} 1510}
1559 1511
1560# Jeremy Huddleston <eradicator@gentoo.org>: 1512# Jeremy Huddleston <eradicator@gentoo.org>:
1561# preserve_old_lib /path/to/libblah.so.0 1513# preserve_old_lib /path/to/libblah.so.0
1596 LIB=$1 1548 LIB=$1
1597 1549
1598 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1550 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1599 SONAME=`basename ${LIB}` 1551 SONAME=`basename ${LIB}`
1600 1552
1601 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."
1602 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"
1603 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,"
1604 einfo "you will need to execute the following command:" 1556 ewarn "you will need to execute the following command:"
1605 einfo " revdep-rebuild --soname ${SONAME}" 1557 ewarn " revdep-rebuild --soname ${SONAME}"
1606 einfo 1558 ewarn
1607 einfo "After doing that, you can safely remove ${LIB}" 1559 ewarn "After doing that, you can safely remove ${LIB}"
1608 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1560 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1609 fi 1561 fi
1610} 1562}
1611 1563
1612# Hack for people to figure out if a package was built with 1564# Hack for people to figure out if a package was built with
1613# certain USE flags 1565# certain USE flags
1614# 1566#
1615# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1567# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1616# ex: built_with_use xchat gtk2 1568# ex: built_with_use xchat gtk2
1617# 1569#
1623 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1575 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1624 1576
1625 local PKG=$(best_version $1) 1577 local PKG=$(best_version $1)
1626 shift 1578 shift
1627 1579
1628 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 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
1629 [[ ! -e ${USEFILE} ]] && return 1 1584 [[ ! -e ${USEFILE} ]] && return 0
1630 1585
1631 local USE_BUILT=$(<${USEFILE}) 1586 local USE_BUILT=$(<${USEFILE})
1632 while [[ $# -gt 0 ]] ; do 1587 while [[ $# -gt 0 ]] ; do
1633 if [[ ${opt} = "-o" ]] ; then 1588 if [[ ${opt} = "-o" ]] ; then
1634 has $1 ${USE_BUILT} && return 0 1589 has $1 ${USE_BUILT} && return 0
1638 shift 1593 shift
1639 done 1594 done
1640 [[ ${opt} = "-a" ]] 1595 [[ ${opt} = "-a" ]]
1641} 1596}
1642 1597
1643# Many configure scripts wrongly bail when a C++ compiler 1598# Many configure scripts wrongly bail when a C++ compiler
1644# could not be detected. #73450 1599# could not be detected. #73450
1645epunt_cxx() { 1600epunt_cxx() {
1646 local dir=$1 1601 local dir=$1
1647 [[ -z ${dir} ]] && dir=${S} 1602 [[ -z ${dir} ]] && dir=${S}
1648 ebegin "Removing useless C++ checks" 1603 ebegin "Removing useless C++ checks"
1651 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1606 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1652 done 1607 done
1653 eend 0 1608 eend 0
1654} 1609}
1655 1610
1656# get_abi_var <VAR> [<ABI>] 1611# dopamd <file> [more files]
1657# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
1658# 1612#
1659# ex: 1613# Install pam auth config file in /etc/pam.d
1660# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32 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>
1661# 1623#
1662# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)" 1624# Install pam file <old name> as <new name> in /etc/pam.d
1663# This will hopefully be added to portage soon... 1625newpamd() {
1664# 1626 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1665# If <ABI> is not specified, ${ABI} is used. 1627
1666# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used. 1628 use pam || return 0
1667# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string. 1629
1668# 1630 INSDESTTREE=/etc/pam.d \
1669# Jeremy Huddleston <eradicator@gentoo.org> 1631 newins "$1" "$2" || die "failed to install $1 as $2"
1670get_abi_var() { 1632}
1671 local flag=${1} 1633
1672 local abi 1634# make a wrapper script ...
1673 if [ $# -gt 1 ]; then 1635# NOTE: this was originally games_make_wrapper, but I noticed other places where
1674 abi=${2} 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:-.}"
1675 elif [ -n "${ABI}" ]; then 1651if [ -n "${libdir}" ] ; then
1676 abi=${ABI} 1652 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1677 elif [ -n "${DEFAULT_ABI}" ]; then 1653 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1678 abi=${DEFAULT_ABI}
1679 else 1654 else
1680 return 1 1655 export LD_LIBRARY_PATH="${libdir}"
1656 fi
1681 fi 1657fi
1682 1658exec ${bin} "\$@"
1683 local var="${flag}_${abi}" 1659EOF
1684 echo ${!var} 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
1685} 1667}
1686
1687get_abi_CFLAGS() { get_abi_var CFLAGS ${@}; }
1688get_abi_CXXFLAGS() { get_abi_var CXXFLAGS ${@}; }
1689get_abi_ASFLAGS() { get_abi_var ASFLAGS ${@}; }
1690get_abi_LIBDIR() { get_abi_var LIBDIR ${@}; }

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

  ViewVC Help
Powered by ViewVC 1.1.20