/[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.2 Revision 1.24
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.2 2010/03/17 14:29:20 scarabeus Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.24 2011/02/28 18:16:40 mgorny 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.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
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}" ]]; 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 epatch_user
202} 263}
203 264
204# @FUNCTION: xorg-2_reconf_source 265# @FUNCTION: xorg-2_reconf_source
205# @USAGE:
206# @DESCRIPTION: 266# @DESCRIPTION:
207# Run eautoreconf if necessary, and run elibtoolize. 267# Run eautoreconf if necessary, and run elibtoolize.
208xorg-2_reconf_source() { 268xorg-2_reconf_source() {
269 debug-print-function ${FUNCNAME} "$@"
270
209 case ${CHOST} in 271 case ${CHOST} in
210 *-interix* | *-aix* | *-winnt*) 272 *-interix* | *-aix* | *-winnt*)
211 # some hosts need full eautoreconf 273 # some hosts need full eautoreconf
212 [[ -e "./configure.ac" ]] && 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."
213 ;; 275 ;;
214 *) 276 *)
215 # elibtoolize required for BSD 277 # elibtoolize required for BSD
216 [[ ${XORG_EAUTORECONF} != no && -e "./configure.ac" ]] && eautoreconf || elibtoolize 278 [[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" || -e "./configure.in" ) ]] && eautoreconf || elibtoolize
217 ;; 279 ;;
218 esac 280 esac
219} 281}
220 282
221# @FUNCTION: xorg-2_src_prepare 283# @FUNCTION: xorg-2_src_prepare
222# @USAGE:
223# @DESCRIPTION: 284# @DESCRIPTION:
224# Prepare a package after unpacking, performing all X-related tasks. 285# Prepare a package after unpacking, performing all X-related tasks.
225xorg-2_src_prepare() { 286xorg-2_src_prepare() {
287 debug-print-function ${FUNCNAME} "$@"
288
226 [[ -n ${GIT_ECLASS} ]] && git_src_prepare 289 [[ -n ${GIT_ECLASS} ]] && git_src_prepare
227 xorg-2_patch_source 290 xorg-2_patch_source
228 xorg-2_reconf_source 291 xorg-2_reconf_source
229} 292}
230 293
231# @FUNCTION: xorg-2_font_configure 294# @FUNCTION: xorg-2_font_configure
232# @USAGE:
233# @DESCRIPTION: 295# @DESCRIPTION:
234# If a font package, perform any necessary configuration steps 296# If a font package, perform any necessary configuration steps
235xorg-2_font_configure() { 297xorg-2_font_configure() {
298 debug-print-function ${FUNCNAME} "$@"
299
236 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
237 FONT_OPTIONS+=" 302 FONT_OPTIONS+="
303 --disable-all-encodings"
304 else
305 FONT_OPTIONS+="
238 --disable-iso8859-2 306 --disable-iso8859-2
239 --disable-iso8859-3 307 --disable-iso8859-3
240 --disable-iso8859-4 308 --disable-iso8859-4
241 --disable-iso8859-5 309 --disable-iso8859-5
242 --disable-iso8859-6 310 --disable-iso8859-6
243 --disable-iso8859-7 311 --disable-iso8859-7
244 --disable-iso8859-8 312 --disable-iso8859-8
245 --disable-iso8859-9 313 --disable-iso8859-9
246 --disable-iso8859-10 314 --disable-iso8859-10
247 --disable-iso8859-11 315 --disable-iso8859-11
248 --disable-iso8859-12 316 --disable-iso8859-12
249 --disable-iso8859-13 317 --disable-iso8859-13
250 --disable-iso8859-14 318 --disable-iso8859-14
251 --disable-iso8859-15 319 --disable-iso8859-15
252 --disable-iso8859-16 320 --disable-iso8859-16
253 --disable-jisx0201 321 --disable-jisx0201
254 --disable-koi8-r" 322 --disable-koi8-r"
255 fi 323 fi
324 fi
256} 325}
257 326
258# @FUNCTION: x-modular_flags_setup 327# @FUNCTION: xorg-2_flags_setup
259# @USAGE:
260# @DESCRIPTION: 328# @DESCRIPTION:
261# Set up CFLAGS for a debug build 329# Set up CFLAGS for a debug build
262xorg-2_flags_setup() { 330xorg-2_flags_setup() {
331 debug-print-function ${FUNCNAME} "$@"
332
263 # Win32 require special define 333 # Win32 require special define
264 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__ 334 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__
265 # hardened ldflags 335 # hardened ldflags
266 [[ ${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
267} 344}
268 345
269# @FUNCTION: xorg-2_src_configure 346# @FUNCTION: xorg-2_src_configure
270# @USAGE:
271# @DESCRIPTION: 347# @DESCRIPTION:
272# Perform any necessary pre-configuration steps, then run configure 348# Perform any necessary pre-configuration steps, then run configure
273xorg-2_src_configure() { 349xorg-2_src_configure() {
274 local myopts="" 350 debug-print-function ${FUNCNAME} "$@"
275 351
276 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
277 [[ -n "${FONT}" ]] && xorg-2_font_configure 360 [[ -n "${FONT}" ]] && xorg-2_font_configure
278 361 local myeconfargs=(
279# @VARIABLE: CONFIGURE_OPTIONS 362 --disable-dependency-tracking
280# @DESCRIPTION:
281# Any options to pass to configure
282 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""}
283 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
284 if has static-libs ${IUSE//+}; then
285 myopts+=" $(use_enable static-libs static)"
286 fi
287 econf \
288 ${FONT_OPTIONS} \
289 ${CONFIGURE_OPTIONS} \ 363 ${CONFIGURE_OPTIONS}
290 ${myopts} 364 ${FONT_OPTIONS}
291 fi 365 )
366
367 autotools-utils_src_configure "$@"
292} 368}
293 369
294# @FUNCTION: xorg-2_src_compile 370# @FUNCTION: xorg-2_src_compile
295# @USAGE:
296# @DESCRIPTION: 371# @DESCRIPTION:
297# Compile a package, performing all X-related tasks. 372# Compile a package, performing all X-related tasks.
298xorg-2_src_compile() { 373xorg-2_src_compile() {
299 base_src_compile 374 debug-print-function ${FUNCNAME} "$@"
375
376 autotools-utils_src_compile "$@"
300} 377}
301 378
302# @FUNCTION: xorg-2_src_install 379# @FUNCTION: xorg-2_src_install
303# @USAGE:
304# @DESCRIPTION: 380# @DESCRIPTION:
305# Install a built package to ${D}, performing any necessary steps. 381# Install a built package to ${D}, performing any necessary steps.
306# Creates a ChangeLog from git if using live ebuilds. 382# Creates a ChangeLog from git if using live ebuilds.
307xorg-2_src_install() { 383xorg-2_src_install() {
384 debug-print-function ${FUNCNAME} "$@"
385
308 if [[ ${CATEGORY} == x11-proto ]]; then 386 if [[ ${CATEGORY} == x11-proto ]]; then
309 emake \ 387 autotools-utils_src_install \
310 ${PN/proto/}docdir=${EPREFIX}/usr/share/doc/${PF} \ 388 ${PN/proto/}docdir="${EPREFIX}/usr/share/doc/${PF}" \
311 DESTDIR="${D}" \ 389 docdir="${EPREFIX}/usr/share/doc/${PF}"
312 install || die "emake install failed"
313 else 390 else
314 emake \ 391 autotools-utils_src_install \
315 docdir=${EPREFIX}/usr/share/doc/${PF} \ 392 docdir="${EPREFIX}/usr/share/doc/${PF}"
316 DESTDIR="${D}" \
317 install || die "emake install failed"
318 fi 393 fi
319 394
320 if [[ -n ${GIT_ECLASS} ]]; then 395 if [[ -n ${GIT_ECLASS} ]]; then
321 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null 396 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null
322 git log ${GIT_TREE} > "${S}"/ChangeLog 397 git log ${EGIT_COMMIT} > "${S}"/ChangeLog
323 popd > /dev/null 398 popd > /dev/null
324 fi 399 fi
325 400
326 if [[ -e "${S}"/ChangeLog ]]; then 401 if [[ -e "${S}"/ChangeLog ]]; then
327 dodoc "${S}"/ChangeLog
328 fi
329# @VARIABLE: DOCS
330# @DESCRIPTION:
331# Any documentation to install
332 if [[ -n ${DOCS} ]]; then
333 dodoc ${DOCS} || die "dodoc failed" 402 dodoc "${S}"/ChangeLog || die "dodoc failed"
334 fi 403 fi
335 404
336 # Don't install libtool archives for server modules 405 # Don't install libtool archives (even with static-libs)
337 if [[ -e "${D%/}${EPREFIX}/usr/$(get_libdir)/xorg/modules" ]]; then 406 remove_libtool_files all
338 find "${D%/}${EPREFIX}/usr/$(get_libdir)/xorg/modules" -name '*.la' \
339 -exec rm -f {} ';'
340 fi
341 407
342 [[ -n ${FONT} ]] && remove_font_metadata 408 [[ -n ${FONT} ]] && remove_font_metadata
343} 409}
344 410
345# @FUNCTION: xorg-2_pkg_postinst 411# @FUNCTION: xorg-2_pkg_postinst
346# @USAGE:
347# @DESCRIPTION: 412# @DESCRIPTION:
348# Run X-specific post-installation tasks on the live filesystem. The 413# Run X-specific post-installation tasks on the live filesystem. The
349# only task right now is some setup for font packages. 414# only task right now is some setup for font packages.
350xorg-2_pkg_postinst() { 415xorg-2_pkg_postinst() {
416 debug-print-function ${FUNCNAME} "$@"
417
351 [[ -n ${FONT} ]] && setup_fonts 418 [[ -n ${FONT} ]] && setup_fonts "$@"
352} 419}
353 420
354# @FUNCTION: xorg-2_pkg_postrm 421# @FUNCTION: xorg-2_pkg_postrm
355# @USAGE:
356# @DESCRIPTION: 422# @DESCRIPTION:
357# 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
358# task right now is some cleanup for font packages. 424# task right now is some cleanup for font packages.
359xorg-2_pkg_postrm() { 425xorg-2_pkg_postrm() {
360 if [[ -n ${FONT} ]]; then 426 debug-print-function ${FUNCNAME} "$@"
361 cleanup_fonts
362 font_pkg_postrm
363 fi
364}
365 427
366# @FUNCTION: cleanup_fonts 428 [[ -n ${FONT} ]] && font_pkg_postrm "$@"
367# @USAGE:
368# @DESCRIPTION:
369# Get rid of font directories that only contain generated files
370cleanup_fonts() {
371 local allowed_files="encodings.dir fonts.alias fonts.cache-1 fonts.dir fonts.scale"
372 local real_dir=${EROOT}usr/share/fonts/${FONT_DIR}
373 local fle allowed_file
374
375 unset KEEP_FONTDIR
376
377 einfo "Checking ${real_dir} for useless files"
378 pushd ${real_dir} &> /dev/null
379 for fle in *; do
380 unset MATCH
381 for allowed_file in ${allowed_files}; do
382 if [[ ${fle} = ${allowed_file} ]]; then
383 # If it's allowed, then move on to the next file
384 MATCH="yes"
385 break
386 fi
387 done
388 # If we found a match in allowed files, move on to the next file
389 [[ -n ${MATCH} ]] && continue
390 # If we get this far, there wasn't a match in the allowed files
391 KEEP_FONTDIR="yes"
392 # We don't need to check more files if we're already keeping it
393 break
394 done
395 popd &> /dev/null
396 # If there are no files worth keeping, then get rid of the dir
397 [[ -z "${KEEP_FONTDIR}" ]] && rm -rf ${real_dir}
398} 429}
399 430
400# @FUNCTION: setup_fonts 431# @FUNCTION: setup_fonts
401# @USAGE:
402# @DESCRIPTION: 432# @DESCRIPTION:
403# Generates needed files for fonts and fixes font permissions 433# Generates needed files for fonts and fixes font permissions
404setup_fonts() { 434setup_fonts() {
435 debug-print-function ${FUNCNAME} "$@"
436
405 create_fonts_scale 437 create_fonts_scale
406 create_fonts_dir 438 create_fonts_dir
407 font_pkg_postinst 439 font_pkg_postinst
408} 440}
409 441
410# @FUNCTION: remove_font_metadata 442# @FUNCTION: remove_font_metadata
411# @USAGE:
412# @DESCRIPTION: 443# @DESCRIPTION:
413# 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
414# with other packages. Instead, they're generated in pkg_postinst(). 445# with other packages. Instead, they're generated in pkg_postinst().
415remove_font_metadata() { 446remove_font_metadata() {
447 debug-print-function ${FUNCNAME} "$@"
448
416 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 449 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
417 einfo "Removing font metadata" 450 einfo "Removing font metadata"
418 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}
419 fi 452 fi
420} 453}
421 454
422# @FUNCTION: create_fonts_scale 455# @FUNCTION: create_fonts_scale
423# @USAGE:
424# @DESCRIPTION: 456# @DESCRIPTION:
425# 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.
426create_fonts_scale() { 458create_fonts_scale() {
459 debug-print-function ${FUNCNAME} "$@"
460
427 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 461 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
428 ebegin "Generating font.scale" 462 ebegin "Generating font.scale"
429 mkfontscale \ 463 mkfontscale \
430 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \ 464 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \
431 -- "${EROOT}/usr/share/fonts/${FONT_DIR}" 465 -- "${EROOT}/usr/share/fonts/${FONT_DIR}"
432 eend $? 466 eend $?
433 fi 467 fi
434} 468}
435 469
436# @FUNCTION: create_fonts_dir 470# @FUNCTION: create_fonts_dir
437# @USAGE:
438# @DESCRIPTION: 471# @DESCRIPTION:
439# 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.
440create_fonts_dir() { 473create_fonts_dir() {
474 debug-print-function ${FUNCNAME} "$@"
475
441 ebegin "Generating fonts.dir" 476 ebegin "Generating fonts.dir"
442 mkfontdir \ 477 mkfontdir \
443 -e "${EROOT}"/usr/share/fonts/encodings \ 478 -e "${EROOT}"/usr/share/fonts/encodings \
444 -e "${EROOT}"/usr/share/fonts/encodings/large \ 479 -e "${EROOT}"/usr/share/fonts/encodings/large \
445 -- "${EROOT}/usr/share/fonts/${FONT_DIR}" 480 -- "${EROOT}/usr/share/fonts/${FONT_DIR}"

Legend:
Removed from v.1.2  
changed lines
  Added in v.1.24

  ViewVC Help
Powered by ViewVC 1.1.20