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

Legend:
Removed from v.1.63  
changed lines
  Added in v.1.104

  ViewVC Help
Powered by ViewVC 1.1.20