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

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

  ViewVC Help
Powered by ViewVC 1.1.20