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

Legend:
Removed from v.1.53  
changed lines
  Added in v.1.125

  ViewVC Help
Powered by ViewVC 1.1.20