Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Donnie Berkholz (dberkholz)" <dberkholz@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-base/kdrive: kdrive-4.3.0-r5.ebuild ChangeLog
Date: Tue, 09 Oct 2007 07:50:28
Message-Id: E1If9hw-0006k9-AR@stork.gentoo.org
1 dberkholz 07/10/09 07:40:48
2
3 Modified: kdrive-4.3.0-r5.ebuild ChangeLog
4 Log:
5 Fix quoting issues caught by latest repoman.
6 (Portage version: 2.1.3.12)
7
8 Revision Changes Path
9 1.22 x11-base/kdrive/kdrive-4.3.0-r5.ebuild
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/kdrive/kdrive-4.3.0-r5.ebuild?rev=1.22&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/kdrive/kdrive-4.3.0-r5.ebuild?rev=1.22&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/kdrive/kdrive-4.3.0-r5.ebuild?r1=1.21&r2=1.22
14
15 Index: kdrive-4.3.0-r5.ebuild
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/x11-base/kdrive/kdrive-4.3.0-r5.ebuild,v
18 retrieving revision 1.21
19 retrieving revision 1.22
20 diff -u -r1.21 -r1.22
21 --- kdrive-4.3.0-r5.ebuild 22 Jul 2007 02:23:43 -0000 1.21
22 +++ kdrive-4.3.0-r5.ebuild 9 Oct 2007 07:40:47 -0000 1.22
23 @@ -1,6 +1,6 @@
24 # Copyright 1999-2007 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26 -# $Header: /var/cvsroot/gentoo-x86/x11-base/kdrive/kdrive-4.3.0-r5.ebuild,v 1.21 2007/07/22 02:23:43 dberkholz Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/x11-base/kdrive/kdrive-4.3.0-r5.ebuild,v 1.22 2007/10/09 07:40:47 dberkholz Exp $
28
29 # If you don't want to build the Xvesa server, do this.
30 # VESA="no" emerge kdrive
31 @@ -78,7 +78,7 @@
32
33 # See linux.cf for MMX, 3DNOW and SSE autodetection. (spyderous)
34
35 - cd ${S}
36 + cd "${S}"
37 touch config/cf/host.def
38 echo "#define XVendorString \"Gentoo Linux (KDrive ${PV}, revision ${PR})\"
39 #define KDriveXServer YES
40 @@ -104,7 +104,7 @@
41 echo "#define ProjectRoot /usr/X11R6" >> config/cf/host.def
42 # If the libs exist locally we do not need to build against
43 # kdrives personal libraries, dont patch to do this.
44 - mv ${PATCH_DIR}/0020* ${PATCH_DIR}/excluded
45 + mv "${PATCH_DIR}"/0020* "${PATCH_DIR}"/excluded
46 else
47 echo "#define BuildScreenSaverExt YES" >> config/cf/host.def
48 echo "#define BuildScreenSaverLibrary YES" >> config/cf/host.def
49 @@ -195,8 +195,8 @@
50 eend 0
51
52 # Bulk patching from all over
53 - cd ${WORKDIR}
54 - EPATCH_SUFFIX="patch" epatch ${PATCH_DIR}
55 + cd "${WORKDIR}"
56 + EPATCH_SUFFIX="patch" epatch "${PATCH_DIR}"
57
58 # We need to modify xmakefile after it has been created
59 if [ ! "`best_version x11-base/xorg-server`" ] ; then
60 @@ -206,25 +206,25 @@
61 MY_LIBROOT="${S}/lib"
62 MY_HERE="./"
63
64 - mkdir -p ${MY_PROJROOT}
65 - cd ${MY_INCROOT}
66 + mkdir -p "${MY_PROJROOT}"
67 + cd "${MY_INCROOT}"
68 for i in `ls ${MY_HERE}` ; do
69 - ln -sf ${MY_INCROOT}/${i} ${MY_PROJROOT}
70 + ln -sf "${MY_INCROOT}"/${i} "${MY_PROJROOT}"
71 done
72
73 - cd ${MY_LIBROOT}
74 + cd "${MY_LIBROOT}"
75 for i in `ls ${MY_HERE}` ; do
76 - ln -sf ${MY_LIBROOT}/${i} ${MY_PROJROOT}
77 + ln -sf "${MY_LIBROOT}"/${i} "${MY_PROJROOT}"
78 done
79
80 - cd ${MY_PROJROOT} && rm -f Imakefile Makefile
81 - ln -sf ${MY_PROJROOT}/extensions ${MY_PROJROOT}/X11/extensions
82 - ln -sf ${S}/lib ${S}/usr/X11R6/lib
83 + cd "${MY_PROJROOT}" && rm -f Imakefile Makefile
84 + ln -sf "${MY_PROJROOT}"/extensions "${MY_PROJROOT}"/X11/extensions
85 + ln -sf "${S}"/lib "${S}"/usr/X11R6/lib
86 eend 0
87 fi
88
89 # Fixing bugs #68531 and #65758 -- this will disable toshiba dpms support
90 - sed '/#ifndef TOSHIBA_SMM/,/#endif/d' -i ${S}/programs/Xserver/hw/kdrive/vesa/vesa.c
91 + sed '/#ifndef TOSHIBA_SMM/,/#endif/d' -i "${S}"/programs/Xserver/hw/kdrive/vesa/vesa.c
92 }
93
94 src_compile() {
95 @@ -243,20 +243,20 @@
96 # for a whole pile of nothing. As such we are just going to copy
97 # across the three needed man pages.
98 einfo "Making and installing man pages..."
99 - mkdir -p ${MANDIR}
100 + mkdir -p "${MANDIR}"
101 MY_MAN_BASE="${S}/programs/Xserver/hw/kdrive"
102
103 if ! use fbdev ; then
104 # We need to regenerate some makefiles for fbdev
105 echo "#define XfbdevServer YES" >> config/cf/host.def
106 - cd ${S}/programs && make Makefiles > /dev/null || die "Xfbdev Makefile regeneration error..."
107 + cd "${S}"/programs && make Makefiles > /dev/null || die "Xfbdev Makefile regeneration error..."
108 fi
109
110 # We have a complete set of makefiles so lets just build what we need
111 - cd ${MY_MAN_BASE}
112 - emake DESTDIR=${MANDIR} install.man || die "Kdrive man page install..."
113 - emake DESTDIR=${MANDIR} -C vesa install.man || die "Xvesa man page install..."
114 - emake DESTDIR=${MANDIR} -C fbdev install.man || die "Xfbdev man page install..."
115 + cd "${MY_MAN_BASE}"
116 + emake DESTDIR="${MANDIR}" install.man || die "Kdrive man page install..."
117 + emake DESTDIR="${MANDIR}" -C vesa install.man || die "Xvesa man page install..."
118 + emake DESTDIR="${MANDIR}" -C fbdev install.man || die "Xfbdev man page install..."
119
120 }
121
122 @@ -286,13 +286,13 @@
123 done
124
125 # Install our startx script
126 - doexe ${PATCH_DIR}/startxkd
127 + doexe "${PATCH_DIR}"/startxkd
128
129 # Install man pages
130 if [ "`best_version x11-base/xorg-server`" ] ; then
131 - doman ${MANDIR}/usr/X11R6/man/man1/X{kdrive,vesa,fbdev}.1x
132 + doman "${MANDIR}"/usr/X11R6/man/man1/X{kdrive,vesa,fbdev}.1x
133 else
134 - doman ${MANDIR}/${S}/usr/X11R6/man/man1/X{kdrive,vesa,fbdev}.1x
135 + doman "${MANDIR}"/"${S}"/usr/X11R6/man/man1/X{kdrive,vesa,fbdev}.1x
136 fi
137 }
138
139
140
141
142 1.44 x11-base/kdrive/ChangeLog
143
144 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/kdrive/ChangeLog?rev=1.44&view=markup
145 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/kdrive/ChangeLog?rev=1.44&content-type=text/plain
146 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/kdrive/ChangeLog?r1=1.43&r2=1.44
147
148 Index: ChangeLog
149 ===================================================================
150 RCS file: /var/cvsroot/gentoo-x86/x11-base/kdrive/ChangeLog,v
151 retrieving revision 1.43
152 retrieving revision 1.44
153 diff -u -r1.43 -r1.44
154 --- ChangeLog 22 Jul 2007 02:23:43 -0000 1.43
155 +++ ChangeLog 9 Oct 2007 07:40:47 -0000 1.44
156 @@ -1,6 +1,10 @@
157 # ChangeLog for x11-base/kdrive
158 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
159 -# $Header: /var/cvsroot/gentoo-x86/x11-base/kdrive/ChangeLog,v 1.43 2007/07/22 02:23:43 dberkholz Exp $
160 +# $Header: /var/cvsroot/gentoo-x86/x11-base/kdrive/ChangeLog,v 1.44 2007/10/09 07:40:47 dberkholz Exp $
161 +
162 + 09 Oct 2007; Donnie Berkholz <dberkholz@g.o>;
163 + kdrive-4.3.0-r5.ebuild:
164 + Fix quoting issues caught by latest repoman.
165
166 22 Jul 2007; Donnie Berkholz <dberkholz@g.o>;
167 kdrive-4.3.0-r5.ebuild:
168
169
170
171 --
172 gentoo-commits@g.o mailing list
Report Message
Find on MARC Find on Google Groups