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