/[gentoo-x86]/eclass/x-modular.eclass
Gentoo

Diff of /eclass/x-modular.eclass

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

Revision 1.103 Revision 1.112
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2005 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/x-modular.eclass,v 1.103 2008/11/26 23:13:24 dberkholz Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.112 2009/08/27 15:16:09 scarabeus Exp $
4# 4#
5# @ECLASS: x-modular.eclass 5# @ECLASS: x-modular.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Donnie Berkholz <dberkholz@gentoo.org>, x11@gentoo.org 7# Donnie Berkholz <dberkholz@gentoo.org>, x11@gentoo.org
8# @BLURB: Reduces code duplication in the modularized X11 ebuilds. 8# @BLURB: Reduces code duplication in the modularized X11 ebuilds.
15# 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
16# DESCRIPTION, KEYWORDS and RDEPEND/DEPEND. If your package is hosted 16# DESCRIPTION, KEYWORDS and RDEPEND/DEPEND. If your package is hosted
17# 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
18# everything else should be automatic. 18# everything else should be automatic.
19 19
20if [[ ${PV} = 9999* ]]; then
21 GIT_ECLASS="git"
22 SNAPSHOT="yes"
23 SRC_URI=""
24fi
25
26# If we're a font package, but not the font.alias one
27FONT_ECLASS=""
28if [[ "${PN/#font-}" != "${PN}" ]] \
29 && [[ "${CATEGORY}" = "media-fonts" ]] \
30 && [[ "${PN}" != "font-alias" ]] \
31 && [[ "${PN}" != "font-util" ]]; then
32 # Activate font code in the rest of the eclass
33 FONT="yes"
34
35 # Whether to inherit the font eclass
36 FONT_ECLASS="font"
37fi
38
39inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \
40 ${FONT_ECLASS} ${GIT_ECLASS}
41
42EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm"
43
44case "${EAPI:-0}" in
45 0|1)
46 ;;
47 2)
48 EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure"
49 ;;
50 *)
51 die "Unknown EAPI ${EAPI}"
52 ;;
53esac
54
55# exports must be ALWAYS after inherit
56EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
57
20# @ECLASS-VARIABLE: XDIR 58# @ECLASS-VARIABLE: XDIR
21# @DESCRIPTION: 59# @DESCRIPTION:
22# Directory prefix to use for everything. If you want to install to a 60# Directory prefix to use for everything. If you want to install to a
23# non-default prefix (e.g., /opt/xorg), change XDIR. This has not been 61# non-default prefix (e.g., /opt/xorg), change XDIR. This has not been
24# recently tested. You may need to uncomment the setting of datadir and 62# recently tested. You may need to uncomment the setting of datadir and
33# @ECLASS-VARIABLE: SNAPSHOT 71# @ECLASS-VARIABLE: SNAPSHOT
34# @DESCRIPTION: 72# @DESCRIPTION:
35# If set to 'yes' and configure.ac exists, eautoreconf will run. Set 73# If set to 'yes' and configure.ac exists, eautoreconf will run. Set
36# before inheriting this eclass. 74# before inheriting this eclass.
37 SNAPSHOT="no" 75 SNAPSHOT="no"
38fi
39
40if [[ ${PV} = 9999* ]]; then
41 GIT_ECLASS="git"
42 SNAPSHOT="yes"
43 SRC_URI=""
44fi 76fi
45 77
46# Set up SRC_URI for individual modular releases 78# Set up SRC_URI for individual modular releases
47BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual" 79BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
48# @ECLASS-VARIABLE: MODULE 80# @ECLASS-VARIABLE: MODULE
84 >=sys-devel/m4-1.4" 116 >=sys-devel/m4-1.4"
85 WANT_AUTOCONF="latest" 117 WANT_AUTOCONF="latest"
86 WANT_AUTOMAKE="latest" 118 WANT_AUTOMAKE="latest"
87fi 119fi
88 120
89# If we're a font package, but not the font.alias one 121if [[ -n "${FONT}" ]]; then
90FONT_ECLASS=""
91if [[ "${PN/#font-}" != "${PN}" ]] \
92 && [[ "${CATEGORY}" = "media-fonts" ]] \
93 && [[ "${PN}" != "font-alias" ]] \
94 && [[ "${PN}" != "font-util" ]]; then
95 # Activate font code in the rest of the eclass
96 FONT="yes"
97
98 # Whether to inherit the font eclass
99 FONT_ECLASS="font"
100
101 RDEPEND="${RDEPEND} 122 RDEPEND="${RDEPEND}
102 media-fonts/encodings 123 media-fonts/encodings
103 x11-apps/mkfontscale 124 x11-apps/mkfontscale
104 x11-apps/mkfontdir" 125 x11-apps/mkfontdir"
105 PDEPEND="${PDEPEND} 126 PDEPEND="${PDEPEND}
124 FONT_DIR=${FONT_DIR/ttf/TTF} 145 FONT_DIR=${FONT_DIR/ttf/TTF}
125 FONT_DIR=${FONT_DIR/otf/OTF} 146 FONT_DIR=${FONT_DIR/otf/OTF}
126 FONT_DIR=${FONT_DIR/type1/Type1} 147 FONT_DIR=${FONT_DIR/type1/Type1}
127 FONT_DIR=${FONT_DIR/speedo/Speedo} 148 FONT_DIR=${FONT_DIR/speedo/Speedo}
128 149
129 # Set up configure option 150 # Set up configure options, wrapped so ebuilds can override if need be
151 if [[ -z ${FONT_OPTIONS} ]]; then
130 FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\"" 152 FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\""
153 fi
131 154
132 if [[ -n "${FONT}" ]]; then 155 if [[ -n "${FONT}" ]]; then
133 if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]] || [[ ${PN##*-} = cyrillic ]]; then 156 if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]] || [[ ${PN##*-} = cyrillic ]]; then
134 IUSE="${IUSE} nls" 157 IUSE="${IUSE} nls"
135 fi 158 fi
168RDEPEND="${RDEPEND} 191RDEPEND="${RDEPEND}
169 !<=x11-base/xorg-x11-6.9" 192 !<=x11-base/xorg-x11-6.9"
170# Provides virtual/x11 for temporary use until packages are ported 193# Provides virtual/x11 for temporary use until packages are ported
171# x11-base/x11-env" 194# x11-base/x11-env"
172 195
173inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \
174 ${FONT_ECLASS} ${GIT_ECLASS}
175
176# @FUNCTION: x-modular_specs_check 196# @FUNCTION: x-modular_specs_check
177# @USAGE: 197# @USAGE:
178# @DESCRIPTION: 198# @DESCRIPTION:
179# Make any necessary changes related to gcc specs (generally hardened) 199# Make any necessary changes related to gcc specs (generally hardened)
180x-modular_specs_check() { 200x-modular_specs_check() {
190# @DESCRIPTION: 210# @DESCRIPTION:
191# Ensures the server supports DRI if building a driver with DRI support 211# Ensures the server supports DRI if building a driver with DRI support
192x-modular_dri_check() { 212x-modular_dri_check() {
193 # (#120057) Enabling DRI in drivers requires that the server was built with 213 # (#120057) Enabling DRI in drivers requires that the server was built with
194 # support for it 214 # support for it
215 # Starting with xorg-server 1.5.3, DRI support is always enabled unless
216 # USE=minimal is set (see bug #252084)
195 if [[ -n "${DRIVER}" ]]; then 217 if [[ -n "${DRIVER}" ]]; then
196 if has dri ${IUSE} && use dri; then 218 if has dri ${IUSE} && use dri; then
197 einfo "Checking for direct rendering capabilities ..." 219 einfo "Checking for direct rendering capabilities ..."
220 if has_version '>=x11-base/xorg-server-1.5.3'; then
221 if built_with_use x11-base/xorg-server minimal; then
222 die "You must build x11-base/xorg-server with USE=-minimal."
223 fi
224 else
198 if ! built_with_use --missing true x11-base/xorg-server dri; then 225 if ! built_with_use x11-base/xorg-server dri; then
199 die "You must build x11-base/xorg-server with USE=dri." 226 die "You must build x11-base/xorg-server with USE=dri."
227 fi
200 fi 228 fi
201 fi 229 fi
202 fi 230 fi
203} 231}
204 232
227 if [[ -n ${GIT_ECLASS} ]]; then 255 if [[ -n ${GIT_ECLASS} ]]; then
228 git_src_unpack 256 git_src_unpack
229 else 257 else
230 unpack ${A} 258 unpack ${A}
231 fi 259 fi
232 cd ${S} 260 cd "${S}"
233 261
234 if [[ -n ${FONT_OPTIONS} ]]; then 262 if [[ -n ${FONT_OPTIONS} ]]; then
235 einfo "Detected font directory: ${FONT_DIR}" 263 einfo "Detected font directory: ${FONT_DIR}"
236 fi 264 fi
237} 265}
287 # Joshua Baergen - October 23, 2005 315 # Joshua Baergen - October 23, 2005
288 # Fix shared lib issues on MIPS, FBSD, etc etc 316 # Fix shared lib issues on MIPS, FBSD, etc etc
289 elibtoolize 317 elibtoolize
290} 318}
291 319
320# @FUNCTION: x-modular_src_prepare
321# @USAGE:
322# @DESCRIPTION:
323# Prepare a package after unpacking, performing all X-related tasks.
324x-modular_src_prepare() {
325 [[ -n ${GIT_ECLASS} ]] && has src_prepare ${EXPORTED_FUNCTIONS} \
326 && git_src_prepare
327 x-modular_patch_source
328 x-modular_reconf_source
329}
330
292# @FUNCTION: x-modular_src_unpack 331# @FUNCTION: x-modular_src_unpack
293# @USAGE: 332# @USAGE:
294# @DESCRIPTION: 333# @DESCRIPTION:
295# Unpack a package, performing all X-related tasks. 334# Unpack a package, performing all X-related tasks.
296x-modular_src_unpack() { 335x-modular_src_unpack() {
297 x-modular_specs_check 336 x-modular_specs_check
298 x-modular_server_supports_drivers_check 337 x-modular_server_supports_drivers_check
299 x-modular_dri_check 338 x-modular_dri_check
300 x-modular_unpack_source 339 x-modular_unpack_source
301 x-modular_patch_source 340 has src_prepare ${EXPORTED_FUNCTIONS} || x-modular_src_prepare
302 x-modular_reconf_source
303} 341}
304 342
305# @FUNCTION: x-modular_font_configure 343# @FUNCTION: x-modular_font_configure
306# @USAGE: 344# @USAGE:
307# @DESCRIPTION: 345# @DESCRIPTION:
308# If a font package, perform any necessary configuration steps 346# If a font package, perform any necessary configuration steps
309x-modular_font_configure() { 347x-modular_font_configure() {
310 if [[ -n "${FONT}" ]]; then 348 if [[ -n "${FONT}" ]]; then
311 # Might be worth adding an option to configure your desired font 349 # Might be worth adding an option to configure your desired font
312 # and exclude all others. Also, should this USE be nls or minimal? 350 # and exclude all others. Also, should this USE be nls or minimal?
313 if ! use nls; then 351 if has nls ${IUSE//+} && ! use nls; then
314 FONT_OPTIONS="${FONT_OPTIONS} 352 FONT_OPTIONS="${FONT_OPTIONS}
315 --disable-iso8859-2 353 --disable-iso8859-2
316 --disable-iso8859-3 354 --disable-iso8859-3
317 --disable-iso8859-4 355 --disable-iso8859-4
318 --disable-iso8859-5 356 --disable-iso8859-5
375# Run make. 413# Run make.
376x-modular_src_make() { 414x-modular_src_make() {
377 emake || die "emake failed" 415 emake || die "emake failed"
378} 416}
379 417
380# @FUNCTION: x-modular_src_configure 418# @FUNCTION: x-modular_src_compile
381# @USAGE: 419# @USAGE:
382# @DESCRIPTION: 420# @DESCRIPTION:
383# Compile a package, performing all X-related tasks. 421# Compile a package, performing all X-related tasks.
384x-modular_src_compile() { 422x-modular_src_compile() {
385 x-modular_src_configure 423 has src_configure ${EXPORTED_FUNCTIONS} || x-modular_src_configure
386 x-modular_src_make 424 x-modular_src_make
387} 425}
388 426
389# @FUNCTION: x-modular_src_install 427# @FUNCTION: x-modular_src_install
390# @USAGE: 428# @USAGE:
391# @DESCRIPTION: 429# @DESCRIPTION:
392# Install a built package to ${D}, performing any necessary steps. 430# Install a built package to ${D}, performing any necessary steps.
393# Creates a ChangeLog from git if using live ebuilds. 431# Creates a ChangeLog from git if using live ebuilds.
394x-modular_src_install() { 432x-modular_src_install() {
395 # Install everything to ${XDIR} 433 # Install everything to ${XDIR}
434 if [[ ${CATEGORY} = x11-proto ]]; then
396 make \ 435 make \
436 ${PN/proto/}docdir=/usr/share/doc/${PF} \
397 DESTDIR="${D}" \ 437 DESTDIR="${D}" \
398 install \ 438 install \
399 || die 439 || die
440 else
441 # FIXME: Drop after X fonts stop running fc-cache during install, bug #278221
442 [[ -n ${FONT} ]] && addpredict /var/cache/fontconfig
443 make \
444 DESTDIR="${D}" \
445 install \
446 || die
447 fi
400# Shouldn't be necessary in XDIR=/usr 448# Shouldn't be necessary in XDIR=/usr
401# einstall forces datadir, so we need to re-force it 449# einstall forces datadir, so we need to re-force it
402# datadir=${XDIR}/share \ 450# datadir=${XDIR}/share \
403# mandir=${XDIR}/share/man \ 451# mandir=${XDIR}/share/man \
404 452
407 git log ${GIT_TREE} > "${S}"/ChangeLog 455 git log ${GIT_TREE} > "${S}"/ChangeLog
408 popd 456 popd
409 fi 457 fi
410 458
411 if [[ -e ${S}/ChangeLog ]]; then 459 if [[ -e ${S}/ChangeLog ]]; then
412 dodoc ${S}/ChangeLog 460 dodoc "${S}"/ChangeLog
413 fi 461 fi
414# @VARIABLE: DOCS 462# @VARIABLE: DOCS
415# @DESCRIPTION: 463# @DESCRIPTION:
416# Any documentation to install 464# Any documentation to install
417 [[ -n ${DOCS} ]] && dodoc ${DOCS} 465 [[ -n ${DOCS} ]] && dodoc ${DOCS}
418 466
419 # Make sure docs get compressed
420 prepalldocs
421
422 # Don't install libtool archives for server modules 467 # Don't install libtool archives for server modules
423 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then 468 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
424 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \ 469 find "${D}"/usr/$(get_libdir)/xorg/modules -name '*.la' \
425 | xargs rm -f 470 | xargs rm -f
426 fi 471 fi
427 472
428 if [[ -n "${FONT}" ]]; then 473 if [[ -n "${FONT}" ]]; then
429 remove_font_metadata 474 remove_font_metadata
516 die "${msg}" 561 die "${msg}"
517 fi 562 fi
518 563
519 create_fonts_scale 564 create_fonts_scale
520 create_fonts_dir 565 create_fonts_dir
521 fix_font_permissions
522 create_font_cache 566 create_font_cache
523} 567}
524 568
525# @FUNCTION: remove_font_metadata 569# @FUNCTION: remove_font_metadata
526# @USAGE: 570# @USAGE:
532 for DIR in ${FONT_DIR}; do 576 for DIR in ${FONT_DIR}; do
533 if [[ "${DIR}" != "Speedo" ]] && \ 577 if [[ "${DIR}" != "Speedo" ]] && \
534 [[ "${DIR}" != "CID" ]] ; then 578 [[ "${DIR}" != "CID" ]] ; then
535 # Delete font metadata files 579 # Delete font metadata files
536 # fonts.scale, fonts.dir, fonts.cache-1 580 # fonts.scale, fonts.dir, fonts.cache-1
537 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} 581 rm -f "${D}"/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
538 fi 582 fi
539 done 583 done
540} 584}
541 585
542# @FUNCTION: install_driver_hwdata 586# @FUNCTION: install_driver_hwdata
581 # NOTE: There is no way to regenerate Speedo/CID fonts.scale 625 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
582 # <dberkholz@gentoo.org> 2 August 2004 626 # <dberkholz@gentoo.org> 2 August 2004
583 if [[ "${x/encodings}" = "${x}" ]] \ 627 if [[ "${x/encodings}" = "${x}" ]] \
584 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then 628 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
585 mkfontscale \ 629 mkfontscale \
586 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 630 -a "${ROOT}"/usr/share/fonts/encodings/encodings.dir \
587 -- ${x} 631 -- ${x}
588 fi 632 fi
589 done 633 done
590 eend 0 634 eend 0
591} 635}
601 [[ -z "$(ls ${x}/)" ]] && continue 645 [[ -z "$(ls ${x}/)" ]] && continue
602 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 646 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
603 647
604 if [[ "${x/encodings}" = "${x}" ]]; then 648 if [[ "${x/encodings}" = "${x}" ]]; then
605 mkfontdir \ 649 mkfontdir \
606 -e ${ROOT}/usr/share/fonts/encodings \ 650 -e "${ROOT}"/usr/share/fonts/encodings \
607 -e ${ROOT}/usr/share/fonts/encodings/large \ 651 -e "${ROOT}"/usr/share/fonts/encodings/large \
608 -- ${x} 652 -- ${x}
609 fi 653 fi
610 done 654 done
611 eend 0 655 eend 0
612} 656}
613 657
614# @FUNCTION: fix_font_permissions
615# @USAGE:
616# @DESCRIPTION:
617# Font files should have 644 permissions. Ensure this is the case.
618fix_font_permissions() {
619 ebegin "Fixing permissions"
620 for DIR in ${FONT_DIR}; do
621 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
622 -exec chmod 0644 {} \;
623 done
624 eend 0
625}
626
627# @FUNCTION: create_font_cache 658# @FUNCTION: create_font_cache
628# @USAGE: 659# @USAGE:
629# @DESCRIPTION: 660# @DESCRIPTION:
630# Create fonts.cache-1 files, used by the new client-side fonts 661# Create fonts.cache-1 files, used by the new client-side fonts
631# subsystem. 662# subsystem.
632create_font_cache() { 663create_font_cache() {
633 font_pkg_postinst 664 font_pkg_postinst
634} 665}
635
636EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm

Legend:
Removed from v.1.103  
changed lines
  Added in v.1.112

  ViewVC Help
Powered by ViewVC 1.1.20