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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20