diff options
| author |   Christoph Junghans <ottxor@gentoo.org> | 2013-09-29 18:00:30 +0000 |
|---|---|---|
| committer | Christoph Junghans <ottxor@gentoo.org> | 2013-09-29 18:00:30 +0000 |
| commit | 1f15bfccd41a36ed43ed9c674ad12b094479780e (patch) | |
| tree | 36bcf73d8f4591493c9ca5d9469ec22cf39be4aa /eclass | |
| parent | Version bump. (diff) | |
| download | gentoo-2-1f15bfccd41a36ed43ed9c674ad12b094479780e.tar.gz gentoo-2-1f15bfccd41a36ed43ed9c674ad12b094479780e.tar.bz2 gentoo-2-1f15bfccd41a36ed43ed9c674ad12b094479780e.zip | |
EAPI bump, ccache support
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/intel-sdp.eclass | 22 |
2 files changed, 18 insertions, 9 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index ed74701e3735..bc96a24ea728 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.999 2013/09/29 17:47:13 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1000 2013/09/29 18:00:30 ottxor Exp $ + + 29 Sep 2013; Christoph Junghans <ottxor@gentoo.org> intel-sdp.eclass: + EAPI bump, ccache support 29 Sep 2013; Gilles Dartiguelongue <eva@gentoo.org> gst-plugins10.eclass: Add support for gstreamer 1.2 release series. diff --git a/eclass/intel-sdp.eclass b/eclass/intel-sdp.eclass index fe116d00bf59..ca7b57e7fa5a 100644 --- a/eclass/intel-sdp.eclass +++ b/eclass/intel-sdp.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.14 2013/07/29 09:50:09 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.15 2013/09/29 18:00:30 ottxor Exp $ # @ECLASS: intel-sdp.eclass # @MAINTAINER: @@ -364,10 +364,6 @@ intel-sdp_pkg_setup() { INTEL_RPMS_FULL+=( ${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.noarch.rpm ) fi done - - case "${EAPI:-0}" in - 0|1|2|3) intel-sdp_pkg_pretend ;; - esac } # @FUNCTION: intel-sdp_src_unpack @@ -472,6 +468,11 @@ intel-sdp_pkg_postinst() { "<:${r%-${_INTEL_PV4}*}-${_INTEL_PV4}:${r}:${INTEL_SDP_EDIR}:${l}:>" done _isdp_run-test + + if [[ ${PN} = icc ]] && has_version ">=dev-util/ccache-3.1.9-r2" ; then + #add ccache links as icc might get installed after ccache + "${EROOT}"/usr/bin/ccache-config --install-links + fi } # @FUNCTION: intel-sdp_pkg_postrm @@ -487,11 +488,16 @@ intel-sdp_pkg_postrm() { ${INTEL_SDP_DB} done fi + + if [[ ${PN} = icc ]] && has_version ">=dev-util/ccache-3.1.9-r2" && [[ -z ${REPLACED_BY_VERSION} ]]; then + # --remove-links would remove all links, --install-links updates them + "${EROOT}"/usr/bin/ccache-config --install-links + fi } -EXPORT_FUNCTIONS pkg_setup src_unpack src_install pkg_postinst pkg_postrm +EXPORT_FUNCTIONS pkg_setup src_unpack src_install pkg_postinst pkg_postrm pkg_pretend case "${EAPI:-0}" in - 0|1|2|3) ;; - 4|5) EXPORT_FUNCTIONS pkg_pretend ;; + 0|1|2|3)die "EAPI=${EAPI} is not supported anymore" ;; + 4|5) ;; *) die "EAPI=${EAPI} is not supported" ;; esac |