| 1 |
ulm 11/08/30 20:10:13 |
| 2 |
|
| 3 |
Modified: elisp.eclass elisp-common.eclass |
| 4 |
Log: |
| 5 |
Sync eclasses from Emacs overlay (revision 1683). |
| 6 |
Change [ ] to [[ ]] throughout. |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.52 eclass/elisp.eclass |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp.eclass?rev=1.52&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp.eclass?rev=1.52&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp.eclass?r1=1.51&r2=1.52 |
| 14 |
|
| 15 |
Index: elisp.eclass |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v |
| 18 |
retrieving revision 1.51 |
| 19 |
retrieving revision 1.52 |
| 20 |
diff -u -r1.51 -r1.52 |
| 21 |
--- elisp.eclass 22 Aug 2011 06:56:26 -0000 1.51 |
| 22 |
+++ elisp.eclass 30 Aug 2011 20:10:13 -0000 1.52 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2011 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.51 2011/08/22 06:56:26 ulm Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.52 2011/08/30 20:10:13 ulm Exp $ |
| 28 |
# |
| 29 |
# @ECLASS: elisp.eclass |
| 30 |
# @MAINTAINER: |
| 31 |
@@ -88,15 +88,15 @@ |
| 32 |
# src_prepare, call elisp_src_prepare. |
| 33 |
|
| 34 |
elisp_src_unpack() { |
| 35 |
- [ -n "${A}" ] && unpack ${A} |
| 36 |
- if [ -f ${P}.el ]; then |
| 37 |
+ [[ -n ${A} ]] && unpack ${A} |
| 38 |
+ if [[ -f ${P}.el ]]; then |
| 39 |
# the "simple elisp" case with a single *.el file in WORKDIR |
| 40 |
mv ${P}.el ${PN}.el || die |
| 41 |
- [ -d "${S}" ] || S=${WORKDIR} |
| 42 |
+ [[ -d ${S} ]] || S=${WORKDIR} |
| 43 |
fi |
| 44 |
|
| 45 |
case "${EAPI:-0}" in |
| 46 |
- 0|1) [ -d "${S}" ] && cd "${S}" |
| 47 |
+ 0|1) [[ -d ${S} ]] && cd "${S}" |
| 48 |
elisp_src_prepare ;; |
| 49 |
esac |
| 50 |
} |
| 51 |
@@ -109,11 +109,11 @@ |
| 52 |
elisp_src_prepare() { |
| 53 |
local patch |
| 54 |
for patch in ${ELISP_PATCHES}; do |
| 55 |
- if [ -f "${patch}" ]; then |
| 56 |
+ if [[ -f ${patch} ]]; then |
| 57 |
epatch "${patch}" |
| 58 |
- elif [ -f "${WORKDIR}/${patch}" ]; then |
| 59 |
+ elif [[ -f ${WORKDIR}/${patch} ]]; then |
| 60 |
epatch "${WORKDIR}/${patch}" |
| 61 |
- elif [ -f "${FILESDIR}/${patch}" ]; then |
| 62 |
+ elif [[ -f ${FILESDIR}/${patch} ]]; then |
| 63 |
epatch "${FILESDIR}/${patch}" |
| 64 |
else |
| 65 |
die "Cannot find ${patch}" |
| 66 |
@@ -135,7 +135,7 @@ |
| 67 |
|
| 68 |
elisp_src_compile() { |
| 69 |
elisp-compile *.el || die |
| 70 |
- if [ -n "${ELISP_TEXINFO}" ]; then |
| 71 |
+ if [[ -n ${ELISP_TEXINFO} ]]; then |
| 72 |
makeinfo ${ELISP_TEXINFO} || die |
| 73 |
fi |
| 74 |
} |
| 75 |
@@ -149,15 +149,15 @@ |
| 76 |
|
| 77 |
elisp_src_install() { |
| 78 |
elisp-install ${PN} *.el *.elc || die |
| 79 |
- if [ -n "${SITEFILE}" ]; then |
| 80 |
+ if [[ -n ${SITEFILE} ]]; then |
| 81 |
elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die |
| 82 |
fi |
| 83 |
- if [ -n "${ELISP_TEXINFO}" ]; then |
| 84 |
+ if [[ -n ${ELISP_TEXINFO} ]]; then |
| 85 |
set -- ${ELISP_TEXINFO} |
| 86 |
set -- ${@##*/} |
| 87 |
doinfo ${@/%.*/.info*} || die |
| 88 |
fi |
| 89 |
- if [ -n "${DOCS}" ]; then |
| 90 |
+ if [[ -n ${DOCS} ]]; then |
| 91 |
dodoc ${DOCS} || die |
| 92 |
fi |
| 93 |
} |
| 94 |
|
| 95 |
|
| 96 |
|
| 97 |
1.75 eclass/elisp-common.eclass |
| 98 |
|
| 99 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?rev=1.75&view=markup |
| 100 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?rev=1.75&content-type=text/plain |
| 101 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?r1=1.74&r2=1.75 |
| 102 |
|
| 103 |
Index: elisp-common.eclass |
| 104 |
=================================================================== |
| 105 |
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v |
| 106 |
retrieving revision 1.74 |
| 107 |
retrieving revision 1.75 |
| 108 |
diff -u -r1.74 -r1.75 |
| 109 |
--- elisp-common.eclass 22 Aug 2011 06:56:26 -0000 1.74 |
| 110 |
+++ elisp-common.eclass 30 Aug 2011 20:10:13 -0000 1.75 |
| 111 |
@@ -1,6 +1,6 @@ |
| 112 |
# Copyright 1999-2011 Gentoo Foundation |
| 113 |
# Distributed under the terms of the GNU General Public License v2 |
| 114 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.74 2011/08/22 06:56:26 ulm Exp $ |
| 115 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.75 2011/08/30 20:10:13 ulm Exp $ |
| 116 |
# |
| 117 |
# @ECLASS: elisp-common.eclass |
| 118 |
# @MAINTAINER: |
| 119 |
@@ -317,12 +317,12 @@ |
| 120 |
local sf i line null="" page=$'\f' |
| 121 |
local -a sflist |
| 122 |
|
| 123 |
- if [ ! -d "${sitelisp}" ]; then |
| 124 |
+ if [[ ! -d ${sitelisp} ]]; then |
| 125 |
eerror "elisp-site-regen: Directory ${sitelisp} does not exist" |
| 126 |
return 1 |
| 127 |
fi |
| 128 |
|
| 129 |
- if [ ! -d "${T}" ]; then |
| 130 |
+ if [[ ! -d ${T} ]]; then |
| 131 |
eerror "elisp-site-regen: Temporary directory ${T} does not exist" |
| 132 |
return 1 |
| 133 |
fi |
| 134 |
@@ -336,7 +336,7 @@ |
| 135 |
for sf in "${sitelisp}"/[0-9][0-9]*-gentoo.el \ |
| 136 |
"${sitelisp}"/site-gentoo.d/[0-9][0-9]*.el |
| 137 |
do |
| 138 |
- [ -r "${sf}" ] || continue |
| 139 |
+ [[ -r ${sf} ]] || continue |
| 140 |
# sort files by their basename. straight insertion sort. |
| 141 |
for ((i=${#sflist[@]}; i>0; i--)); do |
| 142 |
[[ ${sf##*/} < ${sflist[i-1]##*/} ]] || break |
Archives