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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.128  
changed lines
  Added in v.1.227

  ViewVC Help
Powered by ViewVC 1.1.20