Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sat, 12 Dec 2015 10:42:07
Message-Id: 1449916911.87ac40ce74f7529302f79d2ec12d9fded0a289cb.pacho@gentoo
1 commit: 87ac40ce74f7529302f79d2ec12d9fded0a289cb
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 12 10:41:51 2015 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 12 10:41:51 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87ac40ce
7
8 eclass/readme.gentoo.eclass: Add EAPI6 support, stop exporting functions for that EAPI as explained at bug #520094
9
10 eclass/readme.gentoo.eclass | 9 ++++++---
11 1 file changed, 6 insertions(+), 3 deletions(-)
12
13 diff --git a/eclass/readme.gentoo.eclass b/eclass/readme.gentoo.eclass
14 index fdef2fe..741287a 100644
15 --- a/eclass/readme.gentoo.eclass
16 +++ b/eclass/readme.gentoo.eclass
17 @@ -1,4 +1,4 @@
18 -# Copyright 1999-2014 Gentoo Foundation
19 +# Copyright 1999-2015 Gentoo Foundation
20 # Distributed under the terms of the GNU General Public License v2
21 # $Id$
22
23 @@ -28,14 +28,17 @@ case "${EAPI:-0}" in
24 # EAPI>=4 is required for REPLACING_VERSIONS preventing us
25 # from needing to export another pkg_preinst phase to save has_version
26 # result. Also relies on EAPI >=4 default src_install phase.
27 + EXPORT_FUNCTIONS src_install pkg_postinst
28 + ;;
29 + 6)
30 + # Stop exporting default functions as discussed at:
31 + # https://bugs.gentoo.org/show_bug.cgi?id=520094
32 ;;
33 *)
34 die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
35 ;;
36 esac
37
38 -EXPORT_FUNCTIONS src_install pkg_postinst
39 -
40 # @ECLASS-VARIABLE: DISABLE_AUTOFORMATTING
41 # @DEFAULT_UNSET
42 # @DESCRIPTION: