gentoo resync : 04.01.2018

3 files changed, 30 insertions, 23 deletions

diff --git a/sys-devel/bc/Manifest b/sys-devel/bc/Manifest
index 96b920bb6d4b..4766bb55411c 100644
--- a/sys-devel/bc/Manifest
+++ b/sys-devel/bc/Manifest
@@ -3,6 +3,6 @@ AUX bc-1.06.95-void_uninitialized.patch 351 BLAKE2B ad293d5efcebc2cf85a2d1a99e85
 DIST bc-1.06.95.tar.bz2 290069 BLAKE2B 774f07b1f85b4de7c4707baa355caed5a9fc7b3a5ee1a14f4e9fd59f47a4bbdf34bcb76dc05de4dd8c65615284c3588ad7961fa493ed559a0e8880647835bda0 SHA512 16ec13f87ef76ad4de77d378ef8d65a582adca1bf661c9d7675e78d940680c77e81a00a01817fde7c1ad1524562d6f933caa5c42a0686f3f85aadbb39393afb1
 DIST bc-1.07.1.tar.gz 419850 BLAKE2B dcedc193be5521aa0fa3a19746233ed65bc1fe8ef12e15155341706de6fbeecb6dd7ee4ab11e2d4b3aca2ae7097cce89e389b3573493bbc893e00b4ed3239594 SHA512 02126d0db6b6ed06d56cfc292d6f5475ff1e574779d7e69c7809bbb1e13f946f57ea07da2a7666baa092507a951a822044b0970075f75eefe65a5c1999b75d34
 EBUILD bc-1.06.95-r1.ebuild 1510 BLAKE2B 2d4e498eebe76077986a82c249c6bcbd2fcf6628b27c499cdab4952822b992d11854cac88832f30c5a7b618f96bc9b2063fdce9bb3f118d8df5b0400f7f0a52f SHA512 d246ee01a277848789ac860c52d4b1bbab93246b02e5baf09099ba1e88978f824e34abaefa732a4cdf7b41bc7186f959c622fbe2b9fceb14af41e0a313f3b1f4
-EBUILD bc-1.06.95-r2.ebuild 1618 BLAKE2B 6aca65843c7ae9adabd29865288c81fc544671f5f8f27febf97a04eb3516728187d9e3eb736485616af670ba5443866b355981d05b3d97448c1931e85e1ff13c SHA512 25fb59a3666e7f1ec64e61c737f14d66fe0c480bf2c4011d094d2cceed1dea9961fdca716543fbbdcafea7e295376f64a1f61a2a56f29ea2ddc3827ec3809d11
-EBUILD bc-1.07.1-r1.ebuild 1428 BLAKE2B 5906c47db0d91b491eab1ff96ea8800dc5b33a5369318cad29a33d1680381772d375ea77580b8bd4bcff0969255ac77104f9bca3be158029da741d1a2bd175d6 SHA512 5e78ec01eb60c593655677eecd0fb8d4a5f0b941bf90d90b172cb2a9eb85751a2a8012c905dede7bbf14718eb8ca7f5be3f9770e16e33d5fefd80fb271dc51d4
+EBUILD bc-1.06.95-r2.ebuild 1638 BLAKE2B cbb52c9ea674745c49acedb92a2f4ae28061b2314e855136aaf05bbf57551137c5680a8a8cc6d88a5c614c61db5bdf8053d1e8fbde673dfae9d4669667d69200 SHA512 79c65179779809389e16d4ec51d9d33b42b115c7fe8d6ab29cbbd5bec4bfadc15be578bcc42feafa0a8bd62391bc497ba0fd9f7863349f2ad9667273e506d4a9
+EBUILD bc-1.07.1-r1.ebuild 1273 BLAKE2B afc42976eb7c32847e0979a9d551c4504e3fc702781c7dea59efafb21937d8a824bfa6bfa67880aead8c3fb129e5bf2a4c065d28108f64bb0cda33ce730dadf3 SHA512 16bd0dc631c798e1ff3a1a42b887a149204bb48ec9efdd097a6ebfe8d31a1fa163530dbc7fa77b9ab174cacc96cb31ae1f9dac298cf51a13aff89d0c127fc964
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/bc/bc-1.06.95-r2.ebuild b/sys-devel/bc/bc-1.06.95-r2.ebuild
index 6730e90a8280..e74a6b74e03b 100644
--- a/sys-devel/bc/bc-1.06.95-r2.ebuild
+++ b/sys-devel/bc/bc-1.06.95-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,13 +15,18 @@ SLOT="0"
 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"
 IUSE="libedit readline static"
 
-RDEPEND="!readline? ( libedit? ( dev-libs/libedit:= ) )
+RDEPEND="
+	!readline? ( libedit? ( dev-libs/libedit:= ) )
 	readline? (
 		>=sys-libs/readline-4.1:0=
 		>=sys-libs/ncurses-5.2:=
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/flex"
+	)
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/flex
+	virtual/yacc
+"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-void_uninitialized.patch #349339
diff --git a/sys-devel/bc/bc-1.07.1-r1.ebuild b/sys-devel/bc/bc-1.07.1-r1.ebuild
index fcd02f0f33eb..7efced6d3eb0 100644
--- a/sys-devel/bc/bc-1.07.1-r1.ebuild
+++ b/sys-devel/bc/bc-1.07.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
 inherit flag-o-matic toolchain-funcs
 
@@ -14,30 +14,32 @@ SLOT="0"
 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"
 IUSE="libedit readline static"
 
-RDEPEND="!readline? ( libedit? ( dev-libs/libedit:= ) )
+RDEPEND="
+	!readline? ( libedit? ( dev-libs/libedit:= ) )
 	readline? (
 		>=sys-libs/readline-4.1:0=
 		>=sys-libs/ncurses-5.2:=
-	)"
-DEPEND="${RDEPEND}
+	)
+"
+DEPEND="
+	${RDEPEND}
 	sys-apps/ed
-	sys-devel/flex"
+	sys-devel/flex
+	virtual/yacc
+"
 
 src_configure() {
-	local libedit
+	local myconf=(
+		$(use_with readline)
+	)
 	if use readline ; then
-		libedit="--without-libedit"
+		myconf+=( --without-libedit )
 	else
-		libedit=$(use_with libedit)
+		myconf+=( $(use_with libedit) )
 	fi
 	use static && append-ldflags -static
-	# Clobber any CONFIG_SHELL setting the user has forced on us.
-	# We should be able to delete this w/the next release as it
-	# should use updated autoconf.
-	CONFIG_SHELL=/bin/bash \
-	econf \
-		$(use_with readline) \
-		${libedit}
+
+	econf "${myconf[@]}"
 
 	# Do not regen docs -- configure produces a small fragment that includes
 	# the version info which causes all pages to regen (newer file). #554774