1 |
On Sun, 22 Nov 2015 08:27:47 +0000 (UTC) |
2 |
"Michael Sterrett" <mr_bones_@g.o> wrote: |
3 |
|
4 |
> commit: a144d7480f781f21323943d87e6a56136add3830 |
5 |
> Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
6 |
> AuthorDate: Sun Nov 22 08:26:57 2015 +0000 |
7 |
> Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
8 |
> CommitDate: Sun Nov 22 08:27:35 2015 +0000 |
9 |
> URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a144d748 |
10 |
> |
11 |
> Stop inheriting base.eclass (bug #494208) |
12 |
> |
13 |
> eclass/games.eclass | 10 ++++++---- |
14 |
> 1 file changed, 6 insertions(+), 4 deletions(-) |
15 |
> |
16 |
> diff --git a/eclass/games.eclass b/eclass/games.eclass |
17 |
> index 7d231e1..aebf679 100644 |
18 |
> --- a/eclass/games.eclass |
19 |
> +++ b/eclass/games.eclass |
20 |
> @@ -24,11 +24,11 @@ |
21 |
> if [[ -z ${_GAMES_ECLASS} ]]; then |
22 |
> _GAMES_ECLASS=1 |
23 |
> |
24 |
> -inherit base multilib toolchain-funcs eutils user |
25 |
> +inherit multilib toolchain-funcs eutils user |
26 |
|
27 |
This changes API in all existing eclasses. In paricular, src_unpack() |
28 |
and src_prepare() stop being implicitly exported which can cause them |
29 |
to being implicitly replaced by another eclass. Which is especially |
30 |
relevant since you specifically required people to inherit games.eclass |
31 |
last and force its overrides. |
32 |
|
33 |
> case ${EAPI:-0} in |
34 |
> 0|1) EXPORT_FUNCTIONS pkg_setup src_compile pkg_preinst pkg_postinst ;; |
35 |
> - 2|3|4|5) EXPORT_FUNCTIONS pkg_setup src_configure src_compile pkg_preinst pkg_postinst ;; |
36 |
> + 2|3|4|5|6) EXPORT_FUNCTIONS pkg_setup src_configure src_compile pkg_preinst pkg_postinst ;; |
37 |
|
38 |
This is irrelevant change and belongs in a separate commit. |
39 |
Furthermore, I don't think it is appropriate to enable new EAPI support |
40 |
until you perform the eclass changes requested by the Council. |
41 |
|
42 |
> *) die "no support for EAPI=${EAPI} yet" ;; |
43 |
> esac |
44 |
> |
45 |
> @@ -302,12 +302,14 @@ games_src_configure() { |
46 |
> |
47 |
> # @FUNCTION: games_src_compile |
48 |
> # @DESCRIPTION: |
49 |
> -# Runs base_src_make(). This function is exported as src_compile(). |
50 |
> +# This function is exported as src_compile(). |
51 |
> games_src_compile() { |
52 |
> case ${EAPI:-0} in |
53 |
> 0|1) games_src_configure ;; |
54 |
> esac |
55 |
> - base_src_make |
56 |
> + if [[ -f Makefile || -f GNUmakefile || -f makefile ]]; then |
57 |
> + emake "$@" || die |
58 |
> + fi |
59 |
> } |
60 |
> |
61 |
> # @FUNCTION: games_pkg_preinst |
62 |
> |
63 |
|
64 |
I'm going to revert this commit on behalf of QA to avoid breakage. |
65 |
The relevant bug specifically mentioned making the change conditional |
66 |
to EAPI 6. Please either do that (and don't enable EAPI 6 until you |
67 |
have performed all requested changes), or confirm that none of |
68 |
the packages will be broken by removing it retroactively. |
69 |
|
70 |
-- |
71 |
Best regards, |
72 |
Michał Górny |
73 |
<http://dev.gentoo.org/~mgorny/> |