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

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

  ViewVC Help
Powered by ViewVC 1.1.20