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

Diff of /eclass/eutils.eclass

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

Revision 1.143 Revision 1.173
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2005 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.143 2005/01/26 16:19:12 ka0ttic Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.173 2005/05/24 03:17:19 vapier Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
65gen_usr_ldscript() { 65gen_usr_ldscript() {
66 local libdir="$(get_libdir)" 66 local libdir="$(get_libdir)"
67 # Just make sure it exists 67 # Just make sure it exists
68 dodir /usr/${libdir} 68 dodir /usr/${libdir}
69 69
70 for lib in "${@}" ; do
70 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
71/* GNU ld script 72 /* GNU ld script
72 Because Gentoo have critical dynamic libraries 73 Since Gentoo has critical dynamic libraries
73 in /lib, and the static versions in /usr/lib, we 74 in /lib, and the static versions in /usr/lib,
74 need to have a "fake" dynamic lib in /usr/lib, 75 we need to have a "fake" dynamic lib in /usr/lib,
75 otherwise we run into linking problems. 76 otherwise we run into linking problems.
76 See bug #4411 on http://bugs.gentoo.org/ for 77
77 more info. */ 78 See bug http://bugs.gentoo.org/4411 for more info.
79 */
78GROUP ( /${libdir}/${1} ) 80 GROUP ( /${libdir}/${lib} )
79END_LDSCRIPT 81 END_LDSCRIPT
80 fperms a+x "/usr/${libdir}/${1}" 82 fperms a+x "/usr/${libdir}/${lib}"
83 done
81} 84}
82 85
83# Simple function to draw a line consisting of '=' the same length as $* 86# Simple function to draw a line consisting of '=' the same length as $*
87# - only to be used by epatch()
84# 88#
85# <azarah@gentoo.org> (11 Nov 2002) 89# <azarah@gentoo.org> (11 Nov 2002)
86# 90#
87draw_line() { 91draw_line() {
88 local i=0 92 local i=0
114EPATCH_SOURCE="${WORKDIR}/patch" 118EPATCH_SOURCE="${WORKDIR}/patch"
115# Default extension for patches 119# Default extension for patches
116EPATCH_SUFFIX="patch.bz2" 120EPATCH_SUFFIX="patch.bz2"
117# Default options for patch 121# Default options for patch
118# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 122# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
119EPATCH_OPTS="-g0" 123# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
124EPATCH_OPTS="-g0 --no-backup-if-mismatch"
120# List of patches not to apply. Not this is only file names, 125# List of patches not to apply. Not this is only file names,
121# and not the full path .. 126# and not the full path ..
122EPATCH_EXCLUDE="" 127EPATCH_EXCLUDE=""
123# Change the printed message for a single patch. 128# Change the printed message for a single patch.
124EPATCH_SINGLE_MSG="" 129EPATCH_SINGLE_MSG=""
130# Change the printed message for multiple patches.
131EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
125# Force applying bulk patches even if not following the style: 132# Force applying bulk patches even if not following the style:
126# 133#
127# ??_${ARCH}_foo.${EPATCH_SUFFIX} 134# ??_${ARCH}_foo.${EPATCH_SUFFIX}
128# 135#
129EPATCH_FORCE="no" 136EPATCH_FORCE="no"
170 local x="" 177 local x=""
171 178
172 if [ "$#" -gt 1 ] 179 if [ "$#" -gt 1 ]
173 then 180 then
174 local m="" 181 local m=""
175 einfo "${#} patches to apply ..."
176 for m in "$@" ; do 182 for m in "$@" ; do
177 epatch "${m}" 183 epatch "${m}"
178 done 184 done
179 return 0 185 return 0
180 fi 186 fi
234 ;; 240 ;;
235 esac 241 esac
236 242
237 if [ "${SINGLE_PATCH}" = "no" ] 243 if [ "${SINGLE_PATCH}" = "no" ]
238 then 244 then
239 einfo "Applying various patches (bugfixes/updates) ..." 245 einfo "${EPATCH_MULTI_MSG}"
240 fi 246 fi
241 for x in ${EPATCH_SOURCE} 247 for x in ${EPATCH_SOURCE}
242 do 248 do
243 # New ARCH dependant patch naming scheme ... 249 # New ARCH dependant patch naming scheme ...
244 # 250 #
248 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 254 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \
249 [ "${EPATCH_FORCE}" = "yes" ]) 255 [ "${EPATCH_FORCE}" = "yes" ])
250 then 256 then
251 local count=0 257 local count=0
252 local popts="${EPATCH_OPTS}" 258 local popts="${EPATCH_OPTS}"
259 local patchname=${x##*/}
253 260
254 if [ -n "${EPATCH_EXCLUDE}" ] 261 if [ -n "${EPATCH_EXCLUDE}" ]
255 then 262 then
256 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 263 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
257 then 264 then
258 continue 265 continue
259 fi 266 fi
260 fi 267 fi
261 268
263 then 270 then
264 if [ -n "${EPATCH_SINGLE_MSG}" ] 271 if [ -n "${EPATCH_SINGLE_MSG}" ]
265 then 272 then
266 einfo "${EPATCH_SINGLE_MSG}" 273 einfo "${EPATCH_SINGLE_MSG}"
267 else 274 else
268 einfo "Applying ${x##*/} ..." 275 einfo "Applying ${patchname} ..."
269 fi 276 fi
270 else 277 else
271 einfo " ${x##*/} ..." 278 einfo " ${patchname} ..."
272 fi 279 fi
273 280
274 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 281 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
275 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
276 283
277 # Allow for prefix to differ ... im lazy, so shoot me :/ 284 # Allow for prefix to differ ... im lazy, so shoot me :/
278 while [ "${count}" -lt 5 ] 285 while [ "${count}" -lt 5 ]
279 do 286 do
280 # Generate some useful debug info ... 287 # Generate some useful debug info ...
281 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 288 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
282 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 289 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
283 290
284 if [ "${PATCH_SUFFIX}" != "patch" ] 291 if [ "${PATCH_SUFFIX}" != "patch" ]
285 then 292 then
286 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 293 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
287 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 294 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
288 else 295 else
289 PATCH_TARGET="${x}" 296 PATCH_TARGET="${x}"
290 fi 297 fi
291 298
292 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 299 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
293 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 300 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
294 301
295 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
296 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 303 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
297 304
298 if [ "${PATCH_SUFFIX}" != "patch" ] 305 if [ "${PATCH_SUFFIX}" != "patch" ]
299 then 306 then
300 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 307 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
301 then 308 then
302 echo 309 echo
303 eerror "Could not extract patch!" 310 eerror "Could not extract patch!"
304 #die "Could not extract patch!" 311 #die "Could not extract patch!"
305 count=5 312 count=5
306 break 313 break
307 fi 314 fi
308 fi 315 fi
309 316
310 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 317 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
311 then 318 then
312 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 319 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
313 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 320 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
314 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 321 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
315 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
316 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 323 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
317 324
318 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 325 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
319 326
320 if [ "$?" -ne 0 ] 327 if [ "$?" -ne 0 ]
321 then 328 then
322 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 329 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
323 echo 330 echo
324 eerror "A dry-run of patch command succeeded, but actually" 331 eerror "A dry-run of patch command succeeded, but actually"
325 eerror "applying the patch failed!" 332 eerror "applying the patch failed!"
326 #die "Real world sux compared to the dreamworld!" 333 #die "Real world sux compared to the dreamworld!"
327 count=5 334 count=5
328 fi 335 fi
329 336
330 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 337 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
331 338
332 break 339 break
333 fi 340 fi
334 341
335 count=$((count + 1)) 342 count=$((count + 1))
341 fi 348 fi
342 349
343 if [ "${count}" -eq 5 ] 350 if [ "${count}" -eq 5 ]
344 then 351 then
345 echo 352 echo
346 eerror "Failed Patch: ${x##*/}!" 353 eerror "Failed Patch: ${patchname} !"
354 eerror " ( ${PATCH_TARGET} )"
347 eerror 355 eerror
348 eerror "Include in your bugreport the contents of:" 356 eerror "Include in your bugreport the contents of:"
349 eerror 357 eerror
350 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 358 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
351 echo 359 echo
352 die "Failed Patch: ${x##*/}!" 360 die "Failed Patch: ${patchname}!"
353 fi 361 fi
354 362
355 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 363 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
356 364
357 eend 0 365 eend 0
358 fi 366 fi
359 done 367 done
360 if [ "${SINGLE_PATCH}" = "no" ] 368 if [ "${SINGLE_PATCH}" = "no" ]
361 then 369 then
362 einfo "Done with patching" 370 einfo "Done with patching"
363 fi 371 fi
364}
365
366# This function return true if we are using the NPTL pthreads
367# implementation.
368#
369# <azarah@gentoo.org> (06 March 2003)
370#
371have_NPTL() {
372 cat > ${T}/test-nptl.c <<-"END"
373 #define _XOPEN_SOURCE
374 #include <unistd.h>
375 #include <stdio.h>
376
377 int main()
378 {
379 char buf[255];
380 char *str = buf;
381
382 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
383 if (NULL != str) {
384 printf("%s\n", str);
385 if (NULL != strstr(str, "NPTL"))
386 return 0;
387 }
388
389 return 1;
390 }
391 END
392
393 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
394 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
395 then
396 echo "yes"
397 einfon "Checking what PTHREADS implementation we have ..."
398 if ${T}/nptl
399 then
400 return 0
401 else
402 return 1
403 fi
404 else
405 echo "no"
406 fi
407
408 return 1
409} 372}
410 373
411# This function check how many cpu's are present, and then set 374# This function check how many cpu's are present, and then set
412# -j in MAKEOPTS accordingly. 375# -j in MAKEOPTS accordingly.
413# 376#
864# name: the name that will show up in the menu 827# name: the name that will show up in the menu
865# icon: give your little like a pretty little icon ... 828# icon: give your little like a pretty little icon ...
866# this can be relative (to /usr/share/pixmaps) or 829# this can be relative (to /usr/share/pixmaps) or
867# a full path to an icon 830# a full path to an icon
868# type: what kind of application is this ? for categories: 831# type: what kind of application is this ? for categories:
869# http://www.freedesktop.org/standards/menu-spec/ 832# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
870# path: if your app needs to startup in a specific dir 833# path: if your app needs to startup in a specific dir
871make_desktop_entry() { 834make_desktop_entry() {
872 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 835 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
873 836
874 local exec="${1}" 837 local exec=${1}
875 local name="${2:-${PN}}" 838 local name=${2:-${PN}}
876 local icon="${3:-${PN}.png}" 839 local icon=${3:-${PN}.png}
877 local type="${4}" 840 local type=${4}
878 local subdir="${6}" 841 local path=${5}
879 local path="${5:-${GAMES_BINDIR}}" 842
880 if [ -z "${type}" ] 843 if [[ -z ${type} ]] ; then
881 then 844 local catmaj=${CATEGORY%%-*}
882 case ${CATEGORY} in 845 local catmin=${CATEGORY##*-}
883 "app-emulation") 846 case ${catmaj} in
884 type=Emulator 847 app)
885 subdir="Emulation" 848 case ${catmin} in
849 admin) type=System;;
850 cdr) type=DiscBurning;;
851 dicts) type=Dictionary;;
852 editors) type=TextEditor;;
853 emacs) type=TextEditor;;
854 emulation) type=Emulator;;
855 laptop) type=HardwareSettings;;
856 office) type=Office;;
857 vim) type=TextEditor;;
858 xemacs) type=TextEditor;;
859 *) type=;;
860 esac
886 ;; 861 ;;
887 "games-"*) 862
888 type=Game 863 dev)
889 subdir="Games" 864 type="Development"
890 ;; 865 ;;
891 "net-"*) 866
892 type=Network 867 games)
893 subdir="${type}" 868 [[ -z ${path} ]] && path=${GAMES_BINDIR}
869
870 case ${catmin} in
871 action) type=ActionGame;;
872 arcade) type=ArcadeGame;;
873 board) type=BoardGame;;
874 kid) type=KidsGame;;
875 emulation) type=Emulator;;
876 puzzle) type=LogicGame;;
877 rpg) type=RolePlaying;;
878 roguelike) type=RolePlaying;;
879 simulation) type=Simulation;;
880 sports) type=SportsGame;;
881 strategy) type=StrategyGame;;
882 *) type=;;
883 esac
884 type="Game;${type}"
894 ;; 885 ;;
886
887 mail)
888 type="Network;Email"
889 ;;
890
891 media)
892 case ${catmin} in
893 gfx) type=Graphics;;
894 radio) type=Tuner;;
895 sound) type=Audio;;
896 tv) type=TV;;
897 video) type=Video;;
898 *) type=;;
899 esac
900 type="AudioVideo;${type}"
901 ;;
902
903 net)
904 case ${catmin} in
905 dialup) type=Dialup;;
906 ftp) type=FileTransfer;;
907 im) type=InstantMessaging;;
908 irc) type=IRCClient;;
909 mail) type=Email;;
910 news) type=News;;
911 nntp) type=News;;
912 p2p) type=FileTransfer;;
913 *) type=;;
914 esac
915 type="Network;${type}"
916 ;;
917
918 sci)
919 case ${catmin} in
920 astro*) type=Astronomoy;;
921 bio*) type=Biology;;
922 calc*) type=Calculator;;
923 chem*) type=Chemistry;;
924 geo*) type=Geology;;
925 math*) type=Math;;
926 *) type=;;
927 esac
928 type="Science;${type}"
929 ;;
930
931 www)
932 case ${catmin} in
933 client) type=WebBrowser;;
934 *) type=;;
935 esac
936 type="Network"
937 ;;
938
895 *) 939 *)
896 type= 940 type=
897 subdir=
898 ;; 941 ;;
899 esac 942 esac
900 fi 943 fi
944
901 local desktop="${T}/${exec}.desktop" 945 local desktop=${T}/${exec%% *}-${P}.desktop
902 946
903echo "[Desktop Entry] 947echo "[Desktop Entry]
904Encoding=UTF-8 948Encoding=UTF-8
905Version=0.9.2 949Version=0.9.2
906Name=${name} 950Name=${name}
922# make_desktop_entry(<title>, <command>) 966# make_desktop_entry(<title>, <command>)
923# title: File to execute to start the Window Manager 967# title: File to execute to start the Window Manager
924# command: Name of the Window Manager 968# command: Name of the Window Manager
925 969
926make_session_desktop() { 970make_session_desktop() {
927
928 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 971 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
929 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1 972 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
930 973
931 local title="${1}" 974 local title=$1
932 local command="${2}" 975 local command=$2
933 local desktop="${T}/${wm}.desktop" 976 local desktop=${T}/${wm}.desktop
934 977
935echo "[Desktop Entry] 978echo "[Desktop Entry]
936Encoding=UTF-8 979Encoding=UTF-8
937Name=${title} 980Name=${title}
938Comment=This session logs you into ${title} 981Comment=This session logs you into ${title}
940TryExec=${command} 983TryExec=${command}
941Type=Application" > "${desktop}" 984Type=Application" > "${desktop}"
942 985
943 insinto /usr/share/xsessions 986 insinto /usr/share/xsessions
944 doins "${desktop}" 987 doins "${desktop}"
945
946 return 0
947} 988}
948 989
949domenu() { 990domenu() {
950 local i 991 local i j
951 local j
952 insinto /usr/share/applications 992 insinto /usr/share/applications
953 for i in ${@} 993 for i in "$@" ; do
954 do
955 if [ -f "${i}" ]; 994 if [[ -f ${i} ]] ; then
956 then
957 doins ${i} 995 doins "${i}"
958 elif [ -d "${i}" ]; 996 elif [[ -d ${i} ]] ; then
959 then
960 for j in ${i}/*.desktop 997 for j in "${i}"/*.desktop ; do
961 do
962 doins ${j} 998 doins "${j}"
963 done 999 done
964 fi 1000 fi
965 done 1001 done
966} 1002}
1003newmenu() {
1004 insinto /usr/share/applications
1005 newins "$1" "$2"
1006}
967 1007
968doicon() { 1008doicon() {
969 local i 1009 local i j
970 local j
971 insinto /usr/share/pixmaps 1010 insinto /usr/share/pixmaps
972 for i in ${@} 1011 for i in "$@" ; do
973 do
974 if [ -f "${i}" ]; 1012 if [[ -f ${i} ]] ; then
975 then
976 doins ${i} 1013 doins "${i}"
977 elif [ -d "${i}" ]; 1014 elif [[ -d ${i} ]] ; then
978 then
979 for j in ${i}/*.png 1015 for j in "${i}"/*.png ; do
980 do
981 doins ${j} 1016 doins "${j}"
982 done 1017 done
983 fi 1018 fi
984 done 1019 done
1020}
1021newicon() {
1022 insinto /usr/share/pixmaps
1023 newins "$1" "$2"
985} 1024}
986 1025
987############################################################## 1026##############################################################
988# END: Handle .desktop files and menu entries # 1027# END: Handle .desktop files and menu entries #
989############################################################## 1028##############################################################
1390 local mline="" 1429 local mline=""
1391 local showedmsg=0 1430 local showedmsg=0
1392 1431
1393 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1432 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1394 [[ -d ${mline}/${dir} ]] || continue 1433 [[ -d ${mline}/${dir} ]] || continue
1395 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1434 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1396 && export CDROM_ROOT=${mline} 1435 && export CDROM_ROOT=${mline}
1397 done 1436 done
1398 1437
1399 if [[ -z ${CDROM_ROOT} ]] ; then 1438 if [[ -z ${CDROM_ROOT} ]] ; then
1400 echo 1439 echo
1434# directories and uses the intersection of the lists. 1473# directories and uses the intersection of the lists.
1435# The -u builds a list of po files found in all the 1474# The -u builds a list of po files found in all the
1436# directories and uses the union of the lists. 1475# directories and uses the union of the lists.
1437strip-linguas() { 1476strip-linguas() {
1438 local ls newls 1477 local ls newls
1439 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1478 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1440 local op="$1"; shift 1479 local op=$1; shift
1441 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1480 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1442 local d f 1481 local d f
1443 for d in "$@" ; do 1482 for d in "$@" ; do
1444 if [ "${op}" == "-u" ] ; then 1483 if [[ ${op} == "-u" ]] ; then
1445 newls="${ls}" 1484 newls=${ls}
1446 else 1485 else
1447 newls="" 1486 newls=""
1448 fi 1487 fi
1449 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1488 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1450 if [ "${op}" == "-i" ] ; then 1489 if [[ ${op} == "-i" ]] ; then
1451 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1490 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1452 else 1491 else
1453 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1492 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1454 fi 1493 fi
1455 done 1494 done
1456 ls="${newls}" 1495 ls=${newls}
1457 done 1496 done
1458 ls="${ls//.po}" 1497 ls=${ls//.po}
1459 else 1498 else
1460 ls="$@" 1499 ls=$@
1461 fi 1500 fi
1462 1501
1463 ls=" ${ls} " 1502 ls=" ${ls} "
1464 newls="" 1503 newls=""
1465 for f in ${LINGUAS} ; do 1504 for f in ${LINGUAS} ; do
1466 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1505 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1467 newls="${newls} ${f}" 1506 newls="${newls} ${f}"
1468 else 1507 else
1469 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1508 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1470 fi 1509 fi
1471 done 1510 done
1472 if [ -z "${newls}" ] ; then 1511 if [[ -z ${newls} ]] ; then
1473 unset LINGUAS 1512 export LINGUAS=""
1474 else 1513 else
1475 export LINGUAS="${newls}" 1514 export LINGUAS=${newls:1}
1476 fi 1515 fi
1477} 1516}
1478 1517
1479# moved from kernel.eclass since they are generally useful outside of 1518# moved from kernel.eclass since they are generally useful outside of
1480# kernel.eclass -iggy (20041002) 1519# kernel.eclass -iggy (20041002)
1602 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1641 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1603 done 1642 done
1604 eend 0 1643 eend 0
1605} 1644}
1606 1645
1607# dopamd [ file ] [ new file ] 1646# dopamd <file> [more files]
1608# 1647#
1609# Install pam auth config file in /etc/pam.d 1648# Install pam auth config file in /etc/pam.d
1610#
1611# The first argument, 'file' is required. Install as 'new file', if
1612# specified.
1613
1614dopamd() { 1649dopamd() {
1615 local pamd="$1" newpamd="${2:-$1}"
1616 [[ -z "$1" ]] && die "dopamd requires at least one argument." 1650 [[ -z $1 ]] && die "dopamd requires at least one argument"
1617 1651
1618 use pam || return 0 1652 use pam || return 0
1619 1653
1620 insinto /etc/pam.d 1654 INSDESTTREE=/etc/pam.d \
1621 # these are the default doins options, but be explicit just in case 1655 doins "$@" || die "failed to install $@"
1622 insopts -m 0644 -o root -g root
1623 newins ${pamd} ${newpamd} || die "failed to install ${newpamd}"
1624} 1656}
1657# newpamd <old name> <new name>
1658#
1659# Install pam file <old name> as <new name> in /etc/pam.d
1660newpamd() {
1661 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1662
1663 use pam || return 0
1664
1665 INSDESTTREE=/etc/pam.d \
1666 newins "$1" "$2" || die "failed to install $1 as $2"
1667}
1668
1669# make a wrapper script ...
1670# NOTE: this was originally games_make_wrapper, but I noticed other places where
1671# this could be used, so I have moved it here and made it not games-specific
1672# -- wolf31o2
1673# $1 == wrapper name
1674# $2 == binary to run
1675# $3 == directory to chdir before running binary
1676# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1677# $5 == path for wrapper
1678make_wrapper() {
1679 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1680 local tmpwrapper=$(emktemp)
1681 cat << EOF > "${tmpwrapper}"
1682#!/bin/sh
1683cd "${chdir}"
1684export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1685exec ${bin} "\$@"
1686EOF
1687 chmod go+rx "${tmpwrapper}"
1688 if [ -n "${5}" ]
1689 then
1690 exeinto ${5}
1691 newexe "${tmpwrapper}" "${wrapper}"
1692 else
1693 newbin "${tmpwrapper}" "${wrapper}"
1694 fi
1695}

Legend:
Removed from v.1.143  
changed lines
  Added in v.1.173

  ViewVC Help
Powered by ViewVC 1.1.20