/[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.44 Revision 1.118
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.44 2006/02/15 21:07:00 spyderous Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.118 2009/12/09 10:21:49 vapier Exp $
4# 4#
5# Author: Donnie Berkholz <spyderous@gentoo.org> 5# @ECLASS: x-modular.eclass
6# @MAINTAINER:
7# Donnie Berkholz <dberkholz@gentoo.org>, x11@gentoo.org
8# @BLURB: Reduces code duplication in the modularized X11 ebuilds.
9# @DESCRIPTION:
10# This eclass makes trivial X ebuilds possible for apps, fonts, drivers,
11# and more. Many things that would normally be done in various functions
12# can be accessed by setting variables instead, such as patching,
13# running eautoreconf, passing options to configure and installing docs.
6# 14#
7# This eclass is designed to reduce code duplication in the modularized X11 15# All you need to do in a basic ebuild is inherit this eclass and set
8# ebuilds. 16# DESCRIPTION, KEYWORDS and RDEPEND/DEPEND. If your package is hosted
9# 17# with the other X packages, you don't need to set SRC_URI. Pretty much
10# Using this eclass:
11#
12# Inherit it. If you need to run autoreconf for any reason (e.g., your patches
13# apply to the autotools files rather than configure), set SNAPSHOT="yes". Set
14# CONFIGURE_OPTIONS to everything you want to pass to the configure script.
15#
16# If you have any patches to apply, set PATCHES to their locations and epatch
17# will apply them. It also handles epatch-style bulk patches, if you know how to
18# use them and set the correct variables. If you don't, read eutils.eclass.
19#
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
22# directory or directories.
23#
24# IMPORTANT: Both SNAPSHOT and FONT_DIR must be set _before_ the inherit.
25#
26# Pretty much everything else should be automatic. 18# everything else should be automatic.
27 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
28EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm 42EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm"
29 43
30inherit eutils libtool toolchain-funcs flag-o-matic 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
31 54
32# Directory prefix to use for everything 55# exports must be ALWAYS after inherit
56EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
57
58# @ECLASS-VARIABLE: XDIR
59# @DESCRIPTION:
60# Directory prefix to use for everything. If you want to install to a
61# non-default prefix (e.g., /opt/xorg), change XDIR. This has not been
62# recently tested. You may need to uncomment the setting of datadir and
63# mandir in x-modular_src_install() or add it back in if it's no longer
64# there. You may also want to change the SLOT.
33XDIR="/usr" 65XDIR="/usr"
34
35# Set up default patchset version(s) if necessary
36# x11-driver-patches
37if [[ -z "${XDPVER}" ]]; then
38 XDPVER="1"
39fi
40 66
41IUSE="" 67IUSE=""
42HOMEPAGE="http://xorg.freedesktop.org/" 68HOMEPAGE="http://xorg.freedesktop.org/"
43 69
70# @ECLASS-VARIABLE: SNAPSHOT
71# @DESCRIPTION:
72# If set to 'yes' and configure.ac exists, eautoreconf will run. Set
73# before inheriting this eclass.
74: ${SNAPSHOT:=no}
75
44# Set up SRC_URI for individual modular releases 76# Set up SRC_URI for individual modular releases
45BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual" 77BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
46if [[ ${CATEGORY} = x11-apps ]]; then 78# @ECLASS-VARIABLE: MODULE
47 SRC_URI="${SRC_URI} 79# @DESCRIPTION:
48 ${BASE_INDIVIDUAL_URI}/app/${P}.tar.bz2" 80# The subdirectory to download source from. Possible settings are app,
49elif [[ ${CATEGORY} = app-doc ]]; then 81# doc, data, util, driver, font, lib, proto, xserver. Set above the
50 SRC_URI="${SRC_URI} 82# inherit to override the default autoconfigured module.
51 ${BASE_INDIVIDUAL_URI}/doc/${P}.tar.bz2" 83if [[ -z ${MODULE} ]]; then
52# x11-misc contains data and util, x11-themes contains data 84 case ${CATEGORY} in
53elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then 85 app-doc) MODULE="doc" ;;
54 SRC_URI="${SRC_URI} 86 media-fonts) MODULE="font" ;;
55 ${BASE_INDIVIDUAL_URI}/data/${P}.tar.bz2 87 x11-apps|x11-wm) MODULE="app" ;;
56 ${BASE_INDIVIDUAL_URI}/util/${P}.tar.bz2" 88 x11-misc|x11-themes) MODULE="util" ;;
57elif [[ ${CATEGORY} = x11-drivers ]]; then 89 x11-drivers) MODULE="driver" ;;
58 SRC_URI="${SRC_URI} 90 x11-base) MODULE="xserver" ;;
59 ${BASE_INDIVIDUAL_URI}/driver/${P}.tar.bz2" 91 x11-proto) MODULE="proto" ;;
60elif [[ ${CATEGORY} = media-fonts ]]; then 92 x11-libs) MODULE="lib" ;;
61 SRC_URI="${SRC_URI} 93 esac
62 ${BASE_INDIVIDUAL_URI}/font/${P}.tar.bz2"
63elif [[ ${CATEGORY} = x11-libs ]]; then
64 SRC_URI="${SRC_URI}
65 ${BASE_INDIVIDUAL_URI}/lib/${P}.tar.bz2"
66elif [[ ${CATEGORY} = x11-proto ]]; then
67 SRC_URI="${SRC_URI}
68 ${BASE_INDIVIDUAL_URI}/proto/${P}.tar.bz2"
69elif [[ ${CATEGORY} = x11-base ]]; then
70 SRC_URI="${SRC_URI}
71 ${BASE_INDIVIDUAL_URI}/xserver/${P}.tar.bz2"
72fi 94fi
73 95
74# SRC_URI for full releases 96if [[ -n ${GIT_ECLASS} ]]; then
75SRC_URI="${SRC_URI} 97 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PN}"
76 http://xorg.freedesktop.org/releases/X11R7.0/src/everything/${P}.tar.bz2 98else
77 http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/${P}.tar.bz2 99 SRC_URI="${SRC_URI} ${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2"
78 http://xorg.freedesktop.org/releases/X11R7.0-RC3/everything/${P}.tar.bz2 100fi
79 http://xorg.freedesktop.org/releases/X11R7.0-RC2/everything/${P}.tar.bz2
80 http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/${P}.tar.bz2
81 http://xorg.freedesktop.org/releases/X11R7.0-RC0/everything/${P}.tar.bz2"
82 101
83SLOT="0" 102SLOT="0"
84 103
85# Set the license for the package. This can be overridden by setting 104# Set the license for the package. This can be overridden by setting
86# LICENSE after the inherit. 105# LICENSE after the inherit. Nearly all FreeDesktop-hosted X packages
87LICENSE=${PN} 106# are under the MIT license. (This is what Red Hat does in their rpms)
107LICENSE="MIT"
88 108
89# Set up shared dependencies 109# Set up shared dependencies
90if [[ -n "${SNAPSHOT}" ]]; then 110if [[ -n "${SNAPSHOT}" ]]; then
91# FIXME: What's the minimal libtool version supporting arbitrary versioning? 111# FIXME: What's the minimal libtool version supporting arbitrary versioning?
92 DEPEND="${DEPEND} 112 DEPEND="${DEPEND}
93 >=sys-devel/autoconf-2.57
94 >=sys-devel/automake-1.7
95 >=sys-devel/libtool-1.5 113 >=sys-devel/libtool-1.5
96 >=sys-devel/m4-1.4" 114 >=sys-devel/m4-1.4"
115 WANT_AUTOCONF="latest"
116 WANT_AUTOMAKE="latest"
97fi 117fi
98 118
99# If we're a font package, but not the font.alias one 119if [[ -n "${FONT}" ]]; then
100if [[ "${PN/#font-}" != "${PN}" ]] \
101 && [[ "${PN}" != "font-alias" ]] \
102 && [[ "${PN}" != "font-util" ]]; then
103 # Activate font code in the rest of the eclass
104 FONT="yes"
105
106 RDEPEND="${RDEPEND} 120 RDEPEND="${RDEPEND}
107 media-fonts/encodings 121 media-fonts/encodings
108 x11-apps/mkfontscale 122 x11-apps/mkfontscale
109 x11-apps/mkfontdir" 123 x11-apps/mkfontdir"
110 PDEPEND="${PDEPEND} 124 PDEPEND="${PDEPEND}
111 media-fonts/font-alias" 125 media-fonts/font-alias"
112 126
113 # Starting with 7.0RC3, we can specify the font directory 127 # Starting with 7.0RC3, we can specify the font directory
114 # But oddly, we can't do the same for encodings or font-alias 128 # But oddly, we can't do the same for encodings or font-alias
115 129
116 # Wrap in `if` so ebuilds can set it too 130# @ECLASS-VARIABLE: FONT_DIR
117 if [[ -z ${FONT_DIR} ]]; then 131# @DESCRIPTION:
132# If you're creating a font package and the suffix of PN is not equal to
133# the subdirectory of /usr/share/fonts/ it should install into, set
134# FONT_DIR to that directory or directories. Set before inheriting this
135# eclass.
118 FONT_DIR=${PN##*-} 136 : ${FONT_DIR:=${PN##*-}}
119
120 fi
121 137
122 # Fix case of font directories 138 # Fix case of font directories
123 FONT_DIR=${FONT_DIR/ttf/TTF} 139 FONT_DIR=${FONT_DIR/ttf/TTF}
124 FONT_DIR=${FONT_DIR/otf/OTF} 140 FONT_DIR=${FONT_DIR/otf/OTF}
125 FONT_DIR=${FONT_DIR/type1/Type1} 141 FONT_DIR=${FONT_DIR/type1/Type1}
126 FONT_DIR=${FONT_DIR/speedo/Speedo} 142 FONT_DIR=${FONT_DIR/speedo/Speedo}
127 143
128 # Set up configure option 144 # Set up configure options, wrapped so ebuilds can override if need be
145 if [[ -z ${FONT_OPTIONS} ]]; then
129 FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\"" 146 FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\""
147 fi
130 148
131 if [[ -n "${FONT}" ]]; then 149 if [[ -n "${FONT}" ]]; then
132 if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]]; then 150 if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]] || [[ ${PN##*-} = cyrillic ]]; then
133 IUSE="${IUSE} nls" 151 IUSE="${IUSE} nls"
134 fi 152 fi
135 fi 153 fi
136fi 154fi
137 155
138# If we're a driver package 156# If we're a driver package
139if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 157if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
140 # Enable driver code in the rest of the eclass 158 # Enable driver code in the rest of the eclass
141 DRIVER="yes" 159 DRIVER="yes"
142
143 # Add driver patchset to SRC_URI
144 SRC_URI="${SRC_URI}
145 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2"
146fi 160fi
147 161
148# Debugging -- ignore packages that can't be built with debugging 162# Debugging -- ignore packages that can't be built with debugging
149if [[ -z "${FONT}" ]] \ 163if [[ -z "${FONT}" ]] \
150 || [[ "${PN/app-doc}" != "${PN}" ]] \ 164 && [[ "${CATEGORY/app-doc}" = "${CATEGORY}" ]] \
151 || [[ "${PN/x11-proto}" != "${PN}" ]] \ 165 && [[ "${CATEGORY/x11-proto}" = "${CATEGORY}" ]] \
152 || [[ "${PN/util-macros}" != "${PN}" ]] \ 166 && [[ "${PN/util-macros}" = "${PN}" ]] \
153 || [[ "${PN/xbitmaps}" != "${PN}" ]] \ 167 && [[ "${PN/xbitmaps}" = "${PN}" ]] \
154 || [[ "${PN/xkbdata}" != "${PN}" ]] \ 168 && [[ "${PN/xkbdata}" = "${PN}" ]] \
155 || [[ "${PN/xorg-cf-files}" != "${PN}" ]] \ 169 && [[ "${PN/xorg-cf-files}" = "${PN}" ]] \
156 || [[ "${PN/xcursor}" != "${PN}" ]] \ 170 && [[ "${PN/xcursor}" = "${PN}" ]] \
157 ; then 171 ; then
158 DEBUGGABLE="yes" 172 DEBUGGABLE="yes"
159 IUSE="${IUSE} debug" 173 IUSE="${IUSE} debug"
160 if use debug; then
161 RESTRICT="${RESTRICT} nostrip"
162 fi
163fi 174fi
164 175
165DEPEND="${DEPEND} 176DEPEND="${DEPEND}
166 >=dev-util/pkgconfig-0.18" 177 >=dev-util/pkgconfig-0.18"
167 178
168if [[ "${PN/util-macros}" = "${PN}" ]]; then 179if [[ "${PN/util-macros}" = "${PN}" ]]; then
169 DEPEND="${DEPEND} 180 DEPEND="${DEPEND}
170 >=x11-misc/util-macros-0.99.2" 181 >=x11-misc/util-macros-1.3.0
182 sys-devel/binutils"
171fi 183fi
172 184
173# >=sys-apps/man-1.6b-r2 required to look in [0-8]x/ directories
174RDEPEND="${RDEPEND} 185RDEPEND="${RDEPEND}
175 !<=x11-base/xorg-x11-6.9 186 !<=x11-base/xorg-x11-6.9"
176 >=sys-apps/man-1.6b-r2"
177# Provides virtual/x11 for temporary use until packages are ported 187# Provides virtual/x11 for temporary use until packages are ported
178# x11-base/x11-env" 188# x11-base/x11-env"
179 189
190# @FUNCTION: x-modular_specs_check
191# @USAGE:
192# @DESCRIPTION:
193# Make any necessary changes related to gcc specs (generally hardened)
194x-modular_specs_check() {
195 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
196 append-ldflags -Wl,-z,lazy
197 # (#116698) breaks loading
198 filter-ldflags -Wl,-z,now
199 fi
200}
201
202# @FUNCTION: x-modular_dri_check
203# @USAGE:
204# @DESCRIPTION:
205# Ensures the server supports DRI if building a driver with DRI support
206x-modular_dri_check() {
207 # (#120057) Enabling DRI in drivers requires that the server was built with
208 # support for it
209 # Starting with xorg-server 1.5.3, DRI support is always enabled unless
210 # USE=minimal is set (see bug #252084)
211 if [[ -n "${DRIVER}" ]]; then
212 if has dri ${IUSE} && use dri; then
213 einfo "Checking for direct rendering capabilities ..."
214 if has_version '>=x11-base/xorg-server-1.5.3'; then
215 if built_with_use x11-base/xorg-server minimal; then
216 die "You must build x11-base/xorg-server with USE=-minimal."
217 fi
218 else
219 if ! built_with_use x11-base/xorg-server dri; then
220 die "You must build x11-base/xorg-server with USE=dri."
221 fi
222 fi
223 fi
224 fi
225}
226
227# @FUNCTION: x-modular_server_supports_drivers_check
228# @USAGE:
229# @DESCRIPTION:
230# Ensures the server SDK is installed if a driver is being built
231x-modular_server_supports_drivers_check() {
232 # (#135873) Only certain servers will actually use or be capable of
233 # building external drivers, including binary drivers.
234 if [[ -n "${DRIVER}" ]]; then
235 if has_version '>=x11-base/xorg-server-1.1'; then
236 if ! built_with_use x11-base/xorg-server xorg; then
237 eerror "x11-base/xorg-server is not built with support for external drivers."
238 die "You must build x11-base/xorg-server with USE=xorg."
239 fi
240 fi
241 fi
242}
243
244# @FUNCTION: x-modular_unpack_source
245# @USAGE:
246# @DESCRIPTION:
247# Simply unpack source code. Nothing else.
180x-modular_unpack_source() { 248x-modular_unpack_source() {
249 if [[ -n ${GIT_ECLASS} ]]; then
250 git_src_unpack
251 else
181 unpack ${A} 252 unpack ${A}
253 fi
182 cd ${S} 254 cd "${S}"
183 255
184 if [[ -n ${FONT_OPTIONS} ]]; then 256 if [[ -n ${FONT_OPTIONS} ]]; then
185 einfo "Detected font directory: ${FONT_DIR}" 257 einfo "Detected font directory: ${FONT_DIR}"
186 fi 258 fi
187} 259}
188 260
261# @FUNCTION: x-modular_patch_source
262# @USAGE:
263# @DESCRIPTION:
264# Apply all patches
189x-modular_patch_source() { 265x-modular_patch_source() {
190 # Use standardized names and locations with bulk patching 266 # Use standardized names and locations with bulk patching
191 # Patch directory is ${WORKDIR}/patch 267 # Patch directory is ${WORKDIR}/patch
192 # See epatch() in eutils.eclass for more documentation 268 # See epatch() in eutils.eclass for more documentation
193 if [[ -z "${EPATCH_SUFFIX}" ]] ; then 269 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
194 EPATCH_SUFFIX="patch" 270 EPATCH_SUFFIX="patch"
195 fi 271 fi
196 272
197 # If this is a driver package we need to fix man page install location. 273# @VARIABLE: PATCHES
198 # Running autoreconf will use the patched util-macros to make the 274# @DESCRIPTION:
199 # change for us, so we only need to patch if it is not going to run. 275# If you have any patches to apply, set PATCHES to their locations and epatch
200 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then 276# will apply them. It also handles epatch-style bulk patches, if you know how to
201 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 277# use them and set the correct variables. If you don't, read eutils.eclass.
202 fi 278 if [[ ${#PATCHES[@]} -gt 1 ]]; then
203 279 for x in "${PATCHES[@]}"; do
204 # For specific list of patches 280 epatch "${x}"
281 done
205 if [[ -n "${PATCHES}" ]] ; then 282 elif [[ -n "${PATCHES}" ]]; then
206 for PATCH in ${PATCHES} 283 for x in ${PATCHES}; do
207 do
208 epatch ${PATCH} 284 epatch "${x}"
209 done 285 done
210 # For non-default directory bulk patching 286 # For non-default directory bulk patching
211 elif [[ -n "${PATCH_LOC}" ]] ; then 287 elif [[ -n "${PATCH_LOC}" ]] ; then
212 epatch ${PATCH_LOC} 288 epatch ${PATCH_LOC}
213 # For standard bulk patching 289 # For standard bulk patching
214 elif [[ -d "${EPATCH_SOURCE}" ]] ; then 290 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
215 epatch 291 epatch
216 fi 292 fi
217} 293}
218 294
295# @FUNCTION: x-modular_reconf_source
296# @USAGE:
297# @DESCRIPTION:
298# Run eautoreconf if necessary, and run elibtoolize.
219x-modular_reconf_source() { 299x-modular_reconf_source() {
220 # Run autoreconf for CVS snapshots only
221 if [[ "${SNAPSHOT}" = "yes" ]] 300 if [[ "${SNAPSHOT}" = "yes" ]]
222 then 301 then
223 # If possible, generate configure if it doesn't exist 302 # If possible, generate configure if it doesn't exist
224 if [ -f "${S}/configure.ac" ] 303 if [ -f "./configure.ac" ]
225 then 304 then
226 einfo "Running autoreconf..." 305 eautoreconf
227 autoreconf -v --force --install
228 fi
229 fi 306 fi
230
231}
232
233x-modular_src_unpack() {
234 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
235 if gcc-specs-now; then
236 msg="Do not emerge ${PN} without vanilla gcc!"
237 eerror "$msg"
238 die "$msg"
239 fi 307 fi
240 fi
241
242 x-modular_unpack_source
243 x-modular_patch_source
244 x-modular_reconf_source
245 308
246 # Joshua Baergen - October 23, 2005 309 # Joshua Baergen - October 23, 2005
247 # Fix shared lib issues on MIPS, FBSD, etc etc 310 # Fix shared lib issues on MIPS, FBSD, etc etc
248 elibtoolize 311 elibtoolize
249} 312}
250 313
314# @FUNCTION: x-modular_src_prepare
315# @USAGE:
316# @DESCRIPTION:
317# Prepare a package after unpacking, performing all X-related tasks.
318x-modular_src_prepare() {
319 [[ -n ${GIT_ECLASS} ]] && has src_prepare ${EXPORTED_FUNCTIONS} \
320 && git_src_prepare
321 x-modular_patch_source
322 x-modular_reconf_source
323}
324
325# @FUNCTION: x-modular_src_unpack
326# @USAGE:
327# @DESCRIPTION:
328# Unpack a package, performing all X-related tasks.
329x-modular_src_unpack() {
330 x-modular_specs_check
331 x-modular_server_supports_drivers_check
332 x-modular_dri_check
333 x-modular_unpack_source
334 has src_prepare ${EXPORTED_FUNCTIONS} || x-modular_src_prepare
335}
336
337# @FUNCTION: x-modular_font_configure
338# @USAGE:
339# @DESCRIPTION:
340# If a font package, perform any necessary configuration steps
251x-modular_font_configure() { 341x-modular_font_configure() {
252 if [[ -n "${FONT}" ]]; then 342 if [[ -n "${FONT}" ]]; then
253 # Might be worth adding an option to configure your desired font 343 # Might be worth adding an option to configure your desired font
254 # and exclude all others. Also, should this USE be nls or minimal? 344 # and exclude all others. Also, should this USE be nls or minimal?
255 if ! use nls; then 345 if has nls ${IUSE//+} && ! use nls; then
256 FONT_OPTIONS="${FONT_OPTIONS} 346 FONT_OPTIONS="${FONT_OPTIONS}
257 --disable-iso8859-2 347 --disable-iso8859-2
258 --disable-iso8859-3 348 --disable-iso8859-3
259 --disable-iso8859-4 349 --disable-iso8859-4
260 --disable-iso8859-5 350 --disable-iso8859-5
273 --disable-koi8-r" 363 --disable-koi8-r"
274 fi 364 fi
275 fi 365 fi
276} 366}
277 367
368# @FUNCTION: x-modular_debug_setup
369# @USAGE:
370# @DESCRIPTION:
371# Set up CFLAGS for a debug build
278x-modular_debug_setup() { 372x-modular_debug_setup() {
279 if [[ -n "${DEBUGGABLE}" ]]; then 373 if [[ -n "${DEBUGGABLE}" ]]; then
280 if use debug; then 374 if use debug; then
281 strip-flags 375 strip-flags
282 append-flags -g 376 append-flags -g
283 fi 377 fi
284 fi 378 fi
285} 379}
286 380
381# @FUNCTION: x-modular_src_configure
382# @USAGE:
383# @DESCRIPTION:
384# Perform any necessary pre-configuration steps, then run configure
287x-modular_src_configure() { 385x-modular_src_configure() {
288 x-modular_font_configure 386 x-modular_font_configure
289 x-modular_debug_setup 387 x-modular_debug_setup
290 388
389# @VARIABLE: CONFIGURE_OPTIONS
390# @DESCRIPTION:
391# Any extra options to pass to configure
392
291 # If prefix isn't set here, .pc files cause problems 393 # If prefix isn't set here, .pc files cause problems
292 if [[ -x ./configure ]]; then 394 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
293 econf --prefix=${XDIR} \ 395 econf --prefix=${XDIR} \
294 --datadir=${XDIR}/share \ 396 --datadir=${XDIR}/share \
295 ${FONT_OPTIONS} \ 397 ${FONT_OPTIONS} \
296 ${DRIVER_OPTIONS} \ 398 ${DRIVER_OPTIONS} \
297 ${CONFIGURE_OPTIONS} 399 ${CONFIGURE_OPTIONS}
298 fi 400 fi
299} 401}
300 402
403# @FUNCTION: x-modular_src_make
404# @USAGE:
405# @DESCRIPTION:
406# Run make.
301x-modular_src_make() { 407x-modular_src_make() {
302 emake || die "emake failed" 408 emake || die "emake failed"
303} 409}
304 410
411# @FUNCTION: x-modular_src_compile
412# @USAGE:
413# @DESCRIPTION:
414# Compile a package, performing all X-related tasks.
305x-modular_src_compile() { 415x-modular_src_compile() {
306 x-modular_src_configure 416 has src_configure ${EXPORTED_FUNCTIONS} || x-modular_src_configure
307 x-modular_src_make 417 x-modular_src_make
308} 418}
309 419
420# @FUNCTION: x-modular_src_install
421# @USAGE:
422# @DESCRIPTION:
423# Install a built package to ${D}, performing any necessary steps.
424# Creates a ChangeLog from git if using live ebuilds.
310x-modular_src_install() { 425x-modular_src_install() {
311 # Install everything to ${XDIR} 426 # Install everything to ${XDIR}
427 if [[ ${CATEGORY} = x11-proto ]]; then
312 make \ 428 make \
429 ${PN/proto/}docdir=/usr/share/doc/${PF} \
313 DESTDIR="${D}" \ 430 DESTDIR="${D}" \
314 install 431 install \
432 || die
433 else
434 make \
435 docdir=/usr/share/doc/${PF} \
436 DESTDIR="${D}" \
437 install \
438 || die
439 fi
315# Shouldn't be necessary in XDIR=/usr 440# Shouldn't be necessary in XDIR=/usr
316# einstall forces datadir, so we need to re-force it 441# einstall forces datadir, so we need to re-force it
317# datadir=${XDIR}/share \ 442# datadir=${XDIR}/share \
318# mandir=${XDIR}/share/man \ 443# mandir=${XDIR}/share/man \
319 444
445 if [[ -n ${GIT_ECLASS} ]]; then
446 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}"
447 git log ${GIT_TREE} > "${S}"/ChangeLog
448 popd
449 fi
450
451 if [[ -e ${S}/ChangeLog ]]; then
452 dodoc "${S}"/ChangeLog
453 fi
454# @VARIABLE: DOCS
455# @DESCRIPTION:
456# Any documentation to install via dodoc
457 [[ -n ${DOCS} ]] && dodoc ${DOCS}
458
320 # Don't install libtool archives for server modules 459 # Don't install libtool archives for server modules
321 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 460 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
322 find ${D}/usr/lib/xorg/modules -name '*.la' \ 461 find "${D}"/usr/$(get_libdir)/xorg/modules -name '*.la' \
323 | xargs rm -f 462 | xargs rm -f
324 fi 463 fi
325}
326 464
465 if [[ -n "${FONT}" ]]; then
466 remove_font_metadata
467 fi
468
469 if [[ -n "${DRIVER}" ]]; then
470 install_driver_hwdata
471 fi
472}
473
474# @FUNCTION: x-modular_pkg_preinst
475# @USAGE:
476# @DESCRIPTION:
477# This function doesn't do anything right now, but it may in the future.
327x-modular_pkg_preinst() { 478x-modular_pkg_preinst() {
328 if [[ -n "${FONT}" ]]; then 479 # We no longer do anything here, but we can't remove it from the API
329 discover_font_dirs 480 :
330 fi
331} 481}
332 482
483# @FUNCTION: x-modular_pkg_postinst
484# @USAGE:
485# @DESCRIPTION:
486# Run X-specific post-installation tasks on the live filesystem. The
487# only task right now is some setup for font packages.
333x-modular_pkg_postinst() { 488x-modular_pkg_postinst() {
334 if [[ -n "${FONT}" ]]; then 489 if [[ -n "${FONT}" ]]; then
335 setup_fonts 490 setup_fonts
336 fi 491 fi
337} 492}
338 493
494# @FUNCTION: x-modular_pkg_postrm
495# @USAGE:
496# @DESCRIPTION:
497# Run X-specific post-removal tasks on the live filesystem. The only
498# task right now is some cleanup for font packages.
339x-modular_pkg_postrm() { 499x-modular_pkg_postrm() {
340 if [[ -n "${FONT}" ]]; then 500 if [[ -n "${FONT}" ]]; then
341 cleanup_fonts 501 cleanup_fonts
502 font_pkg_postrm
342 fi 503 fi
343} 504}
344 505
506# @FUNCTION: cleanup_fonts
507# @USAGE:
508# @DESCRIPTION:
509# Get rid of font directories that only contain generated files
345cleanup_fonts() { 510cleanup_fonts() {
346 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale" 511 local ALLOWED_FILES="encodings.dir fonts.alias fonts.cache-1 fonts.dir fonts.scale"
347 for DIR in ${FONT_DIR}; do 512 for DIR in ${FONT_DIR}; do
348 unset KEEP_FONTDIR 513 unset KEEP_FONTDIR
349 REAL_DIR=${ROOT}usr/share/fonts/${DIR} 514 REAL_DIR=${ROOT}usr/share/fonts/${DIR}
350 515
351 ebegin "Checking ${REAL_DIR} for useless files" 516 ebegin "Checking ${REAL_DIR} for useless files"
375 fi 540 fi
376 eend 0 541 eend 0
377 done 542 done
378} 543}
379 544
545# @FUNCTION: setup_fonts
546# @USAGE:
547# @DESCRIPTION:
548# Generates needed files for fonts and fixes font permissions
380setup_fonts() { 549setup_fonts() {
381 if [[ ! -n "${FONT_DIRS}" ]]; then 550 if [[ ! -n "${FONT_DIR}" ]]; then
382 msg="FONT_DIRS is empty. The ebuild should set it to at least one subdir of /usr/share/fonts." 551 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
383 eerror "${msg}" 552 eerror "${msg}"
384 die "${msg}" 553 die "${msg}"
385 fi 554 fi
386 555
387 create_fonts_scale 556 create_fonts_scale
388 create_fonts_dir 557 create_fonts_dir
389 fix_font_permissions
390 create_font_cache 558 create_font_cache
391} 559}
392 560
561# @FUNCTION: remove_font_metadata
562# @USAGE:
563# @DESCRIPTION:
564# Don't let the package install generated font files that may overlap
565# with other packages. Instead, they're generated in pkg_postinst().
566remove_font_metadata() {
567 local DIR
568 for DIR in ${FONT_DIR}; do
569 if [[ "${DIR}" != "Speedo" ]] && \
570 [[ "${DIR}" != "CID" ]] ; then
571 # Delete font metadata files
572 # fonts.scale, fonts.dir, fonts.cache-1
573 rm -f "${D}"/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
574 fi
575 done
576}
577
578# @FUNCTION: install_driver_hwdata
579# @USAGE:
580# @DESCRIPTION:
581# Installs device-to-driver mappings for system-config-display and
582# anything else that uses hwdata.
583install_driver_hwdata() {
584 insinto /usr/share/hwdata/videoaliases
585 for i in "${FILESDIR}"/*.xinf; do
586 # We need this for the case when none exist,
587 # so *.xinf doesn't expand
588 if [[ -e $i ]]; then
589 doins $i
590 fi
591 done
592}
593
594# @FUNCTION: discover_font_dirs
595# @USAGE:
596# @DESCRIPTION:
597# Deprecated. Sets up the now-unused FONT_DIRS variable.
393discover_font_dirs() { 598discover_font_dirs() {
394 pushd ${IMAGE}/usr/share/fonts 599 FONT_DIRS="${FONT_DIR}"
395 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
396 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
397 popd
398} 600}
399 601
602# @FUNCTION: create_fonts_scale
603# @USAGE:
604# @DESCRIPTION:
605# Create fonts.scale file, used by the old server-side fonts subsystem.
400create_fonts_scale() { 606create_fonts_scale() {
401 ebegin "Creating fonts.scale files" 607 ebegin "Creating fonts.scale files"
402 local x 608 local x
403 for FONT_DIR in ${FONT_DIRS}; do 609 for DIR in ${FONT_DIR}; do
404 x=${ROOT}/usr/share/fonts/${FONT_DIR} 610 x=${ROOT}/usr/share/fonts/${DIR}
405 [[ -z "$(ls ${x}/)" ]] && continue 611 [[ -z "$(ls ${x}/)" ]] && continue
406 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 612 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
407 613
408 # Only generate .scale files if truetype, opentype or type1 614 # Only generate .scale files if truetype, opentype or type1
409 # fonts are present ... 615 # fonts are present ...
410 616
411 # First truetype (ttf,ttc)
412 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
413 # Also, there is no way to regenerate Speedo/CID fonts.scale 617 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
414 # <spyderous@gentoo.org> 2 August 2004 618 # <dberkholz@gentoo.org> 2 August 2004
415 if [[ "${x/encodings}" = "${x}" ]] \ 619 if [[ "${x/encodings}" = "${x}" ]] \
416 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
417 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
418 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
419 ${ROOT}/usr/bin/ttmkfdir -x 2 \
420 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
421 -o ${x}/fonts.scale -d ${x}
422 # ttmkfdir fails on some stuff, so try mkfontscale if it does
423 local ttmkfdir_return=$?
424 else
425 # We didn't use ttmkfdir at all
426 local ttmkfdir_return=2
427 fi
428 if [[ ${ttmkfdir_return} -ne 0 ]]; then
429 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
430 ${ROOT}/usr/bin/mkfontscale \
431 -a /usr/share/fonts/encodings/encodings.dir \
432 -- ${x}
433 fi
434 # Next type1 and opentype (pfa,pfb,otf,otc)
435 elif [[ "${x/encodings}" = "${x}" ]] \
436 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then 620 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
437 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 621 mkfontscale \
438 ${ROOT}/usr/bin/mkfontscale \
439 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 622 -a "${ROOT}"/usr/share/fonts/encodings/encodings.dir \
440 -- ${x} 623 -- ${x}
441 fi 624 fi
442 done 625 done
443 eend 0 626 eend 0
444} 627}
445 628
629# @FUNCTION: create_fonts_dir
630# @USAGE:
631# @DESCRIPTION:
632# Create fonts.dir file, used by the old server-side fonts subsystem.
446create_fonts_dir() { 633create_fonts_dir() {
447 ebegin "Generating fonts.dir files" 634 ebegin "Generating fonts.dir files"
448 for FONT_DIR in ${FONT_DIRS}; do 635 for DIR in ${FONT_DIR}; do
449 x=${ROOT}/usr/share/fonts/${FONT_DIR} 636 x=${ROOT}/usr/share/fonts/${DIR}
450 [[ -z "$(ls ${x}/)" ]] && continue 637 [[ -z "$(ls ${x}/)" ]] && continue
451 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 638 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
452 639
453 if [[ "${x/encodings}" = "${x}" ]]; then 640 if [[ "${x/encodings}" = "${x}" ]]; then
454 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 641 mkfontdir \
455 ${ROOT}/usr/bin/mkfontdir \
456 -e ${ROOT}/usr/share/fonts/encodings \ 642 -e "${ROOT}"/usr/share/fonts/encodings \
457 -e ${ROOT}/usr/share/fonts/encodings/large \ 643 -e "${ROOT}"/usr/share/fonts/encodings/large \
458 -- ${x} 644 -- ${x}
459 fi 645 fi
460 done 646 done
461 eend 0 647 eend 0
462} 648}
463 649
464fix_font_permissions() { 650# @FUNCTION: create_font_cache
465 ebegin "Fixing permissions" 651# @USAGE:
466 for FONT_DIR in ${FONT_DIRS}; do 652# @DESCRIPTION:
467 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 653# Create fonts.cache-1 files, used by the new client-side fonts
468 -exec chmod 0644 {} \; 654# subsystem.
469 done
470 eend 0
471}
472
473create_font_cache() { 655create_font_cache() {
474 # danarmak found out that fc-cache should be run AFTER all the above 656 font_pkg_postinst
475 # stuff, as otherwise the cache is invalid, and has to be run again
476 # as root anyway
477 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
478 ebegin "Creating FC font cache"
479 HOME="/root" ${ROOT}/usr/bin/fc-cache
480 eend 0
481 fi
482} 657}

Legend:
Removed from v.1.44  
changed lines
  Added in v.1.118

  ViewVC Help
Powered by ViewVC 1.1.20