gentoo resync : 19.01.2018

3 files changed, 2 insertions, 56 deletions

diff --git a/sys-devel/bc/Manifest b/sys-devel/bc/Manifest
index debce9fa7c85..2653901ba3ee 100644
--- a/sys-devel/bc/Manifest
+++ b/sys-devel/bc/Manifest
@@ -2,7 +2,6 @@ AUX bc-1.06.95-mem-leak.patch 588 BLAKE2B b81094c82c02c47bc60d949f8aa50e1a9d00bb
 AUX bc-1.06.95-void_uninitialized.patch 351 BLAKE2B ad293d5efcebc2cf85a2d1a99e850f5c104e57b92cb3070739719f578d3eac38bfb92ba4b5cd5040fe8a711db5b77a4a673e080e27b233878adf1457cbc49073 SHA512 6d2803d831d8a3137c3d867606f8d40455a6f984bfe844e10e276e24cbd5d9fd1ff21b81ea91775dd7e1e55484cdde7bf859fa3e9a17887bdf548b32cdc46dae
 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 1630 BLAKE2B 415d2584250f5c9047bd90fc44922defc5089034c9e710d3678794614601a2e47f64aa0fa30fbb65f111a63060278ac1826b95d9f5c0872b0bfa05afa77897b0 SHA512 0b5dd68377ebb3aac5812384f2ca5fe31b5edfef1d0e86af64a5d51a58c7e4accba1aee5db36e81c76188e879f28d9ea88e6a312f29b8ba17baf2778a1f77faa
+EBUILD bc-1.06.95-r2.ebuild 1625 BLAKE2B efa5f764217c5bece03572407a604c8e8170f1f68e4def86f20dea4b98b6fbf9d50a78af7c4e21d95fbb17d466c4b4b668bd044a17369b51a6b5688c0a7edf08 SHA512 85cfbb839eb36d364388e35252dd03f7b4c19ef7a6d91c3ae73c2562aeedc1dfb84f9fd77dc8b4bddeecadaf1d098b3734aa197016b066bcf87fb796b07a6fa5
 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-r1.ebuild b/sys-devel/bc/bc-1.06.95-r1.ebuild
deleted file mode 100644
index 5ae9bc3006cd..000000000000
--- a/sys-devel/bc/bc-1.06.95-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Handy console-based calculator utility"
-HOMEPAGE="https://www.gnu.org/software/bc/bc.html"
-SRC_URI="mirror://gnu-alpha/bc/${P}.tar.bz2
-	mirror://gnu/bc/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~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? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 )
-	libedit? ( dev-libs/libedit )"
-DEPEND="${RDEPEND}
-	sys-devel/flex"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-void_uninitialized.patch #349339
-}
-
-src_configure() {
-	export CONFIG_SHELL=${BASH}
-
-	local myconf
-	if use readline ; then
-		myconf="--with-readline --without-libedit"
-	elif use libedit ; then
-		myconf="--without-readline --with-libedit"
-	else
-		myconf="--without-readline --without-libedit"
-	fi
-	use static && append-ldflags -static
-	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
-	touch -r doc doc/*
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)" || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS FAQ NEWS README ChangeLog
-}
diff --git a/sys-devel/bc/bc-1.06.95-r2.ebuild b/sys-devel/bc/bc-1.06.95-r2.ebuild
index 876674207af4..1c570e29145a 100644
--- a/sys-devel/bc/bc-1.06.95-r2.ebuild
+++ b/sys-devel/bc/bc-1.06.95-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu-alpha/bc/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2.1"
 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"
+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="