/[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.80 Revision 1.119
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.80 2006/10/30 18:40:58 dberkholz Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.119 2010/07/04 20:42:22 dirtyepic 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
28# Directory prefix to use for everything 20if [[ ${PV} = 9999* ]]; then
29XDIR="/usr" 21 GIT_ECLASS="git"
30 22 SNAPSHOT="yes"
31# Set up default patchset version(s) if necessary 23 SRC_URI=""
32# x11-driver-patches
33if [[ -z "${XDPVER}" ]]; then
34 XDPVER="1"
35fi
36
37IUSE=""
38HOMEPAGE="http://xorg.freedesktop.org/"
39
40# Set up SRC_URI for individual modular releases
41BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
42if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then
43 SRC_URI="${SRC_URI}
44 ${BASE_INDIVIDUAL_URI}/app/${P}.tar.bz2"
45elif [[ ${CATEGORY} = app-doc ]]; then
46 SRC_URI="${SRC_URI}
47 ${BASE_INDIVIDUAL_URI}/doc/${P}.tar.bz2"
48# x11-misc contains data and util, x11-themes contains data
49elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then
50 SRC_URI="${SRC_URI}
51 ${BASE_INDIVIDUAL_URI}/data/${P}.tar.bz2
52 ${BASE_INDIVIDUAL_URI}/util/${P}.tar.bz2"
53elif [[ ${CATEGORY} = x11-drivers ]]; then
54 SRC_URI="${SRC_URI}
55 ${BASE_INDIVIDUAL_URI}/driver/${P}.tar.bz2"
56elif [[ ${CATEGORY} = media-fonts ]]; then
57 SRC_URI="${SRC_URI}
58 ${BASE_INDIVIDUAL_URI}/font/${P}.tar.bz2"
59elif [[ ${CATEGORY} = x11-libs ]]; then
60 SRC_URI="${SRC_URI}
61 ${BASE_INDIVIDUAL_URI}/lib/${P}.tar.bz2"
62elif [[ ${CATEGORY} = x11-proto ]]; then
63 SRC_URI="${SRC_URI}
64 ${BASE_INDIVIDUAL_URI}/proto/${P}.tar.bz2"
65elif [[ ${CATEGORY} = x11-base ]]; then
66 SRC_URI="${SRC_URI}
67 ${BASE_INDIVIDUAL_URI}/xserver/${P}.tar.bz2"
68fi
69
70SLOT="0"
71
72# Set the license for the package. This can be overridden by setting
73# LICENSE after the inherit.
74LICENSE=${PN}
75
76# Set up shared dependencies
77if [[ -n "${SNAPSHOT}" ]]; then
78# FIXME: What's the minimal libtool version supporting arbitrary versioning?
79 DEPEND="${DEPEND}
80 >=sys-devel/autoconf-2.57
81 >=sys-devel/automake-1.7
82 >=sys-devel/libtool-1.5
83 >=sys-devel/m4-1.4"
84fi 24fi
85 25
86# 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
87FONT_ECLASS="" 27FONT_ECLASS=""
88if [[ "${PN/#font-}" != "${PN}" ]] \ 28if [[ "${PN/#font-}" != "${PN}" ]] \
92 # Activate font code in the rest of the eclass 32 # Activate font code in the rest of the eclass
93 FONT="yes" 33 FONT="yes"
94 34
95 # Whether to inherit the font eclass 35 # Whether to inherit the font eclass
96 FONT_ECLASS="font" 36 FONT_ECLASS="font"
37fi
97 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
176inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools ${FONT_ECLASS} 190# @FUNCTION: x-modular_specs_check
177 191# @USAGE:
192# @DESCRIPTION:
193# Make any necessary changes related to gcc specs (generally hardened)
178x-modular_specs_check() { 194x-modular_specs_check() {
179 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 195 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
180 append-ldflags -Wl,-z,lazy 196 append-ldflags -Wl,-z,lazy
181 # (#116698) breaks loading 197 # (#116698) breaks loading
182 filter-ldflags -Wl,-z,now 198 filter-ldflags -Wl,-z,now
183 fi 199 fi
184} 200}
185 201
202# @FUNCTION: x-modular_dri_check
203# @USAGE:
204# @DESCRIPTION:
205# Ensures the server supports DRI if building a driver with DRI support
186x-modular_dri_check() { 206x-modular_dri_check() {
187 # (#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
188 # 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)
189 if [[ -n "${DRIVER}" ]]; then 211 if [[ -n "${DRIVER}" ]]; then
190 if has dri ${IUSE} && use dri; then 212 if has dri ${IUSE} && use dri; then
191 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
192 if ! built_with_use x11-base/xorg-server dri; then 219 if ! built_with_use x11-base/xorg-server dri; then
193 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
194 fi 222 fi
195 fi 223 fi
196 fi 224 fi
197} 225}
198 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
199x-modular_server_supports_drivers_check() { 231x-modular_server_supports_drivers_check() {
200 # (#135873) Only certain servers will actually use or be capable of 232 # (#135873) Only certain servers will actually use or be capable of
201 # building external drivers, including binary drivers. 233 # building external drivers, including binary drivers.
202 if [[ -n "${DRIVER}" ]]; then 234 if [[ -n "${DRIVER}" ]]; then
203 if has_version '>=x11-base/xorg-server-1.1'; then 235 if has_version '>=x11-base/xorg-server-1.1'; then
207 fi 239 fi
208 fi 240 fi
209 fi 241 fi
210} 242}
211 243
244# @FUNCTION: x-modular_unpack_source
245# @USAGE:
246# @DESCRIPTION:
247# Simply unpack source code. Nothing else.
212x-modular_unpack_source() { 248x-modular_unpack_source() {
249 if [[ -n ${GIT_ECLASS} ]]; then
250 git_src_unpack
251 else
213 unpack ${A} 252 unpack ${A}
253 fi
214 cd ${S} 254 cd "${S}"
215 255
216 if [[ -n ${FONT_OPTIONS} ]]; then 256 if [[ -n ${FONT_OPTIONS} ]]; then
217 einfo "Detected font directory: ${FONT_DIR}" 257 einfo "Detected font directory: ${FONT_DIR}"
218 fi 258 fi
219} 259}
220 260
261# @FUNCTION: x-modular_patch_source
262# @USAGE:
263# @DESCRIPTION:
264# Apply all patches
221x-modular_patch_source() { 265x-modular_patch_source() {
222 # Use standardized names and locations with bulk patching 266 # Use standardized names and locations with bulk patching
223 # Patch directory is ${WORKDIR}/patch 267 # Patch directory is ${WORKDIR}/patch
224 # See epatch() in eutils.eclass for more documentation 268 # See epatch() in eutils.eclass for more documentation
225 if [[ -z "${EPATCH_SUFFIX}" ]] ; then 269 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
226 EPATCH_SUFFIX="patch" 270 EPATCH_SUFFIX="patch"
227 fi 271 fi
228 272
229 # If this is a driver package we need to fix man page install location. 273# @VARIABLE: PATCHES
230 # Running autoreconf will use the patched util-macros to make the 274# @DESCRIPTION:
231 # 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
232 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\ 276# will apply them. It also handles epatch-style bulk patches, if you know how to
233 && [[ ${XDPVER} != -1 ]]; then 277# use them and set the correct variables. If you don't, read eutils.eclass.
234 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 278 if [[ ${#PATCHES[@]} -gt 1 ]]; then
235 fi 279 for x in "${PATCHES[@]}"; do
236 280 epatch "${x}"
237 # For specific list of patches 281 done
238 if [[ -n "${PATCHES}" ]] ; then 282 elif [[ -n "${PATCHES}" ]]; then
239 for PATCH in ${PATCHES} 283 for x in ${PATCHES}; do
240 do
241 epatch ${PATCH} 284 epatch "${x}"
242 done 285 done
243 # For non-default directory bulk patching 286 # For non-default directory bulk patching
244 elif [[ -n "${PATCH_LOC}" ]] ; then 287 elif [[ -n "${PATCH_LOC}" ]] ; then
245 epatch ${PATCH_LOC} 288 epatch ${PATCH_LOC}
246 # For standard bulk patching 289 # For standard bulk patching
247 elif [[ -d "${EPATCH_SOURCE}" ]] ; then 290 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
248 epatch 291 epatch
249 fi 292 fi
250} 293}
251 294
295# @FUNCTION: x-modular_reconf_source
296# @USAGE:
297# @DESCRIPTION:
298# Run eautoreconf if necessary, and run elibtoolize.
252x-modular_reconf_source() { 299x-modular_reconf_source() {
253 # Run autoreconf for CVS snapshots only
254 if [[ "${SNAPSHOT}" = "yes" ]] 300 if [[ "${SNAPSHOT}" = "yes" ]]
255 then 301 then
256 # If possible, generate configure if it doesn't exist 302 # If possible, generate configure if it doesn't exist
257 if [ -f "./configure.ac" ] 303 if [ -f "./configure.ac" ]
258 then 304 then
263 # Joshua Baergen - October 23, 2005 309 # Joshua Baergen - October 23, 2005
264 # Fix shared lib issues on MIPS, FBSD, etc etc 310 # Fix shared lib issues on MIPS, FBSD, etc etc
265 elibtoolize 311 elibtoolize
266} 312}
267 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.
268x-modular_src_unpack() { 329x-modular_src_unpack() {
269 x-modular_specs_check 330 x-modular_specs_check
270 x-modular_server_supports_drivers_check 331 x-modular_server_supports_drivers_check
271 x-modular_dri_check 332 x-modular_dri_check
272 x-modular_unpack_source 333 x-modular_unpack_source
273 x-modular_patch_source 334 has src_prepare ${EXPORTED_FUNCTIONS} || x-modular_src_prepare
274 x-modular_reconf_source
275} 335}
276 336
337# @FUNCTION: x-modular_font_configure
338# @USAGE:
339# @DESCRIPTION:
340# If a font package, perform any necessary configuration steps
277x-modular_font_configure() { 341x-modular_font_configure() {
278 if [[ -n "${FONT}" ]]; then 342 if [[ -n "${FONT}" ]]; then
279 # Might be worth adding an option to configure your desired font 343 # Might be worth adding an option to configure your desired font
280 # 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?
281 if ! use nls; then 345 if has nls ${IUSE//+} && ! use nls; then
282 FONT_OPTIONS="${FONT_OPTIONS} 346 FONT_OPTIONS="${FONT_OPTIONS}
283 --disable-iso8859-2 347 --disable-iso8859-2
284 --disable-iso8859-3 348 --disable-iso8859-3
285 --disable-iso8859-4 349 --disable-iso8859-4
286 --disable-iso8859-5 350 --disable-iso8859-5
299 --disable-koi8-r" 363 --disable-koi8-r"
300 fi 364 fi
301 fi 365 fi
302} 366}
303 367
368# @FUNCTION: x-modular_debug_setup
369# @USAGE:
370# @DESCRIPTION:
371# Set up CFLAGS for a debug build
304x-modular_debug_setup() { 372x-modular_debug_setup() {
305 if [[ -n "${DEBUGGABLE}" ]]; then 373 if [[ -n "${DEBUGGABLE}" ]]; then
306 if use debug; then 374 if use debug; then
307 strip-flags 375 strip-flags
308 append-flags -g 376 append-flags -g
309 fi 377 fi
310 fi 378 fi
311} 379}
312 380
381# @FUNCTION: x-modular_src_configure
382# @USAGE:
383# @DESCRIPTION:
384# Perform any necessary pre-configuration steps, then run configure
313x-modular_src_configure() { 385x-modular_src_configure() {
314 x-modular_font_configure 386 x-modular_font_configure
315 x-modular_debug_setup 387 x-modular_debug_setup
316 388
389# @VARIABLE: CONFIGURE_OPTIONS
390# @DESCRIPTION:
391# Any extra options to pass to configure
392
317 # If prefix isn't set here, .pc files cause problems 393 # If prefix isn't set here, .pc files cause problems
318 if [[ -x ./configure ]]; then 394 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
319 econf --prefix=${XDIR} \ 395 econf --prefix=${XDIR} \
320 --datadir=${XDIR}/share \ 396 --datadir=${XDIR}/share \
321 ${FONT_OPTIONS} \ 397 ${FONT_OPTIONS} \
322 ${DRIVER_OPTIONS} \ 398 ${DRIVER_OPTIONS} \
323 ${CONFIGURE_OPTIONS} 399 ${CONFIGURE_OPTIONS}
324 fi 400 fi
325} 401}
326 402
403# @FUNCTION: x-modular_src_make
404# @USAGE:
405# @DESCRIPTION:
406# Run make.
327x-modular_src_make() { 407x-modular_src_make() {
328 emake || die "emake failed" 408 emake || die "emake failed"
329} 409}
330 410
411# @FUNCTION: x-modular_src_compile
412# @USAGE:
413# @DESCRIPTION:
414# Compile a package, performing all X-related tasks.
331x-modular_src_compile() { 415x-modular_src_compile() {
332 x-modular_src_configure 416 has src_configure ${EXPORTED_FUNCTIONS} || x-modular_src_configure
333 x-modular_src_make 417 x-modular_src_make
334} 418}
335 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.
336x-modular_src_install() { 425x-modular_src_install() {
337 # Install everything to ${XDIR} 426 # Install everything to ${XDIR}
427 if [[ ${CATEGORY} = x11-proto ]]; then
338 make \ 428 make \
429 ${PN/proto/}docdir=/usr/share/doc/${PF} \
339 DESTDIR="${D}" \ 430 DESTDIR="${D}" \
340 install 431 install \
432 || die
433 else
434 make \
435 docdir=/usr/share/doc/${PF} \
436 DESTDIR="${D}" \
437 install \
438 || die
439 fi
341# Shouldn't be necessary in XDIR=/usr 440# Shouldn't be necessary in XDIR=/usr
342# einstall forces datadir, so we need to re-force it 441# einstall forces datadir, so we need to re-force it
343# datadir=${XDIR}/share \ 442# datadir=${XDIR}/share \
344# mandir=${XDIR}/share/man \ 443# mandir=${XDIR}/share/man \
345 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
346 if [[ -e ${S}/ChangeLog ]]; then 451 if [[ -e ${S}/ChangeLog ]]; then
347 dodoc ${S}/ChangeLog 452 dodoc "${S}"/ChangeLog
348 fi 453 fi
349 454# @VARIABLE: DOCS
350 # Make sure docs get compressed 455# @DESCRIPTION:
351 prepalldocs 456# Any documentation to install via dodoc
457 [[ -n ${DOCS} ]] && dodoc ${DOCS}
352 458
353 # Don't install libtool archives for server modules 459 # Don't install libtool archives for server modules
354 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then 460 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
355 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \ 461 find "${D}"/usr/$(get_libdir)/xorg/modules -name '*.la' \
356 | xargs rm -f 462 | xargs rm -f
357 fi 463 fi
358 464
359 # Don't install overlapping fonts.* files
360 # Generate them instead when possible
361 if [[ -n "${FONT}" ]]; then 465 if [[ -n "${FONT}" ]]; then
362 remove_font_metadata 466 remove_font_metadata
363 fi 467 fi
364 468
365 if [[ -n "${DRIVER}" ]]; then 469 if [[ -n "${DRIVER}" ]]; then
366 install_driver_hwdata 470 install_driver_hwdata
367 fi 471 fi
368} 472}
369 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.
370x-modular_pkg_preinst() { 478x-modular_pkg_preinst() {
371 # We no longer do anything here, but we can't remove it from the API 479 # We no longer do anything here, but we can't remove it from the API
372 : 480 :
373} 481}
374 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.
375x-modular_pkg_postinst() { 488x-modular_pkg_postinst() {
376 if [[ -n "${FONT}" ]]; then 489 if [[ -n "${FONT}" ]]; then
377 setup_fonts 490 setup_fonts
378 fi 491 fi
379} 492}
380 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.
381x-modular_pkg_postrm() { 499x-modular_pkg_postrm() {
382 if [[ -n "${FONT}" ]]; then 500 if [[ -n "${FONT}" ]]; then
383 cleanup_fonts
384 font_pkg_postrm 501 font_pkg_postrm
385 fi 502 fi
386} 503}
387 504
388cleanup_fonts() { 505# @FUNCTION: setup_fonts
389 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale" 506# @USAGE:
390 for DIR in ${FONT_DIR}; do 507# @DESCRIPTION:
391 unset KEEP_FONTDIR 508# Generates needed files for fonts and fixes font permissions
392 REAL_DIR=${ROOT}usr/share/fonts/${DIR}
393
394 ebegin "Checking ${REAL_DIR} for useless files"
395 pushd ${REAL_DIR} &> /dev/null
396 for FILE in *; do
397 unset MATCH
398 for ALLOWED_FILE in ${ALLOWED_FILES}; do
399 if [[ ${FILE} = ${ALLOWED_FILE} ]]; then
400 # If it's allowed, then move on to the next file
401 MATCH="yes"
402 break
403 fi
404 done
405 # If we found a match in allowed files, move on to the next file
406 if [[ -n ${MATCH} ]]; then
407 continue
408 fi
409 # If we get this far, there wasn't a match in the allowed files
410 KEEP_FONTDIR="yes"
411 # We don't need to check more files if we're already keeping it
412 break
413 done
414 popd &> /dev/null
415 # If there are no files worth keeping, then get rid of the dir
416 if [[ -z "${KEEP_FONTDIR}" ]]; then
417 rm -rf ${REAL_DIR}
418 fi
419 eend 0
420 done
421}
422
423setup_fonts() { 509setup_fonts() {
424 if [[ ! -n "${FONT_DIR}" ]]; then 510 if [[ ! -n "${FONT_DIR}" ]]; then
425 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts." 511 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
426 eerror "${msg}" 512 eerror "${msg}"
427 die "${msg}" 513 die "${msg}"
428 fi 514 fi
429 515
430 create_fonts_scale 516 create_fonts_scale
431 create_fonts_dir 517 create_fonts_dir
432 fix_font_permissions
433 create_font_cache 518 create_font_cache
434} 519}
435 520
521# @FUNCTION: remove_font_metadata
522# @USAGE:
523# @DESCRIPTION:
524# Don't let the package install generated font files that may overlap
525# with other packages. Instead, they're generated in pkg_postinst().
436remove_font_metadata() { 526remove_font_metadata() {
437 local DIR 527 local DIR
438 for DIR in ${FONT_DIR}; do 528 for DIR in ${FONT_DIR}; do
439 if [[ "${DIR}" != "Speedo" ]] && \ 529 if [[ "${DIR}" != "Speedo" ]] && \
440 [[ "${DIR}" != "CID" ]] ; then 530 [[ "${DIR}" != "CID" ]] ; then
441 # Delete font metadata files 531 # Delete font metadata files
442 # fonts.scale, fonts.dir, fonts.cache-1 532 # fonts.scale, fonts.dir, fonts.cache-1
443 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} 533 rm -f "${D}"/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
444 fi 534 fi
445 done 535 done
446} 536}
447 537
538# @FUNCTION: install_driver_hwdata
539# @USAGE:
540# @DESCRIPTION:
448# Installs device-to-driver mappings for system-config-display 541# Installs device-to-driver mappings for system-config-display and
449# and anything else that uses hwdata 542# anything else that uses hwdata.
450install_driver_hwdata() { 543install_driver_hwdata() {
451 insinto /usr/share/hwdata/videoaliases 544 insinto /usr/share/hwdata/videoaliases
452 for i in "${FILESDIR}"/*.xinf; do 545 for i in "${FILESDIR}"/*.xinf; do
453 # We need this for the case when none exist, 546 # We need this for the case when none exist,
454 # so *.xinf doesn't expand 547 # so *.xinf doesn't expand
456 doins $i 549 doins $i
457 fi 550 fi
458 done 551 done
459} 552}
460 553
554# @FUNCTION: discover_font_dirs
555# @USAGE:
556# @DESCRIPTION:
557# Deprecated. Sets up the now-unused FONT_DIRS variable.
461discover_font_dirs() { 558discover_font_dirs() {
462 FONT_DIRS="${FONT_DIR}" 559 FONT_DIRS="${FONT_DIR}"
463} 560}
464 561
562# @FUNCTION: create_fonts_scale
563# @USAGE:
564# @DESCRIPTION:
565# Create fonts.scale file, used by the old server-side fonts subsystem.
465create_fonts_scale() { 566create_fonts_scale() {
466 ebegin "Creating fonts.scale files" 567 ebegin "Creating fonts.scale files"
467 local x 568 local x
468 for DIR in ${FONT_DIR}; do 569 for DIR in ${FONT_DIR}; do
469 x=${ROOT}/usr/share/fonts/${DIR} 570 x=${ROOT}/usr/share/fonts/${DIR}
472 573
473 # Only generate .scale files if truetype, opentype or type1 574 # Only generate .scale files if truetype, opentype or type1
474 # fonts are present ... 575 # fonts are present ...
475 576
476 # NOTE: There is no way to regenerate Speedo/CID fonts.scale 577 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
477 # <spyderous@gentoo.org> 2 August 2004 578 # <dberkholz@gentoo.org> 2 August 2004
478 if [[ "${x/encodings}" = "${x}" ]] \ 579 if [[ "${x/encodings}" = "${x}" ]] \
479 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then 580 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
480 mkfontscale \ 581 mkfontscale \
481 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 582 -a "${ROOT}"/usr/share/fonts/encodings/encodings.dir \
482 -- ${x} 583 -- ${x}
483 fi 584 fi
484 done 585 done
485 eend 0 586 eend 0
486} 587}
487 588
589# @FUNCTION: create_fonts_dir
590# @USAGE:
591# @DESCRIPTION:
592# Create fonts.dir file, used by the old server-side fonts subsystem.
488create_fonts_dir() { 593create_fonts_dir() {
489 ebegin "Generating fonts.dir files" 594 ebegin "Generating fonts.dir files"
490 for DIR in ${FONT_DIR}; do 595 for DIR in ${FONT_DIR}; do
491 x=${ROOT}/usr/share/fonts/${DIR} 596 x=${ROOT}/usr/share/fonts/${DIR}
492 [[ -z "$(ls ${x}/)" ]] && continue 597 [[ -z "$(ls ${x}/)" ]] && continue
493 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 598 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
494 599
495 if [[ "${x/encodings}" = "${x}" ]]; then 600 if [[ "${x/encodings}" = "${x}" ]]; then
496 mkfontdir \ 601 mkfontdir \
497 -e ${ROOT}/usr/share/fonts/encodings \ 602 -e "${ROOT}"/usr/share/fonts/encodings \
498 -e ${ROOT}/usr/share/fonts/encodings/large \ 603 -e "${ROOT}"/usr/share/fonts/encodings/large \
499 -- ${x} 604 -- ${x}
500 fi 605 fi
501 done 606 done
502 eend 0 607 eend 0
503} 608}
504 609
505fix_font_permissions() { 610# @FUNCTION: create_font_cache
506 ebegin "Fixing permissions" 611# @USAGE:
507 for DIR in ${FONT_DIR}; do 612# @DESCRIPTION:
508 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \ 613# Create fonts.cache-1 files, used by the new client-side fonts
509 -exec chmod 0644 {} \; 614# subsystem.
510 done
511 eend 0
512}
513
514create_font_cache() { 615create_font_cache() {
515 font_pkg_postinst 616 font_pkg_postinst
516} 617}
517
518EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm

Legend:
Removed from v.1.80  
changed lines
  Added in v.1.119

  ViewVC Help
Powered by ViewVC 1.1.20