1 |
spock 07/09/24 19:43:48 |
2 |
|
3 |
Modified: ChangeLog splashutils-1.5.2.1.ebuild |
4 |
Log: |
5 |
Add missing quotes around variables that can contain spaces. |
6 |
(Portage version: 2.1.3.9) |
7 |
|
8 |
Revision Changes Path |
9 |
1.113 media-gfx/splashutils/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/splashutils/ChangeLog?rev=1.113&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/splashutils/ChangeLog?rev=1.113&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/splashutils/ChangeLog?r1=1.112&r2=1.113 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v |
18 |
retrieving revision 1.112 |
19 |
retrieving revision 1.113 |
20 |
diff -u -r1.112 -r1.113 |
21 |
--- ChangeLog 23 Sep 2007 11:50:57 -0000 1.112 |
22 |
+++ ChangeLog 24 Sep 2007 19:43:46 -0000 1.113 |
23 |
@@ -1,6 +1,10 @@ |
24 |
# ChangeLog for media-gfx/splashutils |
25 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.112 2007/09/23 11:50:57 spock Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.113 2007/09/24 19:43:46 spock Exp $ |
28 |
+ |
29 |
+ 24 Sep 2007; Michał Januszewski <spock@g.o> |
30 |
+ splashutils-1.5.2.1.ebuild: |
31 |
+ Add missing quotes around variables that can contain spaces. |
32 |
|
33 |
23 Sep 2007; Michał Januszewski <spock@g.o> |
34 |
-splashutils-1.4.3.ebuild, -splashutils-1.5.1.ebuild, |
35 |
|
36 |
|
37 |
|
38 |
1.2 media-gfx/splashutils/splashutils-1.5.2.1.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/splashutils/splashutils-1.5.2.1.ebuild?rev=1.2&view=markup |
41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/splashutils/splashutils-1.5.2.1.ebuild?rev=1.2&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/splashutils/splashutils-1.5.2.1.ebuild?r1=1.1&r2=1.2 |
43 |
|
44 |
Index: splashutils-1.5.2.1.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.2.1.ebuild,v |
47 |
retrieving revision 1.1 |
48 |
retrieving revision 1.2 |
49 |
diff -u -r1.1 -r1.2 |
50 |
--- splashutils-1.5.2.1.ebuild 23 Sep 2007 11:48:45 -0000 1.1 |
51 |
+++ splashutils-1.5.2.1.ebuild 24 Sep 2007 19:43:46 -0000 1.2 |
52 |
@@ -1,6 +1,6 @@ |
53 |
# Copyright 1999-2007 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.2.1.ebuild,v 1.1 2007/09/23 11:48:45 spock Exp $ |
56 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.2.1.ebuild,v 1.2 2007/09/24 19:43:46 spock Exp $ |
57 |
|
58 |
inherit eutils multilib toolchain-funcs |
59 |
|
60 |
@@ -57,16 +57,16 @@ |
61 |
src_unpack() { |
62 |
unpack ${A} |
63 |
|
64 |
- [ ! -d ${S}/libs ] && mkdir ${S}/libs |
65 |
- [ ! -d ${S}/objs ] && mkdir ${S}/objs |
66 |
- mv ${WORKDIR}/{libpng-${V_PNG},jpeg-${V_JPEG},zlib-${V_ZLIB},freetype-${V_FT}} ${S}/libs |
67 |
+ [ ! -d "${S}/libs" ] && mkdir "${S}/libs" |
68 |
+ [ ! -d "${S}/objs" ] && mkdir "${S}/objs" |
69 |
+ mv "${WORKDIR}"/{libpng-${V_PNG},jpeg-${V_JPEG},zlib-${V_ZLIB},freetype-${V_FT}} "${S}/libs" |
70 |
# We need to delete the Makefile and let it be rebuilt when splashutils |
71 |
# is being configured. Either that, or we end up with a segfaulting kernel |
72 |
# helper. |
73 |
- rm ${S}/libs/zlib-${V_ZLIB}/Makefile |
74 |
+ rm "${S}/libs/zlib-${V_ZLIB}/Makefile" |
75 |
|
76 |
- cd ${S} |
77 |
- ln -sf ${S} ${WORKDIR}/core |
78 |
+ cd "${S}" |
79 |
+ ln -sf "${S}" "${WORKDIR}/core" |
80 |
|
81 |
# Check whether the kernel tree has been patched with fbcondecor. |
82 |
if [[ ! -e /usr/$(get_libdir)/klibc/include/linux/console_splash.h && \ |
83 |
@@ -88,14 +88,14 @@ |
84 |
ewarn "splashutils, you're on your own, as this configuration is not supported." |
85 |
else |
86 |
# This should make splashutils compile on systems with hardened GCC. |
87 |
- sed -e 's@K_CFLAGS =@K_CFLAGS = -fno-stack-protector@' -i ${S}/Makefile |
88 |
+ sed -e 's@K_CFLAGS =@K_CFLAGS = -fno-stack-protector@' -i "${S}/Makefile" |
89 |
fi |
90 |
|
91 |
if ! use truetype ; then |
92 |
- sed -i -e 's/fbtruetype kbd/kbd/' ${SM}/Makefile |
93 |
+ sed -i -e 's/fbtruetype kbd/kbd/' "${SM}/Makefile" |
94 |
fi |
95 |
|
96 |
- sed -i -e "s#/lib/splash#/$(get_libdir)/splash#" ${S}/scripts/{splash_manager,splash_geninitramfs} |
97 |
+ sed -i -e "s#/lib/splash#/$(get_libdir)/splash#" "${S}"/scripts/{splash_manager,splash_geninitramfs} |
98 |
} |
99 |
|
100 |
src_compile() { |
101 |
@@ -107,10 +107,10 @@ |
102 |
myconf="--with-fbcondecor" |
103 |
fi |
104 |
|
105 |
- cd ${SM} |
106 |
+ cd "${SM}" |
107 |
emake LIB=$(get_libdir) STRIP=true || die "failed to build miscsplashutils" |
108 |
|
109 |
- cd ${S} |
110 |
+ cd "${S}" |
111 |
./configure \ |
112 |
--with-libdir="/$(get_libdir)" \ |
113 |
$(use_with png) \ |
114 |
@@ -124,7 +124,7 @@ |
115 |
emake -j1 || die "failed to build splashutils" |
116 |
|
117 |
if has_version ">=sys-apps/baselayout-1.13.99"; then |
118 |
- cd ${SG} |
119 |
+ cd "${SG}" |
120 |
emake LIB=$(get_libdir) || die "failed to build the splash plugin" |
121 |
fi |
122 |
} |
123 |
@@ -132,39 +132,39 @@ |
124 |
src_install() { |
125 |
local LIB=$(get_libdir) |
126 |
|
127 |
- cd ${SM} |
128 |
- make DESTDIR=${D} LIB=${LIB} install || die |
129 |
+ cd "${SM}" |
130 |
+ make DESTDIR="${D}" LIB=${LIB} install || die |
131 |
|
132 |
export ZLIBSRC LPNGSRC JPEGSRC FT2SRC |
133 |
- cd ${S} |
134 |
- make DESTDIR=${D} LIB=${LIB} install || die |
135 |
+ cd "${S}" |
136 |
+ make DESTDIR="${D}" LIB=${LIB} install || die |
137 |
|
138 |
- mv ${D}/usr/${LIB}/libfbsplash.so* ${D}/${LIB}/ |
139 |
+ mv "${D}"/usr/${LIB}/libfbsplash.so* "${D}"/${LIB}/ |
140 |
gen_usr_ldscript libfbsplash.so |
141 |
|
142 |
echo 'CONFIG_PROTECT_MASK="/etc/splash"' > 99splash |
143 |
doenvd 99splash |
144 |
|
145 |
- newinitd ${SG}/init-fbcondecor fbcondecor |
146 |
- newconfd ${SG}/splash.conf splash |
147 |
- newconfd ${SG}/fbcondecor.conf fbcondecor |
148 |
+ newinitd "${SG}"/init-fbcondecor fbcondecor |
149 |
+ newconfd "${SG}"/splash.conf splash |
150 |
+ newconfd "${SG}"/fbcondecor.conf fbcondecor |
151 |
|
152 |
insinto /usr/share/${PN} |
153 |
- doins ${SG}/initrd.splash |
154 |
+ doins "${SG}"/initrd.splash |
155 |
|
156 |
insinto /etc/splash |
157 |
- doins ${SM}/fbtruetype/luxisri.ttf |
158 |
+ doins "${SM}"/fbtruetype/luxisri.ttf |
159 |
|
160 |
dodoc docs/* README AUTHORS |
161 |
|
162 |
if has_version ">=sys-apps/baselayout-1.13.99"; then |
163 |
- cd ${SG} |
164 |
- make DESTDIR=${D} LIB=${LIB} install || die "failed to install the splash plugin" |
165 |
+ cd "${SG}" |
166 |
+ make DESTDIR="${D}" LIB=${LIB} install || die "failed to install the splash plugin" |
167 |
else |
168 |
- cp ${SG}/splash-functions-bl1.sh ${D}/sbin/splash-functions.sh |
169 |
+ cp "${SG}"/splash-functions-bl1.sh "${D}"/sbin/splash-functions.sh |
170 |
fi |
171 |
|
172 |
- sed -i -e "s#/lib/splash#/${LIB}/splash#" ${D}/sbin/splash-functions.sh |
173 |
+ sed -i -e "s#/lib/splash#/${LIB}/splash#" "${D}"/sbin/splash-functions.sh |
174 |
keepdir /${LIB}/splash/{tmp,cache,bin} |
175 |
dosym /${LIB}/splash/bin/fbres /sbin/fbres |
176 |
} |
177 |
|
178 |
|
179 |
|
180 |
-- |
181 |
gentoo-commits@g.o mailing list |