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

Legend:
Removed from v.1.52  
changed lines
  Added in v.1.103

  ViewVC Help
Powered by ViewVC 1.1.20