| 1 |
ssuominen 09/12/31 21:39:49 |
| 2 |
|
| 3 |
Modified: canna-3.7_p2.ebuild canna-3.7_p3.ebuild |
| 4 |
Log: |
| 5 |
Fix quoting |
| 6 |
(Portage version: 2.2_rc61/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.20 app-i18n/canna/canna-3.7_p2.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/canna/canna-3.7_p2.ebuild?rev=1.20&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/canna/canna-3.7_p2.ebuild?rev=1.20&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/canna/canna-3.7_p2.ebuild?r1=1.19&r2=1.20 |
| 14 |
|
| 15 |
Index: canna-3.7_p2.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7_p2.ebuild,v |
| 18 |
retrieving revision 1.19 |
| 19 |
retrieving revision 1.20 |
| 20 |
diff -u -r1.19 -r1.20 |
| 21 |
--- canna-3.7_p2.ebuild 23 Sep 2009 15:40:30 -0000 1.19 |
| 22 |
+++ canna-3.7_p2.ebuild 31 Dec 2009 21:39:49 -0000 1.20 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2009 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7_p2.ebuild,v 1.19 2009/09/23 15:40:30 patrick Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7_p2.ebuild,v 1.20 2009/12/31 21:39:49 ssuominen Exp $ |
| 28 |
|
| 29 |
inherit cannadic eutils multilib |
| 30 |
|
| 31 |
@@ -25,15 +25,15 @@ |
| 32 |
|
| 33 |
src_unpack() { |
| 34 |
unpack ${A} |
| 35 |
- cd ${S} |
| 36 |
+ cd "${S}" |
| 37 |
find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g' |
| 38 |
sed -e "s%@cannapkgver@%${PF}%" \ |
| 39 |
- ${FILESDIR}/${P/_*/}-gentoo.diff.in > ${T}/${PF}-gentoo.diff |
| 40 |
- epatch ${T}/${PF}-gentoo.diff |
| 41 |
+ "${FILESDIR}"/${P/_*/}-gentoo.diff.in > "${T}/${PF}-gentoo.diff" |
| 42 |
+ epatch "${T}"/${PF}-gentoo.diff |
| 43 |
cd dic/phono |
| 44 |
- epatch ${FILESDIR}/${PN}-kpdef-gentoo.diff |
| 45 |
+ epatch "${FILESDIR}"/${PN}-kpdef-gentoo.diff |
| 46 |
|
| 47 |
- cd ${S} |
| 48 |
+ cd "${S}" |
| 49 |
# Multilib-strict fix for amd64 |
| 50 |
sed -i -e "s:\(DefLibCannaDir.*\)/lib:\1/$(get_libdir):g" Canna.conf* |
| 51 |
# fix deprecated sort syntax |
| 52 |
@@ -65,8 +65,8 @@ |
| 53 |
} |
| 54 |
|
| 55 |
src_install() { |
| 56 |
- make DESTDIR=${D} install || die |
| 57 |
- make DESTDIR=${D} install.man || die |
| 58 |
+ make DESTDIR="${D}" install || die |
| 59 |
+ make DESTDIR="${D}" install.man || die |
| 60 |
|
| 61 |
# install default.canna (removed from Canna36p4) |
| 62 |
insinto /usr/share/canna |
| 63 |
@@ -77,7 +77,7 @@ |
| 64 |
|
| 65 |
dodir /usr/share/man/man8 /usr/share/man/ja/man8 |
| 66 |
for man in cannaserver cannakill ; do |
| 67 |
- for mandir in ${D}/usr/share/man ${D}/usr/share/man/ja ; do |
| 68 |
+ for mandir in "${D}"/usr/share/man "${D}"/usr/share/man/ja ; do |
| 69 |
mv ${mandir}/man1/${man}.1 ${mandir}/man8/${man}.8 |
| 70 |
done |
| 71 |
done |
| 72 |
@@ -89,16 +89,16 @@ |
| 73 |
doins doc/man/guide/tex/canna.{dvi,ps,pdf} |
| 74 |
fi |
| 75 |
|
| 76 |
- newinitd ${FILESDIR}/canna.initd canna || die |
| 77 |
- newconfd ${FILESDIR}/canna.confd canna || die |
| 78 |
- insinto /etc/ ; newins ${FILESDIR}/canna.hosts hosts.canna || die |
| 79 |
+ newinitd "${FILESDIR}"/canna.initd canna || die |
| 80 |
+ newconfd "${FILESDIR}"/canna.confd canna || die |
| 81 |
+ insinto /etc/ ; newins "${FILESDIR}"/canna.hosts hosts.canna || die |
| 82 |
keepdir /var/log/canna/ || die |
| 83 |
|
| 84 |
# for backward compatibility |
| 85 |
- dosbin ${FILESDIR}/update-canna-dics_dir |
| 86 |
+ dosbin "${FILESDIR}"/update-canna-dics_dir |
| 87 |
|
| 88 |
insinto /var/lib/canna/dic/dics.d/ |
| 89 |
- newins ${D}/var/lib/canna/dic/canna/dics.dir 00canna.dics.dir |
| 90 |
+ newins "${D}"/var/lib/canna/dic/canna/dics.dir 00canna.dics.dir |
| 91 |
|
| 92 |
# fix permission for user dictionary |
| 93 |
keepdir /var/lib/canna/dic/{user,group} |
| 94 |
@@ -122,17 +122,17 @@ |
| 95 |
einfo "Stopping Canna for safe unmerge" |
| 96 |
einfo |
| 97 |
/etc/init.d/canna stop |
| 98 |
- touch ${T}/canna.cookie |
| 99 |
+ touch "${T}"/canna.cookie |
| 100 |
fi |
| 101 |
} |
| 102 |
|
| 103 |
pkg_postrm() { |
| 104 |
- if [ -f /usr/sbin/cannaserver -a -e ${T}/canna.cookie ] ; then |
| 105 |
+ if [ -f /usr/sbin/cannaserver -a -e "${T}"/canna.cookie ] ; then |
| 106 |
#update-cannadic-dir |
| 107 |
einfo |
| 108 |
einfo "Restarting Canna" |
| 109 |
einfo |
| 110 |
/etc/init.d/canna start |
| 111 |
- rm -f ${T}/canna.cookie |
| 112 |
+ rm -f "${T}"/canna.cookie |
| 113 |
fi |
| 114 |
} |
| 115 |
|
| 116 |
|
| 117 |
|
| 118 |
1.7 app-i18n/canna/canna-3.7_p3.ebuild |
| 119 |
|
| 120 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/canna/canna-3.7_p3.ebuild?rev=1.7&view=markup |
| 121 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/canna/canna-3.7_p3.ebuild?rev=1.7&content-type=text/plain |
| 122 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/canna/canna-3.7_p3.ebuild?r1=1.6&r2=1.7 |
| 123 |
|
| 124 |
Index: canna-3.7_p3.ebuild |
| 125 |
=================================================================== |
| 126 |
RCS file: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7_p3.ebuild,v |
| 127 |
retrieving revision 1.6 |
| 128 |
retrieving revision 1.7 |
| 129 |
diff -u -r1.6 -r1.7 |
| 130 |
--- canna-3.7_p3.ebuild 23 Sep 2009 15:40:30 -0000 1.6 |
| 131 |
+++ canna-3.7_p3.ebuild 31 Dec 2009 21:39:49 -0000 1.7 |
| 132 |
@@ -1,6 +1,6 @@ |
| 133 |
# Copyright 1999-2009 Gentoo Foundation |
| 134 |
# Distributed under the terms of the GNU General Public License v2 |
| 135 |
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7_p3.ebuild,v 1.6 2009/09/23 15:40:30 patrick Exp $ |
| 136 |
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7_p3.ebuild,v 1.7 2009/12/31 21:39:49 ssuominen Exp $ |
| 137 |
|
| 138 |
inherit cannadic eutils multilib |
| 139 |
|
| 140 |
@@ -25,15 +25,15 @@ |
| 141 |
|
| 142 |
src_unpack() { |
| 143 |
unpack ${A} |
| 144 |
- cd ${S} |
| 145 |
+ cd "${S}" |
| 146 |
find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g' |
| 147 |
sed -e "s%@cannapkgver@%${PF}%" \ |
| 148 |
- ${FILESDIR}/${P/_*/}-gentoo.diff.in > ${T}/${PF}-gentoo.diff |
| 149 |
- epatch ${T}/${PF}-gentoo.diff |
| 150 |
+ "${FILESDIR}"/${P/_*/}-gentoo.diff.in > "${T}/${PF}-gentoo.diff" |
| 151 |
+ epatch "${T}"/${PF}-gentoo.diff |
| 152 |
cd dic/phono |
| 153 |
- epatch ${FILESDIR}/${PN}-kpdef-gentoo.diff |
| 154 |
+ epatch "${FILESDIR}"/${PN}-kpdef-gentoo.diff |
| 155 |
|
| 156 |
- cd ${S} |
| 157 |
+ cd "${S}" |
| 158 |
# Multilib-strict fix for amd64 |
| 159 |
sed -i -e "s:\(DefLibCannaDir.*\)/lib:\1/$(get_libdir):g" Canna.conf* |
| 160 |
# fix deprecated sort syntax |
| 161 |
@@ -66,8 +66,8 @@ |
| 162 |
} |
| 163 |
|
| 164 |
src_install() { |
| 165 |
- make DESTDIR=${D} install || die |
| 166 |
- make DESTDIR=${D} install.man || die |
| 167 |
+ make DESTDIR="${D}" install || die |
| 168 |
+ make DESTDIR="${D}" install.man || die |
| 169 |
|
| 170 |
# install default.canna (removed from Canna36p4) |
| 171 |
insinto /usr/share/canna |
| 172 |
@@ -78,7 +78,7 @@ |
| 173 |
|
| 174 |
dodir /usr/share/man/man8 /usr/share/man/ja/man8 |
| 175 |
for man in cannaserver cannakill ; do |
| 176 |
- for mandir in ${D}/usr/share/man ${D}/usr/share/man/ja ; do |
| 177 |
+ for mandir in "${D}"/usr/share/man "${D}"/usr/share/man/ja ; do |
| 178 |
mv ${mandir}/man1/${man}.1 ${mandir}/man8/${man}.8 |
| 179 |
done |
| 180 |
done |
| 181 |
@@ -90,16 +90,16 @@ |
| 182 |
doins doc/man/guide/tex/canna.{dvi,ps,pdf} |
| 183 |
fi |
| 184 |
|
| 185 |
- newinitd ${FILESDIR}/canna.initd canna || die |
| 186 |
- newconfd ${FILESDIR}/canna.confd canna || die |
| 187 |
- insinto /etc/ ; newins ${FILESDIR}/canna.hosts hosts.canna || die |
| 188 |
+ newinitd "${FILESDIR}"/canna.initd canna || die |
| 189 |
+ newconfd "${FILESDIR}"/canna.confd canna || die |
| 190 |
+ insinto /etc/ ; newins "${FILESDIR}"/canna.hosts hosts.canna || die |
| 191 |
keepdir /var/log/canna/ || die |
| 192 |
|
| 193 |
# for backward compatibility |
| 194 |
- dosbin ${FILESDIR}/update-canna-dics_dir |
| 195 |
+ dosbin "${FILESDIR}"/update-canna-dics_dir |
| 196 |
|
| 197 |
insinto /var/lib/canna/dic/dics.d/ |
| 198 |
- newins ${D}/var/lib/canna/dic/canna/dics.dir 00canna.dics.dir |
| 199 |
+ newins "${D}"/var/lib/canna/dic/canna/dics.dir 00canna.dics.dir |
| 200 |
|
| 201 |
# fix permission for user dictionary |
| 202 |
keepdir /var/lib/canna/dic/{user,group} |
| 203 |
@@ -123,17 +123,17 @@ |
| 204 |
einfo "Stopping Canna for safe unmerge" |
| 205 |
einfo |
| 206 |
/etc/init.d/canna stop |
| 207 |
- touch ${T}/canna.cookie |
| 208 |
+ touch "${T}"/canna.cookie |
| 209 |
fi |
| 210 |
} |
| 211 |
|
| 212 |
pkg_postrm() { |
| 213 |
- if [ -f /usr/sbin/cannaserver -a -e ${T}/canna.cookie ] ; then |
| 214 |
+ if [ -f /usr/sbin/cannaserver -a -e "${T}"/canna.cookie ] ; then |
| 215 |
#update-cannadic-dir |
| 216 |
einfo |
| 217 |
einfo "Restarting Canna" |
| 218 |
einfo |
| 219 |
/etc/init.d/canna start |
| 220 |
- rm -f ${T}/canna.cookie |
| 221 |
+ rm -f "${T}"/canna.cookie |
| 222 |
fi |
| 223 |
} |
Archives