/[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.20
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.20 2010/11/09 18:25:00 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
78 x11-proto) MODULE="proto" ;; 78 x11-proto) MODULE="proto" ;;
79 x11-libs) MODULE="lib" ;; 79 x11-libs) MODULE="lib" ;;
80 esac 80 esac
81fi 81fi
82 82
83# @ECLASS-VARIABLE: PACKAGE_NAME
84# @DESCRIPTION:
85# For git checkout git repository migth differ from package name
86# so it can be overriden via this variable.
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}
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.8.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
146 159
147# Add static-libs useflag where usefull. 160# Add static-libs useflag where usefull.
148if [[ ${XORG_STATIC} == yes \ 161if [[ ${XORG_STATIC} == yes \
149 && ${FONT} != yes \ 162 && ${FONT} != yes \
150 && ${CATEGORY} != app-doc \ 163 && ${CATEGORY} != app-doc \
164 && ${CATEGORY} != x11-apps \
151 && ${CATEGORY} != x11-proto \ 165 && ${CATEGORY} != x11-proto \
152 && ${CATEGORY} != x11-drivers \ 166 && ${CATEGORY} != x11-drivers \
153 && ${CATEGORY} != media-fonts \ 167 && ${CATEGORY} != media-fonts \
154 && ${PN} != util-macros \ 168 && ${PN} != util-macros \
155 && ${PN} != xbitmaps \ 169 && ${PN} != xbitmaps \
163# Check deps on xorg-server 177# Check deps on xorg-server
164has dri ${IUSE//+} && DEPEND+=" dri? ( >=x11-base/xorg-server-1.6.3.901-r2[-minimal] )" 178has dri ${IUSE//+} && DEPEND+=" dri? ( >=x11-base/xorg-server-1.6.3.901-r2[-minimal] )"
165[[ -n "${DRIVER}" ]] && DEPEND+=" x11-base/xorg-server[xorg]" 179[[ -n "${DRIVER}" ]] && DEPEND+=" x11-base/xorg-server[xorg]"
166 180
167# @FUNCTION: xorg-2_pkg_setup 181# @FUNCTION: xorg-2_pkg_setup
168# @USAGE:
169# @DESCRIPTION: 182# @DESCRIPTION:
170# Setup prefix compat 183# Setup prefix compat
171xorg-2_pkg_setup() { 184xorg-2_pkg_setup() {
172 [[ ${FONT} == yes ]] && font_pkg_setup 185 [[ ${FONT} == yes ]] && font_pkg_setup
173} 186}
174 187
175# @FUNCTION: xorg-2_src_unpack 188# @FUNCTION: xorg-2_src_unpack
176# @USAGE:
177# @DESCRIPTION: 189# @DESCRIPTION:
178# Simply unpack source code. 190# Simply unpack source code.
179xorg-2_src_unpack() { 191xorg-2_src_unpack() {
180 if [[ -n ${GIT_ECLASS} ]]; then 192 if [[ -n ${GIT_ECLASS} ]]; then
181 git_src_unpack 193 git_src_unpack
185 197
186 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}" 198 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}"
187} 199}
188 200
189# @FUNCTION: xorg-2_patch_source 201# @FUNCTION: xorg-2_patch_source
190# @USAGE:
191# @DESCRIPTION: 202# @DESCRIPTION:
192# Apply all patches 203# Apply all patches
193xorg-2_patch_source() { 204xorg-2_patch_source() {
194 # Use standardized names and locations with bulk patching 205 # Use standardized names and locations with bulk patching
195 # Patch directory is ${WORKDIR}/patch 206 # Patch directory is ${WORKDIR}/patch
199 [[ -d "${EPATCH_SOURCE}" ]] && epatch 210 [[ -d "${EPATCH_SOURCE}" ]] && epatch
200 base_src_prepare 211 base_src_prepare
201} 212}
202 213
203# @FUNCTION: xorg-2_reconf_source 214# @FUNCTION: xorg-2_reconf_source
204# @USAGE:
205# @DESCRIPTION: 215# @DESCRIPTION:
206# Run eautoreconf if necessary, and run elibtoolize. 216# Run eautoreconf if necessary, and run elibtoolize.
207xorg-2_reconf_source() { 217xorg-2_reconf_source() {
208 case ${CHOST} in 218 case ${CHOST} in
209 *-interix* | *-aix* | *-winnt*) 219 *-interix* | *-aix* | *-winnt*)
210 # some hosts need full eautoreconf 220 # some hosts need full eautoreconf
211 [[ -e "./configure.ac" || -e "./configure.in" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail." 221 [[ -e "./configure.ac" || -e "./configure.in" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail."
212 ;; 222 ;;
213 *) 223 *)
214 # elibtoolize required for BSD 224 # elibtoolize required for BSD
215 [[ ${XORG_EAUTORECONF} != no && -e "./configure.ac" ]] && eautoreconf || elibtoolize 225 [[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" || -e "./configure.in" ) ]] && eautoreconf || elibtoolize
216 ;; 226 ;;
217 esac 227 esac
218} 228}
219 229
220# @FUNCTION: xorg-2_src_prepare 230# @FUNCTION: xorg-2_src_prepare
221# @USAGE:
222# @DESCRIPTION: 231# @DESCRIPTION:
223# Prepare a package after unpacking, performing all X-related tasks. 232# Prepare a package after unpacking, performing all X-related tasks.
224xorg-2_src_prepare() { 233xorg-2_src_prepare() {
225 [[ -n ${GIT_ECLASS} ]] && git_src_prepare 234 [[ -n ${GIT_ECLASS} ]] && git_src_prepare
226 xorg-2_patch_source 235 xorg-2_patch_source
227 xorg-2_reconf_source 236 xorg-2_reconf_source
228} 237}
229 238
230# @FUNCTION: xorg-2_font_configure 239# @FUNCTION: xorg-2_font_configure
231# @USAGE:
232# @DESCRIPTION: 240# @DESCRIPTION:
233# If a font package, perform any necessary configuration steps 241# If a font package, perform any necessary configuration steps
234xorg-2_font_configure() { 242xorg-2_font_configure() {
235 if has nls ${IUSE//+} && ! use nls; then 243 if has nls ${IUSE//+} && ! use nls; then
236 FONT_OPTIONS+=" 244 FONT_OPTIONS+="
252 --disable-jisx0201 260 --disable-jisx0201
253 --disable-koi8-r" 261 --disable-koi8-r"
254 fi 262 fi
255} 263}
256 264
257# @FUNCTION: x-modular_flags_setup 265# @FUNCTION: xorg-2_flags_setup
258# @USAGE:
259# @DESCRIPTION: 266# @DESCRIPTION:
260# Set up CFLAGS for a debug build 267# Set up CFLAGS for a debug build
261xorg-2_flags_setup() { 268xorg-2_flags_setup() {
262 # Win32 require special define 269 # Win32 require special define
263 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__ 270 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__
264 # hardened ldflags 271 # hardened ldflags
265 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy 272 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy
273
274 # Quite few libraries fail on runtime without these:
275 if has static-libs ${IUSE//+}; then
276 filter-flags -Wl,-Bdirect
277 filter-ldflags -Bdirect
278 filter-ldflags -Wl,-Bdirect
279 fi
266} 280}
267 281
268# @FUNCTION: xorg-2_src_configure 282# @FUNCTION: xorg-2_src_configure
269# @USAGE:
270# @DESCRIPTION: 283# @DESCRIPTION:
271# Perform any necessary pre-configuration steps, then run configure 284# Perform any necessary pre-configuration steps, then run configure
272xorg-2_src_configure() { 285xorg-2_src_configure() {
273 local myopts="" 286 local myopts=""
274 287
275 xorg-2_flags_setup 288 xorg-2_flags_setup
276 [[ -n "${FONT}" ]] && xorg-2_font_configure 289 [[ -n "${FONT}" ]] && xorg-2_font_configure
277 290
278# @VARIABLE: CONFIGURE_OPTIONS 291 # @VARIABLE: CONFIGURE_OPTIONS
279# @DESCRIPTION: 292 # @DESCRIPTION:
280# Any options to pass to configure 293 # Any options to pass to configure
294 # @DEFAULT_UNSET
281 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""} 295 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""}
282 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then 296 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
283 if has static-libs ${IUSE//+}; then 297 if has static-libs ${IUSE//+}; then
284 myopts+=" $(use_enable static-libs static)" 298 myopts+=" $(use_enable static-libs static)"
285 fi 299 fi
289 ${myopts} 303 ${myopts}
290 fi 304 fi
291} 305}
292 306
293# @FUNCTION: xorg-2_src_compile 307# @FUNCTION: xorg-2_src_compile
294# @USAGE:
295# @DESCRIPTION: 308# @DESCRIPTION:
296# Compile a package, performing all X-related tasks. 309# Compile a package, performing all X-related tasks.
297xorg-2_src_compile() { 310xorg-2_src_compile() {
298 base_src_compile 311 base_src_compile
299} 312}
300 313
301# @FUNCTION: xorg-2_src_install 314# @FUNCTION: xorg-2_src_install
302# @USAGE:
303# @DESCRIPTION: 315# @DESCRIPTION:
304# Install a built package to ${D}, performing any necessary steps. 316# Install a built package to ${D}, performing any necessary steps.
305# Creates a ChangeLog from git if using live ebuilds. 317# Creates a ChangeLog from git if using live ebuilds.
306xorg-2_src_install() { 318xorg-2_src_install() {
307 if [[ ${CATEGORY} == x11-proto ]]; then 319 if [[ ${CATEGORY} == x11-proto ]]; then
308 emake \ 320 emake \
309 ${PN/proto/}docdir=${EPREFIX}/usr/share/doc/${PF} \ 321 ${PN/proto/}docdir=${EPREFIX}/usr/share/doc/${PF} \
322 docdir=${EPREFIX}/usr/share/doc/${PF} \
310 DESTDIR="${D}" \ 323 DESTDIR="${D}" \
311 install || die "emake install failed" 324 install || die "emake install failed"
312 else 325 else
313 emake \ 326 emake \
314 docdir=${EPREFIX}/usr/share/doc/${PF} \ 327 docdir=${EPREFIX}/usr/share/doc/${PF} \
316 install || die "emake install failed" 329 install || die "emake install failed"
317 fi 330 fi
318 331
319 if [[ -n ${GIT_ECLASS} ]]; then 332 if [[ -n ${GIT_ECLASS} ]]; then
320 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null 333 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null
321 git log ${GIT_TREE} > "${S}"/ChangeLog 334 git log ${EGIT_COMMIT} > "${S}"/ChangeLog
322 popd > /dev/null 335 popd > /dev/null
323 fi 336 fi
324 337
325 if [[ -e "${S}"/ChangeLog ]]; then 338 if [[ -e "${S}"/ChangeLog ]]; then
326 dodoc "${S}"/ChangeLog 339 dodoc "${S}"/ChangeLog
327 fi 340 fi
328# @VARIABLE: DOCS 341 # @VARIABLE: DOCS
329# @DESCRIPTION: 342 # @DESCRIPTION:
330# Any documentation to install 343 # Any documentation to install
344 # @DEFAULT_UNSET
331 if [[ -n ${DOCS} ]]; then 345 if [[ -n ${DOCS} ]]; then
332 dodoc ${DOCS} || die "dodoc failed" 346 dodoc ${DOCS} || die "dodoc failed"
333 fi 347 fi
334 348
335 # Don't install libtool archives for server modules 349 # Don't install libtool archives for server modules
340 354
341 [[ -n ${FONT} ]] && remove_font_metadata 355 [[ -n ${FONT} ]] && remove_font_metadata
342} 356}
343 357
344# @FUNCTION: xorg-2_pkg_postinst 358# @FUNCTION: xorg-2_pkg_postinst
345# @USAGE:
346# @DESCRIPTION: 359# @DESCRIPTION:
347# Run X-specific post-installation tasks on the live filesystem. The 360# Run X-specific post-installation tasks on the live filesystem. The
348# only task right now is some setup for font packages. 361# only task right now is some setup for font packages.
349xorg-2_pkg_postinst() { 362xorg-2_pkg_postinst() {
350 [[ -n ${FONT} ]] && setup_fonts 363 [[ -n ${FONT} ]] && setup_fonts
351} 364}
352 365
353# @FUNCTION: xorg-2_pkg_postrm 366# @FUNCTION: xorg-2_pkg_postrm
354# @USAGE:
355# @DESCRIPTION: 367# @DESCRIPTION:
356# Run X-specific post-removal tasks on the live filesystem. The only 368# Run X-specific post-removal tasks on the live filesystem. The only
357# task right now is some cleanup for font packages. 369# task right now is some cleanup for font packages.
358xorg-2_pkg_postrm() { 370xorg-2_pkg_postrm() {
359 if [[ -n ${FONT} ]]; then 371 if [[ -n ${FONT} ]]; then
360 font_pkg_postrm 372 font_pkg_postrm
361 fi 373 fi
362} 374}
363 375
364# @FUNCTION: setup_fonts 376# @FUNCTION: setup_fonts
365# @USAGE:
366# @DESCRIPTION: 377# @DESCRIPTION:
367# Generates needed files for fonts and fixes font permissions 378# Generates needed files for fonts and fixes font permissions
368setup_fonts() { 379setup_fonts() {
369 create_fonts_scale 380 create_fonts_scale
370 create_fonts_dir 381 create_fonts_dir
371 font_pkg_postinst 382 font_pkg_postinst
372} 383}
373 384
374# @FUNCTION: remove_font_metadata 385# @FUNCTION: remove_font_metadata
375# @USAGE:
376# @DESCRIPTION: 386# @DESCRIPTION:
377# Don't let the package install generated font files that may overlap 387# Don't let the package install generated font files that may overlap
378# with other packages. Instead, they're generated in pkg_postinst(). 388# with other packages. Instead, they're generated in pkg_postinst().
379remove_font_metadata() { 389remove_font_metadata() {
380 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 390 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
382 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1} 392 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1}
383 fi 393 fi
384} 394}
385 395
386# @FUNCTION: create_fonts_scale 396# @FUNCTION: create_fonts_scale
387# @USAGE:
388# @DESCRIPTION: 397# @DESCRIPTION:
389# Create fonts.scale file, used by the old server-side fonts subsystem. 398# Create fonts.scale file, used by the old server-side fonts subsystem.
390create_fonts_scale() { 399create_fonts_scale() {
391 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 400 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
392 ebegin "Generating font.scale" 401 ebegin "Generating font.scale"
396 eend $? 405 eend $?
397 fi 406 fi
398} 407}
399 408
400# @FUNCTION: create_fonts_dir 409# @FUNCTION: create_fonts_dir
401# @USAGE:
402# @DESCRIPTION: 410# @DESCRIPTION:
403# Create fonts.dir file, used by the old server-side fonts subsystem. 411# Create fonts.dir file, used by the old server-side fonts subsystem.
404create_fonts_dir() { 412create_fonts_dir() {
405 ebegin "Generating fonts.dir" 413 ebegin "Generating fonts.dir"
406 mkfontdir \ 414 mkfontdir \

Legend:
Removed from v.1.6  
changed lines
  Added in v.1.20

  ViewVC Help
Powered by ViewVC 1.1.20