/[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.76 Revision 1.87
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.76 2006/10/11 02:31:47 dberkholz Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.87 2007/10/14 10:12:24 dberkholz Exp $
4# 4#
5# Author: Donnie Berkholz <spyderous@gentoo.org> 5# Author: Donnie Berkholz <dberkholz@gentoo.org>
6# 6#
7# This eclass is designed to reduce code duplication in the modularized X11 7# This eclass is designed to reduce code duplication in the modularized X11
8# ebuilds. 8# ebuilds.
9# 9#
10# Using this eclass: 10# Using this eclass:
19# 19#
20# If you're creating a font package and the suffix of PN is not equal to the 20# If you're creating a font package and the suffix of PN is not equal to the
21# subdirectory of /usr/share/fonts/ it should install into, set FONT_DIR to that 21# subdirectory of /usr/share/fonts/ it should install into, set FONT_DIR to that
22# directory or directories. 22# directory or directories.
23# 23#
24# If you want to change the auto-application of the driver patchset or prevent
25# it from applying, edit XDPVER in the ebuild. Set it to -1 to prevent patch
26# application or positive integers for that patch version.
27#
24# IMPORTANT: Both SNAPSHOT and FONT_DIR must be set _before_ the inherit. 28# IMPORTANT: SNAPSHOT, FONT_DIR and XDPVER must be set _before_ the inherit.
29#
30# If you want to install to a non-default prefix (e.g., /opt/xorg), change
31# XDIR. This has not been recently tested. You may need to uncomment the
32# setting of datadir and mandir in x-modular_src_install() or add it back in if
33# it's no longer there. You may also want to change the SLOT.
25# 34#
26# Pretty much everything else should be automatic. 35# Pretty much everything else should be automatic.
27
28EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
29
30inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools
31 36
32# Directory prefix to use for everything 37# Directory prefix to use for everything
33XDIR="/usr" 38XDIR="/usr"
34 39
35# Set up default patchset version(s) if necessary 40# Set up default patchset version(s) if necessary
39fi 44fi
40 45
41IUSE="" 46IUSE=""
42HOMEPAGE="http://xorg.freedesktop.org/" 47HOMEPAGE="http://xorg.freedesktop.org/"
43 48
49if [[ ${PV} = 9999* ]]; then
50 GIT_ECLASS="git"
51 SNAPSHOT="yes"
52 SRC_URI=""
53fi
54
44# Set up SRC_URI for individual modular releases 55# Set up SRC_URI for individual modular releases
45BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual" 56BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
46if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then 57if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then
47 SRC_URI="${SRC_URI} 58 MODULE="app"
48 ${BASE_INDIVIDUAL_URI}/app/${P}.tar.bz2"
49elif [[ ${CATEGORY} = app-doc ]]; then 59elif [[ ${CATEGORY} = app-doc ]]; then
50 SRC_URI="${SRC_URI} 60 MODULE="doc"
51 ${BASE_INDIVIDUAL_URI}/doc/${P}.tar.bz2"
52# x11-misc contains data and util, x11-themes contains data 61# x11-misc contains data and util, x11-themes contains data
53elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then 62elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then
54 SRC_URI="${SRC_URI} 63 if [[ ${PN} == xbitmaps || ${PN} == xcursor-themes || ${PN} == xkbdata ]]; then
55 ${BASE_INDIVIDUAL_URI}/data/${P}.tar.bz2 64 MODULE="data"
56 ${BASE_INDIVIDUAL_URI}/util/${P}.tar.bz2" 65 else
66 MODULE="data"
67 fi
57elif [[ ${CATEGORY} = x11-drivers ]]; then 68elif [[ ${CATEGORY} = x11-drivers ]]; then
58 SRC_URI="${SRC_URI} 69 MODULE="driver"
59 ${BASE_INDIVIDUAL_URI}/driver/${P}.tar.bz2"
60elif [[ ${CATEGORY} = media-fonts ]]; then 70elif [[ ${CATEGORY} = media-fonts ]]; then
61 SRC_URI="${SRC_URI} 71 MODULE="font"
62 ${BASE_INDIVIDUAL_URI}/font/${P}.tar.bz2"
63elif [[ ${CATEGORY} = x11-libs ]]; then 72elif [[ ${CATEGORY} = x11-libs ]]; then
64 SRC_URI="${SRC_URI} 73 MODULE="lib"
65 ${BASE_INDIVIDUAL_URI}/lib/${P}.tar.bz2"
66elif [[ ${CATEGORY} = x11-proto ]]; then 74elif [[ ${CATEGORY} = x11-proto ]]; then
67 SRC_URI="${SRC_URI} 75 MODULE="proto"
68 ${BASE_INDIVIDUAL_URI}/proto/${P}.tar.bz2"
69elif [[ ${CATEGORY} = x11-base ]]; then 76elif [[ ${CATEGORY} = x11-base ]]; then
70 SRC_URI="${SRC_URI} 77 MODULE="xserver"
71 ${BASE_INDIVIDUAL_URI}/xserver/${P}.tar.bz2" 78fi
79
80if [[ -n ${GIT_ECLASS} ]]; then
81 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PN}"
82else
83 SRC_URI="${SRC_URI} ${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2"
72fi 84fi
73 85
74SLOT="0" 86SLOT="0"
75 87
76# Set the license for the package. This can be overridden by setting 88# Set the license for the package. This can be overridden by setting
79 91
80# Set up shared dependencies 92# Set up shared dependencies
81if [[ -n "${SNAPSHOT}" ]]; then 93if [[ -n "${SNAPSHOT}" ]]; then
82# FIXME: What's the minimal libtool version supporting arbitrary versioning? 94# FIXME: What's the minimal libtool version supporting arbitrary versioning?
83 DEPEND="${DEPEND} 95 DEPEND="${DEPEND}
84 >=sys-devel/autoconf-2.57
85 >=sys-devel/automake-1.7
86 >=sys-devel/libtool-1.5 96 >=sys-devel/libtool-1.5
87 >=sys-devel/m4-1.4" 97 >=sys-devel/m4-1.4"
98 WANT_AUTOCONF="latest"
99 WANT_AUTOMAKE="latest"
88fi 100fi
89 101
90# If we're a font package, but not the font.alias one 102# If we're a font package, but not the font.alias one
103FONT_ECLASS=""
91if [[ "${PN/#font-}" != "${PN}" ]] \ 104if [[ "${PN/#font-}" != "${PN}" ]] \
92 && [[ "${CATEGORY}" = "media-fonts" ]] \ 105 && [[ "${CATEGORY}" = "media-fonts" ]] \
93 && [[ "${PN}" != "font-alias" ]] \ 106 && [[ "${PN}" != "font-alias" ]] \
94 && [[ "${PN}" != "font-util" ]]; then 107 && [[ "${PN}" != "font-util" ]]; then
95 # Activate font code in the rest of the eclass 108 # Activate font code in the rest of the eclass
96 FONT="yes" 109 FONT="yes"
97 110
111 # Whether to inherit the font eclass
112 FONT_ECLASS="font"
113
98 RDEPEND="${RDEPEND} 114 RDEPEND="${RDEPEND}
99 media-fonts/encodings 115 media-fonts/encodings
100 x11-apps/mkfontscale 116 x11-apps/mkfontscale
101 x11-apps/mkfontdir" 117 x11-apps/mkfontdir"
102 PDEPEND="${PDEPEND} 118 PDEPEND="${PDEPEND}
133 DRIVER="yes" 149 DRIVER="yes"
134 150
135 if [[ ${XDPVER} != -1 ]]; then 151 if [[ ${XDPVER} != -1 ]]; then
136 # Add driver patchset to SRC_URI 152 # Add driver patchset to SRC_URI
137 SRC_URI="${SRC_URI} 153 SRC_URI="${SRC_URI}
138 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2" 154 mirror://gentoo/x11-driver-patches-${XDPVER}.tar.bz2"
139 fi 155 fi
140fi 156fi
141 157
142# Debugging -- ignore packages that can't be built with debugging 158# Debugging -- ignore packages that can't be built with debugging
143if [[ -z "${FONT}" ]] \ 159if [[ -z "${FONT}" ]] \
149 || [[ "${PN/xorg-cf-files}" != "${PN}" ]] \ 165 || [[ "${PN/xorg-cf-files}" != "${PN}" ]] \
150 || [[ "${PN/xcursor}" != "${PN}" ]] \ 166 || [[ "${PN/xcursor}" != "${PN}" ]] \
151 ; then 167 ; then
152 DEBUGGABLE="yes" 168 DEBUGGABLE="yes"
153 IUSE="${IUSE} debug" 169 IUSE="${IUSE} debug"
154 if use debug; then
155 if ! has splitdebug ${FEATURES}; then
156 RESTRICT="${RESTRICT} nostrip"
157 fi
158 fi
159fi 170fi
160 171
161DEPEND="${DEPEND} 172DEPEND="${DEPEND}
162 >=dev-util/pkgconfig-0.18" 173 >=dev-util/pkgconfig-0.18"
163 174
170RDEPEND="${RDEPEND} 181RDEPEND="${RDEPEND}
171 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 ) 182 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
172 !<=x11-base/xorg-x11-6.9" 183 !<=x11-base/xorg-x11-6.9"
173# Provides virtual/x11 for temporary use until packages are ported 184# Provides virtual/x11 for temporary use until packages are ported
174# x11-base/x11-env" 185# x11-base/x11-env"
186
187inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \
188 ${FONT_ECLASS} ${GIT_ECLASS}
175 189
176x-modular_specs_check() { 190x-modular_specs_check() {
177 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 191 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
178 append-ldflags -Wl,-z,lazy 192 append-ldflags -Wl,-z,lazy
179 # (#116698) breaks loading 193 # (#116698) breaks loading
206 fi 220 fi
207 fi 221 fi
208} 222}
209 223
210x-modular_unpack_source() { 224x-modular_unpack_source() {
225 if [[ -n ${GIT_ECLASS} ]]; then
226 git_src_unpack
227 else
211 unpack ${A} 228 unpack ${A}
229 fi
212 cd ${S} 230 cd ${S}
213 231
214 if [[ -n ${FONT_OPTIONS} ]]; then 232 if [[ -n ${FONT_OPTIONS} ]]; then
215 einfo "Detected font directory: ${FONT_DIR}" 233 einfo "Detected font directory: ${FONT_DIR}"
216 fi 234 fi
311x-modular_src_configure() { 329x-modular_src_configure() {
312 x-modular_font_configure 330 x-modular_font_configure
313 x-modular_debug_setup 331 x-modular_debug_setup
314 332
315 # If prefix isn't set here, .pc files cause problems 333 # If prefix isn't set here, .pc files cause problems
316 if [[ -x ./configure ]]; then 334 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
317 econf --prefix=${XDIR} \ 335 econf --prefix=${XDIR} \
318 --datadir=${XDIR}/share \ 336 --datadir=${XDIR}/share \
319 ${FONT_OPTIONS} \ 337 ${FONT_OPTIONS} \
320 ${DRIVER_OPTIONS} \ 338 ${DRIVER_OPTIONS} \
321 ${CONFIGURE_OPTIONS} 339 ${CONFIGURE_OPTIONS}
339# Shouldn't be necessary in XDIR=/usr 357# Shouldn't be necessary in XDIR=/usr
340# einstall forces datadir, so we need to re-force it 358# einstall forces datadir, so we need to re-force it
341# datadir=${XDIR}/share \ 359# datadir=${XDIR}/share \
342# mandir=${XDIR}/share/man \ 360# mandir=${XDIR}/share/man \
343 361
362 if [[ -n ${GIT_ECLASS} ]]; then
363 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}"
364 git log ${GIT_TREE} > "${S}"/ChangeLog
365 popd
366 fi
367
344 if [[ -e ${S}/ChangeLog ]]; then 368 if [[ -e ${S}/ChangeLog ]]; then
345 dodoc ${S}/ChangeLog 369 dodoc ${S}/ChangeLog
346 fi 370 fi
347 371
348 # Make sure docs get compressed 372 # Make sure docs get compressed
364 install_driver_hwdata 388 install_driver_hwdata
365 fi 389 fi
366} 390}
367 391
368x-modular_pkg_preinst() { 392x-modular_pkg_preinst() {
369 if [[ -n "${FONT}" ]]; then 393 # We no longer do anything here, but we can't remove it from the API
370 discover_font_dirs 394 :
371 fi
372} 395}
373 396
374x-modular_pkg_postinst() { 397x-modular_pkg_postinst() {
375 if [[ -n "${FONT}" ]]; then 398 if [[ -n "${FONT}" ]]; then
376 setup_fonts 399 setup_fonts
378} 401}
379 402
380x-modular_pkg_postrm() { 403x-modular_pkg_postrm() {
381 if [[ -n "${FONT}" ]]; then 404 if [[ -n "${FONT}" ]]; then
382 cleanup_fonts 405 cleanup_fonts
406 font_pkg_postrm
383 fi 407 fi
384} 408}
385 409
386cleanup_fonts() { 410cleanup_fonts() {
387 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale" 411 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
417 eend 0 441 eend 0
418 done 442 done
419} 443}
420 444
421setup_fonts() { 445setup_fonts() {
422 if [[ ! -n "${FONT_DIRS}" ]]; then 446 if [[ ! -n "${FONT_DIR}" ]]; then
423 msg="FONT_DIRS is empty. The ebuild should set it to at least one subdir of /usr/share/fonts." 447 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
424 eerror "${msg}" 448 eerror "${msg}"
425 die "${msg}" 449 die "${msg}"
426 fi 450 fi
427 451
428 create_fonts_scale 452 create_fonts_scale
455 fi 479 fi
456 done 480 done
457} 481}
458 482
459discover_font_dirs() { 483discover_font_dirs() {
460 pushd ${IMAGE}/usr/share/fonts 484 FONT_DIRS="${FONT_DIR}"
461 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
462 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
463 popd
464} 485}
465 486
466create_fonts_scale() { 487create_fonts_scale() {
467 ebegin "Creating fonts.scale files" 488 ebegin "Creating fonts.scale files"
468 local x 489 local x
469 for FONT_DIR in ${FONT_DIRS}; do 490 for DIR in ${FONT_DIR}; do
470 x=${ROOT}/usr/share/fonts/${FONT_DIR} 491 x=${ROOT}/usr/share/fonts/${DIR}
471 [[ -z "$(ls ${x}/)" ]] && continue 492 [[ -z "$(ls ${x}/)" ]] && continue
472 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 493 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
473 494
474 # Only generate .scale files if truetype, opentype or type1 495 # Only generate .scale files if truetype, opentype or type1
475 # fonts are present ... 496 # fonts are present ...
476 497
477 # First truetype (ttf,ttc)
478 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
479 # Also, there is no way to regenerate Speedo/CID fonts.scale 498 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
480 # <spyderous@gentoo.org> 2 August 2004 499 # <dberkholz@gentoo.org> 2 August 2004
481 if [[ "${x/encodings}" = "${x}" ]] \ 500 if [[ "${x/encodings}" = "${x}" ]] \
482 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
483 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
484 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
485 ${ROOT}/usr/bin/ttmkfdir -x 2 \
486 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
487 -o ${x}/fonts.scale -d ${x}
488 # ttmkfdir fails on some stuff, so try mkfontscale if it does
489 local ttmkfdir_return=$?
490 else
491 # We didn't use ttmkfdir at all
492 local ttmkfdir_return=2
493 fi
494 if [[ ${ttmkfdir_return} -ne 0 ]]; then
495 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
496 ${ROOT}/usr/bin/mkfontscale \
497 -a /usr/share/fonts/encodings/encodings.dir \
498 -- ${x}
499 fi
500 # Next type1 and opentype (pfa,pfb,otf,otc)
501 elif [[ "${x/encodings}" = "${x}" ]] \
502 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then 501 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
503 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 502 mkfontscale \
504 ${ROOT}/usr/bin/mkfontscale \
505 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 503 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
506 -- ${x} 504 -- ${x}
507 fi 505 fi
508 done 506 done
509 eend 0 507 eend 0
510} 508}
511 509
512create_fonts_dir() { 510create_fonts_dir() {
513 ebegin "Generating fonts.dir files" 511 ebegin "Generating fonts.dir files"
514 for FONT_DIR in ${FONT_DIRS}; do 512 for DIR in ${FONT_DIR}; do
515 x=${ROOT}/usr/share/fonts/${FONT_DIR} 513 x=${ROOT}/usr/share/fonts/${DIR}
516 [[ -z "$(ls ${x}/)" ]] && continue 514 [[ -z "$(ls ${x}/)" ]] && continue
517 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 515 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
518 516
519 if [[ "${x/encodings}" = "${x}" ]]; then 517 if [[ "${x/encodings}" = "${x}" ]]; then
520 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 518 mkfontdir \
521 ${ROOT}/usr/bin/mkfontdir \
522 -e ${ROOT}/usr/share/fonts/encodings \ 519 -e ${ROOT}/usr/share/fonts/encodings \
523 -e ${ROOT}/usr/share/fonts/encodings/large \ 520 -e ${ROOT}/usr/share/fonts/encodings/large \
524 -- ${x} 521 -- ${x}
525 fi 522 fi
526 done 523 done
527 eend 0 524 eend 0
528} 525}
529 526
530fix_font_permissions() { 527fix_font_permissions() {
531 ebegin "Fixing permissions" 528 ebegin "Fixing permissions"
532 for FONT_DIR in ${FONT_DIRS}; do 529 for DIR in ${FONT_DIR}; do
533 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 530 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
534 -exec chmod 0644 {} \; 531 -exec chmod 0644 {} \;
535 done 532 done
536 eend 0 533 eend 0
537} 534}
538 535
539create_font_cache() { 536create_font_cache() {
540 # danarmak found out that fc-cache should be run AFTER all the above 537 font_pkg_postinst
541 # stuff, as otherwise the cache is invalid, and has to be run again
542 # as root anyway
543 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
544 ebegin "Creating FC font cache"
545 HOME="/root" ${ROOT}/usr/bin/fc-cache
546 eend 0
547 fi
548} 538}
539
540EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm

Legend:
Removed from v.1.76  
changed lines
  Added in v.1.87

  ViewVC Help
Powered by ViewVC 1.1.20