/[gentoo-x86]/eclass/xorg-2.eclass
Gentoo

Diff of /eclass/xorg-2.eclass

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

Revision 1.1 Revision 1.23
1# Copyright 1999-2010 Gentoo Foundation 1# Copyright 1999-2010 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/xorg-2.eclass,v 1.1 2010/03/14 10:27:07 scarabeus Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.23 2011/02/15 12:13:58 scarabeus Exp $
4# 4#
5# @ECLASS: xorg-2.eclass 5# @ECLASS: xorg-2.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# x11@gentoo.org 7# x11@gentoo.org
8
9# Author: Tomáš Chvátal <scarabeus@gentoo.org>
10# Author: Donnie Berkholz <dberkholz@gentoo.org>
11# @BLURB: Reduces code duplication in the modularized X11 ebuilds. 8# @BLURB: Reduces code duplication in the modularized X11 ebuilds.
12# @DESCRIPTION: 9# @DESCRIPTION:
13# This eclass makes trivial X ebuilds possible for apps, fonts, drivers, 10# This eclass makes trivial X ebuilds possible for apps, fonts, drivers,
14# and more. Many things that would normally be done in various functions 11# and more. Many things that would normally be done in various functions
15# can be accessed by setting variables instead, such as patching, 12# can be accessed by setting variables instead, such as patching,
… …
18# All you need to do in a basic ebuild is inherit this eclass and set 15# All you need to do in a basic ebuild is inherit this eclass and set
19# DESCRIPTION, KEYWORDS and RDEPEND/DEPEND. If your package is hosted 16# DESCRIPTION, KEYWORDS and RDEPEND/DEPEND. If your package is hosted
20# with the other X packages, you don't need to set SRC_URI. Pretty much 17# with the other X packages, you don't need to set SRC_URI. Pretty much
21# everything else should be automatic. 18# everything else should be automatic.
22 19
20# Author: Tomáš Chvátal <scarabeus@gentoo.org>
21# Author: Donnie Berkholz <dberkholz@gentoo.org>
22
23GIT_ECLASS="" 23GIT_ECLASS=""
24if [[ ${PV} == *9999* ]]; then 24if [[ ${PV} == *9999* ]]; then
25 GIT_ECLASS="git" 25 GIT_ECLASS="git"
26 XORG_EAUTORECONF="yes" 26 XORG_EAUTORECONF="yes"
27 SRC_URI="" 27 SRC_URI=""
… …
41inherit eutils base libtool multilib toolchain-funcs flag-o-matic autotools \ 41inherit eutils base libtool multilib toolchain-funcs flag-o-matic autotools \
42 ${FONT_ECLASS} ${GIT_ECLASS} 42 ${FONT_ECLASS} ${GIT_ECLASS}
43 43
44EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm" 44EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm"
45case "${EAPI:-0}" in 45case "${EAPI:-0}" in
46 3) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;; 46 3|4) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;;
47 *) DEPEND="EAPI-UNSUPPORTED" ;; 47 *) die "EAPI-UNSUPPORTED" ;;
48esac 48esac
49 49
50# exports must be ALWAYS after inherit 50# exports must be ALWAYS after inherit
51EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS} 51EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
52 52
… …
65# @DESCRIPTION: 65# @DESCRIPTION:
66# The subdirectory to download source from. Possible settings are app, 66# The subdirectory to download source from. Possible settings are app,
67# doc, data, util, driver, font, lib, proto, xserver. Set above the 67# doc, data, util, driver, font, lib, proto, xserver. Set above the
68# inherit to override the default autoconfigured module. 68# inherit to override the default autoconfigured module.
69if [[ -z ${MODULE} ]]; then 69if [[ -z ${MODULE} ]]; then
70 MODULE=""
71 case ${CATEGORY} in 70 case ${CATEGORY} in
72 app-doc) MODULE="doc" ;; 71 app-doc) MODULE="doc" ;;
73 media-fonts) MODULE="font" ;; 72 media-fonts) MODULE="font" ;;
74 x11-apps|x11-wm) MODULE="app" ;; 73 x11-apps|x11-wm) MODULE="app" ;;
75 x11-misc|x11-themes) MODULE="util" ;; 74 x11-misc|x11-themes) MODULE="util" ;;
76 x11-drivers) MODULE="driver" ;; 75 x11-drivers) MODULE="driver" ;;
77 x11-base) MODULE="xserver" ;; 76 x11-base) MODULE="xserver" ;;
78 x11-proto) MODULE="proto" ;; 77 x11-proto) MODULE="proto" ;;
79 x11-libs) MODULE="lib" ;; 78 x11-libs) MODULE="lib" ;;
79 *) MODULE="" ;;
80 esac 80 esac
81fi 81fi
82 82
83# @ECLASS-VARIABLE: PACKAGE_NAME
84# @DESCRIPTION:
85# For git checkout the git repository migth differ from package name.
86# This variable can be used for proper directory specification
87: ${PACKAGE_NAME:=${PN}}
88
83if [[ -n ${GIT_ECLASS} ]]; then 89if [[ -n ${GIT_ECLASS} ]]; then
84 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PN}" 90 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PACKAGE_NAME}"
85else 91else
86 SRC_URI+=" ${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2" 92 SRC_URI+=" ${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2"
87fi 93fi
88 94
89: ${SLOT:=0} 95: ${SLOT:=0}
90 96
91# Set the license for the package. This can be overridden by setting 97# Set the license for the package. This can be overridden by setting
92# LICENSE after the inherit. Nearly all FreeDesktop-hosted X packages 98# LICENSE after the inherit. Nearly all FreeDesktop-hosted X packages
93# are under the MIT license. (This is what Red Hat does in their rpms) 99# are under the MIT license. (This is what Red Hat does in their rpms)
94: ${LICENSE=MIT} 100: ${LICENSE:=MIT}
95 101
96# Set up shared dependencies 102# Set up autotools shared dependencies
97if [[ ${XORG_EAUTORECONF} != no ]]; then 103# Remember that all versions here MUST be stable
98 DEPEND+=" 104XORG_EAUTORECONF_ARCHES="x86-interix ppc-aix x86-winnt"
105EAUTORECONF_DEPEND+="
99 >=sys-devel/libtool-2.2.6a 106 >=sys-devel/libtool-2.2.6a
100 sys-devel/m4" 107 sys-devel/m4"
101 # This MUST BE STABLE
102 if [[ ${PN} != util-macros ]] ; then 108if [[ ${PN} != util-macros ]] ; then
103 DEPEND+=" >=x11-misc/util-macros-1.5.0" 109 EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.11.0"
104 # Required even by xorg-server 110 # Required even by xorg-server
105 [[ ${PN} == "font-util" ]] || DEPEND+=" >=media-fonts/font-util-1.1.1-r1" 111 [[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.1.1-r1"
106 fi 112fi
107 WANT_AUTOCONF="latest" 113WANT_AUTOCONF="latest"
108 WANT_AUTOMAKE="latest" 114WANT_AUTOMAKE="latest"
109fi 115for arch in ${XORG_EAUTORECONF_ARCHES}; do
116 EAUTORECONF_DEPENDS+=" ${arch}? ( ${EAUTORECONF_DEPEND} )"
117done
118DEPEND+=" ${EAUTORECONF_DEPENDS}"
119[[ ${XORG_EAUTORECONF} != no ]] && DEPEND+=" ${EAUTORECONF_DEPEND}"
120unset EAUTORECONF_DEPENDS
121unset EAUTORECONF_DEPEND
110 122
111if [[ ${FONT} == yes ]]; then 123if [[ ${FONT} == yes ]]; then
112 RDEPEND+=" media-fonts/encodings 124 RDEPEND+=" media-fonts/encodings
113 x11-apps/mkfontscale 125 x11-apps/mkfontscale
114 x11-apps/mkfontdir" 126 x11-apps/mkfontdir"
115 PDEPEND+=" media-fonts/font-alias" 127 PDEPEND+=" media-fonts/font-alias"
128 DEPEND+=" >=media-fonts/font-util-1.1.1-r1"
116 129
117 # @ECLASS-VARIABLE: FONT_DIR 130 # @ECLASS-VARIABLE: FONT_DIR
118 # @DESCRIPTION: 131 # @DESCRIPTION:
119 # If you're creating a font package and the suffix of PN is not equal to 132 # If you're creating a font package and the suffix of PN is not equal to
120 # the subdirectory of /usr/share/fonts/ it should install into, set 133 # the subdirectory of /usr/share/fonts/ it should install into, set
… …
135fi 148fi
136 149
137# If we're a driver package, then enable DRIVER case 150# If we're a driver package, then enable DRIVER case
138[[ ${PN} == xf86-video-* || ${PN} == xf86-input-* ]] && DRIVER="yes" 151[[ ${PN} == xf86-video-* || ${PN} == xf86-input-* ]] && DRIVER="yes"
139 152
153# @ECLASS-VARIABLE: XORG_STATIC
154# @DESCRIPTION:
155# Enables static-libs useflag. Set to no, if your package gets:
156#
157# QA: configure: WARNING: unrecognized options: --disable-static
158: ${XORG_STATIC:="yes"}
159
140# Add static-libs useflag where usefull. 160# Add static-libs useflag where usefull.
161if [[ ${XORG_STATIC} == yes \
141if [[ ${FONT} != yes \ 162 && ${FONT} != yes \
142 && ${CATEGORY} != app-doc \ 163 && ${CATEGORY} != app-doc \
164 && ${CATEGORY} != x11-apps \
143 && ${CATEGORY} != x11-proto \ 165 && ${CATEGORY} != x11-proto \
144 && ${CATEGORY} != x11-drivers \ 166 && ${CATEGORY} != x11-drivers \
145 && ${CATEGORY} != media-fonts \ 167 && ${CATEGORY} != media-fonts \
146 && ${PN} != util-macros \ 168 && ${PN} != util-macros \
147 && ${PN} != xbitmaps \ 169 && ${PN} != xbitmaps \
… …
155# Check deps on xorg-server 177# Check deps on xorg-server
156has dri ${IUSE//+} && DEPEND+=" dri? ( >=x11-base/xorg-server-1.6.3.901-r2[-minimal] )" 178has dri ${IUSE//+} && DEPEND+=" dri? ( >=x11-base/xorg-server-1.6.3.901-r2[-minimal] )"
157[[ -n "${DRIVER}" ]] && DEPEND+=" x11-base/xorg-server[xorg]" 179[[ -n "${DRIVER}" ]] && DEPEND+=" x11-base/xorg-server[xorg]"
158 180
159# @FUNCTION: xorg-2_pkg_setup 181# @FUNCTION: xorg-2_pkg_setup
160# @USAGE:
161# @DESCRIPTION: 182# @DESCRIPTION:
162# Setup prefix compat 183# Setup prefix compat
163xorg-2_pkg_setup() { 184xorg-2_pkg_setup() {
185 debug-print-function ${FUNCNAME} "$@"
186
164 [[ ${FONT} == yes ]] && font_pkg_setup 187 [[ ${FONT} == yes ]] && font_pkg_setup "$@"
165} 188}
166 189
167# @FUNCTION: xorg-2_src_unpack 190# @FUNCTION: xorg-2_src_unpack
168# @USAGE:
169# @DESCRIPTION: 191# @DESCRIPTION:
170# Simply unpack source code. 192# Simply unpack source code.
171xorg-2_src_unpack() { 193xorg-2_src_unpack() {
194 debug-print-function ${FUNCNAME} "$@"
195
172 if [[ -n ${GIT_ECLASS} ]]; then 196 if [[ -n ${GIT_ECLASS} ]]; then
173 git_src_unpack 197 git_src_unpack
174 else 198 else
175 unpack ${A} 199 unpack ${A}
176 fi 200 fi
177 201
178 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}" 202 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}"
179} 203}
180 204
181# @FUNCTION: xorg-2_patch_source 205# @FUNCTION: xorg-2_patch_source
182# @USAGE:
183# @DESCRIPTION: 206# @DESCRIPTION:
184# Apply all patches 207# Apply all patches
185xorg-2_patch_source() { 208xorg-2_patch_source() {
209 debug-print-function ${FUNCNAME} "$@"
210
186 # Use standardized names and locations with bulk patching 211 # Use standardized names and locations with bulk patching
187 # Patch directory is ${WORKDIR}/patch 212 # Patch directory is ${WORKDIR}/patch
188 # See epatch() in eutils.eclass for more documentation 213 # See epatch() in eutils.eclass for more documentation
189 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch} 214 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch}
190 215
191 [[ -d "${EPATCH_SOURCE}" ]] && epatch 216 [[ -d "${EPATCH_SOURCE}" ]] && epatch
192 base_src_prepare 217 base_src_prepare "$@"
193 epatch_user
194} 218}
195 219
196# @FUNCTION: xorg-2_reconf_source 220# @FUNCTION: xorg-2_reconf_source
197# @USAGE:
198# @DESCRIPTION: 221# @DESCRIPTION:
199# Run eautoreconf if necessary, and run elibtoolize. 222# Run eautoreconf if necessary, and run elibtoolize.
200xorg-2_reconf_source() { 223xorg-2_reconf_source() {
224 debug-print-function ${FUNCNAME} "$@"
225
201 case ${CHOST} in 226 case ${CHOST} in
202 *-interix* | *-aix* | *-winnt*) 227 *-interix* | *-aix* | *-winnt*)
203 # some hosts need full eautoreconf 228 # some hosts need full eautoreconf
204 [[ -e "./configure.ac" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail." 229 [[ -e "./configure.ac" || -e "./configure.in" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail."
205 ;; 230 ;;
206 *) 231 *)
207 # elibtoolize required for BSD 232 # elibtoolize required for BSD
208 [[ ${XORG_EAUTORECONF} != no && -e "./configure.ac" ]] && eautoreconf || elibtoolize 233 [[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" || -e "./configure.in" ) ]] && eautoreconf || elibtoolize
209 ;; 234 ;;
210 esac 235 esac
211} 236}
212 237
213# @FUNCTION: xorg-2_src_prepare 238# @FUNCTION: xorg-2_src_prepare
214# @USAGE:
215# @DESCRIPTION: 239# @DESCRIPTION:
216# Prepare a package after unpacking, performing all X-related tasks. 240# Prepare a package after unpacking, performing all X-related tasks.
217xorg-2_src_prepare() { 241xorg-2_src_prepare() {
242 debug-print-function ${FUNCNAME} "$@"
243
218 [[ -n ${GIT_ECLASS} ]] && git_src_prepare 244 [[ -n ${GIT_ECLASS} ]] && git_src_prepare
219 xorg-2_patch_source 245 xorg-2_patch_source
220 xorg-2_reconf_source 246 xorg-2_reconf_source
221} 247}
222 248
223# @FUNCTION: xorg-2_font_configure 249# @FUNCTION: xorg-2_font_configure
224# @USAGE:
225# @DESCRIPTION: 250# @DESCRIPTION:
226# If a font package, perform any necessary configuration steps 251# If a font package, perform any necessary configuration steps
227xorg-2_font_configure() { 252xorg-2_font_configure() {
253 debug-print-function ${FUNCNAME} "$@"
254
228 if has nls ${IUSE//+} && ! use nls; then 255 if has nls ${IUSE//+} && ! use nls; then
229 FONT_OPTIONS+=" 256 FONT_OPTIONS+="
230 --disable-iso8859-2 257 --disable-iso8859-2
231 --disable-iso8859-3 258 --disable-iso8859-3
232 --disable-iso8859-4 259 --disable-iso8859-4
… …
245 --disable-jisx0201 272 --disable-jisx0201
246 --disable-koi8-r" 273 --disable-koi8-r"
247 fi 274 fi
248} 275}
249 276
250# @FUNCTION: x-modular_flags_setup 277# @FUNCTION: xorg-2_flags_setup
251# @USAGE:
252# @DESCRIPTION: 278# @DESCRIPTION:
253# Set up CFLAGS for a debug build 279# Set up CFLAGS for a debug build
254xorg-2_flags_setup() { 280xorg-2_flags_setup() {
281 debug-print-function ${FUNCNAME} "$@"
282
255 # Win32 require special define 283 # Win32 require special define
256 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__ 284 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__
257 # hardened ldflags 285 # hardened ldflags
258 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy 286 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy
287
288 # Quite few libraries fail on runtime without these:
289 if has static-libs ${IUSE//+}; then
290 filter-flags -Wl,-Bdirect
291 filter-ldflags -Bdirect
292 filter-ldflags -Wl,-Bdirect
293 fi
259} 294}
260 295
261# @FUNCTION: xorg-2_src_configure 296# @FUNCTION: xorg-2_src_configure
262# @USAGE:
263# @DESCRIPTION: 297# @DESCRIPTION:
264# Perform any necessary pre-configuration steps, then run configure 298# Perform any necessary pre-configuration steps, then run configure
265xorg-2_src_configure() { 299xorg-2_src_configure() {
300 debug-print-function ${FUNCNAME} "$@"
266 local myopts="" 301 local myopts=""
267 302
268 xorg-2_flags_setup 303 xorg-2_flags_setup
269 [[ -n "${FONT}" ]] && xorg-2_font_configure 304 [[ -n "${FONT}" ]] && xorg-2_font_configure
270 305
271# @VARIABLE: CONFIGURE_OPTIONS 306 # @VARIABLE: CONFIGURE_OPTIONS
272# @DESCRIPTION: 307 # @DESCRIPTION:
273# Any options to pass to configure 308 # Any options to pass to configure
309 # @DEFAULT_UNSET
274 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""} 310 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""}
275 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then 311 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
276 if has static-libs ${IUSE//+}; then 312 if has static-libs ${IUSE//+}; then
277 myopts+=" $(use_enable static-libs static)" 313 myopts+=" $(use_enable static-libs static)"
278 fi 314 fi
… …
282 ${myopts} 318 ${myopts}
283 fi 319 fi
284} 320}
285 321
286# @FUNCTION: xorg-2_src_compile 322# @FUNCTION: xorg-2_src_compile
287# @USAGE:
288# @DESCRIPTION: 323# @DESCRIPTION:
289# Compile a package, performing all X-related tasks. 324# Compile a package, performing all X-related tasks.
290xorg-2_src_compile() { 325xorg-2_src_compile() {
326 debug-print-function ${FUNCNAME} "$@"
327
291 base_src_compile 328 base_src_compile "$@"
292} 329}
293 330
294# @FUNCTION: xorg-2_src_install 331# @FUNCTION: xorg-2_src_install
295# @USAGE:
296# @DESCRIPTION: 332# @DESCRIPTION:
297# Install a built package to ${D}, performing any necessary steps. 333# Install a built package to ${D}, performing any necessary steps.
298# Creates a ChangeLog from git if using live ebuilds. 334# Creates a ChangeLog from git if using live ebuilds.
299xorg-2_src_install() { 335xorg-2_src_install() {
336 debug-print-function ${FUNCNAME} "$@"
337
300 if [[ ${CATEGORY} == x11-proto ]]; then 338 if [[ ${CATEGORY} == x11-proto ]]; then
301 emake \ 339 emake \
302 ${PN/proto/}docdir=${EPREFIX}/usr/share/doc/${PF} \ 340 ${PN/proto/}docdir=${EPREFIX}/usr/share/doc/${PF} \
341 docdir=${EPREFIX}/usr/share/doc/${PF} \
303 DESTDIR="${D}" \ 342 DESTDIR="${D}" \
304 install || die "emake install failed" 343 install || die "emake install failed"
305 else 344 else
306 emake \ 345 emake \
307 docdir=${EPREFIX}/usr/share/doc/${PF} \ 346 docdir=${EPREFIX}/usr/share/doc/${PF} \
… …
309 install || die "emake install failed" 348 install || die "emake install failed"
310 fi 349 fi
311 350
312 if [[ -n ${GIT_ECLASS} ]]; then 351 if [[ -n ${GIT_ECLASS} ]]; then
313 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null 352 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null
314 git log ${GIT_TREE} > "${S}"/ChangeLog 353 git log ${EGIT_COMMIT} > "${S}"/ChangeLog
315 popd > /dev/null 354 popd > /dev/null
316 fi 355 fi
317 356
318 if [[ -e "${S}"/ChangeLog ]]; then 357 if [[ -e "${S}"/ChangeLog ]]; then
319 dodoc "${S}"/ChangeLog 358 dodoc "${S}"/ChangeLog || die "dodoc failed"
320 fi 359 fi
321# @VARIABLE: DOCS 360 # @VARIABLE: DOCS
322# @DESCRIPTION: 361 # @DESCRIPTION:
323# Any documentation to install 362 # Any documentation to install
363 # @DEFAULT_UNSET
324 if [[ -n ${DOCS} ]]; then 364 if [[ -n ${DOCS} ]]; then
325 dodoc ${DOCS} || die "dodoc failed" 365 dodoc ${DOCS} || die "dodoc failed"
326 fi 366 fi
327 367
328 # Don't install libtool archives for server modules 368 # Don't install libtool archives for server modules
… …
333 373
334 [[ -n ${FONT} ]] && remove_font_metadata 374 [[ -n ${FONT} ]] && remove_font_metadata
335} 375}
336 376
337# @FUNCTION: xorg-2_pkg_postinst 377# @FUNCTION: xorg-2_pkg_postinst
338# @USAGE:
339# @DESCRIPTION: 378# @DESCRIPTION:
340# Run X-specific post-installation tasks on the live filesystem. The 379# Run X-specific post-installation tasks on the live filesystem. The
341# only task right now is some setup for font packages. 380# only task right now is some setup for font packages.
342xorg-2_pkg_postinst() { 381xorg-2_pkg_postinst() {
382 debug-print-function ${FUNCNAME} "$@"
383
343 [[ -n ${FONT} ]] && setup_fonts 384 [[ -n ${FONT} ]] && setup_fonts "$@"
344} 385}
345 386
346# @FUNCTION: xorg-2_pkg_postrm 387# @FUNCTION: xorg-2_pkg_postrm
347# @USAGE:
348# @DESCRIPTION: 388# @DESCRIPTION:
349# Run X-specific post-removal tasks on the live filesystem. The only 389# Run X-specific post-removal tasks on the live filesystem. The only
350# task right now is some cleanup for font packages. 390# task right now is some cleanup for font packages.
351xorg-2_pkg_postrm() { 391xorg-2_pkg_postrm() {
352 if [[ -n ${FONT} ]]; then 392 debug-print-function ${FUNCNAME} "$@"
353 cleanup_fonts
354 font_pkg_postrm
355 fi
356}
357 393
358# @FUNCTION: cleanup_fonts 394 [[ -n ${FONT} ]] && font_pkg_postrm "$@"
359# @USAGE:
360# @DESCRIPTION:
361# Get rid of font directories that only contain generated files
362cleanup_fonts() {
363 local allowed_files="encodings.dir fonts.alias fonts.cache-1 fonts.dir fonts.scale"
364 local real_dir=${EROOT}usr/share/fonts/${FONT_DIR}
365 local fle allowed_file
366
367 unset KEEP_FONTDIR
368
369 einfo "Checking ${real_dir} for useless files"
370 pushd ${real_dir} &> /dev/null
371 for fle in *; do
372 unset MATCH
373 for allowed_file in ${allowed_files}; do
374 if [[ ${fle} = ${allowed_file} ]]; then
375 # If it's allowed, then move on to the next file
376 MATCH="yes"
377 break
378 fi
379 done
380 # If we found a match in allowed files, move on to the next file
381 [[ -n ${MATCH} ]] && continue
382 # If we get this far, there wasn't a match in the allowed files
383 KEEP_FONTDIR="yes"
384 # We don't need to check more files if we're already keeping it
385 break
386 done
387 popd &> /dev/null
388 # If there are no files worth keeping, then get rid of the dir
389 [[ -z "${KEEP_FONTDIR}" ]] && rm -rf ${real_dir}
390} 395}
391 396
392# @FUNCTION: setup_fonts 397# @FUNCTION: setup_fonts
393# @USAGE:
394# @DESCRIPTION: 398# @DESCRIPTION:
395# Generates needed files for fonts and fixes font permissions 399# Generates needed files for fonts and fixes font permissions
396setup_fonts() { 400setup_fonts() {
401 debug-print-function ${FUNCNAME} "$@"
402
397 create_fonts_scale 403 create_fonts_scale
398 create_fonts_dir 404 create_fonts_dir
399 font_pkg_postinst 405 font_pkg_postinst
400} 406}
401 407
402# @FUNCTION: remove_font_metadata 408# @FUNCTION: remove_font_metadata
403# @USAGE:
404# @DESCRIPTION: 409# @DESCRIPTION:
405# Don't let the package install generated font files that may overlap 410# Don't let the package install generated font files that may overlap
406# with other packages. Instead, they're generated in pkg_postinst(). 411# with other packages. Instead, they're generated in pkg_postinst().
407remove_font_metadata() { 412remove_font_metadata() {
413 debug-print-function ${FUNCNAME} "$@"
414
408 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 415 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
409 einfo "Removing font metadata" 416 einfo "Removing font metadata"
410 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1} 417 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1}
411 fi 418 fi
412} 419}
413 420
414# @FUNCTION: create_fonts_scale 421# @FUNCTION: create_fonts_scale
415# @USAGE:
416# @DESCRIPTION: 422# @DESCRIPTION:
417# Create fonts.scale file, used by the old server-side fonts subsystem. 423# Create fonts.scale file, used by the old server-side fonts subsystem.
418create_fonts_scale() { 424create_fonts_scale() {
425 debug-print-function ${FUNCNAME} "$@"
426
419 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 427 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
420 ebegin "Generating font.scale" 428 ebegin "Generating font.scale"
421 mkfontscale \ 429 mkfontscale \
422 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \ 430 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \
423 -- "${EROOT}/usr/share/fonts/${FONT_DIR}" 431 -- "${EROOT}/usr/share/fonts/${FONT_DIR}"
424 eend $? 432 eend $?
425 fi 433 fi
426} 434}
427 435
428# @FUNCTION: create_fonts_dir 436# @FUNCTION: create_fonts_dir
429# @USAGE:
430# @DESCRIPTION: 437# @DESCRIPTION:
431# Create fonts.dir file, used by the old server-side fonts subsystem. 438# Create fonts.dir file, used by the old server-side fonts subsystem.
432create_fonts_dir() { 439create_fonts_dir() {
440 debug-print-function ${FUNCNAME} "$@"
441
433 ebegin "Generating fonts.dir" 442 ebegin "Generating fonts.dir"
434 mkfontdir \ 443 mkfontdir \
435 -e "${EROOT}"/usr/share/fonts/encodings \ 444 -e "${EROOT}"/usr/share/fonts/encodings \
436 -e "${EROOT}"/usr/share/fonts/encodings/large \ 445 -e "${EROOT}"/usr/share/fonts/encodings/large \
437 -- "${EROOT}/usr/share/fonts/${FONT_DIR}" 446 -- "${EROOT}/usr/share/fonts/${FONT_DIR}"
Legend:
Removed from v.1.1  
changed lines
  Added in v.1.23
  ViewVC Help
Powered by ViewVC 1.1.13