/[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.9 Revision 1.18
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.9 2010/08/11 09:20:09 scarabeus Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.18 2010/11/01 12:37:58 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.
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) 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
98 DEPEND+=" 98 DEPEND+="
99 >=sys-devel/libtool-2.2.6a 99 >=sys-devel/libtool-2.2.6a
100 sys-devel/m4" 100 sys-devel/m4"
101 # This MUST BE STABLE 101 # This MUST BE STABLE
102 if [[ ${PN} != util-macros ]] ; then 102 if [[ ${PN} != util-macros ]] ; then
103 DEPEND+=" >=x11-misc/util-macros-1.8.0" 103 DEPEND+=" >=x11-misc/util-macros-1.11.0"
104 # Required even by xorg-server 104 # Required even by xorg-server
105 [[ ${PN} == "font-util" ]] || DEPEND+=" >=media-fonts/font-util-1.1.1-r1" 105 [[ ${PN} == "font-util" ]] || DEPEND+=" >=media-fonts/font-util-1.1.1-r1"
106 fi 106 fi
107 WANT_AUTOCONF="latest" 107 WANT_AUTOCONF="latest"
108 WANT_AUTOMAKE="latest" 108 WANT_AUTOMAKE="latest"
111if [[ ${FONT} == yes ]]; then 111if [[ ${FONT} == yes ]]; then
112 RDEPEND+=" media-fonts/encodings 112 RDEPEND+=" media-fonts/encodings
113 x11-apps/mkfontscale 113 x11-apps/mkfontscale
114 x11-apps/mkfontdir" 114 x11-apps/mkfontdir"
115 PDEPEND+=" media-fonts/font-alias" 115 PDEPEND+=" media-fonts/font-alias"
116 DEPEND+=" >=media-fonts/font-util-1.1.1-r1"
116 117
117 # @ECLASS-VARIABLE: FONT_DIR 118 # @ECLASS-VARIABLE: FONT_DIR
118 # @DESCRIPTION: 119 # @DESCRIPTION:
119 # If you're creating a font package and the suffix of PN is not equal to 120 # 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 121 # the subdirectory of /usr/share/fonts/ it should install into, set
146 147
147# Add static-libs useflag where usefull. 148# Add static-libs useflag where usefull.
148if [[ ${XORG_STATIC} == yes \ 149if [[ ${XORG_STATIC} == yes \
149 && ${FONT} != yes \ 150 && ${FONT} != yes \
150 && ${CATEGORY} != app-doc \ 151 && ${CATEGORY} != app-doc \
152 && ${CATEGORY} != x11-apps \
151 && ${CATEGORY} != x11-proto \ 153 && ${CATEGORY} != x11-proto \
152 && ${CATEGORY} != x11-drivers \ 154 && ${CATEGORY} != x11-drivers \
153 && ${CATEGORY} != media-fonts \ 155 && ${CATEGORY} != media-fonts \
154 && ${PN} != util-macros \ 156 && ${PN} != util-macros \
155 && ${PN} != xbitmaps \ 157 && ${PN} != xbitmaps \
163# Check deps on xorg-server 165# Check deps on xorg-server
164has dri ${IUSE//+} && DEPEND+=" dri? ( >=x11-base/xorg-server-1.6.3.901-r2[-minimal] )" 166has dri ${IUSE//+} && DEPEND+=" dri? ( >=x11-base/xorg-server-1.6.3.901-r2[-minimal] )"
165[[ -n "${DRIVER}" ]] && DEPEND+=" x11-base/xorg-server[xorg]" 167[[ -n "${DRIVER}" ]] && DEPEND+=" x11-base/xorg-server[xorg]"
166 168
167# @FUNCTION: xorg-2_pkg_setup 169# @FUNCTION: xorg-2_pkg_setup
168# @USAGE:
169# @DESCRIPTION: 170# @DESCRIPTION:
170# Setup prefix compat 171# Setup prefix compat
171xorg-2_pkg_setup() { 172xorg-2_pkg_setup() {
172 [[ ${FONT} == yes ]] && font_pkg_setup 173 [[ ${FONT} == yes ]] && font_pkg_setup
173} 174}
174 175
175# @FUNCTION: xorg-2_src_unpack 176# @FUNCTION: xorg-2_src_unpack
176# @USAGE:
177# @DESCRIPTION: 177# @DESCRIPTION:
178# Simply unpack source code. 178# Simply unpack source code.
179xorg-2_src_unpack() { 179xorg-2_src_unpack() {
180 if [[ -n ${GIT_ECLASS} ]]; then 180 if [[ -n ${GIT_ECLASS} ]]; then
181 git_src_unpack 181 git_src_unpack
185 185
186 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}" 186 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}"
187} 187}
188 188
189# @FUNCTION: xorg-2_patch_source 189# @FUNCTION: xorg-2_patch_source
190# @USAGE:
191# @DESCRIPTION: 190# @DESCRIPTION:
192# Apply all patches 191# Apply all patches
193xorg-2_patch_source() { 192xorg-2_patch_source() {
194 # Use standardized names and locations with bulk patching 193 # Use standardized names and locations with bulk patching
195 # Patch directory is ${WORKDIR}/patch 194 # Patch directory is ${WORKDIR}/patch
199 [[ -d "${EPATCH_SOURCE}" ]] && epatch 198 [[ -d "${EPATCH_SOURCE}" ]] && epatch
200 base_src_prepare 199 base_src_prepare
201} 200}
202 201
203# @FUNCTION: xorg-2_reconf_source 202# @FUNCTION: xorg-2_reconf_source
204# @USAGE:
205# @DESCRIPTION: 203# @DESCRIPTION:
206# Run eautoreconf if necessary, and run elibtoolize. 204# Run eautoreconf if necessary, and run elibtoolize.
207xorg-2_reconf_source() { 205xorg-2_reconf_source() {
208 case ${CHOST} in 206 case ${CHOST} in
209 *-interix* | *-aix* | *-winnt*) 207 *-interix* | *-aix* | *-winnt*)
216 ;; 214 ;;
217 esac 215 esac
218} 216}
219 217
220# @FUNCTION: xorg-2_src_prepare 218# @FUNCTION: xorg-2_src_prepare
221# @USAGE:
222# @DESCRIPTION: 219# @DESCRIPTION:
223# Prepare a package after unpacking, performing all X-related tasks. 220# Prepare a package after unpacking, performing all X-related tasks.
224xorg-2_src_prepare() { 221xorg-2_src_prepare() {
225 [[ -n ${GIT_ECLASS} ]] && git_src_prepare 222 [[ -n ${GIT_ECLASS} ]] && git_src_prepare
226 xorg-2_patch_source 223 xorg-2_patch_source
227 xorg-2_reconf_source 224 xorg-2_reconf_source
228} 225}
229 226
230# @FUNCTION: xorg-2_font_configure 227# @FUNCTION: xorg-2_font_configure
231# @USAGE:
232# @DESCRIPTION: 228# @DESCRIPTION:
233# If a font package, perform any necessary configuration steps 229# If a font package, perform any necessary configuration steps
234xorg-2_font_configure() { 230xorg-2_font_configure() {
235 if has nls ${IUSE//+} && ! use nls; then 231 if has nls ${IUSE//+} && ! use nls; then
236 FONT_OPTIONS+=" 232 FONT_OPTIONS+="
252 --disable-jisx0201 248 --disable-jisx0201
253 --disable-koi8-r" 249 --disable-koi8-r"
254 fi 250 fi
255} 251}
256 252
257# @FUNCTION: x-modular_flags_setup 253# @FUNCTION: xorg-2_flags_setup
258# @USAGE:
259# @DESCRIPTION: 254# @DESCRIPTION:
260# Set up CFLAGS for a debug build 255# Set up CFLAGS for a debug build
261xorg-2_flags_setup() { 256xorg-2_flags_setup() {
262 # Win32 require special define 257 # Win32 require special define
263 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__ 258 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__
264 # hardened ldflags 259 # hardened ldflags
265 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy 260 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy
261
262 # Quite few libraries fail on runtime without these:
263 if has static-libs ${IUSE//+}; then
264 filter-flags -Wl,-Bdirect
265 filter-ldflags -Bdirect
266 filter-ldflags -Wl,-Bdirect
267 fi
266} 268}
267 269
268# @FUNCTION: xorg-2_src_configure 270# @FUNCTION: xorg-2_src_configure
269# @USAGE:
270# @DESCRIPTION: 271# @DESCRIPTION:
271# Perform any necessary pre-configuration steps, then run configure 272# Perform any necessary pre-configuration steps, then run configure
272xorg-2_src_configure() { 273xorg-2_src_configure() {
273 local myopts="" 274 local myopts=""
274 275
275 xorg-2_flags_setup 276 xorg-2_flags_setup
276 [[ -n "${FONT}" ]] && xorg-2_font_configure 277 [[ -n "${FONT}" ]] && xorg-2_font_configure
277 278
278# @VARIABLE: CONFIGURE_OPTIONS 279 # @VARIABLE: CONFIGURE_OPTIONS
279# @DESCRIPTION: 280 # @DESCRIPTION:
280# Any options to pass to configure 281 # Any options to pass to configure
282 # @DEFAULT_UNSET
281 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""} 283 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""}
282 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then 284 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
283 if has static-libs ${IUSE//+}; then 285 if has static-libs ${IUSE//+}; then
284 myopts+=" $(use_enable static-libs static)" 286 myopts+=" $(use_enable static-libs static)"
285 fi 287 fi
289 ${myopts} 291 ${myopts}
290 fi 292 fi
291} 293}
292 294
293# @FUNCTION: xorg-2_src_compile 295# @FUNCTION: xorg-2_src_compile
294# @USAGE:
295# @DESCRIPTION: 296# @DESCRIPTION:
296# Compile a package, performing all X-related tasks. 297# Compile a package, performing all X-related tasks.
297xorg-2_src_compile() { 298xorg-2_src_compile() {
298 base_src_compile 299 base_src_compile
299} 300}
300 301
301# @FUNCTION: xorg-2_src_install 302# @FUNCTION: xorg-2_src_install
302# @USAGE:
303# @DESCRIPTION: 303# @DESCRIPTION:
304# Install a built package to ${D}, performing any necessary steps. 304# Install a built package to ${D}, performing any necessary steps.
305# Creates a ChangeLog from git if using live ebuilds. 305# Creates a ChangeLog from git if using live ebuilds.
306xorg-2_src_install() { 306xorg-2_src_install() {
307 if [[ ${CATEGORY} == x11-proto ]]; then 307 if [[ ${CATEGORY} == x11-proto ]]; then
317 install || die "emake install failed" 317 install || die "emake install failed"
318 fi 318 fi
319 319
320 if [[ -n ${GIT_ECLASS} ]]; then 320 if [[ -n ${GIT_ECLASS} ]]; then
321 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null 321 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null
322 git log ${GIT_TREE} > "${S}"/ChangeLog 322 git log ${EGIT_COMMIT} > "${S}"/ChangeLog
323 popd > /dev/null 323 popd > /dev/null
324 fi 324 fi
325 325
326 if [[ -e "${S}"/ChangeLog ]]; then 326 if [[ -e "${S}"/ChangeLog ]]; then
327 dodoc "${S}"/ChangeLog 327 dodoc "${S}"/ChangeLog
328 fi 328 fi
329# @VARIABLE: DOCS 329 # @VARIABLE: DOCS
330# @DESCRIPTION: 330 # @DESCRIPTION:
331# Any documentation to install 331 # Any documentation to install
332 # @DEFAULT_UNSET
332 if [[ -n ${DOCS} ]]; then 333 if [[ -n ${DOCS} ]]; then
333 dodoc ${DOCS} || die "dodoc failed" 334 dodoc ${DOCS} || die "dodoc failed"
334 fi 335 fi
335 336
336 # Don't install libtool archives for server modules 337 # Don't install libtool archives for server modules
341 342
342 [[ -n ${FONT} ]] && remove_font_metadata 343 [[ -n ${FONT} ]] && remove_font_metadata
343} 344}
344 345
345# @FUNCTION: xorg-2_pkg_postinst 346# @FUNCTION: xorg-2_pkg_postinst
346# @USAGE:
347# @DESCRIPTION: 347# @DESCRIPTION:
348# Run X-specific post-installation tasks on the live filesystem. The 348# Run X-specific post-installation tasks on the live filesystem. The
349# only task right now is some setup for font packages. 349# only task right now is some setup for font packages.
350xorg-2_pkg_postinst() { 350xorg-2_pkg_postinst() {
351 [[ -n ${FONT} ]] && setup_fonts 351 [[ -n ${FONT} ]] && setup_fonts
352} 352}
353 353
354# @FUNCTION: xorg-2_pkg_postrm 354# @FUNCTION: xorg-2_pkg_postrm
355# @USAGE:
356# @DESCRIPTION: 355# @DESCRIPTION:
357# Run X-specific post-removal tasks on the live filesystem. The only 356# Run X-specific post-removal tasks on the live filesystem. The only
358# task right now is some cleanup for font packages. 357# task right now is some cleanup for font packages.
359xorg-2_pkg_postrm() { 358xorg-2_pkg_postrm() {
360 if [[ -n ${FONT} ]]; then 359 if [[ -n ${FONT} ]]; then
361 font_pkg_postrm 360 font_pkg_postrm
362 fi 361 fi
363} 362}
364 363
365# @FUNCTION: setup_fonts 364# @FUNCTION: setup_fonts
366# @USAGE:
367# @DESCRIPTION: 365# @DESCRIPTION:
368# Generates needed files for fonts and fixes font permissions 366# Generates needed files for fonts and fixes font permissions
369setup_fonts() { 367setup_fonts() {
370 create_fonts_scale 368 create_fonts_scale
371 create_fonts_dir 369 create_fonts_dir
372 font_pkg_postinst 370 font_pkg_postinst
373} 371}
374 372
375# @FUNCTION: remove_font_metadata 373# @FUNCTION: remove_font_metadata
376# @USAGE:
377# @DESCRIPTION: 374# @DESCRIPTION:
378# Don't let the package install generated font files that may overlap 375# Don't let the package install generated font files that may overlap
379# with other packages. Instead, they're generated in pkg_postinst(). 376# with other packages. Instead, they're generated in pkg_postinst().
380remove_font_metadata() { 377remove_font_metadata() {
381 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 378 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
383 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1} 380 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1}
384 fi 381 fi
385} 382}
386 383
387# @FUNCTION: create_fonts_scale 384# @FUNCTION: create_fonts_scale
388# @USAGE:
389# @DESCRIPTION: 385# @DESCRIPTION:
390# Create fonts.scale file, used by the old server-side fonts subsystem. 386# Create fonts.scale file, used by the old server-side fonts subsystem.
391create_fonts_scale() { 387create_fonts_scale() {
392 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 388 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
393 ebegin "Generating font.scale" 389 ebegin "Generating font.scale"
397 eend $? 393 eend $?
398 fi 394 fi
399} 395}
400 396
401# @FUNCTION: create_fonts_dir 397# @FUNCTION: create_fonts_dir
402# @USAGE:
403# @DESCRIPTION: 398# @DESCRIPTION:
404# Create fonts.dir file, used by the old server-side fonts subsystem. 399# Create fonts.dir file, used by the old server-side fonts subsystem.
405create_fonts_dir() { 400create_fonts_dir() {
406 ebegin "Generating fonts.dir" 401 ebegin "Generating fonts.dir"
407 mkfontdir \ 402 mkfontdir \

Legend:
Removed from v.1.9  
changed lines
  Added in v.1.18

  ViewVC Help
Powered by ViewVC 1.1.20