/[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.98 Revision 1.107
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.98 2008/05/27 18:40:19 dberkholz Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.107 2009/03/03 16:28:32 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.
… …
43 SRC_URI="" 43 SRC_URI=""
44fi 44fi
45 45
46# Set up SRC_URI for individual modular releases 46# Set up SRC_URI for individual modular releases
47BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual" 47BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
48if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then 48# @ECLASS-VARIABLE: MODULE
49# @DESCRIPTION:
50# The subdirectory to download source from. Possible settings are app,
51# doc, data, util, driver, font, lib, proto, xserver. Set above the
52# inherit to override the default autoconfigured module.
53if [[ -z ${MODULE} ]]; then
49 MODULE="app" 54 MODULE=""
50elif [[ ${CATEGORY} = app-doc ]]; then 55 case ${CATEGORY} in
51 MODULE="doc" 56 app-doc) MODULE="doc" ;;
52# x11-misc contains data and util, x11-themes contains data 57 media-fonts) MODULE="font" ;;
53elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then 58 x11-apps|x11-wm) MODULE="app" ;;
54 if [[ ${PN} == xbitmaps || ${PN} == xcursor-themes || ${PN} == xkbdata ]]; then 59 x11-misc|x11-themes) MODULE="util" ;;
55 MODULE="data" 60 x11-drivers) MODULE="driver" ;;
56 else 61 x11-base) MODULE="xserver" ;;
57 MODULE="util" 62 x11-proto) MODULE="proto" ;;
58 fi 63 x11-libs) MODULE="lib" ;;
59elif [[ ${CATEGORY} = x11-drivers ]]; then 64 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 65fi
70 66
71if [[ -n ${GIT_ECLASS} ]]; then 67if [[ -n ${GIT_ECLASS} ]]; then
72 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PN}" 68 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PN}"
73else 69else
… …
194# @DESCRIPTION: 190# @DESCRIPTION:
195# Ensures the server supports DRI if building a driver with DRI support 191# Ensures the server supports DRI if building a driver with DRI support
196x-modular_dri_check() { 192x-modular_dri_check() {
197 # (#120057) Enabling DRI in drivers requires that the server was built with 193 # (#120057) Enabling DRI in drivers requires that the server was built with
198 # support for it 194 # support for it
195 # Starting with xorg-server 1.5.3, DRI support is always enabled unless
196 # USE=minimal is set (see bug #252084)
199 if [[ -n "${DRIVER}" ]]; then 197 if [[ -n "${DRIVER}" ]]; then
200 if has dri ${IUSE} && use dri; then 198 if has dri ${IUSE} && use dri; then
201 einfo "Checking for direct rendering capabilities ..." 199 einfo "Checking for direct rendering capabilities ..."
200 if has_version '>=x11-base/xorg-server-1.5.3'; then
201 if built_with_use x11-base/xorg-server minimal; then
202 die "You must build x11-base/xorg-server with USE=-minimal."
203 fi
204 else
202 if ! built_with_use x11-base/xorg-server dri; then 205 if ! built_with_use x11-base/xorg-server dri; then
203 die "You must build x11-base/xorg-server with USE=dri." 206 die "You must build x11-base/xorg-server with USE=dri."
207 fi
204 fi 208 fi
205 fi 209 fi
206 fi 210 fi
207} 211}
208 212
… …
231 if [[ -n ${GIT_ECLASS} ]]; then 235 if [[ -n ${GIT_ECLASS} ]]; then
232 git_src_unpack 236 git_src_unpack
233 else 237 else
234 unpack ${A} 238 unpack ${A}
235 fi 239 fi
236 cd ${S} 240 cd "${S}"
237 241
238 if [[ -n ${FONT_OPTIONS} ]]; then 242 if [[ -n ${FONT_OPTIONS} ]]; then
239 einfo "Detected font directory: ${FONT_DIR}" 243 einfo "Detected font directory: ${FONT_DIR}"
240 fi 244 fi
241} 245}
… …
395# @DESCRIPTION: 399# @DESCRIPTION:
396# Install a built package to ${D}, performing any necessary steps. 400# Install a built package to ${D}, performing any necessary steps.
397# Creates a ChangeLog from git if using live ebuilds. 401# Creates a ChangeLog from git if using live ebuilds.
398x-modular_src_install() { 402x-modular_src_install() {
399 # Install everything to ${XDIR} 403 # Install everything to ${XDIR}
404 if [[ ${CATEGORY} = x11-proto ]]; then
400 make \ 405 make \
406 ${PN/proto/}docdir=/usr/share/doc/${PF} \
401 DESTDIR="${D}" \ 407 DESTDIR="${D}" \
402 install 408 install \
409 || die
410 else
411 make \
412 DESTDIR="${D}" \
413 install \
414 || die
415 fi
403# Shouldn't be necessary in XDIR=/usr 416# Shouldn't be necessary in XDIR=/usr
404# einstall forces datadir, so we need to re-force it 417# einstall forces datadir, so we need to re-force it
405# datadir=${XDIR}/share \ 418# datadir=${XDIR}/share \
406# mandir=${XDIR}/share/man \ 419# mandir=${XDIR}/share/man \
407 420
… …
410 git log ${GIT_TREE} > "${S}"/ChangeLog 423 git log ${GIT_TREE} > "${S}"/ChangeLog
411 popd 424 popd
412 fi 425 fi
413 426
414 if [[ -e ${S}/ChangeLog ]]; then 427 if [[ -e ${S}/ChangeLog ]]; then
415 dodoc ${S}/ChangeLog 428 dodoc "${S}"/ChangeLog
416 fi 429 fi
417# @VARIABLE: DOCS 430# @VARIABLE: DOCS
418# @DESCRIPTION: 431# @DESCRIPTION:
419# Any documentation to install 432# Any documentation to install
420 [[ -n ${DOCS} ]] && dodoc ${DOCS} 433 [[ -n ${DOCS} ]] && dodoc ${DOCS}
421 434
422 # Make sure docs get compressed
423 prepalldocs
424
425 # Don't install libtool archives for server modules 435 # Don't install libtool archives for server modules
426 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then 436 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
427 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \ 437 find "${D}"/usr/$(get_libdir)/xorg/modules -name '*.la' \
428 | xargs rm -f 438 | xargs rm -f
429 fi 439 fi
430 440
431 if [[ -n "${FONT}" ]]; then 441 if [[ -n "${FONT}" ]]; then
432 remove_font_metadata 442 remove_font_metadata
… …
535 for DIR in ${FONT_DIR}; do 545 for DIR in ${FONT_DIR}; do
536 if [[ "${DIR}" != "Speedo" ]] && \ 546 if [[ "${DIR}" != "Speedo" ]] && \
537 [[ "${DIR}" != "CID" ]] ; then 547 [[ "${DIR}" != "CID" ]] ; then
538 # Delete font metadata files 548 # Delete font metadata files
539 # fonts.scale, fonts.dir, fonts.cache-1 549 # fonts.scale, fonts.dir, fonts.cache-1
540 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} 550 rm -f "${D}"/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
541 fi 551 fi
542 done 552 done
543} 553}
544 554
545# @FUNCTION: install_driver_hwdata 555# @FUNCTION: install_driver_hwdata
… …
584 # NOTE: There is no way to regenerate Speedo/CID fonts.scale 594 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
585 # <dberkholz@gentoo.org> 2 August 2004 595 # <dberkholz@gentoo.org> 2 August 2004
586 if [[ "${x/encodings}" = "${x}" ]] \ 596 if [[ "${x/encodings}" = "${x}" ]] \
587 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then 597 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
588 mkfontscale \ 598 mkfontscale \
589 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 599 -a "${ROOT}"/usr/share/fonts/encodings/encodings.dir \
590 -- ${x} 600 -- ${x}
591 fi 601 fi
592 done 602 done
593 eend 0 603 eend 0
594} 604}
… …
604 [[ -z "$(ls ${x}/)" ]] && continue 614 [[ -z "$(ls ${x}/)" ]] && continue
605 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 615 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
606 616
607 if [[ "${x/encodings}" = "${x}" ]]; then 617 if [[ "${x/encodings}" = "${x}" ]]; then
608 mkfontdir \ 618 mkfontdir \
609 -e ${ROOT}/usr/share/fonts/encodings \ 619 -e "${ROOT}"/usr/share/fonts/encodings \
610 -e ${ROOT}/usr/share/fonts/encodings/large \ 620 -e "${ROOT}"/usr/share/fonts/encodings/large \
611 -- ${x} 621 -- ${x}
612 fi 622 fi
613 done 623 done
614 eend 0 624 eend 0
615} 625}
… …
619# @DESCRIPTION: 629# @DESCRIPTION:
620# Font files should have 644 permissions. Ensure this is the case. 630# Font files should have 644 permissions. Ensure this is the case.
621fix_font_permissions() { 631fix_font_permissions() {
622 ebegin "Fixing permissions" 632 ebegin "Fixing permissions"
623 for DIR in ${FONT_DIR}; do 633 for DIR in ${FONT_DIR}; do
624 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \ 634 find "${ROOT}"/usr/share/fonts/${DIR} -type f -name 'font.*' \
625 -exec chmod 0644 {} \; 635 -exec chmod 0644 {} \;
626 done 636 done
627 eend 0 637 eend 0
628} 638}
629 639
Legend:
Removed from v.1.98  
changed lines
  Added in v.1.107
  ViewVC Help
Powered by ViewVC 1.1.13