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

Legend:
Removed from v.1.58  
changed lines
  Added in v.1.99

  ViewVC Help
Powered by ViewVC 1.1.20