/[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.102 Revision 1.109
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.102 2008/08/25 17:10:36 dberkholz Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.109 2009/05/14 12:40:55 remi 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}
… …
168RDEPEND="${RDEPEND} 189RDEPEND="${RDEPEND}
169 !<=x11-base/xorg-x11-6.9" 190 !<=x11-base/xorg-x11-6.9"
170# Provides virtual/x11 for temporary use until packages are ported 191# Provides virtual/x11 for temporary use until packages are ported
171# x11-base/x11-env" 192# x11-base/x11-env"
172 193
173inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \
174 ${FONT_ECLASS} ${GIT_ECLASS}
175
176# @FUNCTION: x-modular_specs_check 194# @FUNCTION: x-modular_specs_check
177# @USAGE: 195# @USAGE:
178# @DESCRIPTION: 196# @DESCRIPTION:
179# Make any necessary changes related to gcc specs (generally hardened) 197# Make any necessary changes related to gcc specs (generally hardened)
180x-modular_specs_check() { 198x-modular_specs_check() {
… …
190# @DESCRIPTION: 208# @DESCRIPTION:
191# 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
192x-modular_dri_check() { 210x-modular_dri_check() {
193 # (#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
194 # 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)
195 if [[ -n "${DRIVER}" ]]; then 215 if [[ -n "${DRIVER}" ]]; then
196 if has dri ${IUSE} && use dri; then 216 if has dri ${IUSE} && use dri; then
197 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
198 if ! built_with_use x11-base/xorg-server dri; then 223 if ! built_with_use x11-base/xorg-server dri; then
199 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
200 fi 226 fi
201 fi 227 fi
202 fi 228 fi
203} 229}
204 230
… …
227 if [[ -n ${GIT_ECLASS} ]]; then 253 if [[ -n ${GIT_ECLASS} ]]; then
228 git_src_unpack 254 git_src_unpack
229 else 255 else
230 unpack ${A} 256 unpack ${A}
231 fi 257 fi
232 cd ${S} 258 cd "${S}"
233 259
234 if [[ -n ${FONT_OPTIONS} ]]; then 260 if [[ -n ${FONT_OPTIONS} ]]; then
235 einfo "Detected font directory: ${FONT_DIR}" 261 einfo "Detected font directory: ${FONT_DIR}"
236 fi 262 fi
237} 263}
… …
287 # Joshua Baergen - October 23, 2005 313 # Joshua Baergen - October 23, 2005
288 # Fix shared lib issues on MIPS, FBSD, etc etc 314 # Fix shared lib issues on MIPS, FBSD, etc etc
289 elibtoolize 315 elibtoolize
290} 316}
291 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
292# @FUNCTION: x-modular_src_unpack 329# @FUNCTION: x-modular_src_unpack
293# @USAGE: 330# @USAGE:
294# @DESCRIPTION: 331# @DESCRIPTION:
295# Unpack a package, performing all X-related tasks. 332# Unpack a package, performing all X-related tasks.
296x-modular_src_unpack() { 333x-modular_src_unpack() {
297 x-modular_specs_check 334 x-modular_specs_check
298 x-modular_server_supports_drivers_check 335 x-modular_server_supports_drivers_check
299 x-modular_dri_check 336 x-modular_dri_check
300 x-modular_unpack_source 337 x-modular_unpack_source
301 x-modular_patch_source 338 has src_prepare ${EXPORTED_FUNCTIONS} || x-modular_src_prepare
302 x-modular_reconf_source
303} 339}
304 340
305# @FUNCTION: x-modular_font_configure 341# @FUNCTION: x-modular_font_configure
306# @USAGE: 342# @USAGE:
307# @DESCRIPTION: 343# @DESCRIPTION:
… …
375# Run make. 411# Run make.
376x-modular_src_make() { 412x-modular_src_make() {
377 emake || die "emake failed" 413 emake || die "emake failed"
378} 414}
379 415
380# @FUNCTION: x-modular_src_configure 416# @FUNCTION: x-modular_src_compile
381# @USAGE: 417# @USAGE:
382# @DESCRIPTION: 418# @DESCRIPTION:
383# Compile a package, performing all X-related tasks. 419# Compile a package, performing all X-related tasks.
384x-modular_src_compile() { 420x-modular_src_compile() {
385 x-modular_src_configure 421 has src_configure ${EXPORTED_FUNCTIONS} || x-modular_src_configure
386 x-modular_src_make 422 x-modular_src_make
387} 423}
388 424
389# @FUNCTION: x-modular_src_install 425# @FUNCTION: x-modular_src_install
390# @USAGE: 426# @USAGE:
391# @DESCRIPTION: 427# @DESCRIPTION:
392# Install a built package to ${D}, performing any necessary steps. 428# Install a built package to ${D}, performing any necessary steps.
393# Creates a ChangeLog from git if using live ebuilds. 429# Creates a ChangeLog from git if using live ebuilds.
394x-modular_src_install() { 430x-modular_src_install() {
395 # Install everything to ${XDIR} 431 # Install everything to ${XDIR}
432 if [[ ${CATEGORY} = x11-proto ]]; then
396 make \ 433 make \
434 ${PN/proto/}docdir=/usr/share/doc/${PF} \
397 DESTDIR="${D}" \ 435 DESTDIR="${D}" \
398 install \ 436 install \
399 || die 437 || die
438 else
439 make \
440 DESTDIR="${D}" \
441 install \
442 || die
443 fi
400# Shouldn't be necessary in XDIR=/usr 444# Shouldn't be necessary in XDIR=/usr
401# einstall forces datadir, so we need to re-force it 445# einstall forces datadir, so we need to re-force it
402# datadir=${XDIR}/share \ 446# datadir=${XDIR}/share \
403# mandir=${XDIR}/share/man \ 447# mandir=${XDIR}/share/man \
404 448
… …
407 git log ${GIT_TREE} > "${S}"/ChangeLog 451 git log ${GIT_TREE} > "${S}"/ChangeLog
408 popd 452 popd
409 fi 453 fi
410 454
411 if [[ -e ${S}/ChangeLog ]]; then 455 if [[ -e ${S}/ChangeLog ]]; then
412 dodoc ${S}/ChangeLog 456 dodoc "${S}"/ChangeLog
413 fi 457 fi
414# @VARIABLE: DOCS 458# @VARIABLE: DOCS
415# @DESCRIPTION: 459# @DESCRIPTION:
416# Any documentation to install 460# Any documentation to install
417 [[ -n ${DOCS} ]] && dodoc ${DOCS} 461 [[ -n ${DOCS} ]] && dodoc ${DOCS}
418 462
419 # Make sure docs get compressed
420 prepalldocs
421
422 # Don't install libtool archives for server modules 463 # Don't install libtool archives for server modules
423 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then 464 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
424 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \ 465 find "${D}"/usr/$(get_libdir)/xorg/modules -name '*.la' \
425 | xargs rm -f 466 | xargs rm -f
426 fi 467 fi
427 468
428 if [[ -n "${FONT}" ]]; then 469 if [[ -n "${FONT}" ]]; then
429 remove_font_metadata 470 remove_font_metadata
… …
532 for DIR in ${FONT_DIR}; do 573 for DIR in ${FONT_DIR}; do
533 if [[ "${DIR}" != "Speedo" ]] && \ 574 if [[ "${DIR}" != "Speedo" ]] && \
534 [[ "${DIR}" != "CID" ]] ; then 575 [[ "${DIR}" != "CID" ]] ; then
535 # Delete font metadata files 576 # Delete font metadata files
536 # fonts.scale, fonts.dir, fonts.cache-1 577 # fonts.scale, fonts.dir, fonts.cache-1
537 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} 578 rm -f "${D}"/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
538 fi 579 fi
539 done 580 done
540} 581}
541 582
542# @FUNCTION: install_driver_hwdata 583# @FUNCTION: install_driver_hwdata
… …
581 # NOTE: There is no way to regenerate Speedo/CID fonts.scale 622 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
582 # <dberkholz@gentoo.org> 2 August 2004 623 # <dberkholz@gentoo.org> 2 August 2004
583 if [[ "${x/encodings}" = "${x}" ]] \ 624 if [[ "${x/encodings}" = "${x}" ]] \
584 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then 625 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
585 mkfontscale \ 626 mkfontscale \
586 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 627 -a "${ROOT}"/usr/share/fonts/encodings/encodings.dir \
587 -- ${x} 628 -- ${x}
588 fi 629 fi
589 done 630 done
590 eend 0 631 eend 0
591} 632}
… …
601 [[ -z "$(ls ${x}/)" ]] && continue 642 [[ -z "$(ls ${x}/)" ]] && continue
602 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 643 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
603 644
604 if [[ "${x/encodings}" = "${x}" ]]; then 645 if [[ "${x/encodings}" = "${x}" ]]; then
605 mkfontdir \ 646 mkfontdir \
606 -e ${ROOT}/usr/share/fonts/encodings \ 647 -e "${ROOT}"/usr/share/fonts/encodings \
607 -e ${ROOT}/usr/share/fonts/encodings/large \ 648 -e "${ROOT}"/usr/share/fonts/encodings/large \
608 -- ${x} 649 -- ${x}
609 fi 650 fi
610 done 651 done
611 eend 0 652 eend 0
612} 653}
… …
616# @DESCRIPTION: 657# @DESCRIPTION:
617# Font files should have 644 permissions. Ensure this is the case. 658# Font files should have 644 permissions. Ensure this is the case.
618fix_font_permissions() { 659fix_font_permissions() {
619 ebegin "Fixing permissions" 660 ebegin "Fixing permissions"
620 for DIR in ${FONT_DIR}; do 661 for DIR in ${FONT_DIR}; do
621 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \ 662 find "${ROOT}"/usr/share/fonts/${DIR} -type f -name 'font.*' \
622 -exec chmod 0644 {} \; 663 -exec chmod 0644 {} \;
623 done 664 done
624 eend 0 665 eend 0
625} 666}
626 667
… …
630# Create fonts.cache-1 files, used by the new client-side fonts 671# Create fonts.cache-1 files, used by the new client-side fonts
631# subsystem. 672# subsystem.
632create_font_cache() { 673create_font_cache() {
633 font_pkg_postinst 674 font_pkg_postinst
634} 675}
635
636EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
Legend:
Removed from v.1.102  
changed lines
  Added in v.1.109
  ViewVC Help
Powered by ViewVC 1.1.13