/[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.8 Revision 1.25
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.8 2010/08/06 20:46:08 scarabeus Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.25 2011/03/01 18:56: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# @BLURB: Reduces code duplication in the modularized X11 ebuilds. 8# @BLURB: Reduces code duplication in the modularized X11 ebuilds.
… …
36 # Activate font code in the rest of the eclass 36 # Activate font code in the rest of the eclass
37 FONT="yes" 37 FONT="yes"
38 FONT_ECLASS="font" 38 FONT_ECLASS="font"
39fi 39fi
40 40
41inherit eutils base libtool multilib toolchain-funcs flag-o-matic autotools \ 41inherit autotools-utils eutils 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" ;;
77 x11-base) MODULE="xserver" ;; 75 x11-base) MODULE=xserver/ ;;
76 x11-drivers) MODULE=driver/ ;;
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 might 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.8.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
… …
146 159
147# Add static-libs useflag where usefull. 160# Add static-libs useflag where usefull.
148if [[ ${XORG_STATIC} == yes \ 161if [[ ${XORG_STATIC} == yes \
149 && ${FONT} != yes \ 162 && ${FONT} != yes \
150 && ${CATEGORY} != app-doc \ 163 && ${CATEGORY} != app-doc \
164 && ${CATEGORY} != x11-apps \
151 && ${CATEGORY} != x11-proto \ 165 && ${CATEGORY} != x11-proto \
152 && ${CATEGORY} != x11-drivers \ 166 && ${CATEGORY} != x11-drivers \
153 && ${CATEGORY} != media-fonts \ 167 && ${CATEGORY} != media-fonts \
154 && ${PN} != util-macros \ 168 && ${PN} != util-macros \
155 && ${PN} != xbitmaps \ 169 && ${PN} != xbitmaps \
… …
158 IUSE+=" static-libs" 172 IUSE+=" static-libs"
159fi 173fi
160 174
161DEPEND+=" >=dev-util/pkgconfig-0.23" 175DEPEND+=" >=dev-util/pkgconfig-0.23"
162 176
163# Check deps on xorg-server 177# Check deps on drivers
164has dri ${IUSE//+} && DEPEND+=" dri? ( >=x11-base/xorg-server-1.6.3.901-r2[-minimal] )" 178if has dri ${IUSE//+}; then
165[[ -n "${DRIVER}" ]] && DEPEND+=" x11-base/xorg-server[xorg]" 179 COMMON_DEPEND+=" dri? (
180 x11-base/xorg-server[-minimal]
181 x11-libs/libdrm
182 )"
183 DEPEND+=" dri? (
184 x11-proto/xf86driproto
185 x11-proto/glproto
186 x11-proto/dri2proto
187 )"
188fi
189if [[ -n "${DRIVER}" && ${PN} == xf86-video-* ]]; then
190 COMMON_DEPEND+="
191 x11-base/xorg-server[xorg]
192 x11-libs/libpciaccess
193 "
194 # we also needs some protos and libs in all cases
195 DEPEND+="
196 x11-proto/fontsproto
197 x11-proto/randrproto
198 x11-proto/renderproto
199 x11-proto/videoproto
200 x11-proto/xextproto
201 x11-proto/xineramaproto
202 x11-proto/xproto
203 "
204fi
205
206# Add deps on documentation
207# Most docbooks use dtd version 4.2 and 4.3 add more when found
208if has doc ${IUSE//+}; then
209 DEPEND+="
210 doc? (
211 app-text/xmlto
212 app-doc/doxygen
213 app-text/docbook-xml-dtd:4.2
214 app-text/docbook-xml-dtd:4.3
215 )
216 "
217fi
218
219DEPEND+=" ${COMMON_DEPEND}"
220RDEPEND+=" ${COMMON_DEPEND}"
221unset COMMON_DEPEND
222
223debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: DEPEND=${DEPEND}"
224debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: RDEPEND=${RDEPEND}"
166 225
167# @FUNCTION: xorg-2_pkg_setup 226# @FUNCTION: xorg-2_pkg_setup
168# @USAGE:
169# @DESCRIPTION: 227# @DESCRIPTION:
170# Setup prefix compat 228# Setup prefix compat
171xorg-2_pkg_setup() { 229xorg-2_pkg_setup() {
230 debug-print-function ${FUNCNAME} "$@"
231
172 [[ ${FONT} == yes ]] && font_pkg_setup 232 [[ ${FONT} == yes ]] && font_pkg_setup "$@"
173} 233}
174 234
175# @FUNCTION: xorg-2_src_unpack 235# @FUNCTION: xorg-2_src_unpack
176# @USAGE:
177# @DESCRIPTION: 236# @DESCRIPTION:
178# Simply unpack source code. 237# Simply unpack source code.
179xorg-2_src_unpack() { 238xorg-2_src_unpack() {
239 debug-print-function ${FUNCNAME} "$@"
240
180 if [[ -n ${GIT_ECLASS} ]]; then 241 if [[ -n ${GIT_ECLASS} ]]; then
181 git_src_unpack 242 git_src_unpack
182 else 243 else
183 unpack ${A} 244 unpack ${A}
184 fi 245 fi
185 246
186 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}" 247 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}"
187} 248}
188 249
189# @FUNCTION: xorg-2_patch_source 250# @FUNCTION: xorg-2_patch_source
190# @USAGE:
191# @DESCRIPTION: 251# @DESCRIPTION:
192# Apply all patches 252# Apply all patches
193xorg-2_patch_source() { 253xorg-2_patch_source() {
254 debug-print-function ${FUNCNAME} "$@"
255
194 # Use standardized names and locations with bulk patching 256 # Use standardized names and locations with bulk patching
195 # Patch directory is ${WORKDIR}/patch 257 # Patch directory is ${WORKDIR}/patch
196 # See epatch() in eutils.eclass for more documentation 258 # See epatch() in eutils.eclass for more documentation
197 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch} 259 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch}
198 260
199 [[ -d "${EPATCH_SOURCE}" ]] && epatch 261 [[ -d "${EPATCH_SOURCE}" ]] && epatch
200 base_src_prepare 262 autotools-utils_src_prepare "$@"
201} 263}
202 264
203# @FUNCTION: xorg-2_reconf_source 265# @FUNCTION: xorg-2_reconf_source
204# @USAGE:
205# @DESCRIPTION: 266# @DESCRIPTION:
206# Run eautoreconf if necessary, and run elibtoolize. 267# Run eautoreconf if necessary, and run elibtoolize.
207xorg-2_reconf_source() { 268xorg-2_reconf_source() {
269 debug-print-function ${FUNCNAME} "$@"
270
208 case ${CHOST} in 271 case ${CHOST} in
209 *-interix* | *-aix* | *-winnt*) 272 *-interix* | *-aix* | *-winnt*)
210 # some hosts need full eautoreconf 273 # some hosts need full eautoreconf
211 [[ -e "./configure.ac" || -e "./configure.in" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail." 274 [[ -e "./configure.ac" || -e "./configure.in" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail."
212 ;; 275 ;;
… …
216 ;; 279 ;;
217 esac 280 esac
218} 281}
219 282
220# @FUNCTION: xorg-2_src_prepare 283# @FUNCTION: xorg-2_src_prepare
221# @USAGE:
222# @DESCRIPTION: 284# @DESCRIPTION:
223# Prepare a package after unpacking, performing all X-related tasks. 285# Prepare a package after unpacking, performing all X-related tasks.
224xorg-2_src_prepare() { 286xorg-2_src_prepare() {
287 debug-print-function ${FUNCNAME} "$@"
288
225 [[ -n ${GIT_ECLASS} ]] && git_src_prepare 289 [[ -n ${GIT_ECLASS} ]] && git_src_prepare
226 xorg-2_patch_source 290 xorg-2_patch_source
227 xorg-2_reconf_source 291 xorg-2_reconf_source
228} 292}
229 293
230# @FUNCTION: xorg-2_font_configure 294# @FUNCTION: xorg-2_font_configure
231# @USAGE:
232# @DESCRIPTION: 295# @DESCRIPTION:
233# If a font package, perform any necessary configuration steps 296# If a font package, perform any necessary configuration steps
234xorg-2_font_configure() { 297xorg-2_font_configure() {
298 debug-print-function ${FUNCNAME} "$@"
299
235 if has nls ${IUSE//+} && ! use nls; then 300 if has nls ${IUSE//+} && ! use nls; then
301 if grep -q -s "disable-all-encodings" ${ECONF_SOURCE:-.}/configure; then
236 FONT_OPTIONS+=" 302 FONT_OPTIONS+="
303 --disable-all-encodings"
304 else
305 FONT_OPTIONS+="
237 --disable-iso8859-2 306 --disable-iso8859-2
238 --disable-iso8859-3 307 --disable-iso8859-3
239 --disable-iso8859-4 308 --disable-iso8859-4
240 --disable-iso8859-5 309 --disable-iso8859-5
241 --disable-iso8859-6 310 --disable-iso8859-6
242 --disable-iso8859-7 311 --disable-iso8859-7
243 --disable-iso8859-8 312 --disable-iso8859-8
244 --disable-iso8859-9 313 --disable-iso8859-9
245 --disable-iso8859-10 314 --disable-iso8859-10
246 --disable-iso8859-11 315 --disable-iso8859-11
247 --disable-iso8859-12 316 --disable-iso8859-12
248 --disable-iso8859-13 317 --disable-iso8859-13
249 --disable-iso8859-14 318 --disable-iso8859-14
250 --disable-iso8859-15 319 --disable-iso8859-15
251 --disable-iso8859-16 320 --disable-iso8859-16
252 --disable-jisx0201 321 --disable-jisx0201
253 --disable-koi8-r" 322 --disable-koi8-r"
254 fi 323 fi
324 fi
255} 325}
256 326
257# @FUNCTION: x-modular_flags_setup 327# @FUNCTION: xorg-2_flags_setup
258# @USAGE:
259# @DESCRIPTION: 328# @DESCRIPTION:
260# Set up CFLAGS for a debug build 329# Set up CFLAGS for a debug build
261xorg-2_flags_setup() { 330xorg-2_flags_setup() {
331 debug-print-function ${FUNCNAME} "$@"
332
262 # Win32 require special define 333 # Win32 require special define
263 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__ 334 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__
264 # hardened ldflags 335 # hardened ldflags
265 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy 336 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy
337
338 # Quite few libraries fail on runtime without these:
339 if has static-libs ${IUSE//+}; then
340 filter-flags -Wl,-Bdirect
341 filter-ldflags -Bdirect
342 filter-ldflags -Wl,-Bdirect
343 fi
266} 344}
267 345
268# @FUNCTION: xorg-2_src_configure 346# @FUNCTION: xorg-2_src_configure
269# @USAGE:
270# @DESCRIPTION: 347# @DESCRIPTION:
271# Perform any necessary pre-configuration steps, then run configure 348# Perform any necessary pre-configuration steps, then run configure
272xorg-2_src_configure() { 349xorg-2_src_configure() {
273 local myopts="" 350 debug-print-function ${FUNCNAME} "$@"
274 351
275 xorg-2_flags_setup 352 xorg-2_flags_setup
353
354 # @VARIABLE: CONFIGURE_OPTIONS
355 # @DESCRIPTION:
356 # Any options to pass to configure
357 # @DEFAULT_UNSET
358 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""}
359
276 [[ -n "${FONT}" ]] && xorg-2_font_configure 360 [[ -n "${FONT}" ]] && xorg-2_font_configure
277 361 local myeconfargs=(
278# @VARIABLE: CONFIGURE_OPTIONS 362 --disable-dependency-tracking
279# @DESCRIPTION:
280# Any options to pass to configure
281 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""}
282 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
283 if has static-libs ${IUSE//+}; then
284 myopts+=" $(use_enable static-libs static)"
285 fi
286 econf \
287 ${FONT_OPTIONS} \
288 ${CONFIGURE_OPTIONS} \ 363 ${CONFIGURE_OPTIONS}
289 ${myopts} 364 ${FONT_OPTIONS}
290 fi 365 )
366
367 autotools-utils_src_configure "$@"
291} 368}
292 369
293# @FUNCTION: xorg-2_src_compile 370# @FUNCTION: xorg-2_src_compile
294# @USAGE:
295# @DESCRIPTION: 371# @DESCRIPTION:
296# Compile a package, performing all X-related tasks. 372# Compile a package, performing all X-related tasks.
297xorg-2_src_compile() { 373xorg-2_src_compile() {
298 base_src_compile 374 debug-print-function ${FUNCNAME} "$@"
375
376 autotools-utils_src_compile "$@"
299} 377}
300 378
301# @FUNCTION: xorg-2_src_install 379# @FUNCTION: xorg-2_src_install
302# @USAGE:
303# @DESCRIPTION: 380# @DESCRIPTION:
304# Install a built package to ${D}, performing any necessary steps. 381# Install a built package to ${D}, performing any necessary steps.
305# Creates a ChangeLog from git if using live ebuilds. 382# Creates a ChangeLog from git if using live ebuilds.
306xorg-2_src_install() { 383xorg-2_src_install() {
384 debug-print-function ${FUNCNAME} "$@"
385
307 if [[ ${CATEGORY} == x11-proto ]]; then 386 if [[ ${CATEGORY} == x11-proto ]]; then
308 emake \ 387 autotools-utils_src_install \
309 ${PN/proto/}docdir=${EPREFIX}/usr/share/doc/${PF} \ 388 ${PN/proto/}docdir="${EPREFIX}/usr/share/doc/${PF}" \
310 DESTDIR="${D}" \ 389 docdir="${EPREFIX}/usr/share/doc/${PF}"
311 install || die "emake install failed"
312 else 390 else
313 emake \ 391 autotools-utils_src_install \
314 docdir=${EPREFIX}/usr/share/doc/${PF} \ 392 docdir="${EPREFIX}/usr/share/doc/${PF}"
315 DESTDIR="${D}" \
316 install || die "emake install failed"
317 fi 393 fi
318 394
319 if [[ -n ${GIT_ECLASS} ]]; then 395 if [[ -n ${GIT_ECLASS} ]]; then
320 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null 396 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null
321 git log ${GIT_TREE} > "${S}"/ChangeLog 397 git log ${EGIT_COMMIT} > "${S}"/ChangeLog
322 popd > /dev/null 398 popd > /dev/null
323 fi 399 fi
324 400
325 if [[ -e "${S}"/ChangeLog ]]; then 401 if [[ -e "${S}"/ChangeLog ]]; then
326 dodoc "${S}"/ChangeLog
327 fi
328# @VARIABLE: DOCS
329# @DESCRIPTION:
330# Any documentation to install
331 if [[ -n ${DOCS} ]]; then
332 dodoc ${DOCS} || die "dodoc failed" 402 dodoc "${S}"/ChangeLog || die "dodoc failed"
333 fi 403 fi
334 404
335 # Don't install libtool archives for server modules 405 # Don't install libtool archives (even with static-libs)
336 if [[ -e "${D%/}${EPREFIX}/usr/$(get_libdir)/xorg/modules" ]]; then 406 remove_libtool_files all
337 find "${D%/}${EPREFIX}/usr/$(get_libdir)/xorg/modules" -name '*.la' \
338 -exec rm -f {} ';'
339 fi
340 407
341 [[ -n ${FONT} ]] && remove_font_metadata 408 [[ -n ${FONT} ]] && remove_font_metadata
342} 409}
343 410
344# @FUNCTION: xorg-2_pkg_postinst 411# @FUNCTION: xorg-2_pkg_postinst
345# @USAGE:
346# @DESCRIPTION: 412# @DESCRIPTION:
347# Run X-specific post-installation tasks on the live filesystem. The 413# Run X-specific post-installation tasks on the live filesystem. The
348# only task right now is some setup for font packages. 414# only task right now is some setup for font packages.
349xorg-2_pkg_postinst() { 415xorg-2_pkg_postinst() {
416 debug-print-function ${FUNCNAME} "$@"
417
350 [[ -n ${FONT} ]] && setup_fonts 418 [[ -n ${FONT} ]] && setup_fonts "$@"
351} 419}
352 420
353# @FUNCTION: xorg-2_pkg_postrm 421# @FUNCTION: xorg-2_pkg_postrm
354# @USAGE:
355# @DESCRIPTION: 422# @DESCRIPTION:
356# Run X-specific post-removal tasks on the live filesystem. The only 423# Run X-specific post-removal tasks on the live filesystem. The only
357# task right now is some cleanup for font packages. 424# task right now is some cleanup for font packages.
358xorg-2_pkg_postrm() { 425xorg-2_pkg_postrm() {
359 if [[ -n ${FONT} ]]; then 426 debug-print-function ${FUNCNAME} "$@"
360 font_pkg_postrm 427
361 fi 428 [[ -n ${FONT} ]] && font_pkg_postrm "$@"
362} 429}
363 430
364# @FUNCTION: setup_fonts 431# @FUNCTION: setup_fonts
365# @USAGE:
366# @DESCRIPTION: 432# @DESCRIPTION:
367# Generates needed files for fonts and fixes font permissions 433# Generates needed files for fonts and fixes font permissions
368setup_fonts() { 434setup_fonts() {
435 debug-print-function ${FUNCNAME} "$@"
436
369 create_fonts_scale 437 create_fonts_scale
370 create_fonts_dir 438 create_fonts_dir
371 font_pkg_postinst 439 font_pkg_postinst
372} 440}
373 441
374# @FUNCTION: remove_font_metadata 442# @FUNCTION: remove_font_metadata
375# @USAGE:
376# @DESCRIPTION: 443# @DESCRIPTION:
377# Don't let the package install generated font files that may overlap 444# Don't let the package install generated font files that may overlap
378# with other packages. Instead, they're generated in pkg_postinst(). 445# with other packages. Instead, they're generated in pkg_postinst().
379remove_font_metadata() { 446remove_font_metadata() {
447 debug-print-function ${FUNCNAME} "$@"
448
380 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 449 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
381 einfo "Removing font metadata" 450 einfo "Removing font metadata"
382 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1} 451 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1}
383 fi 452 fi
384} 453}
385 454
386# @FUNCTION: create_fonts_scale 455# @FUNCTION: create_fonts_scale
387# @USAGE:
388# @DESCRIPTION: 456# @DESCRIPTION:
389# Create fonts.scale file, used by the old server-side fonts subsystem. 457# Create fonts.scale file, used by the old server-side fonts subsystem.
390create_fonts_scale() { 458create_fonts_scale() {
459 debug-print-function ${FUNCNAME} "$@"
460
391 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 461 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
392 ebegin "Generating font.scale" 462 ebegin "Generating font.scale"
393 mkfontscale \ 463 mkfontscale \
394 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \ 464 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \
395 -- "${EROOT}/usr/share/fonts/${FONT_DIR}" 465 -- "${EROOT}/usr/share/fonts/${FONT_DIR}"
396 eend $? 466 eend $?
397 fi 467 fi
398} 468}
399 469
400# @FUNCTION: create_fonts_dir 470# @FUNCTION: create_fonts_dir
401# @USAGE:
402# @DESCRIPTION: 471# @DESCRIPTION:
403# Create fonts.dir file, used by the old server-side fonts subsystem. 472# Create fonts.dir file, used by the old server-side fonts subsystem.
404create_fonts_dir() { 473create_fonts_dir() {
474 debug-print-function ${FUNCNAME} "$@"
475
405 ebegin "Generating fonts.dir" 476 ebegin "Generating fonts.dir"
406 mkfontdir \ 477 mkfontdir \
407 -e "${EROOT}"/usr/share/fonts/encodings \ 478 -e "${EROOT}"/usr/share/fonts/encodings \
408 -e "${EROOT}"/usr/share/fonts/encodings/large \ 479 -e "${EROOT}"/usr/share/fonts/encodings/large \
409 -- "${EROOT}/usr/share/fonts/${FONT_DIR}" 480 -- "${EROOT}/usr/share/fonts/${FONT_DIR}"
Legend:
Removed from v.1.8  
changed lines
  Added in v.1.25
  ViewVC Help
Powered by ViewVC 1.1.13