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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.104  
changed lines
  Added in v.1.279

  ViewVC Help
Powered by ViewVC 1.1.20