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

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

  ViewVC Help
Powered by ViewVC 1.1.20