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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20