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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20