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

  ViewVC Help
Powered by ViewVC 1.1.20