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

Diff of /eclass/eutils.eclass

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

Revision 1.133 Revision 1.275
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2006 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.133 2004/12/29 18:19:04 lanius Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.275 2007/02/17 00:17:39 vapier Exp $
4#
5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 4#
7# This eclass is for general purpose functions that most ebuilds 5# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 6# have to implement themselves.
9# 7#
10# NB: If you add anything, please comment it! 8# NB: If you add anything, please comment it!
9#
10# Maintainer: see each individual function, base-system@gentoo.org as default
11 11
12ECLASS=eutils 12inherit multilib portability
13INHERITED="$INHERITED $ECLASS"
14
15DEPEND="!bootstrap? ( sys-devel/patch )"
16 13
17DESCRIPTION="Based on the ${ECLASS} eclass" 14DESCRIPTION="Based on the ${ECLASS} eclass"
18 15
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 16# Wait for the supplied number of seconds. If no argument is supplied, defaults
20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 17# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
21# outputting to a terminal, don't wait. For compatability purposes, the argument 18# outputting to a terminal, don't wait. For compatability purposes, the argument
22# must be an integer greater than zero. 19# must be an integer greater than zero.
23# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
24epause() { 21epause() {
25 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then 22 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
26 sleep ${1:-5}
27 fi
28} 23}
29 24
30# Beep the specified number of times (defaults to five). If our output 25# Beep the specified number of times (defaults to five). If our output
31# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set, 26# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set,
32# don't beep. 27# don't beep.
33# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 28# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
34ebeep() { 29ebeep() {
35 local n 30 local n
36 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then 31 if [[ -z ${EBEEP_IGNORE} ]] ; then
37 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 32 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
38 echo -ne "\a" 33 echo -ne "\a"
39 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null 34 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
40 echo -ne "\a" 35 echo -ne "\a"
41 sleep 1 36 sleep 1
42 done 37 done
43 fi 38 fi
44} 39}
45 40
46# This function simply returns the desired lib directory. With portage
47# 2.0.51, we now have support for installing libraries to lib32/lib64
48# to accomidate the needs of multilib systems. It's no longer a good idea
49# to assume all libraries will end up in lib. Replace any (sane) instances
50# where lib is named directly with $(get_libdir) if possible.
51#
52# Travis Tilley <lv@gentoo.org> (24 Aug 2004)
53#
54# Jeremy Huddleston <eradicator@gentoo.org> (23 Dec 2004):
55# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set,
56# fall back on old behavior. Any profile that has these set should also
57# depend on a newer version of portage (not yet released) which uses these
58# over CONF_LIBDIR in econf, dolib, etc...
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 [[ -z $(type -p mktemp) ]] ; then
571 then
572 local tmp=/ 372 local tmp=/
573 while [ -e "${tmp}" ] ; do 373 while [[ -e ${tmp} ]] ; do
574 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 374 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
575 done 375 done
576 ${exe} "${tmp}" 376 ${exe} "${tmp}" || ${exe} -p "${tmp}"
577 echo "${tmp}" 377 echo "${tmp}"
578 else 378 else
579 [ "${exe}" == "touch" ] \ 379 if [[ ${exe} == "touch" ]] ; then
580 && exe="-p" \ 380 [[ ${USERLAND} == "GNU" ]] \
581 || exe="-d" 381 && mktemp -p "${topdir}" \
582 mktemp ${exe} "${topdir}" 382 || TMPDIR="${topdir}" mktemp -t tmp
383 else
384 [[ ${USERLAND} == "GNU" ]] \
385 && mktemp -d "${topdir}" \
386 || TMPDIR="${topdir}" mktemp -dt tmp
387 fi
583 fi 388 fi
584} 389}
585 390
586# Small wrapper for getent (Linux), nidump (Mac OS X), 391# Small wrapper for getent (Linux), nidump (Mac OS X),
587# and pw (FreeBSD) used in enewuser()/enewgroup() 392# and pw (FreeBSD) used in enewuser()/enewgroup()
588# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 393# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
589# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 394# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
590# 395#
591# egetent(database, key) 396# egetent(database, key)
592egetent() { 397egetent() {
593 if useq ppc-macos ; then 398 case ${CHOST} in
399 *-darwin*)
594 case "$2" in 400 case "$2" in
595 *[!0-9]*) # Non numeric 401 *[!0-9]*) # Non numeric
596 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 402 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
597 ;; 403 ;;
598 *) # Numeric 404 *) # Numeric
599 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 405 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
600 ;; 406 ;;
601 esac 407 esac
602 elif useq x86-fbsd ; then 408 ;;
603 local action 409 *-freebsd*|*-dragonfly*)
604 if [ "$1" == "passwd" ] 410 local opts action="user"
605 then 411 [[ $1 == "passwd" ]] || action="group"
606 action="user" 412
607 else 413 # lookup by uid/gid
608 action="group" 414 if [[ $2 == [[:digit:]]* ]] ; then
415 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
609 fi 416 fi
417
610 pw show "${action}" "$2" -q 418 pw show ${action} ${opts} "$2" -q
611 else 419 ;;
420 *-netbsd*|*-openbsd*)
421 grep "$2:\*:" /etc/$1
422 ;;
423 *)
612 which nscd >& /dev/null && nscd -i "$1" 424 type -p nscd >& /dev/null && nscd -i "$1"
613 getent "$1" "$2" 425 getent "$1" "$2"
614 fi 426 ;;
427 esac
615} 428}
616 429
617# Simplify/standardize adding users to the system 430# Simplify/standardize adding users to the system
618# vapier@gentoo.org 431# vapier@gentoo.org
619# 432#
626# shell: /bin/false 439# shell: /bin/false
627# homedir: /dev/null 440# homedir: /dev/null
628# groups: none 441# groups: none
629# extra: comment of 'added by portage for ${PN}' 442# extra: comment of 'added by portage for ${PN}'
630enewuser() { 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
631 # get the username 451 # get the username
632 local euser="$1"; shift 452 local euser=$1; shift
633 if [ -z "${euser}" ] 453 if [[ -z ${euser} ]] ; then
634 then
635 eerror "No username specified !" 454 eerror "No username specified !"
636 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
637 fi 456 fi
638 457
639 # lets see if the username already exists 458 # lets see if the username already exists
640 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 459 if [[ -n $(egetent passwd "${euser}") ]] ; then
641 then
642 return 0 460 return 0
643 fi 461 fi
644 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
645 463
646 # options to pass to useradd 464 # options to pass to useradd
647 local opts= 465 local opts=
648 466
649 # handle uid 467 # handle uid
650 local euid="$1"; shift 468 local euid=$1; shift
651 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 469 if [[ -n ${euid} && ${euid} != -1 ]] ; then
652 then
653 if [ "${euid}" -gt 0 ] 470 if [[ ${euid} -gt 0 ]] ; then
654 then
655 if [ ! -z "`egetent passwd ${euid}`" ] 471 if [[ -n $(egetent passwd ${euid}) ]] ; then
656 then
657 euid="next" 472 euid="next"
658 fi 473 fi
659 else 474 else
660 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
661 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
662 fi 477 fi
663 else 478 else
664 euid="next" 479 euid="next"
665 fi 480 fi
666 if [ "${euid}" == "next" ] 481 if [[ ${euid} == "next" ]] ; then
667 then 482 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 483 [[ -z $(egetent passwd ${euid}) ]] && break
676 done 484 done
677 fi 485 fi
678 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
679 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
680 488
681 # handle shell 489 # handle shell
682 local eshell="$1"; shift 490 local eshell=$1; shift
683 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
684 then 492 if [[ ! -e ${ROOT}${eshell} ]] ; then
685 if [ ! -e "${eshell}" ]
686 then
687 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
688 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"
689 fi 499 fi
690 else 500 else
691 if [ "${USERLAND}" == "BSD" ] 501 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
692 then 502 [[ -x ${ROOT}${shell} ]] && break
693 eshell="/usr/bin/false" 503 done
694 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
695 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
696 fi 513 fi
514
515 eshell=${shell}
697 fi 516 fi
698 einfo " - Shell: ${eshell}" 517 einfo " - Shell: ${eshell}"
699 opts="${opts} -s ${eshell}" 518 opts="${opts} -s ${eshell}"
700 519
701 # handle homedir 520 # handle homedir
702 local ehome="$1"; shift 521 local ehome=$1; shift
703 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 522 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
704 then
705 ehome="/dev/null" 523 ehome="/dev/null"
706 fi 524 fi
707 einfo " - Home: ${ehome}" 525 einfo " - Home: ${ehome}"
708 opts="${opts} -d ${ehome}" 526 opts="${opts} -d ${ehome}"
709 527
710 # handle groups 528 # handle groups
711 local egroups="$1"; shift 529 local egroups=$1; shift
712 if [ ! -z "${egroups}" ] 530 if [[ ! -z ${egroups} ]] ; then
713 then
714 local oldifs="${IFS}" 531 local oldifs=${IFS}
715 local defgroup="" exgroups="" 532 local defgroup="" exgroups=""
716 533
717 export IFS="," 534 export IFS=","
718 for g in ${egroups} 535 for g in ${egroups} ; do
719 do
720 export IFS="${oldifs}" 536 export IFS=${oldifs}
721 if [ -z "`egetent group \"${g}\"`" ] 537 if [[ -z $(egetent group "${g}") ]] ; then
722 then
723 eerror "You must add group ${g} to the system first" 538 eerror "You must add group ${g} to the system first"
724 die "${g} is not a valid GID" 539 die "${g} is not a valid GID"
725 fi 540 fi
726 if [ -z "${defgroup}" ] 541 if [[ -z ${defgroup} ]] ; then
727 then
728 defgroup="${g}" 542 defgroup=${g}
729 else 543 else
730 exgroups="${exgroups},${g}" 544 exgroups="${exgroups},${g}"
731 fi 545 fi
732 export IFS="," 546 export IFS=","
733 done 547 done
734 export IFS="${oldifs}" 548 export IFS=${oldifs}
735 549
736 opts="${opts} -g ${defgroup}" 550 opts="${opts} -g ${defgroup}"
737 if [ ! -z "${exgroups}" ] 551 if [[ ! -z ${exgroups} ]] ; then
738 then
739 opts="${opts} -G ${exgroups:1}" 552 opts="${opts} -G ${exgroups:1}"
740 fi 553 fi
741 else 554 else
742 egroups="(none)" 555 egroups="(none)"
743 fi 556 fi
744 einfo " - Groups: ${egroups}" 557 einfo " - Groups: ${egroups}"
745 558
746 # handle extra and add the user 559 # handle extra and add the user
747 local eextra="$@"
748 local oldsandbox="${SANDBOX_ON}" 560 local oldsandbox=${SANDBOX_ON}
749 export SANDBOX_ON="0" 561 export SANDBOX_ON="0"
750 if useq ppc-macos 562 case ${CHOST} in
751 then 563 *-darwin*)
752 ### Make the user 564 ### Make the user
753 if [ -z "${eextra}" ] 565 if [[ -z $@ ]] ; then
754 then
755 dscl . create /users/${euser} uid ${euid} 566 dscl . create /users/${euser} uid ${euid}
756 dscl . create /users/${euser} shell ${eshell} 567 dscl . create /users/${euser} shell ${eshell}
757 dscl . create /users/${euser} home ${ehome} 568 dscl . create /users/${euser} home ${ehome}
758 dscl . create /users/${euser} realname "added by portage for ${PN}" 569 dscl . create /users/${euser} realname "added by portage for ${PN}"
759 ### Add the user to the groups specified 570 ### Add the user to the groups specified
760 local oldifs="${IFS}" 571 local oldifs=${IFS}
761 export IFS="," 572 export IFS=","
762 for g in ${egroups} 573 for g in ${egroups} ; do
763 do
764 dscl . merge /groups/${g} users ${euser} 574 dscl . merge /groups/${g} users ${euser}
765 done 575 done
766 export IFS="${oldifs}" 576 export IFS=${oldifs}
767 else 577 else
768 einfo "Extra options are not supported on macos yet" 578 einfo "Extra options are not supported on Darwin yet"
769 einfo "Please report the ebuild along with the info below" 579 einfo "Please report the ebuild along with the info below"
770 einfo "eextra: ${eextra}" 580 einfo "eextra: $@"
771 die "Required function missing" 581 die "Required function missing"
772 fi 582 fi
773 elif use x86-fbsd ; then 583 ;;
774 if [ -z "${eextra}" ] 584 *-freebsd*|*-dragonfly*)
775 then 585 if [[ -z $@ ]] ; then
776 pw useradd ${euser} ${opts} \ 586 pw useradd ${euser} ${opts} \
777 -c "added by portage for ${PN}" \ 587 -c "added by portage for ${PN}" \
778 die "enewuser failed" 588 die "enewuser failed"
779 else 589 else
780 einfo " - Extra: ${eextra}" 590 einfo " - Extra: $@"
781 pw useradd ${euser} ${opts} \ 591 pw useradd ${euser} ${opts} \
782 -c ${eextra} || die "enewuser failed" 592 "$@" || die "enewuser failed"
783 fi 593 fi
594 ;;
595
596 *-netbsd*)
597 if [[ -z $@ ]] ; then
598 useradd ${opts} ${euser} || die "enewuser failed"
784 else 599 else
785 if [ -z "${eextra}" ] 600 einfo " - Extra: $@"
786 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
787 useradd ${opts} ${euser} \ 620 useradd ${opts} ${euser} \
788 -c "added by portage for ${PN}" \ 621 -c "added by portage for ${PN}" \
789 || die "enewuser failed" 622 || die "enewuser failed"
790 else 623 else
791 einfo " - Extra: ${eextra}" 624 einfo " - Extra: $@"
792 useradd ${opts} ${euser} ${eextra} \ 625 useradd ${opts} ${euser} "$@" \
793 || die "enewuser failed" 626 || die "enewuser failed"
794 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}"
795 fi 636 fi
637
796 export SANDBOX_ON="${oldsandbox}" 638 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} 639}
806 640
807# Simplify/standardize adding groups to the system 641# Simplify/standardize adding groups to the system
808# vapier@gentoo.org 642# vapier@gentoo.org
809# 643#
812# Default values if you do not specify any: 646# Default values if you do not specify any:
813# groupname: REQUIRED ! 647# groupname: REQUIRED !
814# gid: next available (see groupadd(8)) 648# gid: next available (see groupadd(8))
815# extra: none 649# extra: none
816enewgroup() { 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
817 # get the group 658 # get the group
818 local egroup="$1"; shift 659 local egroup="$1"; shift
819 if [ -z "${egroup}" ] 660 if [ -z "${egroup}" ]
820 then 661 then
821 eerror "No group specified !" 662 eerror "No group specified !"
822 die "Cannot call enewgroup without a group" 663 die "Cannot call enewgroup without a group"
823 fi 664 fi
824 665
825 # see if group already exists 666 # see if group already exists
826 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 667 if [[ -n $(egetent group "${egroup}") ]]; then
827 then
828 return 0 668 return 0
829 fi 669 fi
830 einfo "Adding group '${egroup}' to your system ..." 670 einfo "Adding group '${egroup}' to your system ..."
831 671
832 # options to pass to useradd 672 # options to pass to useradd
838 then 678 then
839 if [ "${egid}" -gt 0 ] 679 if [ "${egid}" -gt 0 ]
840 then 680 then
841 if [ -z "`egetent group ${egid}`" ] 681 if [ -z "`egetent group ${egid}`" ]
842 then 682 then
843 if useq ppc-macos ; then 683 if [[ "${CHOST}" == *-darwin* ]]; then
844 opts="${opts} ${egid}" 684 opts="${opts} ${egid}"
845 else 685 else
846 opts="${opts} -g ${egid}" 686 opts="${opts} -g ${egid}"
847 fi 687 fi
848 else 688 else
862 opts="${opts} ${eextra}" 702 opts="${opts} ${eextra}"
863 703
864 # add the group 704 # add the group
865 local oldsandbox="${SANDBOX_ON}" 705 local oldsandbox="${SANDBOX_ON}"
866 export SANDBOX_ON="0" 706 export SANDBOX_ON="0"
867 if useq ppc-macos ; then 707 case ${CHOST} in
708 *-darwin*)
868 if [ ! -z "${eextra}" ]; 709 if [ ! -z "${eextra}" ];
869 then 710 then
870 einfo "Extra options are not supported on macos yet" 711 einfo "Extra options are not supported on Darwin/OS X yet"
871 einfo "Please report the ebuild along with the info below" 712 einfo "Please report the ebuild along with the info below"
872 einfo "eextra: ${eextra}" 713 einfo "eextra: ${eextra}"
873 die "Required function missing" 714 die "Required function missing"
874 fi 715 fi
875 716
876 # If we need the next available 717 # If we need the next available
877 case ${egid} in 718 case ${egid} in
878 *[!0-9]*) # Non numeric 719 *[!0-9]*) # Non numeric
879 for egid in `jot 898 101`; do 720 for ((egid = 101; egid <= 999; egid++)); do
880 [ -z "`egetent group ${egid}`" ] && break 721 [[ -z $(egetent group ${egid}) ]] && break
881 done 722 done
882 esac 723 esac
883 dscl . create /groups/${egroup} gid ${egid} 724 dscl . create /groups/${egroup} gid ${egid}
884 dscl . create /groups/${egroup} passwd '*' 725 dscl . create /groups/${egroup} passwd '*'
885 elif use x86-fbsd ; then 726 ;;
727
728 *-freebsd*|*-dragonfly*)
886 case ${egid} in 729 case ${egid} in
887 *[!0-9]*) # Non numeric 730 *[!0-9]*) # Non numeric
888 for egid in `jot 898 101`; do 731 for ((egid = 101; egid <= 999; egid++)); do
889 [ -z "`egetent group ${egid}`" ] && break 732 [[ -z $(egetent group ${egid}) ]] && break
890 done 733 done
891 esac 734 esac
892 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 735 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
893 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 *)
894 groupadd ${opts} ${egroup} || die "enewgroup failed" 749 groupadd ${opts} ${egroup} || die "enewgroup failed"
895 fi 750 ;;
751 esac
896 export SANDBOX_ON="${oldsandbox}" 752 export SANDBOX_ON="${oldsandbox}"
897} 753}
898 754
899# Simple script to replace 'dos2unix' binaries 755# Simple script to replace 'dos2unix' binaries
900# vapier@gentoo.org 756# vapier@gentoo.org
901# 757#
902# edos2unix(file, <more files> ...) 758# edos2unix(file, <more files> ...)
903edos2unix() { 759edos2unix() {
904 for f in "$@" 760 echo "$@" | xargs sed -i 's/\r$//'
905 do
906 cp "${f}" ${T}/edos2unix
907 sed 's/\r$//' ${T}/edos2unix > "${f}"
908 done
909} 761}
910 762
911 763
912############################################################## 764##############################################################
913# START: Handle .desktop files and menu entries # 765# START: Handle .desktop files and menu entries #
914# maybe this should be separated into a new eclass some time # 766# maybe this should be separated into a new eclass some time #
915# lanius@gentoo.org # 767# lanius@gentoo.org #
916############################################################## 768##############################################################
917 769
918# Make a desktop file ! 770# Make a desktop file !
919# Great for making those icons in kde/gnome startmenu ! 771# Great for making those icons in kde/gnome startmenu !
920# Amaze your friends ! Get the women ! Join today ! 772# Amaze your friends ! Get the women ! Join today !
921# 773#
922# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 774# make_desktop_entry(<command>, [name], [icon], [type], [path])
923# 775#
924# binary: what binary does the app run with ? 776# binary: what command does the app run with ?
925# name: the name that will show up in the menu 777# name: the name that will show up in the menu
926# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
927# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
928# a full path to an icon 780# a full path to an icon
929# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
930# http://www.freedesktop.org/standards/menu-spec/ 782# http://www.freedesktop.org/Standards/desktop-entry-spec
931# path: if your app needs to startup in a specific dir 783# path: if your app needs to startup in a specific dir
932make_desktop_entry() { 784make_desktop_entry() {
933 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 785 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
934 786
935 local exec="${1}" 787 local exec=${1}
936 local name="${2:-${PN}}" 788 local name=${2:-${PN}}
937 local icon="${3:-${PN}.png}" 789 local icon=${3:-${PN}.png}
938 local type="${4}" 790 local type=${4}
939 local subdir="${6}" 791 local path=${5}
940 local path="${5:-${GAMES_BINDIR}}" 792
941 if [ -z "${type}" ] 793 if [[ -z ${type} ]] ; then
942 then 794 local catmaj=${CATEGORY%%-*}
943 case ${CATEGORY} in 795 local catmin=${CATEGORY##*-}
944 "app-emulation") 796 case ${catmaj} in
945 type=Emulator 797 app)
946 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
947 ;; 811 ;;
948 "games-"*) 812
949 type=Game 813 dev)
950 subdir="Games" 814 type="Development"
951 ;; 815 ;;
952 "net-"*) 816
953 type=Network 817 games)
954 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}"
955 ;; 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
956 *) 887 *)
957 type= 888 type=
958 subdir=
959 ;; 889 ;;
960 esac 890 esac
961 fi 891 fi
962 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
963 899
900 cat <<-EOF > "${desktop}"
964echo "[Desktop Entry] 901 [Desktop Entry]
965Encoding=UTF-8 902 Encoding=UTF-8
966Version=0.9.2 903 Version=0.9.2
967Name=${name} 904 Name=${name}
968Type=Application 905 Type=Application
969Comment=${DESCRIPTION} 906 Comment=${DESCRIPTION}
970Exec=${exec} 907 Exec=${exec}
908 TryExec=${exec%% *}
971Path=${path} 909 Path=${path}
972Icon=${icon} 910 Icon=${icon}
973Categories=Application;${type};" > "${desktop}" 911 Categories=Application;${type};
912 EOF
974 913
914 (
915 # wrap the env here so that the 'insinto' call
916 # doesn't corrupt the env of the caller
975 insinto /usr/share/applications 917 insinto /usr/share/applications
976 doins "${desktop}" 918 doins "${desktop}"
977 919 )
978 return 0
979} 920}
980 921
981# Make a GDM/KDM Session file 922# Make a GDM/KDM Session file
982# 923#
983# make_desktop_entry(<title>, <command>) 924# make_session_desktop(<title>, <command>)
984# title: File to execute to start the Window Manager 925# title: File to execute to start the Window Manager
985# command: Name of the Window Manager 926# command: Name of the Window Manager
986 927
987make_session_desktop() { 928make_session_desktop() {
988
989 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 929 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
990 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1 930 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
991 931
992 local title="${1}" 932 local title=$1
993 local command="${2}" 933 local command=$2
994 local desktop="${T}/${wm}.desktop" 934 local desktop=${T}/${wm}.desktop
995 935
936 cat <<-EOF > "${desktop}"
996echo "[Desktop Entry] 937 [Desktop Entry]
997Encoding=UTF-8 938 Encoding=UTF-8
998Name=${title} 939 Name=${title}
999Comment=This session logs you into ${title} 940 Comment=This session logs you into ${title}
1000Exec=${command} 941 Exec=${command}
1001TryExec=${command} 942 TryExec=${command}
1002Type=Application" > "${desktop}" 943 Type=Application
944 EOF
1003 945
946 (
947 # wrap the env here so that the 'insinto' call
948 # doesn't corrupt the env of the caller
1004 insinto /usr/share/xsessions 949 insinto /usr/share/xsessions
1005 doins "${desktop}" 950 doins "${desktop}"
1006 951 )
1007 return 0
1008} 952}
1009 953
1010domenu() { 954domenu() {
1011 local i 955 (
1012 local j 956 # wrap the env here so that the 'insinto' call
957 # doesn't corrupt the env of the caller
958 local i j ret=0
1013 insinto /usr/share/applications 959 insinto /usr/share/applications
1014 for i in ${@} 960 for i in "$@" ; do
1015 do
1016 if [ -f "${i}" ]; 961 if [[ -f ${i} ]] ; then
1017 then
1018 doins ${i} 962 doins "${i}"
963 ((ret+=$?))
1019 elif [ -d "${i}" ]; 964 elif [[ -d ${i} ]] ; then
1020 then
1021 for j in ${i}/*.desktop 965 for j in "${i}"/*.desktop ; do
1022 do
1023 doins ${j} 966 doins "${j}"
967 ((ret+=$?))
1024 done 968 done
1025 fi 969 fi
1026 done 970 done
971 exit ${ret}
972 )
973}
974newmenu() {
975 (
976 # wrap the env here so that the 'insinto' call
977 # doesn't corrupt the env of the caller
978 insinto /usr/share/applications
979 newins "$@"
980 )
1027} 981}
1028 982
1029doicon() { 983doicon() {
1030 local i 984 (
1031 local j 985 # wrap the env here so that the 'insinto' call
986 # doesn't corrupt the env of the caller
987 local i j ret
1032 insinto /usr/share/pixmaps 988 insinto /usr/share/pixmaps
1033 for i in ${@} 989 for i in "$@" ; do
1034 do
1035 if [ -f "${i}" ]; 990 if [[ -f ${i} ]] ; then
1036 then
1037 doins ${i} 991 doins "${i}"
992 ((ret+=$?))
1038 elif [ -d "${i}" ]; 993 elif [[ -d ${i} ]] ; then
1039 then
1040 for j in ${i}/*.png 994 for j in "${i}"/*.png ; do
1041 do
1042 doins ${j} 995 doins "${j}"
996 ((ret+=$?))
1043 done 997 done
1044 fi 998 fi
1045 done 999 done
1000 exit ${ret}
1001 )
1002}
1003newicon() {
1004 (
1005 # wrap the env here so that the 'insinto' call
1006 # doesn't corrupt the env of the caller
1007 insinto /usr/share/pixmaps
1008 newins "$@"
1009 )
1046} 1010}
1047 1011
1048############################################################## 1012##############################################################
1049# END: Handle .desktop files and menu entries # 1013# END: Handle .desktop files and menu entries #
1050############################################################## 1014##############################################################
1051 1015
1052 1016
1053# for internal use only (unpack_pdv and unpack_makeself) 1017# for internal use only (unpack_pdv and unpack_makeself)
1054find_unpackable_file() { 1018find_unpackable_file() {
1055 local src="$1" 1019 local src=$1
1056 if [ -z "${src}" ] 1020 if [[ -z ${src} ]] ; then
1057 then
1058 src="${DISTDIR}/${A}" 1021 src=${DISTDIR}/${A}
1059 else 1022 else
1060 if [ -e "${DISTDIR}/${src}" ] 1023 if [[ -e ${DISTDIR}/${src} ]] ; then
1061 then
1062 src="${DISTDIR}/${src}" 1024 src=${DISTDIR}/${src}
1063 elif [ -e "${PWD}/${src}" ] 1025 elif [[ -e ${PWD}/${src} ]] ; then
1064 then
1065 src="${PWD}/${src}" 1026 src=${PWD}/${src}
1066 elif [ -e "${src}" ] 1027 elif [[ -e ${src} ]] ; then
1067 then
1068 src="${src}" 1028 src=${src}
1069 fi
1070 fi 1029 fi
1071 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 1030 fi
1031 [[ ! -e ${src} ]] && return 1
1072 echo "${src}" 1032 echo "${src}"
1073} 1033}
1074 1034
1075# Unpack those pesky pdv generated files ... 1035# Unpack those pesky pdv generated files ...
1076# They're self-unpacking programs with the binary package stuffed in 1036# They're self-unpacking programs with the binary package stuffed in
1077# the middle of the archive. Valve seems to use it a lot ... too bad 1037# the middle of the archive. Valve seems to use it a lot ... too bad
1078# it seems to like to segfault a lot :(. So lets take it apart ourselves. 1038# it seems to like to segfault a lot :(. So lets take it apart ourselves.
1079# 1039#
1080# Usage: unpack_pdv [file to unpack] [size of off_t] 1040# Usage: unpack_pdv [file to unpack] [size of off_t]
1081# - you have to specify the off_t size ... i have no idea how to extract that 1041# - you have to specify the off_t size ... i have no idea how to extract that
1082# information out of the binary executable myself. basically you pass in 1042# information out of the binary executable myself. basically you pass in
1083# the size of the off_t type (in bytes) on the machine that built the pdv 1043# the size of the off_t type (in bytes) on the machine that built the pdv
1084# archive. one way to determine this is by running the following commands: 1044# archive. one way to determine this is by running the following commands:
1085# strings <pdv archive> | grep lseek 1045# strings <pdv archive> | grep lseek
1086# strace -elseek <pdv archive> 1046# strace -elseek <pdv archive>
1087# basically look for the first lseek command (we do the strings/grep because 1047# basically look for the first lseek command (we do the strings/grep because
1088# sometimes the function call is _llseek or something) and steal the 2nd 1048# sometimes the function call is _llseek or something) and steal the 2nd
1089# parameter. here is an example: 1049# parameter. here is an example:
1090# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1050# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1091# lseek 1051# lseek
1092# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1052# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1093# lseek(3, -4, SEEK_END) = 2981250 1053# lseek(3, -4, SEEK_END) = 2981250
1094# thus we would pass in the value of '4' as the second parameter. 1054# thus we would pass in the value of '4' as the second parameter.
1095unpack_pdv() { 1055unpack_pdv() {
1096 local src="`find_unpackable_file $1`" 1056 local src=$(find_unpackable_file "$1")
1097 local sizeoff_t="$2" 1057 local sizeoff_t=$2
1098 1058
1059 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1099 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1060 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1100 1061
1101 local shrtsrc="`basename ${src}`" 1062 local shrtsrc=$(basename "${src}")
1102 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1063 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1103 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1064 local metaskip=$(tail -c ${sizeoff_t} "${src}" | hexdump -e \"%i\")
1104 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1065 local tailskip=$(tail -c $((${sizeoff_t}*2)) "${src}" | head -c ${sizeoff_t} | hexdump -e \"%i\")
1105 1066
1106 # grab metadata for debug reasons 1067 # grab metadata for debug reasons
1107 local metafile="$(emktemp)" 1068 local metafile=$(emktemp)
1108 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1069 tail -c +$((${metaskip}+1)) "${src}" > "${metafile}"
1109 1070
1110 # rip out the final file name from the metadata 1071 # rip out the final file name from the metadata
1111 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1072 local datafile=$(tail -c +$((${metaskip}+1)) "${src}" | strings | head -n 1)
1112 datafile="`basename ${datafile}`" 1073 datafile=$(basename "${datafile}")
1113 1074
1114 # now lets uncompress/untar the file if need be 1075 # now lets uncompress/untar the file if need be
1115 local tmpfile="$(emktemp)" 1076 local tmpfile=$(emktemp)
1116 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1077 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1117 1078
1118 local iscompressed="`file -b ${tmpfile}`" 1079 local iscompressed=$(file -b "${tmpfile}")
1119 if [ "${iscompressed:0:8}" == "compress" ] ; then 1080 if [[ ${iscompressed:0:8} == "compress" ]] ; then
1120 iscompressed=1 1081 iscompressed=1
1121 mv ${tmpfile}{,.Z} 1082 mv ${tmpfile}{,.Z}
1122 gunzip ${tmpfile} 1083 gunzip ${tmpfile}
1123 else 1084 else
1124 iscompressed=0 1085 iscompressed=0
1125 fi 1086 fi
1126 local istar="`file -b ${tmpfile}`" 1087 local istar=$(file -b "${tmpfile}")
1127 if [ "${istar:0:9}" == "POSIX tar" ] ; then 1088 if [[ ${istar:0:9} == "POSIX tar" ]] ; then
1128 istar=1 1089 istar=1
1129 else 1090 else
1130 istar=0 1091 istar=0
1131 fi 1092 fi
1132 1093
1168# many other game companies. 1129# many other game companies.
1169# 1130#
1170# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1131# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1171# - If the file is not specified then unpack will utilize ${A}. 1132# - If the file is not specified then unpack will utilize ${A}.
1172# - If the offset is not specified then we will attempt to extract 1133# - If the offset is not specified then we will attempt to extract
1173# the proper offset from the script itself. 1134# the proper offset from the script itself.
1174unpack_makeself() { 1135unpack_makeself() {
1136 local src_input=${1:-${A}}
1175 local src="$(find_unpackable_file "$1")" 1137 local src=$(find_unpackable_file "${src_input}")
1176 local skip="$2" 1138 local skip=$2
1177 local exe="$3" 1139 local exe=$3
1178 1140
1141 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1142
1179 local shrtsrc="$(basename "${src}")" 1143 local shrtsrc=$(basename "${src}")
1180 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1144 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1181 if [ -z "${skip}" ] 1145 if [[ -z ${skip} ]] ; then
1182 then
1183 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1146 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1184 local skip=0 1147 local skip=0
1185 exe=tail 1148 exe=tail
1186 case ${ver} in 1149 case ${ver} in
1187 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1150 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1188 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1151 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1189 ;; 1152 ;;
1190 2.0|2.0.1) 1153 2.0|2.0.1)
1191 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1154 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1192 ;; 1155 ;;
1200 ;; 1163 ;;
1201 2.1.3) 1164 2.1.3)
1202 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1165 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1203 let skip="skip + 1" 1166 let skip="skip + 1"
1204 ;; 1167 ;;
1205 2.1.4) 1168 2.1.4|2.1.5)
1206 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1169 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1207 skip=$(head -n ${skip} "${src}" | wc -c) 1170 skip=$(head -n ${skip} "${src}" | wc -c)
1208 exe="dd" 1171 exe="dd"
1209 ;; 1172 ;;
1210 *) 1173 *)
1222 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1185 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1223 *) die "makeself cant handle exe '${exe}'" 1186 *) die "makeself cant handle exe '${exe}'"
1224 esac 1187 esac
1225 1188
1226 # lets grab the first few bytes of the file to figure out what kind of archive it is 1189 # lets grab the first few bytes of the file to figure out what kind of archive it is
1227 local tmpfile="$(emktemp)" 1190 local tmpfile=$(emktemp)
1228 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1191 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1229 local filetype="$(file -b "${tmpfile}")" 1192 local filetype=$(file -b "${tmpfile}")
1230 case ${filetype} in 1193 case ${filetype} in
1231 *tar\ archive) 1194 *tar\ archive*)
1232 eval ${exe} | tar --no-same-owner -xf - 1195 eval ${exe} | tar --no-same-owner -xf -
1233 ;; 1196 ;;
1234 bzip2*) 1197 bzip2*)
1235 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1198 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1236 ;; 1199 ;;
1255check_license() { 1218check_license() {
1256 local lic=$1 1219 local lic=$1
1257 if [ -z "${lic}" ] ; then 1220 if [ -z "${lic}" ] ; then
1258 lic="${PORTDIR}/licenses/${LICENSE}" 1221 lic="${PORTDIR}/licenses/${LICENSE}"
1259 else 1222 else
1260 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1223 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1261 lic="${PORTDIR}/licenses/${src}" 1224 lic="${PORTDIR}/licenses/${lic}"
1262 elif [ -e "${PWD}/${src}" ] ; then 1225 elif [ -e "${PWD}/${lic}" ] ; then
1263 lic="${PWD}/${src}" 1226 lic="${PWD}/${lic}"
1264 elif [ -e "${src}" ] ; then 1227 elif [ -e "${lic}" ] ; then
1265 lic="${src}" 1228 lic="${lic}"
1266 fi
1267 fi 1229 fi
1230 fi
1268 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1231 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1269 local l="`basename ${lic}`" 1232 local l="`basename ${lic}`"
1270 1233
1271 # here is where we check for the licenses the user already 1234 # here is where we check for the licenses the user already
1272 # accepted ... if we don't find a match, we make the user accept 1235 # accepted ... if we don't find a match, we make the user accept
1273 local shopts=$- 1236 local shopts=$-
1274 local alic 1237 local alic
1275 set -o noglob #so that bash doesn't expand "*" 1238 set -o noglob #so that bash doesn't expand "*"
1276 for alic in ${ACCEPT_LICENSE} ; do 1239 for alic in ${ACCEPT_LICENSE} ; do
1277 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1240 if [[ ${alic} == ${l} ]]; then
1278 set +o noglob; set -${shopts} #reset old shell opts 1241 set +o noglob; set -${shopts} #reset old shell opts
1279 return 0 1242 return 0
1280 fi 1243 fi
1281 done 1244 done
1282 set +o noglob; set -$shopts #reset old shell opts 1245 set +o noglob; set -$shopts #reset old shell opts
1283 1246
1284 local licmsg="$(emktemp)" 1247 local licmsg=$(emktemp)
1285 cat << EOF > ${licmsg} 1248 cat <<-EOF > ${licmsg}
1286********************************************************** 1249 **********************************************************
1287The following license outlines the terms of use of this 1250 The following license outlines the terms of use of this
1288package. You MUST accept this license for installation to 1251 package. You MUST accept this license for installation to
1289continue. When you are done viewing, hit 'q'. If you 1252 continue. When you are done viewing, hit 'q'. If you
1290CTRL+C out of this, the install will not run! 1253 CTRL+C out of this, the install will not run!
1291********************************************************** 1254 **********************************************************
1292 1255
1293EOF 1256 EOF
1294 cat ${lic} >> ${licmsg} 1257 cat ${lic} >> ${licmsg}
1295 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}" 1258 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}"
1296 einfon "Do you accept the terms of this license (${l})? [yes/no] " 1259 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1297 read alic 1260 read alic
1298 case ${alic} in 1261 case ${alic} in
1315# and when the function returns, you can assume that the cd has been 1278# and when the function returns, you can assume that the cd has been
1316# found at CDROM_ROOT. 1279# found at CDROM_ROOT.
1317# 1280#
1318# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1281# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1319# etc... if you want to give the cds better names, then just export 1282# etc... if you want to give the cds better names, then just export
1320# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1283# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1284# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1285# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1286# CDROM_NAME_2="data cd"
1287# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1321# 1288#
1322# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1289# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1323# 1290#
1324# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1291# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1325# - this will attempt to locate a cd based upon a file that is on 1292# - this will attempt to locate a cd based upon a file that is on
1326# the cd ... the more files you give this function, the more cds 1293# the cd ... the more files you give this function, the more cds
1327# the cdrom functions will handle 1294# the cdrom functions will handle
1328cdrom_get_cds() { 1295cdrom_get_cds() {
1329 # first we figure out how many cds we're dealing with by 1296 # first we figure out how many cds we're dealing with by
1330 # the # of files they gave us 1297 # the # of files they gave us
1331 local cdcnt=0 1298 local cdcnt=0
1332 local f= 1299 local f=
1333 for f in "$@" ; do 1300 for f in "$@" ; do
1334 cdcnt=$((cdcnt + 1)) 1301 ((++cdcnt))
1335 export CDROM_CHECK_${cdcnt}="$f" 1302 export CDROM_CHECK_${cdcnt}="$f"
1336 done 1303 done
1337 export CDROM_TOTAL_CDS=${cdcnt} 1304 export CDROM_TOTAL_CDS=${cdcnt}
1338 export CDROM_CURRENT_CD=1 1305 export CDROM_CURRENT_CD=1
1339 1306
1340 # now we see if the user gave use CD_ROOT ... 1307 # now we see if the user gave use CD_ROOT ...
1341 # if they did, let's just believe them that it's correct 1308 # if they did, let's just believe them that it's correct
1342 if [[ ! -z ${CD_ROOT} ]] ; then
1343 export CDROM_ROOT=${CD_ROOT}
1344 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1345 return
1346 fi
1347 # do the same for CD_ROOT_X
1348 if [[ ! -z ${CD_ROOT_1} ]] ; then 1309 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1349 local var= 1310 local var=
1350 cdcnt=0 1311 cdcnt=0
1351 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1312 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1352 cdcnt=$((cdcnt + 1)) 1313 ((++cdcnt))
1353 var="CD_ROOT_${cdcnt}" 1314 var="CD_ROOT_${cdcnt}"
1315 [[ -z ${!var} ]] && var="CD_ROOT"
1354 if [[ -z ${!var} ]] ; then 1316 if [[ -z ${!var} ]] ; then
1355 eerror "You must either use just the CD_ROOT" 1317 eerror "You must either use just the CD_ROOT"
1356 eerror "or specify ALL the CD_ROOT_X variables." 1318 eerror "or specify ALL the CD_ROOT_X variables."
1357 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1319 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1358 die "could not locate CD_ROOT_${cdcnt}" 1320 die "could not locate CD_ROOT_${cdcnt}"
1359 fi 1321 fi
1360 export CDROM_ROOTS_${cdcnt}="${!var}"
1361 done 1322 done
1362 export CDROM_ROOT=${CDROM_ROOTS_1} 1323 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1363 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1324 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1325 export CDROM_SET=-1
1326 for f in ${CDROM_CHECK_1//:/ } ; do
1327 ((++CDROM_SET))
1328 [[ -e ${CD_ROOT}/${f} ]] && break
1329 done
1330 export CDROM_MATCH=${f}
1364 return 1331 return
1365 fi 1332 fi
1366 1333
1334 # User didn't help us out so lets make sure they know they can
1335 # simplify the whole process ...
1367 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1336 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1368 einfon "This ebuild will need the " 1337 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1369 if [[ -z ${CDROM_NAME} ]] ; then
1370 echo "cdrom for ${PN}."
1371 else
1372 echo "${CDROM_NAME}."
1373 fi
1374 echo 1338 echo
1375 einfo "If you do not have the CD, but have the data files" 1339 einfo "If you do not have the CD, but have the data files"
1376 einfo "mounted somewhere on your filesystem, just export" 1340 einfo "mounted somewhere on your filesystem, just export"
1377 einfo "the variable CD_ROOT so that it points to the" 1341 einfo "the variable CD_ROOT so that it points to the"
1378 einfo "directory containing the files." 1342 einfo "directory containing the files."
1379 echo 1343 echo
1380 einfo "For example:" 1344 einfo "For example:"
1381 einfo "export CD_ROOT=/mnt/cdrom" 1345 einfo "export CD_ROOT=/mnt/cdrom"
1382 echo 1346 echo
1383 else 1347 else
1348 if [[ -n ${CDROM_NAME_SET} ]] ; then
1349 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1350 cdcnt=0
1351 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1352 ((++cdcnt))
1353 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1354 done
1355 fi
1356
1384 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1357 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1385 cdcnt=0 1358 cdcnt=0
1386 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1359 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1387 cdcnt=$((cdcnt + 1)) 1360 ((++cdcnt))
1388 var="CDROM_NAME_${cdcnt}" 1361 var="CDROM_NAME_${cdcnt}"
1389 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1362 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1390 done 1363 done
1391 echo 1364 echo
1392 einfo "If you do not have the CDs, but have the data files" 1365 einfo "If you do not have the CDs, but have the data files"
1393 einfo "mounted somewhere on your filesystem, just export" 1366 einfo "mounted somewhere on your filesystem, just export"
1394 einfo "the following variables so they point to the right place:" 1367 einfo "the following variables so they point to the right place:"
1395 einfon "" 1368 einfon ""
1396 cdcnt=0 1369 cdcnt=0
1397 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1370 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1398 cdcnt=$((cdcnt + 1)) 1371 ((++cdcnt))
1399 echo -n " CD_ROOT_${cdcnt}" 1372 echo -n " CD_ROOT_${cdcnt}"
1400 done 1373 done
1401 echo 1374 echo
1402 einfo "Or, if you have all the files in the same place, or" 1375 einfo "Or, if you have all the files in the same place, or"
1403 einfo "you only have one cdrom, you can export CD_ROOT" 1376 einfo "you only have one cdrom, you can export CD_ROOT"
1406 echo 1379 echo
1407 einfo "For example:" 1380 einfo "For example:"
1408 einfo "export CD_ROOT_1=/mnt/cdrom" 1381 einfo "export CD_ROOT_1=/mnt/cdrom"
1409 echo 1382 echo
1410 fi 1383 fi
1384
1385 export CDROM_SET=""
1411 export CDROM_CURRENT_CD=0 1386 export CDROM_CURRENT_CD=0
1412 cdrom_load_next_cd 1387 cdrom_load_next_cd
1413} 1388}
1414 1389
1415# this is only used when you need access to more than one cd. 1390# this is only used when you need access to more than one cd.
1416# when you have finished using the first cd, just call this function. 1391# when you have finished using the first cd, just call this function.
1417# when it returns, CDROM_ROOT will be pointing to the second cd. 1392# when it returns, CDROM_ROOT will be pointing to the second cd.
1418# remember, you can only go forward in the cd chain, you can't go back. 1393# remember, you can only go forward in the cd chain, you can't go back.
1419cdrom_load_next_cd() { 1394cdrom_load_next_cd() {
1420 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1421 local var= 1395 local var
1422 1396 ((++CDROM_CURRENT_CD))
1423 if [[ ! -z ${CD_ROOT} ]] ; then
1424 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1425 return
1426 fi
1427 1397
1428 unset CDROM_ROOT 1398 unset CDROM_ROOT
1429 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1399 var=CD_ROOT_${CDROM_CURRENT_CD}
1400 [[ -z ${!var} ]] && var="CD_ROOT"
1430 if [[ -z ${!var} ]] ; then 1401 if [[ -z ${!var} ]] ; then
1431 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1402 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1432 cdrom_locate_file_on_cd ${!var} 1403 _cdrom_locate_file_on_cd ${!var}
1433 else 1404 else
1434 export CDROM_ROOT=${!var} 1405 export CDROM_ROOT=${!var}
1435 fi 1406 fi
1436 1407
1437 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1408 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1442# all it does is try to locate a give file on a cd ... if the cd isn't 1413# all it does is try to locate a give file on a cd ... if the cd isn't
1443# found, then a message asking for the user to insert the cdrom will be 1414# found, then a message asking for the user to insert the cdrom will be
1444# displayed and we'll hang out here until: 1415# displayed and we'll hang out here until:
1445# (1) the file is found on a mounted cdrom 1416# (1) the file is found on a mounted cdrom
1446# (2) the user hits CTRL+C 1417# (2) the user hits CTRL+C
1447cdrom_locate_file_on_cd() { 1418_cdrom_locate_file_on_cd() {
1419 local mline=""
1420 local showedmsg=0
1421
1448 while [[ -z ${CDROM_ROOT} ]] ; do 1422 while [[ -z ${CDROM_ROOT} ]] ; do
1423 local i=0
1424 local -a cdset=(${*//:/ })
1425 if [[ -n ${CDROM_SET} ]] ; then
1426 cdset=(${cdset[${CDROM_SET}]})
1427 fi
1428
1429 while [[ -n ${cdset[${i}]} ]] ; do
1449 local dir="$(dirname ${@})" 1430 local dir=$(dirname ${cdset[${i}]})
1450 local file="$(basename ${@})" 1431 local file=$(basename ${cdset[${i}]})
1451 local mline=""
1452 local showedmsg=0
1453 1432
1454 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1433 local point= node= fs= foo=
1455 [[ -d ${mline}/${dir} ]] || continue 1434 while read point node fs foo ; do
1456 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1435 [[ " cd9660 iso9660 " != *" ${fs} "* ]] && \
1436 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1437 && continue
1438 point=${point//\040/ }
1439 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1457 && export CDROM_ROOT=${mline} 1440 export CDROM_ROOT=${point}
1441 export CDROM_SET=${i}
1442 export CDROM_MATCH=${cdset[${i}]}
1443 return
1444 done <<< "$(get_mounts)"
1445
1446 ((++i))
1458 done 1447 done
1459 1448
1460 if [[ -z ${CDROM_ROOT} ]] ; then
1461 echo 1449 echo
1462 if [[ ${showedmsg} -eq 0 ]] ; then 1450 if [[ ${showedmsg} -eq 0 ]] ; then
1463 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1451 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1464 if [[ -z ${CDROM_NAME} ]] ; then 1452 if [[ -z ${CDROM_NAME} ]] ; then
1465 einfo "Please insert the cdrom for ${PN} now !" 1453 einfo "Please insert+mount the cdrom for ${PN} now !"
1466 else
1467 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1468 fi
1469 else 1454 else
1470 if [[ -z ${CDROM_NAME_1} ]] ; then
1471 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1472 else
1473 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1474 einfo "Please insert+mount the ${!var} cdrom now !" 1455 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1475 fi
1476 fi 1456 fi
1477 showedmsg=1 1457 else
1458 if [[ -z ${CDROM_NAME_1} ]] ; then
1459 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1460 else
1461 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1462 einfo "Please insert+mount the ${!var} cdrom now !"
1463 fi
1478 fi 1464 fi
1465 showedmsg=1
1466 fi
1479 einfo "Press return to scan for the cd again" 1467 einfo "Press return to scan for the cd again"
1480 einfo "or hit CTRL+C to abort the emerge." 1468 einfo "or hit CTRL+C to abort the emerge."
1481 read 1469 echo
1482 fi 1470 einfo "If you are having trouble with the detection"
1471 einfo "of your CD, it is possible that you do not have"
1472 einfo "Joliet support enabled in your kernel. Please"
1473 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1474 read || die "something is screwed with your system"
1483 done 1475 done
1484} 1476}
1485 1477
1486# Make sure that LINGUAS only contains languages that 1478# Make sure that LINGUAS only contains languages that
1487# a package can support 1479# a package can support
1488# 1480#
1489# usage: strip-linguas <allow LINGUAS> 1481# usage: strip-linguas <allow LINGUAS>
1490# strip-linguas -i <directories of .po files> 1482# strip-linguas -i <directories of .po files>
1491# strip-linguas -u <directories of .po files> 1483# strip-linguas -u <directories of .po files>
1492# 1484#
1493# The first form allows you to specify a list of LINGUAS. 1485# The first form allows you to specify a list of LINGUAS.
1494# The -i builds a list of po files found in all the 1486# The -i builds a list of po files found in all the
1495# directories and uses the intersection of the lists. 1487# directories and uses the intersection of the lists.
1496# The -u builds a list of po files found in all the 1488# The -u builds a list of po files found in all the
1497# directories and uses the union of the lists. 1489# directories and uses the union of the lists.
1498strip-linguas() { 1490strip-linguas() {
1499 local ls newls 1491 local ls newls nols
1500 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1492 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1501 local op="$1"; shift 1493 local op=$1; shift
1502 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1494 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1503 local d f 1495 local d f
1504 for d in "$@" ; do 1496 for d in "$@" ; do
1505 if [ "${op}" == "-u" ] ; then 1497 if [[ ${op} == "-u" ]] ; then
1506 newls="${ls}" 1498 newls=${ls}
1507 else 1499 else
1508 newls="" 1500 newls=""
1509 fi 1501 fi
1510 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1502 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1511 if [ "${op}" == "-i" ] ; then 1503 if [[ ${op} == "-i" ]] ; then
1512 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1504 hasq ${f} ${ls} && newls="${newls} ${f}"
1513 else 1505 else
1514 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1506 hasq ${f} ${ls} || newls="${newls} ${f}"
1515 fi 1507 fi
1516 done 1508 done
1517 ls="${newls}" 1509 ls=${newls}
1518 done 1510 done
1519 ls="${ls//.po}"
1520 else 1511 else
1521 ls="$@" 1512 ls="$@"
1522 fi 1513 fi
1523 1514
1524 ls=" ${ls} " 1515 nols=""
1525 newls="" 1516 newls=""
1526 for f in ${LINGUAS} ; do 1517 for f in ${LINGUAS} ; do
1527 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1518 if hasq ${f} ${ls} ; then
1528 newls="${newls} ${f}" 1519 newls="${newls} ${f}"
1529 else 1520 else
1530 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1521 nols="${nols} ${f}"
1531 fi 1522 fi
1532 done 1523 done
1533 if [ -z "${newls}" ] ; then 1524 [[ -n ${nols} ]] \
1534 unset LINGUAS 1525 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1535 else
1536 export LINGUAS="${newls}" 1526 export LINGUAS=${newls:1}
1537 fi
1538} 1527}
1539 1528
1540# moved from kernel.eclass since they are generally useful outside of 1529# moved from kernel.eclass since they are generally useful outside of
1541# kernel.eclass -iggy (20041002) 1530# kernel.eclass -iggy (20041002)
1542 1531
1543# the following functions are useful in kernel module ebuilds, etc. 1532# the following functions are useful in kernel module ebuilds, etc.
1544# for an example see ivtv or drbd ebuilds 1533# for an example see ivtv or drbd ebuilds
1545 1534
1546# set's ARCH to match what the kernel expects 1535# set's ARCH to match what the kernel expects
1547set_arch_to_kernel() { 1536set_arch_to_kernel() {
1537 i=10
1538 while ((i--)) ; do
1539 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1540 done
1548 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1541 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1549 case ${ARCH} in 1542 case ${ARCH} in
1550 x86) export ARCH="i386";; 1543 x86) export ARCH="i386";;
1551 amd64) export ARCH="x86_64";; 1544 amd64) export ARCH="x86_64";;
1552 hppa) export ARCH="parisc";; 1545 hppa) export ARCH="parisc";;
1553 mips) export ARCH="mips";; 1546 mips) export ARCH="mips";;
1547 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
1554 *) export ARCH="${ARCH}";; 1548 *) export ARCH="${ARCH}";;
1555 esac 1549 esac
1556} 1550}
1557 1551
1558# set's ARCH back to what portage expects 1552# set's ARCH back to what portage expects
1559set_arch_to_portage() { 1553set_arch_to_portage() {
1554 i=10
1555 while ((i--)) ; do
1556 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1557 done
1560 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1558 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1561} 1559}
1562 1560
1563# Jeremy Huddleston <eradicator@gentoo.org>: 1561# Jeremy Huddleston <eradicator@gentoo.org>:
1564# preserve_old_lib /path/to/libblah.so.0 1562# preserve_old_lib /path/to/libblah.so.0
1565# preserve_old_lib_notify /path/to/libblah.so.0 1563# preserve_old_lib_notify /path/to/libblah.so.0
1566# 1564#
1567# These functions are useful when a lib in your package changes --soname. Such 1565# These functions are useful when a lib in your package changes --library. Such
1568# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1566# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1569# would break packages that link against it. Most people get around this 1567# would break packages that link against it. Most people get around this
1570# by using the portage SLOT mechanism, but that is not always a relevant 1568# by using the portage SLOT mechanism, but that is not always a relevant
1571# solution, so instead you can add the following to your ebuilds: 1569# solution, so instead you can add the following to your ebuilds:
1572# 1570#
1573# src_install() { 1571# pkg_preinst() {
1574# ... 1572# ...
1575# preserve_old_lib /usr/$(get_libdir)/libogg.so.0 1573# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1576# ... 1574# ...
1577# } 1575# }
1578# 1576#
1581# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0 1579# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1582# ... 1580# ...
1583# } 1581# }
1584 1582
1585preserve_old_lib() { 1583preserve_old_lib() {
1586 LIB=$1 1584 if [[ ${EBUILD_PHASE} != "preinst" ]] ; then
1585 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1586# die "Invalid preserve_old_lib() usage"
1587 fi
1588 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1587 1589
1588 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1590 local lib dir
1589 SONAME=`basename ${LIB}` 1591 for lib in "$@" ; do
1590 DIRNAME=`dirname ${LIB}` 1592 [[ -e ${ROOT}/${lib} ]] || continue
1591 1593 dir=${lib%/*}
1592 dodir ${DIRNAME} 1594 dodir ${dir} || die "dodir ${dir} failed"
1593 cp ${ROOT}${LIB} ${D}${DIRNAME} 1595 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
1594 touch ${D}${LIB} 1596 touch "${D}"/${lib}
1595 fi 1597 done
1596} 1598}
1597 1599
1598preserve_old_lib_notify() { 1600preserve_old_lib_notify() {
1599 LIB=$1 1601 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1602 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1603# die "Invalid preserve_old_lib_notify() usage"
1604 fi
1600 1605
1601 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1606 local lib notice=0
1602 SONAME=`basename ${LIB}` 1607 for lib in "$@" ; do
1603 1608 [[ -e ${ROOT}/${lib} ]] || continue
1609 if [[ ${notice} -eq 0 ]] ; then
1610 notice=1
1604 einfo "An old version of an installed library was detected on your system." 1611 ewarn "Old versions of installed libraries were detected on your system."
1605 einfo "In order to avoid breaking packages that link against is, this older version" 1612 ewarn "In order to avoid breaking packages that depend on these old libs,"
1606 einfo "is not being removed. In order to make full use of this newer version," 1613 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1607 einfo "you will need to execute the following command:" 1614 ewarn "in order to remove these old dependencies. If you do not have this"
1608 einfo " revdep-rebuild --soname ${SONAME}" 1615 ewarn "helper program, simply emerge the 'gentoolkit' package."
1609 einfo 1616 ewarn
1610 einfo "After doing that, you can safely remove ${LIB}" 1617 fi
1611 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1618 ewarn " # revdep-rebuild --library ${lib##*/}"
1612 fi 1619 done
1613} 1620}
1614 1621
1615# Hack for people to figure out if a package was built with 1622# Hack for people to figure out if a package was built with
1616# certain USE flags 1623# certain USE flags
1617# 1624#
1618# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1625# Usage: built_with_use [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1619# ex: built_with_use xchat gtk2 1626# ex: built_with_use xchat gtk2
1620# 1627#
1621# Flags: -a all USE flags should be utilized 1628# Flags: -a all USE flags should be utilized
1622# -o at least one USE flag should be utilized 1629# -o at least one USE flag should be utilized
1630# --missing peform the specified action if the flag is not in IUSE (true/false/die)
1631# --hidden USE flag we're checking is hidden expanded so it isnt in IUSE
1623# Note: the default flag is '-a' 1632# Note: the default flag is '-a'
1624built_with_use() { 1633built_with_use() {
1634 local hidden="no"
1635 if [[ $1 == "--hidden" ]] ; then
1636 hidden="yes"
1637 shift
1638 fi
1639
1640 local missing_action="die"
1641 if [[ $1 == "--missing" ]] ; then
1642 missing_action=$2
1643 shift ; shift
1644 case ${missing_action} in
1645 true|false|die) ;;
1646 *) die "unknown action '${missing_action}'";;
1647 esac
1648 fi
1649
1625 local opt=$1 1650 local opt=$1
1626 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1651 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1627 1652
1628 local PKG=$(best_version $1) 1653 local PKG=$(best_version $1)
1654 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1629 shift 1655 shift
1630 1656
1631 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1657 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1632 [[ ! -e ${USEFILE} ]] && return 1 1658 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1659
1660 # if the IUSE file doesn't exist, the read will error out, we need to handle
1661 # this gracefully
1662 if [[ ! -e ${USEFILE} ]] || [[ ! -e ${IUSEFILE} && ${hidden} == "no" ]] ; then
1663 case ${missing_action} in
1664 true) return 0;;
1665 false) return 1;;
1666 die) die "Unable to determine what USE flags $PKG was built with";;
1667 esac
1668 fi
1669
1670 if [[ ${hidden} == "no" ]] ; then
1671 local IUSE_BUILT=$(<${IUSEFILE})
1672 # Don't check USE_EXPAND #147237
1673 local expand
1674 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1675 if [[ $1 == ${expand}_* ]] ; then
1676 expand=""
1677 break
1678 fi
1679 done
1680 if [[ -n ${expand} ]] ; then
1681 if ! has $1 ${IUSE_BUILT} ; then
1682 case ${missing_action} in
1683 true) return 0;;
1684 false) return 1;;
1685 die) die "$PKG does not actually support the $1 USE flag!";;
1686 esac
1687 fi
1688 fi
1689 fi
1633 1690
1634 local USE_BUILT=$(<${USEFILE}) 1691 local USE_BUILT=$(<${USEFILE})
1635 while [[ $# -gt 0 ]] ; do 1692 while [[ $# -gt 0 ]] ; do
1636 if [[ ${opt} = "-o" ]] ; then 1693 if [[ ${opt} = "-o" ]] ; then
1637 has $1 ${USE_BUILT} && return 0 1694 has $1 ${USE_BUILT} && return 0
1641 shift 1698 shift
1642 done 1699 done
1643 [[ ${opt} = "-a" ]] 1700 [[ ${opt} = "-a" ]]
1644} 1701}
1645 1702
1646# Many configure scripts wrongly bail when a C++ compiler 1703# Many configure scripts wrongly bail when a C++ compiler
1647# could not be detected. #73450 1704# could not be detected. #73450
1648epunt_cxx() { 1705epunt_cxx() {
1649 local dir=$1 1706 local dir=$1
1650 [[ -z ${dir} ]] && dir=${S} 1707 [[ -z ${dir} ]] && dir=${S}
1651 ebegin "Removing useless C++ checks" 1708 ebegin "Removing useless C++ checks"
1654 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1711 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1655 done 1712 done
1656 eend 0 1713 eend 0
1657} 1714}
1658 1715
1659# get_abi_var <VAR> [<ABI>] 1716# make a wrapper script ...
1660# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults 1717# NOTE: this was originally games_make_wrapper, but I noticed other places where
1661# 1718# this could be used, so I have moved it here and made it not games-specific
1662# This code is for testing purposes only with the sparc64-multilib ${PROFILE_ARCH} 1719# -- wolf31o2
1663# and getting a more multilib-aware portage layout. It may end up being used, but for now 1720# $1 == wrapper name
1664# it is subject to removal if a better way is worked out. 1721# $2 == binary to run
1665# 1722# $3 == directory to chdir before running binary
1666# ex: 1723# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1667# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32 1724# $5 == path for wrapper
1668# 1725make_wrapper() {
1669# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)" 1726 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1670# This will hopefully be added to portage soon... 1727 local tmpwrapper=$(emktemp)
1671# 1728 # We don't want to quote ${bin} so that people can pass complex
1672# If <ABI> is not specified, ${ABI} is used. 1729 # things as $bin ... "./someprog --args"
1673# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used. 1730 cat << EOF > "${tmpwrapper}"
1674# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string. 1731#!/bin/sh
1675# 1732cd "${chdir:-.}"
1676# Jeremy Huddleston <eradicator@gentoo.org>
1677get_abi_var() {
1678 local flag=$1
1679 local abi
1680 if [ $# -gt 1 ]; then
1681 abi=$1
1682 elif [ -n "${ABI}" ]; then 1733if [ -n "${libdir}" ] ; then
1683 abi=${ABI} 1734 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1684 elif [ -n "${DEFAULT_ABI}" ]; then 1735 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1685 abi=${DEFAULT_ABI}
1686 else 1736 else
1687 return 1 1737 export LD_LIBRARY_PATH="${libdir}"
1738 fi
1688 fi 1739fi
1689 eval echo \${${flag}_${abi}} 1740exec ${bin} "\$@"
1741EOF
1742 chmod go+rx "${tmpwrapper}"
1743 if [[ -n ${path} ]] ; then
1744 exeinto "${path}"
1745 newexe "${tmpwrapper}" "${wrapper}"
1746 else
1747 newbin "${tmpwrapper}" "${wrapper}"
1748 fi
1690} 1749}
1691
1692get_abi_CFLAGS() { get_abi_var CFLAGS $1; }
1693get_abi_CXXFLAGS() { get_abi_var CXXFLAGS $1; }
1694get_abi_ASFLAGS() { get_abi_var ASFLAGS $1; }
1695get_abi_LIBDIR() { get_abi_var LIBDIR $1; }
1696

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

  ViewVC Help
Powered by ViewVC 1.1.20