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

Legend:
Removed from v.1.61  
changed lines
  Added in v.1.106

  ViewVC Help
Powered by ViewVC 1.1.20