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

Legend:
Removed from v.1.1  
changed lines
  Added in v.1.26

  ViewVC Help
Powered by ViewVC 1.1.20