Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/wxGTK/
Date: Thu, 04 Jan 2018 17:18:58
Message-Id: 1515086280.69dc05bada5cb4272c7af647306a68bbd9820bc0.leio@gentoo
1 commit: 69dc05bada5cb4272c7af647306a68bbd9820bc0
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 4 02:26:39 2018 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 4 17:18:00 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69dc05ba
7
8 x11-libs/wxGTK: don't eautoreconf or rename configure.in files
9
10 wxWidgets doesn't use full autotools (at least not automake), and it maintains
11 an autoconf'ed configure script inside its code repository, which gets (usually)
12 updated after each configure.in update.
13 Because we don't eautoreconf to see a slightly dumb warning about configure.in
14 vs configure.ac, remove the renaming, as the code is buggy and breaks on some
15 non-default PORTAGE_TMPDIR values. I don't intend to ever add back an eautoreconf
16 if at all possible, but if it is, make sure such renaming isn't buggy like this.
17 Also note that other Makefile.in's seem to refer to the preset configure.in's by
18 name (with .in ending), so renaming them is probably wrong as well via such a
19 global "find" approach, at least without patching the references too.
20
21 The eautoreconf and buggy renaming was already removed on bump for 3.0 SLOT.
22
23 Closes: https://bugs.gentoo.org/614982
24 Package-Manager: Portage-2.3.19, Repoman-2.3.6
25
26 x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild | 8 +-------
27 1 file changed, 1 insertion(+), 7 deletions(-)
28
29 diff --git a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild b/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild
30 index 6066afd3bb4..6605d6d4ac8 100644
31 --- a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild
32 +++ b/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild
33 @@ -3,7 +3,7 @@
34
35 EAPI=6
36
37 -inherit autotools multilib-minimal
38 +inherit multilib-minimal
39
40 DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
41 HOMEPAGE="https://wxwidgets.org/"
42 @@ -67,12 +67,6 @@ S="${WORKDIR}/wxWidgets-${PV}"
43 src_prepare() {
44 default
45
46 - local f
47 - for f in $(find "${S}" -name configure.in); do
48 - mv "${f}" "${f/in/ac}" || die
49 - done
50 - AT_M4DIR="${S}/build/aclocal" eautoreconf
51 -
52 # Versionating
53 sed -i \
54 -e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\