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

Legend:
Removed from v.1.78  
changed lines
  Added in v.1.97

  ViewVC Help
Powered by ViewVC 1.1.20