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

Legend:
Removed from v.1.76  
changed lines
  Added in v.1.112

  ViewVC Help
Powered by ViewVC 1.1.20