Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/bc/
Date: Thu, 04 Jan 2018 13:00:41
Message-Id: 1515070830.6da887f1b2eaadc441e75eb2c19182ff4a64b717.polynomial-c@gentoo
1 commit: 6da887f1b2eaadc441e75eb2c19182ff4a64b717
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 4 12:59:58 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 4 13:00:30 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6da887f1
7
8 sys-devel/bc: Added missing virtual/yacc dependency.
9
10 Closes: https://bugs.gentoo.org/593924
11 Package-Manager: Portage-2.3.19, Repoman-2.3.6
12
13 sys-devel/bc/bc-1.06.95-r2.ebuild | 15 ++++++++++-----
14 sys-devel/bc/bc-1.07.1-r1.ebuild | 34 ++++++++++++++++++----------------
15 2 files changed, 28 insertions(+), 21 deletions(-)
16
17 diff --git a/sys-devel/bc/bc-1.06.95-r2.ebuild b/sys-devel/bc/bc-1.06.95-r2.ebuild
18 index 6730e90a828..e74a6b74e03 100644
19 --- a/sys-devel/bc/bc-1.06.95-r2.ebuild
20 +++ b/sys-devel/bc/bc-1.06.95-r2.ebuild
21 @@ -1,4 +1,4 @@
22 -# Copyright 1999-2017 Gentoo Foundation
23 +# Copyright 1999-2018 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25
26 EAPI="5"
27 @@ -15,13 +15,18 @@ SLOT="0"
28 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
29 IUSE="libedit readline static"
30
31 -RDEPEND="!readline? ( libedit? ( dev-libs/libedit:= ) )
32 +RDEPEND="
33 + !readline? ( libedit? ( dev-libs/libedit:= ) )
34 readline? (
35 >=sys-libs/readline-4.1:0=
36 >=sys-libs/ncurses-5.2:=
37 - )"
38 -DEPEND="${RDEPEND}
39 - sys-devel/flex"
40 + )
41 +"
42 +DEPEND="
43 + ${RDEPEND}
44 + sys-devel/flex
45 + virtual/yacc
46 +"
47
48 src_prepare() {
49 epatch "${FILESDIR}"/${P}-void_uninitialized.patch #349339
50
51 diff --git a/sys-devel/bc/bc-1.07.1-r1.ebuild b/sys-devel/bc/bc-1.07.1-r1.ebuild
52 index fcd02f0f33e..7efced6d3eb 100644
53 --- a/sys-devel/bc/bc-1.07.1-r1.ebuild
54 +++ b/sys-devel/bc/bc-1.07.1-r1.ebuild
55 @@ -1,7 +1,7 @@
56 -# Copyright 1999-2017 Gentoo Foundation
57 +# Copyright 1999-2018 Gentoo Foundation
58 # Distributed under the terms of the GNU General Public License v2
59
60 -EAPI="6"
61 +EAPI=6
62
63 inherit flag-o-matic toolchain-funcs
64
65 @@ -14,30 +14,32 @@ SLOT="0"
66 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
67 IUSE="libedit readline static"
68
69 -RDEPEND="!readline? ( libedit? ( dev-libs/libedit:= ) )
70 +RDEPEND="
71 + !readline? ( libedit? ( dev-libs/libedit:= ) )
72 readline? (
73 >=sys-libs/readline-4.1:0=
74 >=sys-libs/ncurses-5.2:=
75 - )"
76 -DEPEND="${RDEPEND}
77 + )
78 +"
79 +DEPEND="
80 + ${RDEPEND}
81 sys-apps/ed
82 - sys-devel/flex"
83 + sys-devel/flex
84 + virtual/yacc
85 +"
86
87 src_configure() {
88 - local libedit
89 + local myconf=(
90 + $(use_with readline)
91 + )
92 if use readline ; then
93 - libedit="--without-libedit"
94 + myconf+=( --without-libedit )
95 else
96 - libedit=$(use_with libedit)
97 + myconf+=( $(use_with libedit) )
98 fi
99 use static && append-ldflags -static
100 - # Clobber any CONFIG_SHELL setting the user has forced on us.
101 - # We should be able to delete this w/the next release as it
102 - # should use updated autoconf.
103 - CONFIG_SHELL=/bin/bash \
104 - econf \
105 - $(use_with readline) \
106 - ${libedit}
107 +
108 + econf "${myconf[@]}"
109
110 # Do not regen docs -- configure produces a small fragment that includes
111 # the version info which causes all pages to regen (newer file). #554774