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

Legend:
Removed from v.1.51  
changed lines
  Added in v.1.98

  ViewVC Help
Powered by ViewVC 1.1.20