/[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.53 Revision 1.107
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2005 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.53 2006/04/20 23:43:48 spyderous Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.107 2009/03/03 16:28:32 remi Exp $
4# 4#
5# 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
178x-modular_unpack_source() { 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() {
179 # (#120057) Enabling DRI in drivers requires that the server was built with 193 # (#120057) Enabling DRI in drivers requires that the server was built with
180 # support for it 194 # support for it
195 # Starting with xorg-server 1.5.3, DRI support is always enabled unless
196 # USE=minimal is set (see bug #252084)
181 if [[ -n "${DRIVER}" ]]; then 197 if [[ -n "${DRIVER}" ]]; then
182 if has dri ${IUSE} && use dri; then 198 if has dri ${IUSE} && use dri; then
183 einfo "Checking for direct rendering capabilities ..." 199 einfo "Checking for direct rendering capabilities ..."
200 if has_version '>=x11-base/xorg-server-1.5.3'; then
201 if built_with_use x11-base/xorg-server minimal; then
202 die "You must build x11-base/xorg-server with USE=-minimal."
203 fi
204 else
184 if ! built_with_use x11-base/xorg-server dri; then 205 if ! built_with_use x11-base/xorg-server dri; then
185 die "You must build x11-base/xorg-server with USE=dri." 206 die "You must build x11-base/xorg-server with USE=dri."
207 fi
186 fi 208 fi
187 fi 209 fi
188 fi 210 fi
211}
189 212
213# @FUNCTION: x-modular_server_supports_drivers_check
214# @USAGE:
215# @DESCRIPTION:
216# Ensures the server SDK is installed if a driver is being built
217x-modular_server_supports_drivers_check() {
218 # (#135873) Only certain servers will actually use or be capable of
219 # building external drivers, including binary drivers.
220 if [[ -n "${DRIVER}" ]]; then
221 if has_version '>=x11-base/xorg-server-1.1'; then
222 if ! built_with_use x11-base/xorg-server xorg; then
223 eerror "x11-base/xorg-server is not built with support for external drivers."
224 die "You must build x11-base/xorg-server with USE=xorg."
225 fi
226 fi
227 fi
228}
229
230# @FUNCTION: x-modular_unpack_source
231# @USAGE:
232# @DESCRIPTION:
233# Simply unpack source code. Nothing else.
234x-modular_unpack_source() {
235 if [[ -n ${GIT_ECLASS} ]]; then
236 git_src_unpack
237 else
190 unpack ${A} 238 unpack ${A}
239 fi
191 cd ${S} 240 cd "${S}"
192 241
193 if [[ -n ${FONT_OPTIONS} ]]; then 242 if [[ -n ${FONT_OPTIONS} ]]; then
194 einfo "Detected font directory: ${FONT_DIR}" 243 einfo "Detected font directory: ${FONT_DIR}"
195 fi 244 fi
196} 245}
197 246
247# @FUNCTION: x-modular_patch_source
248# @USAGE:
249# @DESCRIPTION:
250# Apply all patches
198x-modular_patch_source() { 251x-modular_patch_source() {
199 # Use standardized names and locations with bulk patching 252 # Use standardized names and locations with bulk patching
200 # Patch directory is ${WORKDIR}/patch 253 # Patch directory is ${WORKDIR}/patch
201 # See epatch() in eutils.eclass for more documentation 254 # See epatch() in eutils.eclass for more documentation
202 if [[ -z "${EPATCH_SUFFIX}" ]] ; then 255 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
203 EPATCH_SUFFIX="patch" 256 EPATCH_SUFFIX="patch"
204 fi 257 fi
205 258
206 # If this is a driver package we need to fix man page install location. 259# @VARIABLE: PATCHES
207 # Running autoreconf will use the patched util-macros to make the 260# @DESCRIPTION:
208 # change for us, so we only need to patch if it is not going to run. 261# If you have any patches to apply, set PATCHES to their locations and epatch
209 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then 262# will apply them. It also handles epatch-style bulk patches, if you know how to
210 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 263# use them and set the correct variables. If you don't, read eutils.eclass.
211 fi 264 if [[ ${#PATCHES[@]} -gt 1 ]]; then
212 265 for x in "${PATCHES[@]}"; do
213 # For specific list of patches 266 epatch "${x}"
267 done
214 if [[ -n "${PATCHES}" ]] ; then 268 elif [[ -n "${PATCHES}" ]]; then
215 for PATCH in ${PATCHES} 269 for x in ${PATCHES}; do
216 do
217 epatch ${PATCH} 270 epatch "${x}"
218 done 271 done
219 # For non-default directory bulk patching 272 # For non-default directory bulk patching
220 elif [[ -n "${PATCH_LOC}" ]] ; then 273 elif [[ -n "${PATCH_LOC}" ]] ; then
221 epatch ${PATCH_LOC} 274 epatch ${PATCH_LOC}
222 # For standard bulk patching 275 # For standard bulk patching
223 elif [[ -d "${EPATCH_SOURCE}" ]] ; then 276 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
224 epatch 277 epatch
225 fi 278 fi
226} 279}
227 280
281# @FUNCTION: x-modular_reconf_source
282# @USAGE:
283# @DESCRIPTION:
284# Run eautoreconf if necessary, and run elibtoolize.
228x-modular_reconf_source() { 285x-modular_reconf_source() {
229 # Run autoreconf for CVS snapshots only
230 if [[ "${SNAPSHOT}" = "yes" ]] 286 if [[ "${SNAPSHOT}" = "yes" ]]
231 then 287 then
232 # If possible, generate configure if it doesn't exist 288 # If possible, generate configure if it doesn't exist
233 if [ -f "${S}/configure.ac" ] 289 if [ -f "./configure.ac" ]
234 then 290 then
235 eautoreconf 291 eautoreconf
236 fi 292 fi
237 fi 293 fi
238 294
295 # Joshua Baergen - October 23, 2005
296 # Fix shared lib issues on MIPS, FBSD, etc etc
297 elibtoolize
239} 298}
240 299
300# @FUNCTION: x-modular_src_unpack
301# @USAGE:
302# @DESCRIPTION:
303# Unpack a package, performing all X-related tasks.
241x-modular_src_unpack() { 304x-modular_src_unpack() {
242 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 305 x-modular_specs_check
243 if gcc-specs-now; then 306 x-modular_server_supports_drivers_check
244 msg="${PN} does not work with hardened gcc specs. Switch to vanilla gcc specs to emerge ${PN}." 307 x-modular_dri_check
245 eerror "$msg"
246 die "$msg"
247 fi
248 fi
249
250 x-modular_unpack_source 308 x-modular_unpack_source
251 x-modular_patch_source 309 x-modular_patch_source
252 x-modular_reconf_source 310 x-modular_reconf_source
253
254 # Joshua Baergen - October 23, 2005
255 # Fix shared lib issues on MIPS, FBSD, etc etc
256 elibtoolize
257} 311}
258 312
313# @FUNCTION: x-modular_font_configure
314# @USAGE:
315# @DESCRIPTION:
316# If a font package, perform any necessary configuration steps
259x-modular_font_configure() { 317x-modular_font_configure() {
260 if [[ -n "${FONT}" ]]; then 318 if [[ -n "${FONT}" ]]; then
261 # Might be worth adding an option to configure your desired font 319 # Might be worth adding an option to configure your desired font
262 # and exclude all others. Also, should this USE be nls or minimal? 320 # and exclude all others. Also, should this USE be nls or minimal?
263 if ! use nls; then 321 if ! use nls; then
281 --disable-koi8-r" 339 --disable-koi8-r"
282 fi 340 fi
283 fi 341 fi
284} 342}
285 343
344# @FUNCTION: x-modular_debug_setup
345# @USAGE:
346# @DESCRIPTION:
347# Set up CFLAGS for a debug build
286x-modular_debug_setup() { 348x-modular_debug_setup() {
287 if [[ -n "${DEBUGGABLE}" ]]; then 349 if [[ -n "${DEBUGGABLE}" ]]; then
288 if use debug; then 350 if use debug; then
289 strip-flags 351 strip-flags
290 append-flags -g 352 append-flags -g
291 fi 353 fi
292 fi 354 fi
293} 355}
294 356
357# @FUNCTION: x-modular_src_configure
358# @USAGE:
359# @DESCRIPTION:
360# Perform any necessary pre-configuration steps, then run configure
295x-modular_src_configure() { 361x-modular_src_configure() {
296 x-modular_font_configure 362 x-modular_font_configure
297 x-modular_debug_setup 363 x-modular_debug_setup
298 364
365# @VARIABLE: CONFIGURE_OPTIONS
366# @DESCRIPTION:
367# Any options to pass to configure
368[[ -n ${CONFIGURE_OPTIONS} ]]
369
299 # If prefix isn't set here, .pc files cause problems 370 # If prefix isn't set here, .pc files cause problems
300 if [[ -x ./configure ]]; then 371 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
301 econf --prefix=${XDIR} \ 372 econf --prefix=${XDIR} \
302 --datadir=${XDIR}/share \ 373 --datadir=${XDIR}/share \
303 ${FONT_OPTIONS} \ 374 ${FONT_OPTIONS} \
304 ${DRIVER_OPTIONS} \ 375 ${DRIVER_OPTIONS} \
305 ${CONFIGURE_OPTIONS} 376 ${CONFIGURE_OPTIONS}
306 fi 377 fi
307} 378}
308 379
380# @FUNCTION: x-modular_src_make
381# @USAGE:
382# @DESCRIPTION:
383# Run make.
309x-modular_src_make() { 384x-modular_src_make() {
310 emake || die "emake failed" 385 emake || die "emake failed"
311} 386}
312 387
388# @FUNCTION: x-modular_src_configure
389# @USAGE:
390# @DESCRIPTION:
391# Compile a package, performing all X-related tasks.
313x-modular_src_compile() { 392x-modular_src_compile() {
314 x-modular_src_configure 393 x-modular_src_configure
315 x-modular_src_make 394 x-modular_src_make
316} 395}
317 396
397# @FUNCTION: x-modular_src_install
398# @USAGE:
399# @DESCRIPTION:
400# Install a built package to ${D}, performing any necessary steps.
401# Creates a ChangeLog from git if using live ebuilds.
318x-modular_src_install() { 402x-modular_src_install() {
319 # Install everything to ${XDIR} 403 # Install everything to ${XDIR}
404 if [[ ${CATEGORY} = x11-proto ]]; then
320 make \ 405 make \
406 ${PN/proto/}docdir=/usr/share/doc/${PF} \
321 DESTDIR="${D}" \ 407 DESTDIR="${D}" \
322 install 408 install \
409 || die
410 else
411 make \
412 DESTDIR="${D}" \
413 install \
414 || die
415 fi
323# Shouldn't be necessary in XDIR=/usr 416# Shouldn't be necessary in XDIR=/usr
324# einstall forces datadir, so we need to re-force it 417# einstall forces datadir, so we need to re-force it
325# datadir=${XDIR}/share \ 418# datadir=${XDIR}/share \
326# mandir=${XDIR}/share/man \ 419# mandir=${XDIR}/share/man \
327 420
328 # Make sure docs get compressed 421 if [[ -n ${GIT_ECLASS} ]]; then
329 prepalldocs 422 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}"
423 git log ${GIT_TREE} > "${S}"/ChangeLog
424 popd
425 fi
426
427 if [[ -e ${S}/ChangeLog ]]; then
428 dodoc "${S}"/ChangeLog
429 fi
430# @VARIABLE: DOCS
431# @DESCRIPTION:
432# Any documentation to install
433 [[ -n ${DOCS} ]] && dodoc ${DOCS}
330 434
331 # Don't install libtool archives for server modules 435 # Don't install libtool archives for server modules
332 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 436 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
333 find ${D}/usr/lib/xorg/modules -name '*.la' \ 437 find "${D}"/usr/$(get_libdir)/xorg/modules -name '*.la' \
334 | xargs rm -f 438 | xargs rm -f
335 fi 439 fi
336 440
337 # Don't install overlapping fonts.* files
338 # Generate them instead when possible
339 if [[ -n "${FONT}" ]]; then 441 if [[ -n "${FONT}" ]]; then
340 remove_font_metadata 442 remove_font_metadata
341 fi 443 fi
342}
343 444
445 if [[ -n "${DRIVER}" ]]; then
446 install_driver_hwdata
447 fi
448}
449
450# @FUNCTION: x-modular_pkg_preinst
451# @USAGE:
452# @DESCRIPTION:
453# This function doesn't do anything right now, but it may in the future.
344x-modular_pkg_preinst() { 454x-modular_pkg_preinst() {
345 if [[ -n "${FONT}" ]]; then 455 # We no longer do anything here, but we can't remove it from the API
346 discover_font_dirs 456 :
347 fi
348} 457}
349 458
459# @FUNCTION: x-modular_pkg_postinst
460# @USAGE:
461# @DESCRIPTION:
462# Run X-specific post-installation tasks on the live filesystem. The
463# only task right now is some setup for font packages.
350x-modular_pkg_postinst() { 464x-modular_pkg_postinst() {
351 if [[ -n "${FONT}" ]]; then 465 if [[ -n "${FONT}" ]]; then
352 setup_fonts 466 setup_fonts
353 fi 467 fi
354} 468}
355 469
470# @FUNCTION: x-modular_pkg_postrm
471# @USAGE:
472# @DESCRIPTION:
473# Run X-specific post-removal tasks on the live filesystem. The only
474# task right now is some cleanup for font packages.
356x-modular_pkg_postrm() { 475x-modular_pkg_postrm() {
357 if [[ -n "${FONT}" ]]; then 476 if [[ -n "${FONT}" ]]; then
358 cleanup_fonts 477 cleanup_fonts
478 font_pkg_postrm
359 fi 479 fi
360} 480}
361 481
482# @FUNCTION: cleanup_fonts
483# @USAGE:
484# @DESCRIPTION:
485# Get rid of font directories that only contain generated files
362cleanup_fonts() { 486cleanup_fonts() {
363 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale" 487 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
364 for DIR in ${FONT_DIR}; do 488 for DIR in ${FONT_DIR}; do
365 unset KEEP_FONTDIR 489 unset KEEP_FONTDIR
366 REAL_DIR=${ROOT}usr/share/fonts/${DIR} 490 REAL_DIR=${ROOT}usr/share/fonts/${DIR}
392 fi 516 fi
393 eend 0 517 eend 0
394 done 518 done
395} 519}
396 520
521# @FUNCTION: setup_fonts
522# @USAGE:
523# @DESCRIPTION:
524# Generates needed files for fonts and fixes font permissions
397setup_fonts() { 525setup_fonts() {
398 if [[ ! -n "${FONT_DIRS}" ]]; then 526 if [[ ! -n "${FONT_DIR}" ]]; then
399 msg="FONT_DIRS is empty. The ebuild should set it to at least one subdir of /usr/share/fonts." 527 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
400 eerror "${msg}" 528 eerror "${msg}"
401 die "${msg}" 529 die "${msg}"
402 fi 530 fi
403 531
404 create_fonts_scale 532 create_fonts_scale
405 create_fonts_dir 533 create_fonts_dir
406 fix_font_permissions 534 fix_font_permissions
407 create_font_cache 535 create_font_cache
408} 536}
409 537
538# @FUNCTION: remove_font_metadata
539# @USAGE:
540# @DESCRIPTION:
541# Don't let the package install generated font files that may overlap
542# with other packages. Instead, they're generated in pkg_postinst().
410remove_font_metadata() { 543remove_font_metadata() {
411 local DIR 544 local DIR
412 for DIR in ${FONT_DIR}; do 545 for DIR in ${FONT_DIR}; do
413 if [[ "${DIR}" != "Speedo" ]] && \ 546 if [[ "${DIR}" != "Speedo" ]] && \
414 [[ "${DIR}" != "CID" ]] ; then 547 [[ "${DIR}" != "CID" ]] ; then
415 # Delete font metadata files 548 # Delete font metadata files
416 # fonts.scale, fonts.dir, fonts.cache-1 549 # fonts.scale, fonts.dir, fonts.cache-1
417 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} 550 rm -f "${D}"/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
418 fi 551 fi
419 done 552 done
420} 553}
421 554
555# @FUNCTION: install_driver_hwdata
556# @USAGE:
557# @DESCRIPTION:
558# Installs device-to-driver mappings for system-config-display and
559# anything else that uses hwdata.
560install_driver_hwdata() {
561 insinto /usr/share/hwdata/videoaliases
562 for i in "${FILESDIR}"/*.xinf; do
563 # We need this for the case when none exist,
564 # so *.xinf doesn't expand
565 if [[ -e $i ]]; then
566 doins $i
567 fi
568 done
569}
570
571# @FUNCTION: discover_font_dirs
572# @USAGE:
573# @DESCRIPTION:
574# Deprecated. Sets up the now-unused FONT_DIRS variable.
422discover_font_dirs() { 575discover_font_dirs() {
423 pushd ${IMAGE}/usr/share/fonts 576 FONT_DIRS="${FONT_DIR}"
424 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
425 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
426 popd
427} 577}
428 578
579# @FUNCTION: create_fonts_scale
580# @USAGE:
581# @DESCRIPTION:
582# Create fonts.scale file, used by the old server-side fonts subsystem.
429create_fonts_scale() { 583create_fonts_scale() {
430 ebegin "Creating fonts.scale files" 584 ebegin "Creating fonts.scale files"
431 local x 585 local x
432 for FONT_DIR in ${FONT_DIRS}; do 586 for DIR in ${FONT_DIR}; do
433 x=${ROOT}/usr/share/fonts/${FONT_DIR} 587 x=${ROOT}/usr/share/fonts/${DIR}
434 [[ -z "$(ls ${x}/)" ]] && continue 588 [[ -z "$(ls ${x}/)" ]] && continue
435 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 589 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
436 590
437 # Only generate .scale files if truetype, opentype or type1 591 # Only generate .scale files if truetype, opentype or type1
438 # fonts are present ... 592 # fonts are present ...
439 593
440 # First truetype (ttf,ttc)
441 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
442 # Also, there is no way to regenerate Speedo/CID fonts.scale 594 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
443 # <spyderous@gentoo.org> 2 August 2004 595 # <dberkholz@gentoo.org> 2 August 2004
444 if [[ "${x/encodings}" = "${x}" ]] \ 596 if [[ "${x/encodings}" = "${x}" ]] \
445 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
446 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
447 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
448 ${ROOT}/usr/bin/ttmkfdir -x 2 \
449 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
450 -o ${x}/fonts.scale -d ${x}
451 # ttmkfdir fails on some stuff, so try mkfontscale if it does
452 local ttmkfdir_return=$?
453 else
454 # We didn't use ttmkfdir at all
455 local ttmkfdir_return=2
456 fi
457 if [[ ${ttmkfdir_return} -ne 0 ]]; then
458 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
459 ${ROOT}/usr/bin/mkfontscale \
460 -a /usr/share/fonts/encodings/encodings.dir \
461 -- ${x}
462 fi
463 # Next type1 and opentype (pfa,pfb,otf,otc)
464 elif [[ "${x/encodings}" = "${x}" ]] \
465 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then 597 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
466 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 598 mkfontscale \
467 ${ROOT}/usr/bin/mkfontscale \
468 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 599 -a "${ROOT}"/usr/share/fonts/encodings/encodings.dir \
469 -- ${x} 600 -- ${x}
470 fi 601 fi
471 done 602 done
472 eend 0 603 eend 0
473} 604}
474 605
606# @FUNCTION: create_fonts_dir
607# @USAGE:
608# @DESCRIPTION:
609# Create fonts.dir file, used by the old server-side fonts subsystem.
475create_fonts_dir() { 610create_fonts_dir() {
476 ebegin "Generating fonts.dir files" 611 ebegin "Generating fonts.dir files"
477 for FONT_DIR in ${FONT_DIRS}; do 612 for DIR in ${FONT_DIR}; do
478 x=${ROOT}/usr/share/fonts/${FONT_DIR} 613 x=${ROOT}/usr/share/fonts/${DIR}
479 [[ -z "$(ls ${x}/)" ]] && continue 614 [[ -z "$(ls ${x}/)" ]] && continue
480 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 615 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
481 616
482 if [[ "${x/encodings}" = "${x}" ]]; then 617 if [[ "${x/encodings}" = "${x}" ]]; then
483 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 618 mkfontdir \
484 ${ROOT}/usr/bin/mkfontdir \
485 -e ${ROOT}/usr/share/fonts/encodings \ 619 -e "${ROOT}"/usr/share/fonts/encodings \
486 -e ${ROOT}/usr/share/fonts/encodings/large \ 620 -e "${ROOT}"/usr/share/fonts/encodings/large \
487 -- ${x} 621 -- ${x}
488 fi 622 fi
489 done 623 done
490 eend 0 624 eend 0
491} 625}
492 626
627# @FUNCTION: fix_font_permissions
628# @USAGE:
629# @DESCRIPTION:
630# Font files should have 644 permissions. Ensure this is the case.
493fix_font_permissions() { 631fix_font_permissions() {
494 ebegin "Fixing permissions" 632 ebegin "Fixing permissions"
495 for FONT_DIR in ${FONT_DIRS}; do 633 for DIR in ${FONT_DIR}; do
496 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 634 find "${ROOT}"/usr/share/fonts/${DIR} -type f -name 'font.*' \
497 -exec chmod 0644 {} \; 635 -exec chmod 0644 {} \;
498 done 636 done
499 eend 0 637 eend 0
500} 638}
501 639
640# @FUNCTION: create_font_cache
641# @USAGE:
642# @DESCRIPTION:
643# Create fonts.cache-1 files, used by the new client-side fonts
644# subsystem.
502create_font_cache() { 645create_font_cache() {
503 # danarmak found out that fc-cache should be run AFTER all the above 646 font_pkg_postinst
504 # stuff, as otherwise the cache is invalid, and has to be run again
505 # as root anyway
506 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
507 ebegin "Creating FC font cache"
508 HOME="/root" ${ROOT}/usr/bin/fc-cache
509 eend 0
510 fi
511} 647}
648
649EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm

Legend:
Removed from v.1.53  
changed lines
  Added in v.1.107

  ViewVC Help
Powered by ViewVC 1.1.20