/[gentoo-x86]/eclass/x-modular.eclass
Gentoo

Diff of /eclass/x-modular.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

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

Legend:
Removed from v.1.78  
changed lines
  Added in v.1.92

  ViewVC Help
Powered by ViewVC 1.1.20