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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20