Gentoo Archives: gentoo-dev

From: Andrew Savchenko <bircoph@g.o>
To: gentoo-dev@l.g.o
Cc: java@g.o
Subject: [gentoo-dev] [PATCH] java-pkg-opt-2.eclass: fix java-pkg-opt-2_src_prepare to always call eapply_user for EAPI-6+
Date: Sun, 30 Jul 2017 11:33:28
Message-Id: 20170730143253.f8ccf2b2cb849b95133d2546@gentoo.org
1 Hi all,
2
3 For EAPI 6+ java-pkg-opt-2_src_prepare() has eapply_user call via
4 java-utils-2_src_prepare() from java-utils-2.eclass. But
5 java-utils-2_src_prepare() call is conditional and in case when
6 package is build with USE=-java java-utils-2_src_prepare() is not
7 called, hence eapply_user is not called in src_prepare phase and
8 ebuild fails.
9
10 The following patch fixes this by calling eapply_user if java USE
11 is disabled _and_ EAPI is 6+.
12
13 [pedantic mode on]
14 Strictly speaking when EAPI is other than [0-5]. The way java-*
15 eclasses are now, they assume ![0-5] == 6+. It may be speculated
16 that this is not entirely correct and many other eclasses
17 explicitly deny all unknown EAPIs. If someone is interesting in
18 fixing this issue, please handle it with the java team and do not
19 mix it into the problem described at the beginning. My goal now is
20 to fix eapply_user issue which cases trouble for any EAPI 6
21 packages with optional java support and default src_prepare() at
22 the ebuild scope.
23 [pedantic mode off]
24
25 Best regards,
26 Andrew Savchenko

Attachments

File name MIME type
java-pkg-opt-2.eclass.patch text/x-diff

Replies