/[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.16
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.16 2010/10/28 11:46:32 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
… …
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
… …
163# Check deps on xorg-server 164# Check deps on xorg-server
164has dri ${IUSE//+} && DEPEND+=" dri? ( >=x11-base/xorg-server-1.6.3.901-r2[-minimal] )" 165has dri ${IUSE//+} && DEPEND+=" dri? ( >=x11-base/xorg-server-1.6.3.901-r2[-minimal] )"
165[[ -n "${DRIVER}" ]] && DEPEND+=" x11-base/xorg-server[xorg]" 166[[ -n "${DRIVER}" ]] && DEPEND+=" x11-base/xorg-server[xorg]"
166 167
167# @FUNCTION: xorg-2_pkg_setup 168# @FUNCTION: xorg-2_pkg_setup
168# @USAGE:
169# @DESCRIPTION: 169# @DESCRIPTION:
170# Setup prefix compat 170# Setup prefix compat
171xorg-2_pkg_setup() { 171xorg-2_pkg_setup() {
172 [[ ${FONT} == yes ]] && font_pkg_setup 172 [[ ${FONT} == yes ]] && font_pkg_setup
173} 173}
174 174
175# @FUNCTION: xorg-2_src_unpack 175# @FUNCTION: xorg-2_src_unpack
176# @USAGE:
177# @DESCRIPTION: 176# @DESCRIPTION:
178# Simply unpack source code. 177# Simply unpack source code.
179xorg-2_src_unpack() { 178xorg-2_src_unpack() {
180 if [[ -n ${GIT_ECLASS} ]]; then 179 if [[ -n ${GIT_ECLASS} ]]; then
181 git_src_unpack 180 git_src_unpack
… …
185 184
186 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}" 185 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}"
187} 186}
188 187
189# @FUNCTION: xorg-2_patch_source 188# @FUNCTION: xorg-2_patch_source
190# @USAGE:
191# @DESCRIPTION: 189# @DESCRIPTION:
192# Apply all patches 190# Apply all patches
193xorg-2_patch_source() { 191xorg-2_patch_source() {
194 # Use standardized names and locations with bulk patching 192 # Use standardized names and locations with bulk patching
195 # Patch directory is ${WORKDIR}/patch 193 # Patch directory is ${WORKDIR}/patch
… …
199 [[ -d "${EPATCH_SOURCE}" ]] && epatch 197 [[ -d "${EPATCH_SOURCE}" ]] && epatch
200 base_src_prepare 198 base_src_prepare
201} 199}
202 200
203# @FUNCTION: xorg-2_reconf_source 201# @FUNCTION: xorg-2_reconf_source
204# @USAGE:
205# @DESCRIPTION: 202# @DESCRIPTION:
206# Run eautoreconf if necessary, and run elibtoolize. 203# Run eautoreconf if necessary, and run elibtoolize.
207xorg-2_reconf_source() { 204xorg-2_reconf_source() {
208 case ${CHOST} in 205 case ${CHOST} in
209 *-interix* | *-aix* | *-winnt*) 206 *-interix* | *-aix* | *-winnt*)
… …
216 ;; 213 ;;
217 esac 214 esac
218} 215}
219 216
220# @FUNCTION: xorg-2_src_prepare 217# @FUNCTION: xorg-2_src_prepare
221# @USAGE:
222# @DESCRIPTION: 218# @DESCRIPTION:
223# Prepare a package after unpacking, performing all X-related tasks. 219# Prepare a package after unpacking, performing all X-related tasks.
224xorg-2_src_prepare() { 220xorg-2_src_prepare() {
225 [[ -n ${GIT_ECLASS} ]] && git_src_prepare 221 [[ -n ${GIT_ECLASS} ]] && git_src_prepare
226 xorg-2_patch_source 222 xorg-2_patch_source
227 xorg-2_reconf_source 223 xorg-2_reconf_source
228} 224}
229 225
230# @FUNCTION: xorg-2_font_configure 226# @FUNCTION: xorg-2_font_configure
231# @USAGE:
232# @DESCRIPTION: 227# @DESCRIPTION:
233# If a font package, perform any necessary configuration steps 228# If a font package, perform any necessary configuration steps
234xorg-2_font_configure() { 229xorg-2_font_configure() {
235 if has nls ${IUSE//+} && ! use nls; then 230 if has nls ${IUSE//+} && ! use nls; then
236 FONT_OPTIONS+=" 231 FONT_OPTIONS+="
… …
252 --disable-jisx0201 247 --disable-jisx0201
253 --disable-koi8-r" 248 --disable-koi8-r"
254 fi 249 fi
255} 250}
256 251
257# @FUNCTION: x-modular_flags_setup 252# @FUNCTION: xorg-2_flags_setup
258# @USAGE:
259# @DESCRIPTION: 253# @DESCRIPTION:
260# Set up CFLAGS for a debug build 254# Set up CFLAGS for a debug build
261xorg-2_flags_setup() { 255xorg-2_flags_setup() {
262 # Win32 require special define 256 # Win32 require special define
263 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__ 257 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__
264 # hardened ldflags 258 # hardened ldflags
265 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy 259 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy
260
261 # Quite few libraries fail on runtime without these:
262 if has static-libs ${IUSE//+}; then
263 filter-flags -Wl,-Bdirect
264 filter-ldflags -Bdirect
265 filter-ldflags -Wl,-Bdirect
266 fi
266} 267}
267 268
268# @FUNCTION: xorg-2_src_configure 269# @FUNCTION: xorg-2_src_configure
269# @USAGE:
270# @DESCRIPTION: 270# @DESCRIPTION:
271# Perform any necessary pre-configuration steps, then run configure 271# Perform any necessary pre-configuration steps, then run configure
272xorg-2_src_configure() { 272xorg-2_src_configure() {
273 local myopts="" 273 local myopts=""
274 274
275 xorg-2_flags_setup 275 xorg-2_flags_setup
276 [[ -n "${FONT}" ]] && xorg-2_font_configure 276 [[ -n "${FONT}" ]] && xorg-2_font_configure
277 277
278# @VARIABLE: CONFIGURE_OPTIONS 278 # @VARIABLE: CONFIGURE_OPTIONS
279# @DESCRIPTION: 279 # @DESCRIPTION:
280# Any options to pass to configure 280 # Any options to pass to configure
281 # @DEFAULT_UNSET
281 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""} 282 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""}
282 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then 283 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
283 if has static-libs ${IUSE//+}; then 284 if has static-libs ${IUSE//+}; then
284 myopts+=" $(use_enable static-libs static)" 285 myopts+=" $(use_enable static-libs static)"
285 fi 286 fi
… …
289 ${myopts} 290 ${myopts}
290 fi 291 fi
291} 292}
292 293
293# @FUNCTION: xorg-2_src_compile 294# @FUNCTION: xorg-2_src_compile
294# @USAGE:
295# @DESCRIPTION: 295# @DESCRIPTION:
296# Compile a package, performing all X-related tasks. 296# Compile a package, performing all X-related tasks.
297xorg-2_src_compile() { 297xorg-2_src_compile() {
298 base_src_compile 298 base_src_compile
299} 299}
300 300
301# @FUNCTION: xorg-2_src_install 301# @FUNCTION: xorg-2_src_install
302# @USAGE:
303# @DESCRIPTION: 302# @DESCRIPTION:
304# Install a built package to ${D}, performing any necessary steps. 303# Install a built package to ${D}, performing any necessary steps.
305# Creates a ChangeLog from git if using live ebuilds. 304# Creates a ChangeLog from git if using live ebuilds.
306xorg-2_src_install() { 305xorg-2_src_install() {
307 if [[ ${CATEGORY} == x11-proto ]]; then 306 if [[ ${CATEGORY} == x11-proto ]]; then
… …
317 install || die "emake install failed" 316 install || die "emake install failed"
318 fi 317 fi
319 318
320 if [[ -n ${GIT_ECLASS} ]]; then 319 if [[ -n ${GIT_ECLASS} ]]; then
321 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null 320 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null
322 git log ${GIT_TREE} > "${S}"/ChangeLog 321 git log ${EGIT_COMMIT} > "${S}"/ChangeLog
323 popd > /dev/null 322 popd > /dev/null
324 fi 323 fi
325 324
326 if [[ -e "${S}"/ChangeLog ]]; then 325 if [[ -e "${S}"/ChangeLog ]]; then
327 dodoc "${S}"/ChangeLog 326 dodoc "${S}"/ChangeLog
328 fi 327 fi
329# @VARIABLE: DOCS 328 # @VARIABLE: DOCS
330# @DESCRIPTION: 329 # @DESCRIPTION:
331# Any documentation to install 330 # Any documentation to install
331 # @DEFAULT_UNSET
332 if [[ -n ${DOCS} ]]; then 332 if [[ -n ${DOCS} ]]; then
333 dodoc ${DOCS} || die "dodoc failed" 333 dodoc ${DOCS} || die "dodoc failed"
334 fi 334 fi
335 335
336 # Don't install libtool archives for server modules 336 # Don't install libtool archives for server modules
… …
341 341
342 [[ -n ${FONT} ]] && remove_font_metadata 342 [[ -n ${FONT} ]] && remove_font_metadata
343} 343}
344 344
345# @FUNCTION: xorg-2_pkg_postinst 345# @FUNCTION: xorg-2_pkg_postinst
346# @USAGE:
347# @DESCRIPTION: 346# @DESCRIPTION:
348# Run X-specific post-installation tasks on the live filesystem. The 347# Run X-specific post-installation tasks on the live filesystem. The
349# only task right now is some setup for font packages. 348# only task right now is some setup for font packages.
350xorg-2_pkg_postinst() { 349xorg-2_pkg_postinst() {
351 [[ -n ${FONT} ]] && setup_fonts 350 [[ -n ${FONT} ]] && setup_fonts
352} 351}
353 352
354# @FUNCTION: xorg-2_pkg_postrm 353# @FUNCTION: xorg-2_pkg_postrm
355# @USAGE:
356# @DESCRIPTION: 354# @DESCRIPTION:
357# Run X-specific post-removal tasks on the live filesystem. The only 355# Run X-specific post-removal tasks on the live filesystem. The only
358# task right now is some cleanup for font packages. 356# task right now is some cleanup for font packages.
359xorg-2_pkg_postrm() { 357xorg-2_pkg_postrm() {
360 if [[ -n ${FONT} ]]; then 358 if [[ -n ${FONT} ]]; then
361 font_pkg_postrm 359 font_pkg_postrm
362 fi 360 fi
363} 361}
364 362
365# @FUNCTION: setup_fonts 363# @FUNCTION: setup_fonts
366# @USAGE:
367# @DESCRIPTION: 364# @DESCRIPTION:
368# Generates needed files for fonts and fixes font permissions 365# Generates needed files for fonts and fixes font permissions
369setup_fonts() { 366setup_fonts() {
370 create_fonts_scale 367 create_fonts_scale
371 create_fonts_dir 368 create_fonts_dir
372 font_pkg_postinst 369 font_pkg_postinst
373} 370}
374 371
375# @FUNCTION: remove_font_metadata 372# @FUNCTION: remove_font_metadata
376# @USAGE:
377# @DESCRIPTION: 373# @DESCRIPTION:
378# Don't let the package install generated font files that may overlap 374# Don't let the package install generated font files that may overlap
379# with other packages. Instead, they're generated in pkg_postinst(). 375# with other packages. Instead, they're generated in pkg_postinst().
380remove_font_metadata() { 376remove_font_metadata() {
381 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 377 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
… …
383 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1} 379 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1}
384 fi 380 fi
385} 381}
386 382
387# @FUNCTION: create_fonts_scale 383# @FUNCTION: create_fonts_scale
388# @USAGE:
389# @DESCRIPTION: 384# @DESCRIPTION:
390# Create fonts.scale file, used by the old server-side fonts subsystem. 385# Create fonts.scale file, used by the old server-side fonts subsystem.
391create_fonts_scale() { 386create_fonts_scale() {
392 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 387 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
393 ebegin "Generating font.scale" 388 ebegin "Generating font.scale"
… …
397 eend $? 392 eend $?
398 fi 393 fi
399} 394}
400 395
401# @FUNCTION: create_fonts_dir 396# @FUNCTION: create_fonts_dir
402# @USAGE:
403# @DESCRIPTION: 397# @DESCRIPTION:
404# Create fonts.dir file, used by the old server-side fonts subsystem. 398# Create fonts.dir file, used by the old server-side fonts subsystem.
405create_fonts_dir() { 399create_fonts_dir() {
406 ebegin "Generating fonts.dir" 400 ebegin "Generating fonts.dir"
407 mkfontdir \ 401 mkfontdir \
Legend:
Removed from v.1.9  
changed lines
  Added in v.1.16
  ViewVC Help
Powered by ViewVC 1.1.13