diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2014-03-09 18:54:44 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2014-03-09 18:54:44 +0000 |
| commit | b4e6c9cd5abcc9cd8eb4463d43cfc6650513c7d3 (patch) | |
| tree | 08c8eeecf2cb6e2e63814032849b22cb11a015fd /eclass | |
| parent | Update libxshmfence dependency to 1.1, bug #503932. (diff) | |
| download | gentoo-2-b4e6c9cd5abcc9cd8eb4463d43cfc6650513c7d3.tar.gz gentoo-2-b4e6c9cd5abcc9cd8eb4463d43cfc6650513c7d3.tar.bz2 gentoo-2-b4e6c9cd5abcc9cd8eb4463d43cfc6650513c7d3.zip | |
Do not inherit base.eclass, bug 497054.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/texlive-module.eclass | 24 |
2 files changed, 23 insertions, 6 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index bed2fdd8ff7b..2190c4312594 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1168 2014/03/09 18:16:04 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1169 2014/03/09 18:54:44 ulm Exp $ + + 09 Mar 2014; Ulrich Müller <ulm@gentoo.org> texlive-module.eclass: + Do not inherit base.eclass, bug 497054. 09 Mar 2014; Michael Palimaka <kensington@gentoo.org> cmake-utils.eclass: Remove stray character thanks to mimi_vx. diff --git a/eclass/texlive-module.eclass b/eclass/texlive-module.eclass index c52e614d5760..f10df89d9e32 100644 --- a/eclass/texlive-module.eclass +++ b/eclass/texlive-module.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/texlive-module.eclass,v 1.67 2013/09/25 15:18:28 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/texlive-module.eclass,v 1.68 2014/03/09 18:54:44 ulm Exp $ # @ECLASS: texlive-module.eclass # @MAINTAINER: @@ -20,7 +20,7 @@ # Starting from TeX Live 2009, the eclass provides a src_unpack function taking # care of unpacking and relocating the files that need it. # -# It inherits texlive-common and base for supporting patching via the PATCHES +# It inherits texlive-common. Patching is supported via the PATCHES # bash array. # @ECLASS-VARIABLE: TEXLIVE_MODULE_CONTENTS @@ -61,7 +61,11 @@ # Information to display about the package. # e.g. for enabling/disabling a feature -inherit texlive-common base +# @ECLASS-VARIABLE: PATCHES +# @DESCRIPTION: +# Array variable specifying any patches to be applied. + +inherit texlive-common eutils case "${EAPI:-0}" in 0|1|2) @@ -128,6 +132,15 @@ texlive-module_src_unpack() { done } +# @FUNCTION: texlive-module_src_prepare +# @DESCRIPTION: +# Apply patches from the PATCHES array and user patches, if any. + +texlive-module_src_prepare() { + [[ ${#PATCHES[@]} -gt 0 ]] && epatch "${PATCHES[@]}" + epatch_user +} + # @FUNCTION: texlive-module_add_format # @DESCRIPTION: # Creates/appends to a format.${PN}.cnf file for fmtutil. @@ -372,4 +385,5 @@ texlive-module_pkg_postrm() { etexmf-update } -EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst pkg_postrm +EXPORT_FUNCTIONS src_unpack src_prepare src_compile src_install \ + pkg_postinst pkg_postrm |