/[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.97 Revision 1.110
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.97 2008/05/09 07:18:19 dberkholz Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.110 2009/07/24 13:32:44 pva 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
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 76fi
39 77
40if [[ ${PV} = 9999* ]]; then
41 GIT_ECLASS="git"
42 SNAPSHOT="yes"
43 SRC_URI=""
44fi
45
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"
48if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then 80# @ECLASS-VARIABLE: MODULE
81# @DESCRIPTION:
82# The subdirectory to download source from. Possible settings are app,
83# doc, data, util, driver, font, lib, proto, xserver. Set above the
84# inherit to override the default autoconfigured module.
85if [[ -z ${MODULE} ]]; then
49 MODULE="app" 86 MODULE=""
50elif [[ ${CATEGORY} = app-doc ]]; then 87 case ${CATEGORY} in
51 MODULE="doc" 88 app-doc) MODULE="doc" ;;
52# x11-misc contains data and util, x11-themes contains data 89 media-fonts) MODULE="font" ;;
53elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then 90 x11-apps|x11-wm) MODULE="app" ;;
54 if [[ ${PN} == xbitmaps || ${PN} == xcursor-themes || ${PN} == xkbdata ]]; then 91 x11-misc|x11-themes) MODULE="util" ;;
55 MODULE="data" 92 x11-drivers) MODULE="driver" ;;
56 else 93 x11-base) MODULE="xserver" ;;
57 MODULE="util" 94 x11-proto) MODULE="proto" ;;
58 fi 95 x11-libs) MODULE="lib" ;;
59elif [[ ${CATEGORY} = x11-drivers ]]; then 96 esac
60 MODULE="driver"
61elif [[ ${CATEGORY} = media-fonts ]]; then
62 MODULE="font"
63elif [[ ${CATEGORY} = x11-libs ]]; then
64 MODULE="lib"
65elif [[ ${CATEGORY} = x11-proto ]]; then
66 MODULE="proto"
67elif [[ ${CATEGORY} = x11-base ]]; then
68 MODULE="xserver"
69fi 97fi
70 98
71if [[ -n ${GIT_ECLASS} ]]; then 99if [[ -n ${GIT_ECLASS} ]]; then
72 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PN}" 100 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PN}"
73else 101else
88 >=sys-devel/m4-1.4" 116 >=sys-devel/m4-1.4"
89 WANT_AUTOCONF="latest" 117 WANT_AUTOCONF="latest"
90 WANT_AUTOMAKE="latest" 118 WANT_AUTOMAKE="latest"
91fi 119fi
92 120
93# If we're a font package, but not the font.alias one 121if [[ -n "${FONT}" ]]; then
94FONT_ECLASS=""
95if [[ "${PN/#font-}" != "${PN}" ]] \
96 && [[ "${CATEGORY}" = "media-fonts" ]] \
97 && [[ "${PN}" != "font-alias" ]] \
98 && [[ "${PN}" != "font-util" ]]; then
99 # Activate font code in the rest of the eclass
100 FONT="yes"
101
102 # Whether to inherit the font eclass
103 FONT_ECLASS="font"
104
105 RDEPEND="${RDEPEND} 122 RDEPEND="${RDEPEND}
106 media-fonts/encodings 123 media-fonts/encodings
107 x11-apps/mkfontscale 124 x11-apps/mkfontscale
108 x11-apps/mkfontdir" 125 x11-apps/mkfontdir"
109 PDEPEND="${PDEPEND} 126 PDEPEND="${PDEPEND}
172RDEPEND="${RDEPEND} 189RDEPEND="${RDEPEND}
173 !<=x11-base/xorg-x11-6.9" 190 !<=x11-base/xorg-x11-6.9"
174# Provides virtual/x11 for temporary use until packages are ported 191# Provides virtual/x11 for temporary use until packages are ported
175# x11-base/x11-env" 192# x11-base/x11-env"
176 193
177inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \
178 ${FONT_ECLASS} ${GIT_ECLASS}
179
180# @FUNCTION: x-modular_specs_check 194# @FUNCTION: x-modular_specs_check
181# @USAGE: 195# @USAGE:
182# @DESCRIPTION: 196# @DESCRIPTION:
183# Make any necessary changes related to gcc specs (generally hardened) 197# Make any necessary changes related to gcc specs (generally hardened)
184x-modular_specs_check() { 198x-modular_specs_check() {
194# @DESCRIPTION: 208# @DESCRIPTION:
195# Ensures the server supports DRI if building a driver with DRI support 209# Ensures the server supports DRI if building a driver with DRI support
196x-modular_dri_check() { 210x-modular_dri_check() {
197 # (#120057) Enabling DRI in drivers requires that the server was built with 211 # (#120057) Enabling DRI in drivers requires that the server was built with
198 # support for it 212 # support for it
213 # Starting with xorg-server 1.5.3, DRI support is always enabled unless
214 # USE=minimal is set (see bug #252084)
199 if [[ -n "${DRIVER}" ]]; then 215 if [[ -n "${DRIVER}" ]]; then
200 if has dri ${IUSE} && use dri; then 216 if has dri ${IUSE} && use dri; then
201 einfo "Checking for direct rendering capabilities ..." 217 einfo "Checking for direct rendering capabilities ..."
218 if has_version '>=x11-base/xorg-server-1.5.3'; then
219 if built_with_use x11-base/xorg-server minimal; then
220 die "You must build x11-base/xorg-server with USE=-minimal."
221 fi
222 else
202 if ! built_with_use x11-base/xorg-server dri; then 223 if ! built_with_use x11-base/xorg-server dri; then
203 die "You must build x11-base/xorg-server with USE=dri." 224 die "You must build x11-base/xorg-server with USE=dri."
225 fi
204 fi 226 fi
205 fi 227 fi
206 fi 228 fi
207} 229}
208 230
231 if [[ -n ${GIT_ECLASS} ]]; then 253 if [[ -n ${GIT_ECLASS} ]]; then
232 git_src_unpack 254 git_src_unpack
233 else 255 else
234 unpack ${A} 256 unpack ${A}
235 fi 257 fi
236 cd ${S} 258 cd "${S}"
237 259
238 if [[ -n ${FONT_OPTIONS} ]]; then 260 if [[ -n ${FONT_OPTIONS} ]]; then
239 einfo "Detected font directory: ${FONT_DIR}" 261 einfo "Detected font directory: ${FONT_DIR}"
240 fi 262 fi
241} 263}
291 # Joshua Baergen - October 23, 2005 313 # Joshua Baergen - October 23, 2005
292 # Fix shared lib issues on MIPS, FBSD, etc etc 314 # Fix shared lib issues on MIPS, FBSD, etc etc
293 elibtoolize 315 elibtoolize
294} 316}
295 317
318# @FUNCTION: x-modular_src_prepare
319# @USAGE:
320# @DESCRIPTION:
321# Prepare a package after unpacking, performing all X-related tasks.
322x-modular_src_prepare() {
323 [[ -n ${GIT_ECLASS} ]] && has src_prepare ${EXPORTED_FUNCTIONS} \
324 && git_src_prepare
325 x-modular_patch_source
326 x-modular_reconf_source
327}
328
296# @FUNCTION: x-modular_src_unpack 329# @FUNCTION: x-modular_src_unpack
297# @USAGE: 330# @USAGE:
298# @DESCRIPTION: 331# @DESCRIPTION:
299# Unpack a package, performing all X-related tasks. 332# Unpack a package, performing all X-related tasks.
300x-modular_src_unpack() { 333x-modular_src_unpack() {
301 x-modular_specs_check 334 x-modular_specs_check
302 x-modular_server_supports_drivers_check 335 x-modular_server_supports_drivers_check
303 x-modular_dri_check 336 x-modular_dri_check
304 x-modular_unpack_source 337 x-modular_unpack_source
305 x-modular_patch_source 338 has src_prepare ${EXPORTED_FUNCTIONS} || x-modular_src_prepare
306 x-modular_reconf_source
307} 339}
308 340
309# @FUNCTION: x-modular_font_configure 341# @FUNCTION: x-modular_font_configure
310# @USAGE: 342# @USAGE:
311# @DESCRIPTION: 343# @DESCRIPTION:
359 x-modular_debug_setup 391 x-modular_debug_setup
360 392
361# @VARIABLE: CONFIGURE_OPTIONS 393# @VARIABLE: CONFIGURE_OPTIONS
362# @DESCRIPTION: 394# @DESCRIPTION:
363# Any options to pass to configure 395# Any options to pass to configure
364[[ -n ${CONFIGURE_OPTIONTS} ]] 396[[ -n ${CONFIGURE_OPTIONS} ]]
365 397
366 # If prefix isn't set here, .pc files cause problems 398 # If prefix isn't set here, .pc files cause problems
367 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then 399 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
368 econf --prefix=${XDIR} \ 400 econf --prefix=${XDIR} \
369 --datadir=${XDIR}/share \ 401 --datadir=${XDIR}/share \
379# Run make. 411# Run make.
380x-modular_src_make() { 412x-modular_src_make() {
381 emake || die "emake failed" 413 emake || die "emake failed"
382} 414}
383 415
384# @FUNCTION: x-modular_src_configure 416# @FUNCTION: x-modular_src_compile
385# @USAGE: 417# @USAGE:
386# @DESCRIPTION: 418# @DESCRIPTION:
387# Compile a package, performing all X-related tasks. 419# Compile a package, performing all X-related tasks.
388x-modular_src_compile() { 420x-modular_src_compile() {
389 x-modular_src_configure 421 has src_configure ${EXPORTED_FUNCTIONS} || x-modular_src_configure
390 x-modular_src_make 422 x-modular_src_make
391} 423}
392 424
393# @FUNCTION: x-modular_src_install 425# @FUNCTION: x-modular_src_install
394# @USAGE: 426# @USAGE:
395# @DESCRIPTION: 427# @DESCRIPTION:
396# Install a built package to ${D}, performing any necessary steps. 428# Install a built package to ${D}, performing any necessary steps.
397# Creates a ChangeLog from git if using live ebuilds. 429# Creates a ChangeLog from git if using live ebuilds.
398x-modular_src_install() { 430x-modular_src_install() {
399 # Install everything to ${XDIR} 431 # Install everything to ${XDIR}
432 if [[ ${CATEGORY} = x11-proto ]]; then
400 make \ 433 make \
434 ${PN/proto/}docdir=/usr/share/doc/${PF} \
401 DESTDIR="${D}" \ 435 DESTDIR="${D}" \
402 install 436 install \
437 || die
438 else
439 # FIXME: Drop after X fonts stop running fc-cache during install, bug #278221
440 [[ -n ${FONT} ]] && addpredict /var/cache/fontconfig
441 make \
442 DESTDIR="${D}" \
443 install \
444 || die
445 fi
403# Shouldn't be necessary in XDIR=/usr 446# Shouldn't be necessary in XDIR=/usr
404# einstall forces datadir, so we need to re-force it 447# einstall forces datadir, so we need to re-force it
405# datadir=${XDIR}/share \ 448# datadir=${XDIR}/share \
406# mandir=${XDIR}/share/man \ 449# mandir=${XDIR}/share/man \
407 450
410 git log ${GIT_TREE} > "${S}"/ChangeLog 453 git log ${GIT_TREE} > "${S}"/ChangeLog
411 popd 454 popd
412 fi 455 fi
413 456
414 if [[ -e ${S}/ChangeLog ]]; then 457 if [[ -e ${S}/ChangeLog ]]; then
415 dodoc ${S}/ChangeLog 458 dodoc "${S}"/ChangeLog
416 fi 459 fi
417# @VARIABLE: DOCS 460# @VARIABLE: DOCS
418# @DESCRIPTION: 461# @DESCRIPTION:
419# Any documentation to install 462# Any documentation to install
420 [[ -n ${DOCS} ]] && dodoc ${DOCS} 463 [[ -n ${DOCS} ]] && dodoc ${DOCS}
421 464
422 # Make sure docs get compressed
423 prepalldocs
424
425 # Don't install libtool archives for server modules 465 # Don't install libtool archives for server modules
426 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then 466 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
427 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \ 467 find "${D}"/usr/$(get_libdir)/xorg/modules -name '*.la' \
428 | xargs rm -f 468 | xargs rm -f
429 fi 469 fi
430 470
431 if [[ -n "${FONT}" ]]; then 471 if [[ -n "${FONT}" ]]; then
432 remove_font_metadata 472 remove_font_metadata
535 for DIR in ${FONT_DIR}; do 575 for DIR in ${FONT_DIR}; do
536 if [[ "${DIR}" != "Speedo" ]] && \ 576 if [[ "${DIR}" != "Speedo" ]] && \
537 [[ "${DIR}" != "CID" ]] ; then 577 [[ "${DIR}" != "CID" ]] ; then
538 # Delete font metadata files 578 # Delete font metadata files
539 # fonts.scale, fonts.dir, fonts.cache-1 579 # fonts.scale, fonts.dir, fonts.cache-1
540 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} 580 rm -f "${D}"/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
541 fi 581 fi
542 done 582 done
543} 583}
544 584
545# @FUNCTION: install_driver_hwdata 585# @FUNCTION: install_driver_hwdata
584 # NOTE: There is no way to regenerate Speedo/CID fonts.scale 624 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
585 # <dberkholz@gentoo.org> 2 August 2004 625 # <dberkholz@gentoo.org> 2 August 2004
586 if [[ "${x/encodings}" = "${x}" ]] \ 626 if [[ "${x/encodings}" = "${x}" ]] \
587 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then 627 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
588 mkfontscale \ 628 mkfontscale \
589 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 629 -a "${ROOT}"/usr/share/fonts/encodings/encodings.dir \
590 -- ${x} 630 -- ${x}
591 fi 631 fi
592 done 632 done
593 eend 0 633 eend 0
594} 634}
604 [[ -z "$(ls ${x}/)" ]] && continue 644 [[ -z "$(ls ${x}/)" ]] && continue
605 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 645 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
606 646
607 if [[ "${x/encodings}" = "${x}" ]]; then 647 if [[ "${x/encodings}" = "${x}" ]]; then
608 mkfontdir \ 648 mkfontdir \
609 -e ${ROOT}/usr/share/fonts/encodings \ 649 -e "${ROOT}"/usr/share/fonts/encodings \
610 -e ${ROOT}/usr/share/fonts/encodings/large \ 650 -e "${ROOT}"/usr/share/fonts/encodings/large \
611 -- ${x} 651 -- ${x}
612 fi 652 fi
613 done 653 done
614 eend 0 654 eend 0
615} 655}
619# @DESCRIPTION: 659# @DESCRIPTION:
620# Font files should have 644 permissions. Ensure this is the case. 660# Font files should have 644 permissions. Ensure this is the case.
621fix_font_permissions() { 661fix_font_permissions() {
622 ebegin "Fixing permissions" 662 ebegin "Fixing permissions"
623 for DIR in ${FONT_DIR}; do 663 for DIR in ${FONT_DIR}; do
624 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \ 664 find "${ROOT}"/usr/share/fonts/${DIR} -type f -name 'font.*' \
625 -exec chmod 0644 {} \; 665 -exec chmod 0644 {} \;
626 done 666 done
627 eend 0 667 eend 0
628} 668}
629 669
633# Create fonts.cache-1 files, used by the new client-side fonts 673# Create fonts.cache-1 files, used by the new client-side fonts
634# subsystem. 674# subsystem.
635create_font_cache() { 675create_font_cache() {
636 font_pkg_postinst 676 font_pkg_postinst
637} 677}
638
639EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm

Legend:
Removed from v.1.97  
changed lines
  Added in v.1.110

  ViewVC Help
Powered by ViewVC 1.1.20