/[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.8 Revision 1.15
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.8 2010/08/06 20:46:08 scarabeus Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.15 2010/10/28 11:43:33 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 packages fail on runtime without these:
262 filter-flags -Wl,-Bdirect
263 filter-ldflags -Bdirect
264 filter-ldflags -Wl,-Bdirect
266} 265}
267 266
268# @FUNCTION: xorg-2_src_configure 267# @FUNCTION: xorg-2_src_configure
269# @USAGE:
270# @DESCRIPTION: 268# @DESCRIPTION:
271# Perform any necessary pre-configuration steps, then run configure 269# Perform any necessary pre-configuration steps, then run configure
272xorg-2_src_configure() { 270xorg-2_src_configure() {
273 local myopts="" 271 local myopts=""
274 272
275 xorg-2_flags_setup 273 xorg-2_flags_setup
276 [[ -n "${FONT}" ]] && xorg-2_font_configure 274 [[ -n "${FONT}" ]] && xorg-2_font_configure
277 275
278# @VARIABLE: CONFIGURE_OPTIONS 276 # @VARIABLE: CONFIGURE_OPTIONS
279# @DESCRIPTION: 277 # @DESCRIPTION:
280# Any options to pass to configure 278 # Any options to pass to configure
279 # @DEFAULT_UNSET
281 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""} 280 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""}
282 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then 281 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
283 if has static-libs ${IUSE//+}; then 282 if has static-libs ${IUSE//+}; then
284 myopts+=" $(use_enable static-libs static)" 283 myopts+=" $(use_enable static-libs static)"
285 fi 284 fi
289 ${myopts} 288 ${myopts}
290 fi 289 fi
291} 290}
292 291
293# @FUNCTION: xorg-2_src_compile 292# @FUNCTION: xorg-2_src_compile
294# @USAGE:
295# @DESCRIPTION: 293# @DESCRIPTION:
296# Compile a package, performing all X-related tasks. 294# Compile a package, performing all X-related tasks.
297xorg-2_src_compile() { 295xorg-2_src_compile() {
298 base_src_compile 296 base_src_compile
299} 297}
300 298
301# @FUNCTION: xorg-2_src_install 299# @FUNCTION: xorg-2_src_install
302# @USAGE:
303# @DESCRIPTION: 300# @DESCRIPTION:
304# Install a built package to ${D}, performing any necessary steps. 301# Install a built package to ${D}, performing any necessary steps.
305# Creates a ChangeLog from git if using live ebuilds. 302# Creates a ChangeLog from git if using live ebuilds.
306xorg-2_src_install() { 303xorg-2_src_install() {
307 if [[ ${CATEGORY} == x11-proto ]]; then 304 if [[ ${CATEGORY} == x11-proto ]]; then
308 emake \ 305 emake \
309 ${PN/proto/}docdir=${EPREFIX}/usr/share/doc/${PF} \ 306 ${PN/proto/}docdir=${EPREFIX}/usr/share/doc/${PF} \
307 docdir=${EPREFIX}/usr/share/doc/${PF} \
310 DESTDIR="${D}" \ 308 DESTDIR="${D}" \
311 install || die "emake install failed" 309 install || die "emake install failed"
312 else 310 else
313 emake \ 311 emake \
314 docdir=${EPREFIX}/usr/share/doc/${PF} \ 312 docdir=${EPREFIX}/usr/share/doc/${PF} \
316 install || die "emake install failed" 314 install || die "emake install failed"
317 fi 315 fi
318 316
319 if [[ -n ${GIT_ECLASS} ]]; then 317 if [[ -n ${GIT_ECLASS} ]]; then
320 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null 318 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null
321 git log ${GIT_TREE} > "${S}"/ChangeLog 319 git log ${EGIT_COMMIT} > "${S}"/ChangeLog
322 popd > /dev/null 320 popd > /dev/null
323 fi 321 fi
324 322
325 if [[ -e "${S}"/ChangeLog ]]; then 323 if [[ -e "${S}"/ChangeLog ]]; then
326 dodoc "${S}"/ChangeLog 324 dodoc "${S}"/ChangeLog
327 fi 325 fi
328# @VARIABLE: DOCS 326 # @VARIABLE: DOCS
329# @DESCRIPTION: 327 # @DESCRIPTION:
330# Any documentation to install 328 # Any documentation to install
329 # @DEFAULT_UNSET
331 if [[ -n ${DOCS} ]]; then 330 if [[ -n ${DOCS} ]]; then
332 dodoc ${DOCS} || die "dodoc failed" 331 dodoc ${DOCS} || die "dodoc failed"
333 fi 332 fi
334 333
335 # Don't install libtool archives for server modules 334 # Don't install libtool archives for server modules
340 339
341 [[ -n ${FONT} ]] && remove_font_metadata 340 [[ -n ${FONT} ]] && remove_font_metadata
342} 341}
343 342
344# @FUNCTION: xorg-2_pkg_postinst 343# @FUNCTION: xorg-2_pkg_postinst
345# @USAGE:
346# @DESCRIPTION: 344# @DESCRIPTION:
347# Run X-specific post-installation tasks on the live filesystem. The 345# Run X-specific post-installation tasks on the live filesystem. The
348# only task right now is some setup for font packages. 346# only task right now is some setup for font packages.
349xorg-2_pkg_postinst() { 347xorg-2_pkg_postinst() {
350 [[ -n ${FONT} ]] && setup_fonts 348 [[ -n ${FONT} ]] && setup_fonts
351} 349}
352 350
353# @FUNCTION: xorg-2_pkg_postrm 351# @FUNCTION: xorg-2_pkg_postrm
354# @USAGE:
355# @DESCRIPTION: 352# @DESCRIPTION:
356# Run X-specific post-removal tasks on the live filesystem. The only 353# Run X-specific post-removal tasks on the live filesystem. The only
357# task right now is some cleanup for font packages. 354# task right now is some cleanup for font packages.
358xorg-2_pkg_postrm() { 355xorg-2_pkg_postrm() {
359 if [[ -n ${FONT} ]]; then 356 if [[ -n ${FONT} ]]; then
360 font_pkg_postrm 357 font_pkg_postrm
361 fi 358 fi
362} 359}
363 360
364# @FUNCTION: setup_fonts 361# @FUNCTION: setup_fonts
365# @USAGE:
366# @DESCRIPTION: 362# @DESCRIPTION:
367# Generates needed files for fonts and fixes font permissions 363# Generates needed files for fonts and fixes font permissions
368setup_fonts() { 364setup_fonts() {
369 create_fonts_scale 365 create_fonts_scale
370 create_fonts_dir 366 create_fonts_dir
371 font_pkg_postinst 367 font_pkg_postinst
372} 368}
373 369
374# @FUNCTION: remove_font_metadata 370# @FUNCTION: remove_font_metadata
375# @USAGE:
376# @DESCRIPTION: 371# @DESCRIPTION:
377# Don't let the package install generated font files that may overlap 372# Don't let the package install generated font files that may overlap
378# with other packages. Instead, they're generated in pkg_postinst(). 373# with other packages. Instead, they're generated in pkg_postinst().
379remove_font_metadata() { 374remove_font_metadata() {
380 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 375 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
382 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1} 377 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1}
383 fi 378 fi
384} 379}
385 380
386# @FUNCTION: create_fonts_scale 381# @FUNCTION: create_fonts_scale
387# @USAGE:
388# @DESCRIPTION: 382# @DESCRIPTION:
389# Create fonts.scale file, used by the old server-side fonts subsystem. 383# Create fonts.scale file, used by the old server-side fonts subsystem.
390create_fonts_scale() { 384create_fonts_scale() {
391 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 385 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
392 ebegin "Generating font.scale" 386 ebegin "Generating font.scale"
396 eend $? 390 eend $?
397 fi 391 fi
398} 392}
399 393
400# @FUNCTION: create_fonts_dir 394# @FUNCTION: create_fonts_dir
401# @USAGE:
402# @DESCRIPTION: 395# @DESCRIPTION:
403# Create fonts.dir file, used by the old server-side fonts subsystem. 396# Create fonts.dir file, used by the old server-side fonts subsystem.
404create_fonts_dir() { 397create_fonts_dir() {
405 ebegin "Generating fonts.dir" 398 ebegin "Generating fonts.dir"
406 mkfontdir \ 399 mkfontdir \

Legend:
Removed from v.1.8  
changed lines
  Added in v.1.15

  ViewVC Help
Powered by ViewVC 1.1.20