/[gentoo-x86]/eclass/xorg-2.eclass
Gentoo

Diff of /eclass/xorg-2.eclass

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

Revision 1.6 Revision 1.30
1# Copyright 1999-2010 Gentoo Foundation 1# Copyright 1999-2010 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/xorg-2.eclass,v 1.6 2010/07/14 08:34:27 scarabeus Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.30 2011/03/16 09:29:42 scarabeus Exp $
4# 4#
5# @ECLASS: xorg-2.eclass 5# @ECLASS: xorg-2.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# x11@gentoo.org 7# x11@gentoo.org
8# @BLURB: Reduces code duplication in the modularized X11 ebuilds. 8# @BLURB: Reduces code duplication in the modularized X11 ebuilds.
… …
22 22
23GIT_ECLASS="" 23GIT_ECLASS=""
24if [[ ${PV} == *9999* ]]; then 24if [[ ${PV} == *9999* ]]; then
25 GIT_ECLASS="git" 25 GIT_ECLASS="git"
26 XORG_EAUTORECONF="yes" 26 XORG_EAUTORECONF="yes"
27 SRC_URI=""
28fi 27fi
29 28
30# If we're a font package, but not the font.alias one 29# If we're a font package, but not the font.alias one
31FONT_ECLASS="" 30FONT_ECLASS=""
32if [[ ${PN} == font* \ 31if [[ ${PN} == font* \
… …
36 # Activate font code in the rest of the eclass 35 # Activate font code in the rest of the eclass
37 FONT="yes" 36 FONT="yes"
38 FONT_ECLASS="font" 37 FONT_ECLASS="font"
39fi 38fi
40 39
41inherit eutils base libtool multilib toolchain-funcs flag-o-matic autotools \ 40inherit autotools-utils eutils libtool multilib toolchain-funcs flag-o-matic autotools \
42 ${FONT_ECLASS} ${GIT_ECLASS} 41 ${FONT_ECLASS} ${GIT_ECLASS}
43 42
44EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm" 43EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm"
45case "${EAPI:-0}" in 44case "${EAPI:-0}" in
46 3) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;; 45 3|4) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;;
47 *) DEPEND="EAPI-UNSUPPORTED" ;; 46 *) die "EAPI-UNSUPPORTED" ;;
48esac 47esac
49 48
50# exports must be ALWAYS after inherit 49# exports must be ALWAYS after inherit
51EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS} 50EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
52 51
… …
57# @DESCRIPTION: 56# @DESCRIPTION:
58# If set to 'yes' and configure.ac exists, eautoreconf will run. Set 57# If set to 'yes' and configure.ac exists, eautoreconf will run. Set
59# before inheriting this eclass. 58# before inheriting this eclass.
60: ${XORG_EAUTORECONF:="no"} 59: ${XORG_EAUTORECONF:="no"}
61 60
61# @ECLASS-VARIABLE: BASE_INDIVIDUAL_URI
62# @DESCRIPTION:
62# Set up SRC_URI for individual modular releases 63# Set up SRC_URI for individual modular releases. If set to an empty
64# string, no SRC_URI will be provided by the eclass.
63BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual" 65: ${BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"}
66
64# @ECLASS-VARIABLE: MODULE 67# @ECLASS-VARIABLE: MODULE
65# @DESCRIPTION: 68# @DESCRIPTION:
66# The subdirectory to download source from. Possible settings are app, 69# The subdirectory to download source from. Possible settings are app,
67# doc, data, util, driver, font, lib, proto, xserver. Set above the 70# doc, data, util, driver, font, lib, proto, xserver. Set above the
68# inherit to override the default autoconfigured module. 71# inherit to override the default autoconfigured module.
69if [[ -z ${MODULE} ]]; then 72if [[ -z ${MODULE} ]]; then
70 MODULE=""
71 case ${CATEGORY} in 73 case ${CATEGORY} in
72 app-doc) MODULE="doc" ;; 74 app-doc) MODULE=doc/ ;;
73 media-fonts) MODULE="font" ;; 75 media-fonts) MODULE=font/ ;;
74 x11-apps|x11-wm) MODULE="app" ;; 76 x11-apps|x11-wm) MODULE=app/ ;;
75 x11-misc|x11-themes) MODULE="util" ;; 77 x11-misc|x11-themes) MODULE=util/ ;;
76 x11-drivers) MODULE="driver" ;;
77 x11-base) MODULE="xserver" ;; 78 x11-base) MODULE=xserver/ ;;
79 x11-drivers) MODULE=driver/ ;;
78 x11-proto) MODULE="proto" ;; 80 x11-proto) MODULE=proto/ ;;
79 x11-libs) MODULE="lib" ;; 81 x11-libs) MODULE=lib/ ;;
82 *) MODULE= ;;
80 esac 83 esac
81fi 84fi
82 85
86# @ECLASS-VARIABLE: PACKAGE_NAME
87# @DESCRIPTION:
88# For git checkout the git repository might differ from package name.
89# This variable can be used for proper directory specification
90: ${PACKAGE_NAME:=${PN}}
91
83if [[ -n ${GIT_ECLASS} ]]; then 92if [[ -n ${GIT_ECLASS} ]]; then
84 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PN}" 93 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}${PACKAGE_NAME}"
85else 94elif [[ -n ${BASE_INDIVIDUAL_URI} ]]; then
86 SRC_URI+=" ${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2" 95 SRC_URI="${BASE_INDIVIDUAL_URI}/${MODULE}${P}.tar.bz2"
87fi 96fi
88 97
89: ${SLOT:=0} 98: ${SLOT:=0}
90 99
91# Set the license for the package. This can be overridden by setting 100# Set the license for the package. This can be overridden by setting
92# LICENSE after the inherit. Nearly all FreeDesktop-hosted X packages 101# LICENSE after the inherit. Nearly all FreeDesktop-hosted X packages
93# are under the MIT license. (This is what Red Hat does in their rpms) 102# are under the MIT license. (This is what Red Hat does in their rpms)
94: ${LICENSE:=MIT} 103: ${LICENSE:=MIT}
95 104
96# Set up shared dependencies 105# Set up autotools shared dependencies
97if [[ ${XORG_EAUTORECONF} != no ]]; then 106# Remember that all versions here MUST be stable
98 DEPEND+=" 107XORG_EAUTORECONF_ARCHES="x86-interix ppc-aix x86-winnt"
108EAUTORECONF_DEPEND+="
99 >=sys-devel/libtool-2.2.6a 109 >=sys-devel/libtool-2.2.6a
100 sys-devel/m4" 110 sys-devel/m4"
101 # This MUST BE STABLE
102 if [[ ${PN} != util-macros ]] ; then 111if [[ ${PN} != util-macros ]] ; then
103 DEPEND+=" >=x11-misc/util-macros-1.8.0" 112 EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.12.0"
104 # Required even by xorg-server 113 # Required even by xorg-server
105 [[ ${PN} == "font-util" ]] || DEPEND+=" >=media-fonts/font-util-1.1.1-r1" 114 [[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.1.1-r1"
106 fi 115fi
107 WANT_AUTOCONF="latest" 116WANT_AUTOCONF="latest"
108 WANT_AUTOMAKE="latest" 117WANT_AUTOMAKE="latest"
109fi 118for arch in ${XORG_EAUTORECONF_ARCHES}; do
119 EAUTORECONF_DEPENDS+=" ${arch}? ( ${EAUTORECONF_DEPEND} )"
120done
121DEPEND+=" ${EAUTORECONF_DEPENDS}"
122[[ ${XORG_EAUTORECONF} != no ]] && DEPEND+=" ${EAUTORECONF_DEPEND}"
123unset EAUTORECONF_DEPENDS
124unset EAUTORECONF_DEPEND
110 125
111if [[ ${FONT} == yes ]]; then 126if [[ ${FONT} == yes ]]; then
112 RDEPEND+=" media-fonts/encodings 127 RDEPEND+=" media-fonts/encodings
113 x11-apps/mkfontscale 128 x11-apps/mkfontscale
114 x11-apps/mkfontdir" 129 x11-apps/mkfontdir"
115 PDEPEND+=" media-fonts/font-alias" 130 PDEPEND+=" media-fonts/font-alias"
131 DEPEND+=" >=media-fonts/font-util-1.1.1-r1"
116 132
117 # @ECLASS-VARIABLE: FONT_DIR 133 # @ECLASS-VARIABLE: FONT_DIR
118 # @DESCRIPTION: 134 # @DESCRIPTION:
119 # If you're creating a font package and the suffix of PN is not equal to 135 # If you're creating a font package and the suffix of PN is not equal to
120 # the subdirectory of /usr/share/fonts/ it should install into, set 136 # the subdirectory of /usr/share/fonts/ it should install into, set
… …
146 162
147# Add static-libs useflag where usefull. 163# Add static-libs useflag where usefull.
148if [[ ${XORG_STATIC} == yes \ 164if [[ ${XORG_STATIC} == yes \
149 && ${FONT} != yes \ 165 && ${FONT} != yes \
150 && ${CATEGORY} != app-doc \ 166 && ${CATEGORY} != app-doc \
167 && ${CATEGORY} != x11-apps \
151 && ${CATEGORY} != x11-proto \ 168 && ${CATEGORY} != x11-proto \
152 && ${CATEGORY} != x11-drivers \ 169 && ${CATEGORY} != x11-drivers \
153 && ${CATEGORY} != media-fonts \ 170 && ${CATEGORY} != media-fonts \
154 && ${PN} != util-macros \ 171 && ${PN} != util-macros \
155 && ${PN} != xbitmaps \ 172 && ${PN} != xbitmaps \
… …
158 IUSE+=" static-libs" 175 IUSE+=" static-libs"
159fi 176fi
160 177
161DEPEND+=" >=dev-util/pkgconfig-0.23" 178DEPEND+=" >=dev-util/pkgconfig-0.23"
162 179
163# Check deps on xorg-server 180# Check deps on drivers
164has dri ${IUSE//+} && DEPEND+=" dri? ( >=x11-base/xorg-server-1.6.3.901-r2[-minimal] )" 181if has dri ${IUSE//+}; then
165[[ -n "${DRIVER}" ]] && DEPEND+=" x11-base/xorg-server[xorg]" 182 COMMON_DEPEND+=" dri? (
183 x11-base/xorg-server[-minimal]
184 x11-libs/libdrm
185 )"
186 DEPEND+=" dri? (
187 x11-proto/xf86driproto
188 x11-proto/glproto
189 x11-proto/dri2proto
190 )"
191fi
192if [[ -n "${DRIVER}" ]]; then
193 COMMON_DEPEND+="
194 x11-base/xorg-server[xorg]
195 "
196fi
197if [[ -n "${DRIVER}" && ${PN} == xf86-video-* ]]; then
198 COMMON_DEPEND+="
199 x11-libs/libpciaccess
200 "
201 # we also needs some protos and libs in all cases
202 DEPEND+="
203 x11-proto/fontsproto
204 x11-proto/randrproto
205 x11-proto/renderproto
206 x11-proto/videoproto
207 x11-proto/xextproto
208 x11-proto/xineramaproto
209 x11-proto/xproto
210 "
211fi
212
213# Add deps on documentation
214# Most docbooks use dtd version 4.2 and 4.3 add more when found
215if has doc ${IUSE//+}; then
216 DEPEND+="
217 doc? (
218 app-text/asciidoc
219 app-text/xmlto
220 app-doc/doxygen
221 app-text/docbook-xml-dtd:4.1
222 app-text/docbook-xml-dtd:4.2
223 app-text/docbook-xml-dtd:4.3
224 )
225 "
226fi
227
228DEPEND+=" ${COMMON_DEPEND}"
229RDEPEND+=" ${COMMON_DEPEND}"
230unset COMMON_DEPEND
231
232debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: DEPEND=${DEPEND}"
233debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: RDEPEND=${RDEPEND}"
166 234
167# @FUNCTION: xorg-2_pkg_setup 235# @FUNCTION: xorg-2_pkg_setup
168# @USAGE:
169# @DESCRIPTION: 236# @DESCRIPTION:
170# Setup prefix compat 237# Setup prefix compat
171xorg-2_pkg_setup() { 238xorg-2_pkg_setup() {
239 debug-print-function ${FUNCNAME} "$@"
240
172 [[ ${FONT} == yes ]] && font_pkg_setup 241 [[ ${FONT} == yes ]] && font_pkg_setup "$@"
173} 242}
174 243
175# @FUNCTION: xorg-2_src_unpack 244# @FUNCTION: xorg-2_src_unpack
176# @USAGE:
177# @DESCRIPTION: 245# @DESCRIPTION:
178# Simply unpack source code. 246# Simply unpack source code.
179xorg-2_src_unpack() { 247xorg-2_src_unpack() {
248 debug-print-function ${FUNCNAME} "$@"
249
180 if [[ -n ${GIT_ECLASS} ]]; then 250 if [[ -n ${GIT_ECLASS} ]]; then
181 git_src_unpack 251 git_src_unpack
182 else 252 else
183 unpack ${A} 253 unpack ${A}
184 fi 254 fi
185 255
186 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}" 256 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}"
187} 257}
188 258
189# @FUNCTION: xorg-2_patch_source 259# @FUNCTION: xorg-2_patch_source
190# @USAGE:
191# @DESCRIPTION: 260# @DESCRIPTION:
192# Apply all patches 261# Apply all patches
193xorg-2_patch_source() { 262xorg-2_patch_source() {
263 debug-print-function ${FUNCNAME} "$@"
264
194 # Use standardized names and locations with bulk patching 265 # Use standardized names and locations with bulk patching
195 # Patch directory is ${WORKDIR}/patch 266 # Patch directory is ${WORKDIR}/patch
196 # See epatch() in eutils.eclass for more documentation 267 # See epatch() in eutils.eclass for more documentation
197 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch} 268 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch}
198 269
199 [[ -d "${EPATCH_SOURCE}" ]] && epatch 270 [[ -d "${EPATCH_SOURCE}" ]] && epatch
200 base_src_prepare 271 autotools-utils_src_prepare "$@"
201} 272}
202 273
203# @FUNCTION: xorg-2_reconf_source 274# @FUNCTION: xorg-2_reconf_source
204# @USAGE:
205# @DESCRIPTION: 275# @DESCRIPTION:
206# Run eautoreconf if necessary, and run elibtoolize. 276# Run eautoreconf if necessary, and run elibtoolize.
207xorg-2_reconf_source() { 277xorg-2_reconf_source() {
278 debug-print-function ${FUNCNAME} "$@"
279
208 case ${CHOST} in 280 case ${CHOST} in
209 *-interix* | *-aix* | *-winnt*) 281 *-interix* | *-aix* | *-winnt*)
210 # some hosts need full eautoreconf 282 # some hosts need full eautoreconf
211 [[ -e "./configure.ac" || -e "./configure.in" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail." 283 [[ -e "./configure.ac" || -e "./configure.in" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail."
212 ;; 284 ;;
213 *) 285 *)
214 # elibtoolize required for BSD 286 # elibtoolize required for BSD
215 [[ ${XORG_EAUTORECONF} != no && -e "./configure.ac" ]] && eautoreconf || elibtoolize 287 [[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" || -e "./configure.in" ) ]] && eautoreconf || elibtoolize
216 ;; 288 ;;
217 esac 289 esac
218} 290}
219 291
220# @FUNCTION: xorg-2_src_prepare 292# @FUNCTION: xorg-2_src_prepare
221# @USAGE:
222# @DESCRIPTION: 293# @DESCRIPTION:
223# Prepare a package after unpacking, performing all X-related tasks. 294# Prepare a package after unpacking, performing all X-related tasks.
224xorg-2_src_prepare() { 295xorg-2_src_prepare() {
296 debug-print-function ${FUNCNAME} "$@"
297
225 [[ -n ${GIT_ECLASS} ]] && git_src_prepare 298 [[ -n ${GIT_ECLASS} ]] && git_src_prepare
226 xorg-2_patch_source 299 xorg-2_patch_source
227 xorg-2_reconf_source 300 xorg-2_reconf_source
228} 301}
229 302
230# @FUNCTION: xorg-2_font_configure 303# @FUNCTION: xorg-2_font_configure
231# @USAGE:
232# @DESCRIPTION: 304# @DESCRIPTION:
233# If a font package, perform any necessary configuration steps 305# If a font package, perform any necessary configuration steps
234xorg-2_font_configure() { 306xorg-2_font_configure() {
307 debug-print-function ${FUNCNAME} "$@"
308
235 if has nls ${IUSE//+} && ! use nls; then 309 if has nls ${IUSE//+} && ! use nls; then
310 if grep -q -s "disable-all-encodings" ${ECONF_SOURCE:-.}/configure; then
236 FONT_OPTIONS+=" 311 FONT_OPTIONS+="
312 --disable-all-encodings"
313 else
314 FONT_OPTIONS+="
237 --disable-iso8859-2 315 --disable-iso8859-2
238 --disable-iso8859-3 316 --disable-iso8859-3
239 --disable-iso8859-4 317 --disable-iso8859-4
240 --disable-iso8859-5 318 --disable-iso8859-5
241 --disable-iso8859-6 319 --disable-iso8859-6
242 --disable-iso8859-7 320 --disable-iso8859-7
243 --disable-iso8859-8 321 --disable-iso8859-8
244 --disable-iso8859-9 322 --disable-iso8859-9
245 --disable-iso8859-10 323 --disable-iso8859-10
246 --disable-iso8859-11 324 --disable-iso8859-11
247 --disable-iso8859-12 325 --disable-iso8859-12
248 --disable-iso8859-13 326 --disable-iso8859-13
249 --disable-iso8859-14 327 --disable-iso8859-14
250 --disable-iso8859-15 328 --disable-iso8859-15
251 --disable-iso8859-16 329 --disable-iso8859-16
252 --disable-jisx0201 330 --disable-jisx0201
253 --disable-koi8-r" 331 --disable-koi8-r"
254 fi 332 fi
333 fi
255} 334}
256 335
257# @FUNCTION: x-modular_flags_setup 336# @FUNCTION: xorg-2_flags_setup
258# @USAGE:
259# @DESCRIPTION: 337# @DESCRIPTION:
260# Set up CFLAGS for a debug build 338# Set up CFLAGS for a debug build
261xorg-2_flags_setup() { 339xorg-2_flags_setup() {
340 debug-print-function ${FUNCNAME} "$@"
341
262 # Win32 require special define 342 # Win32 require special define
263 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__ 343 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__
264 # hardened ldflags 344 # hardened ldflags
265 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy 345 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy
346
347 # Quite few libraries fail on runtime without these:
348 if has static-libs ${IUSE//+}; then
349 filter-flags -Wl,-Bdirect
350 filter-ldflags -Bdirect
351 filter-ldflags -Wl,-Bdirect
352 fi
266} 353}
267 354
268# @FUNCTION: xorg-2_src_configure 355# @FUNCTION: xorg-2_src_configure
269# @USAGE:
270# @DESCRIPTION: 356# @DESCRIPTION:
271# Perform any necessary pre-configuration steps, then run configure 357# Perform any necessary pre-configuration steps, then run configure
272xorg-2_src_configure() { 358xorg-2_src_configure() {
273 local myopts="" 359 debug-print-function ${FUNCNAME} "$@"
274 360
275 xorg-2_flags_setup 361 xorg-2_flags_setup
362
363 # @VARIABLE: CONFIGURE_OPTIONS
364 # @DESCRIPTION:
365 # Any options to pass to configure
366 # @DEFAULT_UNSET
367 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""}
368
276 [[ -n "${FONT}" ]] && xorg-2_font_configure 369 [[ -n "${FONT}" ]] && xorg-2_font_configure
277 370 local myeconfargs=(
278# @VARIABLE: CONFIGURE_OPTIONS 371 --disable-dependency-tracking
279# @DESCRIPTION:
280# Any options to pass to configure
281 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""}
282 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
283 if has static-libs ${IUSE//+}; then
284 myopts+=" $(use_enable static-libs static)"
285 fi
286 econf \
287 ${FONT_OPTIONS} \
288 ${CONFIGURE_OPTIONS} \ 372 ${CONFIGURE_OPTIONS}
289 ${myopts} 373 ${FONT_OPTIONS}
290 fi 374 )
375
376 autotools-utils_src_configure "$@"
291} 377}
292 378
293# @FUNCTION: xorg-2_src_compile 379# @FUNCTION: xorg-2_src_compile
294# @USAGE:
295# @DESCRIPTION: 380# @DESCRIPTION:
296# Compile a package, performing all X-related tasks. 381# Compile a package, performing all X-related tasks.
297xorg-2_src_compile() { 382xorg-2_src_compile() {
298 base_src_compile 383 debug-print-function ${FUNCNAME} "$@"
384
385 autotools-utils_src_compile "$@"
299} 386}
300 387
301# @FUNCTION: xorg-2_src_install 388# @FUNCTION: xorg-2_src_install
302# @USAGE:
303# @DESCRIPTION: 389# @DESCRIPTION:
304# Install a built package to ${D}, performing any necessary steps. 390# Install a built package to ${D}, performing any necessary steps.
305# Creates a ChangeLog from git if using live ebuilds. 391# Creates a ChangeLog from git if using live ebuilds.
306xorg-2_src_install() { 392xorg-2_src_install() {
393 debug-print-function ${FUNCNAME} "$@"
394
307 if [[ ${CATEGORY} == x11-proto ]]; then 395 if [[ ${CATEGORY} == x11-proto ]]; then
308 emake \ 396 autotools-utils_src_install \
309 ${PN/proto/}docdir=${EPREFIX}/usr/share/doc/${PF} \ 397 ${PN/proto/}docdir="${EPREFIX}/usr/share/doc/${PF}" \
310 DESTDIR="${D}" \ 398 docdir="${EPREFIX}/usr/share/doc/${PF}"
311 install || die "emake install failed"
312 else 399 else
313 emake \ 400 autotools-utils_src_install \
314 docdir=${EPREFIX}/usr/share/doc/${PF} \ 401 docdir="${EPREFIX}/usr/share/doc/${PF}"
315 DESTDIR="${D}" \
316 install || die "emake install failed"
317 fi 402 fi
318 403
319 if [[ -n ${GIT_ECLASS} ]]; then 404 if [[ -n ${GIT_ECLASS} ]]; then
320 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null 405 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null
321 git log ${GIT_TREE} > "${S}"/ChangeLog 406 git log ${EGIT_COMMIT} > "${S}"/ChangeLog
322 popd > /dev/null 407 popd > /dev/null
323 fi 408 fi
324 409
325 if [[ -e "${S}"/ChangeLog ]]; then 410 if [[ -e "${S}"/ChangeLog ]]; then
326 dodoc "${S}"/ChangeLog
327 fi
328# @VARIABLE: DOCS
329# @DESCRIPTION:
330# Any documentation to install
331 if [[ -n ${DOCS} ]]; then
332 dodoc ${DOCS} || die "dodoc failed" 411 dodoc "${S}"/ChangeLog || die "dodoc failed"
333 fi 412 fi
334 413
335 # Don't install libtool archives for server modules 414 # Don't install libtool archives (even with static-libs)
336 if [[ -e "${D%/}${EPREFIX}/usr/$(get_libdir)/xorg/modules" ]]; then 415 remove_libtool_files all
337 find "${D%/}${EPREFIX}/usr/$(get_libdir)/xorg/modules" -name '*.la' \
338 -exec rm -f {} ';'
339 fi
340 416
341 [[ -n ${FONT} ]] && remove_font_metadata 417 [[ -n ${FONT} ]] && remove_font_metadata
342} 418}
343 419
344# @FUNCTION: xorg-2_pkg_postinst 420# @FUNCTION: xorg-2_pkg_postinst
345# @USAGE:
346# @DESCRIPTION: 421# @DESCRIPTION:
347# Run X-specific post-installation tasks on the live filesystem. The 422# Run X-specific post-installation tasks on the live filesystem. The
348# only task right now is some setup for font packages. 423# only task right now is some setup for font packages.
349xorg-2_pkg_postinst() { 424xorg-2_pkg_postinst() {
425 debug-print-function ${FUNCNAME} "$@"
426
350 [[ -n ${FONT} ]] && setup_fonts 427 [[ -n ${FONT} ]] && setup_fonts "$@"
351} 428}
352 429
353# @FUNCTION: xorg-2_pkg_postrm 430# @FUNCTION: xorg-2_pkg_postrm
354# @USAGE:
355# @DESCRIPTION: 431# @DESCRIPTION:
356# Run X-specific post-removal tasks on the live filesystem. The only 432# Run X-specific post-removal tasks on the live filesystem. The only
357# task right now is some cleanup for font packages. 433# task right now is some cleanup for font packages.
358xorg-2_pkg_postrm() { 434xorg-2_pkg_postrm() {
359 if [[ -n ${FONT} ]]; then 435 debug-print-function ${FUNCNAME} "$@"
360 font_pkg_postrm 436
361 fi 437 [[ -n ${FONT} ]] && font_pkg_postrm "$@"
362} 438}
363 439
364# @FUNCTION: setup_fonts 440# @FUNCTION: setup_fonts
365# @USAGE:
366# @DESCRIPTION: 441# @DESCRIPTION:
367# Generates needed files for fonts and fixes font permissions 442# Generates needed files for fonts and fixes font permissions
368setup_fonts() { 443setup_fonts() {
444 debug-print-function ${FUNCNAME} "$@"
445
369 create_fonts_scale 446 create_fonts_scale
370 create_fonts_dir 447 create_fonts_dir
371 font_pkg_postinst 448 font_pkg_postinst
372} 449}
373 450
374# @FUNCTION: remove_font_metadata 451# @FUNCTION: remove_font_metadata
375# @USAGE:
376# @DESCRIPTION: 452# @DESCRIPTION:
377# Don't let the package install generated font files that may overlap 453# Don't let the package install generated font files that may overlap
378# with other packages. Instead, they're generated in pkg_postinst(). 454# with other packages. Instead, they're generated in pkg_postinst().
379remove_font_metadata() { 455remove_font_metadata() {
456 debug-print-function ${FUNCNAME} "$@"
457
380 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 458 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
381 einfo "Removing font metadata" 459 einfo "Removing font metadata"
382 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1} 460 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1}
383 fi 461 fi
384} 462}
385 463
386# @FUNCTION: create_fonts_scale 464# @FUNCTION: create_fonts_scale
387# @USAGE:
388# @DESCRIPTION: 465# @DESCRIPTION:
389# Create fonts.scale file, used by the old server-side fonts subsystem. 466# Create fonts.scale file, used by the old server-side fonts subsystem.
390create_fonts_scale() { 467create_fonts_scale() {
468 debug-print-function ${FUNCNAME} "$@"
469
391 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 470 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
392 ebegin "Generating font.scale" 471 ebegin "Generating font.scale"
393 mkfontscale \ 472 mkfontscale \
394 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \ 473 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \
395 -- "${EROOT}/usr/share/fonts/${FONT_DIR}" 474 -- "${EROOT}/usr/share/fonts/${FONT_DIR}"
396 eend $? 475 eend $?
397 fi 476 fi
398} 477}
399 478
400# @FUNCTION: create_fonts_dir 479# @FUNCTION: create_fonts_dir
401# @USAGE:
402# @DESCRIPTION: 480# @DESCRIPTION:
403# Create fonts.dir file, used by the old server-side fonts subsystem. 481# Create fonts.dir file, used by the old server-side fonts subsystem.
404create_fonts_dir() { 482create_fonts_dir() {
483 debug-print-function ${FUNCNAME} "$@"
484
405 ebegin "Generating fonts.dir" 485 ebegin "Generating fonts.dir"
406 mkfontdir \ 486 mkfontdir \
407 -e "${EROOT}"/usr/share/fonts/encodings \ 487 -e "${EROOT}"/usr/share/fonts/encodings \
408 -e "${EROOT}"/usr/share/fonts/encodings/large \ 488 -e "${EROOT}"/usr/share/fonts/encodings/large \
409 -- "${EROOT}/usr/share/fonts/${FONT_DIR}" 489 -- "${EROOT}/usr/share/fonts/${FONT_DIR}"
Legend:
Removed from v.1.6  
changed lines
  Added in v.1.30
  ViewVC Help
Powered by ViewVC 1.1.13