/[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.2 Revision 1.12
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.2 2010/03/17 14:29:20 scarabeus Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.12 2010/08/24 08:59:56 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.
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.5.0" 103 DEPEND+=" >=x11-misc/util-macros-1.8.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"
163# Check deps on xorg-server 163# Check deps on xorg-server
164has dri ${IUSE//+} && DEPEND+=" dri? ( >=x11-base/xorg-server-1.6.3.901-r2[-minimal] )" 164has dri ${IUSE//+} && DEPEND+=" dri? ( >=x11-base/xorg-server-1.6.3.901-r2[-minimal] )"
165[[ -n "${DRIVER}" ]] && DEPEND+=" x11-base/xorg-server[xorg]" 165[[ -n "${DRIVER}" ]] && DEPEND+=" x11-base/xorg-server[xorg]"
166 166
167# @FUNCTION: xorg-2_pkg_setup 167# @FUNCTION: xorg-2_pkg_setup
168# @USAGE:
169# @DESCRIPTION: 168# @DESCRIPTION:
170# Setup prefix compat 169# Setup prefix compat
171xorg-2_pkg_setup() { 170xorg-2_pkg_setup() {
172 [[ ${FONT} == yes ]] && font_pkg_setup 171 [[ ${FONT} == yes ]] && font_pkg_setup
173} 172}
174 173
175# @FUNCTION: xorg-2_src_unpack 174# @FUNCTION: xorg-2_src_unpack
176# @USAGE:
177# @DESCRIPTION: 175# @DESCRIPTION:
178# Simply unpack source code. 176# Simply unpack source code.
179xorg-2_src_unpack() { 177xorg-2_src_unpack() {
180 if [[ -n ${GIT_ECLASS} ]]; then 178 if [[ -n ${GIT_ECLASS} ]]; then
181 git_src_unpack 179 git_src_unpack
185 183
186 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}" 184 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}"
187} 185}
188 186
189# @FUNCTION: xorg-2_patch_source 187# @FUNCTION: xorg-2_patch_source
190# @USAGE:
191# @DESCRIPTION: 188# @DESCRIPTION:
192# Apply all patches 189# Apply all patches
193xorg-2_patch_source() { 190xorg-2_patch_source() {
194 # Use standardized names and locations with bulk patching 191 # Use standardized names and locations with bulk patching
195 # Patch directory is ${WORKDIR}/patch 192 # Patch directory is ${WORKDIR}/patch
196 # See epatch() in eutils.eclass for more documentation 193 # See epatch() in eutils.eclass for more documentation
197 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch} 194 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch}
198 195
199 [[ -d "${EPATCH_SOURCE}" ]] && epatch 196 [[ -d "${EPATCH_SOURCE}" ]] && epatch
200 base_src_prepare 197 base_src_prepare
201 epatch_user
202} 198}
203 199
204# @FUNCTION: xorg-2_reconf_source 200# @FUNCTION: xorg-2_reconf_source
205# @USAGE:
206# @DESCRIPTION: 201# @DESCRIPTION:
207# Run eautoreconf if necessary, and run elibtoolize. 202# Run eautoreconf if necessary, and run elibtoolize.
208xorg-2_reconf_source() { 203xorg-2_reconf_source() {
209 case ${CHOST} in 204 case ${CHOST} in
210 *-interix* | *-aix* | *-winnt*) 205 *-interix* | *-aix* | *-winnt*)
211 # some hosts need full eautoreconf 206 # some hosts need full eautoreconf
212 [[ -e "./configure.ac" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail." 207 [[ -e "./configure.ac" || -e "./configure.in" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail."
213 ;; 208 ;;
214 *) 209 *)
215 # elibtoolize required for BSD 210 # elibtoolize required for BSD
216 [[ ${XORG_EAUTORECONF} != no && -e "./configure.ac" ]] && eautoreconf || elibtoolize 211 [[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" || -e "./configure.in" ) ]] && eautoreconf || elibtoolize
217 ;; 212 ;;
218 esac 213 esac
219} 214}
220 215
221# @FUNCTION: xorg-2_src_prepare 216# @FUNCTION: xorg-2_src_prepare
222# @USAGE:
223# @DESCRIPTION: 217# @DESCRIPTION:
224# Prepare a package after unpacking, performing all X-related tasks. 218# Prepare a package after unpacking, performing all X-related tasks.
225xorg-2_src_prepare() { 219xorg-2_src_prepare() {
226 [[ -n ${GIT_ECLASS} ]] && git_src_prepare 220 [[ -n ${GIT_ECLASS} ]] && git_src_prepare
227 xorg-2_patch_source 221 xorg-2_patch_source
228 xorg-2_reconf_source 222 xorg-2_reconf_source
229} 223}
230 224
231# @FUNCTION: xorg-2_font_configure 225# @FUNCTION: xorg-2_font_configure
232# @USAGE:
233# @DESCRIPTION: 226# @DESCRIPTION:
234# If a font package, perform any necessary configuration steps 227# If a font package, perform any necessary configuration steps
235xorg-2_font_configure() { 228xorg-2_font_configure() {
236 if has nls ${IUSE//+} && ! use nls; then 229 if has nls ${IUSE//+} && ! use nls; then
237 FONT_OPTIONS+=" 230 FONT_OPTIONS+="
253 --disable-jisx0201 246 --disable-jisx0201
254 --disable-koi8-r" 247 --disable-koi8-r"
255 fi 248 fi
256} 249}
257 250
258# @FUNCTION: x-modular_flags_setup 251# @FUNCTION: xorg-2_flags_setup
259# @USAGE:
260# @DESCRIPTION: 252# @DESCRIPTION:
261# Set up CFLAGS for a debug build 253# Set up CFLAGS for a debug build
262xorg-2_flags_setup() { 254xorg-2_flags_setup() {
263 # Win32 require special define 255 # Win32 require special define
264 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__ 256 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__
265 # hardened ldflags 257 # hardened ldflags
266 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy 258 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy
267} 259}
268 260
269# @FUNCTION: xorg-2_src_configure 261# @FUNCTION: xorg-2_src_configure
270# @USAGE:
271# @DESCRIPTION: 262# @DESCRIPTION:
272# Perform any necessary pre-configuration steps, then run configure 263# Perform any necessary pre-configuration steps, then run configure
273xorg-2_src_configure() { 264xorg-2_src_configure() {
274 local myopts="" 265 local myopts=""
275 266
276 xorg-2_flags_setup 267 xorg-2_flags_setup
277 [[ -n "${FONT}" ]] && xorg-2_font_configure 268 [[ -n "${FONT}" ]] && xorg-2_font_configure
278 269
279# @VARIABLE: CONFIGURE_OPTIONS 270 # @VARIABLE: CONFIGURE_OPTIONS
280# @DESCRIPTION: 271 # @DESCRIPTION:
281# Any options to pass to configure 272 # Any options to pass to configure
273 # @DEFAULT_UNSET
282 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""} 274 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""}
283 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then 275 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
284 if has static-libs ${IUSE//+}; then 276 if has static-libs ${IUSE//+}; then
285 myopts+=" $(use_enable static-libs static)" 277 myopts+=" $(use_enable static-libs static)"
286 fi 278 fi
290 ${myopts} 282 ${myopts}
291 fi 283 fi
292} 284}
293 285
294# @FUNCTION: xorg-2_src_compile 286# @FUNCTION: xorg-2_src_compile
295# @USAGE:
296# @DESCRIPTION: 287# @DESCRIPTION:
297# Compile a package, performing all X-related tasks. 288# Compile a package, performing all X-related tasks.
298xorg-2_src_compile() { 289xorg-2_src_compile() {
299 base_src_compile 290 base_src_compile
300} 291}
301 292
302# @FUNCTION: xorg-2_src_install 293# @FUNCTION: xorg-2_src_install
303# @USAGE:
304# @DESCRIPTION: 294# @DESCRIPTION:
305# Install a built package to ${D}, performing any necessary steps. 295# Install a built package to ${D}, performing any necessary steps.
306# Creates a ChangeLog from git if using live ebuilds. 296# Creates a ChangeLog from git if using live ebuilds.
307xorg-2_src_install() { 297xorg-2_src_install() {
308 if [[ ${CATEGORY} == x11-proto ]]; then 298 if [[ ${CATEGORY} == x11-proto ]]; then
309 emake \ 299 emake \
310 ${PN/proto/}docdir=${EPREFIX}/usr/share/doc/${PF} \ 300 ${PN/proto/}docdir=${EPREFIX}/usr/share/doc/${PF} \
301 docdir=${EPREFIX}/usr/share/doc/${PF} \
311 DESTDIR="${D}" \ 302 DESTDIR="${D}" \
312 install || die "emake install failed" 303 install || die "emake install failed"
313 else 304 else
314 emake \ 305 emake \
315 docdir=${EPREFIX}/usr/share/doc/${PF} \ 306 docdir=${EPREFIX}/usr/share/doc/${PF} \
317 install || die "emake install failed" 308 install || die "emake install failed"
318 fi 309 fi
319 310
320 if [[ -n ${GIT_ECLASS} ]]; then 311 if [[ -n ${GIT_ECLASS} ]]; then
321 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null 312 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null
322 git log ${GIT_TREE} > "${S}"/ChangeLog 313 git log ${EGIT_COMMIT} > "${S}"/ChangeLog
323 popd > /dev/null 314 popd > /dev/null
324 fi 315 fi
325 316
326 if [[ -e "${S}"/ChangeLog ]]; then 317 if [[ -e "${S}"/ChangeLog ]]; then
327 dodoc "${S}"/ChangeLog 318 dodoc "${S}"/ChangeLog
328 fi 319 fi
329# @VARIABLE: DOCS 320 # @VARIABLE: DOCS
330# @DESCRIPTION: 321 # @DESCRIPTION:
331# Any documentation to install 322 # Any documentation to install
323 # @DEFAULT_UNSET
332 if [[ -n ${DOCS} ]]; then 324 if [[ -n ${DOCS} ]]; then
333 dodoc ${DOCS} || die "dodoc failed" 325 dodoc ${DOCS} || die "dodoc failed"
334 fi 326 fi
335 327
336 # Don't install libtool archives for server modules 328 # Don't install libtool archives for server modules
341 333
342 [[ -n ${FONT} ]] && remove_font_metadata 334 [[ -n ${FONT} ]] && remove_font_metadata
343} 335}
344 336
345# @FUNCTION: xorg-2_pkg_postinst 337# @FUNCTION: xorg-2_pkg_postinst
346# @USAGE:
347# @DESCRIPTION: 338# @DESCRIPTION:
348# Run X-specific post-installation tasks on the live filesystem. The 339# Run X-specific post-installation tasks on the live filesystem. The
349# only task right now is some setup for font packages. 340# only task right now is some setup for font packages.
350xorg-2_pkg_postinst() { 341xorg-2_pkg_postinst() {
351 [[ -n ${FONT} ]] && setup_fonts 342 [[ -n ${FONT} ]] && setup_fonts
352} 343}
353 344
354# @FUNCTION: xorg-2_pkg_postrm 345# @FUNCTION: xorg-2_pkg_postrm
355# @USAGE:
356# @DESCRIPTION: 346# @DESCRIPTION:
357# Run X-specific post-removal tasks on the live filesystem. The only 347# Run X-specific post-removal tasks on the live filesystem. The only
358# task right now is some cleanup for font packages. 348# task right now is some cleanup for font packages.
359xorg-2_pkg_postrm() { 349xorg-2_pkg_postrm() {
360 if [[ -n ${FONT} ]]; then 350 if [[ -n ${FONT} ]]; then
361 cleanup_fonts
362 font_pkg_postrm 351 font_pkg_postrm
363 fi 352 fi
364} 353}
365 354
366# @FUNCTION: cleanup_fonts
367# @USAGE:
368# @DESCRIPTION:
369# Get rid of font directories that only contain generated files
370cleanup_fonts() {
371 local allowed_files="encodings.dir fonts.alias fonts.cache-1 fonts.dir fonts.scale"
372 local real_dir=${EROOT}usr/share/fonts/${FONT_DIR}
373 local fle allowed_file
374
375 unset KEEP_FONTDIR
376
377 einfo "Checking ${real_dir} for useless files"
378 pushd ${real_dir} &> /dev/null
379 for fle in *; do
380 unset MATCH
381 for allowed_file in ${allowed_files}; do
382 if [[ ${fle} = ${allowed_file} ]]; then
383 # If it's allowed, then move on to the next file
384 MATCH="yes"
385 break
386 fi
387 done
388 # If we found a match in allowed files, move on to the next file
389 [[ -n ${MATCH} ]] && continue
390 # If we get this far, there wasn't a match in the allowed files
391 KEEP_FONTDIR="yes"
392 # We don't need to check more files if we're already keeping it
393 break
394 done
395 popd &> /dev/null
396 # If there are no files worth keeping, then get rid of the dir
397 [[ -z "${KEEP_FONTDIR}" ]] && rm -rf ${real_dir}
398}
399
400# @FUNCTION: setup_fonts 355# @FUNCTION: setup_fonts
401# @USAGE:
402# @DESCRIPTION: 356# @DESCRIPTION:
403# Generates needed files for fonts and fixes font permissions 357# Generates needed files for fonts and fixes font permissions
404setup_fonts() { 358setup_fonts() {
405 create_fonts_scale 359 create_fonts_scale
406 create_fonts_dir 360 create_fonts_dir
407 font_pkg_postinst 361 font_pkg_postinst
408} 362}
409 363
410# @FUNCTION: remove_font_metadata 364# @FUNCTION: remove_font_metadata
411# @USAGE:
412# @DESCRIPTION: 365# @DESCRIPTION:
413# Don't let the package install generated font files that may overlap 366# Don't let the package install generated font files that may overlap
414# with other packages. Instead, they're generated in pkg_postinst(). 367# with other packages. Instead, they're generated in pkg_postinst().
415remove_font_metadata() { 368remove_font_metadata() {
416 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 369 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
418 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1} 371 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1}
419 fi 372 fi
420} 373}
421 374
422# @FUNCTION: create_fonts_scale 375# @FUNCTION: create_fonts_scale
423# @USAGE:
424# @DESCRIPTION: 376# @DESCRIPTION:
425# Create fonts.scale file, used by the old server-side fonts subsystem. 377# Create fonts.scale file, used by the old server-side fonts subsystem.
426create_fonts_scale() { 378create_fonts_scale() {
427 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 379 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
428 ebegin "Generating font.scale" 380 ebegin "Generating font.scale"
432 eend $? 384 eend $?
433 fi 385 fi
434} 386}
435 387
436# @FUNCTION: create_fonts_dir 388# @FUNCTION: create_fonts_dir
437# @USAGE:
438# @DESCRIPTION: 389# @DESCRIPTION:
439# Create fonts.dir file, used by the old server-side fonts subsystem. 390# Create fonts.dir file, used by the old server-side fonts subsystem.
440create_fonts_dir() { 391create_fonts_dir() {
441 ebegin "Generating fonts.dir" 392 ebegin "Generating fonts.dir"
442 mkfontdir \ 393 mkfontdir \

Legend:
Removed from v.1.2  
changed lines
  Added in v.1.12

  ViewVC Help
Powered by ViewVC 1.1.20