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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.212  
changed lines
  Added in v.1.325

  ViewVC Help
Powered by ViewVC 1.1.20